Merged dspace-cris-7 into DSC-1023

Author: corrad82-4s

src/app/app-routing-paths.ts

@@ -142,4 +142,11 @@ export function getEditItemPageRoute() {
 export function getSubscriptionsModuleRoute() {
   return `/${SUBSCRIPTIONS_MODULE_PATH}`;
 }
+
 export const SUBSCRIPTIONS_MODULE_PATH = 'subscriptions';
+
+export const STATISTICS_PAGE_PATH = 'statistics';
+
+export function getStatisticsModuleRoute() {
+  return `/${STATISTICS_PAGE_PATH}`;
+}

src/app/app-routing.module.ts

@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { RouterModule, NoPreloading } from '@angular/router';
+import { NoPreloading, RouterModule } from '@angular/router';
 import { AuthBlockingGuard } from './core/auth/auth-blocking.guard';
 
 import { AuthenticatedGuard } from './core/auth/authenticated.guard';
@@ -10,9 +10,9 @@ import {
   ACCESS_CONTROL_MODULE_PATH,
   ADMIN_MODULE_PATH,
   BITSTREAM_MODULE_PATH,
-  ERROR_PAGE,
   BULK_IMPORT_PATH,
   EDIT_ITEM_PATH,
+  ERROR_PAGE,
   FORBIDDEN_PATH,
   FORGOT_PASSWORD_PATH,
   HEALTH_PAGE_PATH,
@@ -22,6 +22,7 @@ import {
   PROFILE_MODULE_PATH,
   REGISTER_PATH,
   REQUEST_COPY_MODULE_PATH,
+  STATISTICS_PAGE_PATH,
   WORKFLOW_ITEM_MODULE_PATH,
 } from './app-routing-paths';
 import { COLLECTION_MODULE_PATH } from './collection-page/collection-page-routing-paths';
@@ -43,7 +44,7 @@ import { ServerCheckGuard } from './core/server-check/server-check.guard';
 import { MenuResolver } from './menu.resolver';
 import { ThemedPageErrorComponent } from './page-error/themed-page-error.component';
 import { SUGGESTION_MODULE_PATH } from './suggestions-page/suggestions-page-routing-paths';
-import { StatisticsAdministratorGuard } from './core/data/feature-authorization/feature-authorization-guard/statistics-administrator.guard';
+import { RedirectService } from './redirect/redirect.service';
 
 @NgModule({
   imports: [
@@ -247,7 +248,7 @@ import { StatisticsAdministratorGuard } from './core/data/feature-authorization/
             component: ThemedForbiddenComponent
           },
           {
-            path: 'statistics',
+            path: STATISTICS_PAGE_PATH,
             loadChildren: () => import('./statistics-page/statistics-page-routing.module')
               .then((m) => m.StatisticsPageRoutingModule),
           },
@@ -282,7 +283,7 @@ import { StatisticsAdministratorGuard } from './core/data/feature-authorization/
             loadChildren: () => import('./invitation/invitation.module')
               .then((m) => m.InvitationModule)
           },
-          { path: '**', pathMatch: 'full', component: ThemedPageNotFoundComponent },
+          { path: '**', pathMatch: 'full', component: ThemedPageNotFoundComponent, canActivate: [RedirectService] },
         ]
       }
     ], {

src/app/core/data/base/search-data.spec.ts

@@ -8,9 +8,12 @@
 import { constructSearchEndpointDefault, SearchData, SearchDataImpl } from './search-data';
 import { FindListOptions } from '../find-list-options.model';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
-import { of as observableOf } from 'rxjs';
+import { of, of as observableOf } from 'rxjs';
 import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
 import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
+import { TestScheduler } from 'rxjs/testing';
+import { RemoteData } from '../remote-data';
+import { RequestEntryState } from '../request-entry-state.model';
 
 /**
  * Tests whether calls to `SearchData` methods are correctly patched through in a concrete data service that implements it
@@ -19,6 +22,12 @@ export function testSearchDataImplementation(serviceFactory: () => SearchData<an
   let service;
 
   describe('SearchData implementation', () => {
+    let testScheduler: TestScheduler;
+    const searchByResp = Object.assign(
+      new RemoteData(0, 0, 0, undefined, undefined, {}, 200),
+      { state: RequestEntryState.Success, payload: 'TEST searchBy' }
+    );
+    const searchByResp$ = of(searchByResp);
     const OPTIONS = Object.assign(new FindListOptions(), { elementsPerPage: 10, currentPage: 3 });
     const FOLLOWLINKS = [
       followLink('test'),
@@ -27,16 +36,27 @@ export function testSearchDataImplementation(serviceFactory: () => SearchData<an
 
     beforeAll(() => {
       service = serviceFactory();
-      (service as any).searchData = jasmine.createSpyObj('searchData', {
-        searchBy: 'TEST searchBy',
+      (service as any).searchData = jasmine.createSpyObj('searchData', ['searchBy']);
+      service.searchData.searchBy.and.returnValue(searchByResp$);
+    });
+
+    beforeEach(() => {
+      testScheduler = new TestScheduler((actual, expected) => {
+        return expect(actual).toEqual(expected);
       });
     });
 
     it('should handle calls to searchBy', () => {
+      const expectedMarbles = '(a|)';
+      const expectedValues = {
+        a: searchByResp
+      };
       const out: any = service.searchBy('searchMethod', OPTIONS, false, true, ...FOLLOWLINKS);
 
       expect((service as any).searchData.searchBy).toHaveBeenCalledWith('searchMethod', OPTIONS, false, true, ...FOLLOWLINKS);
-      expect(out).toBe('TEST searchBy');
+      testScheduler.run(({ expectObservable }) => {
+        expectObservable(out).toBe(expectedMarbles, expectedValues);
+      });
     });
   });
 }

src/app/core/data/bitstream-data.service.ts

@@ -352,7 +352,7 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
     uuid: string,
     bundlename: string,
     metadataFilters: MetadataFilter[],
-    options: FindListOptions,
+    options?: FindListOptions,
     useCachedVersionIfAvailable = true,
     reRequestOnStale = true,
     ...linksToFollow: FollowLinkConfig<Bitstream>[]

src/app/core/export-service/browser-export.service.ts

@@ -0,0 +1,71 @@
+import { ExportAsConfig, ExportAsService } from 'ngx-export-as';
+import { toJpeg, toPng } from 'html-to-image';
+import { Options } from 'html-to-image/es/types';
+import { saveAs } from 'file-saver';
+import { BehaviorSubject } from 'rxjs';
+
+import { ExportImageType, ExportService } from './export.service';
+
+/**
+ *  IMPORTANT
+ *  Due to a problem occurring on SSR with the ExportAsService dependency, which use window object, this service can't be injected.
+ *  So we need to instantiate the class directly based on current the platform whn is needed
+ *  TODO To be refactored when https://github.com/wnabil/ngx-export-as/pull/112 is fixed
+ */
+export class BrowserExportService implements ExportService {
+
+  /**
+   * Configuration for CSV export process
+   */
+  exportAsConfig: ExportAsConfig;
+
+  /**
+   * Creates excel from the table element reference.
+   *
+   * @param type of export.
+   * @param fileName is the file name to save as.
+   * @param elementIdOrContent is the content that is being exported.
+   * @param download option if it's going to be downloaded.
+   */
+  exportAsFile(type: any, elementIdOrContent: string, fileName: string, download: boolean = true) {
+
+    this.exportAsConfig = {
+      type:type,
+      elementIdOrContent: elementIdOrContent,
+      fileName:fileName,
+      download:download
+    };
+
+    const exportAsService: ExportAsService = new ExportAsService();
+    return exportAsService.save(this.exportAsConfig, fileName);
+  }
+
+  /**
+   * Creates an image from the given element reference.
+   *
+   * @param domNode   The HTMLElement.
+   * @param type      The type of image to export.
+   * @param fileName  The file name to save as.
+   * @param isLoading A boolean representing the exporting process status.
+   */
+  exportAsImage(domNode: HTMLElement, type: ExportImageType, fileName: string, isLoading: BehaviorSubject<boolean>): void {
+
+    const options: Options = { backgroundColor: '#ffffff' };
+
+    if (type === ExportImageType.png) {
+      toPng(domNode, options)
+      .then((dataUrl) => {
+        saveAs(dataUrl, fileName + '.' + type);
+        isLoading.next(false);
+      });
+    } else {
+      toJpeg(domNode, options)
+      .then((dataUrl) => {
+        saveAs(dataUrl, fileName + '.' + type);
+        isLoading.next(false);
+      });
+    }
+
+  }
+
+}

src/app/core/export-service/export.service.ts

@@ -1,45 +1,21 @@
-import { Injectable } from '@angular/core';
-
-import { ExportAsConfig, ExportAsService } from 'ngx-export-as';
-import { toJpeg, toPng } from 'html-to-image';
-import { Options } from 'html-to-image/es/types';
-import { saveAs } from 'file-saver';
 import { BehaviorSubject } from 'rxjs';
 
 export enum ExportImageType {
   png = 'png',
   jpeg = 'jpeg',
 }
 
-@Injectable()
-export class ExportService {
-
-  /**
-   * Configuration for CSV export process
-   */
-  exportAsConfig: ExportAsConfig;
-
-  constructor(private exportAsService: ExportAsService) { }
+export interface ExportService {
 
   /**
    * Creates excel from the table element reference.
    *
    * @param type of export.
    * @param fileName is the file name to save as.
    * @param elementIdOrContent is the content that is being exported.
-   * @param download option if its going to be downloaded.
+   * @param download option if it's going to be downloaded.
    */
-  exportAsFile(type: any, elementIdOrContent: string, fileName: string, download: boolean = true) {
-
-    this.exportAsConfig = {
-      type:type,
-      elementIdOrContent: elementIdOrContent,
-      fileName:fileName,
-      download:download
-    };
-
-    return this.exportAsService.save(this.exportAsConfig, fileName);
-  }
+  exportAsFile(type: any, elementIdOrContent: string, fileName: string, download?: boolean);
 
   /**
    * Creates an image from the given element reference.
@@ -49,24 +25,5 @@ export class ExportService {
    * @param fileName  The file name to save as.
    * @param isLoading A boolean representing the exporting process status.
    */
-  exportAsImage(domNode: HTMLElement, type: ExportImageType, fileName: string, isLoading: BehaviorSubject<boolean>): void {
-
-    const options: Options = { backgroundColor: '#ffffff' };
-
-    if (type === ExportImageType.png) {
-      toPng(domNode, options)
-      .then((dataUrl) => {
-        saveAs(dataUrl, fileName + '.' + type);
-        isLoading.next(false);
-      });
-    } else {
-      toJpeg(domNode, options)
-      .then((dataUrl) => {
-        saveAs(dataUrl, fileName + '.' + type);
-        isLoading.next(false);
-      });
-    }
-
-  }
-
+  exportAsImage(domNode: HTMLElement, type: ExportImageType, fileName: string, isLoading: BehaviorSubject<boolean>);
 }

src/app/core/export-service/server-export.service.ts

@@ -1,18 +1,15 @@
-import { Injectable } from '@angular/core';
-
 import { BehaviorSubject } from 'rxjs';
 
-import { ExportImageType } from './export.service';
+import { ExportImageType, ExportService } from './export.service';
 
-@Injectable()
-export class ServerExportService {
+export class ServerExportService implements ExportService {
   /**
    * Creates excel from the table element reference.
    *
    * @param type of export.
    * @param fileName is the file name to save as.
    * @param elementIdOrContent is the content that is being exported.
-   * @param download option if its going to be downloaded.
+   * @param download option if it'ss going to be downloaded.
    */
   exportAsFile(type: any, elementIdOrContent: string, fileName: string, download: boolean = true) {
     return;

src/app/core/statistics/usage-report-data.service.ts

@@ -79,6 +79,8 @@ export class UsageReportDataService extends IdentifiableDataService<UsageReport>
   }
 
   public searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<UsageReport>[]): Observable<RemoteData<PaginatedList<UsageReport>>> {
-    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
+      getFirstSucceededRemoteData()
+    );
   }
 }

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

@@ -145,7 +145,7 @@ describe('MetadataContainerComponent', () => {
   });
 
   const mockBitstreamDataService = jasmine.createSpyObj('BitstreamDataService', {
-    findAllByItemAndBundleName: jasmine.createSpy('findAllByItemAndBundleName')
+    findShowableBitstreamsByItem: jasmine.createSpy('findShowableBitstreamsByItem')
   });
 
   beforeEach(async () => {
@@ -172,7 +172,10 @@ describe('MetadataContainerComponent', () => {
     component = fixture.componentInstance;
     component.item = testItem;
     component.box = boxMetadata;
-    mockBitstreamDataService.findAllByItemAndBundleName.and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList([])));
+
+    mockBitstreamDataService.findShowableBitstreamsByItem.and.returnValue(
+      createSuccessfulRemoteDataObject$(createPaginatedList([]))
+    );
   });
 
   describe('When field rendering type is not structured', () => {
@@ -283,15 +286,15 @@ describe('MetadataContainerComponent', () => {
     describe('and item has bitstream', () => {
 
       beforeEach(() => {
-        mockBitstreamDataService.findAllByItemAndBundleName.and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1])));
+        mockBitstreamDataService.findShowableBitstreamsByItem.and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1])));
         fixture.detectChanges();
       });
 
       it('should create', () => {
         expect(component).toBeTruthy();
       });
 
-      it('should not render metadata ', (done) => {
+      it('should render metadata ', (done) => {
         const spanValueFound = fixture.debugElement.queryAll(By.css('.test-style-label'));
         expect(spanValueFound.length).toBe(1);
 
@@ -301,6 +304,35 @@ describe('MetadataContainerComponent', () => {
       });
     });
 
+    describe('and bitstream has metadata', () => {
+      beforeEach(() => {
+        component.field.bitstream.metadataField = 'metadataFieldTest';
+        component.field.bitstream.metadataValue = 'metadataValueTest';
+        fixture.detectChanges();
+      });
+
+      it('should use the metadata in filters', () => {
+        expect(mockBitstreamDataService.findShowableBitstreamsByItem).toHaveBeenCalledWith(
+          testItem.uuid,
+          bitstreamField.bitstream.bundle,
+          [ { metadataName: 'metadataFieldTest', metadataValue: 'metadataValueTest' } ]
+        );
+      });
+    });
+
+    describe('and bitstream doesnt have metadataValue', () => {
+      beforeEach(() => {
+        component.field.bitstream.metadataValue = undefined;
+        fixture.detectChanges();
+      });
+
+      it('should use empty array in filters', () => {
+        expect(mockBitstreamDataService.findShowableBitstreamsByItem).toHaveBeenCalledWith(
+          testItem.uuid,
+          bitstreamField.bitstream.bundle,
+          [] // <--- empty array of filters
+        );
+      });
+    });
   });
-})
-  ;
+});