External-Mirrors/keycloak
2
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-01-10 15:32:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fixed dialog title when deleting a user (#35499)

Browse Source 
* Fixed dialog title when deleting a user

Signed-off-by: Agnieszka Gancarczyk <agagancarczyk@gmail.com>

* Fix for title in delete user dialog

Signed-off-by: Agnieszka Gancarczyk <agagancarczyk@gmail.com>

* Fixed test

Signed-off-by: Agnieszka Gancarczyk <agagancarczyk@gmail.com>

---------

Signed-off-by: Agnieszka Gancarczyk <agagancarczyk@gmail.com>
This commit is contained in:
Agnieszka Gancarczyk 2024-12-04 18:10:07 +00:00 committed by GitHub
parent dcc967a4b2
commit 2e85dc5177
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/apps/admin-ui/cypress/e2e/users_test.spec.ts
View File

@ -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();

2
js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties
View File

@ -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?

5
js/apps/admin-ui/src/components/users/UserDataTable.tsx
View File

@ -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,

2
js/apps/admin-ui/src/user/EditUser.tsx
View File

@ -235,7 +235,7 @@ export default function EditUser() {
});
const [toggleDeleteDialog, DeleteConfirm] = useConfirmDialog({
titleKey: "deleteConfirm",
titleKey: "deleteConfirmUsers",
messageKey: "deleteConfirmCurrentUser",
continueButtonLabel: "delete",
continueButtonVariant: ButtonVariant.danger,