Fixed dialog title when deleting a user (#35499)

agagancarczyk · web-flow · commit 2e85dc5177cb · 2024-12-04T18:10:07.000Z
* Fixed dialog title when deleting a user

Signed-off-by: Agnieszka Gancarczyk &lt;agagancarczyk@gmail.com&gt;

* Fix for title in delete user dialog

Signed-off-by: Agnieszka Gancarczyk &lt;agagancarczyk@gmail.com&gt;

* Fixed test

Signed-off-by: Agnieszka Gancarczyk &lt;agagancarczyk@gmail.com&gt;

---------

Signed-off-by: Agnieszka Gancarczyk &lt;agagancarczyk@gmail.com&gt;
diff --git a/js/apps/admin-ui/cypress/e2e/users_test.spec.ts b/js/apps/admin-ui/cypress/e2e/users_test.spec.ts
@@ -471,7 +471,7 @@ describe("User creation", () => {
     listingPage.searchItem(itemId).itemExist(itemId);
     listingPage.deleteItemFromSearchBar(itemId);
 
-    modalUtils.checkModalTitle("Delete user?").confirmModal();
+    modalUtils.checkModalTitle("Delete user " + itemId + "?").confirmModal();
 
     masthead.checkNotificationMessage("The user has been deleted");
     sidebarPage.waitForPageLoad();
@@ -483,7 +483,9 @@ describe("User creation", () => {
     // Delete
     listingPage.deleteItem(itemIdWithGroups);
 
-    modalUtils.checkModalTitle("Delete user?").confirmModal();
+    modalUtils
+      .checkModalTitle("Delete user " + itemIdWithGroups + "?")
+      .confirmModal();
 
     masthead.checkNotificationMessage("The user has been deleted");
     sidebarPage.waitForPageLoad();
@@ -495,7 +497,9 @@ describe("User creation", () => {
     // Delete
     listingPage.deleteItem(itemIdWithCred);
 
-    modalUtils.checkModalTitle("Delete user?").confirmModal();
+    modalUtils
+      .checkModalTitle("Delete user " + itemIdWithCred + "?")
+      .confirmModal();
 
     masthead.checkNotificationMessage("The user has been deleted");
     sidebarPage.waitForPageLoad();
diff --git a/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties b/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties
@@ -3305,3 +3305,5 @@ filterByMembershipType=Filter by Membership Type
 organizationsMembersListError=Could not fetch organization members\: {{error}}
 MANAGED=Managed
 UNMANAGED=Unmanaged
+deleteConfirmUsers_one=Delete user {{name}}?
+deleteConfirmUsers_other=Delete {{count}} users?
diff --git a/js/apps/admin-ui/src/components/users/UserDataTable.tsx b/js/apps/admin-ui/src/components/users/UserDataTable.tsx
@@ -203,7 +203,10 @@ export function UserDataTable() {
   });
 
   const [toggleDeleteDialog, DeleteConfirm] = useConfirmDialog({
-    titleKey: "deleteConfirmUsers",
+    titleKey: t("deleteConfirmUsers", {
+      count: selectedRows.length,
+      name: selectedRows[0]?.username,
+    }),
     messageKey: t("deleteConfirmDialog", { count: selectedRows.length }),
     continueButtonLabel: "delete",
     continueButtonVariant: ButtonVariant.danger,
diff --git a/js/apps/admin-ui/src/user/EditUser.tsx b/js/apps/admin-ui/src/user/EditUser.tsx
@@ -235,7 +235,7 @@ export default function EditUser() {
   });
 
   const [toggleDeleteDialog, DeleteConfirm] = useConfirmDialog({
-    titleKey: "deleteConfirm",
+    titleKey: "deleteConfirmUsers",
     messageKey: "deleteConfirmCurrentUser",
     continueButtonLabel: "delete",
     continueButtonVariant: ButtonVariant.danger,
