Move dormant notification

coder · BrunoQuaresma · Jan 12, 2024 · Jan 9, 2024 · Jan 9, 2024 · Jan 9, 2024
commit 38f213e6ce822d205010e27ae6ef41b077dd575c
diff --git a/site/src/components/WorkspaceDeletion/index.ts b/site/src/components/WorkspaceDeletion/index.ts
diff --git a/...WorkspaceDeletion/DormantDeletionText.tsx → ...kspaceStatusBadge/DormantDeletionText.tsx b/...WorkspaceDeletion/DormantDeletionText.tsx → ...kspaceStatusBadge/DormantDeletionText.tsx
diff --git a/site/src/components/WorkspaceStatusBadge/WorkspaceStatusBadge.tsx b/site/src/components/WorkspaceStatusBadge/WorkspaceStatusBadge.tsx
@@ -9,7 +9,7 @@ import { type FC, type ReactNode } from "react";
 import type { Workspace } from "api/typesGenerated";
 import { Pill } from "components/Pill/Pill";
 import { ChooseOne, Cond } from "components/Conditionals/ChooseOne";
-import { DormantDeletionText } from "components/WorkspaceDeletion";
+import { DormantDeletionText } from "./DormantDeletionText";
 import { getDisplayWorkspaceStatus } from "utils/workspace";
 import { useClassName } from "hooks/useClassName";
 import { formatDistanceToNow } from "date-fns";

diff --git a/...kspaceDeletion/DormantWorkspaceBanner.tsx → .../WorkspacePage/DormantWorkspaceBanner.tsx b/...kspaceDeletion/DormantWorkspaceBanner.tsx → .../WorkspacePage/DormantWorkspaceBanner.tsx
@@ -3,24 +3,18 @@ import { ReactNode, type FC } from "react";
 import type { Workspace } from "api/typesGenerated";
 import { useIsWorkspaceActionsEnabled } from "components/Dashboard/DashboardProvider";
 import { Alert } from "components/Alert/Alert";
-
-export enum Count {
-  Singular,
-  Multiple,
-}
+import { useLocalStorage } from "hooks";
 
 interface DormantWorkspaceBannerProps {
   workspace: Workspace;
-  onDismiss: () => void;
-  shouldRedisplayBanner: boolean;
 }
 
 export const DormantWorkspaceBanner: FC<DormantWorkspaceBannerProps> = ({
   workspace,
-  onDismiss,
-  shouldRedisplayBanner,
 }) => {
   const experimentEnabled = useIsWorkspaceActionsEnabled();
+  const { saveLocal, getLocal } = useLocalStorage();
+  const shouldRedisplayBanner = getLocal("dismissedWorkspace") !== workspace.id;
 
   if (
     // Only show this if the experiment is included.
@@ -69,7 +63,13 @@ export const DormantWorkspaceBanner: FC<DormantWorkspaceBannerProps> = ({
   };
 
   return (
-    <Alert severity="warning" onDismiss={onDismiss} dismissible>
+    <Alert
+      severity="warning"
+      onDismiss={() => {
+        saveLocal("dismissedWorkspace", workspace.id);
+      }}
+      dismissible
+    >
       {alertText()}
     </Alert>
   );

diff --git a/site/src/pages/WorkspacePage/Workspace.tsx b/site/src/pages/WorkspacePage/Workspace.tsx
@@ -8,9 +8,8 @@ import type * as TypesGen from "api/typesGenerated";
 import { Alert, AlertDetail } from "components/Alert/Alert";
 import { Stack } from "components/Stack/Stack";
 import { ErrorAlert } from "components/Alert/ErrorAlert";
-import { DormantWorkspaceBanner } from "components/WorkspaceDeletion";
 import { AgentRow } from "components/Resources/AgentRow";
-import { useLocalStorage, useTab } from "hooks";
+import { useTab } from "hooks";
 import {
   ActiveTransition,
   WorkspaceBuildProgress,
@@ -95,7 +94,6 @@ export const Workspace: FC<WorkspaceProps> = ({
   permissions,
 }) => {
   const navigate = useNavigate();
-  const { saveLocal, getLocal } = useLocalStorage();
   const theme = useTheme();
 
   const [showAlertPendingInQueue, setShowAlertPendingInQueue] = useState(false);
@@ -261,15 +259,6 @@ export const Workspace: FC<WorkspaceProps> = ({
               />
             )}
 
-            {/* <DormantWorkspaceBanner/> determines its own visibility */}
-            <DormantWorkspaceBanner
-              workspace={workspace}
-              shouldRedisplayBanner={
-                getLocal("dismissedWorkspace") !== workspace.id
-              }
-              onDismiss={() => saveLocal("dismissedWorkspace", workspace.id)}
-            />
-
             {showAlertPendingInQueue && (
               <Alert severity="info">
                 <AlertTitle>Workspace build is pending</AlertTitle>

diff --git a/site/src/pages/WorkspacePage/WorkspaceNotifications.tsx b/site/src/pages/WorkspacePage/WorkspaceNotifications.tsx
@@ -6,6 +6,7 @@ import { Alert, AlertDetail } from "components/Alert/Alert";
 import { FC } from "react";
 import { useQuery } from "react-query";
 import { WorkspacePermissions } from "./permissions";
+import { DormantWorkspaceBanner } from "./DormantWorkspaceBanner";
 
 type WorkspaceNotificationsProps = {
   workspace: Workspace;
@@ -78,6 +79,8 @@ export const WorkspaceNotifications: FC<WorkspaceNotificationsProps> = (
             </AlertDetail>
           </Alert>
         )}
+
+      <DormantWorkspaceBanner workspace={workspace} />
     </>
   );
 };