Move DAUs to General Settings for now

coder · BrunoQuaresma · Jan 26, 2023 · Jan 18, 2023 · Jan 18, 2023 · Jan 18, 2023
commit f1a29c11aa6069b2bcf22a80fabef2490f25002f
diff --git a/site/src/AppRouter.tsx b/site/src/AppRouter.tsx
@@ -103,9 +103,6 @@ const NetworkSettingsPage = lazy(
       "./pages/DeploySettingsPage/NetworkSettingsPage/NetworkSettingsPage"
     ),
 )
-const MetricsPage = lazy(
-  () => import("./pages/DeploySettingsPage/MetricsPage/MetricsPage"),
-)
 const GitAuthPage = lazy(() => import("./pages/GitAuthPage/GitAuthPage"))
 const TemplateVersionPage = lazy(
   () => import("./pages/TemplateVersionPage/TemplateVersionPage"),
@@ -195,7 +192,6 @@ export const AppRouter: FC = () => {
                 <Route path="network" element={<NetworkSettingsPage />} />
                 <Route path="userauth" element={<UserAuthSettingsPage />} />
                 <Route path="gitauth" element={<GitAuthSettingsPage />} />
-                <Route path="metrics" element={<MetricsPage />} />
               </Route>
 
               <Route path="settings" element={<SettingsLayout />}>

diff --git a/site/src/components/DeploySettingsLayout/Sidebar.tsx b/site/src/components/DeploySettingsLayout/Sidebar.tsx
@@ -9,7 +9,6 @@ import { Stack } from "components/Stack/Stack"
 import { ElementType, PropsWithChildren, ReactNode, FC } from "react"
 import { NavLink } from "react-router-dom"
 import { combineClasses } from "util/combineClasses"
-import TrendingUpIcon from "@material-ui/icons/ShowChart"
 
 const SidebarNavItem: FC<
   PropsWithChildren<{ href: string; icon: ReactNode }>
@@ -76,12 +75,6 @@ export const Sidebar: React.FC = () => {
       >
         Security
       </SidebarNavItem>
-      <SidebarNavItem
-        href="metrics"
-        icon={<SidebarNavItemIcon icon={TrendingUpIcon} />}
-      >
-        Metrics
-      </SidebarNavItem>
     </nav>
   )
 }

diff --git a/site/src/pages/DeploySettingsPage/GeneralSettingsPage/GeneralSettingsPage.tsx b/site/src/pages/DeploySettingsPage/GeneralSettingsPage/GeneralSettingsPage.tsx
@@ -5,14 +5,19 @@ import { pageTitle } from "util/page"
 import { GeneralSettingsPageView } from "./GeneralSettingsPageView"
 
 const GeneralSettingsPage: FC = () => {
-  const { deploymentConfig: deploymentConfig } = useDeploySettings()
+  const { deploymentConfig, deploymentDAUs, getDeploymentDAUsError } =
+    useDeploySettings()
 
   return (
     <>
       <Helmet>
         <title>{pageTitle("General Settings")}</title>
       </Helmet>
-      <GeneralSettingsPageView deploymentConfig={deploymentConfig} />
+      <GeneralSettingsPageView
+        deploymentConfig={deploymentConfig}
+        deploymentDAUs={deploymentDAUs}
+        getDeploymentDAUsError={getDeploymentDAUsError}
+      />
     </>
   )
 }

diff --git a/site/src/pages/DeploySettingsPage/GeneralSettingsPage/GeneralSettingsPageView.stories.tsx b/site/src/pages/DeploySettingsPage/GeneralSettingsPage/GeneralSettingsPageView.stories.tsx
@@ -1,4 +1,8 @@
 import { ComponentMeta, Story } from "@storybook/react"
+import {
+  makeMockApiError,
+  MockDeploymentDAUResponse,
+} from "testHelpers/entities"
 import {
   GeneralSettingsPageView,
   GeneralSettingsPageViewProps,
@@ -24,10 +28,24 @@ export default {
         },
       },
     },
+    deploymentDAUs: {
+      defaultValue: MockDeploymentDAUResponse,
+    },
   },
 } as ComponentMeta<typeof GeneralSettingsPageView>
 
 const Template: Story<GeneralSettingsPageViewProps> = (args) => (
   <GeneralSettingsPageView {...args} />
 )
 export const Page = Template.bind({})
+
+export const NoDAUs = Template.bind({})
+NoDAUs.args = {
+  deploymentDAUs: undefined,
+}
+
+export const DAUError = Template.bind({})
+DAUError.args = {
+  deploymentDAUs: undefined,
+  getDeploymentDAUsError: makeMockApiError({ message: "Error fetching DAUs." }),
+}
diff --git a/site/src/pages/DeploySettingsPage/GeneralSettingsPage/GeneralSettingsPageView.tsx b/site/src/pages/DeploySettingsPage/GeneralSettingsPage/GeneralSettingsPageView.tsx
@@ -1,12 +1,19 @@
-import { DeploymentConfig } from "api/typesGenerated"
+import { DeploymentConfig, DeploymentDAUsResponse } from "api/typesGenerated"
+import { AlertBanner } from "components/AlertBanner/AlertBanner"
+import { DAUChart } from "components/DAUChart/DAUChart"
 import { Header } from "components/DeploySettingsLayout/Header"
 import OptionsTable from "components/DeploySettingsLayout/OptionsTable"
+import { Stack } from "components/Stack/Stack"
 
 export type GeneralSettingsPageViewProps = {
   deploymentConfig: Pick<DeploymentConfig, "access_url" | "wildcard_access_url">
+  deploymentDAUs?: DeploymentDAUsResponse
+  getDeploymentDAUsError: unknown
 }
 export const GeneralSettingsPageView = ({
   deploymentConfig,
+  deploymentDAUs,
+  getDeploymentDAUsError,
 }: GeneralSettingsPageViewProps): JSX.Element => {
   return (
     <>
@@ -15,12 +22,18 @@ export const GeneralSettingsPageView = ({
         description="Information about your Coder deployment."
         docsHref="https://coder.com/docs/coder-oss/latest/admin/configure"
       />
-      <OptionsTable
-        options={{
-          access_url: deploymentConfig.access_url,
-          wildcard_access_url: deploymentConfig.wildcard_access_url,
-        }}
-      />
+      <Stack spacing={4}>
+        {Boolean(getDeploymentDAUsError) && (
+          <AlertBanner error={getDeploymentDAUsError} severity="error" />
+        )}
+        {deploymentDAUs && <DAUChart daus={deploymentDAUs} />}
+        <OptionsTable
+          options={{
+            access_url: deploymentConfig.access_url,
+            wildcard_access_url: deploymentConfig.wildcard_access_url,
+          }}
+        />
+      </Stack>
     </>
   )
 }
diff --git a/site/src/pages/DeploySettingsPage/MetricsPage/MetricsPage.tsx b/site/src/pages/DeploySettingsPage/MetricsPage/MetricsPage.tsx
diff --git a/site/src/pages/DeploySettingsPage/MetricsPage/MetricsPageView.stories.tsx b/site/src/pages/DeploySettingsPage/MetricsPage/MetricsPageView.stories.tsx
diff --git a/site/src/pages/DeploySettingsPage/MetricsPage/MetricsPageView.tsx b/site/src/pages/DeploySettingsPage/MetricsPage/MetricsPageView.tsx