Skip to content

Commit 571bb5e

Browse files
aslilacaslilac
committed
🧹
1 parent 46cb3c7 commit 571bb5e

File tree

4 files changed

+50
-37
lines changed

4 files changed

+50
-37
lines changed

‎site/src/pages/ManagementSettingsPage/GroupsPage/GroupSettingsPageView.tsx

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ import { useFormik } from "formik";
33
import type { FC } from "react";
44
import * as Yup from "yup";
55
import type { Group } from "api/typesGenerated";
6-
import { FormFooter } from "components/FormFooter/FormFooter";
7-
import { FullPageForm } from "components/FullPageForm/FullPageForm";
6+
import {
7+
FormFields,
8+
FormFooter,
9+
FormSection,
10+
HorizontalForm,
11+
} from "components/Form/Form";
812
import { IconField } from "components/IconField/IconField";
913
import { Loader } from "components/Loader/Loader";
10-
import { Margins } from "components/Margins/Margins";
11-
import { Stack } from "components/Stack/Stack";
1214
import {
1315
getFormHelpers,
1416
nameValidator,
@@ -56,9 +58,12 @@ const UpdateGroupForm: FC<UpdateGroupFormProps> = ({
5658
const getFieldHelpers = getFormHelpers<FormData>(form, errors);
5759

5860
return (
59-
<FullPageForm title="Group settings">
60-
<form onSubmit={form.handleSubmit}>
61-
<Stack spacing={2.5}>
61+
<HorizontalForm onSubmit={form.handleSubmit}>
62+
<FormSection
63+
title="Group settings"
64+
description="Set a name and avatar for this group."
65+
>
66+
<FormFields>
6267
<TextField
6368
{...getFieldHelpers("name")}
6469
onChange={onChangeTrimmed(form)}
@@ -89,6 +94,13 @@ const UpdateGroupForm: FC<UpdateGroupFormProps> = ({
8994
/>
9095
</>
9196
)}
97+
</FormFields>
98+
</FormSection>
99+
<FormSection
100+
title="Quota"
101+
description="You can use quotas to restrict how many resources a user can create."
102+
>
103+
<FormFields>
92104
<TextField
93105
{...getFieldHelpers("quota_allowance", {
94106
helperText: `This group gives ${form.values.quota_allowance} quota credits to each
@@ -100,11 +112,11 @@ const UpdateGroupForm: FC<UpdateGroupFormProps> = ({
100112
type="number"
101113
label="Quota Allowance"
102114
/>
103-
</Stack>
115+
</FormFields>
116+
</FormSection>
104117

105-
<FormFooter onCancel={onCancel} isLoading={isLoading} />
106-
</form>
107-
</FullPageForm>
118+
<FormFooter onCancel={onCancel} isLoading={isLoading} />
119+
</HorizontalForm>
108120
);
109121
};
110122

@@ -130,15 +142,13 @@ const GroupSettingsPageView: FC<SettingsGroupPageViewProps> = ({
130142
}
131143

132144
return (
133-
<Margins>
134-
<UpdateGroupForm
135-
group={group!}
136-
onCancel={onCancel}
137-
errors={formErrors}
138-
isLoading={isUpdating}
139-
onSubmit={onSubmit}
140-
/>
141-
</Margins>
145+
<UpdateGroupForm
146+
group={group!}
147+
onCancel={onCancel}
148+
errors={formErrors}
149+
isLoading={isUpdating}
150+
onSubmit={onSubmit}
151+
/>
142152
);
143153
};
144154

‎site/src/pages/ManagementSettingsPage/Sidebar.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ const DeploymentSettingsNavigation: FC = () => {
7878
Observability
7979
</SidebarNavSubItem>
8080
<SidebarNavSubItem href="/users">Users</SidebarNavSubItem>
81-
<SidebarNavSubItem href="/groups">Groups</SidebarNavSubItem>
8281
</Stack>
8382
)}
8483
</div>

‎site/src/pages/UsersPage/UsersLayout.tsx

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ import { TAB_PADDING_Y, TabLink, Tabs, TabsList } from "components/Tabs/Tabs";
1515
import { useAuthenticated } from "contexts/auth/RequireAuth";
1616
import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
1717
import { USERS_LINK } from "modules/navigation";
18+
import { useDashboard } from "modules/dashboard/useDashboard";
1819

1920
export const UsersLayout: FC = () => {
2021
const { permissions } = useAuthenticated();
22+
const { experiments } = useDashboard();
2123
const { createUser: canCreateUser, createGroup: canCreateGroup } =
2224
permissions;
2325
const navigate = useNavigate();
@@ -57,21 +59,23 @@ export const UsersLayout: FC = () => {
5759
</PageHeader>
5860
</Margins>
5961

60-
<Tabs
61-
css={{ marginBottom: 40, marginTop: -TAB_PADDING_Y }}
62-
active={activeTab}
63-
>
64-
<Margins>
65-
<TabsList>
66-
<TabLink to={USERS_LINK} value="users">
67-
Users
68-
</TabLink>
69-
<TabLink to="/groups" value="groups">
70-
Groups
71-
</TabLink>
72-
</TabsList>
73-
</Margins>
74-
</Tabs>
62+
{!experiments.includes("multi-organization") && (
63+
<Tabs
64+
css={{ marginBottom: 40, marginTop: -TAB_PADDING_Y }}
65+
active={activeTab}
66+
>
67+
<Margins>
68+
<TabsList>
69+
<TabLink to={USERS_LINK} value="users">
70+
Users
71+
</TabLink>
72+
<TabLink to="/groups" value="groups">
73+
Groups
74+
</TabLink>
75+
</TabsList>
76+
</Margins>
77+
</Tabs>
78+
)}
7579

7680
<Margins>
7781
<Suspense fallback={<Loader />}>

‎site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export const WorkspaceSettingsForm: FC<WorkspaceSettingsFormProps> = ({
7878
workspace.allow_renames
7979
? form.values.name !== form.initialValues.name &&
8080
"Depending on the template, renaming your workspace may be destructive"
81-
: "Renaming your workspace can be destructive and has not been enabled for this deployment."
81+
: "Renaming your workspace can be destructive and is disabled by the template."
8282
}
8383
/>
8484
</FormFields>

0 commit comments

Comments
 (0)