Skip to content

feat: add minimal frontend for creating workspaces from specific template versions #9475

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.

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 8 commits into from
Sep 7, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Immutable Version ID form field
  • Loading branch information
aslilac committed Sep 5, 2023
commit f1d33273f79423c35c13f94dc8bbff239242cfe1
1 change: 1 addition & 0 deletions site/src/i18n/en/createWorkspacePage.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"templateLabel": "Template",
"versionLabel": "Version ID",
"nameLabel": "Workspace Name",
"ownerLabel": "Owner",
"createWorkspace": "Create Workspace",
Expand Down
12 changes: 10 additions & 2 deletions site/src/pages/CreateWorkspacePage/CreateWorkspacePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,15 @@ const CreateWorkspacePage: FC = () => {
},
},
})
const { template, error, parameters, permissions, gitAuth, defaultName } =
createWorkspaceState.context
const {
template,
error,
parameters,
permissions,
gitAuth,
defaultName,
versionId,
} = createWorkspaceState.context
const title = createWorkspaceState.matches("autoCreating")
? "Creating workspace..."
: "Create Workspace"
Expand All @@ -75,6 +82,7 @@ const CreateWorkspacePage: FC = () => {
defaultBuildParameters={defaultBuildParameters}
error={error}
template={template as Template}
versionId={versionId}
gitAuth={gitAuth as TemplateVersionGitAuth[]}
permissions={permissions as CreateWSPermissions}
parameters={parameters as TemplateVersionParameter[]}
Expand Down
23 changes: 23 additions & 0 deletions site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@ import {
import { CreateWSPermissions } from "xServices/createWorkspace/createWorkspaceXService"
import { GitAuth } from "components/GitAuth/GitAuth"
import { ErrorAlert } from "components/Alert/ErrorAlert"
import { Stack } from "components/Stack/Stack"

export interface CreateWorkspacePageViewProps {
error: unknown
defaultName: string
defaultOwner: TypesGen.User
template: TypesGen.Template
versionId?: string
gitAuth: TypesGen.TemplateVersionGitAuth[]
parameters: TypesGen.TemplateVersionParameter[]
defaultBuildParameters: TypesGen.WorkspaceBuildParameter[]
Expand All @@ -46,6 +48,7 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
defaultName,
defaultOwner,
template,
versionId,
gitAuth,
parameters,
defaultBuildParameters,
Expand Down Expand Up @@ -108,6 +111,19 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
>
<FormFields>
<SelectedTemplate template={template} />
{versionId && (
<Stack spacing={1} className={styles.hasDescription}>
<TextField
disabled
fullWidth
value={versionId}
label={t("versionLabel")}
/>
<span className={styles.description}>
This parameter has been preset, and cannot be modified.
</span>
</Stack>
)}
<TextField
{...getFieldHelpers("name")}
disabled={form.isSubmitting}
Expand Down Expand Up @@ -245,6 +261,13 @@ const useGitAuthVerification = (gitAuth: TypesGen.TemplateVersionGitAuth[]) => {
}

const useStyles = makeStyles((theme) => ({
hasDescription: {
paddingBottom: theme.spacing(2),
},
description: {
fontSize: 13,
color: theme.palette.text.secondary,
},
warningText: {
color: theme.palette.warning.light,
},
Expand Down