Skip to content

fix(site): hide ws proxy on menu when disabled #11101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 8, 2023
Merged

fix(site): hide ws proxy on menu when disabled #11101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
342a57b
fix(site): do not show ws proxy on menu if it is not enabled
BrunoQuaresma Dec 8, 2023
a4726db
Fix storybook and visible filter
BrunoQuaresma Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 5 additions & 24 deletions site/src/pages/HealthPage/AccessURLPage.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,13 @@
import { StoryObj, Meta } from "@storybook/react";
import { AccessURLPage } from "./AccessURLPage";
import { HealthLayout } from "./HealthLayout";
import {
reactRouterOutlet,
reactRouterParameters,
} from "storybook-addon-react-router-v6";
import { useQueryClient } from "react-query";
import { MockHealth } from "testHelpers/entities";
import { generateMeta } from "./storybook";

const meta: Meta = {
title: "pages/Health/AccessURL",
render: HealthLayout,
parameters: {
layout: "fullscreen",
reactRouter: reactRouterParameters({
routing: reactRouterOutlet(
{ path: "/health/access-url" },
<AccessURLPage />,
),
}),
},
decorators: [
(Story) => {
const queryClient = useQueryClient();
queryClient.setQueryData(["health"], MockHealth);
return <Story />;
},
],
...generateMeta({
path: "/health/access-url",
element: <AccessURLPage />,
}),
};

export default meta;
Expand Down
26 changes: 5 additions & 21 deletions site/src/pages/HealthPage/DERPPage.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,13 @@
import { StoryObj, Meta } from "@storybook/react";
import { DERPPage } from "./DERPPage";
import { HealthLayout } from "./HealthLayout";
import {
reactRouterOutlet,
reactRouterParameters,
} from "storybook-addon-react-router-v6";
import { useQueryClient } from "react-query";
import { MockHealth } from "testHelpers/entities";
import { generateMeta } from "./storybook";

const meta: Meta = {
title: "pages/Health/DERP",
render: HealthLayout,
parameters: {
layout: "fullscreen",
reactRouter: reactRouterParameters({
routing: reactRouterOutlet({ path: "/health/derp" }, <DERPPage />),
}),
},
decorators: [
(Story) => {
const queryClient = useQueryClient();
queryClient.setQueryData(["health"], MockHealth);
return <Story />;
},
],
...generateMeta({
path: "/health/derp",
element: <DERPPage />,
}),
};

export default meta;
Expand Down
30 changes: 6 additions & 24 deletions site/src/pages/HealthPage/DERPRegionPage.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,18 @@
import { StoryObj, Meta } from "@storybook/react";
import { DERPRegionPage } from "./DERPRegionPage";
import { HealthLayout } from "./HealthLayout";
import {
reactRouterOutlet,
reactRouterParameters,
} from "storybook-addon-react-router-v6";
import { useQueryClient } from "react-query";
import { MockHealth } from "testHelpers/entities";
import { generateMeta } from "./storybook";

const firstRegionId = Object.values(MockHealth.derp.regions)[0].region
?.RegionID;

const meta: Meta = {
title: "pages/Health/DERPRegion",
render: HealthLayout,
parameters: {
layout: "fullscreen",
reactRouter: reactRouterParameters({
location: { pathParams: { regionId: firstRegionId } },
routing: reactRouterOutlet(
{ path: `/health/derp/regions/:regionId` },
<DERPRegionPage />,
),
}),
},
decorators: [
(Story) => {
const queryClient = useQueryClient();
queryClient.setQueryData(["health"], MockHealth);
return <Story />;
},
],
...generateMeta({
path: "/health/derp/regions/:regionId",
element: <DERPRegionPage />,
params: { regionId: firstRegionId },
}),
};

export default meta;
Expand Down
29 changes: 5 additions & 24 deletions site/src/pages/HealthPage/DatabasePage.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,13 @@
import { StoryObj, Meta } from "@storybook/react";
import { DatabasePage } from "./DatabasePage";
import { HealthLayout } from "./HealthLayout";
import {
reactRouterOutlet,
reactRouterParameters,
} from "storybook-addon-react-router-v6";
import { useQueryClient } from "react-query";
import { MockHealth } from "testHelpers/entities";
import { generateMeta } from "./storybook";

const meta: Meta = {
title: "pages/Health/Database",
render: HealthLayout,
parameters: {
layout: "fullscreen",
reactRouter: reactRouterParameters({
routing: reactRouterOutlet(
{ path: "/health/database" },
<DatabasePage />,
),
}),
},
decorators: [
(Story) => {
const queryClient = useQueryClient();
queryClient.setQueryData(["health"], MockHealth);
return <Story />;
},
],
...generateMeta({
path: "/health/database",
element: <DatabasePage />,
}),
};

export default meta;
Expand Down
61 changes: 42 additions & 19 deletions site/src/pages/HealthPage/HealthLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,16 @@ import Tooltip from "@mui/material/Tooltip";
import CircularProgress from "@mui/material/CircularProgress";
import { NavLink, Outlet } from "react-router-dom";
import { css } from "@emotion/css";
import { kebabCase } from "lodash/fp";
import kebabCase from "lodash/fp/kebabCase";
import { Suspense } from "react";
import { HealthIcon } from "./Content";
import { HealthSeverity } from "api/typesGenerated";
import NotificationsOffOutlined from "@mui/icons-material/NotificationsOffOutlined";

const sections = {
derp: "DERP",
access_url: "Access URL",
websocket: "Websocket",
database: "Database",
workspace_proxy: "Workspace Proxy",
} as const;
import { useDashboard } from "components/Dashboard/DashboardProvider";

export function HealthLayout() {
const theme = useTheme();
const dashboard = useDashboard();
const queryClient = useQueryClient();
const { data: healthStatus } = useQuery({
...health(),
Expand All @@ -36,6 +30,16 @@ export function HealthLayout() {
const { mutate: forceRefresh, isLoading: isRefreshing } = useMutation(
refreshHealth(queryClient),
);
const sections = {
derp: "DERP",
access_url: "Access URL",
websocket: "Websocket",
database: "Database",
workspace_proxy: dashboard.experiments.includes("moons")
? "Workspace Proxy"
: undefined,
} as const;
const visibleSections = filterVisibleSections(sections);

return (
<>
Expand Down Expand Up @@ -106,13 +110,13 @@ export function HealthLayout() {
}}
>
{healthStatus.healthy
? Object.keys(sections).some(
(key) =>
healthStatus[key as keyof typeof sections]
.warnings !== null &&
healthStatus[key as keyof typeof sections].warnings
.length > 0,
)
? Object.keys(visibleSections).some((key) => {
const section =
healthStatus[key as keyof typeof visibleSections];
return (
section.warnings && section.warnings.length > 0
);
})
? "All systems operational, but performance might be degraded"
: "All systems operational"
: "Some issues have been detected"}
Expand Down Expand Up @@ -145,12 +149,13 @@ export function HealthLayout() {
</div>

<nav css={{ display: "flex", flexDirection: "column", gap: 1 }}>
{Object.keys(sections)
{Object.keys(visibleSections)
.sort()
.map((key) => {
const label = sections[key as keyof typeof sections];
const label =
visibleSections[key as keyof typeof visibleSections];
const healthSection =
healthStatus[key as keyof typeof sections];
healthStatus[key as keyof typeof visibleSections];

return (
<NavLink
Expand Down Expand Up @@ -218,3 +223,21 @@ export function HealthLayout() {
</>
);
}

const filterVisibleSections = <T extends object>(sections: T) => {
return Object.keys(sections).reduce(
(visible, sectionName) => {
const sectionValue = sections[sectionName as keyof typeof sections];

if (!sectionValue) {
return visible;
}

return {
...visible,
[sectionName]: sectionValue,
};
},
{} as Partial<typeof sections>,
);
};
29 changes: 5 additions & 24 deletions site/src/pages/HealthPage/WebsocketPage.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,13 @@
import { StoryObj, Meta } from "@storybook/react";
import { WebsocketPage } from "./WebsocketPage";
import { HealthLayout } from "./HealthLayout";
import {
reactRouterOutlet,
reactRouterParameters,
} from "storybook-addon-react-router-v6";
import { useQueryClient } from "react-query";
import { MockHealth } from "testHelpers/entities";
import { generateMeta } from "./storybook";

const meta: Meta = {
title: "pages/Health/Websocket",
render: HealthLayout,
parameters: {
layout: "fullscreen",
reactRouter: reactRouterParameters({
routing: reactRouterOutlet(
{ path: "/health/derp/websocket" },
<WebsocketPage />,
),
}),
},
decorators: [
(Story) => {
const queryClient = useQueryClient();
queryClient.setQueryData(["health"], MockHealth);
return <Story />;
},
],
...generateMeta({
path: "/health/websocket",
element: <WebsocketPage />,
}),
};

export default meta;
Expand Down
29 changes: 5 additions & 24 deletions site/src/pages/HealthPage/WebsocketProxyPage.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,13 @@
import { StoryObj, Meta } from "@storybook/react";
import { WorkspaceProxyPage } from "./WorkspaceProxyPage";
import { HealthLayout } from "./HealthLayout";
import {
reactRouterOutlet,
reactRouterParameters,
} from "storybook-addon-react-router-v6";
import { useQueryClient } from "react-query";
import { MockHealth } from "testHelpers/entities";
import { generateMeta } from "./storybook";

const meta: Meta = {
title: "pages/Health/WorkspaceProxy",
render: HealthLayout,
parameters: {
layout: "fullscreen",
reactRouter: reactRouterParameters({
routing: reactRouterOutlet(
{ path: "/health/workspace-proxy" },
<WorkspaceProxyPage />,
),
}),
},
decorators: [
(Story) => {
const queryClient = useQueryClient();
queryClient.setQueryData(["health"], MockHealth);
return <Story />;
},
],
...generateMeta({
path: "/health/workspace-proxy",
element: <WorkspaceProxyPage />,
}),
};

export default meta;
Expand Down
30 changes: 27 additions & 3 deletions site/src/pages/HealthPage/storybook.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,32 @@ import {
reactRouterOutlet,
RouteDefinition,
} from "storybook-addon-react-router-v6";
import { MockHealth, MockHealthSettings } from "testHelpers/entities";
import {
MockBuildInfo,
MockEntitlements,
MockExperiments,
MockHealth,
MockHealthSettings,
} from "testHelpers/entities";
import { Meta } from "@storybook/react";
import { HEALTH_QUERY_KEY, HEALTH_QUERY_SETTINGS_KEY } from "api/queries/debug";
import { DashboardProvider } from "components/Dashboard/DashboardProvider";
import { HealthLayout } from "./HealthLayout";

type MetaOptions = {
element: RouteDefinition;
path: string;
params?: Record<string, string>;
};

export const generateMeta = ({ element, path }: MetaOptions): Meta => {
export const generateMeta = ({ element, path, params }: MetaOptions): Meta => {
return {
render: HealthLayout,
parameters: {
layout: "fullscreen",
reactRouter: reactRouterParameters({
routing: reactRouterOutlet({ path: `/health/${path}` }, element),
location: { pathParams: params },
routing: reactRouterOutlet({ path }, element),
}),
},
decorators: [
Expand All @@ -28,6 +39,19 @@ export const generateMeta = ({ element, path }: MetaOptions): Meta => {
queryClient.setQueryData(HEALTH_QUERY_SETTINGS_KEY, MockHealthSettings);
return <Story />;
},
(Story) => {
const queryClient = useQueryClient();
queryClient.setQueryData(["buildInfo"], MockBuildInfo);
queryClient.setQueryData(["entitlements"], MockEntitlements);
queryClient.setQueryData(["experiments"], MockExperiments);
queryClient.setQueryData(["appearance"], MockExperiments);

return (
<DashboardProvider>
<Story />
</DashboardProvider>
);
},
],
};
};