fix templates

defelmnq · defelmnq · commit b51c005c53c2 · 2025-03-26T14:13:48.000Z
diff --git a/coderd/database/migrations/000311_improve_dormant_workspace_notification.up.sql b/coderd/database/migrations/000311_improve_dormant_workspace_notification.up.sql
@@ -1,3 +1,3 @@
-UPDATE notification_templates SET body_template = E'Your workspace **{{.Labels.name}}** has been marked as [**dormant**](https://coder.com/docs/templates/schedule#dormancy-threshold-enterprise) due to inactivity exceeding the dormancy threshold.' ||
-	E'This workspace will be automatically deleted in {{.Labels.timeTilDormant}} if it remains inactive.' ||
+UPDATE notification_templates SET body_template = E'Your workspace **{{.Labels.name}}** has been marked as [**dormant**](https://coder.com/docs/templates/schedule#dormancy-threshold-enterprise) due to inactivity exceeding the dormancy threshold.\n\n' ||
+	E'This workspace will be automatically deleted in {{.Labels.timeTilDormant}} if it remains inactive.\n\n' ||
 	E'To prevent deletion, activate your workspace using the link below.' WHERE id = '0ea69165-ec14-4314-91f1-69566ac3c5a0';
diff --git a/coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceDormant.html.golden b/coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceDormant.html.golden
@@ -14,9 +14,12 @@ Hi Bobby,
 
 Your workspace bobby-workspace has been marked as dormant (https://coder.co=
 m/docs/templates/schedule#dormancy-threshold-enterprise) due to inactivity =
-exceeding the dormancy threshold.This workspace will be automatically delet=
-ed in 24 hours if it remains inactive.To prevent deletion, activate your wo=
-rkspace using the link below.
+exceeding the dormancy threshold.
+
+This workspace will be automatically deleted in 24 hours if it remains inac=
+tive.
+
+To prevent deletion, activate your workspace using the link below.
 
 
 View workspace: http://test.com/@bobby/bobby-workspace
@@ -53,9 +56,12 @@ argin: 8px 0 32px; line-height: 1.5;">
         <p>Your workspace <strong>bobby-workspace</strong> has been marked =
 as <a href=3D"https://coder.com/docs/templates/schedule#dormancy-threshold-=
 enterprise"><strong>dormant</strong></a> due to inactivity exceeding the do=
-rmancy threshold.This workspace will be automatically deleted in 24 hours i=
-f it remains inactive.To prevent deletion, activate your workspace using th=
-e link below.</p>
+rmancy threshold.</p>
+
+<p>This workspace will be automatically deleted in 24 hours if it remains i=
+nactive.</p>
+
+<p>To prevent deletion, activate your workspace using the link below.</p>
       </div>
       <div style=3D"text-align: center; margin-top: 32px;">
        =20
diff --git a/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceDormant.json.golden b/coderd/notifications/testdata/rendered-templates/webhook/TemplateWorkspaceDormant.json.golden
@@ -27,6 +27,6 @@
   },
   "title": "Workspace \"bobby-workspace\" marked as dormant",
   "title_markdown": "Workspace \"bobby-workspace\" marked as dormant",
-  "body": "Your workspace bobby-workspace has been marked as dormant (https://coder.com/docs/templates/schedule#dormancy-threshold-enterprise) due to inactivity exceeding the dormancy threshold.This workspace will be automatically deleted in 24 hours if it remains inactive.To prevent deletion, activate your workspace using the link below.",
-  "body_markdown": "Your workspace **bobby-workspace** has been marked as [**dormant**](https://coder.com/docs/templates/schedule#dormancy-threshold-enterprise) due to inactivity exceeding the dormancy threshold.This workspace will be automatically deleted in 24 hours if it remains inactive.To prevent deletion, activate your workspace using the link below."
+  "body": "Your workspace bobby-workspace has been marked as dormant (https://coder.com/docs/templates/schedule#dormancy-threshold-enterprise) due to inactivity exceeding the dormancy threshold.\n\nThis workspace will be automatically deleted in 24 hours if it remains inactive.\n\nTo prevent deletion, activate your workspace using the link below.",
+  "body_markdown": "Your workspace **bobby-workspace** has been marked as [**dormant**](https://coder.com/docs/templates/schedule#dormancy-threshold-enterprise) due to inactivity exceeding the dormancy threshold.\n\nThis workspace will be automatically deleted in 24 hours if it remains inactive.\n\nTo prevent deletion, activate your workspace using the link below."
 }

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@`
`27`	`27`	`},`
`28`	`28`	`"title": "Workspace \"bobby-workspace\" marked as dormant",`
`29`	`29`	`"title_markdown": "Workspace \"bobby-workspace\" marked as dormant",`
`30`		`- "body": "Your workspace bobby-workspace has been marked as dormant (https://coder.com/docs/templates/schedule#dormancy-threshold-enterprise) due to inactivity exceeding the dormancy threshold.This workspace will be automatically deleted in 24 hours if it remains inactive.To prevent deletion, activate your workspace using the link below.",`
`31`		`- "body_markdown": "Your workspace bobby-workspace has been marked as [dormant](https://coder.com/docs/templates/schedule#dormancy-threshold-enterprise) due to inactivity exceeding the dormancy threshold.This workspace will be automatically deleted in 24 hours if it remains inactive.To prevent deletion, activate your workspace using the link below."`
	`30`	`+ "body": "Your workspace bobby-workspace has been marked as dormant (https://coder.com/docs/templates/schedule#dormancy-threshold-enterprise) due to inactivity exceeding the dormancy threshold.\n\nThis workspace will be automatically deleted in 24 hours if it remains inactive.\n\nTo prevent deletion, activate your workspace using the link below.",`
	`31`	`+ "body_markdown": "Your workspace bobby-workspace has been marked as [dormant](https://coder.com/docs/templates/schedule#dormancy-threshold-enterprise) due to inactivity exceeding the dormancy threshold.\n\nThis workspace will be automatically deleted in 24 hours if it remains inactive.\n\nTo prevent deletion, activate your workspace using the link below."`
`32`	`32`	`}`