Skip to content

chore(site): upgrade msw to 2.0 #12597

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 16 commits into from
Mar 19, 2024
Merged

chore(site): upgrade msw to 2.0 #12597

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3e0e2e2
wp: upgrade msw
BrunoQuaresma Mar 8, 2024
d385f53
Minor fixes
BrunoQuaresma Mar 8, 2024
41fcf23
Fix polyfill issues and ProxyContext old api usage
BrunoQuaresma Mar 14, 2024
7855226
Fix PortForwardPopoverView tests
BrunoQuaresma Mar 14, 2024
41ccf83
Skip usePaginatedQuery.test
BrunoQuaresma Mar 14, 2024
b641691
Merge branch 'main' of https://github.com/coder/coder into bq/upgrade…
BrunoQuaresma Mar 14, 2024
c5f758a
Skip usePaginatedQuery test
BrunoQuaresma Mar 14, 2024
3c3db52
Fix fmt
BrunoQuaresma Mar 14, 2024
723ccd9
Fix lint
BrunoQuaresma Mar 14, 2024
4c61c01
fix typo
BrunoQuaresma Mar 18, 2024
a70d24c
Remove ynecessary async
BrunoQuaresma Mar 18, 2024
8f5748a
Merge branch 'main' of https://github.com/coder/coder into bq/upgrade…
BrunoQuaresma Mar 18, 2024
374f6c4
Fix metadata stuff
BrunoQuaresma Mar 18, 2024
089680d
Improve type
BrunoQuaresma Mar 18, 2024
538f1e2
Merge branch 'main' of https://github.com/coder/coder into bq/upgrade…
BrunoQuaresma Mar 18, 2024
d5d8788
Merge branch 'main' of https://github.com/coder/coder into bq/upgrade…
BrunoQuaresma Mar 19, 2024
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
Prev Previous commit
Next Next commit
Fix metadata stuff
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Mar 18, 2024
commit 374f6c41ec78e93a9bfd5545a2d1b4607edeb463
7 changes: 1 addition & 6 deletions site/src/modules/resources/AgentMetadata.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@ import Skeleton from "@mui/material/Skeleton";
import Tooltip from "@mui/material/Tooltip";
import dayjs from "dayjs";
import {
createContext,
type FC,
type HTMLAttributes,
useContext,
useEffect,
useLayoutEffect,
useRef,
Expand All @@ -22,8 +20,6 @@ import { MONOSPACE_FONT_FAMILY } from "theme/constants";

type ItemStatus = "stale" | "valid" | "loading";

export const WatchAgentMetadataContext = createContext(watchAgentMetadata);

export interface AgentMetadataViewProps {
metadata: WorkspaceAgentMetadata[];
}
Expand Down Expand Up @@ -53,7 +49,6 @@ export const AgentMetadata: FC<AgentMetadataProps> = ({
const [metadata, setMetadata] = useState<
WorkspaceAgentMetadata[] | undefined
>(undefined);
const watchAgentMetadata = useContext(WatchAgentMetadataContext);

useEffect(() => {
if (storybookMetadata !== undefined) {
Expand Down Expand Up @@ -88,7 +83,7 @@ export const AgentMetadata: FC<AgentMetadataProps> = ({
};
};
return connect();
}, [agent.id, watchAgentMetadata, storybookMetadata]);
}, [agent.id, storybookMetadata]);

if (metadata === undefined) {
return (
Expand Down
9 changes: 0 additions & 9 deletions site/src/pages/WorkspacePage/Workspace.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import { action } from "@storybook/addon-actions";
import type { Meta, StoryObj } from "@storybook/react";
import { withReactContext } from "storybook-react-context";
import type { ProvisionerJobLog } from "api/typesGenerated";
import { ProxyContext, getPreferredProxy } from "contexts/ProxyContext";
import EventSource from "eventsourcemock";
import { DashboardContext } from "modules/dashboard/DashboardProvider";
import { WatchAgentMetadataContext } from "modules/resources/AgentMetadata";
import * as Mocks from "testHelpers/entities";
import type { WorkspacePermissions } from "./permissions";
import { Workspace } from "./Workspace";
Expand Down Expand Up @@ -68,12 +65,6 @@ const meta: Meta<typeof Workspace> = {
</ProxyContext.Provider>
</DashboardContext.Provider>
),
withReactContext({
Context: WatchAgentMetadataContext,
initialState: (_: string): EventSource => {
return new EventSource();
},
}),
],
};

Expand Down