From 6f32bdf403e9d37fa7fe3d33ff415baf5079d3a5 Mon Sep 17 00:00:00 2001
From: Ammar Bandukwala <ammar@ammar.io>
Date: Fri, 25 Aug 2023 22:01:30 +0000
Subject: [PATCH] feat(site): show entity name in DeleteDialog

---
 site/src/components/Dialogs/DeleteDialog/DeleteDialog.tsx | 2 +-
 site/src/i18n/en/common.json                              | 2 +-
 site/src/pages/UsersPage/UsersPage.test.tsx               | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/site/src/components/Dialogs/DeleteDialog/DeleteDialog.tsx b/site/src/components/Dialogs/DeleteDialog/DeleteDialog.tsx
index 0a56fe65b25c6..f46405cbb4c31 100644
--- a/site/src/components/Dialogs/DeleteDialog/DeleteDialog.tsx
+++ b/site/src/components/Dialogs/DeleteDialog/DeleteDialog.tsx
@@ -39,7 +39,7 @@ export const DeleteDialog: FC<PropsWithChildren<DeleteDialogProps>> = ({
       <Maybe condition={info !== undefined}>
         <p className={styles.warning}>{info}</p>
       </Maybe>
-      <p>{t("deleteDialog.confirm", { entity })}</p>
+      <p>{t("deleteDialog.confirm", { entity, name })}</p>
 
       <form
         onSubmit={(e) => {
diff --git a/site/src/i18n/en/common.json b/site/src/i18n/en/common.json
index a22e318e6e8c5..875976e4d8e41 100644
--- a/site/src/i18n/en/common.json
+++ b/site/src/i18n/en/common.json
@@ -16,7 +16,7 @@
   "deleteDialog": {
     "title": "Delete {{entity}}",
     "intro": "Deleting this {{entity}} is irreversible!",
-    "confirm": "Are you sure you want to proceed? Type the name of this {{entity}} below to confirm.",
+    "confirm": "Are you sure you want to proceed? Type {{name}} below to confirm.",
     "confirmLabel": "Name of {{entity}} to delete",
     "incorrectName": "Incorrect {{entity}} name."
   },
diff --git a/site/src/pages/UsersPage/UsersPage.test.tsx b/site/src/pages/UsersPage/UsersPage.test.tsx
index ef2ec64d44107..16ca542a5d916 100644
--- a/site/src/pages/UsersPage/UsersPage.test.tsx
+++ b/site/src/pages/UsersPage/UsersPage.test.tsx
@@ -72,7 +72,11 @@ const deleteUser = async (setupActionSpies: () => void) => {
   // Check if the confirm message is displayed
   const confirmDialog = await screen.findByRole("dialog")
   expect(confirmDialog).toHaveTextContent(
-    t("deleteDialog.confirm", { ns: "common", entity: "user" }).toString(),
+    t("deleteDialog.confirm", {
+      ns: "common",
+      entity: "user",
+      name: MockUser2.username,
+    }).toString(),
   )
 
   // Confirm with text input