From 685a0b9866db6ea1041c07199937ffbbc833f3ff Mon Sep 17 00:00:00 2001
From: Jaayden Halko <jaayden.halko@gmail.com>
Date: Wed, 26 Jun 2024 02:24:51 +0000
Subject: [PATCH 1/4] fix: improve checkbox text in template schedule settings
 dialog

---
 .../ScheduleDialog.stories.tsx                | 33 +++++++++++++
 .../TemplateSchedulePage/ScheduleDialog.tsx   | 49 +++++++++----------
 2 files changed, 56 insertions(+), 26 deletions(-)
 create mode 100644 site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.stories.tsx

diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.stories.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.stories.tsx
new file mode 100644
index 0000000000000..daed5181d979a
--- /dev/null
+++ b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.stories.tsx
@@ -0,0 +1,33 @@
+import { action } from "@storybook/addon-actions";
+import type { Meta, StoryObj } from "@storybook/react";
+import { ScheduleDialog } from "./ScheduleDialog";
+
+const meta: Meta<typeof ScheduleDialog> = {
+  title: "pages/TemplateSettingsPage/ScheduleDialog",
+  component: ScheduleDialog,
+  args: {
+    onConfirm: action("onConfirm"),
+    onClose: action("onClose"),
+    open: true,
+    title: "Workspace Scheduling",
+  }
+};
+
+export default meta;
+type Story = StoryObj<typeof ScheduleDialog>;
+
+export const DormancyThreshold: Story = {
+  args: {
+    dormantValueChanged: true,
+    inactiveWorkspacesToGoDormant: 2,
+    inactiveWorkspacesToGoDormantInWeek: 5,
+  },
+};
+
+export const DormancyDeletion: Story = {
+  args: {
+    deletionValueChanged: true,
+    dormantWorkspacesToBeDeleted: 2,
+    dormantWorkspacesToBeDeletedInWeek: 5,
+  },
+};
diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.tsx
index 357c5c7c53d8b..26eb20bb57edd 100644
--- a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.tsx
+++ b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.tsx
@@ -2,7 +2,6 @@ import type { Interpolation, Theme } from "@emotion/react";
 import Checkbox from "@mui/material/Checkbox";
 import DialogActions from "@mui/material/DialogActions";
 import FormControlLabel from "@mui/material/FormControlLabel";
-import { Stack } from "@mui/system";
 import type { FC } from "react";
 import type { ConfirmDialogProps } from "components/Dialogs/ConfirmDialog/ConfirmDialog";
 import { Dialog, DialogActionButtons } from "components/Dialogs/Dialog";
@@ -68,9 +67,9 @@ export const ScheduleDialog: FC<ScheduleDialogProps> = ({
             <>
               <h4>Dormancy Threshold</h4>
               <p css={styles.dialogDescription}>
-                This change will result in {inactiveWorkspacesToGoDormant}{" "}
-                workspaces being immediately transitioned to the dormant state
-                and {inactiveWorkspacesToGoDormantInWeek} over the next seven
+                This change will result in <strong>{inactiveWorkspacesToGoDormant}</strong> {" "}
+                workspace(s) being immediately transitioned to the dormant state
+                and <strong>{inactiveWorkspacesToGoDormantInWeek}</strong> over the next 7
                 days. To prevent this, do you want to reset the inactivity
                 period for all template workspaces?
               </p>
@@ -84,7 +83,7 @@ export const ScheduleDialog: FC<ScheduleDialogProps> = ({
                     }}
                   />
                 }
-                label="Reset"
+                label="Prevent Dormancy - Reset all workspace inactivity periods"
               />
             </>
           )}
@@ -92,27 +91,25 @@ export const ScheduleDialog: FC<ScheduleDialogProps> = ({
           {showDeletionWarning && (
             <>
               <h4>Dormancy Auto-Deletion</h4>
-              <Stack direction="row" spacing={5}>
-                <p css={styles.dialogDescription}>
-                  This change will result in {dormantWorkspacesToBeDeleted}{" "}
-                  workspaces being immediately deleted and{" "}
-                  {dormantWorkspacesToBeDeletedInWeek} over the next 7 days. To
-                  prevent this, do you want to reset the dormancy period for all
-                  template workspaces?
-                </p>
-                <FormControlLabel
-                  css={{ marginTop: 16 }}
-                  control={
-                    <Checkbox
-                      size="small"
-                      onChange={(e) => {
-                        updateDormantWorkspaces(e.target.checked);
-                      }}
-                    />
-                  }
-                  label="Reset"
-                />
-              </Stack>
+              <p css={styles.dialogDescription}>
+                This change will result in <strong>{dormantWorkspacesToBeDeleted}</strong>{" "}
+                workspace(s) being immediately deleted and{" "}
+                <strong>{dormantWorkspacesToBeDeletedInWeek}</strong> over the next 7 days. To
+                prevent this, do you want to reset the dormancy period for all
+                template workspaces?
+              </p>
+              <FormControlLabel
+                css={{ marginTop: 16 }}
+                control={
+                  <Checkbox
+                    size="small"
+                    onChange={(e) => {
+                      updateDormantWorkspaces(e.target.checked);
+                    }}
+                  />
+                }
+                label="Prevent Deletion - Reset all workspace dormancy periods"
+              />
             </>
           )}
         </>

From 0d1acdaf651640fe884482a97d60211eb5dae0ed Mon Sep 17 00:00:00 2001
From: Jaayden Halko <jaayden.halko@gmail.com>
Date: Wed, 26 Jun 2024 03:25:54 +0000
Subject: [PATCH 2/4] fix: format

---
 .../ScheduleDialog.stories.tsx                |  2 +-
 .../TemplateSchedulePage/ScheduleDialog.tsx   | 22 ++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.stories.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.stories.tsx
index daed5181d979a..403c735d4c6ac 100644
--- a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.stories.tsx
+++ b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.stories.tsx
@@ -10,7 +10,7 @@ const meta: Meta<typeof ScheduleDialog> = {
     onClose: action("onClose"),
     open: true,
     title: "Workspace Scheduling",
-  }
+  },
 };
 
 export default meta;
diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.tsx
index 26eb20bb57edd..87aa023ce7cb9 100644
--- a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.tsx
+++ b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.tsx
@@ -67,11 +67,12 @@ export const ScheduleDialog: FC<ScheduleDialogProps> = ({
             <>
               <h4>Dormancy Threshold</h4>
               <p css={styles.dialogDescription}>
-                This change will result in <strong>{inactiveWorkspacesToGoDormant}</strong> {" "}
-                workspace(s) being immediately transitioned to the dormant state
-                and <strong>{inactiveWorkspacesToGoDormantInWeek}</strong> over the next 7
-                days. To prevent this, do you want to reset the inactivity
-                period for all template workspaces?
+                This change will result in{" "}
+                <strong>{inactiveWorkspacesToGoDormant}</strong> workspace(s)
+                being immediately transitioned to the dormant state and{" "}
+                <strong>{inactiveWorkspacesToGoDormantInWeek}</strong> over the
+                next 7 days. To prevent this, do you want to reset the
+                inactivity period for all template workspaces?
               </p>
               <FormControlLabel
                 css={{ marginTop: 16 }}
@@ -92,11 +93,12 @@ export const ScheduleDialog: FC<ScheduleDialogProps> = ({
             <>
               <h4>Dormancy Auto-Deletion</h4>
               <p css={styles.dialogDescription}>
-                This change will result in <strong>{dormantWorkspacesToBeDeleted}</strong>{" "}
-                workspace(s) being immediately deleted and{" "}
-                <strong>{dormantWorkspacesToBeDeletedInWeek}</strong> over the next 7 days. To
-                prevent this, do you want to reset the dormancy period for all
-                template workspaces?
+                This change will result in{" "}
+                <strong>{dormantWorkspacesToBeDeleted}</strong> workspace(s)
+                being immediately deleted and{" "}
+                <strong>{dormantWorkspacesToBeDeletedInWeek}</strong> over the
+                next 7 days. To prevent this, do you want to reset the dormancy
+                period for all template workspaces?
               </p>
               <FormControlLabel
                 css={{ marginTop: 16 }}

From 97bf14aefc467cee4bc64319b900a3496ea0aaaa Mon Sep 17 00:00:00 2001
From: Jaayden Halko <jaayden.halko@gmail.com>
Date: Wed, 26 Jun 2024 23:08:25 +0000
Subject: [PATCH 3/4] fix: remove (s) plural language

---
 .../TemplateSchedulePage/ScheduleDialog.stories.tsx  |  4 ++--
 .../TemplateSchedulePage/ScheduleDialog.tsx          | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.stories.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.stories.tsx
index 403c735d4c6ac..ee29803377494 100644
--- a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.stories.tsx
+++ b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.stories.tsx
@@ -19,7 +19,7 @@ type Story = StoryObj<typeof ScheduleDialog>;
 export const DormancyThreshold: Story = {
   args: {
     dormantValueChanged: true,
-    inactiveWorkspacesToGoDormant: 2,
+    inactiveWorkspacesToGoDormant: 1,
     inactiveWorkspacesToGoDormantInWeek: 5,
   },
 };
@@ -27,7 +27,7 @@ export const DormancyThreshold: Story = {
 export const DormancyDeletion: Story = {
   args: {
     deletionValueChanged: true,
-    dormantWorkspacesToBeDeleted: 2,
+    dormantWorkspacesToBeDeleted: 1,
     dormantWorkspacesToBeDeletedInWeek: 5,
   },
 };
diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.tsx
index 87aa023ce7cb9..affbc4df5f9c9 100644
--- a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.tsx
+++ b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.tsx
@@ -68,9 +68,11 @@ export const ScheduleDialog: FC<ScheduleDialogProps> = ({
               <h4>Dormancy Threshold</h4>
               <p css={styles.dialogDescription}>
                 This change will result in{" "}
-                <strong>{inactiveWorkspacesToGoDormant}</strong> workspace(s)
+                <strong>{inactiveWorkspacesToGoDormant}</strong>{" "}
+                {inactiveWorkspacesToGoDormant === 1 ? "workspace" : "workspaces"}{" "}
                 being immediately transitioned to the dormant state and{" "}
-                <strong>{inactiveWorkspacesToGoDormantInWeek}</strong> over the
+                <strong>{inactiveWorkspacesToGoDormantInWeek}</strong>{" "}
+                {inactiveWorkspacesToGoDormantInWeek === 1 ? "workspace" : "workspaces"} over the
                 next 7 days. To prevent this, do you want to reset the
                 inactivity period for all template workspaces?
               </p>
@@ -94,9 +96,11 @@ export const ScheduleDialog: FC<ScheduleDialogProps> = ({
               <h4>Dormancy Auto-Deletion</h4>
               <p css={styles.dialogDescription}>
                 This change will result in{" "}
-                <strong>{dormantWorkspacesToBeDeleted}</strong> workspace(s)
+                <strong>{dormantWorkspacesToBeDeleted}</strong>{" "}
+                {dormantWorkspacesToBeDeleted === 1 ? "workspace" : "workspaces"}{" "}
                 being immediately deleted and{" "}
-                <strong>{dormantWorkspacesToBeDeletedInWeek}</strong> over the
+                <strong>{dormantWorkspacesToBeDeletedInWeek}</strong>{" "}
+                {dormantWorkspacesToBeDeletedInWeek === 1 ? "workspace" : "workspaces"} over the
                 next 7 days. To prevent this, do you want to reset the dormancy
                 period for all template workspaces?
               </p>

From 4df993cc701f8ebdde7a592b587341d2e59fd44c Mon Sep 17 00:00:00 2001
From: Jaayden Halko <jaayden.halko@gmail.com>
Date: Thu, 27 Jun 2024 14:25:01 +0000
Subject: [PATCH 4/4] fix: fix format

---
 .../TemplateSchedulePage/ScheduleDialog.tsx   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.tsx
index affbc4df5f9c9..f5463bef1a123 100644
--- a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.tsx
+++ b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/ScheduleDialog.tsx
@@ -69,11 +69,15 @@ export const ScheduleDialog: FC<ScheduleDialogProps> = ({
               <p css={styles.dialogDescription}>
                 This change will result in{" "}
                 <strong>{inactiveWorkspacesToGoDormant}</strong>{" "}
-                {inactiveWorkspacesToGoDormant === 1 ? "workspace" : "workspaces"}{" "}
+                {inactiveWorkspacesToGoDormant === 1
+                  ? "workspace"
+                  : "workspaces"}{" "}
                 being immediately transitioned to the dormant state and{" "}
                 <strong>{inactiveWorkspacesToGoDormantInWeek}</strong>{" "}
-                {inactiveWorkspacesToGoDormantInWeek === 1 ? "workspace" : "workspaces"} over the
-                next 7 days. To prevent this, do you want to reset the
+                {inactiveWorkspacesToGoDormantInWeek === 1
+                  ? "workspace"
+                  : "workspaces"}{" "}
+                over the next 7 days. To prevent this, do you want to reset the
                 inactivity period for all template workspaces?
               </p>
               <FormControlLabel
@@ -97,12 +101,16 @@ export const ScheduleDialog: FC<ScheduleDialogProps> = ({
               <p css={styles.dialogDescription}>
                 This change will result in{" "}
                 <strong>{dormantWorkspacesToBeDeleted}</strong>{" "}
-                {dormantWorkspacesToBeDeleted === 1 ? "workspace" : "workspaces"}{" "}
+                {dormantWorkspacesToBeDeleted === 1
+                  ? "workspace"
+                  : "workspaces"}{" "}
                 being immediately deleted and{" "}
                 <strong>{dormantWorkspacesToBeDeletedInWeek}</strong>{" "}
-                {dormantWorkspacesToBeDeletedInWeek === 1 ? "workspace" : "workspaces"} over the
-                next 7 days. To prevent this, do you want to reset the dormancy
-                period for all template workspaces?
+                {dormantWorkspacesToBeDeletedInWeek === 1
+                  ? "workspace"
+                  : "workspaces"}{" "}
+                over the next 7 days. To prevent this, do you want to reset the
+                dormancy period for all template workspaces?
               </p>
               <FormControlLabel
                 css={{ marginTop: 16 }}

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/coder/coder/pull/13669.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/coder/coder/pull/13669.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/coder/coder/pull/13669.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/coder/coder/pull/13669.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>