add delte option

puzzle · Nov 21, 2024 · 2368900 · 2368900
1 parent e7275df
commit 2368900
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/frontend/src/app/components/objective/ObjectiveMenuActions.ts b/frontend/src/app/components/objective/ObjectiveMenuActions.ts
@@ -47,6 +47,13 @@ export class ObjectiveMenuActions {
     return { displayName: 'Objective duplizieren', action: action, afterAction: afterAction };
   }
 
+  deleteObjectiveAction(objective: ObjectiveMin): ObjectiveMenuEntry {
+    const action: ObjectiveMenuAction = () => this.dialogService.openConfirmDialog('CONFIRMATION.DELETE.OBJECTIVE');
+    const afterAction: ObjectiveMenuAfterAction = (objective, dialogResult) =>
+      this.afterActions.deleteObjective(objective);
+    return { displayName: 'Objective löschen', action: action, afterAction: afterAction };
+  }
+
   completeObjectiveAction(objective: ObjectiveMin): ObjectiveMenuEntry {
     const config = {
       data: { objectiveTitle: objective.title },

diff --git a/frontend/src/app/components/objective/ObjectiveMenuAfterActions.ts b/frontend/src/app/components/objective/ObjectiveMenuAfterActions.ts
@@ -37,6 +37,12 @@ export class ObjectiveMenuAfterActions {
     });
   }
 
+  deleteObjective(objective: ObjectiveMin) {
+    this.objectiveService.deleteObjective(objective.id).subscribe(() => {
+      this.refreshDataService.markDataRefresh();
+    });
+  }
+
   objectiveBackToDraft(objectiveMin: ObjectiveMin) {
     this.objectiveService.getFullObjective(objectiveMin.id).subscribe((objective: Objective) => {
       objective.state = 'DRAFT' as State;

diff --git a/frontend/src/app/services/objective-menu-actions.service.ts b/frontend/src/app/services/objective-menu-actions.service.ts
@@ -50,7 +50,7 @@ export class ObjectiveMenuActionsService {
   }
 
   private getDefaultActions(objective: ObjectiveMin): ObjectiveMenuEntry[] {
-    return [this.actions.duplicateObjectiveAction(objective)];
+    return [this.actions.duplicateObjectiveAction(objective), this.actions.deleteObjectiveAction(objective)];
   }
 
   private getDraftMenuActions(objective: ObjectiveMin): ObjectiveMenuEntry[] {

diff --git a/frontend/src/app/shared/dialog/objective-dialog/objective-form.component.html b/frontend/src/app/shared/dialog/objective-dialog/objective-form.component.html
@@ -95,11 +95,6 @@
       </button>
       <button color="primary" mat-button mat-dialog-close [attr.data-testId]="'cancel'">Abbrechen</button>
     </div>
-
-    <div class="col-auto" *ngIf="data.objective.objectiveId && data.action != 'duplicate'">
-      <button color="primary" type="button" mat-button (click)="deleteObjective()" [attr.data-testId]="'delete'">
-        Objective Löschen
-      </button>
-    </div>
+    >
   </ng-container>
 </app-dialog-template-core>