Merged dspace-cris-7 into DSC-1328-fix-show-community-collection

Author: vins01-4science

server.ts

@@ -34,7 +34,7 @@ import { createCertificate } from 'pem';
 import { createServer } from 'https';
 import { json } from 'body-parser';
 
-import { existsSync, readFileSync } from 'fs';
+import { readFileSync } from 'fs';
 import { join } from 'path';
 
 import { enableProdMode } from '@angular/core';
@@ -213,6 +213,11 @@ export function app() {
    */
   server.get('/app/health', healthCheck);
 
+  /**
+   * Checking client status
+   */
+  server.get('/app/client/health', clientHealthCheck);
+
   /**
    * Default sending all incoming requests to ngApp() function, after first checking for a cached
    * copy of the page (see cacheCheck())
@@ -545,6 +550,16 @@ function start() {
   }
 }
 
+/*
+ * The callback function to serve client health check requests
+ */
+function clientHealthCheck(req, res) {
+    const isServerHealthy = true;
+    if (isServerHealthy) {
+      res.status(200).json({ status: 'UP' });
+    }
+}
+
 /*
  * The callback function to serve health check requests
  */

src/app/audit-page/object-audit-overview/object-audit-overview.component.html

@@ -4,7 +4,7 @@ <h2 class="flex-grow-1">{{'audit.object.overview.title' | translate}}</h2>
     </div>
 
     <ng-container *ngIf="object">
-        <h4 class="mt-4 mb-4">{{ object.name }} (<em>{{object.type}})</em></h4>
+        <h4 class="mt-4 mb-4">{{ object.name }} (<em>{{object.type}}</em>)</h4>
 
       <ng-container *ngIf="(auditsRD$ | async)?.payload as audits">
 
@@ -61,6 +61,7 @@ <h4 class="mt-4 mb-4">{{ object.name }} (<em>{{object.type}})</em></h4>
 
       </ng-container>
 
+      <h4 class="mt-4 mb-4" *ngIf="(auditsRD$ | async).statusCode === 404">{{'audit.object.overview.disabled.message' | translate}}</h4>
 
     </ng-container>
 

src/app/core/data/version-history-data.service.ts

@@ -16,7 +16,12 @@ import { VERSION_HISTORY } from '../shared/version-history.resource-type';
 import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { VersionDataService } from './version-data.service';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { getAllSucceededRemoteData, getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload, getRemoteDataPayload } from '../shared/operators';
+import {
+  getAllSucceededRemoteData,
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+  getRemoteDataPayload
+} from '../shared/operators';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { hasValueOperator } from '../../shared/empty.util';
 import { Item } from '../shared/item.model';

src/app/core/layout/models/section.model.ts

@@ -59,6 +59,7 @@ export interface TopSection extends SectionComponent {
   titleKey: string;
   componentType: 'top';
   numberOfItems: number;
+  showThumbnails: boolean;
 }
 
 export interface SearchSection extends SectionComponent {

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/relation/cris-layout-relation-box.component.html

@@ -3,5 +3,7 @@
                               [configuration]="configuration"
                               [searchEnabled]="searchEnabled"
                               [showCharts]="true"
-                              [showScopeSelector]="false">
+                              [showScopeSelector]="false"
+                              [showSearchResultNotice]="showSearchResultNotice$ | async"
+                              [searchResultNotice]="searchResultNotice">
 </ds-configuration-search-page>

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/relation/cris-layout-relation-box.component.spec.ts

@@ -1,14 +1,19 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { ComponentFixture, fakeAsync, TestBed, waitForAsync } from '@angular/core/testing';
 
 import { CrisLayoutRelationBoxComponent } from './cris-layout-relation-box.component';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { CommonModule } from '@angular/common';
 import { SharedModule } from '../../../../../shared/shared.module';
 import { Item } from '../../../../../core/shared/item.model';
-import { of } from 'rxjs';
+import { of as observableOf, of } from 'rxjs';
 import { CrisLayoutBox } from '../../../../../core/layout/models/box.model';
 import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock';
+import { MetadataValue } from '../../../../../core/shared/metadata.models';
+import { Person } from '@angular/cli/utilities/package-json';
+import { AuthService } from '../../../../../core/auth/auth.service';
+import { cold } from 'jasmine-marbles';
+import { EPersonMock, EPersonMock2 } from '../../../../../shared/testing/eperson.mock';
 
 describe('CrisLayoutRelationBoxComponent', () => {
   let component: CrisLayoutRelationBoxComponent;
@@ -25,7 +30,37 @@ describe('CrisLayoutRelationBoxComponent', () => {
     collapsed: false,
     header: 'CrisLayoutBox Header',
     shortname: 'test-box',
-    configuration: of({ configuration: 'box-configuration-id' })
+    configuration: { 'discovery-configuration': 'box-configuration-id' }
+  });
+
+  const relationPublicationsBox = Object.assign(new CrisLayoutBox(), {
+    id: '2',
+    collapsed: false,
+    header: 'Publications',
+    shortname: 'publications',
+    configuration: { 'discovery-configuration': 'RELATION.Person.researchoutputs' }
+  });
+
+  const personItem = Object.assign(new Item(), {
+    id: '1234-65487-12354-1235',
+    bundles: of({}),
+    metadata: {
+      'dspace.entity.type': [{ value: 'Person' }] as MetadataValue[],
+      'dspace.object.owner': [{ value: 'not Owner', authority:  EPersonMock2.id }] as MetadataValue[],
+    }
+  });
+
+  const ownerItem = Object.assign(new Item(), {
+    id: '1234-65487-12354-1235',
+    bundles: of({}),
+    metadata: {
+      'dspace.entity.type': [{ value: 'Person' }] as MetadataValue[],
+      'dspace.object.owner': [{ value: 'Owner', authority: EPersonMock.id }] as MetadataValue[],
+    }
+  });
+
+  const authService = jasmine.createSpyObj('authService', {
+    getAuthenticatedUserFromStore: observableOf(null)
   });
 
   beforeEach(waitForAsync(() => {
@@ -40,25 +75,96 @@ describe('CrisLayoutRelationBoxComponent', () => {
         CommonModule,
         SharedModule
       ],
-      declarations: [ CrisLayoutRelationBoxComponent ],
+      declarations: [CrisLayoutRelationBoxComponent],
       schemas: [NO_ERRORS_SCHEMA],
       providers: [
-        { provide: 'boxProvider', useClass: testBox },
-        { provide: 'itemProvider', useClass: testItem },
+        { provide: 'boxProvider', useValue: testBox },
+        { provide: 'itemProvider', useValue: testItem },
+        { provide: AuthService, useValue: authService },
       ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(CrisLayoutRelationBoxComponent);
     component = fixture.componentInstance;
-    component.box = testBox;
-    component.item = testItem;
-    fixture.detectChanges();
   });
 
-  xit('should have set scope in searchFilter', () => {
-    expect(component.searchFilter).toContain('scope=' + testItem.id);
+  describe('When item is not a Person', () => {
+    beforeEach(() => {
+      component.box = testBox;
+      component.item = testItem;
+      fixture.detectChanges();
+    });
+
+    it('should create CrisLayoutRelationBoxComponent', () => {
+      expect(component).toBeDefined();
+    });
+
+    it('should have set scope in searchFilter', () => {
+      expect(component.searchFilter).toContain('scope=' + testItem.id);
+    });
+
+    it('info message cannot be shown', fakeAsync(() => {
+      expect(component.showSearchResultNotice$).toBeObservable(cold('a', { a: false }));
+    }));
+
+    it('info message has no value', fakeAsync(() => {
+      expect(component.searchResultNotice).toBeUndefined();
+    }));
+  });
+
+  describe('When item is a Person', () => {
+
+    describe('When relation-box of researchoutputs is shown', () => {
+      beforeEach(() => {
+        component.box = relationPublicationsBox;
+      });
+
+      describe('Whenever the personItem is the researcher profile of the logged user', () => {
+        beforeEach(() => {
+          (authService.getAuthenticatedUserFromStore as jasmine.Spy).and.returnValue(observableOf({ id: EPersonMock.id } as Person));
+          component.item = ownerItem;
+          fixture.detectChanges();
+        });
+        it('info message can be shown', fakeAsync(() => {
+          expect(component.showSearchResultNotice$).toBeObservable(cold('a', { a: true }));
+        }));
+        it('info message has value', fakeAsync(() => {
+          expect(component.searchResultNotice).not.toBeUndefined();
+        }));
+      });
+
+      describe('Whenever the personItem is not the researcher profile of the logged user', () => {
+        beforeEach(() => {
+          (authService.getAuthenticatedUserFromStore as jasmine.Spy).and.returnValue(observableOf({ id: 'fake-uuid' } as Person));
+          component.item = personItem;
+          fixture.detectChanges();
+        });
+        it('info message cannot be shown', fakeAsync(() => {
+          expect(component.showSearchResultNotice$).toBeObservable(cold('a', { a: false }));
+        }));
+        it('info message has no value', fakeAsync(() => {
+          expect(component.searchResultNotice).not.toBeUndefined();
+        }));
+      });
+
+      describe('no one is logged', () => {
+        beforeEach(() => {
+          (authService.getAuthenticatedUserFromStore as jasmine.Spy).and.returnValue(observableOf(null as Person));
+          fixture.detectChanges();
+        });
+        it('info message has no value', fakeAsync(() => {
+          // component.showSearchResultNotice$.subscribe(value => expect(value).toBeUndefined());
+          expect(component.showSearchResultNotice$).toBeObservable(cold('a', { a: false }));
+        }));
+        it('info message has no value', fakeAsync(() => {
+          expect(component.searchResultNotice).toBeUndefined();
+        }));
+      });
+
+    });
   });
+
 });

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/relation/cris-layout-relation-box.component.ts

@@ -1,10 +1,17 @@
-import { ChangeDetectorRef, Component, Inject, OnInit } from '@angular/core';
+import { Component, Inject, OnInit } from '@angular/core';
+
+import { BehaviorSubject, Observable, shareReplay } from 'rxjs';
+import { filter, map, take } from 'rxjs/operators';
+import { TranslateService } from '@ngx-translate/core';
+
 import { RenderCrisLayoutBoxFor } from '../../../../decorators/cris-layout-box.decorator';
 import { LayoutBox } from '../../../../enums/layout-box.enum';
 import { CrisLayoutBoxModelComponent } from '../../../../models/cris-layout-box-component.model';
-import { TranslateService } from '@ngx-translate/core';
 import { CrisLayoutBox, RelationBoxConfiguration } from '../../../../../core/layout/models/box.model';
 import { Item } from '../../../../../core/shared/item.model';
+import { AuthService } from '../../../../../core/auth/auth.service';
+import { isNotEmpty } from '../../../../../shared/empty.util';
+import { EPerson } from '../../../../../core/eperson/models/eperson.model';
 
 @Component({
   selector: 'ds-cris-layout-search-box',
@@ -26,15 +33,23 @@ export class CrisLayoutRelationBoxComponent extends CrisLayoutBoxModelComponent
    * flag for enable/disable search bar
    */
   searchEnabled = false;
+
   /**
-   * The width of the sidebar (bootstrap columns)
+   * A boolean representing if to show or not the search notice
    */
-  // sideBarWidth = 3;
+  showSearchResultNotice$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
-  constructor(public cd: ChangeDetectorRef,
-              protected translateService: TranslateService,
-              @Inject('boxProvider') public boxProvider: CrisLayoutBox,
-              @Inject('itemProvider') public itemProvider: Item) {
+  /**
+   * The search notice message
+   */
+  searchResultNotice: string;
+
+  constructor(
+    protected authService: AuthService,
+    protected translateService: TranslateService,
+    @Inject('boxProvider') public boxProvider: CrisLayoutBox,
+    @Inject('itemProvider') public itemProvider: Item
+  ) {
     super(translateService, boxProvider, itemProvider);
   }
 
@@ -43,6 +58,31 @@ export class CrisLayoutRelationBoxComponent extends CrisLayoutBoxModelComponent
 
     this.searchFilter = `scope=${this.item.id}`;
     this.configuration = (this.box.configuration as RelationBoxConfiguration)['discovery-configuration'];
+    const isResearchOutputsConfiguration =
+      this.configuration?.endsWith('researchoutputs') || this.configuration?.endsWith('Publication');
+    if (!this.isPersonEntity() || !isResearchOutputsConfiguration) {
+      this.showSearchResultNotice$.next(false);
+    } else {
+      this.isProfileOwner().pipe(take(1)).subscribe((result) => {
+        this.searchResultNotice = this.translateService.instant('manage.relationships.hidden-related-items-alert');
+        this.showSearchResultNotice$.next(result);
+      });
+    }
+  }
+
+  protected getOwner(user: EPerson) {
+    return this.item.firstMetadataValue('dspace.object.owner', { authority: user.id });
   }
 
+  protected isProfileOwner(): Observable<boolean> {
+    return this.authService.getAuthenticatedUserFromStore().pipe(
+      filter(isNotEmpty),
+      map((user) => isNotEmpty(this.getOwner(user))),
+      shareReplay(1)
+    );
+  }
+
+  protected isPersonEntity(): boolean {
+    return isNotEmpty(this.item.firstMetadataValue('dspace.entity.type', { value: 'Person' }));
+  }
 }

src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.spec.ts

@@ -18,6 +18,7 @@ describe('DsoVersioningModalService', () => {
   let router;
   let workspaceItemDataService;
   let itemService;
+  let editItemService;
 
   const mockItem: Item = Object.assign(new Item(), {
     bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
@@ -48,6 +49,7 @@ describe('DsoVersioningModalService', () => {
     router = jasmine.createSpyObj('router', ['navigateByUrl']);
     workspaceItemDataService = jasmine.createSpyObj('workspaceItemDataService', ['findByItem']);
     itemService = jasmine.createSpyObj('itemService', ['findByHref']);
+    editItemService = jasmine.createSpyObj('editItemService', ['invalidateItemCache']);
 
     service = new DsoVersioningModalService(
       modalService,
@@ -56,7 +58,8 @@ describe('DsoVersioningModalService', () => {
       itemVersionShared,
       router,
       workspaceItemDataService,
-      itemService
+        itemService,
+        editItemService,
     );
   }));
   describe('when onCreateNewVersion() is called', () => {

src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts

@@ -16,6 +16,8 @@ import { ItemVersionsSharedService } from '../../../item-page/versions/item-vers
 import {
   ItemVersionsSummaryModalComponent
 } from '../../../item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component';
+import { EditItemDataService } from '../../../core/submission/edititem-data.service';
+import { fromPromise } from 'rxjs/internal/observable/innerFrom';
 
 /**
  * Service to take care of all the functionality related to the version creation modal
@@ -34,6 +36,7 @@ export class DsoVersioningModalService {
     protected router: Router,
     protected workspaceItemDataService: WorkspaceitemDataService,
     protected itemService: ItemDataService,
+    protected editItemService: EditItemDataService,
   ) {
   }
 
@@ -71,11 +74,9 @@ export class DsoVersioningModalService {
       getFirstSucceededRemoteDataPayload<Item>(),
       switchMap((newVersionItem: Item) => this.workspaceItemDataService.findByItem(newVersionItem.uuid, true, false)),
       getFirstSucceededRemoteDataPayload<WorkspaceItem>(),
-    ).subscribe((wsItem) => {
-      const wsiId = wsItem.id;
-      const route = 'workspaceitems/' + wsiId + '/edit';
-      this.router.navigateByUrl(route);
-    });
+        map((wsItem: WorkspaceItem) => `workspaceitems/${wsItem?.id}/edit`),
+        switchMap((route: string) => fromPromise(this.router.navigateByUrl(route))),
+    ).subscribe(() => this.editItemService.invalidateItemCache(item.uuid));
   }
 
   /**