From 72476bc76d1b25adc1afed52c3ca9e45d703aa76 Mon Sep 17 00:00:00 2001
From: Sofie Hofmann <29145005+sofie29@users.noreply.github.com>
Date: Tue, 15 Sep 2020 10:21:37 +0200
Subject: [PATCH] TSK-1370: A deleted task is immediately removed from the task
 list

---
 .../shared/components/pagination/pagination.component.ts   | 2 +-
 .../services/forms-validator/forms-validator.service.ts    | 1 -
 .../components/task-master/task-master.component.ts        | 7 ++++++-
 .../components/taskdetails/taskdetails.component.ts        | 2 +-
 web/src/app/workplace/services/task.service.ts             | 6 ++++++
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/web/src/app/shared/components/pagination/pagination.component.ts b/web/src/app/shared/components/pagination/pagination.component.ts
index dde599d68..0a8f2d839 100644
--- a/web/src/app/shared/components/pagination/pagination.component.ts
+++ b/web/src/app/shared/components/pagination/pagination.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, Input, Output, EventEmitter, OnChanges, SimpleChanges } from '@angular/core';
+import { Component, Input, Output, EventEmitter, OnChanges, SimpleChanges } from '@angular/core';
 import { Page } from 'app/shared/models/page';
 
 @Component({
diff --git a/web/src/app/shared/services/forms-validator/forms-validator.service.ts b/web/src/app/shared/services/forms-validator/forms-validator.service.ts
index 6363aabf9..9bb8dc85b 100644
--- a/web/src/app/shared/services/forms-validator/forms-validator.service.ts
+++ b/web/src/app/shared/services/forms-validator/forms-validator.service.ts
@@ -110,7 +110,6 @@ export class FormsValidatorService {
   }
 
   validateInputOverflow(inputFieldModel: NgModel, maxLength: Number, event?: any): void {
-    console.log(event);
     if (this.overflowErrorSubscriptionMap.has(inputFieldModel.name)) {
       this.overflowErrorSubscriptionMap.get(inputFieldModel.name).unsubscribe();
     }
diff --git a/web/src/app/workplace/components/task-master/task-master.component.ts b/web/src/app/workplace/components/task-master/task-master.component.ts
index 75396d58f..23c5b0bb9 100644
--- a/web/src/app/workplace/components/task-master/task-master.component.ts
+++ b/web/src/app/workplace/components/task-master/task-master.component.ts
@@ -67,6 +67,11 @@ export class TaskMasterComponent implements OnInit, OnDestroy {
       this.getTasks();
     });
 
+    this.taskService.taskDeletedStream.pipe(takeUntil(this.destroy$)).subscribe(() => {
+      this.selectedId = '';
+      this.getTasks();
+    });
+
     this.orientationService
       .getOrientation()
       .pipe(takeUntil(this.destroy$))
@@ -148,7 +153,7 @@ export class TaskMasterComponent implements OnInit, OnDestroy {
         .pipe(takeUntil(this.destroy$))
         .subscribe((taskResource) => {
           this.requestInProgress = false;
-          if (taskResource.tasks && taskResource.tasks.length > 1) {
+          if (taskResource.tasks && taskResource.tasks.length > 0) {
             this.tasks = taskResource.tasks;
           } else {
             this.tasks = [];
diff --git a/web/src/app/workplace/components/taskdetails/taskdetails.component.ts b/web/src/app/workplace/components/taskdetails/taskdetails.component.ts
index 90006c38f..1cf38ad67 100644
--- a/web/src/app/workplace/components/taskdetails/taskdetails.component.ts
+++ b/web/src/app/workplace/components/taskdetails/taskdetails.component.ts
@@ -110,7 +110,7 @@ export class TaskdetailsComponent implements OnInit, OnDestroy {
   deleteTaskConfirmation(): void {
     this.deleteTaskSubscription = this.taskService.deleteTask(this.task).subscribe(
       () => {
-        this.taskService.publishUpdatedTask();
+        this.taskService.publishTaskDeletion();
         this.task = null;
         this.router.navigate(['taskana/workplace/tasks']);
       },
diff --git a/web/src/app/workplace/services/task.service.ts b/web/src/app/workplace/services/task.service.ts
index e42383358..d656cbbc4 100644
--- a/web/src/app/workplace/services/task.service.ts
+++ b/web/src/app/workplace/services/task.service.ts
@@ -14,6 +14,8 @@ export class TaskService {
   taskChangedStream = this.taskChangedSource.asObservable();
   private taskSelectedSource = new Subject<Task>();
   taskSelectedStream = this.taskSelectedSource.asObservable();
+  private taskDeletedSource = new Subject<Task>();
+  taskDeletedStream = this.taskDeletedSource.asObservable();
 
   constructor(private httpClient: HttpClient, private startupService: StartupService) {}
 
@@ -25,6 +27,10 @@ export class TaskService {
     this.taskChangedSource.next(task);
   }
 
+  publishTaskDeletion() {
+    this.taskDeletedSource.next();
+  }
+
   selectTask(task?: Task) {
     this.taskSelectedSource.next(task);
   }