From 9d4fc0a8f7c5a1e4bdd0847732cbc85bd74986a6 Mon Sep 17 00:00:00 2001
From: Ben <me@bpmct.net>
Date: Sat, 12 Aug 2023 00:33:34 +0000
Subject: [PATCH 1/2] chore: reword some workspace actions stuff

---
 site/src/i18n/en/templateSettingsPage.json           | 12 ++++++------
 .../TemplateScheduleForm/TemplateScheduleForm.tsx    | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/site/src/i18n/en/templateSettingsPage.json b/site/src/i18n/en/templateSettingsPage.json
index d1b0927b5a78a..bf624ae736938 100644
--- a/site/src/i18n/en/templateSettingsPage.json
+++ b/site/src/i18n/en/templateSettingsPage.json
@@ -22,12 +22,12 @@
   "failureTTLHelperText_zero": "Coder will not automatically stop failed workspaces",
   "failureTTLHelperText_one": "Coder will attempt to stop failed workspaces after {{count}} day.",
   "failureTTLHelperText_other": "Coder will attempt to stop failed workspaces after {{count}} days.",
-  "inactivityTTLHelperText_zero": "Coder will not automatically lock inactive workspaces",
-  "inactivityTTLHelperText_one": "Coder will automatically lock inactive workspaces after {{count}} day.",
-  "inactivityTTLHelperText_other": "Coder will automatically lock inactive workspaces after {{count}} days.",
-  "lockedTTLHelperText_zero": "Coder will not automatically delete locked workspaces",
-  "lockedTTLHelperText_one": "Coder will automatically delete locked workspaces after {{count}} day.",
-  "lockedTTLHelperText_other": "Coder will automatically delete locked workspaces after {{count}} days.",
+  "inactivityTTLHelperText_zero": "Coder will not mark workspaces as inactive",
+  "inactivityTTLHelperText_one": "Coder will will mark workspaces as inactive after {{count}} day without user connections.",
+  "inactivityTTLHelperText_other": "Coder will will mark workspaces as inactive after {{count}} days without user connections",
+  "lockedTTLHelperText_zero": "Coder will not automatically delete inactive workspaces",
+  "lockedTTLHelperText_one": "Coder will automatically delete inactive workspaces after {{count}} day.",
+  "lockedTTLHelperText_other": "Coder will automatically delete inactive workspaces after {{count}} days.",
   "allowUserCancelWorkspaceJobsLabel": "Allow users to cancel in-progress workspace jobs.",
   "allowUserCancelWorkspaceJobsNotice": "Depending on your template, canceling builds may leave workspaces in an unhealthy state. This option isn't recommended for most use cases.",
   "allowUsersCancelHelperText": "If checked, users may be able to corrupt their workspace.",
diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/TemplateScheduleForm.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/TemplateScheduleForm.tsx
index 13c524d6b5d51..f47079abf5bd6 100644
--- a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/TemplateScheduleForm.tsx
+++ b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/TemplateScheduleForm.tsx
@@ -359,8 +359,8 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
             </FormFields>
           </FormSection>
           <FormSection
-            title="Inactivity Soft Deletion"
-            description="When enabled, Coder will soft-delete workspaces that have not been accessed after a specified number of days. A soft-deleted workspace cannot be interacted with until it is recovered by the user."
+            title="Inactivity Threshold"
+            description="When enabled, Coder will mark workspaces as inactive after a period of time with no connections. Inactive workspaces can be auto-deleted (see below) or manually reviewed by the workspace owner or admins."
           >
             <FormFields>
               <FormControlLabel
@@ -371,7 +371,7 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
                     onChange={handleToggleInactivityCleanup}
                   />
                 }
-                label="Enable Inactivity Soft Deletion"
+                label="Enable Inactivity Threshold"
               />
               <TextField
                 {...getFieldHelpers(
@@ -392,8 +392,8 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
             </FormFields>
           </FormSection>
           <FormSection
-            title="Deletion Retention"
-            description="When enabled, Coder will permanently delete workspaces that have been soft-deleted for a specified number of days. Once a workspace is permanently deleted it cannot be recovered."
+            title="Inactivity Deletion"
+            description="When enabled, Coder will permanently delete workspaces that have been marked as inactive. specified number of days. Once a workspace is permanently deleted it cannot be recovered."
           >
             <FormFields>
               <FormControlLabel
@@ -404,7 +404,7 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
                     onChange={handleToggleLockedCleanup}
                   />
                 }
-                label="Enable Deletion Retention"
+                label="Enable Inactivity Deletion"
               />
               <TextField
                 {...getFieldHelpers(

From a2ea825903604a4bc4fd1bbc90bc0a6835e53893 Mon Sep 17 00:00:00 2001
From: Ben <me@bpmct.net>
Date: Sat, 12 Aug 2023 00:40:48 +0000
Subject: [PATCH 2/2] fix typo

---
 .../TemplateScheduleForm/TemplateScheduleForm.tsx               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/TemplateScheduleForm.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/TemplateScheduleForm.tsx
index f47079abf5bd6..7751c91d343ee 100644
--- a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/TemplateScheduleForm.tsx
+++ b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/TemplateScheduleForm.tsx
@@ -393,7 +393,7 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
           </FormSection>
           <FormSection
             title="Inactivity Deletion"
-            description="When enabled, Coder will permanently delete workspaces that have been marked as inactive. specified number of days. Once a workspace is permanently deleted it cannot be recovered."
+            description="When enabled, Coder will permanently delete workspaces that have been marked as inactive. Once a workspace is permanently deleted it cannot be recovered."
           >
             <FormFields>
               <FormControlLabel