addressed the comments

joobisb · joobisb · commit 254f4dce98fd · 2024-09-03T10:00:47.000+05:30
diff --git a/coderd/notifications/Archive.zip b/coderd/notifications/Archive.zip
diff --git a/coderd/notifications/dispatch/smtp/html.gotmpl b/coderd/notifications/dispatch/smtp/html.gotmpl
@@ -26,7 +26,7 @@
       <div style="border-top: 1px solid #e2e8f0; color: #475569; font-size: 12px; margin-top: 64px; padding-top: 24px; line-height: 1.6;">
         <p>&copy;&nbsp;{{ current_year }}&nbsp;Coder. All rights reserved&nbsp;-&nbsp;<a href="{{ base_url }}" style="color: #2563eb; text-decoration: none;">{{ base_url }}</a></p>
         <p><a href="{{ base_url }}/settings/notifications" style="color: #2563eb; text-decoration: none;">Click here to manage your notification settings</a></p>
-        <p><a href="{{ base_url }}/settings/notifications?unsubscribe={{ .NotificationTemplateID }}" style="color: #2563eb; text-decoration: none;">Stop receiving emails like this</a></p>
+        <p><a href="{{ base_url }}/settings/notifications?disabled={{ .NotificationTemplateID }}" style="color: #2563eb; text-decoration: none;">Stop receiving emails like this</a></p>
       </div>
     </div>
   </body>
diff --git a/coderd/notifications/enqueuer.go b/coderd/notifications/enqueuer.go
@@ -121,7 +121,7 @@ func (s *StoreEnqueuer) Enqueue(ctx context.Context, userID, templateID uuid.UUI
 // actions which can be taken by the recipient.
 func (s *StoreEnqueuer) buildPayload(metadata database.FetchNewMessageMetadataRow, labels map[string]string) (*types.MessagePayload, error) {
 	payload := types.MessagePayload{
-		Version: "1.0",
+		Version: "1.1",
 
 		NotificationName:       metadata.NotificationName,
 		NotificationTemplateID: metadata.NotificationTemplateID.String(),
diff --git a/coderd/notifications/types/payload.go b/coderd/notifications/types/payload.go
@@ -7,12 +7,14 @@ package types
 type MessagePayload struct {
 	Version string `json:"_version"`
 
-	NotificationName       string            `json:"notification_name"`
-	NotificationTemplateID string            `json:"notification_template_id"`
-	UserID                 string            `json:"user_id"`
-	UserEmail              string            `json:"user_email"`
-	UserName               string            `json:"user_name"`
-	UserUsername           string            `json:"user_username"`
-	Actions                []TemplateAction  `json:"actions"`
-	Labels                 map[string]string `json:"labels"`
+	NotificationName       string `json:"notification_name"`
+	NotificationTemplateID string `json:"notification_template_id"`
+
+	UserID       string `json:"user_id"`
+	UserEmail    string `json:"user_email"`
+	UserName     string `json:"user_name"`
+	UserUsername string `json:"user_username"`
+
+	Actions []TemplateAction  `json:"actions"`
+	Labels  map[string]string `json:"labels"`
 }
diff --git a/site/src/pages/UserSettingsPage/NotificationsPage/NotificationsPage.tsx b/site/src/pages/UserSettingsPage/NotificationsPage/NotificationsPage.tsx
@@ -18,7 +18,7 @@ import type {
 	NotificationPreference,
 	NotificationTemplate,
 } from "api/typesGenerated";
-import { displaySuccess } from "components/GlobalSnackbar/utils";
+import { displayError, displaySuccess } from "components/GlobalSnackbar/utils";
 import { Loader } from "components/Loader/Loader";
 import { Stack } from "components/Stack/Stack";
 import { useAuthenticated } from "contexts/auth/RequireAuth";
@@ -63,24 +63,38 @@ export const NotificationsPage: FC = () => {
 		updateUserNotificationPreferences(user.id, queryClient),
 	);
 	const [searchParams] = useSearchParams();
-	const unsubscribeTemplateId = searchParams.get("unsubscribe");
+	const templateId = searchParams.get("disabled");
 
 	useEffect(() => {
-		if (unsubscribeTemplateId) {
-			handleUnsubscribe(unsubscribeTemplateId);
+		if (templateId && templatesByGroup.isSuccess && templatesByGroup.data) {
+			disableTemplate(templateId);
 		}
-	}, [unsubscribeTemplateId]);
+	}, [templateId, templatesByGroup.isSuccess, templatesByGroup.data]);
 
-	const handleUnsubscribe = async (templateId: string) => {
-		await updatePreferences.mutateAsync({
-			template_disabled_map: {
-				[templateId]: true,
-			},
-		});
-		displaySuccess("Notification preferences updated");
-		queryClient.invalidateQueries(
-			userNotificationPreferences(user.id).queryKey,
-		);
+	const disableTemplate = async (templateId: string) => {
+		try {
+			await updatePreferences.mutateAsync({
+				template_disabled_map: {
+					[templateId]: true,
+				},
+			});
+
+			const allTemplates = Object.values(templatesByGroup.data ?? {}).flat();
+			const template = allTemplates.find((t) => t.id === templateId);
+
+			if (!template) {
+				throw new Error(`Template with ID ${templateId} not found`);
+			}
+
+			displaySuccess(`${template.name} notification has been disabled`);
+
+			queryClient.invalidateQueries(
+				userNotificationPreferences(user.id).queryKey,
+			);
+		} catch (error) {
+			console.error(error);
+			displayError("Error on disabling notification");
+		}
 	};
 
 	const ready =
