Merge branch 'next-minor' into story/modeler-extension

valtimo-platform · Dec 3, 2024 · 43e1f8e · 43e1f8e
2 parents 7aca4bf + 39581a1
commit 43e1f8e
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 10 deletions.
diff --git a/...ts/valtimo/task/src/lib/components/assign-user-to-task/assign-user-to-task.component.scss b/...ts/valtimo/task/src/lib/components/assign-user-to-task/assign-user-to-task.component.scss
@@ -16,6 +16,8 @@
 
 .container-fluid {
   color: #959595;
+  padding: 0;
+  margin: 0;
 }
 
 i {

diff --git a/...ects/valtimo/task/src/lib/components/task-detail-content/task-detail-content.component.ts b/...ects/valtimo/task/src/lib/components/task-detail-content/task-detail-content.component.ts
@@ -93,6 +93,10 @@ export class TaskDetailContentComponent implements OnInit, OnDestroy {
 
     this.loadTaskDetails(value.task as any, value.processLinkActivityResult);
   }
+  @Input() public set modalClosed(_: boolean) {
+    // save form flow data on modal closed
+    if (this.formFlow) this.formFlow.saveData();
+  }
   @Output() public readonly closeModalEvent = new EventEmitter();
   @Output() public readonly formSubmit = new EventEmitter();
   @Output() public readonly activeChange = new EventEmitter<boolean>();
@@ -247,7 +251,9 @@ export class TaskDetailContentComponent implements OnInit, OnDestroy {
       )
       .subscribe({
         next: (intermediateSubmission: IntermediateSubmission) => {
-          this.taskIntermediateSaveService.setSubmission({data: intermediateSubmission.submission});
+          this.taskIntermediateSaveService.setSubmission({
+            data: intermediateSubmission?.submission || {},
+          });
 
           if (formViewModelComponentRef) {
             formViewModelComponentRef.instance.submission = {

diff --git a/...c/lib/components/task-detail-intermediate-save/task-detail-intermediate-save.component.ts b/...c/lib/components/task-detail-intermediate-save/task-detail-intermediate-save.component.ts
@@ -180,7 +180,14 @@ export class TaskDetailIntermediateSaveComponent {
       .getIntermediateSubmission(task.id ?? '')
       .pipe(take(1))
       .subscribe(intermediateSave => {
-        this.currentIntermediateSave = this.formatIntermediateSubmission(intermediateSave);
+        if (intermediateSave !== null) {
+          this.currentIntermediateSave = this.formatIntermediateSubmission(intermediateSave);
+        } else {
+          this.currentIntermediateSave = null;
+          this.taskIntermediateSaveService.setSubmission({});
+        }
+
+        this.currentIntermediateSaveEvent.emit(this.currentIntermediateSave);
       });
   }
 }
diff --git a/projects/valtimo/task/src/lib/components/task-detail-modal/task-detail-modal.component.html b/projects/valtimo/task/src/lib/components/task-detail-modal/task-detail-modal.component.html
@@ -66,12 +66,14 @@
     @if (processLinkPreloaded$ | async) {
       <valtimo-task-detail-content
         [taskAndProcessLink]="taskAndProcessLink$ | async"
+        [modalClosed]="modalCloseEvent$ | async"
         (formSubmit)="onFormSubmit()"
         (closeModalEvent)="closeModal()"
       ></valtimo-task-detail-content>
     } @else {
       <valtimo-task-detail-content
         [task]="task$ | async"
+        [modalClosed]="modalCloseEvent$ | async"
         (formSubmit)="onFormSubmit()"
         (closeModalEvent)="closeModal()"
       ></valtimo-task-detail-content>

diff --git a/projects/valtimo/task/src/lib/components/task-detail-modal/task-detail-modal.component.ts b/projects/valtimo/task/src/lib/components/task-detail-modal/task-detail-modal.component.ts
@@ -70,6 +70,8 @@ export class TaskDetailModalComponent implements OnInit {
 
   public readonly canAssignUserToTask$ = new BehaviorSubject<boolean>(false);
 
+  public readonly modalCloseEvent$ = new BehaviorSubject<boolean>(false);
+
   private readonly _subscriptions = new Subscription();
 
   constructor(
@@ -118,7 +120,7 @@ export class TaskDetailModalComponent implements OnInit {
   public openTaskAndProcessLinkDetails(taskWithProcessLink: TaskWithProcessLink | null): void {
     this.processLinkPreloaded$.next(true);
     this.taskAndProcessLink$.next(taskWithProcessLink);
-    this.task$.next(taskWithProcessLink.task as any);
+    this.task$.next({...(taskWithProcessLink.task as any)});
     this.page$.next({
       title: taskWithProcessLink.task?.name,
       subtitle: `${this.translateService.instant('taskDetail.taskCreated')} ${taskWithProcessLink.task?.created}`,
@@ -147,6 +149,7 @@ export class TaskDetailModalComponent implements OnInit {
   public closeModal(): void {
     this._modal.open = false;
     this.taskIntermediateSaveService.setSubmission({});
+    this.modalCloseEvent$.next(!this.modalCloseEvent$.getValue());
   }
 
   private openModal(): void {

diff --git a/projects/valtimo/task/src/lib/services/task-intermediate-save.service.ts b/projects/valtimo/task/src/lib/services/task-intermediate-save.service.ts
@@ -17,7 +17,7 @@ import {HttpClient, HttpHeaders} from '@angular/common/http';
 import {Injectable} from '@angular/core';
 import {BaseApiService, ConfigService} from '@valtimo/config';
 import {InterceptorSkip} from '@valtimo/security';
-import {BehaviorSubject, Observable, filter} from 'rxjs';
+import {BehaviorSubject, catchError, filter, Observable, of} from 'rxjs';
 import {IntermediateSaveRequest, IntermediateSubmission} from '../models';
 
 @Injectable({providedIn: 'root'})
@@ -39,16 +39,17 @@ export class TaskIntermediateSaveService extends BaseApiService {
     super(httpClient, configService);
   }
 
-  public getIntermediateSubmission(taskInstanceId: string): Observable<IntermediateSubmission> {
-    return this.httpClient.get<IntermediateSubmission>(
-      this.getApiUrl('/v1/form/intermediate/submission'),
-      {
+  public getIntermediateSubmission(
+    taskInstanceId: string
+  ): Observable<IntermediateSubmission | null> {
+    return this.httpClient
+      .get<IntermediateSubmission>(this.getApiUrl('/v1/form/intermediate/submission'), {
         params: {
           taskInstanceId,
         },
         headers: new HttpHeaders().set(InterceptorSkip, '404'),
-      }
-    );
+      })
+      .pipe(catchError(() => of(null)));
   }
 
   public storeIntermediateSubmission(