Skip to content

Commit 6443abc

Browse files
aslilacaslilac
committed
🧹
1 parent fe275f6 commit 6443abc

7 files changed

+14
-100
lines changed

‎site/src/pages/DeploySettingsPage/DeploySettingsLayout.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import { Margins } from "components/Margins/Margins";
88
import { Stack } from "components/Stack/Stack";
99
import { useAuthenticated } from "contexts/auth/RequireAuth";
1010
import { RequirePermission } from "contexts/auth/RequirePermission";
11-
import { Sidebar } from "../ManagementSettingsPage/Sidebar";
1211
import { useDashboard } from "modules/dashboard/useDashboard";
1312
import { ManagementSettingsLayout } from "pages/ManagementSettingsPage/ManagementSettingsLayout";
13+
import { Sidebar } from "../ManagementSettingsPage/Sidebar";
1414

1515
type DeploySettingsContextValue = {
1616
deploymentValues: DeploymentConfig;

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

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
1-
import { type FC } from "react";
1+
import type { FC } from "react";
22
import { useMutation, useQueryClient } from "react-query";
33
import { useNavigate } from "react-router-dom";
4-
import {
5-
createOrganization,
6-
updateOrganization,
7-
deleteOrganization,
8-
} from "api/queries/organizations";
4+
import { createOrganization } from "api/queries/organizations";
95
import { ErrorAlert } from "components/Alert/ErrorAlert";
106
import { displaySuccess } from "components/GlobalSnackbar/utils";
117
import { Stack } from "components/Stack/Stack";
12-
import { useOrganizationSettings } from "./ManagementSettingsLayout";
138
import { CreateOrganizationPageView } from "./CreateOrganizationPageView";
149

1510
const CreateOrganizationPage: FC = () => {

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

+2-45
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,22 @@
1-
import type { Interpolation, Theme } from "@emotion/react";
2-
import Button from "@mui/material/Button";
31
import TextField from "@mui/material/TextField";
42
import { useFormik } from "formik";
5-
import { type FC, useState } from "react";
6-
import { useMutation, useQueryClient } from "react-query";
3+
import type { FC } from "react";
74
import * as Yup from "yup";
8-
import {
9-
createOrganization,
10-
updateOrganization,
11-
deleteOrganization,
12-
} from "api/queries/organizations";
13-
import type {
14-
CreateOrganizationRequest,
15-
Organization,
16-
} from "api/typesGenerated";
17-
import { ErrorAlert } from "components/Alert/ErrorAlert";
5+
import type { CreateOrganizationRequest } from "api/typesGenerated";
186
import {
197
FormFields,
208
FormSection,
219
HorizontalForm,
2210
FormFooter,
2311
} from "components/Form/Form";
24-
import { displaySuccess } from "components/GlobalSnackbar/utils";
2512
import { IconField } from "components/IconField/IconField";
26-
import { Margins } from "components/Margins/Margins";
2713
import { PageHeader, PageHeaderTitle } from "components/PageHeader/PageHeader";
28-
import { Stack } from "components/Stack/Stack";
2914
import {
3015
getFormHelpers,
3116
nameValidator,
3217
displayNameValidator,
3318
onChangeTrimmed,
3419
} from "utils/formUtils";
35-
import { useOrganizationSettings } from "./ManagementSettingsLayout";
3620

3721
const MAX_DESCRIPTION_CHAR_LIMIT = 128;
3822
const MAX_DESCRIPTION_MESSAGE = `Please enter a description that is no longer than ${MAX_DESCRIPTION_CHAR_LIMIT} characters.`;
@@ -118,30 +102,3 @@ export const CreateOrganizationPageView: FC<
118102
</div>
119103
);
120104
};
121-
122-
const styles = {
123-
dangerButton: (theme) => ({
124-
"&.MuiButton-contained": {
125-
backgroundColor: theme.roles.danger.fill.solid,
126-
borderColor: theme.roles.danger.fill.outline,
127-
128-
"&:not(.MuiLoadingButton-loading)": {
129-
color: theme.roles.danger.fill.text,
130-
},
131-
132-
"&:hover:not(:disabled)": {
133-
backgroundColor: theme.roles.danger.hover.fill.solid,
134-
borderColor: theme.roles.danger.hover.fill.outline,
135-
},
136-
137-
"&.Mui-disabled": {
138-
backgroundColor: theme.roles.danger.disabled.background,
139-
borderColor: theme.roles.danger.disabled.outline,
140-
141-
"&:not(.MuiLoadingButton-loading)": {
142-
color: theme.roles.danger.disabled.fill.text,
143-
},
144-
},
145-
},
146-
}),
147-
} satisfies Record<string, Interpolation<Theme>>;

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { createContext, type FC, Suspense, useContext } from "react";
22
import { useQuery } from "react-query";
33
import { Outlet, useLocation, useParams } from "react-router-dom";
4+
import { deploymentConfig } from "api/queries/deployment";
45
import { myOrganizations } from "api/queries/users";
56
import type { Organization } from "api/typesGenerated";
67
import { Loader } from "components/Loader/Loader";
@@ -10,9 +11,8 @@ import { useAuthenticated } from "contexts/auth/RequireAuth";
1011
import { RequirePermission } from "contexts/auth/RequirePermission";
1112
import { useDashboard } from "modules/dashboard/useDashboard";
1213
import NotFoundPage from "pages/404Page/404Page";
13-
import { Sidebar } from "./Sidebar";
14-
import { deploymentConfig } from "api/queries/deployment";
1514
import { DeploySettingsContext } from "../DeploySettingsPage/DeploySettingsLayout";
15+
import { Sidebar } from "./Sidebar";
1616

1717
type OrganizationSettingsContextValue = {
1818
currentOrganizationId?: string;
@@ -43,8 +43,6 @@ export const ManagementSettingsLayout: FC = () => {
4343

4444
const multiOrgExperimentEnabled = experiments.includes("multi-organization");
4545

46-
console.log("oh jeez", organization);
47-
4846
const inOrganizationSettings =
4947
location.pathname.startsWith("/organizations") &&
5048
location.pathname !== "/organizations/new";

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

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import { type FC } from "react";
1+
import type { FC } from "react";
22
import { useMutation, useQueryClient } from "react-query";
33
import { useNavigate } from "react-router-dom";
44
import {
5-
createOrganization,
65
updateOrganization,
76
deleteOrganization,
87
} from "api/queries/organizations";
@@ -16,7 +15,6 @@ const OrganizationSettingsPage: FC = () => {
1615
const navigate = useNavigate();
1716

1817
const queryClient = useQueryClient();
19-
const addOrganizationMutation = useMutation(createOrganization(queryClient));
2018
const updateOrganizationMutation = useMutation(
2119
updateOrganization(queryClient),
2220
);
@@ -29,9 +27,7 @@ const OrganizationSettingsPage: FC = () => {
2927
const org = organizations.find((org) => org.id === currentOrganizationId);
3028

3129
const error =
32-
updateOrganizationMutation.error ??
33-
addOrganizationMutation.error ??
34-
deleteOrganizationMutation.error;
30+
updateOrganizationMutation.error ?? deleteOrganizationMutation.error;
3531

3632
if (!currentOrganizationId) {
3733
return null;
@@ -55,10 +51,6 @@ const OrganizationSettingsPage: FC = () => {
5551
});
5652
displaySuccess("Organization settings updated.");
5753
}}
58-
onCreateOrg={(name) => {
59-
addOrganizationMutation.mutate({ name });
60-
navigate(`/organizations/${name}`);
61-
}}
6254
onDeleteOrg={() => {
6355
deleteOrganizationMutation.mutate(org.id);
6456
navigate("/organizations");

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

+2-26
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,26 @@ import type { Interpolation, Theme } from "@emotion/react";
22
import Button from "@mui/material/Button";
33
import TextField from "@mui/material/TextField";
44
import { useFormik } from "formik";
5-
import { type FC, useState } from "react";
6-
import { useMutation, useQueryClient } from "react-query";
5+
import type { FC } from "react";
76
import * as Yup from "yup";
8-
import {
9-
createOrganization,
10-
updateOrganization,
11-
deleteOrganization,
12-
} from "api/queries/organizations";
137
import type {
148
Organization,
159
UpdateOrganizationRequest,
1610
} from "api/typesGenerated";
17-
import { ErrorAlert } from "components/Alert/ErrorAlert";
1811
import {
1912
FormFields,
2013
FormSection,
2114
HorizontalForm,
2215
FormFooter,
2316
} from "components/Form/Form";
24-
import { displaySuccess } from "components/GlobalSnackbar/utils";
2517
import { IconField } from "components/IconField/IconField";
26-
import { Margins } from "components/Margins/Margins";
2718
import { PageHeader, PageHeaderTitle } from "components/PageHeader/PageHeader";
28-
import { Stack } from "components/Stack/Stack";
2919
import {
3020
getFormHelpers,
3121
nameValidator,
3222
displayNameValidator,
3323
onChangeTrimmed,
3424
} from "utils/formUtils";
35-
import { useOrganizationSettings } from "./ManagementSettingsLayout";
3625

3726
const MAX_DESCRIPTION_CHAR_LIMIT = 128;
3827
const MAX_DESCRIPTION_MESSAGE = `Please enter a description that is no longer than ${MAX_DESCRIPTION_CHAR_LIMIT} characters.`;
@@ -51,13 +40,12 @@ interface OrganizationSettingsPageViewProps {
5140
error: unknown;
5241
onSubmit: (values: UpdateOrganizationRequest) => Promise<void>;
5342

54-
onCreateOrg: (name: string) => void;
5543
onDeleteOrg: () => void;
5644
}
5745

5846
export const OrganizationSettingsPageView: FC<
5947
OrganizationSettingsPageViewProps
60-
> = ({ org, error, onSubmit, onCreateOrg, onDeleteOrg }) => {
48+
> = ({ org, error, onSubmit, onDeleteOrg }) => {
6149
const form = useFormik<UpdateOrganizationRequest>({
6250
initialValues: {
6351
name: org.name,
@@ -71,8 +59,6 @@ export const OrganizationSettingsPageView: FC<
7159
});
7260
const getFieldHelpers = getFormHelpers(form, error);
7361

74-
const [newOrgName, setNewOrgName] = useState("");
75-
7662
return (
7763
<div>
7864
<PageHeader>
@@ -132,16 +118,6 @@ export const OrganizationSettingsPageView: FC<
132118
Delete this organization
133119
</Button>
134120
)}
135-
136-
<Stack css={{ marginTop: 128 }}>
137-
<TextField
138-
label="New organization name"
139-
onChange={(event) => setNewOrgName(event.target.value)}
140-
/>
141-
<Button onClick={() => onCreateOrg(newOrgName)}>
142-
Create new organization
143-
</Button>
144-
</Stack>
145121
</div>
146122
);
147123
};

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

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import { cx } from "@emotion/css";
2+
import AddIcon from "@mui/icons-material/Add";
3+
import SettingsIcon from "@mui/icons-material/Settings";
24
import type { FC, ReactNode } from "react";
35
import { Link, NavLink, useLocation } from "react-router-dom";
46
import type { Organization } from "api/typesGenerated";
@@ -7,8 +9,6 @@ import { Stack } from "components/Stack/Stack";
79
import { UserAvatar } from "components/UserAvatar/UserAvatar";
810
import { type ClassName, useClassName } from "hooks/useClassName";
911
import { useOrganizationSettings } from "./ManagementSettingsLayout";
10-
import SettingsIcon from "@mui/icons-material/Settings";
11-
import AddIcon from "@mui/icons-material/Add";
1212

1313
export const Sidebar: FC = () => {
1414
const { currentOrganizationId, organizations } = useOrganizationSettings();
@@ -47,11 +47,7 @@ export const Sidebar: FC = () => {
4747
);
4848
};
4949

50-
interface DeploymentSettingsNavigationProps {}
51-
52-
const DeploymentSettingsNavigation: FC<
53-
DeploymentSettingsNavigationProps
54-
> = ({}) => {
50+
const DeploymentSettingsNavigation: FC = () => {
5551
const location = useLocation();
5652
const active = location.pathname.startsWith("/deployment");
5753

0 commit comments

Comments
 (0)