Merge remote-tracking branch 'origin/main' into add-stale-warning/kir…

…a-pilot
coder · Kira-Pilot · Oct 5, 2022 · Oct 4, 2022 · Oct 4, 2022 · Oct 5, 2022
commit dec2566dc66a93fbed694e78c98db658692f7990
diff --git a/site/src/components/WorkspaceDeletedBanner/WorkspaceDeletedBanner.tsx b/site/src/components/WorkspaceDeletedBanner/WorkspaceDeletedBanner.tsx
@@ -1,9 +1,9 @@
 import Button from "@material-ui/core/Button"
 import { FC } from "react"
 import * as TypesGen from "../../api/typesGenerated"
-import { isWorkspaceDeleted } from "../../util/workspace"
 import { WarningAlert } from "components/WarningAlert/WarningAlert"
 import { useTranslation } from "react-i18next"
+import { Maybe } from "components/Conditionals/Maybe"
 
 export interface WorkspaceDeletedBannerProps {
   workspace: TypesGen.Workspace
@@ -15,21 +15,18 @@ export const WorkspaceDeletedBanner: FC<React.PropsWithChildren<WorkspaceDeleted
   handleClick,
 }) => {
   const { t } = useTranslation("workspacePage")
-
-  if (!isWorkspaceDeleted(workspace)) {
-    return null
-  }
-
   const NewWorkspaceButton = (
     <Button onClick={handleClick} size="small">
       {t("ctas.createWorkspaceCta")}
     </Button>
   )
 
   return (
-    <WarningAlert
-      text={t("warningsAndErrors.workspaceDeletedWarning")}
-      actions={[NewWorkspaceButton]}
-    />
+    <Maybe condition={workspace.latest_build.status === "deleted"}>
+      <WarningAlert
+        text={t("warningsAndErrors.workspaceDeletedWarning")}
+        actions={[NewWorkspaceButton]}
+      />
+    </Maybe>
   )
 }
diff --git a/site/src/i18n/en/workspacePage.json b/site/src/i18n/en/workspacePage.json
@@ -15,5 +15,21 @@
     "workspaceRefreshWarning": "We're having difficulty fetching the latest workspace state. Refresh the page to see the newest changes.",
     "workspaceDeletedWarning": "This workspace has been deleted and cannot be edited.",
     "workspaceShutdownWarning": "Your workspace is scheduled to automatically shut down soon."
+  },
+  "actionButton": {
+    "start": "Start",
+    "stop": "Stop",
+    "delete": "Delete",
+    "cancel": "Cancel",
+    "update": "Update",
+    "updating": "Updating",
+    "starting": "Starting...",
+    "stopping": "Stopping...",
+    "deleting": "Deleting..."
+  },
+  "disabledButton": {
+    "canceling": "Canceling",
+    "deleted": "Deleted",
+    "pending": "Pending"
   }
 }