Merged in task/dspace-cris-2023_02_x/DSC-1852 (pull request DSpace#2028)

[DSC-1852] Fix issue with process notification which were frozen without updating the status of the process

Approved-by: Andrea Barbasso

Author: atarix83

src/app/core/data/processes/process-data.service.ts

@@ -123,8 +123,7 @@ export class ProcessDataService extends IdentifiableDataService<Process> impleme
    * @param processId The ID of the process
    */
   getProcess(processId: string): Observable<RemoteData<Process>> {
-    const href$ = this.getProcessEndpoint(processId);
-    return this.findByHref(href$,false);
+    return this.findById(processId, false);
   }
 
   /**

src/app/shared/notifications/process-notification/process-notification.component.html

@@ -1,4 +1,4 @@
-<div class="notification alert {{notificationType}} alert-dismissible m-3 shadow" role="alert"
+<div class="notification alert {{(notificationType$ | async)}} alert-dismissible m-3 shadow" role="alert"
      [@enterLeave]="animate">
 
     <button *ngIf="notification.options.clickToClose"
@@ -25,8 +25,8 @@
         </strong>
       </div>
 
-      <span  *ngIf="(finished | async)" class="notification-content pl-1">
-        {{process.processStatus.toString() | titlecase}}
+      <span *ngIf="(finished | async)" class="notification-content pl-1">
+        {{(processStatus$ | async) | translate}}
       </span>
       <span *ngIf="!(finished | async)" class="notification-content pl-1">
         {{'process.new.notification.process.processing' | translate}}
@@ -37,17 +37,13 @@
         </div>
       </div>
 
-      <div  *ngIf="(finished | async) && files && files?.length > 0">
+      <div  *ngIf="(finished | async) && (files$ | async)?.length > 0">
           <div class="notification-content pl-1">{{ 'process.new.notification.process.files' | translate}}</div>
+          <ds-file-download-link class="pl-1" *ngFor="let file of (files$ | async); let last=last;" [bitstream]="file">
+            <span>{{getFileName(file)}}</span>
+            <span>({{(file?.sizeBytes) | dsFileSize }})</span>
+          </ds-file-download-link>
       </div>
-
-      <div class="pl-2" *ngIf="(finished | async) && files && files?.length > 0">
-        <ds-file-download-link *ngFor="let file of files; let last=last;" [bitstream]="file">
-          <span>{{getFileName(file)}}</span>
-          <span>({{(file?.sizeBytes) | dsFileSize }})</span>
-        </ds-file-download-link>
-      </div>
-
   </div>
 
 

src/app/shared/notifications/process-notification/process-notification.component.ts

@@ -1,17 +1,19 @@
-import { BehaviorSubject, Observable, of as observableOf, Subscription, timer } from 'rxjs';
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
   Input,
-  NgZone,
   OnDestroy,
   OnInit,
   TemplateRef,
   ViewEncapsulation
 } from '@angular/core';
 import { trigger } from '@angular/animations';
 import { DomSanitizer } from '@angular/platform-browser';
+
+import { BehaviorSubject, Observable, of as observableOf, Subscription, timer } from 'rxjs';
+import { filter, map, switchMap, take, tap } from 'rxjs/operators';
+
 import { NotificationsService } from '../notifications.service';
 import { scaleEnter, scaleInState, scaleLeave, scaleOutState } from '../../animations/scale';
 import { rotateEnter, rotateInState, rotateLeave, rotateOutState } from '../../animations/rotate';
@@ -26,9 +28,10 @@ import { IProcessNotification } from '../models/process-notification.model';
 import { ProcessDataService } from '../../../core/data/processes/process-data.service';
 import { Process } from '../../../process-page/processes/process.model';
 import { Bitstream } from '../../../core/shared/bitstream.model';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteListPayload } from '../../../core/shared/operators';
+import { getAllCompletedRemoteData, getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { RemoteData } from '../../../core/data/remote-data';
 
 @Component({
   selector: 'ds-process-notification',
@@ -84,7 +87,7 @@ export class ProcessNotificationComponent implements OnInit, OnDestroy {
   /**
    * The process that is being checked.
    */
-  public process: Process;
+  public processStatus$: BehaviorSubject<string> = new BehaviorSubject('');
 
   /**
    * If process checking is finished.
@@ -94,76 +97,76 @@ export class ProcessNotificationComponent implements OnInit, OnDestroy {
   /**
    * Files generated from process end.
    */
-  public files: Bitstream[];
+  public files$: BehaviorSubject<Bitstream[]> = new BehaviorSubject<Bitstream[]>([]);
 
   /**
    * Type of the notification visualisation.
    */
-  public notificationType = 'alert-info';
+  public notificationType$: BehaviorSubject<string> = new BehaviorSubject('alert-info');
 
   constructor(private notificationService: NotificationsService,
               private domSanitizer: DomSanitizer,
               protected processService: ProcessDataService,
               protected nameService: DSONameService,
               private cdr: ChangeDetectorRef,
-              private zone: NgZone) {
+  ) {
   }
 
   /**
    * On init, start check process, and insert notifications information.
    */
   ngOnInit(): void {
     this.animate = this.notification.options.animate + NotificationAnimationsStatus.In;
-    this.initCheckProcess();
+    this.pollUntilProcessFinished();
     this.html = this.notification.html;
     this.contentType(this.notification.title, 'title');
   }
 
   /**
-   * Initialization of timer.
-   */
-  initCheckProcess() {
-    const source = timer(0, this.notification.checkTime);
-    this.sub = source.subscribe(val => {
-      this.checkProcess();
+   * Poll process endpoint until it's finished.
+   */
+  pollUntilProcessFinished() {
+    timer(0, this.notification.checkTime).pipe(
+      switchMap(() => this.processService.getProcess(this.notification.processId)),
+      getAllCompletedRemoteData(),
+      filter((res: RemoteData<Process>) => res.hasFailed || res?.payload?.processStatus.toString() === 'COMPLETED' || res?.payload?.processStatus.toString() === 'FAILED'),
+      take(1),
+      tap((res: RemoteData<Process>) => this.pollingFinishedFor(res)),
+      switchMap((res: RemoteData<Process>) => this.getFiles(res)),
+    ).subscribe((files: Bitstream[]) => {
+      const logFiles = files.filter( (file) => !this.getFileName(file).includes('.log'));
+      this.files$.next(logFiles);
+      this.finished.next(true);
     });
   }
 
   /**
-   * Send request to get the updated process information.
-   */
-  checkProcess() {
-    this.processService.getProcess(this.notification.processId)
-    .pipe(getFirstCompletedRemoteData())
-    .subscribe( (res) => {
-      this.process = res.payload;
-      this.zone.run(() => this.cdr.detectChanges());
-      if (this.process.processStatus.toString() === 'COMPLETED' || this.process.processStatus.toString() === 'FAILED') {
-        this.sub.unsubscribe();
-        if (this.process.processStatus.toString() === 'COMPLETED') {
-          this.notificationType = 'alert-success';
-          this.getFiles();
-        } else {
-          this.notificationType = 'alert-danger';
-          this.zone.run(() => this.cdr.detectChanges());
-        }
-        this.finished.next(true);
-      }
-    });
+   * Handle process results
+   *
+   * @param processRD The RemoteData object for finished process
+   */
+  pollingFinishedFor(processRD: RemoteData<Process>) {
+    if (processRD.hasSucceeded && processRD.payload.processStatus.toString() === 'COMPLETED') {
+      this.notificationType$.next('alert-success');
+      this.processStatus$.next('process.new.notification.process.status.completed');
+    } else {
+      this.processStatus$.next('process.new.notification.process.status.failed');
+      this.notificationType$.next('alert-danger');
+    }
   }
 
   /**
    * When the process is completed get the files output.
    */
-  getFiles() {
-    this.processService.getFiles(this.notification.processId)
-    .pipe(
-      getFirstSucceededRemoteListPayload(),
-     )
-    .subscribe( (files: Bitstream[]) => {
-      this.files = files.filter( (file) => !this.getFileName(file).includes('.log'));
-      this.zone.run(() => this.cdr.detectChanges());
-    });
+  getFiles(processRD: RemoteData<Process>): Observable<Bitstream[]> {
+    if (processRD.hasSucceeded && processRD.payload.processStatus.toString() === 'COMPLETED') {
+      return this.processService.getFiles(processRD.payload.processId).pipe(
+        getFirstCompletedRemoteData(),
+        map((response) => response.hasSucceeded ? response.payload.page : [])
+      );
+    } else {
+      return observableOf([]);
+    }
   }
 
   /**

src/assets/i18n/en.json5

@@ -4459,6 +4459,10 @@
 
   "process.new.notification.process.files": "Output Files: ",
 
+  "process.new.notification.process.status.completed": "Completed",
+
+  "process.new.notification.process.status.failed": "Failed",
+
   "process.new.header": "Create a new process",
 
   "process.new.title": "Create a new process",