)}
@@ -338,12 +331,14 @@ export const CreateWorkspacePageViewExperimental: FC<
{externalAuth && externalAuth.length > 0 && (
-
- External Authentication
-
-
- This template uses external services for authentication.
-
+
+
+ External Authentication
+
+
+ This template uses external services for authentication.
+
+
{Boolean(error) && !hasAllRequiredExternalAuth && (
@@ -367,14 +362,14 @@ export const CreateWorkspacePageViewExperimental: FC<
{parameters.length > 0 && (
-
+
Parameters
These are the settings used by your template. Please note that
immutable parameters cannot be modified once the workspace is
created.
-
+
{presets.length > 0 && (
From 8bb2a1f381661b3d642c728bd4b4c9e4cc6a149a Mon Sep 17 00:00:00 2001
From: Jaayden Halko
Date: Thu, 3 Apr 2025 10:58:43 +0000
Subject: [PATCH 3/3] chore: more cleanup
---
.../CreateWorkspacePageExperimental.tsx | 9 ++++---
.../CreateWorkspacePageViewExperimental.tsx | 24 +++++++------------
2 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageExperimental.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageExperimental.tsx
index a2d654a45ccc2..cc843798b1d4c 100644
--- a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageExperimental.tsx
+++ b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageExperimental.tsx
@@ -17,6 +17,10 @@ import { Loader } from "components/Loader/Loader";
import { useAuthenticated } from "contexts/auth/RequireAuth";
import { useEffectEvent } from "hooks/hookPolyfills";
import { useDashboard } from "modules/dashboard/useDashboard";
+import {
+ type WorkspacePermissions,
+ workspacePermissionChecks,
+} from "modules/permissions/workspaces";
import { generateWorkspaceName } from "modules/workspaces/generateWorkspaceName";
import { type FC, useCallback, useEffect, useRef, useState } from "react";
import { Helmet } from "react-helmet-async";
@@ -26,7 +30,6 @@ import { pageTitle } from "utils/page";
import type { AutofillBuildParameter } from "utils/richParameters";
import { paramsUsedToCreateWorkspace } from "utils/workspace";
import { CreateWorkspacePageViewExperimental } from "./CreateWorkspacePageViewExperimental";
-import { type CreateWSPermissions, createWorkspaceChecks } from "./permissions";
export const createWorkspaceModes = ["form", "auto", "duplicate"] as const;
export type CreateWorkspaceMode = (typeof createWorkspaceModes)[number];
@@ -63,7 +66,7 @@ const CreateWorkspacePageExperimental: FC = () => {
const permissionsQuery = useQuery(
templateQuery.data
? checkAuthorization({
- checks: createWorkspaceChecks(templateQuery.data.organization_id),
+ checks: workspacePermissionChecks(templateQuery.data.organization_id),
})
: { enabled: false },
);
@@ -205,7 +208,7 @@ const CreateWorkspacePageExperimental: FC = () => {
externalAuthPollingState={externalAuthPollingState}
startPollingExternalAuth={startPollingExternalAuth}
hasAllRequiredExternalAuth={hasAllRequiredExternalAuth}
- permissions={permissionsQuery.data as CreateWSPermissions}
+ permissions={permissionsQuery.data as WorkspacePermissions}
parameters={realizedParameters as TemplateVersionParameter[]}
presets={templateVersionPresetsQuery.data ?? []}
creatingWorkspace={createWorkspaceMutation.isLoading}
diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx
index 839cad6468477..2eb58f515ec3c 100644
--- a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx
+++ b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx
@@ -1,6 +1,4 @@
import type { Interpolation, Theme } from "@emotion/react";
-import FormHelperText from "@mui/material/FormHelperText";
-import TextField from "@mui/material/TextField";
import type * as TypesGen from "api/typesGenerated";
import { Alert } from "components/Alert/Alert";
import { ErrorAlert } from "components/Alert/ErrorAlert";
@@ -8,7 +6,6 @@ import { Avatar } from "components/Avatar/Avatar";
import { Button } from "components/Button/Button";
import { FeatureStageBadge } from "components/FeatureStageBadge/FeatureStageBadge";
import { SelectFilter } from "components/Filter/SelectFilter";
-import { FormFields } from "components/Form/Form";
import { Input } from "components/Input/Input";
import { Label } from "components/Label/Label";
import { Pill } from "components/Pill/Pill";
@@ -18,6 +15,7 @@ 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,
@@ -44,7 +42,6 @@ import type {
ExternalAuthPollingState,
} from "./CreateWorkspacePage";
import { ExternalAuthButton } from "./ExternalAuthButton";
-import type { CreateWSPermissions } from "./permissions";
export const Language = {
duplicationWarning:
@@ -67,7 +64,7 @@ export interface CreateWorkspacePageViewExperimentalProps {
parameters: TypesGen.TemplateVersionParameter[];
autofillParameters: AutofillBuildParameter[];
presets: TypesGen.Preset[];
- permissions: CreateWSPermissions;
+ permissions: WorkspacePermissions;
creatingWorkspace: boolean;
onCancel: () => void;
onSubmit: (
@@ -211,13 +208,14 @@ export const CreateWorkspacePageViewExperimental: FC<
return (
<>
-
- Go Back
-
+ Go back
+