8000 Backport to fix dialog title when deleting a user by agagancarczyk · Pull Request #35508 · keycloak/keycloak · GitHub
[go: up one dir, main page]
Skip to content

Backport to fix dialog title when deleting a user #35508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agagancarczyk merged 3 commits into from
Dec 9, 2024
Merged

Backport to fix dialog title when deleting a user #35508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe38b71
Backport to fix dialog title when deleting a user
agagancarczyk Dec 2, 2024
dfe638a
improvement
agagancarczyk Dec 4, 2024
1893111
Merge branch 'release/26.0' into Backport-to-Fix-dialog-title-when-de…
agagancarczyk Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions js/apps/admin-ui/cypress/e2e/users_test.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand Down
4 changes: 3 additions & 1 deletion js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3285,4 +3285,6 @@ managedMembership=Managed membership
filterByMembershipType=Filter by Membership Type
organizationsMembersListError=Could not fetch organization members\: {{error}}
MANAGED=Managed
UNMANAGED=Unmanaged
UNMANAGED=Unmanaged
deleteConfirmUsers_one=Delete user {{name}}?
deleteConfirmUsers_other=Delete {{count}} users?
5 changes: 4 additions & 1 deletion js/apps/admin-ui/src/components/users/UserDataTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion js/apps/admin-ui/src/user/EditUser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ export default function EditUser() {
});

const [toggleDeleteDialog, DeleteConfirm] = useConfirmDialog({
titleKey: "deleteConfirm",
titleKey: "deleteConfirmUsers",
messageKey: "deleteConfirmCurrentUser",
continueButtonLabel: "delete",
continueButtonVariant: ButtonVariant.danger,
Expand Down
0