coder · aslilac · Jan 22, 2024 · Jan 20, 2024 · Jan 22, 2024 · Jan 22, 2024
diff --git a/site/package.json b/site/package.json
@@ -170,10 +170,9 @@
     "vite-plugin-turbosnap": "1.0.2"
   },
   "browserslist": [
-    "chrome 66",
-    "firefox 63",
-    "edge 79",
-    "safari 15.4"
+    "chrome 110",
+    "firefox 111",
+    "safari 16.0"
   ],
   "resolutions": {
     "optionator": "0.9.3",

diff --git a/site/src/AppRouter.tsx b/site/src/AppRouter.tsx
@@ -5,8 +5,8 @@ import {
   BrowserRouter as Router,
   Navigate,
 } from "react-router-dom";
+import { DashboardLayout } from "./modules/dashboard/DashboardLayout";
 import { RequireAuth } from "./contexts/auth/RequireAuth";
-import { DashboardLayout } from "./components/Dashboard/DashboardLayout";
 import { FullScreenLoader } from "./components/Loader/FullScreenLoader";
 import AuditPage from "./pages/AuditPage/AuditPage";
 import { DeploySettingsLayout } from "./pages/DeploySettingsPage/DeploySettingsLayout";

diff --git a/site/src/components/WorkspaceStatusBadge/DormantDeletionText.tsx b/site/src/components/WorkspaceStatusBadge/DormantDeletionText.tsx
@@ -1,7 +1,7 @@
 import { type FC } from "react";
 import type { Workspace } from "api/typesGenerated";
 import { displayDormantDeletion } from "utils/dormant";
-import { useDashboard } from "components/Dashboard/DashboardProvider";
+import { useDashboard } from "modules/dashboard/useDashboard";
 
 interface DormantDeletionTextProps {
   workspace: Workspace;

diff --git a/site/src/components/WorkspaceStatusBadge/WorkspaceStatusBadge.stories.tsx b/site/src/components/WorkspaceStatusBadge/WorkspaceStatusBadge.stories.tsx
@@ -15,7 +15,7 @@ import {
   MockAppearanceConfig,
 } from "testHelpers/entities";
 import { WorkspaceStatusBadge } from "./WorkspaceStatusBadge";
-import { DashboardProviderContext } from "components/Dashboard/DashboardProvider";
+import { DashboardContext } from "modules/dashboard/DashboardProvider";
 import type { Meta, StoryObj } from "@storybook/react";
 
 const MockedAppearance = {
@@ -29,7 +29,7 @@ const meta: Meta<typeof WorkspaceStatusBadge> = {
   component: WorkspaceStatusBadge,
   decorators: [
     (Story) => (
-      <DashboardProviderContext.Provider
+      <DashboardContext.Provider
         value={{
           buildInfo: MockBuildInfo,
           entitlements: MockEntitlementsWithScheduling,
@@ -38,7 +38,7 @@ const meta: Meta<typeof WorkspaceStatusBadge> = {
         }}
       >
         <Story />
-      </DashboardProviderContext.Provider>
+      </DashboardContext.Provider>
     ),
   ],
 };

diff --git a/site/src/contexts/auth/RequireAuth.tsx b/site/src/contexts/auth/RequireAuth.tsx
@@ -4,7 +4,7 @@ import { Outlet, Navigate, useLocation } from "react-router-dom";
 import { embedRedirect } from "utils/redirect";
 import { isApiError } from "api/errors";
 import { ProxyProvider } from "contexts/ProxyContext";
-import { DashboardProvider } from "components/Dashboard/DashboardProvider";
+import { DashboardProvider } from "modules/dashboard/DashboardProvider";
 import { FullScreenLoader } from "components/Loader/FullScreenLoader";
 import { useAuth } from "./useAuth";
 

diff --git a/site/src/hooks/index.ts b/site/src/hooks/index.ts
@@ -1,6 +1,5 @@
 export * from "./useClickable";
 export * from "./useClickableTableRow";
 export * from "./useClipboard";
-export * from "./useFeatureVisibility";
 export * from "./usePagination";
 export * from "./useTab";
diff --git a/...onents/Dashboard/DashboardLayout.test.tsx → ...odules/dashboard/DashboardLayout.test.tsx b/...onents/Dashboard/DashboardLayout.test.tsx → ...odules/dashboard/DashboardLayout.test.tsx
diff --git a/.../components/Dashboard/DashboardLayout.tsx → ...src/modules/dashboard/DashboardLayout.tsx b/.../components/Dashboard/DashboardLayout.tsx → ...src/modules/dashboard/DashboardLayout.tsx
@@ -4,10 +4,10 @@ import Button from "@mui/material/Button";
 import InfoOutlined from "@mui/icons-material/InfoOutlined";
 import { type FC, type HTMLAttributes, Suspense } from "react";
 import { Outlet } from "react-router-dom";
+import { LicenseBanner } from "modules/dashboard/LicenseBanner/LicenseBanner";
+import { ServiceBanner } from "modules/dashboard/ServiceBanner/ServiceBanner";
 import { usePermissions } from "contexts/auth/usePermissions";
-import { LicenseBanner } from "components/Dashboard/LicenseBanner/LicenseBanner";
 import { Loader } from "components/Loader/Loader";
-import { ServiceBanner } from "components/Dashboard/ServiceBanner/ServiceBanner";
 import { dashboardContentBottomPadding } from "theme/constants";
 import { docs } from "utils/docs";
 import { Navbar } from "./Navbar/Navbar";

diff --git a/...omponents/Dashboard/DashboardProvider.tsx → ...c/modules/dashboard/DashboardProvider.tsx b/...omponents/Dashboard/DashboardProvider.tsx → ...c/modules/dashboard/DashboardProvider.tsx
@@ -14,7 +14,6 @@ import {
   type PropsWithChildren,
   createContext,
   useCallback,
-  useContext,
   useState,
 } from "react";
 import { appearance } from "api/queries/appearance";
@@ -27,16 +26,16 @@ interface Appearance {
   setPreview: (config: AppearanceConfig) => void;
 }
 
-interface DashboardProviderValue {
+export interface DashboardValue {
   buildInfo: BuildInfoResponse;
   entitlements: Entitlements;
   experiments: Experiments;
   appearance: Appearance;
 }
 
-export const DashboardProviderContext = createContext<
-  DashboardProviderValue | undefined
->(undefined);
+export const DashboardContext = createContext<DashboardValue | undefined>(
+  undefined,
+);
 
 export const DashboardProvider: FC<PropsWithChildren> = ({ children }) => {
   const buildInfoQuery = useQuery(buildInfo());
@@ -83,7 +82,7 @@ export const DashboardProvider: FC<PropsWithChildren> = ({ children }) => {
   }
 
   return (
-    <DashboardProviderContext.Provider
+    <DashboardContext.Provider
       value={{
         buildInfo: buildInfoQuery.data,
         entitlements: entitlementsQuery.data,
@@ -96,23 +95,6 @@ export const DashboardProvider: FC<PropsWithChildren> = ({ children }) => {
       }}
     >
       {children}
-    </DashboardProviderContext.Provider>
+    </DashboardContext.Provider>
   );
 };
-
-export const useDashboard = (): DashboardProviderValue => {
-  const context = useContext(DashboardProviderContext);
-
-  if (!context) {
-    throw new Error(
-      "useDashboard only can be used inside of DashboardProvider",
-    );
-  }
-
-  return context;
-};
-
-export const useIsWorkspaceActionsEnabled = (): boolean => {
-  const { entitlements } = useDashboard();
-  return entitlements.features["advanced_template_scheduling"].enabled;
-};
diff --git a/...ard/DeploymentBanner/DeploymentBanner.tsx → ...ard/DeploymentBanner/DeploymentBanner.tsx b/...ard/DeploymentBanner/DeploymentBanner.tsx → ...ard/DeploymentBanner/DeploymentBanner.tsx
diff --git a/...ntBanner/DeploymentBannerView.stories.tsx → ...ntBanner/DeploymentBannerView.stories.tsx b/...ntBanner/DeploymentBannerView.stories.tsx → ...ntBanner/DeploymentBannerView.stories.tsx
diff --git a/...DeploymentBanner/DeploymentBannerView.tsx → ...DeploymentBanner/DeploymentBannerView.tsx b/...DeploymentBanner/DeploymentBannerView.tsx → ...DeploymentBanner/DeploymentBannerView.tsx
diff --git a/...Dashboard/LicenseBanner/LicenseBanner.tsx → ...dashboard/LicenseBanner/LicenseBanner.tsx b/...Dashboard/LicenseBanner/LicenseBanner.tsx → ...dashboard/LicenseBanner/LicenseBanner.tsx
@@ -1,5 +1,5 @@
 import { type FC } from "react";
-import { useDashboard } from "components/Dashboard/DashboardProvider";
+import { useDashboard } from "modules/dashboard/useDashboard";
 import { LicenseBannerView } from "./LicenseBannerView";
 
 export const LicenseBanner: FC = () => {

diff --git a/...censeBanner/LicenseBannerView.stories.tsx → ...censeBanner/LicenseBannerView.stories.tsx b/...censeBanner/LicenseBannerView.stories.tsx → ...censeBanner/LicenseBannerView.stories.tsx
diff --git a/...board/LicenseBanner/LicenseBannerView.tsx → ...board/LicenseBanner/LicenseBannerView.tsx b/...board/LicenseBanner/LicenseBannerView.tsx → ...board/LicenseBanner/LicenseBannerView.tsx
diff --git a/...mponents/Dashboard/Navbar/Navbar.test.tsx → .../modules/dashboard/Navbar/Navbar.test.tsx b/...mponents/Dashboard/Navbar/Navbar.test.tsx → .../modules/dashboard/Navbar/Navbar.test.tsx
diff --git a/...rc/components/Dashboard/Navbar/Navbar.tsx → site/src/modules/dashboard/Navbar/Navbar.tsx b/...rc/components/Dashboard/Navbar/Navbar.tsx → site/src/modules/dashboard/Navbar/Navbar.tsx
@@ -3,8 +3,8 @@ import { useAuth } from "contexts/auth/useAuth";
 import { useMe } from "contexts/auth/useMe";
 import { usePermissions } from "contexts/auth/usePermissions";
 import { useProxy } from "contexts/ProxyContext";
-import { useDashboard } from "components/Dashboard/DashboardProvider";
-import { useFeatureVisibility } from "hooks/useFeatureVisibility";
+import { useDashboard } from "modules/dashboard/useDashboard";
+import { useFeatureVisibility } from "../useFeatureVisibility";
 import { NavbarView } from "./NavbarView";
 
 export const Navbar: FC = () => {

diff --git a/...s/Dashboard/Navbar/NavbarView.stories.tsx → ...s/dashboard/Navbar/NavbarView.stories.tsx b/...s/Dashboard/Navbar/NavbarView.stories.tsx → ...s/dashboard/Navbar/NavbarView.stories.tsx
diff --git a/...ents/Dashboard/Navbar/NavbarView.test.tsx → ...ules/dashboard/Navbar/NavbarView.test.tsx b/...ents/Dashboard/Navbar/NavbarView.test.tsx → ...ules/dashboard/Navbar/NavbarView.test.tsx
diff --git a/...omponents/Dashboard/Navbar/NavbarView.tsx → ...c/modules/dashboard/Navbar/NavbarView.tsx b/...omponents/Dashboard/Navbar/NavbarView.tsx → ...c/modules/dashboard/Navbar/NavbarView.tsx
diff --git a/...bar/UserDropdown/UserDropdown.stories.tsx → ...bar/UserDropdown/UserDropdown.stories.tsx b/...bar/UserDropdown/UserDropdown.stories.tsx → ...bar/UserDropdown/UserDropdown.stories.tsx
diff --git a/...oard/Navbar/UserDropdown/UserDropdown.tsx → ...oard/Navbar/UserDropdown/UserDropdown.tsx b/...oard/Navbar/UserDropdown/UserDropdown.tsx → ...oard/Navbar/UserDropdown/UserDropdown.tsx
diff --git a/...UserDropdown/UserDropdownContent.test.tsx → ...UserDropdown/UserDropdownContent.test.tsx b/...UserDropdown/UserDropdownContent.test.tsx → ...UserDropdown/UserDropdownContent.test.tsx
diff --git a/...vbar/UserDropdown/UserDropdownContent.tsx → ...vbar/UserDropdown/UserDropdownContent.tsx b/...vbar/UserDropdown/UserDropdownContent.tsx → ...vbar/UserDropdown/UserDropdownContent.tsx
diff --git a/...Dashboard/ServiceBanner/ServiceBanner.tsx → ...dashboard/ServiceBanner/ServiceBanner.tsx b/...Dashboard/ServiceBanner/ServiceBanner.tsx → ...dashboard/ServiceBanner/ServiceBanner.tsx
@@ -1,5 +1,5 @@
 import { type FC } from "react";
-import { useDashboard } from "components/Dashboard/DashboardProvider";
+import { useDashboard } from "modules/dashboard/useDashboard";
 import { ServiceBannerView } from "./ServiceBannerView";
 
 export const ServiceBanner: FC = () => {

diff --git a/...rviceBanner/ServiceBannerView.stories.tsx → ...rviceBanner/ServiceBannerView.stories.tsx b/...rviceBanner/ServiceBannerView.stories.tsx → ...rviceBanner/ServiceBannerView.stories.tsx
diff --git a/...board/ServiceBanner/ServiceBannerView.tsx → ...board/ServiceBanner/ServiceBannerView.tsx b/...board/ServiceBanner/ServiceBannerView.tsx → ...board/ServiceBanner/ServiceBannerView.tsx
diff --git a/site/src/modules/dashboard/useDashboard.ts b/site/src/modules/dashboard/useDashboard.ts
@@ -0,0 +1,14 @@
+import { useContext } from "react";
+import { DashboardContext, type DashboardValue } from "./DashboardProvider";
+
+export const useDashboard = (): DashboardValue => {
+  const context = useContext(DashboardContext);
+
+  if (!context) {
+    throw new Error(
+      "useDashboard only can be used inside of DashboardProvider",
+    );
+  }
+
+  return context;
+};
diff --git a/site/src/hooks/useFeatureVisibility.ts → ...modules/dashboard/useFeatureVisibility.ts b/site/src/hooks/useFeatureVisibility.ts → ...modules/dashboard/useFeatureVisibility.ts
@@ -1,5 +1,5 @@
 import { FeatureName } from "api/typesGenerated";
-import { useDashboard } from "components/Dashboard/DashboardProvider";
+import { useDashboard } from "./useDashboard";
 import { selectFeatureVisibility } from "utils/entitlements";
 
 export const useFeatureVisibility = (): Record<FeatureName, boolean> => {

diff --git a/...ponents/Dashboard/useUpdateCheck.test.tsx → ...modules/dashboard/useUpdateCheck.test.tsx b/...ponents/Dashboard/useUpdateCheck.test.tsx → ...modules/dashboard/useUpdateCheck.test.tsx
@@ -1,10 +1,10 @@
 import { act, renderHook, waitFor } from "@testing-library/react";
-import { useUpdateCheck } from "./useUpdateCheck";
-import { QueryClient, QueryClientProvider } from "react-query";
 import { type FC, type PropsWithChildren } from "react";
+import { QueryClient, QueryClientProvider } from "react-query";
 import { rest } from "msw";
 import { MockUpdateCheck } from "testHelpers/entities";
 import { server } from "testHelpers/server";
+import { useUpdateCheck } from "./useUpdateCheck";
 
 const createWrapper = (): FC<PropsWithChildren> => {
   const queryClient = new QueryClient();

diff --git a/...rc/components/Dashboard/useUpdateCheck.ts → site/src/modules/dashboard/useUpdateCheck.ts b/...rc/components/Dashboard/useUpdateCheck.ts → site/src/modules/dashboard/useUpdateCheck.ts
diff --git a/site/src/pages/AuditPage/AuditPage.tsx b/site/src/pages/AuditPage/AuditPage.tsx
@@ -1,15 +1,15 @@
-import { isNonInitialPage } from "components/PaginationWidget/utils";
-import { useFeatureVisibility } from "hooks/useFeatureVisibility";
-import { FC } from "react";
+import { type FC } from "react";
 import { Helmet } from "react-helmet-async";
 import { useSearchParams } from "react-router-dom";
+import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
 import { pageTitle } from "utils/page";
-import { AuditPageView } from "./AuditPageView";
+import { paginatedAudits } from "api/queries/audits";
+import { usePaginatedQuery } from "hooks/usePaginatedQuery";
 import { useUserFilterMenu } from "components/Filter/UserFilter";
+import { isNonInitialPage } from "components/PaginationWidget/utils";
 import { useFilter } from "components/Filter/filter";
 import { useActionFilterMenu, useResourceTypeFilterMenu } from "./AuditFilter";
-import { usePaginatedQuery } from "hooks/usePaginatedQuery";
-import { paginatedAudits } from "api/queries/audits";
+import { AuditPageView } from "./AuditPageView";
 
 const AuditPage: FC = () => {
   const { audit_log: isAuditLogVisible } = useFeatureVisibility();

diff --git a/site/src/pages/CreateTemplatePage/DuplicateTemplateView.tsx b/site/src/pages/CreateTemplatePage/DuplicateTemplateView.tsx
@@ -10,9 +10,9 @@ import {
   createTemplate,
 } from "api/queries/templates";
 import { useOrganizationId } from "contexts/auth/useOrganizationId";
+import { useDashboard } from "modules/dashboard/useDashboard";
 import { ErrorAlert } from "components/Alert/ErrorAlert";
 import { Loader } from "components/Loader/Loader";
-import { useDashboard } from "components/Dashboard/DashboardProvider";
 import { CreateTemplateForm } from "./CreateTemplateForm";
 import { firstVersionFromFile, getFormPermissions, newTemplate } from "./utils";
 

diff --git a/site/src/pages/CreateTemplatePage/ImportStarterTemplateView.tsx b/site/src/pages/CreateTemplatePage/ImportStarterTemplateView.tsx
@@ -9,9 +9,9 @@ import {
   templateVersionVariables,
 } from "api/queries/templates";
 import { useOrganizationId } from "contexts/auth/useOrganizationId";
+import { useDashboard } from "modules/dashboard/useDashboard";
 import { ErrorAlert } from "components/Alert/ErrorAlert";
 import { Loader } from "components/Loader/Loader";
-import { useDashboard } from "components/Dashboard/DashboardProvider";
 import { CreateTemplateForm } from "./CreateTemplateForm";
 import {
   firstVersionFromExample,

diff --git a/site/src/pages/CreateTemplatePage/UploadTemplateView.tsx b/site/src/pages/CreateTemplatePage/UploadTemplateView.tsx
@@ -8,7 +8,7 @@ import {
 } from "api/queries/templates";
 import { uploadFile } from "api/queries/files";
 import { useOrganizationId } from "contexts/auth/useOrganizationId";
-import { useDashboard } from "components/Dashboard/DashboardProvider";
+import { useDashboard } from "modules/dashboard/useDashboard";
 import { CreateTemplateForm } from "./CreateTemplateForm";
 import { firstVersionFromFile, getFormPermissions, newTemplate } from "./utils";
 

diff --git a/site/src/pages/DeploySettingsPage/AppearanceSettingsPage/AppearanceSettingsPage.tsx b/site/src/pages/DeploySettingsPage/AppearanceSettingsPage/AppearanceSettingsPage.tsx
@@ -1,13 +1,13 @@
-import { UpdateAppearanceConfig } from "api/typesGenerated";
-import { useDashboard } from "components/Dashboard/DashboardProvider";
-import { FC } from "react";
+import { type FC } from "react";
 import { Helmet } from "react-helmet-async";
-import { pageTitle } from "utils/page";
-import { AppearanceSettingsPageView } from "./AppearanceSettingsPageView";
 import { useMutation, useQueryClient } from "react-query";
+import type { UpdateAppearanceConfig } from "api/typesGenerated";
+import { useDashboard } from "modules/dashboard/useDashboard";
+import { pageTitle } from "utils/page";
 import { updateAppearance } from "api/queries/appearance";
 import { getErrorMessage } from "api/errors";
 import { displayError, displaySuccess } from "components/GlobalSnackbar/utils";
+import { AppearanceSettingsPageView } from "./AppearanceSettingsPageView";
 
 // ServiceBanner is unlike the other Deployment Settings pages because it
 // implements a form, whereas the others are read-only. We make this

diff --git a/site/src/pages/DeploySettingsPage/OAuth2AppsSettingsPage/OAuth2AppsSettingsPage.tsx b/site/src/pages/DeploySettingsPage/OAuth2AppsSettingsPage/OAuth2AppsSettingsPage.tsx
@@ -1,8 +1,8 @@
+import { type FC } from "react";
+import { Helmet } from "react-helmet-async";
 import { useQuery } from "react-query";
 import { getApps } from "api/queries/oauth2";
-import { useDashboard } from "components/Dashboard/DashboardProvider";
-import { FC } from "react";
-import { Helmet } from "react-helmet-async";
+import { useDashboard } from "modules/dashboard/useDashboard";
 import { pageTitle } from "utils/page";
 import OAuth2AppsSettingsPageView from "./OAuth2AppsSettingsPageView";
 

diff --git a/site/src/pages/DeploySettingsPage/ObservabilitySettingsPage/ObservabilitySettingsPage.tsx b/site/src/pages/DeploySettingsPage/ObservabilitySettingsPage/ObservabilitySettingsPage.tsx
@@ -1,7 +1,7 @@
 import { type FC } from "react";
 import { Helmet } from "react-helmet-async";
 import { pageTitle } from "utils/page";
-import { useDashboard } from "components/Dashboard/DashboardProvider";
+import { useDashboard } from "modules/dashboard/useDashboard";
 import { useDeploySettings } from "../DeploySettingsLayout";
 import { ObservabilitySettingsPageView } from "./ObservabilitySettingsPageView";
 

diff --git a/site/src/pages/DeploySettingsPage/SecuritySettingsPage/SecuritySettingsPage.tsx b/site/src/pages/DeploySettingsPage/SecuritySettingsPage/SecuritySettingsPage.tsx
@@ -1,7 +1,7 @@
 import { type FC } from "react";
 import { Helmet } from "react-helmet-async";
 import { pageTitle } from "utils/page";
-import { useDashboard } from "components/Dashboard/DashboardProvider";
+import { useDashboard } from "modules/dashboard/useDashboard";
 import { SecuritySettingsPageView } from "./SecuritySettingsPageView";
 import { useDeploySettings } from "../DeploySettingsLayout";
 

diff --git a/site/src/pages/GroupsPage/GroupsPage.tsx b/site/src/pages/GroupsPage/GroupsPage.tsx
@@ -5,9 +5,9 @@ import { getErrorMessage } from "api/errors";
 import { groups } from "api/queries/groups";
 import { useOrganizationId } from "contexts/auth/useOrganizationId";
 import { usePermissions } from "contexts/auth/usePermissions";
-import { useFeatureVisibility } from "hooks/useFeatureVisibility";
-import { pageTitle } from "utils/page";
+import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
 import { displayError } from "components/GlobalSnackbar/utils";
+import { pageTitle } from "utils/page";
 import GroupsPageView from "./GroupsPageView";
 
 export const GroupsPage: FC = () => {

diff --git a/site/src/pages/HealthPage/AccessURLPage.stories.tsx b/site/src/pages/HealthPage/AccessURLPage.stories.tsx
@@ -13,4 +13,6 @@ const meta: Meta = {
 export default meta;
 type Story = StoryObj;
 
-export const Default: Story = {};
+const Example: Story = {};
+
+export { Example as AccessURL };
diff --git a/site/src/pages/HealthPage/DERPPage.stories.tsx b/site/src/pages/HealthPage/DERPPage.stories.tsx
@@ -13,4 +13,6 @@ const meta: Meta = {
 export default meta;
 type Story = StoryObj;
 
-export const Default: Story = {};
+const Example: Story = {};
+
+export { Example as DERP };
diff --git a/site/src/pages/HealthPage/DERPRegionPage.stories.tsx b/site/src/pages/HealthPage/DERPRegionPage.stories.tsx
@@ -18,4 +18,6 @@ const meta: Meta = {
 export default meta;
 type Story = StoryObj;
 
-export const Default: Story = {};
+const Example: Story = {};
+
+export { Example as DERPRegion };
diff --git a/site/src/pages/HealthPage/DatabasePage.stories.tsx b/site/src/pages/HealthPage/DatabasePage.stories.tsx
@@ -13,4 +13,6 @@ const meta: Meta = {
 export default meta;
 type Story = StoryObj;
 
-export const Default: Story = {};
+const Example: Story = {};
+
+export { Example as Database };