Skip to content

refactor: Refactor create workspace page #4862

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

Merged
merged 7 commits into from
Nov 2, 2022
Merged

refactor: Refactor create workspace page #4862

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
042910d
Update layout
BrunoQuaresma Nov 2, 2022
acfb5dd
Add template card
BrunoQuaresma Nov 2, 2022
f8b5513
Sticky on header
BrunoQuaresma Nov 2, 2022
cea9dd8
Add mobile
BrunoQuaresma Nov 2, 2022
9916a80
Add missed styles
BrunoQuaresma Nov 2, 2022
9b2482f
Fix tests
BrunoQuaresma Nov 2, 2022
0958bc6
Fix tests and mobile
BrunoQuaresma Nov 2, 2022
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
Prev Previous commit
Next Next commit
Add template card
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Nov 2, 2022
commit acfb5dd01cb1dad47d4f70bcc09bf959171ee8eb
89 changes: 65 additions & 24 deletions site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,28 @@ export const CreateWorkspacePageView: FC<
spacing={1}
className={styles.formSectionFields}
>
<TextField
disabled
fullWidth
label={t("templateLabel")}
value={props.selectedTemplate?.name || props.templateName}
variant="outlined"
/>
{props.selectedTemplate && (
<Stack
direction="row"
spacing={2}
className={styles.template}
alignItems="center"
>
<div className={styles.templateIcon}>
<img src={props.selectedTemplate.icon} alt="" />
</div>
<Stack direction="column" spacing={0.5}>
<span className={styles.templateName}>
{props.selectedTemplate.name}
</span>
{props.selectedTemplate.description && (
<span className={styles.templateDescription}>
{props.selectedTemplate.description}
</span>
)}
</Stack>
</Stack>
)}

<TextField
{...getFieldHelpers("name")}
Expand Down Expand Up @@ -238,22 +253,22 @@ export const CreateWorkspacePageView: FC<
)}

{/* Template params */}
<div className={styles.formSection}>
<div className={styles.formSectionInfo}>
<h2 className={styles.formSectionInfoTitle}>Template params</h2>
<p className={styles.formSectionInfoDescription}>
Those values are provided by your template&lsquo;s Terraform
configuration.
</p>
</div>
{props.templateSchema && props.templateSchema.length > 0 && (
<div className={styles.formSection}>
<div className={styles.formSectionInfo}>
<h2 className={styles.formSectionInfoTitle}>Template params</h2>
<p className={styles.formSectionInfoDescription}>
Those values are provided by your template&lsquo;s Terraform
configuration.
</p>
</div>

<Stack
direction="column"
spacing={3} // Spacing here is diff because the fields here don't have the MUI floating label spacing
className={styles.formSectionFields}
>
{props.templateSchema &&
props.templateSchema.map((schema) => (
<Stack
direction="column"
spacing={3} // Spacing here is diff because the fields here don't have the MUI floating label spacing
className={styles.formSectionFields}
>
{props.templateSchema.map((schema) => (
<ParameterInput
disabled={form.isSubmitting}
key={schema.id}
Expand All @@ -266,8 +281,9 @@ export const CreateWorkspacePageView: FC<
schema={schema}
/>
))}
</Stack>
</div>
</Stack>
</div>
)}

<FormFooter
styles={formFooterStyles}
Expand Down Expand Up @@ -312,6 +328,31 @@ const useStyles = makeStyles((theme) => ({
formSectionFields: {
width: "100%",
},

template: {
padding: theme.spacing(2.5, 3),
borderRadius: theme.shape.borderRadius,
backgroundColor: theme.palette.background.paper,
border: `1px solid ${theme.palette.divider}`,
},

templateName: {
fontSize: 16,
},

templateDescription: {
fontSize: 14,
color: theme.palette.text.secondary,
},

templateIcon: {
width: theme.spacing(5),
lineHeight: 1,

"& img": {
width: "100%",
},
},
}))

const useFormFooterStyles = makeStyles((theme) => ({
Expand Down