Merge pull request DSpace#3013 from atmire/process-ui-null-eperson-fix-7.6

[Port dspace-7_x] Handle Null Users Gracefully in Process Overview Page

Author: tdonohue

src/app/process-page/overview/process-overview.component.spec.ts

@@ -1,7 +1,7 @@
 import { ProcessOverviewComponent } from './process-overview.component';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { VarDirective } from '../../shared/utils/var.directive';
-import { TranslateModule } from '@ngx-translate/core';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { ProcessDataService } from '../../core/data/processes/process-data.service';
@@ -33,6 +33,8 @@ describe('ProcessOverviewComponent', () => {
   let processBulkDeleteService;
   let modalService;
 
+  let translateServiceSpy: jasmine.SpyObj<TranslateService>;
+
   const pipe = new DatePipe('en-US');
 
   function init() {
@@ -42,24 +44,29 @@ describe('ProcessOverviewComponent', () => {
         scriptName: 'script-name',
         startTime: '2020-03-19 00:30:00',
         endTime: '2020-03-19 23:30:00',
-        processStatus: ProcessStatus.COMPLETED
+        processStatus: ProcessStatus.COMPLETED,
+        userId: 'testid'
       }),
       Object.assign(new Process(), {
         processId: 2,
         scriptName: 'script-name',
         startTime: '2020-03-20 00:30:00',
         endTime: '2020-03-20 23:30:00',
-        processStatus: ProcessStatus.FAILED
+        processStatus: ProcessStatus.FAILED,
+        userId: 'testid'
       }),
       Object.assign(new Process(), {
         processId: 3,
         scriptName: 'another-script-name',
         startTime: '2020-03-21 00:30:00',
         endTime: '2020-03-21 23:30:00',
-        processStatus: ProcessStatus.RUNNING
+        processStatus: ProcessStatus.RUNNING,
+        userId: 'testid'
       })
     ];
     ePerson = Object.assign(new EPerson(), {
+      id: 'testid',
+      uuid: 'testid',
       metadata: {
         'eperson.firstname': [
           {
@@ -110,6 +117,9 @@ describe('ProcessOverviewComponent', () => {
 
   beforeEach(waitForAsync(() => {
     init();
+
+    translateServiceSpy = jasmine.createSpyObj('TranslateService', ['get']);
+
     TestBed.configureTestingModule({
       declarations: [ProcessOverviewComponent, VarDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
@@ -249,4 +259,43 @@ describe('ProcessOverviewComponent', () => {
       expect(component.setProcesses).toHaveBeenCalled();
     });
   });
+
+  describe('getEPersonName function', () => {
+    it('should return unknown user when id is null', (done: DoneFn) => {
+      const id = null;
+      const expectedTranslation = 'process.overview.unknown.user';
+
+      translateServiceSpy.get(expectedTranslation);
+
+      component.getEpersonName(id).subscribe((result: string) => {
+        expect(result).toBe(expectedTranslation);
+        done();
+      });
+      expect(translateServiceSpy.get).toHaveBeenCalledWith('process.overview.unknown.user');
+    });
+
+    it('should return unknown user when id is invalid', (done: DoneFn) => {
+      const id = '';
+      const expectedTranslation = 'process.overview.unknown.user';
+
+      translateServiceSpy.get(expectedTranslation);
+
+      component.getEpersonName(id).subscribe((result: string) => {
+        expect(result).toBe(expectedTranslation);
+        done();
+      });
+      expect(translateServiceSpy.get).toHaveBeenCalledWith('process.overview.unknown.user');
+    });
+
+    it('should return EPerson name when id is correct', (done: DoneFn) => {
+      const id = 'testid';
+      const expectedName = 'John Doe';
+
+      component.getEpersonName(id).subscribe((result: string) => {
+        expect(result).toEqual(expectedName);
+        done();
+      });
+      expect(translateServiceSpy.get).not.toHaveBeenCalled();
+    });
+  });
 });

src/app/process-page/overview/process-overview.component.ts

@@ -5,16 +5,17 @@ import { PaginatedList } from '../../core/data/paginated-list.model';
 import { Process } from '../processes/process.model';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { EPerson } from '../../core/eperson/models/eperson.model';
-import { map, switchMap } from 'rxjs/operators';
+import { switchMap } from 'rxjs/operators';
 import { ProcessDataService } from '../../core/data/processes/process-data.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { FindListOptions } from '../../core/data/find-list-options.model';
 import { ProcessBulkDeleteService } from './process-bulk-delete.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { hasValue } from '../../shared/empty.util';
+import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'ds-process-overview',
@@ -61,6 +62,7 @@ export class ProcessOverviewComponent implements OnInit, OnDestroy {
               protected modalService: NgbModal,
               public processBulkDeleteService: ProcessBulkDeleteService,
               protected dsoNameService: DSONameService,
+              private translateService: TranslateService,
   ) {
   }
 
@@ -83,10 +85,20 @@ export class ProcessOverviewComponent implements OnInit, OnDestroy {
    * @param id  ID of the EPerson
    */
   getEpersonName(id: string): Observable<string> {
-    return this.ePersonService.findById(id).pipe(
-      getFirstSucceededRemoteDataPayload(),
-      map((eperson: EPerson) => this.dsoNameService.getName(eperson)),
-    );
+    if (isNotEmpty(id)) {
+      return this.ePersonService.findById(id).pipe(
+        getFirstCompletedRemoteData(),
+        switchMap((rd: RemoteData<EPerson>) => {
+          if (rd.hasSucceeded) {
+            return [this.dsoNameService.getName(rd.payload)];
+          } else {
+            return this.translateService.get('process.overview.unknown.user');
+          }
+        })
+      );
+    } else {
+      return this.translateService.get('process.overview.unknown.user');
+    }
   }
 
   ngOnDestroy(): void {

src/assets/i18n/en.json5

@@ -5360,4 +5360,6 @@
 
   "vocabulary-treeview.search.form.add": "Add",
 
+  "process.overview.unknown.user": "Unknown",
+
 }