nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1370: A deleted task is immediately removed from the task list

This commit is contained in:
Sofie Hofmann 2020-09-15 10:21:37 +02:00
parent 0a5ec9e701
commit 72476bc76d
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/app/shared/components/pagination/pagination.component.ts
View File

@ -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'; import { Page } from 'app/shared/models/page';
@Component({ @Component({

1
web/src/app/shared/services/forms-validator/forms-validator.service.ts
View File

@ -110,7 +110,6 @@ export class FormsValidatorService {
} }
validateInputOverflow(inputFieldModel: NgModel, maxLength: Number, event?: any): void { validateInputOverflow(inputFieldModel: NgModel, maxLength: Number, event?: any): void {
console.log(event);
if (this.overflowErrorSubscriptionMap.has(inputFieldModel.name)) { if (this.overflowErrorSubscriptionMap.has(inputFieldModel.name)) {
this.overflowErrorSubscriptionMap.get(inputFieldModel.name).unsubscribe(); this.overflowErrorSubscriptionMap.get(inputFieldModel.name).unsubscribe();
} }

7
web/src/app/workplace/components/task-master/task-master.component.ts
View File

@ -67,6 +67,11 @@ export class TaskMasterComponent implements OnInit, OnDestroy {
this.getTasks(); this.getTasks();
}); });
this.taskService.taskDeletedStream.pipe(takeUntil(this.destroy$)).subscribe(() => {
this.selectedId = '';
this.getTasks();
});
this.orientationService this.orientationService
.getOrientation() .getOrientation()
.pipe(takeUntil(this.destroy$)) .pipe(takeUntil(this.destroy$))
@ -148,7 +153,7 @@ export class TaskMasterComponent implements OnInit, OnDestroy {
.pipe(takeUntil(this.destroy$)) .pipe(takeUntil(this.destroy$))
.subscribe((taskResource) => { .subscribe((taskResource) => {
this.requestInProgress = false; this.requestInProgress = false;
if (taskResource.tasks && taskResource.tasks.length > 1) { if (taskResource.tasks && taskResource.tasks.length > 0) {
this.tasks = taskResource.tasks; this.tasks = taskResource.tasks;
} else { } else {
this.tasks = []; this.tasks = [];

2
web/src/app/workplace/components/taskdetails/taskdetails.component.ts
View File

@ -110,7 +110,7 @@ export class TaskdetailsComponent implements OnInit, OnDestroy {
deleteTaskConfirmation(): void { deleteTaskConfirmation(): void {
this.deleteTaskSubscription = this.taskService.deleteTask(this.task).subscribe( this.deleteTaskSubscription = this.taskService.deleteTask(this.task).subscribe(
() => { () => {
this.taskService.publishUpdatedTask(); this.taskService.publishTaskDeletion();
this.task = null; this.task = null;
this.router.navigate(['taskana/workplace/tasks']); this.router.navigate(['taskana/workplace/tasks']);
}, },

6
web/src/app/workplace/services/task.service.ts
View File

@ -14,6 +14,8 @@ export class TaskService {
taskChangedStream = this.taskChangedSource.asObservable(); taskChangedStream = this.taskChangedSource.asObservable();
private taskSelectedSource = new Subject<Task>(); private taskSelectedSource = new Subject<Task>();
taskSelectedStream = this.taskSelectedSource.asObservable(); taskSelectedStream = this.taskSelectedSource.asObservable();
private taskDeletedSource = new Subject<Task>();
taskDeletedStream = this.taskDeletedSource.asObservable();
constructor(private httpClient: HttpClient, private startupService: StartupService) {} constructor(private httpClient: HttpClient, private startupService: StartupService) {}
@ -25,6 +27,10 @@ export class TaskService {
this.taskChangedSource.next(task); this.taskChangedSource.next(task);
} }
publishTaskDeletion() {
this.taskDeletedSource.next();
}
selectTask(task?: Task) { selectTask(task?: Task) {
this.taskSelectedSource.next(task); this.taskSelectedSource.next(task);
} }