Skip to content

Commit fadea32

Browse files
aslilacaslilac
committed
🧹
1 parent d7f5bac commit fadea32

File tree

12 files changed

+18
-49
lines changed

12 files changed

+18
-49
lines changed

‎site/src/App.tsx

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
useEffect,
88
useState,
99
} from "react";
10-
import { HelmetProvider } from "react-helmet-async";
1110
import { QueryClient, QueryClientProvider } from "react-query";
1211
import { RouterProvider } from "react-router";
1312
import { GlobalSnackbar } from "./components/GlobalSnackbar/GlobalSnackbar";
@@ -63,17 +62,15 @@ export const AppProviders: FC<AppProvidersProps> = ({
6362
}, []);
6463

6564
return (
66-
<HelmetProvider>
67-
<QueryClientProvider client={queryClient}>
68-
<AuthProvider>
69-
<ThemeProvider>
70-
{children}
71-
<GlobalSnackbar />
72-
</ThemeProvider>
73-
</AuthProvider>
74-
{showDevtools && <ReactQueryDevtools initialIsOpen={showDevtools} />}
75-
</QueryClientProvider>
76-
</HelmetProvider>
65+
<QueryClientProvider client={queryClient}>
66+
<AuthProvider>
67+
<ThemeProvider>
68+
{children}
69+
<GlobalSnackbar />
70+
</ThemeProvider>
71+
</AuthProvider>
72+
{showDevtools && <ReactQueryDevtools initialIsOpen={showDevtools} />}
73+
</QueryClientProvider>
7774
);
7875
};
7976

‎site/src/components/ErrorBoundary/GlobalErrorBoundary.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { Meta, StoryObj } from "@storybook/react";
22
import { expect, userEvent } from "@storybook/test";
33
import { within } from "@testing-library/react";
4-
import type { ErrorResponse } from "react-router-dom";
4+
import type { ErrorResponse } from "react-router";
55
import { GlobalErrorBoundaryInner } from "./GlobalErrorBoundary";
66

77
/**

‎site/src/components/ErrorBoundary/GlobalErrorBoundary.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ import { Button } from "components/Button/Button";
33
import { CoderIcon } from "components/Icons/CoderIcon";
44
import { useEmbeddedMetadata } from "hooks/useEmbeddedMetadata";
55
import { type FC, useState } from "react";
6-
import { Helmet } from "react-helmet-async";
76
import {
87
type ErrorResponse,
98
isRouteErrorResponse,
109
useLocation,
1110
useRouteError,
12-
} from "react-router-dom";
11+
} from "react-router";
1312

1413
const errorPageTitle = "Something went wrong";
1514

@@ -34,9 +33,7 @@ export const GlobalErrorBoundaryInner: FC<GlobalErrorBoundaryInnerProps> = ({
3433

3534
return (
3635
<div className="bg-surface-primary text-center w-full h-full flex justify-center items-center">
37-
<Helmet>
38-
<title>{errorPageTitle}</title>
39-
</Helmet>
36+
<title>{errorPageTitle}</title>
4037

4138
<main className="flex gap-6 w-full max-w-prose p-4 flex-col flex-nowrap">
4239
<div className="flex gap-2 flex-col items-center">

‎site/src/components/Sidebar/Sidebar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type { CSSObject, Interpolation, Theme } from "@emotion/react";
33
import { Stack } from "components/Stack/Stack";
44
import { type ClassName, useClassName } from "hooks/useClassName";
55
import type { ElementType, FC, ReactNode } from "react";
6-
import { Link, NavLink } from "react-router-dom";
6+
import { Link, NavLink } from "react-router";
77
import { cn } from "utils/cn";
88

99
interface SidebarProps {

‎site/src/modules/dashboard/Navbar/MobileMenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
XIcon,
2525
} from "lucide-react";
2626
import { type FC, useState } from "react";
27-
import { Link } from "react-router-dom";
27+
import { Link } from "react-router";
2828
import { cn } from "utils/cn";
2929
import { sortProxiesByLatency } from "./proxyUtils";
3030

‎site/src/modules/management/DeploymentSettingsLayout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { Loader } from "components/Loader/Loader";
99
import { useAuthenticated } from "contexts/auth/RequireAuth";
1010
import { RequirePermission } from "contexts/auth/RequirePermission";
1111
import { type FC, Suspense } from "react";
12-
import { Outlet } from "react-router-dom";
12+
import { Outlet } from "react-router";
1313
import { DeploymentSidebar } from "./DeploymentSidebar";
1414

1515
const DeploymentSettingsLayout: FC = () => {

‎site/src/modules/management/OrganizationSettingsLayout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { useAuthenticated } from "contexts/auth/RequireAuth";
1414
import { RequirePermission } from "contexts/auth/RequirePermission";
1515
import { useDashboard } from "modules/dashboard/useDashboard";
1616
import { type FC, Suspense, createContext, useContext } from "react";
17-
import { Outlet, useParams } from "react-router-dom";
17+
import { Outlet, useParams } from "react-router";
1818
import { OrganizationSidebar } from "./OrganizationSidebar";
1919

2020
export const OrganizationSettingsContext = createContext<

‎site/src/pages/ManagementSettingsPage/CustomRolesPage/CustomRolesPageView.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { type Interpolation, type Theme, useTheme } from "@emotion/react";
1+
import type { Interpolation, Theme } from "@emotion/react";
22
import AddIcon from "@mui/icons-material/AddOutlined";
33
import AddOutlined from "@mui/icons-material/AddOutlined";
44
import Button from "@mui/material/Button";
@@ -45,7 +45,6 @@ export const CustomRolesPageView: FC<CustomRolesPageViewProps> = ({
4545
canAssignOrgRole,
4646
isCustomRolesEnabled,
4747
}) => {
48-
const theme = useTheme();
4948
return (
5049
<Stack spacing={4}>
5150
{!isCustomRolesEnabled && (

‎site/src/pages/TemplatePage/TemplatePageHeader.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ export const TemplatePageHeader: FC<TemplatePageHeaderProps> = ({
168168
onDeleteTemplate,
169169
}) => {
170170
const getLink = useLinks();
171-
const hasIcon = template.icon && template.icon !== "";
172171
const templateLink = getLink(
173172
linkToTemplate(template.organization_name, template.name),
174173
);

‎site/src/pages/TemplatesPage/TemplatesPageView.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ const TemplateRow: FC<TemplateRowProps> = ({ showOrganizations, template }) => {
9494
const templatePageLink = getLink(
9595
linkToTemplate(template.organization_name, template.name),
9696
);
97-
const hasIcon = template.icon && template.icon !== "";
9897
const navigate = useNavigate();
9998

10099
const { css: clickableCss, ...clickableRow } = useClickableTableRow({

‎site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { useTheme } from "@emotion/react";
22
import AutorenewIcon from "@mui/icons-material/Autorenew";
33
import LoadingButton from "@mui/lab/LoadingButton";
4-
import Badge from "@mui/material/Badge";
54
import Divider from "@mui/material/Divider";
65
import Table from "@mui/material/Table";
76
import TableBody from "@mui/material/TableBody";
@@ -10,8 +9,6 @@ import TableContainer from "@mui/material/TableContainer";
109
import TableHead from "@mui/material/TableHead";
1110
import TableRow from "@mui/material/TableRow";
1211
import Tooltip from "@mui/material/Tooltip";
13-
// biome-ignore lint/nursery/noRestrictedImports: styled
14-
import { styled } from "@mui/material/styles";
1512
import visuallyHidden from "@mui/utils/visuallyHidden";
1613
import { externalAuthProvider } from "api/queries/externalAuth";
1714
import type {
@@ -110,25 +107,6 @@ interface ExternalAuthRowProps {
110107
onValidateExternalAuth: () => void;
111108
}
112109

113-
const StyledBadge = styled(Badge)(({ theme }) => ({
114-
"& .MuiBadge-badge": {
115-
// Make a circular background for the icon. Background provides contrast, with a thin
116-
// border to separate it from the avatar image.
117-
backgroundColor: `${theme.palette.background.paper}`,
118-
borderStyle: "solid",
119-
borderColor: `${theme.palette.secondary.main}`,
120-
borderWidth: "thin",
121-
122-
// Override the default minimum sizes, as they are larger than what we want.
123-
minHeight: "0px",
124-
minWidth: "0px",
125-
// Override the default "height", which is usually set to some constant value.
126-
height: "auto",
127-
// Padding adds some room for the icon to live in.
128-
padding: "0.1em",
129-
},
130-
}));
131-
132110
const ExternalAuthRow: FC<ExternalAuthRowProps> = ({
133111
app,
134112
unlinked,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ interface SidebarProps {
2222
}
2323

2424
export const Sidebar: FC<SidebarProps> = ({ user }) => {
25-
const { entitlements, experiments } = useDashboard();
25+
const { entitlements } = useDashboard();
2626
const showSchedulePage =
2727
entitlements.features.advanced_template_scheduling.enabled;
2828

0 commit comments

Comments
 (0)