diff --git a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts index ca7a339a04..40aab2fad5 100644 --- a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts +++ b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts @@ -130,9 +130,8 @@ describe('ExportMetadataSelectorComponent', () => { done() }); }); - it('should show error notification', () => { - expect(notificationService.error).toHaveBeenCalled(); - expect(scriptRequestSucceeded).toBeFalse(); + it('should not invoke metadata-export script', () => { + expect(scriptService.invoke).not.toHaveBeenCalled(); }); }); diff --git a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts index c03de2ab12..f294390ecf 100644 --- a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts @@ -66,7 +66,6 @@ export class ExportMetadataSelectorComponent extends DSOSelectorModalWrapperComp resp$.subscribe(); return resp$; } else { - this.notificationsService.error(this.translationService.get('dso-selector.export-metadata.notValidDSO')); return observableOf(false); } } diff --git a/src/app/statistics/statistics.service.spec.ts b/src/app/statistics/statistics.service.spec.ts index eee10eaf02..94b8893154 100644 --- a/src/app/statistics/statistics.service.spec.ts +++ b/src/app/statistics/statistics.service.spec.ts @@ -112,7 +112,9 @@ describe('StatisticsService', () => { const body = JSON.parse(request.body); it('should specify the dsoType', () => { - expect(body.dsoTypes).toBe('item'); + // TODO: change when backend statistics search even can handle multiple dsoTypes in body + // expect(body.dsoTypes).toBe(['item']); + expect(body.dsoType).toBe('item'); }); it('should specify the scope', () => { diff --git a/src/app/statistics/statistics.service.ts b/src/app/statistics/statistics.service.ts index 6284e0c8b8..b8c26a851e 100644 --- a/src/app/statistics/statistics.service.ts +++ b/src/app/statistics/statistics.service.ts @@ -69,8 +69,9 @@ export class StatisticsService { Object.assign(body, { configuration: searchOptions.configuration }) } if (isNotEmpty(searchOptions.dsoTypes)) { - // TODO: check if backend statistics search even can handle multiple dsoTypes in body - Object.assign(body, { dsoTypes: searchOptions.dsoTypes.map( dsoType => dsoType.toLowerCase() ) }) + // TODO: change when backend statistics search even can handle multiple dsoTypes in body + // Object.assign(body, { dsoTypes: searchOptions.dsoTypes.map( dsoType => dsoType.toLowerCase() ) }) + Object.assign(body, { dsoType: searchOptions.dsoTypes[0].toLowerCase() }) } if (hasValue(searchOptions.scope)) { Object.assign(body, { scope: searchOptions.scope }) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index b2540162ab..b6a7c7f7aa 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -989,8 +989,6 @@ "dso-selector.export-metadata.dspaceobject.head": "Export metadata from", - "dso-selector.export-metadata.notValidDSO": "You can only export metadata for collections and communities", - "dso-selector.no-results": "No {{ type }} found", "dso-selector.placeholder": "Search for a {{ type }}",