May 22, 2023 · May 11, 2023 · May 12, 2023 · May 12, 2023 · May 12, 2023 · May 12, 2023
diff --git a/site/src/components/AppLink/AppLink.stories.tsx b/site/src/components/AppLink/AppLink.stories.tsx
      setProxy: () => {
        return
      },
      clearProxy: () => {
        return
      },
    }}
  >
    <AppLink {...args} />
diff --git a/site/src/components/Resources/AgentRow.stories.tsx b/site/src/components/Resources/AgentRow.stories.tsx
        setProxy: () => {
          return
        },
        clearProxy: () => {
          return
        },
      }}
    >
      <AgentRow {...args} />
diff --git a/site/src/components/Resources/ResourceCard.stories.tsx b/site/src/components/Resources/ResourceCard.stories.tsx
        setProxy: () => {
          return
        },
        clearProxy: () => {
          return
        },
      }}
    >
      <AgentRow
        setProxy: () => {
          return
        },
        clearProxy: () => {
          return
        },
      }}
    >
      <AgentRow
diff --git a/site/src/components/Workspace/Workspace.stories.tsx b/site/src/components/Workspace/Workspace.stories.tsx
      setProxy: () => {
        return
      },
      clearProxy: () => {
        return
      },
    }}
  >
    <Workspace {...args} />
diff --git a/site/src/contexts/ProxyContext.test.ts b/site/src/contexts/ProxyContext.test.ts
diff --git a/site/src/contexts/ProxyContext.test.tsx b/site/src/contexts/ProxyContext.test.tsx
 import {
  MockPrimaryWorkspaceProxy,
  MockWorkspaceProxies,
  MockHealthyWildWorkspaceProxy,
  MockUnhealthyWildWorkspaceProxy,
 } from "testHelpers/entities"
 import {
  getPreferredProxy,
  ProxyProvider,
  saveUserSelectedProxy,
  useProxy,
 } from "./ProxyContext"
 import * as ProxyContextModule from "./ProxyContext"
 import {
  renderWithAuth,
  waitForLoaderToBeRemoved,
 } from "testHelpers/renderHelpers"
 import { screen } from "@testing-library/react"
 import { server } from "testHelpers/server"
 import "testHelpers/localstorage"
 import { rest } from "msw"
 import { Region } from "api/typesGenerated"

 describe("ProxyContextGetURLs", () => {
  it.each([
    ["empty", [], undefined, "", ""],
    // Primary has no path app URL. Uses relative links
    [
      "primary",
      [MockPrimaryWorkspaceProxy],
      MockPrimaryWorkspaceProxy,
      "",
      MockPrimaryWorkspaceProxy.wildcard_hostname,
    ],
    [
      "regions selected",
      MockWorkspaceProxies,
      MockHealthyWildWorkspaceProxy,
      MockHealthyWildWorkspaceProxy.path_app_url,
      MockHealthyWildWorkspaceProxy.wildcard_hostname,
    ],
    // Primary is the default if none selected
    [
      "no selected",
      [MockPrimaryWorkspaceProxy],
      undefined,
      "",
      MockPrimaryWorkspaceProxy.wildcard_hostname,
    ],
    [
      "regions no select primary default",
      MockWorkspaceProxies,
      undefined,
      "",
      MockPrimaryWorkspaceProxy.wildcard_hostname,
    ],
    // Primary is the default if the selected is unhealthy
    [
      "unhealthy selection",
      MockWorkspaceProxies,
      MockUnhealthyWildWorkspaceProxy,
      "",
      MockPrimaryWorkspaceProxy.wildcard_hostname,
    ],
    // This should never happen, when there is no primary
    ["no primary", [MockHealthyWildWorkspaceProxy], undefined, "", ""],
  ])(
    `%p`,
    (_, regions, selected, preferredPathAppURL, preferredWildcardHostname) => {
      const preferred = getPreferredProxy(regions, selected)
      expect(preferred.preferredPathAppURL).toBe(preferredPathAppURL)
      expect(preferred.preferredWildcardHostname).toBe(
        preferredWildcardHostname,
      )
    },
  )
 })

 // interface ProxySelectTest {
 //   name: string
 //   actions: ()
 // }

 const TestingComponent = () => {
  return renderWithAuth(
    <ProxyProvider>
      <TestingScreen />
    </ProxyProvider>,
    {
      route: `/proxies`,
      path: "/proxies",
    },
  )
 }

 // TestingScreen just mounts some components that we can check in the unit test.
 const TestingScreen = () => {
  const { proxy, isFetched, isLoading } = useProxy()
  return (
    <>
      <div data-testid="isFetched" title={isFetched.toString()}></div>
      <div data-testid="isLoading" title={isLoading.toString()}></div>
      <div
        data-testid="preferredProxy"
        title={proxy.selectedProxy && proxy.selectedProxy.id}
      ></div>
    </>
  )
 }

 interface ProxyContextSelectionTest {
  expSelectedProxyID: string
  regions: Region[]
  storageProxy: Region | undefined
 }

 describe("ProxyContextSelection", () => {
  beforeEach(() => {
    window.localStorage.clear()
  })

  it.each([
    [
      "empty",
      {
        expSelectedProxyID: "",
        regions: [],
        storageProxy: undefined,
      },
    ],
    [
      "regions_no_selection",
      {
        expSelectedProxyID: MockPrimaryWorkspaceProxy.id,
        regions: MockWorkspaceProxies,
        storageProxy: undefined,
      },
    ],
    [
      "regions_selected_unhealthy",
      {
        expSelectedProxyID: MockPrimaryWorkspaceProxy.id,
        regions: MockWorkspaceProxies,
        storageProxy: MockUnhealthyWildWorkspaceProxy,
      },
    ],
  ] as [string, ProxyContextSelectionTest][])(
    `%s`,
    async (_, { expSelectedProxyID, regions, storageProxy }) => {
      // Initial selection if present
      if (storageProxy) {
        saveUserSelectedProxy(storageProxy)
      }

      // Mock the API response
      server.use(
        rest.get("/api/v2/regions", async (req, res, ctx) => {
          return res(
            ctx.status(200),
            ctx.json({
              regions: regions,
            }),
          )
        }),
      )

      TestingComponent()
      await waitForLoaderToBeRemoved()

      await screen.findByTestId("isFetched").then((x) => {
        expect(x.title).toBe("true")
      })
      await screen.findByTestId("isLoading").then((x) => {
        expect(x.title).toBe("false")
      })
      await screen.findByTestId("preferredProxy").then((x) => {
        expect(x.title).toBe(expSelectedProxyID)
      })

      // const { proxy, proxies, isFetched, isLoading, proxyLatencies } = useProxy()
      // expect(isLoading).toBe(false)
      // expect(isFetched).toBe(true)

      // expect(x).toBe(2)
      // const preferred = getPreferredProxy(regions, selected)
      // expect(preferred.preferredPathAppURL).toBe(preferredPathAppURL)
      // expect(preferred.preferredWildcardHostname).toBe(
      //   preferredWildcardHostname,
      // )
    },
  )
 })
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,6 +26,9 @@ const Template: Story<AppLinkProps> = (args) => (
		setProxy: () => {
		return
		},
		clearProxy: () => {
		return
		},
		}}
		>
		<AppLink {...args} />
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -65,6 +65,9 @@ const TemplateFC = (
		setProxy: () => {
		return
		},
		clearProxy: () => {
		return
		},
		}}
		>
		<AgentRow {...args} />
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,6 +30,9 @@ Example.args = {
		setProxy: () => {
		return
		},
		clearProxy: () => {
		return
		},
		}}
		>
		<AgentRow
Expand DownExpand Up		@@ -97,6 +100,9 @@ BunchOfMetadata.args = {
		setProxy: () => {
		return
		},
		clearProxy: () => {
		return
		},
		}}
		>
		<AgentRow
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -35,6 +35,9 @@ const Template: Story<WorkspaceProps> = (args) => (
		setProxy: () => {
		return
		},
		clearProxy: () => {
		return
		},
		}}
		>
		<Workspace {...args} />
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,192 @@
		import {
		MockPrimaryWorkspaceProxy,
		MockWorkspaceProxies,
		MockHealthyWildWorkspaceProxy,
		MockUnhealthyWildWorkspaceProxy,
		} from "testHelpers/entities"
		import {
		getPreferredProxy,
		ProxyProvider,
		saveUserSelectedProxy,
		useProxy,
		} from "./ProxyContext"
		import * as ProxyContextModule from "./ProxyContext"
		import {
		renderWithAuth,
		waitForLoaderToBeRemoved,
		} from "testHelpers/renderHelpers"
		import { screen } from "@testing-library/react"
		import { server } from "testHelpers/server"
		import "testHelpers/localstorage"
		import { rest } from "msw"
		import { Region } from "api/typesGenerated"

		describe("ProxyContextGetURLs", () => {
		it.each([
		["empty", [], undefined, "", ""],
		// Primary has no path app URL. Uses relative links
		[
		"primary",
		[MockPrimaryWorkspaceProxy],
		MockPrimaryWorkspaceProxy,
		"",
		MockPrimaryWorkspaceProxy.wildcard_hostname,
		],
		[
		"regions selected",
		MockWorkspaceProxies,
		MockHealthyWildWorkspaceProxy,
		MockHealthyWildWorkspaceProxy.path_app_url,
		MockHealthyWildWorkspaceProxy.wildcard_hostname,
		],
		// Primary is the default if none selected
		[
		"no selected",
		[MockPrimaryWorkspaceProxy],
		undefined,
		"",
		MockPrimaryWorkspaceProxy.wildcard_hostname,
		],
		[
		"regions no select primary default",
		MockWorkspaceProxies,
		undefined,
		"",
		MockPrimaryWorkspaceProxy.wildcard_hostname,
		],
		// Primary is the default if the selected is unhealthy
		[
		"unhealthy selection",
		MockWorkspaceProxies,
		MockUnhealthyWildWorkspaceProxy,
		"",
		MockPrimaryWorkspaceProxy.wildcard_hostname,
		],
		// This should never happen, when there is no primary
		["no primary", [MockHealthyWildWorkspaceProxy], undefined, "", ""],
		])(
		`%p`,
		(_, regions, selected, preferredPathAppURL, preferredWildcardHostname) => {
		const preferred = getPreferredProxy(regions, selected)
		expect(preferred.preferredPathAppURL).toBe(preferredPathAppURL)
		expect(preferred.preferredWildcardHostname).toBe(
		preferredWildcardHostname,
		)
		},
		)
		})
Emyrk marked this conversation as resolved. Show resolvedHide resolved

		// interface ProxySelectTest {
		// name: string
		// actions: ()
		// }

		const TestingComponent = () => {
		return renderWithAuth(
		<ProxyProvider>
		<TestingScreen />
		</ProxyProvider>,
		{
		route: `/proxies`,
		path: "/proxies",
		},
Emyrk marked this conversation as resolved. Show resolvedHide resolved
		)
		}

		// TestingScreen just mounts some components that we can check in the unit test.
		const TestingScreen = () => {
		const { proxy, isFetched, isLoading } = useProxy()
		return (
		<>
		<div data-testid="isFetched" title={isFetched.toString()}></div>
		<div data-testid="isLoading" title={isLoading.toString()}></div>
		<div
		data-testid="preferredProxy"
		title={proxy.selectedProxy && proxy.selectedProxy.id}
		></div>
		</>
		)
		}

		interface ProxyContextSelectionTest {
		expSelectedProxyID: string
		regions: Region[]
		storageProxy: Region \| undefined
		}

		describe("ProxyContextSelection", () => {
		beforeEach(() => {
		window.localStorage.clear()
		})

		it.each([
		[
		"empty",
		{
		expSelectedProxyID: "",
		regions: [],
		storageProxy: undefined,
		},
		],
		[
		"regions_no_selection",
		{
		expSelectedProxyID: MockPrimaryWorkspaceProxy.id,
		regions: MockWorkspaceProxies,
		storageProxy: undefined,
		},
		],
		[
		"regions_selected_unhealthy",
		{
		expSelectedProxyID: MockPrimaryWorkspaceProxy.id,
		regions: MockWorkspaceProxies,
		storageProxy: MockUnhealthyWildWorkspaceProxy,
		},
		],
		] as [string, ProxyContextSelectionTest][])(
		`%s`,
		async (_, { expSelectedProxyID, regions, storageProxy }) => {
		// Initial selection if present
		if (storageProxy) {
		saveUserSelectedProxy(storageProxy)
		}

		// Mock the API response
		server.use(
		rest.get("/api/v2/regions", async (req, res, ctx) => {
		return res(
		ctx.status(200),
		ctx.json({
		regions: regions,
		}),
		)
		}),
		)

		TestingComponent()
		await waitForLoaderToBeRemoved()

		await screen.findByTestId("isFetched").then((x) => {
		expect(x.title).toBe("true")
		})
		await screen.findByTestId("isLoading").then((x) => {
		expect(x.title).toBe("false")
		})
		await screen.findByTestId("preferredProxy").then((x) => {
		expect(x.title).toBe(expSelectedProxyID)
		})

		// const { proxy, proxies, isFetched, isLoading, proxyLatencies } = useProxy()
		// expect(isLoading).toBe(false)
		// expect(isFetched).toBe(true)

		// expect(x).toBe(2)
		// const preferred = getPreferredProxy(regions, selected)
		// expect(preferred.preferredPathAppURL).toBe(preferredPathAppURL)
		// expect(preferred.preferredWildcardHostname).toBe(
		// preferredWildcardHostname,
		// )
		},
		)
		})