Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ui v2: restyle kinesis workflow #801

Merged
merged 3 commits into from
Dec 17, 2020
Merged

ui v2: restyle kinesis workflow #801

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0466d9
ui v2: restyle kinesis workflow
dschaller Dec 16, 2020
88d4f02
feedback
dschaller Dec 17, 2020
df4dad5
fix lint
dschaller Dec 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions frontend/packages/app/src/clutch.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,11 @@ module.exports = {
},
},
},
"@clutch-sh/kinesis": {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: Remove this after review

updateShardCount: {
componentProps: {
resolverType: "clutch.aws.kinesis.v1.Stream",
},
},
},
};
2 changes: 1 addition & 1 deletion frontend/packages/core/src/Resolver/input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import React from "react";
import type { UseFormMethods } from "react-hook-form";
import { useForm } from "react-hook-form";
import type { clutch } from "@clutch-sh/api";
import SearchIcon from "@material-ui/icons/Search";
import styled from "@emotion/styled";
import SearchIcon from "@material-ui/icons/Search";

import {
Accordion,
Expand Down
1 change: 0 additions & 1 deletion frontend/packages/core/src/accordion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ const StyledAccordionDetails = styled(MuiAccordionDetails)({
boxSizing: "border-box",
"> *": {
padding: "8px 8px",

},
".MuiFormLabel-root": {
padding: "inherit",
Expand Down
14 changes: 8 additions & 6 deletions frontend/workflows/k8s/src/delete-pod.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,17 @@ and
const Confirm: React.FC<ConfirmChild> = () => {
const deletionData = useDataLayout("deletionData");
const podData = useDataLayout("resourceData");
const {name, cluster, namespace} = podData.displayValue();
const { name, cluster, namespace } = podData.displayValue();
return (
<WizardStep error={deletionData.error} isLoading={deletionData.isLoading}>
<Confirmation action="Deletion" />
<MetadataTable data={[
{name: "Name", value: name},
{name: "Cluster", value: cluster},
{name: "Namespace", value: namespace},
]} />
<MetadataTable
data={[
{ name: "Name", value: name },
{ name: "Cluster", value: cluster },
{ name: "Namespace", value: namespace },
]}
/>
</WizardStep>
);
};
Expand Down
1 change: 1 addition & 0 deletions frontend/workflows/kinesis/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"@clutch-sh/core": "^1.0.0-beta",
"@clutch-sh/data-layout": "^1.0.0-beta",
"@clutch-sh/wizard": "^1.0.0-beta",
"@emotion/styled": "^11.0.0",
"@material-ui/core": "^4.11.0",
"react": "^16.8.0",
"react-dom": "^16.8.0",
Expand Down
89 changes: 54 additions & 35 deletions frontend/workflows/kinesis/src/update-shard-count.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,31 @@ import {
ButtonGroup,
client,
Confirmation,
MetadataTable,
NotePanel,
Resolver,
Select,
TextField,
useWizardContext,
} from "@clutch-sh/core";
import { useDataLayout } from "@clutch-sh/data-layout";
import type { WizardChild } from "@clutch-sh/wizard";
import { Wizard, WizardStep } from "@clutch-sh/wizard";
import { Select } from "@material-ui/core";
import styled from "@emotion/styled";
import { Grid } from "@material-ui/core";

import type { ResolverChild, WorkflowProps } from "./index";

const Form = styled.form({
alignItems: "center",
display: "flex",
flexDirection: "column",
justifyItems: "space-evenly",
"> *": {
padding: "8px 0",
},
});

const StreamIdentifier: React.FC<ResolverChild> = ({ resolverType }) => {
const { onSubmit } = useWizardContext();
const resolvedResourceData = useDataLayout("resourceData");
Expand All @@ -37,10 +50,8 @@ const StreamDetails: React.FC<WizardChild> = () => {
const { onSubmit, onBack } = useWizardContext();
const resourceData = useDataLayout("resourceData");
const stream = resourceData.displayValue();
const [targetShardCount, setTargetShardCount] = React.useState("");
const handleTargetShardCountChange = e => {
setTargetShardCount(e.target.value);
resourceData.updateData("targetShardCount", e.target.value);
const handleTargetShardCountChange = (value: string) => {
resourceData.updateData("targetShardCount", value);
};

const values = [
Expand All @@ -52,35 +63,35 @@ const StreamDetails: React.FC<WizardChild> = () => {
Math.ceil(stream.currentShardCount * 1.75),
Math.ceil(stream.currentShardCount * 2),
];

const options = values.map(value => {
return { label: value.toString() };
});
return (
<WizardStep error={resourceData.error} isLoading={resourceData.isLoading}>
<form onSubmit={handleSubmit(onSubmit)}>
<TextField label="StreamName" name="streamName" value={stream.streamName} />
<TextField label="Region" name="region" value={stream.region} />
<TextField
label="Current Shard Count"
name="currentShardCount"
value={stream.currentShardCount}
/>
Select Target Shard Count:
<Select
labelId="TargetShardCount"
id="targetShardCount"
value={targetShardCount}
onChange={handleTargetShardCountChange}
defaultValue={values[2]}
displayEmpty
>
<option value={values[0]}>{values[0]}</option>
<option value={values[1]}>{values[1]}</option>
<option value={values[2]}>{values[2]}</option>
<option value={values[3]}>{values[3]}</option>
<option value={values[4]}>{values[4]}</option>
<option value={values[5]}>{values[5]}</option>
<option value={values[6]}>{values[6]}</option>
</Select>
</form>
<Form onSubmit={handleSubmit(onSubmit)}>
<TextField readOnly label="StreamName" name="streamName" value={stream.streamName} />
<TextField readOnly label="Region" name="region" value={stream.region} />
<Grid container alignItems="stretch" wrap="nowrap">
<Grid item style={{ flexBasis: "50%", paddingRight: "8px" }}>
danielhochman marked this conversation as resolved.
Show resolved Hide resolved
<TextField
readOnly
label="Current Shard Count"
name="currentShardCount"
value={stream.currentShardCount}
disabled
/>
</Grid>
<Grid item style={{ flexBasis: "50%", paddingRight: "8px" }}>
<Select
label="TargetShardCount"
name="targetShardCount"
onChange={handleTargetShardCountChange}
options={options}
defaultOption={2}
/>
</Grid>
</Grid>
</Form>

<ButtonGroup>
<Button text="Back" onClick={onBack} />
Expand All @@ -100,11 +111,19 @@ const StreamDetails: React.FC<WizardChild> = () => {
};

const Confirm: React.FC<WizardChild> = () => {
const streamData = useDataLayout("streamData");

const updateStreamData = useDataLayout("streamData");
const streamData = useDataLayout("resourceData").value;
return (
<WizardStep error={streamData.error} isLoading={streamData.isLoading}>
<WizardStep error={updateStreamData.error} isLoading={updateStreamData.isLoading}>
<Confirmation action="Update" />
<MetadataTable
data={[
{ name: "Stream Name", value: streamData.streamName },
{ name: "Region", value: streamData.region },
{ name: "Current Shard Count", value: streamData.currentShardCount },
{ name: "Target Shard Count", value: streamData.targetShardCount },
]}
/>
</WizardStep>
);
};
Expand Down