diff --git a/src/Turnierplan.App/Client/e2e/consts/turnierplan.ts b/src/Turnierplan.App/Client/e2e/consts/turnierplan.ts
index 21c5d6cc..b4fbdd34 100644
--- a/src/Turnierplan.App/Client/e2e/consts/turnierplan.ts
+++ b/src/Turnierplan.App/Client/e2e/consts/turnierplan.ts
@@ -4,10 +4,12 @@ export const turnierplan = {
organizationNameField: 'create-organization-page-organization-name-field'
},
deleteWidget: {
- confirmDeleteButton: 'delete-widget-confirm-delete-button',
deleteButton: 'delete-widget-delete-button',
confirmationField: 'delete-widget-confirmation-field'
},
+ deleteModal: {
+ confirmDeleteButton: 'delete-modal-confirm-delete-button'
+ },
header: {
logoLink: 'header-logo-link'
},
diff --git a/src/Turnierplan.App/Client/e2e/pages/view-organization-page.ts b/src/Turnierplan.App/Client/e2e/pages/view-organization-page.ts
index f5d69621..73ba5271 100644
--- a/src/Turnierplan.App/Client/e2e/pages/view-organization-page.ts
+++ b/src/Turnierplan.App/Client/e2e/pages/view-organization-page.ts
@@ -15,6 +15,6 @@ export class ViewOrganizationPage {
await this.page.getByTestId(turnierplan.pageFrame.navigationTab(turnierplan.viewOrganizationPage.settingsPageId)).click();
await this.page.getByTestId(turnierplan.deleteWidget.confirmationField).fill(confirmText);
await this.page.getByTestId(turnierplan.deleteWidget.deleteButton).click();
- await this.page.getByTestId(turnierplan.deleteWidget.confirmDeleteButton).click();
+ await this.page.getByTestId(turnierplan.deleteModal.confirmDeleteButton).click();
}
}
diff --git a/src/Turnierplan.App/Client/src/app/i18n/de.ts b/src/Turnierplan.App/Client/src/app/i18n/de.ts
index e6c9b92a..cc9d430c 100644
--- a/src/Turnierplan.App/Client/src/app/i18n/de.ts
+++ b/src/Turnierplan.App/Client/src/app/i18n/de.ts
@@ -1116,9 +1116,10 @@ export const de = {
Description: 'Beschreibung',
NoLabels: 'Es sind aktuell keine Labels vorhanden.',
LabelsInfo: 'Labels können verwendet werden, um angemeldete Mannschaften zu kategorisieren und zu filtern.',
- DeleteWarning: {
+ Delete: {
Title: 'Label löschen',
- Text: 'Wenn Sie ein Label löschen, wird dieses Label von allen Mannschaften entfernt, bei denen dieses Label aktuell zugewiesen ist. Dies kann nicht rückgängig gemacht werden!'
+ AdditionalModalText:
+ 'Wenn Sie ein Label löschen, wird dieses Label von allen Mannschaften entfernt, bei denen dieses Label aktuell zugewiesen ist. Dies kann nicht rückgängig gemacht werden!'
}
},
SaveToViewApplications: 'Speichern Sie die offenen Änderungen, um die Anmeldungen zu sehen und neue Anmeldungen hinzuzufügen.',
@@ -1306,9 +1307,11 @@ export const de = {
DeleteWidget: {
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'
+ Delete: 'Löschen'
+ },
+ DeleteModal: {
+ InfoText: 'Bestätigen Sie den Löschvorgang. Dies kann nicht rückgängig gemacht werden!',
+ Confirm: 'Löschen bestätigen'
},
VisibilitySelector: {
Private: 'Privat',
diff --git a/src/Turnierplan.App/Client/src/app/portal/components/delete-modal/delete-modal.component.html b/src/Turnierplan.App/Client/src/app/portal/components/delete-modal/delete-modal.component.html
index 56fa78b5..e7415695 100644
--- a/src/Turnierplan.App/Client/src/app/portal/components/delete-modal/delete-modal.component.html
+++ b/src/Turnierplan.App/Client/src/app/portal/components/delete-modal/delete-modal.component.html
@@ -2,7 +2,7 @@
-
+
@let additionalModalTextKey = translationKey + '.AdditionalModalText';
@@ -18,9 +18,9 @@
diff --git a/src/Turnierplan.App/Client/src/app/portal/components/labels-manager/labels-manager.component.html b/src/Turnierplan.App/Client/src/app/portal/components/labels-manager/labels-manager.component.html
index c545994d..7da69d38 100644
--- a/src/Turnierplan.App/Client/src/app/portal/components/labels-manager/labels-manager.component.html
+++ b/src/Turnierplan.App/Client/src/app/portal/components/labels-manager/labels-manager.component.html
@@ -59,11 +59,11 @@
@if (writeAllowed) {
-
+
|
}
@@ -95,20 +95,3 @@
}
-
-
-
-
-
-
diff --git a/src/Turnierplan.App/Client/src/app/portal/components/labels-manager/labels-manager.component.ts b/src/Turnierplan.App/Client/src/app/portal/components/labels-manager/labels-manager.component.ts
index 2c571645..a4f8fc8a 100644
--- a/src/Turnierplan.App/Client/src/app/portal/components/labels-manager/labels-manager.component.ts
+++ b/src/Turnierplan.App/Client/src/app/portal/components/labels-manager/labels-manager.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, Output, TemplateRef } from '@angular/core';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
import { PlanningRealmDto } from '../../../api/models/planning-realm-dto';
import { UpdatePlanningRealmFunc, ViewPlanningRealmComponent } from '../../pages/view-planning-realm/view-planning-realm.component';
import { ApplicationsFilter } from '../../models/applications-filter';
@@ -10,7 +10,8 @@ import { LabelComponent } from '../label/label.component';
import { RenameButtonComponent } from '../rename-button/rename-button.component';
import { ActionButtonComponent } from '../action-button/action-button.component';
import { IsActionAllowedDirective } from '../../directives/is-action-allowed.directive';
-import { NgbModal, NgbModalRef, NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap';
+import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap';
+import { DeleteButtonComponent } from '../delete-button/delete-button.component';
@Component({
selector: 'tp-labels-manager',
@@ -21,7 +22,8 @@ import { NgbModal, NgbModalRef, NgbPopoverModule } from '@ng-bootstrap/ng-bootst
RenameButtonComponent,
ActionButtonComponent,
IsActionAllowedDirective,
- NgbPopoverModule
+ NgbPopoverModule,
+ DeleteButtonComponent
],
templateUrl: './labels-manager.component.html'
})
@@ -38,13 +40,7 @@ export class LabelsManagerComponent {
protected readonly Actions = Actions;
protected readonly availableColors = ViewPlanningRealmComponent.DefaultLabelColorCodes;
- protected confirmDeleteModal?: NgbModalRef;
- protected currentDeletingLabelId?: number;
-
- constructor(
- protected readonly authorizationService: AuthorizationService,
- private readonly modalService: NgbModal
- ) {}
+ constructor(protected readonly authorizationService: AuthorizationService) {}
protected setLabelName(id: number, name: string): void {
this.updatePlanningRealm((planningRealm) => {
@@ -89,22 +85,9 @@ export class LabelsManagerComponent {
});
}
- protected deleteLabel(template: TemplateRef, id: number): void {
- this.currentDeletingLabelId = id;
- this.confirmDeleteModal = this.modalService.open(template, {
- size: 'md',
- fullscreen: 'md',
- centered: true
- });
- }
-
- protected confirmDeleteClicked(): void {
- if (!this.currentDeletingLabelId) {
- return;
- }
-
+ protected deleteLabel(id: number): void {
this.updatePlanningRealm((planningRealm) => {
- const index = planningRealm.labels.findIndex((x) => x.id === this.currentDeletingLabelId);
+ const index = planningRealm.labels.findIndex((x) => x.id === id);
if (index === -1) {
return false;
@@ -114,9 +97,6 @@ export class LabelsManagerComponent {
return true;
});
-
- this.confirmDeleteModal?.close();
- this.currentDeletingLabelId = undefined;
}
protected searchApplicationsClicked(id: number): void {