From a6a6683a735a8974def00ddf336df160b705f401 Mon Sep 17 00:00:00 2001 From: SaschaPfau Date: Mon, 15 May 2023 13:27:36 +0200 Subject: [PATCH 1/2] feat: added URL param name to allow setting workspace name --- .../src/pages/CreateWorkspacePage/CreateWorkspacePage.tsx | 8 ++++++++ .../pages/CreateWorkspacePage/CreateWorkspacePageView.tsx | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.tsx index fff425689bb24..d6871883640a0 100644 --- a/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.tsx +++ b/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.tsx @@ -44,6 +44,7 @@ const CreateWorkspacePage: FC = () => { } = createWorkspaceState.context const [searchParams] = useSearchParams() const defaultParameterValues = getDefaultParameterValues(searchParams) + const name = getName(searchParams) return ( <> @@ -51,6 +52,7 @@ const CreateWorkspacePage: FC = () => { {pageTitle("Create Workspace")} { ) } +const getName = ( + urlSearchParams: URLSearchParams, +): string => { + return urlSearchParams.get("name") ?? "" +} + const getDefaultParameterValues = ( urlSearchParams: URLSearchParams, ): Record => { diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx index 2be426b1ae442..85c53a52b0a8b 100644 --- a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx +++ b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx @@ -35,6 +35,7 @@ export enum CreateWorkspaceErrors { } export interface CreateWorkspacePageViewProps { + name: string loadingTemplates: boolean loadingTemplateSchema: boolean creatingWorkspace: boolean @@ -92,7 +93,7 @@ export const CreateWorkspacePageView: FC< const form: FormikContextType = useFormik({ initialValues: { - name: "", + name: props.name, template_id: props.selectedTemplate ? props.selectedTemplate.id : "", rich_parameter_values: initialRichParameterValues, }, From 4419850aebdc1d249a905fcece50334cfc769cac Mon Sep 17 00:00:00 2001 From: SaschaPfau Date: Tue, 16 May 2023 14:47:32 +0000 Subject: [PATCH 2/2] fix: format --- site/src/pages/CreateWorkspacePage/CreateWorkspacePage.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.tsx index d6871883640a0..183fbc1aceaae 100644 --- a/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.tsx +++ b/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.tsx @@ -98,9 +98,7 @@ const CreateWorkspacePage: FC = () => { ) } -const getName = ( - urlSearchParams: URLSearchParams, -): string => { +const getName = (urlSearchParams: URLSearchParams): string => { return urlSearchParams.get("name") ?? "" }