From 8f523c05d1e62f2c8d9fe4788d9875212cf89c09 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 7 Mar 2019 12:58:12 +0100 Subject: [PATCH 1/4] Added feedback for failed delete operation --- client/src/app/dashboard/table-all/table-all.component.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/client/src/app/dashboard/table-all/table-all.component.ts b/client/src/app/dashboard/table-all/table-all.component.ts index f57264f8..2de282ec 100644 --- a/client/src/app/dashboard/table-all/table-all.component.ts +++ b/client/src/app/dashboard/table-all/table-all.component.ts @@ -102,10 +102,13 @@ export class TableAllComponent implements OnInit { if (result !== 'Cancel') { this.apiService.deleteInstance(id).subscribe((deleteResult: HttpEvent) => { console.log('result', deleteResult); + this.removeAt(i); }, err => { console.log('error delete Instance', err); + if (err.status === 400) { + alert('Cannot delete this instance, other running instances are depending on it'); + } }); - this.removeAt(i); } } this.dialogResult = result; From 17ca119a2f351e26cc1d6f2a2acb405513505b5d Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 7 Mar 2019 13:29:17 +0100 Subject: [PATCH 2/4] Added 'Enter Key press event' for adding a Label --- .../dashboard/label-dialog/label-dialog.component.html | 2 +- .../app/dashboard/label-dialog/label-dialog.component.ts | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/client/src/app/dashboard/label-dialog/label-dialog.component.html b/client/src/app/dashboard/label-dialog/label-dialog.component.html index b24ab3a0..7a80a511 100644 --- a/client/src/app/dashboard/label-dialog/label-dialog.component.html +++ b/client/src/app/dashboard/label-dialog/label-dialog.component.html @@ -4,7 +4,7 @@

Add Label

- + {{getErrorMessage()}}
diff --git a/client/src/app/dashboard/label-dialog/label-dialog.component.ts b/client/src/app/dashboard/label-dialog/label-dialog.component.ts index a66b8253..b74c2f09 100644 --- a/client/src/app/dashboard/label-dialog/label-dialog.component.ts +++ b/client/src/app/dashboard/label-dialog/label-dialog.component.ts @@ -36,6 +36,13 @@ export class LabelDialogComponent implements OnInit { onCloseCancelLabel() { this.thislabelDialogRef.close('CancelLabel'); - } + + onKeydown(event) { + console.log(event); + this.thislabelDialogRef.close({ + status: 'Add', + labelName: this.labelName + }); + } } From 463ca5999db01b4ff60f31712d92f399a6d4f9a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Niclas=20Str=C3=BCwer?= Date: Thu, 7 Mar 2019 15:16:12 +0100 Subject: [PATCH 3/4] Update table-all.component.ts removed unnecessary logs --- client/src/app/dashboard/table-all/table-all.component.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/client/src/app/dashboard/table-all/table-all.component.ts b/client/src/app/dashboard/table-all/table-all.component.ts index 2de282ec..5b3ea881 100644 --- a/client/src/app/dashboard/table-all/table-all.component.ts +++ b/client/src/app/dashboard/table-all/table-all.component.ts @@ -92,16 +92,12 @@ export class TableAllComponent implements OnInit { }); dialogRef.afterClosed().subscribe(result => { - console.log('delete state', instance.instanceState); + if (result === 'Confirm' && instance.instanceState === 'Running') { - console.log('alert working'); alert('Please Stop the Instance before you try to delete'); - console.log('data', this.dataSource.data); - } else { if (result !== 'Cancel') { this.apiService.deleteInstance(id).subscribe((deleteResult: HttpEvent) => { - console.log('result', deleteResult); this.removeAt(i); }, err => { console.log('error delete Instance', err); From 513d6e6f13923253b31fbd9601f3407e9918f727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Niclas=20Str=C3=BCwer?= Date: Thu, 7 Mar 2019 15:17:35 +0100 Subject: [PATCH 4/4] Update label-dialog.component.ts removed logs --- client/src/app/dashboard/label-dialog/label-dialog.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/client/src/app/dashboard/label-dialog/label-dialog.component.ts b/client/src/app/dashboard/label-dialog/label-dialog.component.ts index b74c2f09..4b7c6c44 100644 --- a/client/src/app/dashboard/label-dialog/label-dialog.component.ts +++ b/client/src/app/dashboard/label-dialog/label-dialog.component.ts @@ -39,7 +39,6 @@ export class LabelDialogComponent implements OnInit { } onKeydown(event) { - console.log(event); this.thislabelDialogRef.close({ status: 'Add', labelName: this.labelName