Skip to content

Commit 8bb2a1f

Browse files
jaaydenhjaaydenh
committed
chore: more cleanup
1 parent 807458e commit 8bb2a1f

File tree

2 files changed

+15
-18
lines changed

2 files changed

+15
-18
lines changed

‎site/src/pages/CreateWorkspacePage/CreateWorkspacePageExperimental.tsx

+6-3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ import { Loader } from "components/Loader/Loader";
1717
import { useAuthenticated } from "contexts/auth/RequireAuth";
1818
import { useEffectEvent } from "hooks/hookPolyfills";
1919
import { useDashboard } from "modules/dashboard/useDashboard";
20+
import {
21+
type WorkspacePermissions,
22+
workspacePermissionChecks,
23+
} from "modules/permissions/workspaces";
2024
import { generateWorkspaceName } from "modules/workspaces/generateWorkspaceName";
2125
import { type FC, useCallback, useEffect, useRef, useState } from "react";
2226
import { Helmet } from "react-helmet-async";
@@ -26,7 +30,6 @@ import { pageTitle } from "utils/page";
2630
import type { AutofillBuildParameter } from "utils/richParameters";
2731
import { paramsUsedToCreateWorkspace } from "utils/workspace";
2832
import { CreateWorkspacePageViewExperimental } from "./CreateWorkspacePageViewExperimental";
29-
import { type CreateWSPermissions, createWorkspaceChecks } from "./permissions";
3033
export const createWorkspaceModes = ["form", "auto", "duplicate"] as const;
3134
export type CreateWorkspaceMode = (typeof createWorkspaceModes)[number];
3235

@@ -63,7 +66,7 @@ const CreateWorkspacePageExperimental: FC = () => {
6366
const permissionsQuery = useQuery(
6467
templateQuery.data
6568
? checkAuthorization({
66-
checks: createWorkspaceChecks(templateQuery.data.organization_id),
69+
checks: workspacePermissionChecks(templateQuery.data.organization_id),
6770
})
6871
: { enabled: false },
6972
);
@@ -205,7 +208,7 @@ const CreateWorkspacePageExperimental: FC = () => {
205208
externalAuthPollingState={externalAuthPollingState}
206209
startPollingExternalAuth={startPollingExternalAuth}
207210
hasAllRequiredExternalAuth={hasAllRequiredExternalAuth}
208-
permissions={permissionsQuery.data as CreateWSPermissions}
211+
permissions={permissionsQuery.data as WorkspacePermissions}
209212
parameters={realizedParameters as TemplateVersionParameter[]}
210213
presets={templateVersionPresetsQuery.data ?? []}
211214
creatingWorkspace={createWorkspaceMutation.isLoading}

‎site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx

+9-15
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
import type { Interpolation, Theme } from "@emotion/react";
2-
import FormHelperText from "@mui/material/FormHelperText";
3-
import TextField from "@mui/material/TextField";
42
import type * as TypesGen from "api/typesGenerated";
53
import { Alert } from "components/Alert/Alert";
64
import { ErrorAlert } from "components/Alert/ErrorAlert";
75
import { Avatar } from "components/Avatar/Avatar";
86
import { Button } from "components/Button/Button";
97
import { FeatureStageBadge } from "components/FeatureStageBadge/FeatureStageBadge";
108
import { SelectFilter } from "components/Filter/SelectFilter";
11-
import { FormFields } from "components/Form/Form";
129
import { Input } from "components/Input/Input";
1310
import { Label } from "components/Label/Label";
1411
import { Pill } from "components/Pill/Pill";
@@ -18,6 +15,7 @@ import { Stack } from "components/Stack/Stack";
1815
import { UserAutocomplete } from "components/UserAutocomplete/UserAutocomplete";
1916
import { type FormikContextType, useFormik } from "formik";
2017
import { ArrowLeft } from "lucide-react";
18+
import type { WorkspacePermissions } from "modules/permissions/workspaces";
2119
import { generateWorkspaceName } from "modules/workspaces/generateWorkspaceName";
2220
import {
2321
type FC,
@@ -44,7 +42,6 @@ import type {
4442
ExternalAuthPollingState,
4543
} from "./CreateWorkspacePage";
4644
import { ExternalAuthButton } from "./ExternalAuthButton";
47-
import type { CreateWSPermissions } from "./permissions";
4845

4946
export const Language = {
5047
duplicationWarning:
@@ -67,7 +64,7 @@ export interface CreateWorkspacePageViewExperimentalProps {
6764
parameters: TypesGen.TemplateVersionParameter[];
6865
autofillParameters: AutofillBuildParameter[];
6966
presets: TypesGen.Preset[];
70-
permissions: CreateWSPermissions;
67+
permissions: WorkspacePermissions;
7168
creatingWorkspace: boolean;
7269
onCancel: () => void;
7370
onSubmit: (
@@ -211,13 +208,14 @@ export const CreateWorkspacePageViewExperimental: FC<
211208
return (
212209
<>
213210
<div className="absolute sticky top-5 ml-10">
214-
<Link
215-
to="/organizations"
216-
className="flex flex-row items-center gap-2 no-underline text-content-secondary hover:text-content-primary translate-y-12"
211+
<button
212+
onClick={onCancel}
213+
type="button"
214+
className="flex items-center gap-2 bg-transparent border-none text-content-secondary hover:text-content-primary translate-y-12"
217215
>
218216
<ArrowLeft size={20} />
219-
Go Back
220-
</Link>
217+
Go back
218+
</button>
221219
</div>
222220
<div className="flex flex-col gap-6 max-w-screen-sm mx-auto">
223221
<header className="flex flex-col gap-2 mt-10">
@@ -271,11 +269,7 @@ export const CreateWorkspacePageViewExperimental: FC<
271269
<Label className="text-sm" htmlFor={`${id}-version-id`}>
272270
Version ID
273271
</Label>
274-
<Input
275-
id={`${id}-version-id`}
276-
value={versionId}
277-
disabled
278-
/>
272+
<Input id={`${id}-version-id`} value={versionId} disabled />
279273
<span className="text-xs text-content-secondary">
280274
This parameter has been preset, and cannot be modified.
281275
</span>

0 commit comments

Comments
 (0)