Skip to content

Commit 17a890d

Browse files
aslilacaslilac
committed
🧹
1 parent 0f9de62 commit 17a890d

File tree

6 files changed

+16
-33
lines changed

6 files changed

+16
-33
lines changed

‎clock/mock.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ func (t *Trap) Close() {
532532
close(t.done)
533533
}
534534

535-
var ErrTrapClosed = errors.New("trap closed")
535+
var ErrTrapClosed = xerrors.New("trap closed")
536536

537537
func (t *Trap) Wait(ctx context.Context) (*Call, error) {
538538
select {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ import { createContext, type FC, Suspense, useContext } from "react";
22
import { useQuery } from "react-query";
33
import { Outlet, useParams } from "react-router-dom";
44
import { myOrganizations } from "api/queries/users";
5-
import { Organization } from "api/typesGenerated";
5+
import type { Organization } from "api/typesGenerated";
66
import { Loader } from "components/Loader/Loader";
77
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 "./Sidebar";
1211
import { useDashboard } from "modules/dashboard/useDashboard";
1312
import NotFoundPage from "pages/404Page/404Page";
13+
import { Sidebar } from "./Sidebar";
1414

1515
type OrganizationSettingsContextValue = {
1616
currentOrganizationId: string;

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,29 @@ import TextField from "@mui/material/TextField";
44
import { useFormik } from "formik";
55
import { type FC, useState } from "react";
66
import { useMutation, useQueryClient } from "react-query";
7+
import * as Yup from "yup";
78
import {
89
createOrganization,
910
updateOrganization,
1011
deleteOrganization,
1112
} from "api/queries/organizations";
13+
import type { UpdateOrganizationRequest } from "api/typesGenerated";
1214
import { ErrorAlert } from "components/Alert/ErrorAlert";
15+
import {
16+
FormFields,
17+
FormSection,
18+
HorizontalForm,
19+
FormFooter,
20+
} from "components/Form/Form";
1321
import { Margins } from "components/Margins/Margins";
14-
import { useOrganizationSettings } from "./OrganizationSettingsLayout";
1522
import { PageHeader, PageHeaderTitle } from "components/PageHeader/PageHeader";
1623
import {
1724
getFormHelpers,
1825
nameValidator,
1926
displayNameValidator,
2027
onChangeTrimmed,
2128
} from "utils/formUtils";
22-
import { UpdateOrganizationRequest } from "api/typesGenerated";
23-
import {
24-
FormFields,
25-
FormSection,
26-
HorizontalForm,
27-
FormFooter,
28-
} from "components/Form/Form";
29-
import * as Yup from "yup";
29+
import { useOrganizationSettings } from "./OrganizationSettingsLayout";
3030

3131
const MAX_DESCRIPTION_CHAR_LIMIT = 128;
3232
const MAX_DESCRIPTION_MESSAGE =

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { type FC } from "react";
1+
import type { FC } from "react";
22
import { useMutation, useQueryClient } from "react-query";
33
import {
44
createOrganization,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { cx } from "@emotion/css";
22
import GeneralIcon from "@mui/icons-material/SettingsOutlined";
33
import type { ElementType, FC, ReactNode } from "react";
4-
import { Link, NavLink } from "react-router-dom";
4+
import { NavLink } from "react-router-dom";
55
import type { Organization } from "api/typesGenerated";
66
import { Sidebar as BaseSidebar } from "components/Sidebar/Sidebar";
77
import { Stack } from "components/Stack/Stack";

‎site/src/pages/UserSettingsPage/AccountPage/AccountPage.tsx

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
import Button from "@mui/material/Button";
2-
import { type FC, useEffect, useState } from "react";
1+
import type { FC } from "react";
32
import { useQuery } from "react-query";
43
import { groupsForUser } from "api/queries/groups";
5-
import { DisabledBadge, EnabledBadge } from "components/Badges/Badges";
64
import { Stack } from "components/Stack/Stack";
75
import { useAuthContext } from "contexts/auth/AuthProvider";
86
import { useAuthenticated } from "contexts/auth/RequireAuth";
@@ -15,29 +13,14 @@ export const AccountPage: FC = () => {
1513
const { permissions, user: me } = useAuthenticated();
1614
const { updateProfile, updateProfileError, isUpdatingProfile } =
1715
useAuthContext();
18-
const { entitlements, experiments, organizationId } = useDashboard();
16+
const { entitlements, organizationId } = useDashboard();
1917

2018
const hasGroupsFeature = entitlements.features.user_role_management.enabled;
2119
const groupsQuery = useQuery({
2220
...groupsForUser(organizationId, me.id),
2321
enabled: hasGroupsFeature,
2422
});
2523

26-
const multiOrgExperimentEnabled = experiments.includes("multi-organization");
27-
const [multiOrgUiEnabled, setMultiOrgUiEnabled] = useState(
28-
() =>
29-
multiOrgExperimentEnabled &&
30-
Boolean(localStorage.getItem("enableMultiOrganizationUi")),
31-
);
32-
33-
useEffect(() => {
34-
if (multiOrgUiEnabled) {
35-
localStorage.setItem("enableMultiOrganizationUi", "true");
36-
} else {
37-
localStorage.removeItem("enableMultiOrganizationUi");
38-
}
39-
}, [multiOrgUiEnabled]);
40-
4124
return (
4225
<Stack spacing={6}>
4326
<Section title="Account" description="Update your account info">

0 commit comments

Comments
 (0)