diff --git a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts index 68662933ef099c24ceec1f676957abba80c95f26..21dadeb94428b1eef13a468bc178a1bbfc3d6edb 100644 --- a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts +++ b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts @@ -172,7 +172,7 @@ export class TopicCloudAdministrationComponent implements OnInit { }); confirmDialogRef.afterClosed().subscribe(result => { - if (result === true) { + if (result === 'delete') { this.deleteKeyword(keyword.keywordID); } }); diff --git a/src/app/components/shared/_dialogs/topic-cloud-confirm-dialog/topic-cloud-confirm-dialog.component.html b/src/app/components/shared/_dialogs/topic-cloud-confirm-dialog/topic-cloud-confirm-dialog.component.html index c015d809ac9baeb338f169ea5c6dc43b9d1e7ea1..a158fd0d0109f52eeba02d6ebe1328c034d60c6a 100644 --- a/src/app/components/shared/_dialogs/topic-cloud-confirm-dialog/topic-cloud-confirm-dialog.component.html +++ b/src/app/components/shared/_dialogs/topic-cloud-confirm-dialog/topic-cloud-confirm-dialog.component.html @@ -1,11 +1,19 @@ -<h2 mat-dialog-title>{{'topic-cloud-confirm-dialog.confirm' | translate}}</h2> +<h2 mat-dialog-title>{{'topic-cloud-confirm-dialog.sure' | translate}}</h2> <mat-divider></mat-divider> <p>{{'topic-cloud-confirm-dialog.will-be-deleted' | translate }} '{{data.topic}}'.</p> -<div mat-dialog-actions align="end"> +<!-- <div mat-dialog-actions align="end"> <button class="primary" mat-raised-button [mat-dialog-close]="false"> {{'topic-cloud-confirm-dialog.cancel' | translate}}</button> <button class="warn" mat-raised-button [mat-dialog-close]="true"> {{'topic-cloud-confirm-dialog.delete' | translate}} </button> -</div> +</div> --> + +<app-dialog-action-buttons + buttonsLabelSection="topic-cloud-confirm-dialog" + confirmButtonLabel="delete" + [confirmButtonType]=confirmButtonType + [cancelButtonClickAction]="buildCloseDialogActionCallback()" + [confirmButtonClickAction]="buildDeleteAccountActionCallback()" +></app-dialog-action-buttons> \ No newline at end of file diff --git a/src/app/components/shared/_dialogs/topic-cloud-confirm-dialog/topic-cloud-confirm-dialog.component.ts b/src/app/components/shared/_dialogs/topic-cloud-confirm-dialog/topic-cloud-confirm-dialog.component.ts index 3c23f81cf68f4a64e71864abd7c41155cfb237eb..6e76bd59c5372940dba3585d3d52e558cae2d159 100644 --- a/src/app/components/shared/_dialogs/topic-cloud-confirm-dialog/topic-cloud-confirm-dialog.component.ts +++ b/src/app/components/shared/_dialogs/topic-cloud-confirm-dialog/topic-cloud-confirm-dialog.component.ts @@ -1,5 +1,7 @@ import { Component, Inject, OnInit } from '@angular/core'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { DialogConfirmActionButtonType } from '../../dialog/dialog-action-buttons/dialog-action-buttons.component'; +import { TranslateService } from '@ngx-translate/core'; @Component({ selector: 'app-topic-cloud-confirm-dialog', @@ -8,8 +10,11 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; }) export class TopicCloudConfirmDialogComponent implements OnInit { + confirmButtonType: DialogConfirmActionButtonType = DialogConfirmActionButtonType.Alert; + constructor( public confirmDialogRef: MatDialogRef<TopicCloudConfirmDialogComponent>, + private translationService: TranslateService, @Inject(MAT_DIALOG_DATA) public data: DialogData) { } ngOnInit(): void { @@ -19,6 +24,23 @@ export class TopicCloudConfirmDialogComponent implements OnInit { this.confirmDialogRef.close(); } + close(type: string): void { + this.confirmDialogRef.close(type); + } + + /** + * Returns a lambda which closes the dialog on call. + */ + buildCloseDialogActionCallback(): () => void { + return () => this.close('abort'); + } + + /** + * Returns a lambda which executes the dialog dedicated action on call. + */ + buildDeleteAccountActionCallback(): () => void { + return () => this.close('delete'); + } } export interface DialogData { diff --git a/src/assets/i18n/participant/de.json b/src/assets/i18n/participant/de.json index 8eb5af7e7d9a29a7701223d689b5c9ee40f563fe..ddab61dbb4712cb294f1d550ef3da10b440d0b86 100644 --- a/src/assets/i18n/participant/de.json +++ b/src/assets/i18n/participant/de.json @@ -232,7 +232,7 @@ "topic-cloud-confirm-dialog": { "cancel": "Abbrechen", "delete": "Löschen", - "confirm": "Sind Sie sicher?", + "sure": "Sind Sie sicher?", "will-be-deleted": "Thema wird gelöscht" }, "dialog-comment": { diff --git a/src/assets/i18n/participant/en.json b/src/assets/i18n/participant/en.json index 095abe01829b57cf79201731265c224128b8e5f3..4576c7c823e5feac97f912bb0cff393666fdaa57 100644 --- a/src/assets/i18n/participant/en.json +++ b/src/assets/i18n/participant/en.json @@ -240,7 +240,7 @@ "topic-cloud-confirm-dialog":{ "cancel": "Cancel", "delete": "Delete", - "confirm": "Are you sure?", + "sure": "Are you sure?", "will-be-deleted": "Topic will be deleted" }, "dialog-comment":{