Move deprecated notification

BrunoQuaresma · BrunoQuaresma · commit c969df502e7c · 2024-01-09T12:43:08.000Z
diff --git a/site/src/pages/WorkspacePage/Workspace.tsx b/site/src/pages/WorkspacePage/Workspace.tsx
@@ -44,7 +44,7 @@ export interface WorkspaceProps {
   hideVSCodeDesktopButton?: boolean;
   buildInfo?: TypesGen.BuildInfoResponse;
   sshPrefix?: string;
-  template?: TypesGen.Template;
+  template: TypesGen.Template;
   canRetryDebugMode: boolean;
   handleBuildRetry: () => void;
   handleBuildRetryDebug: () => void;
@@ -189,6 +189,7 @@ export const Workspace: FC<WorkspaceProps> = ({
           <Stack direction="column" css={styles.firstColumnSpacer} spacing={4}>
             <WorkspaceNotifications
               workspace={workspace}
+              template={template}
               latestVersion={latestVersion}
               permissions={permissions}
               onRestartWorkspace={handleRestart}
@@ -222,13 +223,6 @@ export const Workspace: FC<WorkspaceProps> = ({
               </Alert>
             )}
 
-            {template?.deprecated && (
-              <Alert severity="warning">
-                <AlertTitle>Workspace using deprecated template</AlertTitle>
-                <AlertDetail>{template?.deprecation_message}</AlertDetail>
-              </Alert>
-            )}
-
             {transitionStats !== undefined && (
               <WorkspaceBuildProgress
                 workspace={workspace}
diff --git a/site/src/pages/WorkspacePage/WorkspaceNotifications.tsx b/site/src/pages/WorkspacePage/WorkspaceNotifications.tsx
@@ -1,7 +1,7 @@
 import AlertTitle from "@mui/material/AlertTitle";
 import Button from "@mui/material/Button";
 import { workspaceResolveAutostart } from "api/queries/workspaceQuota";
-import { TemplateVersion, Workspace } from "api/typesGenerated";
+import { Template, TemplateVersion, Workspace } from "api/typesGenerated";
 import { Alert, AlertDetail } from "components/Alert/Alert";
 import { FC, useEffect, useState } from "react";
 import { useQuery } from "react-query";
@@ -11,6 +11,7 @@ import dayjs from "dayjs";
 
 type WorkspaceNotificationsProps = {
   workspace: Workspace;
+  template: Template;
   permissions: WorkspacePermissions;
   onRestartWorkspace: () => void;
   latestVersion?: TemplateVersion;
@@ -19,7 +20,13 @@ type WorkspaceNotificationsProps = {
 export const WorkspaceNotifications: FC<WorkspaceNotificationsProps> = (
   props,
 ) => {
-  const { workspace, latestVersion, permissions, onRestartWorkspace } = props;
+  const {
+    workspace,
+    template,
+    latestVersion,
+    permissions,
+    onRestartWorkspace,
+  } = props;
 
   // Outdated
   const canAutostartResponse = useQuery(
@@ -136,6 +143,13 @@ export const WorkspaceNotifications: FC<WorkspaceNotificationsProps> = (
           </AlertDetail>
         </Alert>
       )}
+
+      {template.deprecated && (
+        <Alert severity="warning">
+          <AlertTitle>Workspace using deprecated template</AlertTitle>
+          <AlertDetail>{template.deprecation_message}</AlertDetail>
+        </Alert>
+      )}
     </>
   );
 };
