8000 chore: add proxy provider decorator for storybook by BrunoQuaresma · Pull Request #18023 · coder/coder · GitHub
[go: up one dir, main page]

Skip to content
8000

chore: add proxy provider decorator for storybook #18023

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.

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 1 commit into from
May 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
67 changes: 14 additions & 53 deletions site/src/modules/resources/AgentRow.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import type { Meta, StoryObj } from "@storybook/react";
import { ProxyContext, getPreferredProxy } from "contexts/ProxyContext";
import { getPreferredProxy } from "contexts/ProxyContext";
import { chromatic } from "testHelpers/chromatic";
import * as M from "testHelpers/entities";
import { withDashboardProvider, withWebSocket } from "testHelpers/storybook";
import {
withDashboardProvider,
withProxyProvider,
withWebSocket,
} from "testHelpers/storybook";
import { AgentRow } from "./AgentRow";

const defaultAgentMetadata = [
Expand Down Expand Up @@ -94,32 +98,7 @@ const meta: Meta<typeof AgentRow> = {
showApps: true,
storybookAgentMetadata: defaultAgentMetadata,
},
decorators: [
(Story) => (
<ProxyContext.Provider
value={{
proxyLatencies: M.MockProxyLatencies,
proxy: getPreferredProxy([], undefined),
proxies: [],
isLoading: false,
isFetched: true,
setProxy: () => {
return;
},
clearProxy: () => {
return;
},
refetchProxyLatencies: (): Date => {
return new Date();
},
}}
>
<Story />
</ProxyContext.Provider>
),
withDashboardProvider,
withWebSocket,
],
decorators: [withProxyProvider(), withDashboardProvider, withWebSocket],
parameters: {
chromatic,
queries: [
Expand Down Expand Up @@ -253,31 +232,13 @@ export const Off: Story = {

export const ShowingPortForward: Story = {
decorators: [
(Story) => (
<ProxyContext.Provider
value={{
proxyLatencies: M.MockProxyLatencies,
proxy: getPreferredProxy(
M.MockWorkspaceProxies,
M.MockPrimaryWorkspaceProxy,
),
proxies: M.MockWorkspaceProxies,
isLoading: false,
isFetched: true,
setProxy: () => {
return;
},
clearProxy: () => {
return;
},
refetchProxyLatencies: (): Date => {
return new Date();
},
}}
>
<Story />
</ProxyContext.Provider>
),
withProxyProvider({
proxy: getPreferredProxy(
M.MockWorkspaceProxies,
M.MockPrimaryWorkspaceProxy,
),
proxies: M.MockWorkspaceProxies,
}),
],
};

Expand Down
39 changes: 8 additions & 31 deletions site/src/modules/resources/AppLink/AppLink.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,48 +1,25 @@
import type { Meta, StoryObj } from "@storybook/react";
import { ProxyContext, getPreferredProxy } from "contexts/ProxyContext";
import { getPreferredProxy } from "contexts/ProxyContext";
import {
MockPrimaryWorkspaceProxy,
MockProxyLatencies,
MockWorkspace,
MockWorkspaceAgent,
MockWorkspaceApp,
MockWorkspaceProxies,
} from "testHelpers/entities";
import { withGlobalSnackbar } from "testHelpers/storybook";
import { withGlobalSnackbar, withProxyProvider } from "testHelpers/storybook";
import { AppLink } from "./AppLink";

const meta: Meta<typeof AppLink> = {
title: "modules/resources/AppLink",
component: AppLink,
decorators: [
(Story) => (
<ProxyContext.Provider
value={{
proxyLatencies: MockProxyLatencies,
proxy: {
...getPreferredProxy(
MockWorkspaceProxies,
MockPrimaryWorkspaceProxy,
),
preferredWildcardHostname: "*.super_proxy.tld",
},
proxies: MockWorkspaceProxies,
isLoading: false,
isFetched: true,
setProxy: () => {
return;
},
clearProxy: () => {
return;
},
refetchProxyLatencies: (): Date => {
return new Date();
},
}}
>
<Story />
</ProxyContext.Provider>
),
withProxyProvider({
proxy: {
...getPreferredProxy(MockWorkspaceProxies, MockPrimaryWorkspaceProxy),
preferredWildcardHostname: "*.super_proxy.tld",
},
}),
],
};

Expand Down
37 changes: 4 additions & 33 deletions site/src/modules/resources/ResourceCard.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
import type { Meta, StoryObj } from "@storybook/react";
import type { WorkspaceAgent } from "api/typesGenerated";
import { ProxyContext, getPreferredProxy } from "contexts/ProxyContext";
import {
MockProxyLatencies,
MockWorkspaceResource,
} from "testHelpers/entities";
import { MockWorkspaceResource } from "testHelpers/entities";
import { withProxyProvider } from "testHelpers/storybook";
import { AgentRowPreview } from "./AgentRowPreview";
import { ResourceCard } from "./ResourceCard";

const meta: Meta<typeof ResourceCard> = {
title: "modules/resources/ResourceCard",
component: ResourceCard,
decorators: [withProxyProvider()],
args: {
resource: MockWorkspaceResource,
agentRow: getAgentRow,
agentRow: (agent) => <AgentRowPreview agent={agent} key={agent.id} />,
},
};

Expand Down Expand Up @@ -67,31 +64,5 @@ export const BunchOfMetadata: Story = {
},
],
},
agentRow: getAgentRow,
},
};

function getAgentRow(agent: WorkspaceAgent): JSX.Element {
return (
<ProxyContext.Provider
value={{
proxyLatencies: MockProxyLatencies,
proxy: getPreferredProxy([], undefined),
proxies: [],
isLoading: false,
isFetched: true,
setProxy: () => {
return;
},
clearProxy: () => {
return;
},
refetchProxyLatencies: (): Date => {
return new Date();
},
}}
>
<AgentRowPreview agent={agent} key={agent.id} />
</ProxyContext.Provider>
);
}
33 changes: 3 additions & 30 deletions site/src/modules/resources/Resources.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
import type { Meta, StoryObj } from "@storybook/react";
import type { WorkspaceAgent } from "api/typesGenerated";
import { ProxyContext, getPreferredProxy } from "contexts/ProxyContext";
import {
MockProxyLatencies,
MockWorkspaceResource,
MockWorkspaceResourceMultipleAgents,
} from "testHelpers/entities";
import { withProxyProvider } from "testHelpers/storybook";
import { AgentRowPreview } from "./AgentRowPreview";
import { Resources } from "./Resources";

const meta: Meta<typeof Resources> = {
title: "modules/resources/Resources",
component: Resources,
decorators: [withProxyProvider()],
args: {
resources: [MockWorkspaceResource],
agentRow: getAgentRow,
agentRow: (agent) => <AgentRowPreview key={agent.id} agent={agent} />,
},
};

Expand Down Expand Up @@ -163,31 +162,5 @@ export const BunchOfDevicesWithMetadata: Story = {
),
},
],
agentRow: getAgentRow,
},
};

function getAgentRow(agent: WorkspaceAgent): JSX.Element {
return (
<ProxyContext.Provider
value={{
proxyLatencies: MockProxyLatencies,
proxy: getPreferredProxy([], undefined),
proxies: [],
isLoading: false,
isFetched: true,
setProxy: () => {
return;
},
clearProxy: () => {
return;
},
refetchProxyLatencies: (): Date => {
return new Date();
},
}}
>
<AgentRowPreview key={agent.id} agent={agent} />
</ProxyContext.Provider>
);
}
Original file line number Diff line number Diff line change
@@ -1,38 +1,12 @@
import type { Meta, StoryObj } from "@storybook/react";
import { ProxyContext, getPreferredProxy } from "contexts/ProxyContext";
import {
MockProxyLatencies,
MockWorkspaceAppStatus,
} from "testHelpers/entities";
import { MockWorkspaceAppStatus } from "testHelpers/entities";
import { withProxyProvider } from "testHelpers/storybook";
import { WorkspaceAppStatus } from "./WorkspaceAppStatus";

const meta: Meta<typeof WorkspaceAppStatus> = {
title: "modules/workspaces/WorkspaceAppStatus",
component: WorkspaceAppStatus,
decorators: [
(Story) => (
<ProxyContext.Provider
value={{
proxyLatencies: MockProxyLatencies,
proxy: getPreferredProxy([], undefined),
proxies: [],
isLoading: false,
isFetched: true,
clearProxy: () => {
return;
},
setProxy: () => {
return;
},
refetchProxyLatencies: (): Date => {
return new Date();
},
}}
>
<Story />
</ProxyContext.Provider>
),
],
decorators: [withProxyProvider()],
};

export default meta;
Expand Down
29 changes: 2 additions & 27 deletions site/src/pages/WorkspacePage/AppStatuses.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import type { Meta, StoryObj } from "@storybook/react";
import { ProxyContext, getPreferredProxy } from "contexts/ProxyContext";
import {
MockProxyLatencies,
MockWorkspace,
MockWorkspaceAgent,
MockWorkspaceApp,
MockWorkspaceAppStatus,
} from "testHelpers/entities";
import { withProxyProvider } from "testHelpers/storybook";
import { AppStatuses } from "./AppStatuses";

const meta: Meta<typeof AppStatuses> = {
Expand All @@ -15,31 +14,7 @@ const meta: Meta<typeof AppStatuses> = {
args: {
referenceDate: new Date("2024-03-26T15:15:00Z"),
},
// Add decorator for ProxyContext
decorators: [
(Story) => (
<ProxyContext.Provider
value={{
proxyLatencies: MockProxyLatencies,
proxy: getPreferredProxy([], undefined),
proxies: [],
isLoading: false,
isFetched: true,
clearProxy: () => {
return;
},
setProxy: () => {
return;
},
refetchProxyLatencies: (): Date => {
return new Date();
},
}}
>
<Story />
</ProxyContext.Provider>
),
],
decorators: [withProxyProvider()],
};

export default meta;
Expand Down
34 changes: 6 additions & 28 deletions site/src/pages/WorkspacePage/Workspace.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import { action } from "@storybook/addon-actions";
import type { Meta, StoryObj } from "@storybook/react";
import type { ProvisionerJobLog } from "api/typesGenerated";
import { ProxyContext, getPreferredProxy } from "contexts/ProxyContext";
import * as Mocks from "testHelpers/entities";
import { withAuthProvider, withDashboardProvider } from "testHelpers/storybook";
import {
withAuthProvider,
withDashboardProvider,
withProxyProvider,
} from "testHelpers/storybook";
import type { WorkspacePermissions } from "../../modules/workspaces/permissions";
import { Workspace } from "./Workspace";

Expand Down Expand Up @@ -43,32 +46,7 @@ const meta: Meta<typeof Workspace> = {
],
user: Mocks.MockUserOwner,
},
decorators: [
withAuthProvider,
withDashboardProvider,
(Story) => (
<ProxyContext.Provider
value={{
proxyLatencies: Mocks.MockProxyLatencies,
proxy: getPreferredProxy([], undefined),
proxies: [],
isLoading: false,
isFetched: true,
clearProxy: () => {
return;
},
setProxy: () => {
return;
},
refetchProxyLatencies: (): Date => {
return new Date();
},
}}
>
<Story />
</ProxyContext.Provider>
),
],
decorators: [withAuthProvider, withDashboardProvider, withProxyProvider()],
};

export default meta;
Expand Down
Loading
Loading
0