diff --git a/src/Turnierplan.App/Client/cypress/e2e/create-and-delete-organization.cy.js b/src/Turnierplan.App/Client/cypress/e2e/create-and-delete-organization.cy.js index d405813b..cf9aea5c 100644 --- a/src/Turnierplan.App/Client/cypress/e2e/create-and-delete-organization.cy.js +++ b/src/Turnierplan.App/Client/cypress/e2e/create-and-delete-organization.cy.js @@ -5,7 +5,8 @@ it('create a new organization and delete it', () => { cy.add_organization().then((organizationName) => { cy.getx(turnierplan.pageFrame.navigationTab(turnierplan.viewOrganizationPage.settingsPageId)).click(); cy.getx(turnierplan.deleteWidget.confirmationField).type(organizationName); - cy.getx(turnierplan.deleteWidget.confirmButton).click(); + cy.getx(turnierplan.deleteWidget.deleteButton).click(); + cy.getx(turnierplan.deleteWidget.confirmDeleteButton).click(); cy.contains('Ihre Organisation wurde gelöscht'); // This is the confirmation toast }); }); diff --git a/src/Turnierplan.App/Client/cypress/support/turnierplan.js b/src/Turnierplan.App/Client/cypress/support/turnierplan.js index e900ade9..83cdf1bf 100644 --- a/src/Turnierplan.App/Client/cypress/support/turnierplan.js +++ b/src/Turnierplan.App/Client/cypress/support/turnierplan.js @@ -4,7 +4,8 @@ export const turnierplan = { organizationNameField: 'create-organization-page-organization-name-field' }, deleteWidget: { - confirmButton: 'delete-widget-confirm-button', + confirmDeleteButton: 'delete-widget-confirm-delete-button', + deleteButton: 'delete-widget-delete-button', confirmationField: 'delete-widget-confirmation-field' }, header: { diff --git a/src/Turnierplan.App/Client/src/app/i18n/de.ts b/src/Turnierplan.App/Client/src/app/i18n/de.ts index 39570d73..ea17f1b3 100644 --- a/src/Turnierplan.App/Client/src/app/i18n/de.ts +++ b/src/Turnierplan.App/Client/src/app/i18n/de.ts @@ -1098,8 +1098,11 @@ export const de = { ConfirmTooltip: 'Löschvorgang bestätigen' }, DeleteWidget: { - EnterToConfirm: 'Zur Bestätigung geben Sie bitte "{{text}}" in folgendes Textfeld ein:', - Delete: 'Löschen' + EnterToConfirm: + 'Zur Bestätigung geben Sie bitte "{{text}}" in folgendes Textfeld ein:', + ConfirmModalText: 'Bestätigen Sie den Löschvorgang. Dies kann nicht rückgängig gemacht werden!', + Delete: 'Löschen', + DeleteConfirm: 'Löschen bestätigen' }, VisibilitySelector: { Private: 'Privat', diff --git a/src/Turnierplan.App/Client/src/app/portal/components/delete-widget/delete-widget.component.html b/src/Turnierplan.App/Client/src/app/portal/components/delete-widget/delete-widget.component.html index 32878862..81fada33 100644 --- a/src/Turnierplan.App/Client/src/app/portal/components/delete-widget/delete-widget.component.html +++ b/src/Turnierplan.App/Client/src/app/portal/components/delete-widget/delete-widget.component.html @@ -20,12 +20,34 @@