From 52b94d71c3c496f28cab557244d1ed428c0cff32 Mon Sep 17 00:00:00 2001 From: Jaayden Halko Date: Thu, 3 Apr 2025 22:07:12 +0000 Subject: [PATCH 1/4] fix: create workspace permissions --- .../CreateWorkspacePageViewExperimental.tsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx index a200a76f61081..57369846925a4 100644 --- a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx +++ b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx @@ -15,7 +15,6 @@ import { Stack } from "components/Stack/Stack"; import { UserAutocomplete } from "components/UserAutocomplete/UserAutocomplete"; import { type FormikContextType, useFormik } from "formik"; import { ArrowLeft } from "lucide-react"; -import type { WorkspacePermissions } from "modules/permissions/workspaces"; import { generateWorkspaceName } from "modules/workspaces/generateWorkspaceName"; import { type FC, @@ -37,7 +36,7 @@ import type { ExternalAuthPollingState, } from "./CreateWorkspacePage"; import { ExternalAuthButton } from "./ExternalAuthButton"; - +import type { CreateWSPermissions } from "./permissions"; export const Language = { duplicationWarning: "Duplicating a workspace only copies its parameters. No state from the old workspace is copied over.", @@ -59,7 +58,7 @@ export interface CreateWorkspacePageViewExperimentalProps { parameters: TypesGen.TemplateVersionParameter[]; autofillParameters: AutofillBuildParameter[]; presets: TypesGen.Preset[]; - permissions: WorkspacePermissions; + permissions: CreateWSPermissions; creatingWorkspace: boolean; onCancel: () => void; onSubmit: ( @@ -253,7 +252,7 @@ export const CreateWorkspacePageViewExperimental: FC<

General

- {permissions.createWorkspace + {permissions.createWorkspaceForUser ? "Only admins can create workspaces for other users." : "The name of your new workspace."}

@@ -300,7 +299,7 @@ export const CreateWorkspacePageViewExperimental: FC< - {permissions.createWorkspace && ( + {permissions.createWorkspaceForUser && (
- {permissions.createWorkspaceForUser && ( + {permissions.createWorkspaceForAny && ( { diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx index 57369846925a4..ff8c2836be311 100644 --- a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx +++ b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx @@ -36,7 +36,7 @@ import type { ExternalAuthPollingState, } from "./CreateWorkspacePage"; import { ExternalAuthButton } from "./ExternalAuthButton"; -import type { CreateWSPermissions } from "./permissions"; +import type { CreateWorkspacePermissions } from "./permissions"; export const Language = { duplicationWarning: "Duplicating a workspace only copies its parameters. No state from the old workspace is copied over.", @@ -58,7 +58,7 @@ export interface CreateWorkspacePageViewExperimentalProps { parameters: TypesGen.TemplateVersionParameter[]; autofillParameters: AutofillBuildParameter[]; presets: TypesGen.Preset[]; - permissions: CreateWSPermissions; + permissions: CreateWorkspacePermissions; creatingWorkspace: boolean; onCancel: () => void; onSubmit: ( @@ -252,7 +252,7 @@ export const CreateWorkspacePageViewExperimental: FC<

General

- {permissions.createWorkspaceForUser + {permissions.createWorkspaceForAny ? "Only admins can create workspaces for other users." : "The name of your new workspace."}

@@ -299,7 +299,7 @@ export const CreateWorkspacePageViewExperimental: FC< - {permissions.createWorkspaceForUser && ( + {permissions.createWorkspaceForAny && (