From 8325a34910aea6be0de0e4b61ba8a6df3a5fe17c Mon Sep 17 00:00:00 2001 From: Marie Verdonck Date: Tue, 4 Aug 2020 14:15:25 +0200 Subject: [PATCH 01/78] 72403: Support for process output on detail page --- src/app/core/core.module.ts | 4 + .../core/data/process-output-data.service.ts | 73 +++++++++++++++++++ .../shared/process-output.resource-type.ts | 9 +++ .../detail/process-detail.component.html | 13 +++- .../detail/process-detail.component.spec.ts | 53 +++++++++++++- .../detail/process-detail.component.ts | 24 +++++- src/app/process-page/process-page.resolver.ts | 2 +- .../processes/process-output.model.ts | 36 +++++++++ .../process-page/processes/process.model.ts | 9 +++ src/assets/i18n/en.json5 | 2 +- 10 files changed, 216 insertions(+), 9 deletions(-) create mode 100644 src/app/core/data/process-output-data.service.ts create mode 100644 src/app/core/shared/process-output.resource-type.ts create mode 100644 src/app/process-page/processes/process-output.model.ts diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 5aa462d5e0..d262bfd0d6 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -6,6 +6,7 @@ import { EffectsModule } from '@ngrx/effects'; import { Action, StoreConfig, StoreModule } from '@ngrx/store'; import { MyDSpaceGuard } from '../+my-dspace-page/my-dspace.guard'; +import { ProcessOutput } from '../process-page/processes/process-output.model'; import { isNotEmpty } from '../shared/empty.util'; import { FormBuilderService } from '../shared/form/builder/form-builder.service'; @@ -70,6 +71,7 @@ import { LookupRelationService } from './data/lookup-relation.service'; import { MappedCollectionsReponseParsingService } from './data/mapped-collections-reponse-parsing.service'; import { MyDSpaceResponseParsingService } from './data/mydspace-response-parsing.service'; import { ObjectUpdatesService } from './data/object-updates/object-updates.service'; +import { ProcessOutputDataService } from './data/process-output-data.service'; import { RelationshipTypeService } from './data/relationship-type.service'; import { RelationshipService } from './data/relationship.service'; import { ResourcePolicyService } from './resource-policy/resource-policy.service'; @@ -281,6 +283,7 @@ const PROVIDERS = [ ItemTypeDataService, WorkflowActionDataService, ProcessDataService, + ProcessOutputDataService, ScriptDataService, ProcessFilesResponseParsingService, FeatureDataService, @@ -347,6 +350,7 @@ export const models = ExternalSourceEntry, Script, Process, + ProcessOutput, Version, VersionHistory, WorkflowAction, diff --git a/src/app/core/data/process-output-data.service.ts b/src/app/core/data/process-output-data.service.ts new file mode 100644 index 0000000000..28adbcd6ca --- /dev/null +++ b/src/app/core/data/process-output-data.service.ts @@ -0,0 +1,73 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { Store } from '@ngrx/store'; +import { Observable } from 'rxjs'; +import { ProcessOutput } from '../../process-page/processes/process-output.model'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; +import { dataService } from '../cache/builders/build-decorators'; +import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '../cache/object-cache.service'; +import { CoreState } from '../core.reducers'; +import { HALEndpointService } from '../shared/hal-endpoint.service'; +import { PROCESS_OUTPUT_TYPE } from '../shared/process-output.resource-type'; +import { DataService } from './data.service'; +import { DefaultChangeAnalyzer } from './default-change-analyzer.service'; +import { RemoteData } from './remote-data'; +import { RequestService } from './request.service'; + +/* tslint:disable:max-classes-per-file */ +/** + * A private DataService implementation to delegate specific methods to. + */ +class DataServiceImpl extends DataService { + protected linkPath = 'processes'; + + constructor( + protected requestService: RequestService, + protected rdbService: RemoteDataBuildService, + protected store: Store, + protected objectCache: ObjectCacheService, + protected halService: HALEndpointService, + protected notificationsService: NotificationsService, + protected http: HttpClient, + protected comparator: DefaultChangeAnalyzer) { + super(); + } +} + +// @ts-ignore +/** + * A service to retrieve output from processes from the REST API. + */ +@Injectable() +@dataService(PROCESS_OUTPUT_TYPE) +export class ProcessOutputDataService { + /** + * A private DataService instance to delegate specific methods to. + */ + private dataService: DataServiceImpl; + + constructor( + protected requestService: RequestService, + protected rdbService: RemoteDataBuildService, + protected store: Store, + protected objectCache: ObjectCacheService, + protected halService: HALEndpointService, + protected notificationsService: NotificationsService, + protected http: HttpClient, + protected comparator: DefaultChangeAnalyzer) { + this.dataService = new DataServiceImpl(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparator); + } + + /** + * Returns an observable of {@link RemoteData} of a {@link ProcessOutput}, based on an href, with a list of {@link FollowLinkConfig}, + * to automatically resolve {@link HALLink}s of the {@link ProcessOutput} + * @param href The url of {@link ProcessOutput} we want to retrieve + * @param linksToFollow List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved + */ + findByHref(href: string, ...linksToFollow: Array>): Observable> { + return this.dataService.findByHref(href, ...linksToFollow); + } +} +/* tslint:enable:max-classes-per-file */ diff --git a/src/app/core/shared/process-output.resource-type.ts b/src/app/core/shared/process-output.resource-type.ts new file mode 100644 index 0000000000..2e707d0bda --- /dev/null +++ b/src/app/core/shared/process-output.resource-type.ts @@ -0,0 +1,9 @@ +import { ResourceType } from './resource-type'; + +/** + * The resource type for ProcessOutput + * + * Needs to be in a separate file to prevent circular + * dependencies in webpack. + */ +export const PROCESS_OUTPUT_TYPE = new ResourceType('processOutput'); diff --git a/src/app/process-page/detail/process-detail.component.html b/src/app/process-page/detail/process-detail.component.html index 9cb1f1e6af..078c79a0d5 100644 --- a/src/app/process-page/detail/process-detail.component.html +++ b/src/app/process-page/detail/process-detail.component.html @@ -34,9 +34,16 @@
{{ process.processStatus }}
- - - + + 
+      
+        {{ (outputLogs$ | async)?.join('\n\t') }}
+      
+
+

+ {{ 'process.detail.logs.none' | translate }} +

+ {{'process.detail.back' | translate}} diff --git a/src/app/process-page/detail/process-detail.component.spec.ts b/src/app/process-page/detail/process-detail.component.spec.ts index dff481fdc6..c1efd233e8 100644 --- a/src/app/process-page/detail/process-detail.component.spec.ts +++ b/src/app/process-page/detail/process-detail.component.spec.ts @@ -1,5 +1,7 @@ +import { ProcessOutputDataService } from '../../core/data/process-output-data.service'; +import { ProcessOutput } from '../processes/process-output.model'; import { ProcessDetailComponent } from './process-detail.component'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { async, ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing'; import { VarDirective } from '../../shared/utils/var.directive'; import { TranslateModule } from '@ngx-translate/core'; import { RouterTestingModule } from '@angular/router/testing'; @@ -21,13 +23,20 @@ describe('ProcessDetailComponent', () => { let fixture: ComponentFixture; let processService: ProcessDataService; + let processOutputService: ProcessOutputDataService; let nameService: DSONameService; let process: Process; let fileName: string; let files: Bitstream[]; + let processOutput; + function init() { + processOutput = Object.assign(new ProcessOutput(), { + logs: ['Process started', 'Process completed'] + } + ); process = Object.assign(new Process(), { processId: 1, scriptName: 'script-name', @@ -40,7 +49,15 @@ describe('ProcessDetailComponent', () => { name: '-i', value: 'identifier' } - ] + ], + _links: { + self: { + href: 'https://rest.api/processes/1' + }, + output: { + href: 'https://rest.api/processes/1/output' + } + } }); fileName = 'fake-file-name'; files = [ @@ -62,6 +79,9 @@ describe('ProcessDetailComponent', () => { processService = jasmine.createSpyObj('processService', { getFiles: createSuccessfulRemoteDataObject$(createPaginatedList(files)) }); + processOutputService = jasmine.createSpyObj('processOutputService', { + findByHref: createSuccessfulRemoteDataObject$(processOutput) + }); nameService = jasmine.createSpyObj('nameService', { getName: fileName }); @@ -75,6 +95,7 @@ describe('ProcessDetailComponent', () => { providers: [ { provide: ActivatedRoute, useValue: { data: observableOf({ process: createSuccessfulRemoteDataObject(process) }) } }, { provide: ProcessDataService, useValue: processService }, + { provide: ProcessOutputDataService, useValue: processOutputService }, { provide: DSONameService, useValue: nameService } ], schemas: [NO_ERRORS_SCHEMA] @@ -104,4 +125,32 @@ describe('ProcessDetailComponent', () => { expect(processFiles.textContent).toContain(fileName); }); + it('should display the process\'s output logs', () => { + const outputProcess = fixture.debugElement.query(By.css('#process-output pre')).nativeElement; + expect(outputProcess.textContent).toContain('Process started'); + }); + + describe('if process has no output logs (yet)', () => { + beforeEach(fakeAsync(() => { + jasmine.getEnv().allowRespy(true); + const emptyProcessOutput = Object.assign(new ProcessOutput(), { + logs: [] + }); + spyOn(processOutputService, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(emptyProcessOutput)); + fixture = TestBed.createComponent(ProcessDetailComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }) + ); + it('should not display the process\'s output logs', () => { + const outputProcess = fixture.debugElement.query(By.css('#process-output pre')); + expect(outputProcess).toBeNull(); + }); + it('should display message saying there are no output logs', () => { + const noOutputProcess = fixture.debugElement.query(By.css('#no-output-logs-message')).nativeElement; + expect(noOutputProcess).toBeDefined(); + }); + } + ) + }); diff --git a/src/app/process-page/detail/process-detail.component.ts b/src/app/process-page/detail/process-detail.component.ts index b0e2c7e378..74027a4e72 100644 --- a/src/app/process-page/detail/process-detail.component.ts +++ b/src/app/process-page/detail/process-detail.component.ts @@ -1,9 +1,12 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { Observable } from 'rxjs/internal/Observable'; +import { ProcessOutputDataService } from '../../core/data/process-output-data.service'; import { RemoteData } from '../../core/data/remote-data'; +import { DSpaceObject } from '../../core/shared/dspace-object.model'; +import { ProcessOutput } from '../processes/process-output.model'; import { Process } from '../processes/process.model'; -import { map, switchMap } from 'rxjs/operators'; +import { map, switchMap, tap } from 'rxjs/operators'; import { getFirstSucceededRemoteDataPayload, redirectToPageNotFoundOn404 } from '../../core/shared/operators'; import { AlertType } from '../../shared/alert/aletr-type'; import { ProcessDataService } from '../../core/data/processes/process-data.service'; @@ -36,9 +39,15 @@ export class ProcessDetailComponent implements OnInit { */ filesRD$: Observable>>; + /** + * The Process's Output logs + */ + outputLogs$: Observable; + constructor(protected route: ActivatedRoute, protected router: Router, protected processService: ProcessDataService, + protected processOutputService: ProcessOutputDataService, protected nameService: DSONameService) { } @@ -56,6 +65,17 @@ export class ProcessDetailComponent implements OnInit { getFirstSucceededRemoteDataPayload(), switchMap((process: Process) => this.processService.getFiles(process.processId)) ); + + const processOutputRD$: Observable> = this.processRD$.pipe( + getFirstSucceededRemoteDataPayload(), + switchMap((process: Process) => this.processOutputService.findByHref(process._links.output.href)) + ); + this.outputLogs$ = processOutputRD$.pipe( + getFirstSucceededRemoteDataPayload(), + switchMap((processOutput: ProcessOutput) => { + return [processOutput.logs]; + }) + ) } /** @@ -63,7 +83,7 @@ export class ProcessDetailComponent implements OnInit { * @param bitstream */ getFileName(bitstream: Bitstream) { - return this.nameService.getName(bitstream); + return bitstream instanceof DSpaceObject ? this.nameService.getName(bitstream) : 'unknown'; } } diff --git a/src/app/process-page/process-page.resolver.ts b/src/app/process-page/process-page.resolver.ts index 84821a2574..57c749e1cb 100644 --- a/src/app/process-page/process-page.resolver.ts +++ b/src/app/process-page/process-page.resolver.ts @@ -24,7 +24,7 @@ export class ProcessPageResolver implements Resolve> { * or an error if something went wrong */ resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable> { - return this.processService.findById(route.params.id, followLink('script')).pipe( + return this.processService.findById(route.params.id, followLink('script'), followLink('output') ).pipe( find((RD) => hasValue(RD.error) || RD.hasSucceeded), ); } diff --git a/src/app/process-page/processes/process-output.model.ts b/src/app/process-page/processes/process-output.model.ts new file mode 100644 index 0000000000..4ae1731d26 --- /dev/null +++ b/src/app/process-page/processes/process-output.model.ts @@ -0,0 +1,36 @@ +import { PROCESS_OUTPUT_TYPE } from '../../core/shared/process-output.resource-type'; +import { CacheableObject } from '../../core/cache/object-cache.reducer'; +import { HALLink } from '../../core/shared/hal-link.model'; +import { autoserialize, deserialize } from 'cerialize'; +import { excludeFromEquals } from '../../core/utilities/equals.decorators'; +import { ResourceType } from '../../core/shared/resource-type'; +import { typedObject } from '../../core/cache/builders/build-decorators'; + +/** + * Object representing a process output object + */ +@typedObject +export class ProcessOutput implements CacheableObject { + static type = PROCESS_OUTPUT_TYPE; + + /** + * The object type + */ + @excludeFromEquals + @autoserialize + type: ResourceType; + + /** + * The output strings for this ProcessOutput + */ + @autoserialize + logs: string[]; + + /** + * The {@link HALLink}s for this ProcessOutput + */ + @deserialize + _links: { + self: HALLink, + }; +} diff --git a/src/app/process-page/processes/process.model.ts b/src/app/process-page/processes/process.model.ts index 85de5337e7..891acb626d 100644 --- a/src/app/process-page/processes/process.model.ts +++ b/src/app/process-page/processes/process.model.ts @@ -1,3 +1,5 @@ +import { PROCESS_OUTPUT_TYPE } from '../../core/shared/process-output.resource-type'; +import { ProcessOutput } from './process-output.model'; import { ProcessStatus } from './process-status.model'; import { ProcessParameter } from './process-parameter.model'; import { CacheableObject } from '../../core/cache/object-cache.reducer'; @@ -85,4 +87,11 @@ export class Process implements CacheableObject { */ @link(SCRIPT) script?: Observable>; + + /** + * The output logs created by this Process + * Will be undefined unless the output {@link HALLink} has been resolved. + */ + @link(PROCESS_OUTPUT_TYPE) + output?: Observable>; } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index bfa1c81aa6..69e7df151e 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2085,7 +2085,7 @@ "process.detail.output" : "Process Output", - "process.detail.output.alert" : "Work in progress - Process output is not available yet", + "process.detail.logs.none": "This process has no output logs (yet)", "process.detail.output-files" : "Output Files", From f2a381643028d4027b03df6f9123eda50aa2a321 Mon Sep 17 00:00:00 2001 From: Marie Verdonck Date: Tue, 4 Aug 2020 14:57:57 +0200 Subject: [PATCH 02/78] 72403: tab removed process output, message change & redundant switchmap removed --- src/app/process-page/detail/process-detail.component.html | 7 ++----- src/app/process-page/detail/process-detail.component.ts | 6 +++--- src/assets/i18n/en.json5 | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/app/process-page/detail/process-detail.component.html b/src/app/process-page/detail/process-detail.component.html index 078c79a0d5..e76d24d17a 100644 --- a/src/app/process-page/detail/process-detail.component.html +++ b/src/app/process-page/detail/process-detail.component.html @@ -35,11 +35,8 @@ - 
-      
-        {{ (outputLogs$ | async)?.join('\n\t') }}
-      
-
+ 
{{ (outputLogs$ | async)?.join('\n') }}

{{ 'process.detail.logs.none' | translate }}

diff --git a/src/app/process-page/detail/process-detail.component.ts b/src/app/process-page/detail/process-detail.component.ts index 74027a4e72..af6e3238a6 100644 --- a/src/app/process-page/detail/process-detail.component.ts +++ b/src/app/process-page/detail/process-detail.component.ts @@ -6,7 +6,7 @@ import { RemoteData } from '../../core/data/remote-data'; import { DSpaceObject } from '../../core/shared/dspace-object.model'; import { ProcessOutput } from '../processes/process-output.model'; import { Process } from '../processes/process.model'; -import { map, switchMap, tap } from 'rxjs/operators'; +import { map, switchMap } from 'rxjs/operators'; import { getFirstSucceededRemoteDataPayload, redirectToPageNotFoundOn404 } from '../../core/shared/operators'; import { AlertType } from '../../shared/alert/aletr-type'; import { ProcessDataService } from '../../core/data/processes/process-data.service'; @@ -72,8 +72,8 @@ export class ProcessDetailComponent implements OnInit { ); this.outputLogs$ = processOutputRD$.pipe( getFirstSucceededRemoteDataPayload(), - switchMap((processOutput: ProcessOutput) => { - return [processOutput.logs]; + map((processOutput: ProcessOutput) => { + return processOutput.logs; }) ) } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 69e7df151e..75db3eceb1 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2085,7 +2085,7 @@ "process.detail.output" : "Process Output", - "process.detail.logs.none": "This process has no output logs (yet)", + "process.detail.logs.none": "This process has no output yet", "process.detail.output-files" : "Output Files", From 02c693363b6f5ed28202898a2cc9c5c21c269f51 Mon Sep 17 00:00:00 2001 From: Marie Verdonck Date: Thu, 13 Aug 2020 12:31:42 +0200 Subject: [PATCH 03/78] Unneeded ts-ignore removed --- src/app/core/data/process-output-data.service.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/core/data/process-output-data.service.ts b/src/app/core/data/process-output-data.service.ts index 28adbcd6ca..24f33a85b7 100644 --- a/src/app/core/data/process-output-data.service.ts +++ b/src/app/core/data/process-output-data.service.ts @@ -36,7 +36,6 @@ class DataServiceImpl extends DataService { } } -// @ts-ignore /** * A service to retrieve output from processes from the REST API. */ From f82e6fa48bad7214b53f424bbf8b313152ae5ee9 Mon Sep 17 00:00:00 2001 From: Marie Verdonck Date: Wed, 2 Sep 2020 19:35:35 +0200 Subject: [PATCH 04/78] 72403: Process output logs only retrieved at button press + tests --- .../detail/process-detail.component.html | 22 ++++--- .../detail/process-detail.component.spec.ts | 66 +++++++++++++------ .../detail/process-detail.component.ts | 51 ++++++++++---- src/app/process-page/process-page.resolver.ts | 2 +- src/assets/i18n/en.json5 | 4 ++ 5 files changed, 103 insertions(+), 42 deletions(-) diff --git a/src/app/process-page/detail/process-detail.component.html b/src/app/process-page/detail/process-detail.component.html index e76d24d17a..e13770a0a3 100644 --- a/src/app/process-page/detail/process-detail.component.html +++ b/src/app/process-page/detail/process-detail.component.html @@ -34,13 +34,19 @@
{{ process.processStatus }}
 - - 
{{ (outputLogs$ | async)?.join('\n') }}
-

- {{ 'process.detail.logs.none' | translate }} -

- + + + + 
{{ (outputLogs$ | async)?.join('\n') }}
+

+ {{ 'process.detail.logs.none' | translate }} +

+ - {{'process.detail.back' | translate}} + diff --git a/src/app/process-page/detail/process-detail.component.spec.ts b/src/app/process-page/detail/process-detail.component.spec.ts index c1efd233e8..8d4a3f0e62 100644 --- a/src/app/process-page/detail/process-detail.component.spec.ts +++ b/src/app/process-page/detail/process-detail.component.spec.ts @@ -1,7 +1,7 @@ import { ProcessOutputDataService } from '../../core/data/process-output-data.service'; import { ProcessOutput } from '../processes/process-output.model'; import { ProcessDetailComponent } from './process-detail.component'; -import { async, ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing'; +import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; import { VarDirective } from '../../shared/utils/var.directive'; import { TranslateModule } from '@ngx-translate/core'; import { RouterTestingModule } from '@angular/router/testing'; @@ -93,7 +93,10 @@ describe('ProcessDetailComponent', () => { declarations: [ProcessDetailComponent, ProcessDetailFieldComponent, VarDirective, FileSizePipe], imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])], providers: [ - { provide: ActivatedRoute, useValue: { data: observableOf({ process: createSuccessfulRemoteDataObject(process) }) } }, + { + provide: ActivatedRoute, + useValue: { data: observableOf({ process: createSuccessfulRemoteDataObject(process) }) } + }, { provide: ProcessDataService, useValue: processService }, { provide: ProcessOutputDataService, useValue: processOutputService }, { provide: DSONameService, useValue: nameService } @@ -105,15 +108,16 @@ describe('ProcessDetailComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(ProcessDetailComponent); component = fixture.componentInstance; - fixture.detectChanges(); }); it('should display the script\'s name', () => { + fixture.detectChanges(); const name = fixture.debugElement.query(By.css('#process-name')).nativeElement; expect(name.textContent).toContain(process.scriptName); }); it('should display the process\'s parameters', () => { + fixture.detectChanges(); const args = fixture.debugElement.query(By.css('#process-arguments')).nativeElement; process.parameters.forEach((param) => { expect(args.textContent).toContain(`${param.name} ${param.value}`) @@ -121,27 +125,52 @@ describe('ProcessDetailComponent', () => { }); it('should display the process\'s output files', () => { + fixture.detectChanges(); const processFiles = fixture.debugElement.query(By.css('#process-files')).nativeElement; expect(processFiles.textContent).toContain(fileName); }); - it('should display the process\'s output logs', () => { - const outputProcess = fixture.debugElement.query(By.css('#process-output pre')).nativeElement; - expect(outputProcess.textContent).toContain('Process started'); + describe('if press show output logs', () => { + beforeEach(fakeAsync(() => { + spyOn(component, 'showProcessOutputLogs').and.callThrough(); + fixture.detectChanges(); + const showOutputButton = fixture.debugElement.query(By.css('#showOutputButton')); + showOutputButton.triggerEventHandler('click', { + preventDefault: () => {/**/ + } + }); + tick(); + })); + it('should trigger showProcessOutputLogs', () => { + expect(component.showProcessOutputLogs).toHaveBeenCalled(); + }); + it('should display the process\'s output logs', () => { + fixture.detectChanges(); + const outputProcess = fixture.debugElement.query(By.css('#process-output pre')); + expect(outputProcess.nativeElement.textContent).toContain('Process started'); + }); }); - describe('if process has no output logs (yet)', () => { + describe('if press show output logs and process has no output logs (yet)', () => { beforeEach(fakeAsync(() => { - jasmine.getEnv().allowRespy(true); - const emptyProcessOutput = Object.assign(new ProcessOutput(), { - logs: [] - }); - spyOn(processOutputService, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(emptyProcessOutput)); - fixture = TestBed.createComponent(ProcessDetailComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }) - ); + jasmine.getEnv().allowRespy(true); + const emptyProcessOutput = Object.assign(new ProcessOutput(), { + logs: [] + }); + spyOn(processOutputService, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(emptyProcessOutput)); + fixture = TestBed.createComponent(ProcessDetailComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + spyOn(component, 'showProcessOutputLogs').and.callThrough(); + fixture.detectChanges(); + const showOutputButton = fixture.debugElement.query(By.css('#showOutputButton')); + showOutputButton.triggerEventHandler('click', { + preventDefault: () => {/**/ + } + }); + tick(); + fixture.detectChanges(); + })); it('should not display the process\'s output logs', () => { const outputProcess = fixture.debugElement.query(By.css('#process-output pre')); expect(outputProcess).toBeNull(); @@ -150,7 +179,6 @@ describe('ProcessDetailComponent', () => { const noOutputProcess = fixture.debugElement.query(By.css('#no-output-logs-message')).nativeElement; expect(noOutputProcess).toBeDefined(); }); - } - ) + }); }); diff --git a/src/app/process-page/detail/process-detail.component.ts b/src/app/process-page/detail/process-detail.component.ts index af6e3238a6..f6b628f0f8 100644 --- a/src/app/process-page/detail/process-detail.component.ts +++ b/src/app/process-page/detail/process-detail.component.ts @@ -1,12 +1,13 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, NgZone, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; +import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; import { Observable } from 'rxjs/internal/Observable'; import { ProcessOutputDataService } from '../../core/data/process-output-data.service'; import { RemoteData } from '../../core/data/remote-data'; import { DSpaceObject } from '../../core/shared/dspace-object.model'; import { ProcessOutput } from '../processes/process-output.model'; import { Process } from '../processes/process.model'; -import { map, switchMap } from 'rxjs/operators'; +import { finalize, map, switchMap, take } from 'rxjs/operators'; import { getFirstSucceededRemoteDataPayload, redirectToPageNotFoundOn404 } from '../../core/shared/operators'; import { AlertType } from '../../shared/alert/aletr-type'; import { ProcessDataService } from '../../core/data/processes/process-data.service'; @@ -44,11 +45,21 @@ export class ProcessDetailComponent implements OnInit { */ outputLogs$: Observable; + /** + * Boolean on whether or not to show the output logs + */ + showOutputLogs = false; + /** + * When it's retrieving the output logs from backend, to show loading component + */ + retrievingOutputLogs$ = new BehaviorSubject(false); + constructor(protected route: ActivatedRoute, protected router: Router, protected processService: ProcessDataService, protected processOutputService: ProcessOutputDataService, - protected nameService: DSONameService) { + protected nameService: DSONameService, + private zone: NgZone) { } /** @@ -65,17 +76,6 @@ export class ProcessDetailComponent implements OnInit { getFirstSucceededRemoteDataPayload(), switchMap((process: Process) => this.processService.getFiles(process.processId)) ); - - const processOutputRD$: Observable> = this.processRD$.pipe( - getFirstSucceededRemoteDataPayload(), - switchMap((process: Process) => this.processOutputService.findByHref(process._links.output.href)) - ); - this.outputLogs$ = processOutputRD$.pipe( - getFirstSucceededRemoteDataPayload(), - map((processOutput: ProcessOutput) => { - return processOutput.logs; - }) - ) } /** @@ -86,4 +86,27 @@ export class ProcessDetailComponent implements OnInit { return bitstream instanceof DSpaceObject ? this.nameService.getName(bitstream) : 'unknown'; } + /** + * Retrieves the process logs, while setting the loading subject to true. + * Sets the outputLogs when retrieved and sets the showOutputLogs boolean to show them and hide the button. + */ + showProcessOutputLogs() { + this.retrievingOutputLogs$.next(true); + this.zone.runOutsideAngular(() => { + const processOutputRD$: Observable> = this.processRD$.pipe( + getFirstSucceededRemoteDataPayload(), + switchMap((process: Process) => this.processOutputService.findByHref(process._links.output.href)) + ); + this.outputLogs$ = processOutputRD$.pipe( + getFirstSucceededRemoteDataPayload(), + map((processOutput: ProcessOutput) => { + this.showOutputLogs = true; + return processOutput.logs; + }), + finalize(() => this.zone.run(() => this.retrievingOutputLogs$.next(false))), + ) + }); + this.outputLogs$.pipe(take(1)).subscribe(); + } + } diff --git a/src/app/process-page/process-page.resolver.ts b/src/app/process-page/process-page.resolver.ts index 57c749e1cb..84821a2574 100644 --- a/src/app/process-page/process-page.resolver.ts +++ b/src/app/process-page/process-page.resolver.ts @@ -24,7 +24,7 @@ export class ProcessPageResolver implements Resolve> { * or an error if something went wrong */ resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable> { - return this.processService.findById(route.params.id, followLink('script'), followLink('output') ).pipe( + return this.processService.findById(route.params.id, followLink('script')).pipe( find((RD) => hasValue(RD.error) || RD.hasSucceeded), ); } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 75db3eceb1..036fd87ec8 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2085,6 +2085,10 @@ "process.detail.output" : "Process Output", + "process.detail.logs.button": "Retrieve process output", + + "process.detail.logs.loading": "Retrieving", + "process.detail.logs.none": "This process has no output yet", "process.detail.output-files" : "Output Files", From d9c177b10018f28493f18976daa761fa307098e4 Mon Sep 17 00:00:00 2001 From: Corrado Lombardi Date: Thu, 24 Sep 2020 13:02:38 +0200 Subject: [PATCH 05/78] added RequestService --- .../create-collection-page.component.ts | 6 ++++-- .../delete-collection-page.component.ts | 6 ++++-- .../create-community-page.component.ts | 6 ++++-- .../delete-community-page.component.ts | 7 +++++-- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/app/+collection-page/create-collection-page/create-collection-page.component.ts b/src/app/+collection-page/create-collection-page/create-collection-page.component.ts index ae31b94c3d..a38739c407 100644 --- a/src/app/+collection-page/create-collection-page/create-collection-page.component.ts +++ b/src/app/+collection-page/create-collection-page/create-collection-page.component.ts @@ -7,6 +7,7 @@ import { Collection } from '../../core/shared/collection.model'; import { CollectionDataService } from '../../core/data/collection-data.service'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; +import {RequestService} from '../../core/data/request.service'; /** * Component that represents the page where a user can create a new Collection @@ -26,8 +27,9 @@ export class CreateCollectionPageComponent extends CreateComColPageComponent Date: Thu, 24 Sep 2020 13:03:29 +0200 Subject: [PATCH 06/78] cache cleared with parent community reference once a collection or a community is created or deleted --- .../create-comcol-page.component.ts | 70 +++++++++++++------ .../delete-comcol-page.component.ts | 47 ++++++++++--- 2 files changed, 85 insertions(+), 32 deletions(-) diff --git a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts index 4a7cd9afb1..f55a7f0156 100644 --- a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts +++ b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts @@ -2,18 +2,24 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { take } from 'rxjs/operators'; +import {flatMap, map, take} from 'rxjs/operators'; import { ComColDataService } from '../../../core/data/comcol-data.service'; import { CommunityDataService } from '../../../core/data/community-data.service'; import { RemoteData } from '../../../core/data/remote-data'; import { RouteService } from '../../../core/services/route.service'; import { Community } from '../../../core/shared/community.model'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { getSucceededRemoteData } from '../../../core/shared/operators'; +import { + getFirstSucceededRemoteDataPayload, + getRemoteDataPayload, + getSucceededRemoteData +} from '../../../core/shared/operators'; import { ResourceType } from '../../../core/shared/resource-type'; -import { hasValue, isNotEmpty, isNotUndefined } from '../../empty.util'; +import {hasValue, isEmpty, isNotEmpty, isNotUndefined} from '../../empty.util'; import { NotificationsService } from '../../notifications/notifications.service'; import { RequestParam } from '../../../core/cache/models/request-param.model'; +import {RequestService} from '../../../core/data/request.service'; +import {Collection} from '../../../core/shared/collection.model'; /** * Component representing the create page for communities and collections @@ -54,7 +60,8 @@ export class CreateComColPageComponent implements protected routeService: RouteService, protected router: Router, protected notificationsService: NotificationsService, - protected translate: TranslateService + protected translate: TranslateService, + protected requestService: RequestService ) { } @@ -76,25 +83,29 @@ export class CreateComColPageComponent implements const dso = event.dso; const uploader = event.uploader; - this.parentUUID$.pipe(take(1)).subscribe((uuid: string) => { + this.parentUUID$.pipe( + take(1), + flatMap((uuid: string) => { const params = uuid ? [new RequestParam('parent', uuid)] : []; - this.dsoDataService.create(dso, ...params) - .pipe(getSucceededRemoteData()) - .subscribe((dsoRD: RemoteData) => { - if (isNotUndefined(dsoRD)) { - this.newUUID = dsoRD.payload.uuid; - if (uploader.queue.length > 0) { - this.dsoDataService.getLogoEndpoint(this.newUUID).pipe(take(1)).subscribe((href: string) => { - uploader.options.url = href; - uploader.uploadAll(); - }); - } else { - this.navigateToNewPage(); - } - this.notificationsService.success(null, this.translate.get(this.type.value + '.create.notifications.success')); + return this.dsoDataService.create(dso, ...params) + .pipe(getFirstSucceededRemoteDataPayload() + ) + })) + .subscribe((dsoRD: TDomain) => { + if (isNotUndefined(dsoRD)) { + this.newUUID = dsoRD.uuid; + if (uploader.queue.length > 0) { + this.dsoDataService.getLogoEndpoint(this.newUUID).pipe(take(1)).subscribe((href: string) => { + uploader.options.url = href; + uploader.uploadAll(); + }); + } else { + this.navigateToNewPage(); } - }); - }); + this.refreshCache(dsoRD); + } + this.notificationsService.success(null, this.translate.get(this.type.value + '.create.notifications.success')); + }); } /** @@ -106,4 +117,21 @@ export class CreateComColPageComponent implements } } + private refreshCache(dso: TDomain) { + const parentCommunityUrl = this.parentCommunityUrl(dso as any); + if (!hasValue(parentCommunityUrl)) { + return; + } + this.dsoDataService.findByHref(parentCommunityUrl).pipe( + getSucceededRemoteData(), + getRemoteDataPayload(), + map((pc: TDomain) => isEmpty(pc) ? 'communities/search/top' : pc.id), + take(1) + ).subscribe((href: string) => this.requestService.removeByHrefSubstring(href)); + } + + private parentCommunityUrl(dso: Collection | Community) { + const parentCommunity = dso._links.parentCommunity; + return isNotEmpty(parentCommunity) ? parentCommunity.href : null; + } } diff --git a/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts b/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts index d07d7be032..29ec4f7b19 100644 --- a/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts +++ b/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts @@ -1,13 +1,18 @@ -import { Component, OnInit } from '@angular/core'; -import { Observable } from 'rxjs'; -import { ActivatedRoute, Router } from '@angular/router'; -import { RemoteData } from '../../../core/data/remote-data'; -import { first, map } from 'rxjs/operators'; -import { DataService } from '../../../core/data/data.service'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { NotificationsService } from '../../notifications/notifications.service'; -import { TranslateService } from '@ngx-translate/core'; -import { RestResponse } from '../../../core/cache/response.models'; +import {Component, OnInit} from '@angular/core'; +import {Observable} from 'rxjs'; +import {ActivatedRoute, Router} from '@angular/router'; +import {RemoteData} from '../../../core/data/remote-data'; +import {first, map, take} from 'rxjs/operators'; +import {DataService} from '../../../core/data/data.service'; +import {DSpaceObject} from '../../../core/shared/dspace-object.model'; +import {NotificationsService} from '../../notifications/notifications.service'; +import {TranslateService} from '@ngx-translate/core'; +import {RestResponse} from '../../../core/cache/response.models'; +import {hasValue, isEmpty, isNotEmpty} from '../../empty.util'; +import {RequestService} from '../../../core/data/request.service'; +import {getRemoteDataPayload, getSucceededRemoteData} from '../../../core/shared/operators'; +import {Community} from '../../../core/shared/community.model'; +import {Collection} from '../../../core/shared/collection.model'; /** * Component representing the delete page for communities and collections @@ -31,7 +36,8 @@ export class DeleteComColPageComponent implements protected router: Router, protected route: ActivatedRoute, protected notifications: NotificationsService, - protected translate: TranslateService + protected translate: TranslateService, + protected requestService: RequestService ) { } @@ -50,6 +56,7 @@ export class DeleteComColPageComponent implements if (response.isSuccessful) { const successMessage = this.translate.instant((dso as any).type + '.delete.notification.success'); this.notifications.success(successMessage) + this.refreshCache(dso); } else { const errorMessage = this.translate.instant((dso as any).type + '.delete.notification.fail'); this.notifications.error(errorMessage) @@ -65,4 +72,22 @@ export class DeleteComColPageComponent implements onCancel(dso: TDomain) { this.router.navigate([this.frontendURL + '/' + dso.uuid + '/edit']); } + + private refreshCache(dso: TDomain) { + const parentCommunity = this.parentCommunityUrl(dso as any); + if (!hasValue(parentCommunity)) { + return; + } + this.dsoDataService.findByHref(parentCommunity).pipe( + getSucceededRemoteData(), + getRemoteDataPayload(), + map((pc: TDomain) => isEmpty(pc) ? 'communities/search/top' : pc.id ), + take(1) + ).subscribe((id: string) => this.requestService.removeByHrefSubstring(id)); + } + + private parentCommunityUrl(dso: Collection | Community): string { + const parentCommunity = dso._links.parentCommunity; + return isNotEmpty(parentCommunity) ? parentCommunity.href : null; + } } From 6a016cd17f49c95e0e58709fd0c9dc3b5cceff39 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Tue, 20 Oct 2020 16:40:01 +0200 Subject: [PATCH 07/78] 74199: ItemResolver item to dso refactor --- .../abstract-item-update/abstract-item-update.component.ts | 2 +- src/app/+item-page/edit-item-page/edit-item-page.component.ts | 2 +- .../item-authorizations/item-authorizations.component.spec.ts | 2 +- .../item-authorizations/item-authorizations.component.ts | 2 +- .../item-bitstreams/item-bitstreams.component.spec.ts | 2 +- .../item-collection-mapper.component.spec.ts | 2 +- .../item-collection-mapper/item-collection-mapper.component.ts | 2 +- .../edit-item-page/item-delete/item-delete.component.spec.ts | 2 +- .../item-metadata/item-metadata.component.spec.ts | 2 +- .../edit-item-page/item-move/item-move.component.spec.ts | 2 +- .../+item-page/edit-item-page/item-move/item-move.component.ts | 2 +- .../edit-item-page/item-private/item-private.component.spec.ts | 2 +- .../edit-item-page/item-public/item-public.component.spec.ts | 2 +- .../item-reinstate/item-reinstate.component.spec.ts | 2 +- .../item-relationships/item-relationships.component.spec.ts | 2 +- .../item-withdraw/item-withdraw.component.spec.ts | 2 +- .../abstract-simple-item-action.component.spec.ts | 2 +- .../simple-item-action/abstract-simple-item-action.component.ts | 2 +- src/app/+item-page/full/full-item-page.component.spec.ts | 2 +- src/app/+item-page/item-page-routing.module.ts | 2 +- src/app/+item-page/simple/item-page.component.spec.ts | 2 +- src/app/+item-page/simple/item-page.component.ts | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts b/src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts index bde2b5a1b0..f3055d3e51 100644 --- a/src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts +++ b/src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts @@ -48,7 +48,7 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl ngOnInit(): void { observableCombineLatest(this.route.data, this.route.parent.data).pipe( map(([data, parentData]) => Object.assign({}, data, parentData)), - map((data) => data.item), + map((data) => data.dso), first(), map((data: RemoteData) => data.payload) ).subscribe((item: Item) => { diff --git a/src/app/+item-page/edit-item-page/edit-item-page.component.ts b/src/app/+item-page/edit-item-page/edit-item-page.component.ts index 655582064c..2bd9a30ca3 100644 --- a/src/app/+item-page/edit-item-page/edit-item-page.component.ts +++ b/src/app/+item-page/edit-item-page/edit-item-page.component.ts @@ -47,7 +47,7 @@ export class EditItemPageComponent implements OnInit { this.pages = this.route.routeConfig.children .map((child: any) => child.path) .filter((path: string) => isNotEmpty(path)); // ignore reroutes - this.itemRD$ = this.route.data.pipe(map((data) => data.item)); + this.itemRD$ = this.route.data.pipe(map((data) => data.dso)); } /** diff --git a/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts b/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts index c687c829eb..dcf70a30cb 100644 --- a/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts +++ b/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts @@ -74,7 +74,7 @@ describe('ItemAuthorizationsComponent test suite', () => { const routeStub = { data: observableOf({ - item: createSuccessfulRemoteDataObject(item) + dso: createSuccessfulRemoteDataObject(item) }) }; diff --git a/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.ts b/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.ts index 8153990a02..8b89de7c89 100644 --- a/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.ts +++ b/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.ts @@ -75,7 +75,7 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy { */ ngOnInit(): void { this.item$ = this.route.data.pipe( - map((data) => data.item), + map((data) => data.dso), getFirstSucceededRemoteDataWithNotEmptyPayload(), map((item: Item) => this.linkService.resolveLink( item, diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts index f86c57d69e..5f6e3a06c4 100644 --- a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts +++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts @@ -140,7 +140,7 @@ describe('ItemBitstreamsComponent', () => { }); route = Object.assign({ parent: { - data: observableOf({ item: createMockRD(item) }) + data: observableOf({ dso: createMockRD(item) }) }, data: observableOf({}), url: url diff --git a/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts b/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts index 15b860a782..9aeb1522a6 100644 --- a/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts +++ b/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts @@ -89,7 +89,7 @@ describe('ItemCollectionMapperComponent', () => { clearDiscoveryRequests: () => {} /* tslint:enable:no-empty */ }); - const activatedRouteStub = new ActivatedRouteStub({}, { item: mockItemRD }); + const activatedRouteStub = new ActivatedRouteStub({}, { dso: mockItemRD }); const translateServiceStub = { get: () => of('test-message of item ' + mockItem.name), onLangChange: new EventEmitter(), diff --git a/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts b/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts index 1409e06ddb..df406f826b 100644 --- a/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts +++ b/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts @@ -92,7 +92,7 @@ export class ItemCollectionMapperComponent implements OnInit { } ngOnInit(): void { - this.itemRD$ = this.route.data.pipe(map((data) => data.item)).pipe(getSucceededRemoteData()) as Observable>; + this.itemRD$ = this.route.data.pipe(map((data) => data.dso)).pipe(getSucceededRemoteData()) as Observable>; this.searchOptions$ = this.searchConfigService.paginatedSearchOptions; this.loadCollectionLists(); } diff --git a/src/app/+item-page/edit-item-page/item-delete/item-delete.component.spec.ts b/src/app/+item-page/edit-item-page/item-delete/item-delete.component.spec.ts index 18cbd6e855..e7b454e92b 100644 --- a/src/app/+item-page/edit-item-page/item-delete/item-delete.component.spec.ts +++ b/src/app/+item-page/edit-item-page/item-delete/item-delete.component.spec.ts @@ -138,7 +138,7 @@ describe('ItemDeleteComponent', () => { routeStub = { data: observableOf({ - item: createSuccessfulRemoteDataObject(mockItem) + dso: createSuccessfulRemoteDataObject(mockItem) }) }; diff --git a/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts b/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts index ed9ab4a891..f30b5cc3b0 100644 --- a/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts +++ b/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts @@ -130,7 +130,7 @@ describe('ItemMetadataComponent', () => { routeStub = { data: observableOf({}), parent: { - data: observableOf({ item: createSuccessfulRemoteDataObject(item) }) + data: observableOf({ dso: createSuccessfulRemoteDataObject(item) }) } }; paginatedMetadataFields = new PaginatedList(undefined, [mdField1, mdField2, mdField3]); diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts b/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts index 77aefe2356..c8c49b118b 100644 --- a/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts +++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts @@ -44,7 +44,7 @@ describe('ItemMoveComponent', () => { const routeStub = { data: observableOf({ - item: new RemoteData(false, false, true, null, { + dso: new RemoteData(false, false, true, null, { id: 'item1' }) }) diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.ts b/src/app/+item-page/edit-item-page/item-move/item-move.component.ts index abadd2ec4a..1a544af7dc 100644 --- a/src/app/+item-page/edit-item-page/item-move/item-move.component.ts +++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.ts @@ -55,7 +55,7 @@ export class ItemMoveComponent implements OnInit { } ngOnInit(): void { - this.itemRD$ = this.route.data.pipe(map((data) => data.item), getSucceededRemoteData()) as Observable>; + this.itemRD$ = this.route.data.pipe(map((data) => data.dso), getSucceededRemoteData()) as Observable>; this.itemRD$.subscribe((rd) => { this.itemId = rd.payload.id; } diff --git a/src/app/+item-page/edit-item-page/item-private/item-private.component.spec.ts b/src/app/+item-page/edit-item-page/item-private/item-private.component.spec.ts index 95b08a9936..52ccbc2133 100644 --- a/src/app/+item-page/edit-item-page/item-private/item-private.component.spec.ts +++ b/src/app/+item-page/edit-item-page/item-private/item-private.component.spec.ts @@ -51,7 +51,7 @@ describe('ItemPrivateComponent', () => { routeStub = { data: observableOf({ - item: createSuccessfulRemoteDataObject({ + dso: createSuccessfulRemoteDataObject({ id: 'fake-id' }) }) diff --git a/src/app/+item-page/edit-item-page/item-public/item-public.component.spec.ts b/src/app/+item-page/edit-item-page/item-public/item-public.component.spec.ts index 53df20bf04..1143874709 100644 --- a/src/app/+item-page/edit-item-page/item-public/item-public.component.spec.ts +++ b/src/app/+item-page/edit-item-page/item-public/item-public.component.spec.ts @@ -51,7 +51,7 @@ describe('ItemPublicComponent', () => { routeStub = { data: observableOf({ - item: createSuccessfulRemoteDataObject({ + dso: createSuccessfulRemoteDataObject({ id: 'fake-id' }) }) diff --git a/src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts b/src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts index 5e75b59292..005f330df9 100644 --- a/src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts +++ b/src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts @@ -51,7 +51,7 @@ describe('ItemReinstateComponent', () => { routeStub = { data: observableOf({ - item: createSuccessfulRemoteDataObject({ + dso: createSuccessfulRemoteDataObject({ id: 'fake-id' }) }) diff --git a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts index 5e657ae09d..17fede115e 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts +++ b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts @@ -142,7 +142,7 @@ describe('ItemRelationshipsComponent', () => { routeStub = { data: observableOf({}), parent: { - data: observableOf({ item: new RemoteData(false, false, true, null, item) }) + data: observableOf({ dso: new RemoteData(false, false, true, null, item) }) } }; diff --git a/src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts b/src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts index 249298c092..aa6a3e537a 100644 --- a/src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts +++ b/src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts @@ -51,7 +51,7 @@ describe('ItemWithdrawComponent', () => { routeStub = { data: observableOf({ - item: createSuccessfulRemoteDataObject({ + dso: createSuccessfulRemoteDataObject({ id: 'fake-id' }) }) diff --git a/src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts b/src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts index e6c5cfefc0..31c8a6f808 100644 --- a/src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts +++ b/src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts @@ -74,7 +74,7 @@ describe('AbstractSimpleItemActionComponent', () => { routeStub = { data: observableOf({ - item: createSuccessfulRemoteDataObject({ + dso: createSuccessfulRemoteDataObject({ id: 'fake-id' }) }) diff --git a/src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts b/src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts index ca347e1298..1bd8782a30 100644 --- a/src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts +++ b/src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts @@ -42,7 +42,7 @@ export class AbstractSimpleItemActionComponent implements OnInit { ngOnInit(): void { this.itemRD$ = this.route.data.pipe( - map((data) => data.item), + map((data) => data.dso), getSucceededRemoteData() )as Observable>; diff --git a/src/app/+item-page/full/full-item-page.component.spec.ts b/src/app/+item-page/full/full-item-page.component.spec.ts index 0512ea2fef..af966a2530 100644 --- a/src/app/+item-page/full/full-item-page.component.spec.ts +++ b/src/app/+item-page/full/full-item-page.component.spec.ts @@ -34,7 +34,7 @@ const mockItem: Item = Object.assign(new Item(), { } }); const routeStub = Object.assign(new ActivatedRouteStub(), { - data: observableOf({ item: createSuccessfulRemoteDataObject(mockItem) }) + data: observableOf({ dso: createSuccessfulRemoteDataObject(mockItem) }) }); const metadataServiceStub = { /* tslint:disable:no-empty */ diff --git a/src/app/+item-page/item-page-routing.module.ts b/src/app/+item-page/item-page-routing.module.ts index e4f17326a4..022d905ff3 100644 --- a/src/app/+item-page/item-page-routing.module.ts +++ b/src/app/+item-page/item-page-routing.module.ts @@ -20,7 +20,7 @@ import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model'; { path: ':id', resolve: { - item: ItemPageResolver, + dso: ItemPageResolver, breadcrumb: ItemBreadcrumbResolver }, runGuardsAndResolvers: 'always', diff --git a/src/app/+item-page/simple/item-page.component.spec.ts b/src/app/+item-page/simple/item-page.component.spec.ts index 6c26e75908..c2dd0b7015 100644 --- a/src/app/+item-page/simple/item-page.component.spec.ts +++ b/src/app/+item-page/simple/item-page.component.spec.ts @@ -37,7 +37,7 @@ describe('ItemPageComponent', () => { /* tslint:enable:no-empty */ }; const mockRoute = Object.assign(new ActivatedRouteStub(), { - data: observableOf({ item: createSuccessfulRemoteDataObject(mockItem) }) + data: observableOf({ dso: createSuccessfulRemoteDataObject(mockItem) }) }); beforeEach(async(() => { diff --git a/src/app/+item-page/simple/item-page.component.ts b/src/app/+item-page/simple/item-page.component.ts index 10deef23e4..591a093cc9 100644 --- a/src/app/+item-page/simple/item-page.component.ts +++ b/src/app/+item-page/simple/item-page.component.ts @@ -55,7 +55,7 @@ export class ItemPageComponent implements OnInit { */ ngOnInit(): void { this.itemRD$ = this.route.data.pipe( - map((data) => data.item as RemoteData), + map((data) => data.dso as RemoteData), redirectToPageNotFoundOn404(this.router) ); this.metadataService.processRemoteData(this.itemRD$); From ac44bb9cb9c5fd8d77298ff35dbb9d56ef66c6e0 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Tue, 20 Oct 2020 17:54:12 +0200 Subject: [PATCH 08/78] 74199: Admin search dialogs - intermediate commit --- src/app/core/shared/context.model.ts | 1 + .../dso-selector/dso-selector.component.html | 2 +- .../dso-selector/dso-selector.component.ts | 6 ++ ...sidebar-search-list-element.component.html | 1 + ...n-sidebar-search-list-element.component.ts | 17 ++++++ ...sidebar-search-list-element.component.html | 3 + .../sidebar-search-list-element.component.ts | 56 +++++++++++++++++++ src/app/shared/shared.module.ts | 6 +- 8 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.html create mode 100644 src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts create mode 100644 src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html create mode 100644 src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts diff --git a/src/app/core/shared/context.model.ts b/src/app/core/shared/context.model.ts index 4699a7977b..207c1fb99d 100644 --- a/src/app/core/shared/context.model.ts +++ b/src/app/core/shared/context.model.ts @@ -13,4 +13,5 @@ export enum Context { EntitySearchModal = 'EntitySearchModal', AdminSearch = 'adminSearch', AdminWorkflowSearch = 'adminWorkflowSearch', + SideBarSearchModal = 'sideBarSearchModal', } diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html index 92ddf4cf36..8a2f9272c4 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html @@ -16,6 +16,6 @@ title="{{ listEntry.indexableObject.name }}" (click)="onSelect.emit(listEntry.indexableObject)" #listEntryElement> + [linkType]=linkTypes.None [context]="context"> diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts index 37c9a99f59..d0404d61c9 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts @@ -21,6 +21,7 @@ import { PaginatedList } from '../../../core/data/paginated-list'; import { SearchResult } from '../../search/search-result.model'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { ViewMode } from '../../../core/shared/view-mode.model'; +import { Context } from '../../../core/shared/context.model'; @Component({ selector: 'ds-dso-selector', @@ -85,6 +86,11 @@ export class DSOSelectorComponent implements OnInit { */ linkTypes = CollectionElementLinkType; + /** + * This component's context to display listable objects for + */ + context = Context.SideBarSearchModal; + constructor(private searchService: SearchService) { } diff --git a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.html b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.html new file mode 100644 index 0000000000..be25f1af49 --- /dev/null +++ b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.html @@ -0,0 +1 @@ +Test display for sidebar-search list elements diff --git a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts new file mode 100644 index 0000000000..49724a9309 --- /dev/null +++ b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts @@ -0,0 +1,17 @@ +import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator'; +import { ViewMode } from '../../../../../core/shared/view-mode.model'; +import { Component } from '@angular/core'; +import { Context } from '../../../../../core/shared/context.model'; +import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model'; +import { Item } from '../../../../../core/shared/item.model'; +import { SidebarSearchListElementComponent } from '../../sidebar-search-list-element.component'; + +@listableObjectComponent('PublicationSearchResult', ViewMode.ListElement, Context.SideBarSearchModal) +@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.SideBarSearchModal) +@Component({ + selector: 'ds-publication-sidebar-search-list-element', + templateUrl: '../../sidebar-search-list-element.component.html' +}) +export class PublicationSidebarSearchListElementComponent extends SidebarSearchListElementComponent { + +} diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html new file mode 100644 index 0000000000..b0fe1e58d2 --- /dev/null +++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html @@ -0,0 +1,3 @@ +
{{ parentTitle$ | async }}
 +
{{ title }}
 +
{{ description }}
 diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts new file mode 100644 index 0000000000..0489f9f3b7 --- /dev/null +++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts @@ -0,0 +1,56 @@ +import { SearchResult } from '../../search/search-result.model'; +import { DSpaceObject } from '../../../core/shared/dspace-object.model'; +import { SearchResultListElementComponent } from '../search-result-list-element/search-result-list-element.component'; +import { Component } from '@angular/core'; +import { hasValue } from '../../empty.util'; +import { Observable } from 'rxjs/internal/Observable'; +import { TruncatableService } from '../../truncatable/truncatable.service'; +import { LinkService } from '../../../core/cache/builders/link.service'; +import { find, map } from 'rxjs/operators'; +import { ChildHALResource } from '../../../core/shared/child-hal-resource.model'; +import { followLink } from '../../utils/follow-link-config.model'; +import { RemoteData } from '../../../core/data/remote-data'; + +@Component({ + selector: 'ds-sidebar-search-list-element', + templateUrl: './sidebar-search-list-element.component.html' +}) +export class SidebarSearchListElementComponent, K extends DSpaceObject> extends SearchResultListElementComponent { + parentTitle$: Observable; + title: string; + description: string; + + public constructor(protected truncatableService: TruncatableService, + protected linkService: LinkService) { + super(truncatableService); + } + + ngOnInit(): void { + super.ngOnInit(); + if (hasValue(this.dso)) { + this.parentTitle$ = this.getParentTitle(); + this.title = this.getTitle(); + this.description = this.getDescription(); + } + } + + getTitle(): string { + return this.firstMetadataValue('dc.title'); + } + + getDescription(): string { + // TODO: Expand description + return this.firstMetadataValue('dc.publisher'); + } + + getParentTitle(): Observable { + // TODO: Remove cast to "any" and replace with proper type-check + const propertyName = (this.dso as any).getParentLinkKey(); + return this.linkService.resolveLink(this.dso, followLink(propertyName))[propertyName].pipe( + find((parentRD: RemoteData) => parentRD.hasSucceeded || parentRD.statusCode === 204), + map((parentRD: RemoteData) => { + return parentRD.payload.firstMetadataValue('dc.title'); + }) + ); + } +} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 5f35ed4ceb..5b849eb403 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -210,6 +210,8 @@ import { CollectionDropdownComponent } from './collection-dropdown/collection-dr import { DsSelectComponent } from './ds-select/ds-select.component'; import { VocabularyTreeviewComponent } from './vocabulary-treeview/vocabulary-treeview.component'; import { CurationFormComponent } from '../curation-form/curation-form.component'; +import { PublicationSidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component'; +import { SidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/sidebar-search-list-element.component'; const MODULES = [ // Do NOT include UniversalModule, HttpModule, or JsonpModule here @@ -483,7 +485,9 @@ const ENTRY_COMPONENTS = [ CurationFormComponent, ExportMetadataSelectorComponent, ConfirmationModalComponent, - VocabularyTreeviewComponent + VocabularyTreeviewComponent, + SidebarSearchListElementComponent, + PublicationSidebarSearchListElementComponent, ]; const SHARED_ITEM_PAGE_COMPONENTS = [ From f79ea2b844c5eb7456fb0e9882ec0ae51602b611 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Wed, 21 Oct 2020 13:24:21 +0200 Subject: [PATCH 09/78] 74199: Admin search dialogs - sidebar search list element implementations - intermediate commit --- ...e-sidebar-search-list-element.component.ts | 38 ++++++ ...e-sidebar-search-list-element.component.ts | 38 ++++++ ...l-sidebar-search-list-element.component.ts | 31 +++++ .../journal-entities.module.ts | 8 +- ...t-sidebar-search-list-element.component.ts | 33 +++++ ...n-sidebar-search-list-element.component.ts | 59 +++++++++ ...t-sidebar-search-list-element.component.ts | 26 ++++ .../research-entities.module.ts | 8 +- ...sidebar-search-list-element.component.html | 1 - ...n-sidebar-search-list-element.component.ts | 4 + ...sidebar-search-list-element.component.html | 6 +- .../sidebar-search-list-element.component.ts | 113 ++++++++++++++++-- src/assets/i18n/en.json5 | 2 + 13 files changed, 349 insertions(+), 18 deletions(-) create mode 100644 src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts create mode 100644 src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts create mode 100644 src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts create mode 100644 src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts create mode 100644 src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts create mode 100644 src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts delete mode 100644 src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.html diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts new file mode 100644 index 0000000000..026a9be15c --- /dev/null +++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts @@ -0,0 +1,38 @@ +import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; +import { ViewMode } from '../../../../../core/shared/view-mode.model'; +import { Context } from '../../../../../core/shared/context.model'; +import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; +import { Component } from '@angular/core'; +import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component'; +import { Item } from '../../../../../core/shared/item.model'; +import { isNotEmpty } from '../../../../../shared/empty.util'; + +@listableObjectComponent('JournalIssueSearchResult', ViewMode.ListElement, Context.SideBarSearchModal) +@Component({ + selector: 'ds-journal-issue-sidebar-search-list-element', + templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html' +}) +/** + * Component displaying a list element for a {@link ItemSearchResult} of type "JournalIssue" within the context of + * a sidebar search modal + */ +export class JournalIssueSidebarSearchListElementComponent extends SidebarSearchListElementComponent { + /** + * Get the description of the Journal Issue by returning its volume number(s) and/or issue number(s) + */ + getDescription(): string { + const volumeNumbers = this.allMetadataValues(['publicationvolume.volumeNumber']); + const issueNumbers = this.allMetadataValues(['publicationissue.issueNumber']); + let description = ''; + if (isNotEmpty(volumeNumbers)) { + description += volumeNumbers.join(', '); + } + if (isNotEmpty(description) && isNotEmpty(issueNumbers)) { + description += ' - '; + } + if (isNotEmpty(issueNumbers)) { + description += issueNumbers.join(', '); + } + return this.undefinedIfEmpty(description); + } +} diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts new file mode 100644 index 0000000000..ce99d14406 --- /dev/null +++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts @@ -0,0 +1,38 @@ +import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; +import { ViewMode } from '../../../../../core/shared/view-mode.model'; +import { Context } from '../../../../../core/shared/context.model'; +import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; +import { Component } from '@angular/core'; +import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component'; +import { Item } from '../../../../../core/shared/item.model'; +import { isNotEmpty } from '../../../../../shared/empty.util'; + +@listableObjectComponent('JournalVolumeSearchResult', ViewMode.ListElement, Context.SideBarSearchModal) +@Component({ + selector: 'ds-journal-volume-sidebar-search-list-element', + templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html' +}) +/** + * Component displaying a list element for a {@link ItemSearchResult} of type "JournalVolume" within the context of + * a sidebar search modal + */ +export class JournalVolumeSidebarSearchListElementComponent extends SidebarSearchListElementComponent { + /** + * Get the description of the Journal Volume by returning the journal title and volume number(s) (between parentheses) + */ + getDescription(): string { + const titles = this.allMetadataValues(['journal.title']); + const numbers = this.allMetadataValues(['publicationvolume.volumeNumber']); + let description = ''; + if (isNotEmpty(titles)) { + description += titles.join(', '); + } + if (isNotEmpty(numbers)) { + if (isNotEmpty(description)) { + description += ' '; + } + description += numbers.map((n) => `(${n})`).join(' '); + } + return this.undefinedIfEmpty(description); + } +} diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts new file mode 100644 index 0000000000..f222298ee3 --- /dev/null +++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts @@ -0,0 +1,31 @@ +import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; +import { ViewMode } from '../../../../../core/shared/view-mode.model'; +import { Context } from '../../../../../core/shared/context.model'; +import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; +import { Component } from '@angular/core'; +import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component'; +import { Item } from '../../../../../core/shared/item.model'; +import { isNotEmpty } from '../../../../../shared/empty.util'; + +@listableObjectComponent('JournalSearchResult', ViewMode.ListElement, Context.SideBarSearchModal) +@Component({ + selector: 'ds-journal-sidebar-search-list-element', + templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html' +}) +/** + * Component displaying a list element for a {@link ItemSearchResult} of type "Journal" within the context of + * a sidebar search modal + */ +export class JournalSidebarSearchListElementComponent extends SidebarSearchListElementComponent { + /** + * Get the description of the Journal by returning its ISSN(s) + */ + getDescription(): string { + const issns = this.allMetadataValues(['creativeworkseries.issn']); + let description = ''; + if (isNotEmpty(issns)) { + description += issns.join(', '); + } + return this.undefinedIfEmpty(description); + } +} diff --git a/src/app/entity-groups/journal-entities/journal-entities.module.ts b/src/app/entity-groups/journal-entities/journal-entities.module.ts index d00eae1e54..11ce6c4c2a 100644 --- a/src/app/entity-groups/journal-entities/journal-entities.module.ts +++ b/src/app/entity-groups/journal-entities/journal-entities.module.ts @@ -18,6 +18,9 @@ import { JournalIssueSearchResultListElementComponent } from './item-list-elemen import { JournalVolumeSearchResultListElementComponent } from './item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component'; import { JournalIssueSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component'; import { JournalVolumeSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component'; +import { JournalVolumeSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component'; +import { JournalIssueSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component'; +import { JournalSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component'; const ENTRY_COMPONENTS = [ JournalComponent, @@ -34,7 +37,10 @@ const ENTRY_COMPONENTS = [ JournalVolumeSearchResultListElementComponent, JournalIssueSearchResultGridElementComponent, JournalVolumeSearchResultGridElementComponent, - JournalSearchResultGridElementComponent + JournalSearchResultGridElementComponent, + JournalVolumeSidebarSearchListElementComponent, + JournalIssueSidebarSearchListElementComponent, + JournalSidebarSearchListElementComponent, ]; @NgModule({ diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts new file mode 100644 index 0000000000..54fed3125f --- /dev/null +++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts @@ -0,0 +1,33 @@ +import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; +import { ViewMode } from '../../../../../core/shared/view-mode.model'; +import { Context } from '../../../../../core/shared/context.model'; +import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; +import { Component } from '@angular/core'; +import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component'; +import { Item } from '../../../../../core/shared/item.model'; +import { isNotEmpty } from '../../../../../shared/empty.util'; + +@listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.SideBarSearchModal) +@Component({ + selector: 'ds-org-unit-sidebar-search-list-element', + templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html' +}) +/** + * Component displaying a list element for a {@link ItemSearchResult} of type "OrgUnit" within the context of + * a sidebar search modal + */ +export class OrgUnitSidebarSearchListElementComponent extends SidebarSearchListElementComponent { + /** + * Get the title of the Org Unit by returning its legal name + */ + getTitle(): string { + return this.firstMetadataValue('organization.legalName'); + } + + /** + * Get the description of the Org Unit by returning its dc.description + */ + getDescription(): string { + return this.firstMetadataValue('dc.description'); + } +} diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts new file mode 100644 index 0000000000..9cbf66d040 --- /dev/null +++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts @@ -0,0 +1,59 @@ +import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; +import { ViewMode } from '../../../../../core/shared/view-mode.model'; +import { Context } from '../../../../../core/shared/context.model'; +import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; +import { Component } from '@angular/core'; +import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component'; +import { Item } from '../../../../../core/shared/item.model'; +import { isNotEmpty } from '../../../../../shared/empty.util'; +import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service'; +import { LinkService } from '../../../../../core/cache/builders/link.service'; +import { TranslateService } from '@ngx-translate/core'; + +@listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.SideBarSearchModal) +@Component({ + selector: 'ds-person-sidebar-search-list-element', + templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html' +}) +/** + * Component displaying a list element for a {@link ItemSearchResult} of type "Person" within the context of + * a sidebar search modal + */ +export class PersonSidebarSearchListElementComponent extends SidebarSearchListElementComponent { + constructor(protected truncatableService: TruncatableService, + protected linkService: LinkService, + protected translateService: TranslateService) { + super(truncatableService, linkService); + } + + /** + * Get the title of the Person by returning a combination of its family name and given name (or "No name found") + */ + getTitle(): string { + const familyName = this.firstMetadataValue('person.familyName'); + const givenName = this.firstMetadataValue('person.givenName'); + let title = ''; + if (isNotEmpty(familyName)) { + title = familyName; + } + if (isNotEmpty(title)) { + title += ', '; + } + if (isNotEmpty(givenName)) { + title += givenName; + } + return this.defaultIfEmpty(title, this.translateService.instant('person.listelement.no-title')); + } + + /** + * Get the description of the Person by returning its job title(s) + */ + getDescription(): string { + const titles = this.allMetadataValues(['person.jobTitle']); + let description = ''; + if (isNotEmpty(titles)) { + description += titles.join(', '); + } + return this.undefinedIfEmpty(description); + } +} diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts new file mode 100644 index 0000000000..00124cf497 --- /dev/null +++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts @@ -0,0 +1,26 @@ +import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; +import { ViewMode } from '../../../../../core/shared/view-mode.model'; +import { Context } from '../../../../../core/shared/context.model'; +import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; +import { Component } from '@angular/core'; +import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component'; +import { Item } from '../../../../../core/shared/item.model'; +import { isNotEmpty } from '../../../../../shared/empty.util'; + +@listableObjectComponent('ProjectSearchResult', ViewMode.ListElement, Context.SideBarSearchModal) +@Component({ + selector: 'ds-project-sidebar-search-list-element', + templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html' +}) +/** + * Component displaying a list element for a {@link ItemSearchResult} of type "Project" within the context of + * a sidebar search modal + */ +export class ProjectSidebarSearchListElementComponent extends SidebarSearchListElementComponent { + /** + * Projects currently don't support a description + */ + getDescription(): string { + return undefined; + } +} diff --git a/src/app/entity-groups/research-entities/research-entities.module.ts b/src/app/entity-groups/research-entities/research-entities.module.ts index cef3b4539b..1f50ab830a 100644 --- a/src/app/entity-groups/research-entities/research-entities.module.ts +++ b/src/app/entity-groups/research-entities/research-entities.module.ts @@ -26,6 +26,9 @@ import { NameVariantModalComponent } from './submission/name-variant-modal/name- import { OrgUnitInputSuggestionsComponent } from './submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component'; import { OrgUnitSearchResultListSubmissionElementComponent } from './submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component'; import { ExternalSourceEntryListSubmissionElementComponent } from './submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component'; +import { OrgUnitSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component'; +import { PersonSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component'; +import { ProjectSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component'; const ENTRY_COMPONENTS = [ OrgUnitComponent, @@ -50,7 +53,10 @@ const ENTRY_COMPONENTS = [ NameVariantModalComponent, OrgUnitSearchResultListSubmissionElementComponent, OrgUnitInputSuggestionsComponent, - ExternalSourceEntryListSubmissionElementComponent + ExternalSourceEntryListSubmissionElementComponent, + OrgUnitSidebarSearchListElementComponent, + PersonSidebarSearchListElementComponent, + ProjectSidebarSearchListElementComponent, ]; @NgModule({ diff --git a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.html b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.html deleted file mode 100644 index be25f1af49..0000000000 --- a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.html +++ /dev/null @@ -1 +0,0 @@ -Test display for sidebar-search list elements diff --git a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts index 49724a9309..fb79a4924e 100644 --- a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts +++ b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts @@ -12,6 +12,10 @@ import { SidebarSearchListElementComponent } from '../../sidebar-search-list-ele selector: 'ds-publication-sidebar-search-list-element', templateUrl: '../../sidebar-search-list-element.component.html' }) +/** + * Component displaying a list element for a {@link ItemSearchResult} of type "Publication" within the context of + * a sidebar search modal + */ export class PublicationSidebarSearchListElementComponent extends SidebarSearchListElementComponent { } diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html index b0fe1e58d2..adcf23dcf7 100644 --- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html +++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html @@ -1,3 +1,3 @@ -
{{ parentTitle$ | async }}
 -
{{ title }}
 -
{{ description }}
 +
{{ parentTitle$ | async }}
 +
{{ title }}
 +
{{ description }}
 diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts index 0489f9f3b7..71547854f9 100644 --- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts +++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts @@ -2,7 +2,7 @@ import { SearchResult } from '../../search/search-result.model'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { SearchResultListElementComponent } from '../search-result-list-element/search-result-list-element.component'; import { Component } from '@angular/core'; -import { hasValue } from '../../empty.util'; +import { hasValue, isNotEmpty } from '../../empty.util'; import { Observable } from 'rxjs/internal/Observable'; import { TruncatableService } from '../../truncatable/truncatable.service'; import { LinkService } from '../../../core/cache/builders/link.service'; @@ -10,14 +10,31 @@ import { find, map } from 'rxjs/operators'; import { ChildHALResource } from '../../../core/shared/child-hal-resource.model'; import { followLink } from '../../utils/follow-link-config.model'; import { RemoteData } from '../../../core/data/remote-data'; +import { of as observableOf } from 'rxjs'; @Component({ selector: 'ds-sidebar-search-list-element', templateUrl: './sidebar-search-list-element.component.html' }) +/** + * Component displaying a list element for a {@link SearchResult} in the sidebar search modal + * It displays the name of the parent, title and description of the object. All of which are customizable in the child + * component by overriding the relevant methods of this component + */ export class SidebarSearchListElementComponent, K extends DSpaceObject> extends SearchResultListElementComponent { + /** + * Observable for the title of the parent object (displayed above the object's title) + */ parentTitle$: Observable; + + /** + * The title for the object to display + */ title: string; + + /** + * A description to display below the title + */ description: string; public constructor(protected truncatableService: TruncatableService, @@ -25,6 +42,9 @@ export class SidebarSearchListElementComponent, K exte super(truncatableService); } + /** + * Initialise the component variables + */ ngOnInit(): void { super.ngOnInit(); if (hasValue(this.dso)) { @@ -34,23 +54,92 @@ export class SidebarSearchListElementComponent, K exte } } + /** + * Get the title of the object's parent + * Retrieve the parent by using the object's parent link and retrieving its 'dc.title' metadata + */ + getParentTitle(): Observable { + return this.getParent().pipe( + map((parentRD: RemoteData) => { + return parentRD ? parentRD.payload.firstMetadataValue('dc.title') : undefined; + }) + ); + } + + /** + * Get the parent of the object + */ + getParent(): Observable> { + if (typeof (this.dso as any).getParentLinkKey === 'function') { + const propertyName = (this.dso as any).getParentLinkKey(); + return this.linkService.resolveLink(this.dso, followLink(propertyName))[propertyName].pipe( + find((parentRD: RemoteData) => parentRD.hasSucceeded || parentRD.statusCode === 204) + ); + } + return observableOf(undefined); + } + + /** + * Get the title of the object + * Default: "dc.title" + */ getTitle(): string { return this.firstMetadataValue('dc.title'); } + /** + * Get the description of the object + * Default: "(dc.publisher, dc.date.issued) authors" + */ getDescription(): string { - // TODO: Expand description - return this.firstMetadataValue('dc.publisher'); + const publisher = this.firstMetadataValue('dc.publisher'); + const date = this.firstMetadataValue('dc.date.issued'); + const authors = this.allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); + let description = ''; + if (isNotEmpty(publisher) || isNotEmpty(date)) { + description += '('; + } + if (isNotEmpty(publisher)) { + description += publisher; + } + if (isNotEmpty(date)) { + if (isNotEmpty(publisher)) { + description += ', '; + } + description += date; + } + if (isNotEmpty(description)) { + description += ') '; + } + if (isNotEmpty(authors)) { + authors.forEach((author, i) => { + description += author; + if (i < (authors.length - 1)) { + description += '; '; + } + }); + } + return this.undefinedIfEmpty(description); } - getParentTitle(): Observable { - // TODO: Remove cast to "any" and replace with proper type-check - const propertyName = (this.dso as any).getParentLinkKey(); - return this.linkService.resolveLink(this.dso, followLink(propertyName))[propertyName].pipe( - find((parentRD: RemoteData) => parentRD.hasSucceeded || parentRD.statusCode === 204), - map((parentRD: RemoteData) => { - return parentRD.payload.firstMetadataValue('dc.title'); - }) - ); + /** + * Return undefined if the provided string is empty + * @param value Value to check + */ + undefinedIfEmpty(value: string) { + return this.defaultIfEmpty(value, undefined); + } + + /** + * Return a default value if the provided string is empty + * @param value Value to check + * @param def Default in case value is empty + */ + defaultIfEmpty(value: string, def: string) { + if (isNotEmpty(value)) { + return value; + } else { + return def; + } } } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 84d874388c..a6aaad98ea 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2194,6 +2194,8 @@ "person.listelement.badge": "Person", + "person.listelement.no-title": "No name found", + "person.page.birthdate": "Birth Date", "person.page.email": "Email Address", From 8b2b28df2508c923e06209cef75e06133e981d8e Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Wed, 21 Oct 2020 18:04:03 +0200 Subject: [PATCH 10/78] 74199: Infinite scrollable dso-selector + collection/community implementation + authorized-collection-selector --- ...uthorized-collection-selector.component.ts | 40 ++++++ .../dso-selector/dso-selector.component.html | 12 +- .../dso-selector/dso-selector.component.scss | 5 + .../dso-selector/dso-selector.component.ts | 123 ++++++++++++++---- ...create-item-parent-selector.component.html | 3 +- ...n-sidebar-search-list-element.component.ts | 24 ++++ ...y-sidebar-search-list-element.component.ts | 24 ++++ src/app/shared/shared.module.ts | 9 +- src/styles/_custom_variables.scss | 2 + 9 files changed, 212 insertions(+), 30 deletions(-) create mode 100644 src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts create mode 100644 src/app/shared/dso-selector/dso-selector/dso-selector.component.scss create mode 100644 src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts create mode 100644 src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts diff --git a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts new file mode 100644 index 0000000000..ff9fa81368 --- /dev/null +++ b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts @@ -0,0 +1,40 @@ +import { Component } from '@angular/core'; +import { DSOSelectorComponent } from '../dso-selector.component'; +import { SearchService } from '../../../../core/shared/search/search.service'; +import { CollectionDataService } from '../../../../core/data/collection-data.service'; +import { Observable } from 'rxjs/internal/Observable'; +import { PaginatedList } from '../../../../core/data/paginated-list'; +import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators'; +import { map } from 'rxjs/operators'; +import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model'; +import { SearchResult } from '../../../search/search-result.model'; +import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; + +@Component({ + selector: 'ds-authorized-collection-selector', + templateUrl: '../dso-selector.component.html' +}) +/** + * Component rendering a list of collections to select from + */ +export class AuthorizedCollectionSelectorComponent extends DSOSelectorComponent { + constructor(protected searchService: SearchService, + protected collectionDataService: CollectionDataService) { + super(searchService); + } + + /** + * Perform a search for authorized collections with the current query and page + * @param query Query to search objects for + * @param page Page to retrieve + */ + search(query: string, page: number): Observable>> { + return this.collectionDataService.getAuthorizedCollection(query, Object.assign({ + currentPage: page, + elementsPerPage: this.defaultPagination.pageSize + })).pipe( + getFirstSucceededRemoteDataPayload(), + map((list) => new PaginatedList(list.pageInfo, list.page.map((col) => Object.assign(new CollectionSearchResult(), { indexableObject: col })))) + ); + } +} diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html index 8a2f9272c4..a0b6aff2a3 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html @@ -7,15 +7,23 @@
+
- +
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.scss b/src/app/shared/dso-selector/dso-selector/dso-selector.component.scss new file mode 100644 index 0000000000..37d2ebeca7 --- /dev/null +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.scss @@ -0,0 +1,5 @@ +.scrollable-menu { + height: auto; + max-height: $dso-selector-list-max-height; + overflow-x: hidden; +} diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts index d0404d61c9..8d2d6f758b 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts @@ -3,29 +3,33 @@ import { ElementRef, EventEmitter, Input, + OnDestroy, OnInit, Output, QueryList, ViewChildren } from '@angular/core'; import { FormControl } from '@angular/forms'; - -import { Observable } from 'rxjs'; -import { debounceTime, startWith, switchMap } from 'rxjs/operators'; +import { debounceTime, startWith, switchMap, tap } from 'rxjs/operators'; import { SearchService } from '../../../core/shared/search/search.service'; import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type'; import { PaginatedSearchOptions } from '../../search/paginated-search-options.model'; import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; -import { RemoteData } from '../../../core/data/remote-data'; -import { PaginatedList } from '../../../core/data/paginated-list'; -import { SearchResult } from '../../search/search-result.model'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { ViewMode } from '../../../core/shared/view-mode.model'; import { Context } from '../../../core/shared/context.model'; +import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; +import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators'; +import { Subscription } from 'rxjs/internal/Subscription'; +import { hasValue } from '../../empty.util'; +import { combineLatest as observableCombineLatest } from 'rxjs'; +import { Observable } from 'rxjs/internal/Observable'; +import { PaginatedList } from '../../../core/data/paginated-list'; +import { SearchResult } from '../../search/search-result.model'; @Component({ selector: 'ds-dso-selector', - // styleUrls: ['./dso-selector.component.scss'], + styleUrls: ['./dso-selector.component.scss'], templateUrl: './dso-selector.component.html' }) @@ -33,7 +37,7 @@ import { Context } from '../../../core/shared/context.model'; * Component to render a list of DSO's of which one can be selected * The user can search the list by using the input field */ -export class DSOSelectorComponent implements OnInit { +export class DSOSelectorComponent implements OnInit, OnDestroy { /** * The view mode of the listed objects */ @@ -64,12 +68,29 @@ export class DSOSelectorComponent implements OnInit { /** * Default pagination for this feature */ - private defaultPagination = { id: 'dso-selector', currentPage: 1, pageSize: 5 } as any; + defaultPagination = { id: 'dso-selector', currentPage: 1, pageSize: 5 } as any; /** * List with search results of DSpace objects for the current query */ - listEntries$: Observable>>>; + listEntries: Array> = []; + + /** + * The current page to load + * Dynamically goes up as the user scrolls down until it reaches the last page possible + */ + currentPage$ = new BehaviorSubject(1); + + /** + * Whether or not the list contains a next page to load + * This allows us to avoid next pages from trying to load when there are none + */ + hasNextPage = false; + + /** + * Whether or not the list should be reset next time it receives a page to load + */ + resetList = false; /** * List of element references to all elements @@ -91,31 +112,76 @@ export class DSOSelectorComponent implements OnInit { */ context = Context.SideBarSearchModal; - constructor(private searchService: SearchService) { + /** + * Array to track all subscriptions and unsubscribe them onDestroy + * @type {Array} + */ + public subs: Subscription[] = []; + + constructor(protected searchService: SearchService) { } /** - * Fills the listEntries$ variable with search results based on the input field's current value + * Fills the listEntries variable with search results based on the input field's current value and the current page * The search will always start with the initial currentDSOId value */ ngOnInit(): void { this.input.setValue(this.currentDSOId); this.typesString = this.types.map((type: string) => type.toString().toLowerCase()).join(', '); - this.listEntries$ = this.input.valueChanges - .pipe( + + this.subs.push(observableCombineLatest( + this.input.valueChanges.pipe( debounceTime(this.debounceTime), startWith(this.currentDSOId), - switchMap((query) => { - return this.searchService.search( - new PaginatedSearchOptions({ - query: query, - dsoTypes: this.types, - pagination: this.defaultPagination - }) - ) - } - ) - ) + tap(() => this.currentPage$.next(1)) + ), + this.currentPage$ + ).pipe( + switchMap(([query, page]: [string, number]) => { + if (page === 1) { + // The first page is loading, this means we should reset the list instead of adding to it + this.resetList = true; + } + return this.search(query, page); + }) + ).subscribe((list) => { + if (this.resetList) { + this.listEntries = list.page; + this.resetList = false; + } else { + this.listEntries.push(...list.page); + } + // Check if there are more pages available after the current one + this.hasNextPage = list.totalElements > this.listEntries.length; + })); + } + + /** + * Perform a search for the current query and page + * @param query Query to search objects for + * @param page Page to retrieve + */ + search(query: string, page: number): Observable>> { + return this.searchService.search( + new PaginatedSearchOptions({ + query: query, + dsoTypes: this.types, + pagination: Object.assign({}, this.defaultPagination, { + currentPage: page + }) + }) + ).pipe( + getFirstSucceededRemoteDataPayload() + ); + } + + /** + * When the user reaches the bottom of the page (or almost) and there's a next page available, increase the current page + */ + onScrollDown() { + if (this.hasNextPage) { + this.currentPage$.next(this.currentPage$.value + 1); + } } /** @@ -126,4 +192,11 @@ export class DSOSelectorComponent implements OnInit { this.listElements.first.nativeElement.click(); } } + + /** + * Unsubscribe from all subscriptions + */ + ngOnDestroy(): void { + this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe()); + } } diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html index ef8865ad87..a188b08b60 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html +++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html @@ -5,7 +5,6 @@
- - +
diff --git a/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts new file mode 100644 index 0000000000..8439ca53f7 --- /dev/null +++ b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts @@ -0,0 +1,24 @@ +import { Component } from '@angular/core'; +import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model'; +import { Collection } from '../../../../core/shared/collection.model'; +import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator'; +import { Context } from '../../../../core/shared/context.model'; +import { ViewMode } from '../../../../core/shared/view-mode.model'; +import { SidebarSearchListElementComponent } from '../sidebar-search-list-element.component'; + +@listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.SideBarSearchModal) +@Component({ + selector: 'ds-collection-sidebar-search-list-element', + templateUrl: '../sidebar-search-list-element.component.html' +}) +/** + * Component displaying a list element for a {@link CollectionSearchResult} within the context of a sidebar search modal + */ +export class CollectionSidebarSearchListElementComponent extends SidebarSearchListElementComponent { + /** + * Get the description of the Collection by returning its abstract + */ + getDescription(): string { + return this.firstMetadataValue('dc.description.abstract'); + } +} diff --git a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts new file mode 100644 index 0000000000..02e09c3fd4 --- /dev/null +++ b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts @@ -0,0 +1,24 @@ +import { Component } from '@angular/core'; +import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator'; +import { Context } from '../../../../core/shared/context.model'; +import { ViewMode } from '../../../../core/shared/view-mode.model'; +import { SidebarSearchListElementComponent } from '../sidebar-search-list-element.component'; +import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model'; +import { Community } from '../../../../core/shared/community.model'; + +@listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.SideBarSearchModal) +@Component({ + selector: 'ds-collection-sidebar-search-list-element', + templateUrl: '../sidebar-search-list-element.component.html' +}) +/** + * Component displaying a list element for a {@link CommunitySearchResult} within the context of a sidebar search modal + */ +export class CommunitySidebarSearchListElementComponent extends SidebarSearchListElementComponent { + /** + * Get the description of the Community by returning its abstract + */ + getDescription(): string { + return this.firstMetadataValue('dc.description.abstract'); + } +} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 5b849eb403..d8d8b51331 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -212,6 +212,9 @@ import { VocabularyTreeviewComponent } from './vocabulary-treeview/vocabulary-tr import { CurationFormComponent } from '../curation-form/curation-form.component'; import { PublicationSidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component'; import { SidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/sidebar-search-list-element.component'; +import { CollectionSidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component'; +import { CommunitySidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component'; +import { AuthorizedCollectionSelectorComponent } from './dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component'; const MODULES = [ // Do NOT include UniversalModule, HttpModule, or JsonpModule here @@ -405,7 +408,8 @@ const COMPONENTS = [ CollectionDropdownComponent, ExportMetadataSelectorComponent, ConfirmationModalComponent, - VocabularyTreeviewComponent + VocabularyTreeviewComponent, + AuthorizedCollectionSelectorComponent, ]; const ENTRY_COMPONENTS = [ @@ -488,6 +492,9 @@ const ENTRY_COMPONENTS = [ VocabularyTreeviewComponent, SidebarSearchListElementComponent, PublicationSidebarSearchListElementComponent, + CollectionSidebarSearchListElementComponent, + CommunitySidebarSearchListElementComponent, + AuthorizedCollectionSelectorComponent, ]; const SHARED_ITEM_PAGE_COMPONENTS = [ diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss index c1f155fa39..bc1dfda7e7 100644 --- a/src/styles/_custom_variables.scss +++ b/src/styles/_custom_variables.scss @@ -37,3 +37,5 @@ $edit-item-metadata-field-width: 190px !default; $edit-item-language-field-width: 43px !default; $thumbnail-max-width: 175px !default; + +$dso-selector-list-max-height: 475px !default; From 1127b363e90ba4377cab130d8cdea42c75d3699a Mon Sep 17 00:00:00 2001 From: Corrado Lombardi Date: Thu, 22 Oct 2020 15:45:39 +0200 Subject: [PATCH 11/78] [CSTPER-66] function to get succeeded or no content response --- src/app/core/shared/operators.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/app/core/shared/operators.ts b/src/app/core/shared/operators.ts index ad2588f2b9..203f66b074 100644 --- a/src/app/core/shared/operators.ts +++ b/src/app/core/shared/operators.ts @@ -75,6 +75,11 @@ export const getSucceededRemoteWithNotEmptyData = () => (source: Observable>): Observable> => source.pipe(find((rd: RemoteData) => rd.hasSucceeded && isNotEmpty(rd.payload))); +export const getSucceededOrNoContentResponse = () => + (source: Observable>): Observable> => + source.pipe(find((rd: RemoteData) => rd.hasSucceeded || rd.hasNoContent)); + + /** * Get the first successful remotely retrieved object * From e1cce311e8a24f1183c377104fd6c31017ebf441 Mon Sep 17 00:00:00 2001 From: Corrado Lombardi Date: Thu, 22 Oct 2020 15:46:05 +0200 Subject: [PATCH 12/78] [CSTPER-66] utility method to check if remote data has no content --- src/app/core/data/remote-data.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/app/core/data/remote-data.ts b/src/app/core/data/remote-data.ts index 8502c8ba1d..17fbe6a8a6 100644 --- a/src/app/core/data/remote-data.ts +++ b/src/app/core/data/remote-data.ts @@ -55,4 +55,8 @@ export class RemoteData { return this.state === RemoteDataState.Success; } + get hasNoContent(): boolean { + return this.statusCode === 204; + } + } From 20c7afce06532c033552f69e35fdb183c2aac091 Mon Sep 17 00:00:00 2001 From: Corrado Lombardi Date: Thu, 22 Oct 2020 15:46:29 +0200 Subject: [PATCH 13/78] [CSTPER-66] utility functions to create remote data object without content --- src/app/shared/remote-data.utils.ts | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/app/shared/remote-data.utils.ts b/src/app/shared/remote-data.utils.ts index ce278e0229..580b68673b 100644 --- a/src/app/shared/remote-data.utils.ts +++ b/src/app/shared/remote-data.utils.ts @@ -69,3 +69,24 @@ export function createPendingRemoteDataObject(object?: T): RemoteData { export function createPendingRemoteDataObject$(object?: T): Observable> { return observableOf(createPendingRemoteDataObject(object)); } + +/** + * Method to create a remote data object with no content + */ +export function createNoContentRemoteDataObject(): RemoteData { + return new RemoteData( + true, + true, + true, + null, + null, + 204 + ); +} + +/** + * Method to create a remote data object that has succeeded with no content, wrapped in an observable + */ +export function createNoContentRemoteDataObject$(): Observable> { + return observableOf(createNoContentRemoteDataObject()); +} From be6a6a2f62cccd34d641882840103302dd99879c Mon Sep 17 00:00:00 2001 From: Corrado Lombardi Date: Thu, 22 Oct 2020 15:50:44 +0200 Subject: [PATCH 14/78] [CSTPER-66] when a community or a collection is created or deleted, angular cache is refreshed so that in case of new community or collection it appears immediately in pages where communities and collections lists are displayed, in case of community or collection deletion deleted community or collection does not appear anymore in pages where communities and collections lists are displayed. --- .../create-comcol-page.component.spec.ts | 108 +++++++++++++++++- .../create-comcol-page.component.ts | 14 +-- .../delete-comcol-page.component.spec.ts | 107 ++++++++++++++++- .../delete-comcol-page.component.ts | 21 ++-- 4 files changed, 226 insertions(+), 24 deletions(-) diff --git a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts index 780589d0c5..d2335f623f 100644 --- a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts +++ b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts @@ -2,7 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { CommunityDataService } from '../../../core/data/community-data.service'; import { RouteService } from '../../../core/services/route.service'; import { Router } from '@angular/router'; -import { TranslateModule } from '@ngx-translate/core'; +import {TranslateModule, TranslateService} from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; import { Community } from '../../../core/shared/community.model'; import { SharedModule } from '../../shared.module'; @@ -12,12 +12,14 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { CreateComColPageComponent } from './create-comcol-page.component'; import { - createFailedRemoteDataObject$, + createFailedRemoteDataObject$, createNoContentRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; import { ComColDataService } from '../../../core/data/comcol-data.service'; import { NotificationsService } from '../../notifications/notifications.service'; import { NotificationsServiceStub } from '../../testing/notifications-service.stub'; +import { RequestService } from '../../../core/data/request.service'; +import {getTestScheduler} from 'jasmine-marbles'; describe('CreateComColPageComponent', () => { let comp: CreateComColPageComponent; @@ -29,9 +31,11 @@ describe('CreateComColPageComponent', () => { let community; let newCommunity; + let parentCommunity; let communityDataServiceStub; let routeServiceStub; let routerStub; + let requestServiceStub; const logoEndpoint = 'rest/api/logo/endpoint'; @@ -44,6 +48,15 @@ describe('CreateComColPageComponent', () => { }] }); + parentCommunity = Object.assign(new Community(), { + uuid: 'a20da287-e174-466a-9926-f66as300d399', + id: 'a20da287-e174-466a-9926-f66as300d399', + metadata: [{ + key: 'dc.title', + value: 'parent community' + }] + }); + newCommunity = Object.assign(new Community(), { uuid: '1ff59938-a69a-4e62-b9a4-718569c55d48', metadata: [{ @@ -61,7 +74,8 @@ describe('CreateComColPageComponent', () => { }] })), create: (com, uuid?) => createSuccessfulRemoteDataObject$(newCommunity), - getLogoEndpoint: () => observableOf(logoEndpoint) + getLogoEndpoint: () => observableOf(logoEndpoint), + findByHref: () => null }; routeServiceStub = { @@ -71,6 +85,10 @@ describe('CreateComColPageComponent', () => { navigate: (commands) => commands }; + requestServiceStub = jasmine.createSpyObj('RequestService', { + removeByHrefSubstring: jasmine.createSpy('removeByHrefSubstring'), + }); + } beforeEach(async(() => { @@ -82,7 +100,9 @@ describe('CreateComColPageComponent', () => { { provide: CommunityDataService, useValue: communityDataServiceStub }, { provide: RouteService, useValue: routeServiceStub }, { provide: Router, useValue: routerStub }, - { provide: NotificationsService, useValue: new NotificationsServiceStub() } + { provide: NotificationsService, useValue: new NotificationsServiceStub() }, + { provide: TranslateService, useValue: {}}, + { provide: RequestService, useValue: requestServiceStub} ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); @@ -123,19 +143,23 @@ describe('CreateComColPageComponent', () => { }; }); - it('should navigate when successful', () => { + it('should navigate and refresh cache when successful', () => { spyOn(router, 'navigate'); + spyOn((comp as any), 'refreshCache'); comp.onSubmit(data); fixture.detectChanges(); expect(router.navigate).toHaveBeenCalled(); + expect((comp as any).refreshCache).toHaveBeenCalled(); }); - it('should not navigate on failure', () => { + it('should neither navigate nor refresh cache on failure', () => { spyOn(router, 'navigate'); spyOn(dsoDataService, 'create').and.returnValue(createFailedRemoteDataObject$(newCommunity)); + spyOn((comp as any), 'refreshCache') comp.onSubmit(data); fixture.detectChanges(); expect(router.navigate).not.toHaveBeenCalled(); + expect((comp as any).refreshCache).not.toHaveBeenCalled(); }); }); @@ -182,5 +206,77 @@ describe('CreateComColPageComponent', () => { expect(data.uploader.uploadAll).toHaveBeenCalled(); }); }); + + describe('cache refresh', () => { + let scheduler; + let communityWithoutParentHref; + + beforeEach(() => { + scheduler = getTestScheduler(); + + }) + describe('cache refreshed top level community', () => { + beforeEach(() => { + spyOn(dsoDataService, 'findByHref').and.returnValue(createNoContentRemoteDataObject$()); + data = { + dso: Object.assign(new Community(), { + metadata: [{ + key: 'dc.title', + value: 'top level community' + }] + }), + _links: { + parentCommunity: { + href: 'topLevel/parentCommunity' + } + } + }; + communityWithoutParentHref = { + dso: Object.assign(new Community(), { + metadata: [{ + key: 'dc.title', + value: 'top level community' + }] + }), + _links: {} + }; + }); + it('top level community cache refreshed', () => { + scheduler.schedule(() => (comp as any).refreshCache(data)); + scheduler.flush(); + expect(requestServiceStub.removeByHrefSubstring).toHaveBeenCalledWith('communities/search/top'); + }); + it('top level community without parent link, cache not refreshed', () => { + scheduler.schedule(() => (comp as any).refreshCache(communityWithoutParentHref)); + scheduler.flush(); + expect(requestServiceStub.removeByHrefSubstring).not.toHaveBeenCalled(); + }); + }); + + describe('cache refreshed child community', () => { + beforeEach(() => { + spyOn(dsoDataService, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(parentCommunity)); + data = { + dso: Object.assign(new Community(), { + metadata: [{ + key: 'dc.title', + value: 'child community' + }] + }), + _links: { + parentCommunity: { + href: 'child/parentCommunity' + } + } + }; + }); + it('child level community cache refreshed', () => { + scheduler.schedule(() => (comp as any).refreshCache(data)); + scheduler.flush(); + expect(requestServiceStub.removeByHrefSubstring).toHaveBeenCalledWith('a20da287-e174-466a-9926-f66as300d399'); + }); + }); + }); + }); }); diff --git a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts index f55a7f0156..336998aab3 100644 --- a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts +++ b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts @@ -11,8 +11,7 @@ import { Community } from '../../../core/shared/community.model'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { getFirstSucceededRemoteDataPayload, - getRemoteDataPayload, - getSucceededRemoteData + getSucceededOrNoContentResponse, } from '../../../core/shared/operators'; import { ResourceType } from '../../../core/shared/resource-type'; import {hasValue, isEmpty, isNotEmpty, isNotUndefined} from '../../empty.util'; @@ -123,11 +122,12 @@ export class CreateComColPageComponent implements return; } this.dsoDataService.findByHref(parentCommunityUrl).pipe( - getSucceededRemoteData(), - getRemoteDataPayload(), - map((pc: TDomain) => isEmpty(pc) ? 'communities/search/top' : pc.id), - take(1) - ).subscribe((href: string) => this.requestService.removeByHrefSubstring(href)); + getSucceededOrNoContentResponse(), + take(1), + ).subscribe((rd: RemoteData) => { + const href = rd.hasSucceeded && !isEmpty(rd.payload.id) ? rd.payload.id : 'communities/search/top'; + this.requestService.removeByHrefSubstring(href) + }); } private parentCommunityUrl(dso: Collection | Community) { diff --git a/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts b/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts index e791f41d56..9da77df007 100644 --- a/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts +++ b/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { CommunityDataService } from '../../../core/data/community-data.service'; import { ActivatedRoute, Router } from '@angular/router'; -import { TranslateModule } from '@ngx-translate/core'; +import {TranslateModule, TranslateService} from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; import { Community } from '../../../core/shared/community.model'; import { SharedModule } from '../../shared.module'; @@ -13,6 +13,9 @@ import { DataService } from '../../../core/data/data.service'; import { DeleteComColPageComponent } from './delete-comcol-page.component'; import { NotificationsService } from '../../notifications/notifications.service'; import { NotificationsServiceStub } from '../../testing/notifications-service.stub'; +import {RequestService} from '../../../core/data/request.service'; +import {getTestScheduler} from 'jasmine-marbles'; +import {createNoContentRemoteDataObject$, createSuccessfulRemoteDataObject$} from '../../remote-data.utils'; describe('DeleteComColPageComponent', () => { let comp: DeleteComColPageComponent; @@ -22,9 +25,13 @@ describe('DeleteComColPageComponent', () => { let community; let newCommunity; + let parentCommunity; let routerStub; let routeStub; let notificationsService; + let translateServiceStub; + let requestServiceStub; + const validUUID = 'valid-uuid'; const invalidUUID = 'invalid-uuid'; const frontendURL = '/testType'; @@ -45,10 +52,20 @@ describe('DeleteComColPageComponent', () => { }] }); + parentCommunity = Object.assign(new Community(), { + uuid: 'a20da287-e174-466a-9926-f66as300d399', + id: 'a20da287-e174-466a-9926-f66as300d399', + metadata: [{ + key: 'dc.title', + value: 'parent community' + }] + }); + dsoDataService = jasmine.createSpyObj( 'dsoDataService', { - delete: observableOf({ isSuccessful: true }) + delete: observableOf({ isSuccessful: true }), + findByHref: jasmine.createSpy('findByHref') }); routerStub = { @@ -59,6 +76,14 @@ describe('DeleteComColPageComponent', () => { data: observableOf(community) }; + requestServiceStub = jasmine.createSpyObj('RequestService', { + removeByHrefSubstring: jasmine.createSpy('removeByHrefSubstring') + }); + + translateServiceStub = jasmine.createSpyObj('TranslateService', { + instant: jasmine.createSpy('instant') + }); + } beforeEach(async(() => { @@ -70,6 +95,8 @@ describe('DeleteComColPageComponent', () => { { provide: Router, useValue: routerStub }, { provide: ActivatedRoute, useValue: routeStub }, { provide: NotificationsService, useValue: new NotificationsServiceStub() }, + { provide: TranslateService, useValue: translateServiceStub}, + { provide: RequestService, useValue: requestServiceStub} ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); @@ -108,17 +135,21 @@ describe('DeleteComColPageComponent', () => { it('should show an error notification on failure', () => { (dsoDataService.delete as any).and.returnValue(observableOf({ isSuccessful: false })); spyOn(router, 'navigate'); + spyOn((comp as any), 'refreshCache'); comp.onConfirm(data2); fixture.detectChanges(); expect(notificationsService.error).toHaveBeenCalled(); + expect((comp as any).refreshCache).not.toHaveBeenCalled(); expect(router.navigate).toHaveBeenCalled(); }); it('should show a success notification on success and navigate', () => { spyOn(router, 'navigate'); + spyOn((comp as any), 'refreshCache'); comp.onConfirm(data1); fixture.detectChanges(); expect(notificationsService.success).toHaveBeenCalled(); + expect((comp as any).refreshCache).toHaveBeenCalled(); expect(router.navigate).toHaveBeenCalled(); }); @@ -127,6 +158,78 @@ describe('DeleteComColPageComponent', () => { fixture.detectChanges(); expect(dsoDataService.delete).toHaveBeenCalledWith(data1.id); }); + + describe('cache refresh', () => { + let scheduler; + let communityWithoutParentHref; + let deletedCommunity; + + beforeEach(() => { + scheduler = getTestScheduler(); + + }) + describe('cache refreshed top level community', () => { + beforeEach(() => { + (dsoDataService.findByHref as any).and.returnValue(createNoContentRemoteDataObject$()); + deletedCommunity = { + dso: Object.assign(new Community(), { + metadata: [{ + key: 'dc.title', + value: 'top level community' + }] + }), + _links: { + parentCommunity: { + href: 'topLevel/parentCommunity' + } + } + }; + communityWithoutParentHref = { + dso: Object.assign(new Community(), { + metadata: [{ + key: 'dc.title', + value: 'top level community' + }] + }), + _links: {} + }; + }); + it('top level community cache refreshed', () => { + scheduler.schedule(() => (comp as any).refreshCache(deletedCommunity)); + scheduler.flush(); + expect(requestServiceStub.removeByHrefSubstring).toHaveBeenCalledWith('communities/search/top'); + }); + it('top level community without parent link, cache not refreshed', () => { + scheduler.schedule(() => (comp as any).refreshCache(communityWithoutParentHref)); + scheduler.flush(); + expect(requestServiceStub.removeByHrefSubstring).not.toHaveBeenCalled(); + }); + }); + + describe('cache refreshed child community', () => { + beforeEach(() => { + (dsoDataService.findByHref as any).and.returnValue(createSuccessfulRemoteDataObject$(parentCommunity)); + deletedCommunity = { + dso: Object.assign(new Community(), { + metadata: [{ + key: 'dc.title', + value: 'child community' + }] + }), + _links: { + parentCommunity: { + href: 'child/parentCommunity' + } + } + }; + }); + it('child level community cache refreshed', () => { + scheduler.schedule(() => (comp as any).refreshCache(deletedCommunity)); + scheduler.flush(); + expect(requestServiceStub.removeByHrefSubstring).toHaveBeenCalledWith('a20da287-e174-466a-9926-f66as300d399'); + }); + }); + }); }); describe('onCancel', () => { diff --git a/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts b/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts index 29ec4f7b19..835d302de3 100644 --- a/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts +++ b/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts @@ -10,7 +10,9 @@ import {TranslateService} from '@ngx-translate/core'; import {RestResponse} from '../../../core/cache/response.models'; import {hasValue, isEmpty, isNotEmpty} from '../../empty.util'; import {RequestService} from '../../../core/data/request.service'; -import {getRemoteDataPayload, getSucceededRemoteData} from '../../../core/shared/operators'; +import { + getSucceededOrNoContentResponse, +} from '../../../core/shared/operators'; import {Community} from '../../../core/shared/community.model'; import {Collection} from '../../../core/shared/collection.model'; @@ -74,16 +76,17 @@ export class DeleteComColPageComponent implements } private refreshCache(dso: TDomain) { - const parentCommunity = this.parentCommunityUrl(dso as any); - if (!hasValue(parentCommunity)) { + const parentCommunityUrl = this.parentCommunityUrl(dso as any); + if (!hasValue(parentCommunityUrl)) { return; } - this.dsoDataService.findByHref(parentCommunity).pipe( - getSucceededRemoteData(), - getRemoteDataPayload(), - map((pc: TDomain) => isEmpty(pc) ? 'communities/search/top' : pc.id ), - take(1) - ).subscribe((id: string) => this.requestService.removeByHrefSubstring(id)); + this.dsoDataService.findByHref(parentCommunityUrl).pipe( + getSucceededOrNoContentResponse(), + take(1), + ).subscribe((rd: RemoteData) => { + const href = rd.hasSucceeded && !isEmpty(rd.payload.id) ? rd.payload.id : 'communities/search/top'; + this.requestService.removeByHrefSubstring(href) + }); } private parentCommunityUrl(dso: Collection | Community): string { From 5ef329f7a62d581a629d73351d1f0bf80c8588f8 Mon Sep 17 00:00:00 2001 From: Corrado Lombardi Date: Thu, 22 Oct 2020 16:44:49 +0200 Subject: [PATCH 15/78] [CSTPER-66] removed consecutive blank lines --- src/app/core/shared/operators.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/core/shared/operators.ts b/src/app/core/shared/operators.ts index 203f66b074..80c12612e0 100644 --- a/src/app/core/shared/operators.ts +++ b/src/app/core/shared/operators.ts @@ -79,7 +79,6 @@ export const getSucceededOrNoContentResponse = () => (source: Observable>): Observable> => source.pipe(find((rd: RemoteData) => rd.hasSucceeded || rd.hasNoContent)); - /** * Get the first successful remotely retrieved object * From ade5eb53ccfa782c9be783bf1a6b3a9e960bcab4 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 22 Oct 2020 18:03:32 +0200 Subject: [PATCH 16/78] 74199: Infinite scroll size changes --- .../authorized-collection-selector.component.ts | 1 + .../dso-selector/dso-selector/dso-selector.component.html | 2 +- .../shared/dso-selector/dso-selector/dso-selector.component.ts | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts index ff9fa81368..1e58289c3a 100644 --- a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts +++ b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts @@ -12,6 +12,7 @@ import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; @Component({ selector: 'ds-authorized-collection-selector', + styleUrls: ['../dso-selector.component.scss'], templateUrl: '../dso-selector.component.html' }) /** diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html index a0b6aff2a3..7a04bfc333 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html @@ -9,7 +9,7 @@
Date: Thu, 22 Oct 2020 20:15:08 +0200 Subject: [PATCH 17/78] [CSTPER-66] provided RequestService in constructor and parent community empty link --- .../create-collection-page.component.spec.ts | 4 +++- .../delete-community-page.component.spec.ts | 2 ++ .../create-comcol-page/create-comcol-page.component.spec.ts | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/app/+collection-page/create-collection-page/create-collection-page.component.spec.ts b/src/app/+collection-page/create-collection-page/create-collection-page.component.spec.ts index d64e510a23..13047593cd 100644 --- a/src/app/+collection-page/create-collection-page/create-collection-page.component.spec.ts +++ b/src/app/+collection-page/create-collection-page/create-collection-page.component.spec.ts @@ -12,6 +12,7 @@ import { CommunityDataService } from '../../core/data/community-data.service'; import { CreateCollectionPageComponent } from './create-collection-page.component'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub'; +import {RequestService} from '../../core/data/request.service'; describe('CreateCollectionPageComponent', () => { let comp: CreateCollectionPageComponent; @@ -29,7 +30,8 @@ describe('CreateCollectionPageComponent', () => { }, { provide: RouteService, useValue: { getQueryParameterValue: () => observableOf('1234') } }, { provide: Router, useValue: {} }, - { provide: NotificationsService, useValue: new NotificationsServiceStub() } + { provide: NotificationsService, useValue: new NotificationsServiceStub() }, + { provide: RequestService, useValue: {}} ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); diff --git a/src/app/+community-page/delete-community-page/delete-community-page.component.spec.ts b/src/app/+community-page/delete-community-page/delete-community-page.component.spec.ts index 613be9deb3..6c5f29b4b5 100644 --- a/src/app/+community-page/delete-community-page/delete-community-page.component.spec.ts +++ b/src/app/+community-page/delete-community-page/delete-community-page.component.spec.ts @@ -9,6 +9,7 @@ import { CommunityDataService } from '../../core/data/community-data.service'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { SharedModule } from '../../shared/shared.module'; import { DeleteCommunityPageComponent } from './delete-community-page.component'; +import {RequestService} from '../../core/data/request.service'; describe('DeleteCommunityPageComponent', () => { let comp: DeleteCommunityPageComponent; @@ -22,6 +23,7 @@ describe('DeleteCommunityPageComponent', () => { { provide: CommunityDataService, useValue: {} }, { provide: ActivatedRoute, useValue: { data: observableOf({ dso: { payload: {} } }) } }, { provide: NotificationsService, useValue: {} }, + { provide: RequestService, useValue: {}} ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); diff --git a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts index d2335f623f..bdd00a3a49 100644 --- a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts +++ b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts @@ -131,6 +131,7 @@ describe('CreateComColPageComponent', () => { value: 'test' }] }), + _links: {}, uploader: { options: { url: '' From d50d1506efa48e615268b21477c89c8aa0ea2051 Mon Sep 17 00:00:00 2001 From: Corrado Lombardi Date: Thu, 22 Oct 2020 23:41:18 +0200 Subject: [PATCH 18/78] [CSTPER-66] provided RequestService --- .../delete-collection-page.component.spec.ts | 2 ++ .../create-community-page.component.spec.ts | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/+collection-page/delete-collection-page/delete-collection-page.component.spec.ts b/src/app/+collection-page/delete-collection-page/delete-collection-page.component.spec.ts index d64c1d1915..efe7e99550 100644 --- a/src/app/+collection-page/delete-collection-page/delete-collection-page.component.spec.ts +++ b/src/app/+collection-page/delete-collection-page/delete-collection-page.component.spec.ts @@ -9,6 +9,7 @@ import { of as observableOf } from 'rxjs'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { DeleteCollectionPageComponent } from './delete-collection-page.component'; import { CollectionDataService } from '../../core/data/collection-data.service'; +import {RequestService} from '../../core/data/request.service'; describe('DeleteCollectionPageComponent', () => { let comp: DeleteCollectionPageComponent; @@ -22,6 +23,7 @@ describe('DeleteCollectionPageComponent', () => { { provide: CollectionDataService, useValue: {} }, { provide: ActivatedRoute, useValue: { data: observableOf({ dso: { payload: {} } }) } }, { provide: NotificationsService, useValue: {} }, + { provide: RequestService, useValue: {} } ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); diff --git a/src/app/+community-page/create-community-page/create-community-page.component.spec.ts b/src/app/+community-page/create-community-page/create-community-page.component.spec.ts index b4da0be4d1..c48e9158fb 100644 --- a/src/app/+community-page/create-community-page/create-community-page.component.spec.ts +++ b/src/app/+community-page/create-community-page/create-community-page.component.spec.ts @@ -12,6 +12,7 @@ import { CommunityDataService } from '../../core/data/community-data.service'; import { CreateCommunityPageComponent } from './create-community-page.component'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub'; +import {RequestService} from '../../core/data/request.service'; describe('CreateCommunityPageComponent', () => { let comp: CreateCommunityPageComponent; @@ -25,7 +26,8 @@ describe('CreateCommunityPageComponent', () => { { provide: CommunityDataService, useValue: { findById: () => observableOf({}) } }, { provide: RouteService, useValue: { getQueryParameterValue: () => observableOf('1234') } }, { provide: Router, useValue: {} }, - { provide: NotificationsService, useValue: new NotificationsServiceStub() } + { provide: NotificationsService, useValue: new NotificationsServiceStub() }, + { provide: RequestService, useValue: {} } ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); From 564e4e0b02ac4887a277f3abf039c0d66fb0ad68 Mon Sep 17 00:00:00 2001 From: Corrado Lombardi Date: Fri, 23 Oct 2020 11:53:35 +0200 Subject: [PATCH 19/78] [CSTPER-66] onSubmit test executed within a scheduler and provided _links section on tested data --- .../create-comcol-page.component.spec.ts | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts index bdd00a3a49..898727b813 100644 --- a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts +++ b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts @@ -36,6 +36,7 @@ describe('CreateComColPageComponent', () => { let routeServiceStub; let routerStub; let requestServiceStub; + let scheduler; const logoEndpoint = 'rest/api/logo/endpoint'; @@ -117,6 +118,7 @@ describe('CreateComColPageComponent', () => { communityDataService = (comp as any).communityDataService; routeService = (comp as any).routeService; router = (comp as any).router; + scheduler = getTestScheduler(); }); describe('onSubmit', () => { @@ -146,8 +148,9 @@ describe('CreateComColPageComponent', () => { it('should navigate and refresh cache when successful', () => { spyOn(router, 'navigate'); - spyOn((comp as any), 'refreshCache'); - comp.onSubmit(data); + spyOn((comp as any), 'refreshCache') + scheduler.schedule(() => comp.onSubmit(data)); + scheduler.flush(); fixture.detectChanges(); expect(router.navigate).toHaveBeenCalled(); expect((comp as any).refreshCache).toHaveBeenCalled(); @@ -157,7 +160,8 @@ describe('CreateComColPageComponent', () => { spyOn(router, 'navigate'); spyOn(dsoDataService, 'create').and.returnValue(createFailedRemoteDataObject$(newCommunity)); spyOn((comp as any), 'refreshCache') - comp.onSubmit(data); + scheduler.schedule(() => comp.onSubmit(data)); + scheduler.flush(); fixture.detectChanges(); expect(router.navigate).not.toHaveBeenCalled(); expect((comp as any).refreshCache).not.toHaveBeenCalled(); @@ -173,6 +177,7 @@ describe('CreateComColPageComponent', () => { value: 'test' }] }), + _links: {}, uploader: { options: { url: '' @@ -189,27 +194,29 @@ describe('CreateComColPageComponent', () => { it('should not navigate', () => { spyOn(router, 'navigate'); - comp.onSubmit(data); + scheduler.schedule(() => comp.onSubmit(data)); + scheduler.flush(); fixture.detectChanges(); expect(router.navigate).not.toHaveBeenCalled(); }); it('should set the uploader\'s url to the logo\'s endpoint', () => { - comp.onSubmit(data); + scheduler.schedule(() => comp.onSubmit(data)); + scheduler.flush(); fixture.detectChanges(); expect(data.uploader.options.url).toEqual(logoEndpoint); }); it('should call the uploader\'s uploadAll', () => { spyOn(data.uploader, 'uploadAll'); - comp.onSubmit(data); + scheduler.schedule(() => comp.onSubmit(data)); + scheduler.flush(); fixture.detectChanges(); expect(data.uploader.uploadAll).toHaveBeenCalled(); }); }); describe('cache refresh', () => { - let scheduler; let communityWithoutParentHref; beforeEach(() => { From 4bed16af3297fd6ce394b442d11c4066ae8d05c9 Mon Sep 17 00:00:00 2001 From: Corrado Lombardi Date: Fri, 23 Oct 2020 11:54:07 +0200 Subject: [PATCH 20/78] [CSTPER-66] onConfirm tests executed within a scheduler and provided _links section on tested data --- .../delete-comcol-page.component.spec.ts | 57 ++++++++++++------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts b/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts index 9da77df007..b5a3ccea5d 100644 --- a/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts +++ b/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts @@ -32,6 +32,8 @@ describe('DeleteComColPageComponent', () => { let translateServiceStub; let requestServiceStub; + let scheduler; + const validUUID = 'valid-uuid'; const invalidUUID = 'invalid-uuid'; const frontendURL = '/testType'; @@ -109,34 +111,51 @@ describe('DeleteComColPageComponent', () => { notificationsService = (comp as any).notifications; (comp as any).frontendURL = frontendURL; router = (comp as any).router; + scheduler = getTestScheduler(); }); describe('onConfirm', () => { let data1; let data2; beforeEach(() => { - data1 = Object.assign(new Community(), { - uuid: validUUID, - metadata: [{ - key: 'dc.title', - value: 'test' - }] - }); + data1 = { + dso: Object.assign(new Community(), { + uuid: validUUID, + metadata: [{ + key: 'dc.title', + value: 'test' + }] + }), + _links: {} + }; - data2 = Object.assign(new Community(), { - uuid: invalidUUID, - metadata: [{ - key: 'dc.title', - value: 'test' - }] - }); + data2 = { + dso: Object.assign(new Community(), { + uuid: invalidUUID, + metadata: [{ + key: 'dc.title', + value: 'test' + }] + }), + _links: {}, + uploader: { + options: { + url: '' + }, + queue: [], + /* tslint:disable:no-empty */ + uploadAll: () => {} + /* tslint:enable:no-empty */ + } + }; }); it('should show an error notification on failure', () => { (dsoDataService.delete as any).and.returnValue(observableOf({ isSuccessful: false })); spyOn(router, 'navigate'); spyOn((comp as any), 'refreshCache'); - comp.onConfirm(data2); + scheduler.schedule(() => comp.onConfirm(data2)); + scheduler.flush(); fixture.detectChanges(); expect(notificationsService.error).toHaveBeenCalled(); expect((comp as any).refreshCache).not.toHaveBeenCalled(); @@ -146,7 +165,8 @@ describe('DeleteComColPageComponent', () => { it('should show a success notification on success and navigate', () => { spyOn(router, 'navigate'); spyOn((comp as any), 'refreshCache'); - comp.onConfirm(data1); + scheduler.schedule(() => comp.onConfirm(data1)); + scheduler.flush(); fixture.detectChanges(); expect(notificationsService.success).toHaveBeenCalled(); expect((comp as any).refreshCache).toHaveBeenCalled(); @@ -160,14 +180,9 @@ describe('DeleteComColPageComponent', () => { }); describe('cache refresh', () => { - let scheduler; let communityWithoutParentHref; let deletedCommunity; - beforeEach(() => { - scheduler = getTestScheduler(); - - }) describe('cache refreshed top level community', () => { beforeEach(() => { (dsoDataService.findByHref as any).and.returnValue(createNoContentRemoteDataObject$()); From 9658da4fc01d24f2f7da9f979b3f668ee058d69e Mon Sep 17 00:00:00 2001 From: Corrado Lombardi Date: Fri, 23 Oct 2020 16:40:49 +0200 Subject: [PATCH 21/78] [CSTPER-66] removed detectChanges in single tests, removed TranslateService stub provision, added _links section in community objects --- .../create-comcol-page.component.spec.ts | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts index 898727b813..a7496fbf7a 100644 --- a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts +++ b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts @@ -46,7 +46,8 @@ describe('CreateComColPageComponent', () => { metadata: [{ key: 'dc.title', value: 'test community' - }] + }], + _links: {} }); parentCommunity = Object.assign(new Community(), { @@ -55,7 +56,8 @@ describe('CreateComColPageComponent', () => { metadata: [{ key: 'dc.title', value: 'parent community' - }] + }], + _links: {} }); newCommunity = Object.assign(new Community(), { @@ -63,7 +65,8 @@ describe('CreateComColPageComponent', () => { metadata: [{ key: 'dc.title', value: 'new community' - }] + }], + _links: {} }); communityDataServiceStub = { @@ -102,7 +105,6 @@ describe('CreateComColPageComponent', () => { { provide: RouteService, useValue: routeServiceStub }, { provide: Router, useValue: routerStub }, { provide: NotificationsService, useValue: new NotificationsServiceStub() }, - { provide: TranslateService, useValue: {}}, { provide: RequestService, useValue: requestServiceStub} ], schemas: [NO_ERRORS_SCHEMA] @@ -151,7 +153,6 @@ describe('CreateComColPageComponent', () => { spyOn((comp as any), 'refreshCache') scheduler.schedule(() => comp.onSubmit(data)); scheduler.flush(); - fixture.detectChanges(); expect(router.navigate).toHaveBeenCalled(); expect((comp as any).refreshCache).toHaveBeenCalled(); }); @@ -162,7 +163,6 @@ describe('CreateComColPageComponent', () => { spyOn((comp as any), 'refreshCache') scheduler.schedule(() => comp.onSubmit(data)); scheduler.flush(); - fixture.detectChanges(); expect(router.navigate).not.toHaveBeenCalled(); expect((comp as any).refreshCache).not.toHaveBeenCalled(); }); @@ -196,14 +196,12 @@ describe('CreateComColPageComponent', () => { spyOn(router, 'navigate'); scheduler.schedule(() => comp.onSubmit(data)); scheduler.flush(); - fixture.detectChanges(); expect(router.navigate).not.toHaveBeenCalled(); }); it('should set the uploader\'s url to the logo\'s endpoint', () => { scheduler.schedule(() => comp.onSubmit(data)); scheduler.flush(); - fixture.detectChanges(); expect(data.uploader.options.url).toEqual(logoEndpoint); }); @@ -211,7 +209,6 @@ describe('CreateComColPageComponent', () => { spyOn(data.uploader, 'uploadAll'); scheduler.schedule(() => comp.onSubmit(data)); scheduler.flush(); - fixture.detectChanges(); expect(data.uploader.uploadAll).toHaveBeenCalled(); }); }); From 40891a3c35e89b416ba6507d4833bda728711084 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Fri, 23 Oct 2020 17:29:10 +0200 Subject: [PATCH 22/78] 74199: Admin search dialogs - Current DSO + context for new item/collection --- .../dso-selector/dso-selector.component.html | 1 + .../dso-selector/dso-selector.component.scss | 7 ++++ .../dso-selector/dso-selector.component.ts | 33 +++++++++++++++---- ...te-collection-parent-selector.component.ts | 1 + ...create-item-parent-selector.component.html | 3 +- .../create-item-parent-selector.component.ts | 1 + .../dso-selector-modal-wrapper.component.html | 3 +- .../dso-selector-modal-wrapper.component.ts | 6 ++++ src/assets/i18n/en.json5 | 4 +++ src/styles/_custom_variables.scss | 2 ++ 10 files changed, 52 insertions(+), 9 deletions(-) diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html index 7a04bfc333..048e115f8e 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html @@ -20,6 +20,7 @@
- +
{{header | translate}}
+
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts index 5729ac8460..03d7732fb0 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts @@ -20,6 +20,7 @@ export class CreateItemParentSelectorComponent extends DSOSelectorModalWrapperCo objectType = DSpaceObjectType.ITEM; selectorTypes = [DSpaceObjectType.COLLECTION]; action = SelectorActionType.CREATE; + header = 'dso-selector.create.item.sub-level'; constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) { super(activeModal, route); diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html index e1c18ec1e0..85d8797e66 100644 --- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html +++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html @@ -5,6 +5,7 @@
- +
{{header | translate}}
+
diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts index b56a901b12..59aeceea0f 100644 --- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts @@ -23,6 +23,12 @@ export abstract class DSOSelectorModalWrapperComponent implements OnInit { */ @Input() dsoRD: RemoteData; + /** + * Optional header to display above the selection list + * Supports i18n keys + */ + @Input() header: string; + /** * The type of the DSO that's being edited, created or exported */ diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index a6aaad98ea..97d7ce162a 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1037,6 +1037,8 @@ "dso-selector.create.collection.head": "New collection", + "dso-selector.create.collection.sub-level": "Create a new collection in", + "dso-selector.create.community.head": "New community", "dso-selector.create.community.sub-level": "Create a new community in", @@ -1045,6 +1047,8 @@ "dso-selector.create.item.head": "New item", + "dso-selector.create.item.sub-level": "Create a new item in", + "dso-selector.create.submission.head": "New submission", "dso-selector.edit.collection.head": "Edit collection", diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss index bc1dfda7e7..a9a1ecb391 100644 --- a/src/styles/_custom_variables.scss +++ b/src/styles/_custom_variables.scss @@ -39,3 +39,5 @@ $edit-item-language-field-width: 43px !default; $thumbnail-max-width: 175px !default; $dso-selector-list-max-height: 475px !default; +$dso-selector-current-background-color: #eeeeee; +$dso-selector-current-background-hover-color: darken($dso-selector-current-background-color, 10%); From 892e7bdaa1cf4831f92432d47abae917458cf7e8 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Mon, 26 Oct 2020 15:43:15 +0100 Subject: [PATCH 23/78] 74199: Tests --- ...ebar-search-list-element.component.spec.ts | 42 ++++++++++ ...ebar-search-list-element.component.spec.ts | 45 +++++++++++ ...ebar-search-list-element.component.spec.ts | 40 ++++++++++ ...ebar-search-list-element.component.spec.ts | 37 +++++++++ ...ebar-search-list-element.component.spec.ts | 45 +++++++++++ ...ebar-search-list-element.component.spec.ts | 32 ++++++++ ...ized-collection-selector.component.spec.ts | 56 +++++++++++++ .../dso-selector.component.spec.ts | 79 ++++++++++++++----- ...ebar-search-list-element.component.spec.ts | 37 +++++++++ ...ebar-search-list-element.component.spec.ts | 36 +++++++++ ...ebar-search-list-element.component.spec.ts | 47 +++++++++++ ...sidebar-search-list-element.component.html | 6 +- ...ebar-search-list-element.component.spec.ts | 69 ++++++++++++++++ 13 files changed, 547 insertions(+), 24 deletions(-) create mode 100644 src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.spec.ts create mode 100644 src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.spec.ts create mode 100644 src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.spec.ts create mode 100644 src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts create mode 100644 src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts create mode 100644 src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.spec.ts create mode 100644 src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.spec.ts create mode 100644 src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.spec.ts create mode 100644 src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.spec.ts create mode 100644 src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.spec.ts create mode 100644 src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.spec.ts new file mode 100644 index 0000000000..b9593e7612 --- /dev/null +++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.spec.ts @@ -0,0 +1,42 @@ +import { Item } from '../../../../../core/shared/item.model'; +import { Collection } from '../../../../../core/shared/collection.model'; +import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; +import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec'; +import { JournalIssueSidebarSearchListElementComponent } from './journal-issue-sidebar-search-list-element.component'; + +const object = Object.assign(new ItemSearchResult(), { + indexableObject: Object.assign(new Item(), { + id: 'test-item', + metadata: { + 'dc.title': [ + { + value: 'title' + } + ], + 'publicationvolume.volumeNumber': [ + { + value: '5' + } + ], + 'publicationissue.issueNumber': [ + { + value: '7' + } + ] + } + }) +}); +const parent = Object.assign(new Collection(), { + id: 'test-collection', + metadata: { + 'dc.title': [ + { + value: 'parent title' + } + ] + } +}); + +describe('JournalIssueSidebarSearchListElementComponent', + createSidebarSearchListElementTests(JournalIssueSidebarSearchListElementComponent, object, parent, 'parent title', 'title', '5 - 7') +); diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.spec.ts new file mode 100644 index 0000000000..eca1775c7d --- /dev/null +++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.spec.ts @@ -0,0 +1,45 @@ +import { Item } from '../../../../../core/shared/item.model'; +import { Collection } from '../../../../../core/shared/collection.model'; +import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; +import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec'; +import { JournalVolumeSidebarSearchListElementComponent } from './journal-volume-sidebar-search-list-element.component'; + +const object = Object.assign(new ItemSearchResult(), { + indexableObject: Object.assign(new Item(), { + id: 'test-item', + metadata: { + 'dc.title': [ + { + value: 'title' + } + ], + 'journal.title': [ + { + value: 'journal title' + } + ], + 'publicationvolume.volumeNumber': [ + { + value: '1' + }, + { + value: '2' + } + ] + } + }) +}); +const parent = Object.assign(new Collection(), { + id: 'test-collection', + metadata: { + 'dc.title': [ + { + value: 'parent title' + } + ] + } +}); + +describe('JournalVolumeSidebarSearchListElementComponent', + createSidebarSearchListElementTests(JournalVolumeSidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'journal title (1) (2)') +); diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.spec.ts new file mode 100644 index 0000000000..a47dbf0e2e --- /dev/null +++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.spec.ts @@ -0,0 +1,40 @@ +import { Item } from '../../../../../core/shared/item.model'; +import { Collection } from '../../../../../core/shared/collection.model'; +import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; +import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec'; +import { JournalSidebarSearchListElementComponent } from './journal-sidebar-search-list-element.component'; + +const object = Object.assign(new ItemSearchResult(), { + indexableObject: Object.assign(new Item(), { + id: 'test-item', + metadata: { + 'dc.title': [ + { + value: 'title' + } + ], + 'creativeworkseries.issn': [ + { + value: '1234' + }, + { + value: '5678' + } + ] + } + }) +}); +const parent = Object.assign(new Collection(), { + id: 'test-collection', + metadata: { + 'dc.title': [ + { + value: 'parent title' + } + ] + } +}); + +describe('JournalSidebarSearchListElementComponent', + createSidebarSearchListElementTests(JournalSidebarSearchListElementComponent, object, parent, 'parent title', 'title', '1234, 5678') +); diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts new file mode 100644 index 0000000000..a271273a1b --- /dev/null +++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts @@ -0,0 +1,37 @@ +import { Item } from '../../../../../core/shared/item.model'; +import { Collection } from '../../../../../core/shared/collection.model'; +import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; +import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec'; +import { OrgUnitSidebarSearchListElementComponent } from './org-unit-sidebar-search-list-element.component'; + +const object = Object.assign(new ItemSearchResult(), { + indexableObject: Object.assign(new Item(), { + id: 'test-item', + metadata: { + 'organization.legalName': [ + { + value: 'title' + } + ], + 'dc.description': [ + { + value: 'description' + } + ] + } + }) +}); +const parent = Object.assign(new Collection(), { + id: 'test-collection', + metadata: { + 'dc.title': [ + { + value: 'parent title' + } + ] + } +}); + +describe('OrgUnitSidebarSearchListElementComponent', + createSidebarSearchListElementTests(OrgUnitSidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'description') +); diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts new file mode 100644 index 0000000000..e93dd78636 --- /dev/null +++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts @@ -0,0 +1,45 @@ +import { Item } from '../../../../../core/shared/item.model'; +import { Collection } from '../../../../../core/shared/collection.model'; +import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; +import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec'; +import { PersonSidebarSearchListElementComponent } from './person-sidebar-search-list-element.component'; +import { TranslateService } from '@ngx-translate/core'; + +const object = Object.assign(new ItemSearchResult(), { + indexableObject: Object.assign(new Item(), { + id: 'test-item', + metadata: { + 'person.familyName': [ + { + value: 'family name' + } + ], + 'person.givenName': [ + { + value: 'given name' + } + ], + 'person.jobTitle': [ + { + value: 'job title' + } + ] + } + }) +}); +const parent = Object.assign(new Collection(), { + id: 'test-collection', + metadata: { + 'dc.title': [ + { + value: 'parent title' + } + ] + } +}); + +describe('PersonSidebarSearchListElementComponent', + createSidebarSearchListElementTests(PersonSidebarSearchListElementComponent, object, parent, 'parent title', 'family name, given name', 'job title', [ + { provide: TranslateService, useValue: jasmine.createSpyObj('translate', { instant: '' }) } + ]) +); diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.spec.ts new file mode 100644 index 0000000000..ec0eb0e7bb --- /dev/null +++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.spec.ts @@ -0,0 +1,32 @@ +import { Item } from '../../../../../core/shared/item.model'; +import { Collection } from '../../../../../core/shared/collection.model'; +import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; +import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec'; +import { ProjectSidebarSearchListElementComponent } from './project-sidebar-search-list-element.component'; + +const object = Object.assign(new ItemSearchResult(), { + indexableObject: Object.assign(new Item(), { + id: 'test-item', + metadata: { + 'dc.title': [ + { + value: 'title' + } + ] + } + }) +}); +const parent = Object.assign(new Collection(), { + id: 'test-collection', + metadata: { + 'dc.title': [ + { + value: 'parent title' + } + ] + } +}); + +describe('ProjectSidebarSearchListElementComponent', + createSidebarSearchListElementTests(ProjectSidebarSearchListElementComponent, object, parent, 'parent title', 'title', undefined) +); diff --git a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.spec.ts b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.spec.ts new file mode 100644 index 0000000000..25b7465ada --- /dev/null +++ b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.spec.ts @@ -0,0 +1,56 @@ +import { AuthorizedCollectionSelectorComponent } from './authorized-collection-selector.component'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { VarDirective } from '../../../utils/var.directive'; +import { TranslateModule } from '@ngx-translate/core'; +import { RouterTestingModule } from '@angular/router/testing'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { SearchService } from '../../../../core/shared/search/search.service'; +import { CollectionDataService } from '../../../../core/data/collection-data.service'; +import { createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils'; +import { createPaginatedList } from '../../../testing/utils.test'; +import { Collection } from '../../../../core/shared/collection.model'; +import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; + +describe('AuthorizedCollectionSelectorComponent', () => { + let component: AuthorizedCollectionSelectorComponent; + let fixture: ComponentFixture; + + let collectionService; + let collection; + + beforeEach(async(() => { + collection = Object.assign(new Collection(), { + id: 'authorized-collection' + }); + collectionService = jasmine.createSpyObj('collectionService', { + getAuthorizedCollection: createSuccessfulRemoteDataObject$(createPaginatedList([collection])) + }); + TestBed.configureTestingModule({ + declarations: [AuthorizedCollectionSelectorComponent, VarDirective], + imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])], + providers: [ + { provide: SearchService, useValue: {} }, + { provide: CollectionDataService, useValue: collectionService } + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AuthorizedCollectionSelectorComponent); + component = fixture.componentInstance; + component.types = [DSpaceObjectType.COLLECTION]; + fixture.detectChanges(); + }); + + describe('search', () => { + it('should call getAuthorizedCollection and return the authorized collection in a SearchResult', (done) => { + component.search('', 1).subscribe((result) => { + expect(collectionService.getAuthorizedCollection).toHaveBeenCalled(); + expect(result.page.length).toEqual(1); + expect(result.page[0].indexableObject).toEqual(collection); + done(); + }); + }); + }); +}); diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts index 50b6090aef..7671f012ad 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts @@ -6,10 +6,10 @@ import { SearchService } from '../../../core/shared/search/search.service'; import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; import { ItemSearchResult } from '../../object-collection/shared/item-search-result.model'; import { Item } from '../../../core/shared/item.model'; -import { PaginatedList } from '../../../core/data/paginated-list'; -import { MetadataValue } from '../../../core/shared/metadata.models'; import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; import { PaginatedSearchOptions } from '../../search/paginated-search-options.model'; +import { hasValue } from '../../empty.util'; +import { createPaginatedList } from '../../testing/utils.test'; describe('DSOSelectorComponent', () => { let component: DSOSelectorComponent; @@ -18,19 +18,46 @@ describe('DSOSelectorComponent', () => { const currentDSOId = 'test-uuid-ford-sose'; const type = DSpaceObjectType.ITEM; - const searchResult = new ItemSearchResult(); - const item = new Item(); - item.metadata = { - 'dc.title': [Object.assign(new MetadataValue(), { - value: 'Item title', - language: undefined - })] - }; - searchResult.indexableObject = item; - searchResult.hitHighlights = {}; - const searchService = jasmine.createSpyObj('searchService', { - search: createSuccessfulRemoteDataObject$(new PaginatedList(undefined, [searchResult])) - }); + const searchResult = createSearchResult('current'); + + const firstPageResults = [ + createSearchResult('1'), + createSearchResult('2'), + createSearchResult('3'), + ]; + + const nextPageResults = [ + createSearchResult('4'), + createSearchResult('5'), + createSearchResult('6'), + ]; + + const searchService = { + search: (options: PaginatedSearchOptions) => { + if (hasValue(options.query) && options.query.startsWith('search.resourceid')) { + return createSuccessfulRemoteDataObject$(createPaginatedList([searchResult])); + } else if (options.pagination.currentPage === 1) { + return createSuccessfulRemoteDataObject$(createPaginatedList(firstPageResults)); + } else { + return createSuccessfulRemoteDataObject$(createPaginatedList(nextPageResults)); + } + } + } + + function createSearchResult(name: string): ItemSearchResult { + return Object.assign(new ItemSearchResult(), { + indexableObject: Object.assign(new Item(), { + id: `test-result-${name}`, + metadata: { + 'dc.title': [ + { + value: `test result - ${name}` + } + ] + } + }) + }) + } beforeEach(async(() => { TestBed.configureTestingModule({ @@ -58,13 +85,23 @@ describe('DSOSelectorComponent', () => { expect(component).toBeTruthy(); }); - it('should initially call the search method on the SearchService with the given DSO uuid', () => { - const searchOptions = new PaginatedSearchOptions({ - query: currentDSOId, - dsoTypes: [type], - pagination: (component as any).defaultPagination + describe('populating listEntries', () => { + it('should not be empty', () => { + expect(component.listEntries.length).toBeGreaterThan(0); }); - expect(searchService.search).toHaveBeenCalledWith(searchOptions); + it('should contain a combination of the current DSO and first page results', () => { + expect(component.listEntries).toEqual([searchResult, ...firstPageResults]); + }); + + describe('when current page increases', () => { + beforeEach(() => { + component.currentPage$.next(2); + }); + + it('should contain a combination of the current DSO, as well as first and second page results', () => { + expect(component.listEntries).toEqual([searchResult, ...firstPageResults, ...nextPageResults]); + }); + }); }); }); diff --git a/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.spec.ts b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.spec.ts new file mode 100644 index 0000000000..be3ee7d1bb --- /dev/null +++ b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.spec.ts @@ -0,0 +1,37 @@ +import { CollectionSidebarSearchListElementComponent } from './collection-sidebar-search-list-element.component'; +import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model'; +import { Collection } from '../../../../core/shared/collection.model'; +import { Community } from '../../../../core/shared/community.model'; +import { createSidebarSearchListElementTests } from '../sidebar-search-list-element.component.spec'; + +const object = Object.assign(new CollectionSearchResult(), { + indexableObject: Object.assign(new Collection(), { + id: 'test-collection', + metadata: { + 'dc.title': [ + { + value: 'title' + } + ], + 'dc.description.abstract': [ + { + value: 'description' + } + ] + } + }) +}); +const parent = Object.assign(new Community(), { + id: 'test-community', + metadata: { + 'dc.title': [ + { + value: 'parent title' + } + ] + } +}); + +describe('CollectionSidebarSearchListElementComponent', + createSidebarSearchListElementTests(CollectionSidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'description') +); diff --git a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.spec.ts b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.spec.ts new file mode 100644 index 0000000000..d6bcfc8581 --- /dev/null +++ b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.spec.ts @@ -0,0 +1,36 @@ +import { Community } from '../../../../core/shared/community.model'; +import { createSidebarSearchListElementTests } from '../sidebar-search-list-element.component.spec'; +import { CommunitySidebarSearchListElementComponent } from './community-sidebar-search-list-element.component'; +import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model'; + +const object = Object.assign(new CommunitySearchResult(), { + indexableObject: Object.assign(new Community(), { + id: 'test-community', + metadata: { + 'dc.title': [ + { + value: 'title' + } + ], + 'dc.description.abstract': [ + { + value: 'description' + } + ] + } + }) +}); +const parent = Object.assign(new Community(), { + id: 'test-parent-community', + metadata: { + 'dc.title': [ + { + value: 'parent title' + } + ] + } +}); + +describe('CommunitySidebarSearchListElementComponent', + createSidebarSearchListElementTests(CommunitySidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'description') +); diff --git a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.spec.ts b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.spec.ts new file mode 100644 index 0000000000..106289bba6 --- /dev/null +++ b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.spec.ts @@ -0,0 +1,47 @@ +import { createSidebarSearchListElementTests } from '../../sidebar-search-list-element.component.spec'; +import { PublicationSidebarSearchListElementComponent } from './publication-sidebar-search-list-element.component'; +import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model'; +import { Item } from '../../../../../core/shared/item.model'; +import { Collection } from '../../../../../core/shared/collection.model'; + +const object = Object.assign(new ItemSearchResult(), { + indexableObject: Object.assign(new Item(), { + id: 'test-item', + metadata: { + 'dc.title': [ + { + value: 'title' + } + ], + 'dc.publisher': [ + { + value: 'publisher' + } + ], + 'dc.date.issued': [ + { + value: 'date' + } + ], + 'dc.contributor.author': [ + { + value: 'author' + } + ] + } + }) +}); +const parent = Object.assign(new Collection(), { + id: 'test-collection', + metadata: { + 'dc.title': [ + { + value: 'parent title' + } + ] + } +}); + +describe('PublicationSidebarSearchListElementComponent', + createSidebarSearchListElementTests(PublicationSidebarSearchListElementComponent, object, parent, 'parent title', 'title', '(publisher, date) author') +); diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html index adcf23dcf7..0bad828932 100644 --- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html +++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html @@ -1,3 +1,3 @@ -
{{ parentTitle$ | async }}
 -
{{ title }}
 -
{{ description }}
 +
 +
 +
 diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts new file mode 100644 index 0000000000..f7ec05df95 --- /dev/null +++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts @@ -0,0 +1,69 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { VarDirective } from '../../utils/var.directive'; +import { RouterTestingModule } from '@angular/router/testing'; +import { TranslateModule } from '@ngx-translate/core'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { SearchResult } from '../../search/search-result.model'; +import { DSpaceObject } from '../../../core/shared/dspace-object.model'; +import { TruncatableService } from '../../truncatable/truncatable.service'; +import { LinkService } from '../../../core/cache/builders/link.service'; +import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; +import { HALResource } from '../../../core/shared/hal-resource.model'; +import { ChildHALResource } from '../../../core/shared/child-hal-resource.model'; + +export function createSidebarSearchListElementTests( + componentClass: any, + object: SearchResult, + parent: DSpaceObject, + expectedParentTitle: string, + expectedTitle: string, + expectedDescription: string, + extraProviders: any[] = [] +) { + return () => { + let component; + let fixture: ComponentFixture; + + let linkService; + + beforeEach(async(() => { + linkService = jasmine.createSpyObj('linkService', { + resolveLink: Object.assign(new HALResource(), { + [object.indexableObject.getParentLinkKey()]: createSuccessfulRemoteDataObject$(parent) + }) + }); + TestBed.configureTestingModule({ + declarations: [componentClass, VarDirective], + imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])], + providers: [ + { provide: TruncatableService, useValue: {} }, + { provide: LinkService, useValue: linkService }, + ...extraProviders + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(componentClass); + component = fixture.componentInstance; + component.object = object; + fixture.detectChanges(); + }); + + it('should contain the correct parent title', (done) => { + component.parentTitle$.subscribe((title) => { + expect(title).toEqual(expectedParentTitle); + done(); + }); + }); + + it('should contain the correct title', () => { + expect(component.title).toEqual(expectedTitle); + }); + + it('should contain the correct description', () => { + expect(component.description).toEqual(expectedDescription); + }); + }; +} From 06769493e1c16f65f77fcad9afeab4acc0b09e7c Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Mon, 26 Oct 2020 17:49:56 +0100 Subject: [PATCH 24/78] 74199: Edit current DSO button --- .../collection-page.component.html | 62 ++++++++++--------- .../community-page.component.html | 40 ++++++------ .../item-status/item-status.component.ts | 2 +- .../item-version-history.component.ts | 2 +- .../full/full-item-page.component.html | 7 ++- .../publication/publication.component.html | 11 +++- .../data/feature-authorization/feature-id.ts | 1 + .../journal-issue.component.html | 11 +++- .../journal-volume.component.html | 11 +++- .../item-pages/journal/journal.component.html | 11 +++- .../org-unit/org-unit.component.html | 11 +++- .../item-pages/person/person.component.html | 11 +++- .../item-pages/project/project.component.html | 11 +++- .../dso-page-edit-button.component.html | 6 ++ .../dso-page-edit-button.component.scss | 3 + .../dso-page-edit-button.component.spec.ts | 25 ++++++++ .../dso-page-edit-button.component.ts | 28 +++++++++ src/app/shared/shared.module.ts | 21 ++++--- src/assets/i18n/en.json5 | 20 ++++++ 19 files changed, 214 insertions(+), 80 deletions(-) create mode 100644 src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.html create mode 100644 src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss create mode 100644 src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.spec.ts create mode 100644 src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.ts diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html index 98552ed40b..beb7413415 100644 --- a/src/app/+collection-page/collection-page.component.html +++ b/src/app/+collection-page/collection-page.component.html @@ -3,37 +3,41 @@ *ngVar="(collectionRD$ | async) as collectionRD">
- -
+ +
+
- - - - - + + + + + - - - - - - - - - - -
+ + + + + + + + + +
+
+ +
+
-
- - - - - - - - - - - - - - - -
+
+
+ + + + + + + + + + + + + + +
+
+ +
+
diff --git a/src/app/+item-page/edit-item-page/item-status/item-status.component.ts b/src/app/+item-page/edit-item-page/item-status/item-status.component.ts index dd043330d6..3cd885ddca 100644 --- a/src/app/+item-page/edit-item-page/item-status/item-status.component.ts +++ b/src/app/+item-page/edit-item-page/item-status/item-status.component.ts @@ -56,7 +56,7 @@ export class ItemStatusComponent implements OnInit { } ngOnInit(): void { - this.itemRD$ = this.route.parent.data.pipe(map((data) => data.item)); + this.itemRD$ = this.route.parent.data.pipe(map((data) => data.dso)); this.itemRD$.pipe( first(), map((data: RemoteData) => data.payload) diff --git a/src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.ts b/src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.ts index ce662c5753..7cdd043603 100644 --- a/src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.ts +++ b/src/app/+item-page/edit-item-page/item-version-history/item-version-history.component.ts @@ -30,6 +30,6 @@ export class ItemVersionHistoryComponent { } ngOnInit(): void { - this.itemRD$ = this.route.parent.data.pipe(map((data) => data.item)).pipe(getSucceededRemoteData()) as Observable>; + this.itemRD$ = this.route.parent.data.pipe(map((data) => data.dso)).pipe(getSucceededRemoteData()) as Observable>; } } diff --git a/src/app/+item-page/full/full-item-page.component.html b/src/app/+item-page/full/full-item-page.component.html index 29d3582492..ce63c269de 100644 --- a/src/app/+item-page/full/full-item-page.component.html +++ b/src/app/+item-page/full/full-item-page.component.html @@ -3,7 +3,12 @@
- +
+ +
+ +
+
{{"item.page.link.simple" | translate}} diff --git a/src/app/+item-page/simple/item-types/publication/publication.component.html b/src/app/+item-page/simple/item-types/publication/publication.component.html index 9eb704b9e9..ae3d62a108 100644 --- a/src/app/+item-page/simple/item-types/publication/publication.component.html +++ b/src/app/+item-page/simple/item-types/publication/publication.component.html @@ -1,6 +1,11 @@ -

- {{'publication.page.titleprefix' | translate}} -

+
+

+ {{'publication.page.titleprefix' | translate}} +

+
+ +
+
diff --git a/src/app/core/data/feature-authorization/feature-id.ts b/src/app/core/data/feature-authorization/feature-id.ts index 450d5057aa..3c17f43cb1 100644 --- a/src/app/core/data/feature-authorization/feature-id.ts +++ b/src/app/core/data/feature-authorization/feature-id.ts @@ -5,6 +5,7 @@ export enum FeatureID { LoginOnBehalfOf = 'loginOnBehalfOf', AdministratorOf = 'administratorOf', CanDelete = 'canDelete', + CanEditMetadata = 'canEditMetadata', WithdrawItem = 'withdrawItem', ReinstateItem = 'reinstateItem', EPersonRegistration = 'epersonRegistration', diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html index cdfa6293c4..c5eb3ba59e 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html @@ -1,6 +1,11 @@ -

- {{'journalissue.page.titleprefix' | translate}} -

+
+

+ {{'journalissue.page.titleprefix' | translate}} +

+
+ +
+
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html index 5df1997f0b..38a201df16 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html @@ -1,6 +1,11 @@ -

- {{'journalvolume.page.titleprefix' | translate}} -

+
+

+ {{'journalvolume.page.titleprefix' | translate}} +

+
+ +
+
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html index d8d32df04a..874f748049 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html @@ -1,6 +1,11 @@ -

- {{'journal.page.titleprefix' | translate}} -

+
+

+ {{'journal.page.titleprefix' | translate}} +

+
+ +
+
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html index 784000b446..4d90b85133 100644 --- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html +++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html @@ -1,6 +1,11 @@ -

- {{'orgunit.page.titleprefix' | translate}} -

+
+

+ {{'orgunit.page.titleprefix' | translate}} +

+
+ +
+
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html index af71d5a1c6..2d751eeabb 100644 --- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html +++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html @@ -1,6 +1,11 @@ -

- {{'person.page.titleprefix' | translate}} -

+
+

+ {{'person.page.titleprefix' | translate}} +

+
+ +
+
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.html b/src/app/entity-groups/research-entities/item-pages/project/project.component.html index 6c4a0bab01..4d681bb172 100644 --- a/src/app/entity-groups/research-entities/item-pages/project/project.component.html +++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.html @@ -1,6 +1,11 @@ -

- {{'project.page.titleprefix' | translate}} -

+
+

+ {{'project.page.titleprefix' | translate}} +

+
+ +
+
diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.html b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.html new file mode 100644 index 0000000000..0cfa333ae0 --- /dev/null +++ b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.html @@ -0,0 +1,6 @@ + + + diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss new file mode 100644 index 0000000000..c308aa71b9 --- /dev/null +++ b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss @@ -0,0 +1,3 @@ +.btn-dark { + background-color: $admin-sidebar-bg; +} diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.spec.ts b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.spec.ts new file mode 100644 index 0000000000..253c58c550 --- /dev/null +++ b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { DsoPageEditButtonComponent } from './dso-page-edit-button.component'; + +describe('DsoPageEditButtonComponent', () => { + let component: DsoPageEditButtonComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ DsoPageEditButtonComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DsoPageEditButtonComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.ts b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.ts new file mode 100644 index 0000000000..809d162849 --- /dev/null +++ b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.ts @@ -0,0 +1,28 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { DSpaceObject } from '../../../core/shared/dspace-object.model'; +import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; +import { Observable } from 'rxjs/internal/Observable'; +import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; + +@Component({ + selector: 'ds-dso-page-edit-button', + templateUrl: './dso-page-edit-button.component.html', + styleUrls: ['./dso-page-edit-button.component.scss'] +}) +export class DsoPageEditButtonComponent implements OnInit { + + @Input() dso: DSpaceObject; + + @Input() pageRoutePrefix: string; + + @Input() tooltipMsg: string; + + isAuthorized$: Observable; + + constructor(protected authorizationService: AuthorizationDataService) { } + + ngOnInit() { + this.isAuthorized$ = this.authorizationService.isAuthorized(FeatureID.CanEditMetadata, this.dso.self); + } + +} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index d8d8b51331..8add0c0977 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -215,6 +215,7 @@ import { SidebarSearchListElementComponent } from './object-list/sidebar-search- import { CollectionSidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component'; import { CommunitySidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component'; import { AuthorizedCollectionSelectorComponent } from './dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component'; +import { DsoPageEditButtonComponent } from './dso-page/dso-page-edit-button/dso-page-edit-button.component'; const MODULES = [ // Do NOT include UniversalModule, HttpModule, or JsonpModule here @@ -543,19 +544,21 @@ const DIRECTIVES = [ ...COMPONENTS, ...DIRECTIVES, ...ENTRY_COMPONENTS, - ...SHARED_ITEM_PAGE_COMPONENTS + ...SHARED_ITEM_PAGE_COMPONENTS, + DsoPageEditButtonComponent ], providers: [ ...PROVIDERS ], - exports: [ - ...MODULES, - ...PIPES, - ...COMPONENTS, - ...SHARED_ITEM_PAGE_COMPONENTS, - ...DIRECTIVES, - CurationFormComponent - ], + exports: [ + ...MODULES, + ...PIPES, + ...COMPONENTS, + ...SHARED_ITEM_PAGE_COMPONENTS, + ...DIRECTIVES, + CurationFormComponent, + DsoPageEditButtonComponent + ], entryComponents: [ ...ENTRY_COMPONENTS ] diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 97d7ce162a..9f8d7a0ec1 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -764,6 +764,8 @@ "collection.page.browse.recent.empty": "No items to show", + "collection.page.edit": "Edit this collection", + "collection.page.handle": "Permanent URI for this collection", "collection.page.license": "License", @@ -927,6 +929,8 @@ "community.form.title": "Name", + "community.page.edit": "Edit this community", + "community.page.handle": "Permanent URI for this community", "community.page.license": "License", @@ -1676,6 +1680,8 @@ "item.page.date": "Date", + "item.page.edit": "Edit this item", + "item.page.files": "Files", "item.page.filesection.description": "Description:", @@ -1782,6 +1788,8 @@ "journal.page.description": "Description", + "journal.page.edit": "Edit this item", + "journal.page.editor": "Editor-in-Chief", "journal.page.issn": "ISSN", @@ -1800,6 +1808,8 @@ "journalissue.page.description": "Description", + "journalissue.page.edit": "Edit this item", + "journalissue.page.issuedate": "Issue Date", "journalissue.page.journal-issn": "Journal ISSN", @@ -1818,6 +1828,8 @@ "journalvolume.page.description": "Description", + "journalvolume.page.edit": "Edit this item", + "journalvolume.page.issuedate": "Issue Date", "journalvolume.page.titleprefix": "Journal Volume: ", @@ -2180,6 +2192,8 @@ "orgunit.page.description": "Description", + "orgunit.page.edit": "Edit this item", + "orgunit.page.id": "ID", "orgunit.page.titleprefix": "Organizational Unit: ", @@ -2202,6 +2216,8 @@ "person.page.birthdate": "Birth Date", + "person.page.edit": "Edit this item", + "person.page.email": "Email Address", "person.page.firstname": "First Name", @@ -2433,6 +2449,8 @@ "project.page.description": "Description", + "project.page.edit": "Edit this item", + "project.page.expectedcompletion": "Expected Completion", "project.page.funder": "Funders", @@ -2453,6 +2471,8 @@ "publication.page.description": "Description", + "publication.page.edit": "Edit this item", + "publication.page.journal-issn": "Journal ISSN", "publication.page.journal-title": "Journal Title", From d7d527b735b9debd914a12b9655c1b6e24d90b77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20P=C3=A9ter=20Sipos?= Date: Tue, 27 Oct 2020 10:00:21 +0100 Subject: [PATCH 25/78] #0 fix thumbnail --- .../grid-thumbnail.component.html | 11 +++++-- .../grid-thumbnail.component.ts | 33 ++++++++++++++----- ...-search-result-grid-element.component.html | 4 +-- .../search-result-grid-element.component.ts | 11 ++++--- 4 files changed, 42 insertions(+), 17 deletions(-) diff --git a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.html b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.html index 5b09d09a55..3671073500 100644 --- a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.html +++ b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.html @@ -1,3 +1,10 @@ -
- +
+ + + +
diff --git a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts index 4622483f2f..1033defaf9 100644 --- a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts +++ b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts @@ -1,4 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; +import { BehaviorSubject, Observable, isObservable } from 'rxjs'; +import { RemoteData } from '../../../core/data/remote-data'; import { Bitstream } from '../../../core/shared/bitstream.model'; import { hasValue } from '../../empty.util'; @@ -11,30 +13,45 @@ import { hasValue } from '../../empty.util'; @Component({ selector: 'ds-grid-thumbnail', styleUrls: ['./grid-thumbnail.component.scss'], - templateUrl: './grid-thumbnail.component.html' + templateUrl: './grid-thumbnail.component.html', }) export class GridThumbnailComponent implements OnInit { - - @Input() thumbnail: Bitstream; + @Input() thumbnail: string | Observable>; data: any = {}; /** * The default 'holder.js' image */ - @Input() defaultImage? = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMjYwIiBoZWlnaHQ9IjE4MCIgdmlld0JveD0iMCAwIDI2MCAxODAiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjwhLS0KU291cmNlIFVSTDogaG9sZGVyLmpzLzEwMCV4MTgwL3RleHQ6Tm8gVGh1bWJuYWlsCkNyZWF0ZWQgd2l0aCBIb2xkZXIuanMgMi42LjAuCkxlYXJuIG1vcmUgYXQgaHR0cDovL2hvbGRlcmpzLmNvbQooYykgMjAxMi0yMDE1IEl2YW4gTWFsb3BpbnNreSAtIGh0dHA6Ly9pbXNreS5jbwotLT48ZGVmcz48c3R5bGUgdHlwZT0idGV4dC9jc3MiPjwhW0NEQVRBWyNob2xkZXJfMTVmNzJmMmFlMGIgdGV4dCB7IGZpbGw6I0FBQUFBQTtmb250LXdlaWdodDpib2xkO2ZvbnQtZmFtaWx5OkFyaWFsLCBIZWx2ZXRpY2EsIE9wZW4gU2Fucywgc2Fucy1zZXJpZiwgbW9ub3NwYWNlO2ZvbnQtc2l6ZToxM3B0IH0gXV0+PC9zdHlsZT48L2RlZnM+PGcgaWQ9ImhvbGRlcl8xNWY3MmYyYWUwYiI+PHJlY3Qgd2lkdGg9IjI2MCIgaGVpZ2h0PSIxODAiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSI3Mi4yNDIxODc1IiB5PSI5NiI+Tm8gVGh1bWJuYWlsPC90ZXh0PjwvZz48L2c+PC9zdmc+'; + @Input() defaultImage? = + 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMjYwIiBoZWlnaHQ9IjE4MCIgdmlld0JveD0iMCAwIDI2MCAxODAiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjwhLS0KU291cmNlIFVSTDogaG9sZGVyLmpzLzEwMCV4MTgwL3RleHQ6Tm8gVGh1bWJuYWlsCkNyZWF0ZWQgd2l0aCBIb2xkZXIuanMgMi42LjAuCkxlYXJuIG1vcmUgYXQgaHR0cDovL2hvbGRlcmpzLmNvbQooYykgMjAxMi0yMDE1IEl2YW4gTWFsb3BpbnNreSAtIGh0dHA6Ly9pbXNreS5jbwotLT48ZGVmcz48c3R5bGUgdHlwZT0idGV4dC9jc3MiPjwhW0NEQVRBWyNob2xkZXJfMTVmNzJmMmFlMGIgdGV4dCB7IGZpbGw6I0FBQUFBQTtmb250LXdlaWdodDpib2xkO2ZvbnQtZmFtaWx5OkFyaWFsLCBIZWx2ZXRpY2EsIE9wZW4gU2Fucywgc2Fucy1zZXJpZiwgbW9ub3NwYWNlO2ZvbnQtc2l6ZToxM3B0IH0gXV0+PC9zdHlsZT48L2RlZnM+PGcgaWQ9ImhvbGRlcl8xNWY3MmYyYWUwYiI+PHJlY3Qgd2lkdGg9IjI2MCIgaGVpZ2h0PSIxODAiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSI3Mi4yNDIxODc1IiB5PSI5NiI+Tm8gVGh1bWJuYWlsPC90ZXh0PjwvZz48L2c+PC9zdmc+'; - src: string; + src$: BehaviorSubject; errorHandler(event) { event.currentTarget.src = this.defaultImage; } ngOnInit(): void { - if (hasValue(this.thumbnail) && hasValue(this.thumbnail._links) && this.thumbnail._links.content.href) { - this.src = this.thumbnail._links.content.href; + this.src$ = new BehaviorSubject(this.defaultImage); + console.log('this.thumbnail', this.thumbnail); + if (isObservable(this.thumbnail)) { + this.thumbnail.subscribe((thumbnailRD) => { + this.checkThumbnail(thumbnailRD.payload); + }); } else { - this.src = this.defaultImage + if (this.thumbnail) { + this.src$.next(this.thumbnail); + } } } + checkThumbnail(thumbnail: Bitstream) { + if ( + hasValue(thumbnail) && + hasValue(thumbnail._links) && + thumbnail._links.content.href + ) { + this.src$.next(thumbnail._links.content.href); + } + } } diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.html index 3c2d54b003..22f898662d 100644 --- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.html +++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.html @@ -4,13 +4,13 @@
- +
- +
diff --git a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts index dc05f78e40..9a4e7045a5 100644 --- a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts +++ b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts @@ -6,10 +6,11 @@ import { BitstreamDataService } from '../../../core/data/bitstream-data.service' import { Bitstream } from '../../../core/shared/bitstream.model'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { Metadata } from '../../../core/shared/metadata.utils'; -import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators'; import { hasValue } from '../../empty.util'; import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; import { TruncatableService } from '../../truncatable/truncatable.service'; +import { RemoteData } from '../../../core/data/remote-data'; +import { filter, map } from 'rxjs/operators'; @Component({ selector: 'ds-search-result-grid-element', @@ -42,7 +43,9 @@ export class SearchResultGridElementComponent, K exten */ ngOnInit(): void { if (hasValue(this.object)) { + console.log(this.object) this.dso = this.object.indexableObject; + console.log('this.dso',this.dso) } } @@ -71,9 +74,7 @@ export class SearchResultGridElementComponent, K exten } // TODO refactor to return RemoteData, and thumbnail template to deal with loading - getThumbnail(): Observable { - return this.bitstreamDataService.getThumbnailFor(this.dso as any).pipe( - getFirstSucceededRemoteDataPayload() - ); + getThumbnail(): Observable> { + return this.bitstreamDataService.getThumbnailFor(this.dso as any); } } From 18577f016c9098529ba28beefbcb63c2eaaa9f23 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Tue, 27 Oct 2020 10:46:33 +0100 Subject: [PATCH 26/78] 74200: DsoPageEditButtonComponent test cases --- .../dso-page-edit-button.component.spec.ts | 63 +++++++++++++++++-- .../dso-page-edit-button.component.ts | 17 ++++- 2 files changed, 73 insertions(+), 7 deletions(-) diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.spec.ts b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.spec.ts index 253c58c550..b0d2f3a1fa 100644 --- a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.spec.ts +++ b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.spec.ts @@ -1,25 +1,76 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - import { DsoPageEditButtonComponent } from './dso-page-edit-button.component'; +import { DSpaceObject } from '../../../core/shared/dspace-object.model'; +import { Item } from '../../../core/shared/item.model'; +import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; +import { of as observableOf } from 'rxjs'; +import { TranslateModule } from '@ngx-translate/core'; +import { RouterTestingModule } from '@angular/router/testing'; +import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; +import { By } from '@angular/platform-browser'; +import { TooltipModule } from 'ngx-bootstrap'; describe('DsoPageEditButtonComponent', () => { let component: DsoPageEditButtonComponent; let fixture: ComponentFixture; + let authorizationService: AuthorizationDataService; + let dso: DSpaceObject; + beforeEach(async(() => { + dso = Object.assign(new Item(), { + id: 'test-item', + _links: { + self: { href: 'test-item-selflink' } + } + }); + authorizationService = jasmine.createSpyObj('authorizationService', { + isAuthorized: observableOf(true) + }); TestBed.configureTestingModule({ - declarations: [ DsoPageEditButtonComponent ] - }) - .compileComponents(); + declarations: [ DsoPageEditButtonComponent ], + imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), TooltipModule.forRoot()], + providers: [ + { provide: AuthorizationDataService, useValue: authorizationService } + ] + }).compileComponents(); })); beforeEach(() => { fixture = TestBed.createComponent(DsoPageEditButtonComponent); component = fixture.componentInstance; + component.dso = dso; + component.pageRoutePrefix = 'test'; fixture.detectChanges(); }); - it('should create', () => { - expect(component).toBeTruthy(); + it('should check the authorization of the current user', () => { + expect(authorizationService.isAuthorized).toHaveBeenCalledWith(FeatureID.CanEditMetadata, dso.self); + }); + + describe('when the user is authorized', () => { + beforeEach(() => { + (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(true)); + component.ngOnInit(); + fixture.detectChanges(); + }); + + it('should render a link', () => { + const link = fixture.debugElement.query(By.css('a')); + expect(link).not.toBeNull(); + }); + }); + + describe('when the user is not authorized', () => { + beforeEach(() => { + (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(false)); + component.ngOnInit(); + fixture.detectChanges(); + }); + + it('should not render a link', () => { + const link = fixture.debugElement.query(By.css('a')); + expect(link).toBeNull(); + }); }); }); diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.ts b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.ts index 809d162849..230855a5a2 100644 --- a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.ts +++ b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.ts @@ -9,14 +9,29 @@ import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; templateUrl: './dso-page-edit-button.component.html', styleUrls: ['./dso-page-edit-button.component.scss'] }) +/** + * Display a button linking to the edit page of a DSpaceObject + */ export class DsoPageEditButtonComponent implements OnInit { - + /** + * The DSpaceObject to display a button to the edit page for + */ @Input() dso: DSpaceObject; + /** + * The prefix of the route to the edit page (before the object's UUID, e.g. "items") + */ @Input() pageRoutePrefix: string; + /** + * A message for the tooltip on the button + * Supports i18n keys + */ @Input() tooltipMsg: string; + /** + * Whether or not the current user is authorized to edit the DSpaceObject + */ isAuthorized$: Observable; constructor(protected authorizationService: AuthorizationDataService) { } From 23c01b4683009b94076726ad5ffe2573dafbbef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20P=C3=A9ter=20Sipos?= Date: Wed, 28 Oct 2020 10:44:51 +0100 Subject: [PATCH 27/78] #0-remove --- .editorconfig | 3 +++ .../object-grid/grid-thumbnail/grid-thumbnail.component.ts | 6 ++---- src/app/shared/object-grid/object-grid.component.ts | 1 + .../search-result-grid-element.component.ts | 2 -- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.editorconfig b/.editorconfig index 70ce43b68e..15d4c87b14 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,3 +12,6 @@ trim_trailing_whitespace = true [*.md] insert_final_newline = false trim_trailing_whitespace = false + +[*.ts] +quote_type = single diff --git a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts index 1033defaf9..3c22eef7db 100644 --- a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts +++ b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts @@ -16,7 +16,7 @@ import { hasValue } from '../../empty.util'; templateUrl: './grid-thumbnail.component.html', }) export class GridThumbnailComponent implements OnInit { - @Input() thumbnail: string | Observable>; + @Input() thumbnail: Bitstream | Observable>; data: any = {}; @@ -39,9 +39,7 @@ export class GridThumbnailComponent implements OnInit { this.checkThumbnail(thumbnailRD.payload); }); } else { - if (this.thumbnail) { - this.src$.next(this.thumbnail); - } + this.checkThumbnail(this.thumbnail); } } diff --git a/src/app/shared/object-grid/object-grid.component.ts b/src/app/shared/object-grid/object-grid.component.ts index c6f8347217..446517023c 100644 --- a/src/app/shared/object-grid/object-grid.component.ts +++ b/src/app/shared/object-grid/object-grid.component.ts @@ -169,6 +169,7 @@ export class ObjectGridComponent implements OnInit { this._objects$).pipe(map(([nbColumns, objects]) => { if (hasValue(objects) && hasValue(objects.payload) && hasValue(objects.payload.page)) { const page = objects.payload.page; + console.log(page) const result = []; diff --git a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts index 9a4e7045a5..bcc5153745 100644 --- a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts +++ b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts @@ -43,9 +43,7 @@ export class SearchResultGridElementComponent, K exten */ ngOnInit(): void { if (hasValue(this.object)) { - console.log(this.object) this.dso = this.object.indexableObject; - console.log('this.dso',this.dso) } } From 0ea105c73e48cb1adc5ea646a914487ee12707ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20P=C3=A9ter=20Sipos?= Date: Wed, 28 Oct 2020 16:01:26 +0100 Subject: [PATCH 28/78] #674 fix community and collection thumblogo --- src/app/+search-page/search.component.ts | 4 +++- src/app/core/cache/builders/link.service.ts | 6 ++++-- .../object-grid/grid-thumbnail/grid-thumbnail.component.ts | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/app/+search-page/search.component.ts b/src/app/+search-page/search.component.ts index bbbfdba513..412534a708 100644 --- a/src/app/+search-page/search.component.ts +++ b/src/app/+search-page/search.component.ts @@ -18,6 +18,7 @@ import { SearchService } from '../core/shared/search/search.service'; import { currentPath } from '../shared/utils/route.utils'; import { Router } from '@angular/router'; import { Context } from '../core/shared/context.model'; +import { followLink } from '../shared/utils/follow-link-config.model'; @Component({ selector: 'ds-search', @@ -122,8 +123,9 @@ export class SearchComponent implements OnInit { this.searchLink = this.getSearchLink(); this.searchOptions$ = this.getSearchOptions(); this.sub = this.searchOptions$.pipe( - switchMap((options) => this.service.search(options).pipe(getSucceededRemoteData(), startWith(undefined)))) + switchMap((options) => this.service.search(options, null, followLink('logo')).pipe(getSucceededRemoteData(), startWith(undefined)))) .subscribe((results) => { + console.log('result', results) this.resultsRD$.next(results); }); this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe( diff --git a/src/app/core/cache/builders/link.service.ts b/src/app/core/cache/builders/link.service.ts index dc65eab68f..3592d1058c 100644 --- a/src/app/core/cache/builders/link.service.ts +++ b/src/app/core/cache/builders/link.service.ts @@ -27,7 +27,7 @@ export class LinkService { */ public resolveLinks(model: T, ...linksToFollow: Array>): T { linksToFollow.forEach((linkToFollow: FollowLinkConfig) => { - this.resolveLink(model, linkToFollow); + this.resolveLink(model, linkToFollow); }); return model; } @@ -39,10 +39,12 @@ export class LinkService { * @param linkToFollow the {@link FollowLinkConfig} to resolve */ public resolveLink(model, linkToFollow: FollowLinkConfig): T { + console.log('model', model, 'links', linkToFollow) const matchingLinkDef = getLinkDefinition(model.constructor, linkToFollow.name); if (hasNoValue(matchingLinkDef)) { - throw new Error(`followLink('${linkToFollow.name}') was used for a ${model.constructor.name}, but there is no property on ${model.constructor.name} models with an @link() for ${linkToFollow.name}`); + console.error(`followLink('${linkToFollow.name}') was used for a ${model.constructor.name}, but there is no property on ${model.constructor.name} models with an @link() for ${linkToFollow.name}`); + return model; } else { const provider = getDataServiceFor(matchingLinkDef.resourceType); diff --git a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts index 3c22eef7db..f124613104 100644 --- a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts +++ b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts @@ -33,7 +33,7 @@ export class GridThumbnailComponent implements OnInit { ngOnInit(): void { this.src$ = new BehaviorSubject(this.defaultImage); - console.log('this.thumbnail', this.thumbnail); + // console.log('this.thumbnail', this.thumbnail); if (isObservable(this.thumbnail)) { this.thumbnail.subscribe((thumbnailRD) => { this.checkThumbnail(thumbnailRD.payload); From 371b8e72f79480ff6ced42c357cdc35cbfb5143a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20P=C3=A9ter=20Sipos?= Date: Wed, 28 Oct 2020 16:13:41 +0100 Subject: [PATCH 29/78] #674 remove async --- .../simple/item-types/publication/publication.component.html | 2 +- src/app/+search-page/search.component.ts | 1 - src/app/core/cache/builders/link.service.ts | 1 - .../journal-issue-search-result-grid-element.component.html | 4 ++-- .../journal-volume-search-result-grid-element.component.html | 4 ++-- .../journal/journal-search-result-grid-element.component.html | 4 ++-- .../item-pages/journal-issue/journal-issue.component.html | 2 +- .../item-pages/journal-volume/journal-volume.component.html | 2 +- .../item-pages/journal/journal.component.html | 2 +- .../org-unit-search-result-grid-element.component.html | 4 ++-- .../person/person-search-result-grid-element.component.html | 4 ++-- .../project/project-search-result-grid-element.component.html | 4 ++-- .../item-pages/org-unit/org-unit.component.html | 2 +- .../research-entities/item-pages/person/person.component.html | 2 +- .../item-pages/project/project.component.html | 2 +- ...-unit-search-result-list-submission-element.component.html | 2 +- .../item-detail-preview/item-detail-preview.component.html | 2 +- .../object-grid/grid-thumbnail/grid-thumbnail.component.ts | 1 - src/app/shared/object-grid/object-grid.component.ts | 1 - 19 files changed, 21 insertions(+), 25 deletions(-) diff --git a/src/app/+item-page/simple/item-types/publication/publication.component.html b/src/app/+item-page/simple/item-types/publication/publication.component.html index 9eb704b9e9..f0361d9d53 100644 --- a/src/app/+item-page/simple/item-types/publication/publication.component.html +++ b/src/app/+item-page/simple/item-types/publication/publication.component.html @@ -4,7 +4,7 @@
- + diff --git a/src/app/+search-page/search.component.ts b/src/app/+search-page/search.component.ts index 412534a708..4e50a82827 100644 --- a/src/app/+search-page/search.component.ts +++ b/src/app/+search-page/search.component.ts @@ -125,7 +125,6 @@ export class SearchComponent implements OnInit { this.sub = this.searchOptions$.pipe( switchMap((options) => this.service.search(options, null, followLink('logo')).pipe(getSucceededRemoteData(), startWith(undefined)))) .subscribe((results) => { - console.log('result', results) this.resultsRD$.next(results); }); this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe( diff --git a/src/app/core/cache/builders/link.service.ts b/src/app/core/cache/builders/link.service.ts index 3592d1058c..35c2fbac9c 100644 --- a/src/app/core/cache/builders/link.service.ts +++ b/src/app/core/cache/builders/link.service.ts @@ -39,7 +39,6 @@ export class LinkService { * @param linkToFollow the {@link FollowLinkConfig} to resolve */ public resolveLink(model, linkToFollow: FollowLinkConfig): T { - console.log('model', model, 'links', linkToFollow) const matchingLinkDef = getLinkDefinition(model.constructor, linkToFollow.name); if (hasNoValue(matchingLinkDef)) { diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html index 1ae772a3c3..358a459b4c 100644 --- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html +++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html @@ -6,13 +6,13 @@ rel="noopener noreferrer" [routerLink]="['/items/' + dso.id]" class="card-img-top full-width">
- +
- +
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html index 75d29781b7..e4d3cddd45 100644 --- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html +++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html @@ -6,13 +6,13 @@ rel="noopener noreferrer" [routerLink]="['/items/' + dso.id]" class="card-img-top full-width">
- +
- +
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html index 8c7e5c2f44..135161a9a1 100644 --- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html +++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html @@ -6,13 +6,13 @@ rel="noopener noreferrer" [routerLink]="['/items/' + dso.id]" class="card-img-top full-width">
- +
- +
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html index cdfa6293c4..a7175db516 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html @@ -4,7 +4,7 @@
- +
- +
- +
- +
- +
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html index 1b45c7c4f9..bc1516aa33 100644 --- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html +++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html @@ -6,13 +6,13 @@ rel="noopener noreferrer" [routerLink]="['/items/' + dso.id]" class="card-img-top full-width">
- +
- +
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html index ac3c3ea453..cc3d162453 100644 --- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html +++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html @@ -6,13 +6,13 @@ rel="noopener noreferrer" [routerLink]="['/items/' + dso.id]" class="card-img-top full-width">
- +
- +
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html index 784000b446..8f343ed701 100644 --- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html +++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html @@ -4,7 +4,7 @@
- +
- +
- + diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html index 063e1393cc..f12f01b7fd 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html @@ -1,6 +1,6 @@
- +
- + diff --git a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts index f124613104..15839af1e5 100644 --- a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts +++ b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts @@ -33,7 +33,6 @@ export class GridThumbnailComponent implements OnInit { ngOnInit(): void { this.src$ = new BehaviorSubject(this.defaultImage); - // console.log('this.thumbnail', this.thumbnail); if (isObservable(this.thumbnail)) { this.thumbnail.subscribe((thumbnailRD) => { this.checkThumbnail(thumbnailRD.payload); diff --git a/src/app/shared/object-grid/object-grid.component.ts b/src/app/shared/object-grid/object-grid.component.ts index 446517023c..c6f8347217 100644 --- a/src/app/shared/object-grid/object-grid.component.ts +++ b/src/app/shared/object-grid/object-grid.component.ts @@ -169,7 +169,6 @@ export class ObjectGridComponent implements OnInit { this._objects$).pipe(map(([nbColumns, objects]) => { if (hasValue(objects) && hasValue(objects.payload) && hasValue(objects.payload.page)) { const page = objects.payload.page; - console.log(page) const result = []; From 7925e9134a809c9c5839d6810219b99cbc6961fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20P=C3=A9ter=20Sipos?= Date: Wed, 28 Oct 2020 16:29:02 +0100 Subject: [PATCH 30/78] Revert "#674 remove async" This reverts commit 371b8e72f79480ff6ced42c357cdc35cbfb5143a. --- .../simple/item-types/publication/publication.component.html | 2 +- src/app/+search-page/search.component.ts | 1 + src/app/core/cache/builders/link.service.ts | 1 + .../journal-issue-search-result-grid-element.component.html | 4 ++-- .../journal-volume-search-result-grid-element.component.html | 4 ++-- .../journal/journal-search-result-grid-element.component.html | 4 ++-- .../item-pages/journal-issue/journal-issue.component.html | 2 +- .../item-pages/journal-volume/journal-volume.component.html | 2 +- .../item-pages/journal/journal.component.html | 2 +- .../org-unit-search-result-grid-element.component.html | 4 ++-- .../person/person-search-result-grid-element.component.html | 4 ++-- .../project/project-search-result-grid-element.component.html | 4 ++-- .../item-pages/org-unit/org-unit.component.html | 2 +- .../research-entities/item-pages/person/person.component.html | 2 +- .../item-pages/project/project.component.html | 2 +- ...-unit-search-result-list-submission-element.component.html | 2 +- .../item-detail-preview/item-detail-preview.component.html | 2 +- .../object-grid/grid-thumbnail/grid-thumbnail.component.ts | 1 + src/app/shared/object-grid/object-grid.component.ts | 1 + 19 files changed, 25 insertions(+), 21 deletions(-) diff --git a/src/app/+item-page/simple/item-types/publication/publication.component.html b/src/app/+item-page/simple/item-types/publication/publication.component.html index f0361d9d53..9eb704b9e9 100644 --- a/src/app/+item-page/simple/item-types/publication/publication.component.html +++ b/src/app/+item-page/simple/item-types/publication/publication.component.html @@ -4,7 +4,7 @@
- + diff --git a/src/app/+search-page/search.component.ts b/src/app/+search-page/search.component.ts index 4e50a82827..412534a708 100644 --- a/src/app/+search-page/search.component.ts +++ b/src/app/+search-page/search.component.ts @@ -125,6 +125,7 @@ export class SearchComponent implements OnInit { this.sub = this.searchOptions$.pipe( switchMap((options) => this.service.search(options, null, followLink('logo')).pipe(getSucceededRemoteData(), startWith(undefined)))) .subscribe((results) => { + console.log('result', results) this.resultsRD$.next(results); }); this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe( diff --git a/src/app/core/cache/builders/link.service.ts b/src/app/core/cache/builders/link.service.ts index 35c2fbac9c..3592d1058c 100644 --- a/src/app/core/cache/builders/link.service.ts +++ b/src/app/core/cache/builders/link.service.ts @@ -39,6 +39,7 @@ export class LinkService { * @param linkToFollow the {@link FollowLinkConfig} to resolve */ public resolveLink(model, linkToFollow: FollowLinkConfig): T { + console.log('model', model, 'links', linkToFollow) const matchingLinkDef = getLinkDefinition(model.constructor, linkToFollow.name); if (hasNoValue(matchingLinkDef)) { diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html index 358a459b4c..1ae772a3c3 100644 --- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html +++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html @@ -6,13 +6,13 @@ rel="noopener noreferrer" [routerLink]="['/items/' + dso.id]" class="card-img-top full-width">
- +
- +
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html index e4d3cddd45..75d29781b7 100644 --- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html +++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html @@ -6,13 +6,13 @@ rel="noopener noreferrer" [routerLink]="['/items/' + dso.id]" class="card-img-top full-width">
- +
- +
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html index 135161a9a1..8c7e5c2f44 100644 --- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html +++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html @@ -6,13 +6,13 @@ rel="noopener noreferrer" [routerLink]="['/items/' + dso.id]" class="card-img-top full-width">
- +
- +
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html index a7175db516..cdfa6293c4 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html @@ -4,7 +4,7 @@
- +
- +
- +
- +
- +
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html index bc1516aa33..1b45c7c4f9 100644 --- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html +++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html @@ -6,13 +6,13 @@ rel="noopener noreferrer" [routerLink]="['/items/' + dso.id]" class="card-img-top full-width">
- +
- +
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html index cc3d162453..ac3c3ea453 100644 --- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html +++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html @@ -6,13 +6,13 @@ rel="noopener noreferrer" [routerLink]="['/items/' + dso.id]" class="card-img-top full-width">
- +
- +
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html index 8f343ed701..784000b446 100644 --- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html +++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html @@ -4,7 +4,7 @@
- +
- +
- + diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html index f12f01b7fd..063e1393cc 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html @@ -1,6 +1,6 @@
- +
- + diff --git a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts index 15839af1e5..f124613104 100644 --- a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts +++ b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts @@ -33,6 +33,7 @@ export class GridThumbnailComponent implements OnInit { ngOnInit(): void { this.src$ = new BehaviorSubject(this.defaultImage); + // console.log('this.thumbnail', this.thumbnail); if (isObservable(this.thumbnail)) { this.thumbnail.subscribe((thumbnailRD) => { this.checkThumbnail(thumbnailRD.payload); diff --git a/src/app/shared/object-grid/object-grid.component.ts b/src/app/shared/object-grid/object-grid.component.ts index c6f8347217..446517023c 100644 --- a/src/app/shared/object-grid/object-grid.component.ts +++ b/src/app/shared/object-grid/object-grid.component.ts @@ -169,6 +169,7 @@ export class ObjectGridComponent implements OnInit { this._objects$).pipe(map(([nbColumns, objects]) => { if (hasValue(objects) && hasValue(objects.payload) && hasValue(objects.payload.page)) { const page = objects.payload.page; + console.log(page) const result = []; From 9ae7e8174e4905679ee326c2a0883337b6565892 Mon Sep 17 00:00:00 2001 From: Marie Verdonck Date: Thu, 29 Oct 2020 10:08:19 +0100 Subject: [PATCH 31/78] 74275: [Issue 2988]: Password (re)set for eperson with add PatchOperation --- src/app/core/eperson/eperson-data.service.spec.ts | 2 +- src/app/core/eperson/eperson-data.service.ts | 2 +- src/app/profile-page/profile-page.component.spec.ts | 2 +- src/app/profile-page/profile-page.component.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/core/eperson/eperson-data.service.spec.ts b/src/app/core/eperson/eperson-data.service.spec.ts index a1a6951545..6fde34b9a5 100644 --- a/src/app/core/eperson/eperson-data.service.spec.ts +++ b/src/app/core/eperson/eperson-data.service.spec.ts @@ -303,7 +303,7 @@ describe('EPersonDataService', () => { it('should sent a patch request with an uuid, token and new password to the epersons endpoint', () => { service.patchPasswordWithToken('test-uuid', 'test-token','test-password'); - const operation = Object.assign({ op: 'replace', path: '/password', value: 'test-password' }); + const operation = Object.assign({ op: 'add', path: '/password', value: 'test-password' }); const expected = new PatchRequest(requestService.generateRequestId(), epersonsEndpoint + '/test-uuid?token=test-token', [operation]); expect(requestService.configure).toHaveBeenCalledWith(expected); diff --git a/src/app/core/eperson/eperson-data.service.ts b/src/app/core/eperson/eperson-data.service.ts index a1428aee73..5fc4c6497f 100644 --- a/src/app/core/eperson/eperson-data.service.ts +++ b/src/app/core/eperson/eperson-data.service.ts @@ -280,7 +280,7 @@ export class EPersonDataService extends DataService { patchPasswordWithToken(uuid: string, token: string, password: string): Observable { const requestId = this.requestService.generateRequestId(); - const operation = Object.assign({ op: 'replace', path: '/password', value: password }); + const operation = Object.assign({ op: 'add', path: '/password', value: password }); const hrefObs = this.halService.getEndpoint(this.linkPath).pipe( map((endpoint: string) => this.getIDHref(endpoint, uuid)), diff --git a/src/app/profile-page/profile-page.component.spec.ts b/src/app/profile-page/profile-page.component.spec.ts index 8d78539bab..418626e4d1 100644 --- a/src/app/profile-page/profile-page.component.spec.ts +++ b/src/app/profile-page/profile-page.component.spec.ts @@ -177,7 +177,7 @@ describe('ProfilePageComponent', () => { component.setPasswordValue('testest'); component.setInvalid(false); - operations = [{op: 'replace', path: '/password', value: 'testest'}]; + operations = [{op: 'add', path: '/password', value: 'testest'}]; result = component.updateSecurity(); }); diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts index bc06c49f81..4ae644a633 100644 --- a/src/app/profile-page/profile-page.component.ts +++ b/src/app/profile-page/profile-page.component.ts @@ -120,7 +120,7 @@ export class ProfilePageComponent implements OnInit { this.notificationsService.error(this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'error.general')); } if (!this.invalidSecurity && passEntered) { - const operation = Object.assign({op: 'replace', path: '/password', value: this.password}); + const operation = Object.assign({op: 'add', path: '/password', value: this.password}); this.epersonService.patch(this.currentUser, [operation]).subscribe((response: RestResponse) => { if (response.isSuccessful) { this.notificationsService.success( From 77e7d0effd6ec0e72816095d2e2855f0e7ea024a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20P=C3=A9ter=20Sipos?= Date: Thu, 29 Oct 2020 11:23:02 +0100 Subject: [PATCH 32/78] #674 remove consle logs --- src/app/+search-page/search.component.ts | 1 - src/app/core/cache/builders/link.service.ts | 1 - .../grid-thumbnail/grid-thumbnail.component.html | 13 ++++--------- src/app/shared/object-grid/object-grid.component.ts | 1 - 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/app/+search-page/search.component.ts b/src/app/+search-page/search.component.ts index 412534a708..4e50a82827 100644 --- a/src/app/+search-page/search.component.ts +++ b/src/app/+search-page/search.component.ts @@ -125,7 +125,6 @@ export class SearchComponent implements OnInit { this.sub = this.searchOptions$.pipe( switchMap((options) => this.service.search(options, null, followLink('logo')).pipe(getSucceededRemoteData(), startWith(undefined)))) .subscribe((results) => { - console.log('result', results) this.resultsRD$.next(results); }); this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe( diff --git a/src/app/core/cache/builders/link.service.ts b/src/app/core/cache/builders/link.service.ts index 3592d1058c..35c2fbac9c 100644 --- a/src/app/core/cache/builders/link.service.ts +++ b/src/app/core/cache/builders/link.service.ts @@ -39,7 +39,6 @@ export class LinkService { * @param linkToFollow the {@link FollowLinkConfig} to resolve */ public resolveLink(model, linkToFollow: FollowLinkConfig): T { - console.log('model', model, 'links', linkToFollow) const matchingLinkDef = getLinkDefinition(model.constructor, linkToFollow.name); if (hasNoValue(matchingLinkDef)) { diff --git a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.html b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.html index 3671073500..89ea44061b 100644 --- a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.html +++ b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.html @@ -1,10 +1,5 @@ -
- - + +
- -
+
+ diff --git a/src/app/shared/object-grid/object-grid.component.ts b/src/app/shared/object-grid/object-grid.component.ts index 446517023c..c6f8347217 100644 --- a/src/app/shared/object-grid/object-grid.component.ts +++ b/src/app/shared/object-grid/object-grid.component.ts @@ -169,7 +169,6 @@ export class ObjectGridComponent implements OnInit { this._objects$).pipe(map(([nbColumns, objects]) => { if (hasValue(objects) && hasValue(objects.payload) && hasValue(objects.payload.page)) { const page = objects.payload.page; - console.log(page) const result = []; From 6f7a226b81176cc918d1917e36e4e20a3e8e8f4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20P=C3=A9ter=20Sipos?= Date: Thu, 29 Oct 2020 14:28:49 +0100 Subject: [PATCH 33/78] #674 refactore thumbnail --- .../core/cache/builders/link.service.spec.ts | 9 ++--- .../grid-thumbnail.component.html | 8 ++--- .../grid-thumbnail.component.ts | 36 ++++++++++++------- ...-search-result-grid-element.component.html | 4 +-- ...-search-result-grid-element.component.html | 4 +-- ...-search-result-grid-element.component.html | 4 +-- .../search-result-grid-element.component.ts | 7 ++-- 7 files changed, 40 insertions(+), 32 deletions(-) diff --git a/src/app/core/cache/builders/link.service.spec.ts b/src/app/core/cache/builders/link.service.spec.ts index 95a7570207..6b7c154137 100644 --- a/src/app/core/cache/builders/link.service.spec.ts +++ b/src/app/core/cache/builders/link.service.spec.ts @@ -139,13 +139,10 @@ describe('LinkService', () => { }); describe(`when the specified link doesn't exist on the model's class`, () => { - beforeEach(() => { - spyOnFunction(decorators, 'getLinkDefinition').and.returnValue(undefined); - }); - it('should throw an error', () => { - expect(() => { + it('should return with the same model', () => { + expect( service.resolveLink(testModel, followLink('predecessor', {}, true, followLink('successor'))) - }).toThrow(); + ).toEqual(testModel); }); }); diff --git a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.html b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.html index 89ea44061b..1df4026f83 100644 --- a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.html +++ b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.html @@ -1,5 +1,3 @@ - -
- -
- +
+ +
diff --git a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts index f124613104..90eb6c1bb0 100644 --- a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts +++ b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts @@ -1,4 +1,10 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { + Component, + Input, + OnChanges, + OnInit, + SimpleChanges, +} from '@angular/core'; import { BehaviorSubject, Observable, isObservable } from 'rxjs'; import { RemoteData } from '../../../core/data/remote-data'; import { Bitstream } from '../../../core/shared/bitstream.model'; @@ -15,8 +21,8 @@ import { hasValue } from '../../empty.util'; styleUrls: ['./grid-thumbnail.component.scss'], templateUrl: './grid-thumbnail.component.html', }) -export class GridThumbnailComponent implements OnInit { - @Input() thumbnail: Bitstream | Observable>; +export class GridThumbnailComponent implements OnInit, OnChanges { + @Input() thumbnail: Bitstream; data: any = {}; @@ -26,20 +32,24 @@ export class GridThumbnailComponent implements OnInit { @Input() defaultImage? = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMjYwIiBoZWlnaHQ9IjE4MCIgdmlld0JveD0iMCAwIDI2MCAxODAiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjwhLS0KU291cmNlIFVSTDogaG9sZGVyLmpzLzEwMCV4MTgwL3RleHQ6Tm8gVGh1bWJuYWlsCkNyZWF0ZWQgd2l0aCBIb2xkZXIuanMgMi42LjAuCkxlYXJuIG1vcmUgYXQgaHR0cDovL2hvbGRlcmpzLmNvbQooYykgMjAxMi0yMDE1IEl2YW4gTWFsb3BpbnNreSAtIGh0dHA6Ly9pbXNreS5jbwotLT48ZGVmcz48c3R5bGUgdHlwZT0idGV4dC9jc3MiPjwhW0NEQVRBWyNob2xkZXJfMTVmNzJmMmFlMGIgdGV4dCB7IGZpbGw6I0FBQUFBQTtmb250LXdlaWdodDpib2xkO2ZvbnQtZmFtaWx5OkFyaWFsLCBIZWx2ZXRpY2EsIE9wZW4gU2Fucywgc2Fucy1zZXJpZiwgbW9ub3NwYWNlO2ZvbnQtc2l6ZToxM3B0IH0gXV0+PC9zdHlsZT48L2RlZnM+PGcgaWQ9ImhvbGRlcl8xNWY3MmYyYWUwYiI+PHJlY3Qgd2lkdGg9IjI2MCIgaGVpZ2h0PSIxODAiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSI3Mi4yNDIxODc1IiB5PSI5NiI+Tm8gVGh1bWJuYWlsPC90ZXh0PjwvZz48L2c+PC9zdmc+'; - src$: BehaviorSubject; + src: string; + errorHandler(event) { event.currentTarget.src = this.defaultImage; } ngOnInit(): void { - this.src$ = new BehaviorSubject(this.defaultImage); - // console.log('this.thumbnail', this.thumbnail); - if (isObservable(this.thumbnail)) { - this.thumbnail.subscribe((thumbnailRD) => { - this.checkThumbnail(thumbnailRD.payload); - }); - } else { - this.checkThumbnail(this.thumbnail); + this.src = this.defaultImage; + + this.checkThumbnail(this.thumbnail); + } + + ngOnChanges(changes: SimpleChanges): void { + if ( + !hasValue(changes.thumbnail.previousValue) && + hasValue(changes.thumbnail.currentValue) + ) { + this.checkThumbnail(changes.thumbnail.currentValue); } } @@ -49,7 +59,7 @@ export class GridThumbnailComponent implements OnInit { hasValue(thumbnail._links) && thumbnail._links.content.href ) { - this.src$.next(thumbnail._links.content.href); + this.src = thumbnail._links.content.href; } } } diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html index a2933fd0ec..09d7a190d9 100644 --- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html +++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html @@ -1,10 +1,10 @@
- + - +
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html index 8d5f288498..3d4b95739f 100644 --- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html +++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html @@ -1,10 +1,10 @@
- + - +
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.html index 22f898662d..125553054e 100644 --- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.html +++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component.html @@ -4,13 +4,13 @@
- +
- +
diff --git a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts index 6f60341c0f..e660c060e6 100644 --- a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts +++ b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts @@ -11,6 +11,7 @@ import { AbstractListableElementComponent } from '../../object-collection/shared import { TruncatableService } from '../../truncatable/truncatable.service'; import { RemoteData } from '../../../core/data/remote-data'; import { filter, map } from 'rxjs/operators'; +import { getFirstSucceededRemoteDataPayload, getSucceededRemoteData } from '../../../core/shared/operators'; @Component({ selector: 'ds-search-result-grid-element', @@ -70,7 +71,9 @@ export class SearchResultGridElementComponent, K exten } // TODO refactor to return RemoteData, and thumbnail template to deal with loading - getThumbnail(): Observable> { - return this.bitstreamDataService.getThumbnailFor(this.dso as any); + getThumbnail(): Observable { + return this.bitstreamDataService.getThumbnailFor(this.dso as any).pipe( + getFirstSucceededRemoteDataPayload() + ); } } From 71ca57a5ce1e467eacd53b25341fcc3bcda67dec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20P=C3=A9ter=20Sipos?= Date: Thu, 29 Oct 2020 14:35:44 +0100 Subject: [PATCH 34/78] #674 update other grid elements --- .../collection-grid-element.component.html | 4 ++-- .../community-grid-element.component.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html index 0b1a85d0ef..9b9d174704 100644 --- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html +++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html @@ -1,10 +1,10 @@
- + - +
diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html index eed29367fa..f676ba303b 100644 --- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html +++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html @@ -1,10 +1,10 @@
- + - +
From 9a1b21aeefd753216e11a10c7cd26db9f116780f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20P=C3=A9ter=20Sipos?= Date: Thu, 29 Oct 2020 14:43:17 +0100 Subject: [PATCH 35/78] #675 remove unused imports --- .../object-grid/grid-thumbnail/grid-thumbnail.component.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts index 90eb6c1bb0..3122650bd0 100644 --- a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts +++ b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts @@ -5,8 +5,6 @@ import { OnInit, SimpleChanges, } from '@angular/core'; -import { BehaviorSubject, Observable, isObservable } from 'rxjs'; -import { RemoteData } from '../../../core/data/remote-data'; import { Bitstream } from '../../../core/shared/bitstream.model'; import { hasValue } from '../../empty.util'; From 22fe1841428af3064ea4ded517b16edc462a3ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20P=C3=A9ter=20Sipos?= Date: Thu, 29 Oct 2020 14:57:09 +0100 Subject: [PATCH 36/78] #674 ad doctype --- .../object-grid/grid-thumbnail/grid-thumbnail.component.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts index 3122650bd0..fb736cd102 100644 --- a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts +++ b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts @@ -36,6 +36,9 @@ export class GridThumbnailComponent implements OnInit, OnChanges { event.currentTarget.src = this.defaultImage; } + /** + * Initialize the src + */ ngOnInit(): void { this.src = this.defaultImage; @@ -51,6 +54,9 @@ export class GridThumbnailComponent implements OnInit, OnChanges { } } + /** + * check if the Bitstream has any content than set the src + */ checkThumbnail(thumbnail: Bitstream) { if ( hasValue(thumbnail) && From 17455a786054c1fda9e1d1ea87d9e04b04fd2d59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20P=C3=A9ter=20Sipos?= Date: Thu, 29 Oct 2020 15:19:04 +0100 Subject: [PATCH 37/78] #674 add dock type --- .../object-grid/grid-thumbnail/grid-thumbnail.component.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts index fb736cd102..92d93686dc 100644 --- a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts +++ b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts @@ -45,6 +45,9 @@ export class GridThumbnailComponent implements OnInit, OnChanges { this.checkThumbnail(this.thumbnail); } + /** + * If the old input is undefined and the new one is a bitsream then set src + */ ngOnChanges(changes: SimpleChanges): void { if ( !hasValue(changes.thumbnail.previousValue) && From 9339cfaafd884d9fc5d60e4f5f643f6c6fddcf65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20P=C3=A9ter=20Sipos?= Date: Thu, 29 Oct 2020 16:14:35 +0100 Subject: [PATCH 38/78] #674 remove un used import --- .../search-result-grid-element.component.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts index e660c060e6..a53beaf922 100644 --- a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts +++ b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts @@ -9,9 +9,7 @@ import { Metadata } from '../../../core/shared/metadata.utils'; import { hasValue } from '../../empty.util'; import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; import { TruncatableService } from '../../truncatable/truncatable.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { filter, map } from 'rxjs/operators'; -import { getFirstSucceededRemoteDataPayload, getSucceededRemoteData } from '../../../core/shared/operators'; +import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators'; @Component({ selector: 'ds-search-result-grid-element', From 48c7fff9309b58487a1360a421a71973f7894675 Mon Sep 17 00:00:00 2001 From: Art Lowel Date: Fri, 30 Oct 2020 13:36:39 +0100 Subject: [PATCH 39/78] add loading indicator to infinite scroll, few style tweaks --- src/app/core/shared/context.model.ts | 1 + ...sue-sidebar-search-list-element.component.ts | 1 + ...ume-sidebar-search-list-element.component.ts | 1 + ...nal-sidebar-search-list-element.component.ts | 1 + ...nit-sidebar-search-list-element.component.ts | 1 + ...son-sidebar-search-list-element.component.ts | 1 + ...ect-sidebar-search-list-element.component.ts | 1 + .../dso-selector/dso-selector.component.html | 8 ++++++-- .../dso-selector/dso-selector.component.scss | 9 +-------- .../dso-selector/dso-selector.component.ts | 16 +++++++++++----- ...ion-sidebar-search-list-element.component.ts | 1 + ...ity-sidebar-search-list-element.component.ts | 1 + ...ion-sidebar-search-list-element.component.ts | 2 ++ .../sidebar-search-list-element.component.html | 17 ++++++++++++++--- .../sidebar-search-list-element.component.ts | 10 +++++++++- 15 files changed, 52 insertions(+), 19 deletions(-) diff --git a/src/app/core/shared/context.model.ts b/src/app/core/shared/context.model.ts index 207c1fb99d..3613a143bd 100644 --- a/src/app/core/shared/context.model.ts +++ b/src/app/core/shared/context.model.ts @@ -14,4 +14,5 @@ export enum Context { AdminSearch = 'adminSearch', AdminWorkflowSearch = 'adminWorkflowSearch', SideBarSearchModal = 'sideBarSearchModal', + SideBarSearchModalCurrent = 'sideBarSearchModalCurrent', } diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts index 026a9be15c..84764e9e60 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts @@ -8,6 +8,7 @@ import { Item } from '../../../../../core/shared/item.model'; import { isNotEmpty } from '../../../../../shared/empty.util'; @listableObjectComponent('JournalIssueSearchResult', ViewMode.ListElement, Context.SideBarSearchModal) +@listableObjectComponent('JournalIssueSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent) @Component({ selector: 'ds-journal-issue-sidebar-search-list-element', templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html' diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts index ce99d14406..7af5487f40 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts @@ -8,6 +8,7 @@ import { Item } from '../../../../../core/shared/item.model'; import { isNotEmpty } from '../../../../../shared/empty.util'; @listableObjectComponent('JournalVolumeSearchResult', ViewMode.ListElement, Context.SideBarSearchModal) +@listableObjectComponent('JournalVolumeSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent) @Component({ selector: 'ds-journal-volume-sidebar-search-list-element', templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html' diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts index f222298ee3..4a26b293d9 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts @@ -8,6 +8,7 @@ import { Item } from '../../../../../core/shared/item.model'; import { isNotEmpty } from '../../../../../shared/empty.util'; @listableObjectComponent('JournalSearchResult', ViewMode.ListElement, Context.SideBarSearchModal) +@listableObjectComponent('JournalSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent) @Component({ selector: 'ds-journal-sidebar-search-list-element', templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html' diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts index 54fed3125f..642c13f562 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts @@ -8,6 +8,7 @@ import { Item } from '../../../../../core/shared/item.model'; import { isNotEmpty } from '../../../../../shared/empty.util'; @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.SideBarSearchModal) +@listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent) @Component({ selector: 'ds-org-unit-sidebar-search-list-element', templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html' diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts index 9cbf66d040..ade080f2e2 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts @@ -11,6 +11,7 @@ import { LinkService } from '../../../../../core/cache/builders/link.service'; import { TranslateService } from '@ngx-translate/core'; @listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.SideBarSearchModal) +@listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent) @Component({ selector: 'ds-person-sidebar-search-list-element', templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html' diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts index 00124cf497..0d109c55f0 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts @@ -8,6 +8,7 @@ import { Item } from '../../../../../core/shared/item.model'; import { isNotEmpty } from '../../../../../shared/empty.util'; @listableObjectComponent('ProjectSearchResult', ViewMode.ListElement, Context.SideBarSearchModal) +@listableObjectComponent('ProjectSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent) @Component({ selector: 'ds-project-sidebar-search-list-element', templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html' diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html index 048e115f8e..a115e4a30e 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html @@ -20,11 +20,15 @@ +
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.scss b/src/app/shared/dso-selector/dso-selector/dso-selector.component.scss index d1fbab4142..a9a65d61e7 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.scss +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.scss @@ -1,12 +1,5 @@ .scrollable-menu { height: auto; - max-height: $dso-selector-list-max-height; + max-height: min(70vh, 475px); overflow-x: hidden; } - -.current { - background-color: $dso-selector-current-background-color; - &:hover { - background-color: $dso-selector-current-background-hover-color; - } -} diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts index cb8bf3cec4..c451bfbe4d 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts @@ -107,11 +107,6 @@ export class DSOSelectorComponent implements OnInit, OnDestroy { */ linkTypes = CollectionElementLinkType; - /** - * This component's context to display listable objects for - */ - context = Context.SideBarSearchModal; - /** * Array to track all subscriptions and unsubscribe them onDestroy * @type {Array} @@ -212,6 +207,17 @@ export class DSOSelectorComponent implements OnInit, OnDestroy { } } + /** + * Get the context for element with the given id + */ + getContext(id: string) { + if (id === this.currentDSOId) { + return Context.SideBarSearchModalCurrent; + } else { + return Context.SideBarSearchModal; + } + } + /** * Unsubscribe from all subscriptions */ diff --git a/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts index 8439ca53f7..13703240f4 100644 --- a/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts +++ b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts @@ -7,6 +7,7 @@ import { ViewMode } from '../../../../core/shared/view-mode.model'; import { SidebarSearchListElementComponent } from '../sidebar-search-list-element.component'; @listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.SideBarSearchModal) +@listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.SideBarSearchModalCurrent) @Component({ selector: 'ds-collection-sidebar-search-list-element', templateUrl: '../sidebar-search-list-element.component.html' diff --git a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts index 02e09c3fd4..14c8ec09cd 100644 --- a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts +++ b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts @@ -7,6 +7,7 @@ import { CommunitySearchResult } from '../../../object-collection/shared/communi import { Community } from '../../../../core/shared/community.model'; @listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.SideBarSearchModal) +@listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.SideBarSearchModalCurrent) @Component({ selector: 'ds-collection-sidebar-search-list-element', templateUrl: '../sidebar-search-list-element.component.html' diff --git a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts index fb79a4924e..0822accc50 100644 --- a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts +++ b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts @@ -7,7 +7,9 @@ import { Item } from '../../../../../core/shared/item.model'; import { SidebarSearchListElementComponent } from '../../sidebar-search-list-element.component'; @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement, Context.SideBarSearchModal) +@listableObjectComponent('PublicationSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent) @listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.SideBarSearchModal) +@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.SideBarSearchModalCurrent) @Component({ selector: 'ds-publication-sidebar-search-list-element', templateUrl: '../../sidebar-search-list-element.component.html' diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html index 0bad828932..77611b3cdd 100644 --- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html +++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html @@ -1,3 +1,14 @@ -
 -
 -
 + +
+ + +
+ + +
+ diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts index 71547854f9..478bf50771 100644 --- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts +++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts @@ -11,6 +11,7 @@ import { ChildHALResource } from '../../../core/shared/child-hal-resource.model' import { followLink } from '../../utils/follow-link-config.model'; import { RemoteData } from '../../../core/data/remote-data'; import { of as observableOf } from 'rxjs'; +import { Context } from '../../../core/shared/context.model'; @Component({ selector: 'ds-sidebar-search-list-element', @@ -54,6 +55,13 @@ export class SidebarSearchListElementComponent, K exte } } + /** + * returns true if this element represents the current dso + */ + isCurrent(): boolean { + return this.context === Context.SideBarSearchModalCurrent; + } + /** * Get the title of the object's parent * Retrieve the parent by using the object's parent link and retrieving its 'dc.title' metadata @@ -61,7 +69,7 @@ export class SidebarSearchListElementComponent, K exte getParentTitle(): Observable { return this.getParent().pipe( map((parentRD: RemoteData) => { - return parentRD ? parentRD.payload.firstMetadataValue('dc.title') : undefined; + return hasValue(parentRD) && hasValue(parentRD.payload) ? parentRD.payload.firstMetadataValue('dc.title') : undefined; }) ); } From 96c31d84d6678f85a33fb6fb5df6fd209378ded4 Mon Sep 17 00:00:00 2001 From: Art Lowel Date: Fri, 30 Oct 2020 17:16:49 +0100 Subject: [PATCH 40/78] support truncation on different backgrounds --- .../dso-selector/dso-selector.component.html | 1 + .../dso-selector/dso-selector.component.scss | 2 +- .../dso-selector/dso-selector.component.ts | 5 +++ ...sidebar-search-list-element.component.html | 6 +-- src/app/shared/shared.module.ts | 9 +++-- .../truncatable-part.component.html | 4 +- .../truncatable-part.component.scss | 39 +++++++++++++------ .../truncatable-part.component.ts | 2 + 8 files changed, 47 insertions(+), 21 deletions(-) diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html index a115e4a30e..0e914a3783 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html @@ -22,6 +22,7 @@ class="list-group-item list-group-item-action border-0 list-entry" [ngClass]="{'bg-primary': listEntry.indexableObject.id === currentDSOId}" title="{{ listEntry.indexableObject.name }}" + dsHoverClass="ds-hover" (click)="onSelect.emit(listEntry.indexableObject)" #listEntryElement> diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.scss b/src/app/shared/dso-selector/dso-selector/dso-selector.component.scss index a9a65d61e7..37d2ebeca7 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.scss +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.scss @@ -1,5 +1,5 @@ .scrollable-menu { height: auto; - max-height: min(70vh, 475px); + max-height: $dso-selector-list-max-height; overflow-x: hidden; } diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts index c451bfbe4d..931599c333 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts @@ -107,6 +107,11 @@ export class DSOSelectorComponent implements OnInit, OnDestroy { */ linkTypes = CollectionElementLinkType; + /** + * Track whether the element has the mouse over it + */ + isMouseOver = false + /** * Array to track all subscriptions and unsubscribe them onDestroy * @type {Array} diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html index 77611b3cdd..17e700486f 100644 --- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html +++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html @@ -1,13 +1,13 @@ - +
- +
- +
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 8add0c0977..9bbe9351b0 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -216,6 +216,7 @@ import { CollectionSidebarSearchListElementComponent } from './object-list/sideb import { CommunitySidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component'; import { AuthorizedCollectionSelectorComponent } from './dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component'; import { DsoPageEditButtonComponent } from './dso-page/dso-page-edit-button/dso-page-edit-button.component'; +import { HoverClassDirective } from './hover-class.directive'; const MODULES = [ // Do NOT include UniversalModule, HttpModule, or JsonpModule here @@ -501,6 +502,7 @@ const ENTRY_COMPONENTS = [ const SHARED_ITEM_PAGE_COMPONENTS = [ MetadataFieldWrapperComponent, MetadataValuesComponent, + DsoPageEditButtonComponent ]; const PROVIDERS = [ @@ -531,7 +533,8 @@ const DIRECTIVES = [ FileValidator, ClaimedTaskActionsDirective, NgForTrackByIdDirective, - MetadataFieldValidator + MetadataFieldValidator, + HoverClassDirective ]; @NgModule({ @@ -545,7 +548,6 @@ const DIRECTIVES = [ ...DIRECTIVES, ...ENTRY_COMPONENTS, ...SHARED_ITEM_PAGE_COMPONENTS, - DsoPageEditButtonComponent ], providers: [ ...PROVIDERS @@ -556,8 +558,7 @@ const DIRECTIVES = [ ...COMPONENTS, ...SHARED_ITEM_PAGE_COMPONENTS, ...DIRECTIVES, - CurationFormComponent, - DsoPageEditButtonComponent + CurationFormComponent ], entryComponents: [ ...ENTRY_COMPONENTS diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html index 72f41cd770..bf1212a6bf 100644 --- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html +++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html @@ -1,5 +1,5 @@ -
+
-
\ No newline at end of file +
diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.scss b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.scss index 68b6772465..d2ddfc7383 100644 --- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.scss +++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.scss @@ -1,4 +1,4 @@ -@mixin clamp($lines, $size-factor: 1, $line-height: $line-height-base) { +@mixin clamp($lines, $bg, $size-factor: 1, $line-height: $line-height-base) { $height: $line-height * $font-size-base * $size-factor; &.fixedHeight { height: $lines * $height; @@ -19,10 +19,11 @@ min-width: 75px; max-width: 150px; height: $height; - background: linear-gradient(to right, rgba(255, 255, 255, 0), $body-bg 70%); + background: linear-gradient(to right, rgba(255, 255, 255, 0), $bg 70%); pointer-events: none; } } + } @mixin min($lines, $size-factor: 1, $line-height: $line-height-base) { @@ -31,16 +32,32 @@ } $h4-factor: strip-unit($h4-font-size); + +@mixin clamp-with-titles($i, $bg) { + transition: height 1s; + @include clamp($i, $bg); + &.title { + @include clamp($i, $bg, 1.25); + } + &.h4 { + @include clamp($i, $bg, $h4-factor, $headings-line-height); + } +} + @for $i from 1 through 15 { - .clamp-#{$i} { - transition: height 1s; - @include clamp($i); - &.title { - @include clamp($i, 1.25); - } - &.h4 { - @include clamp($i, $h4-factor, $headings-line-height); - } + .clamp-default-#{$i} { + @include clamp-with-titles($i, $body-bg); + } + :host-context(.ds-hover) .clamp-default-#{$i} { + @include clamp-with-titles($i, $list-group-hover-bg); + } + + .clamp-primary-#{$i} { + @include clamp-with-titles($i, $primary); + } + + :host-context(.ds-hover) .clamp-primary-#{$i} { + @include clamp-with-titles($i, darken($primary, 10%)); } } diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts index fef5d7d098..2a375e95d9 100644 --- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts +++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts @@ -38,6 +38,8 @@ export class TruncatablePartComponent implements OnInit, OnDestroy { */ @Input() fixedHeight = false; + @Input() background = 'default'; + /** * Current amount of lines shown of this part */ From f06c4a20b098e43756a7552cd7fc7e36022e59d8 Mon Sep 17 00:00:00 2001 From: Art Lowel Date: Fri, 30 Oct 2020 17:40:12 +0100 Subject: [PATCH 41/78] make breadcrumb home text i18nable --- src/app/breadcrumbs/breadcrumbs.component.html | 2 +- src/assets/i18n/en.json5 | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/breadcrumbs/breadcrumbs.component.html b/src/app/breadcrumbs/breadcrumbs.component.html index 6c1c31c89f..1f142526e2 100644 --- a/src/app/breadcrumbs/breadcrumbs.component.html +++ b/src/app/breadcrumbs/breadcrumbs.component.html @@ -2,7 +2,7 @@
Date: Wed, 4 Nov 2020 14:11:46 +0100 Subject: [PATCH 43/78] 74199: AuthorizedCollectionSelectorComponent current dso query fix --- .../authorized-collection-selector.component.ts | 7 +++++++ .../dso-selector/dso-selector/dso-selector.component.ts | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts index 1e58289c3a..0a19da54c8 100644 --- a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts +++ b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts @@ -24,6 +24,13 @@ export class AuthorizedCollectionSelectorComponent extends DSOSelectorComponent super(searchService); } + /** + * Get a query to send for retrieving the current DSO + */ + getCurrentDSOQuery(): string { + return this.currentDSOId; + } + /** * Perform a search for authorized collections with the current query and page * @param query Query to search objects for diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts index 931599c333..5bbcec4262 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts @@ -131,7 +131,7 @@ export class DSOSelectorComponent implements OnInit, OnDestroy { // Create an observable searching for the current DSO (return empty list if there's no current DSO) let currentDSOResult$; if (isNotEmpty(this.currentDSOId)) { - currentDSOResult$ = this.search(`search.resourceid:${this.currentDSOId}`, 1); + currentDSOResult$ = this.search(this.getCurrentDSOQuery(), 1); } else { currentDSOResult$ = observableOf(new PaginatedList(undefined, [])); } @@ -175,6 +175,13 @@ export class DSOSelectorComponent implements OnInit, OnDestroy { })); } + /** + * Get a query to send for retrieving the current DSO + */ + getCurrentDSOQuery(): string { + return `search.resourceid:${this.currentDSOId}`; + } + /** * Perform a search for the current query and page * @param query Query to search objects for From 5835c661ac4e3e08ea0c971ccc69a462d4349707 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Wed, 4 Nov 2020 14:59:10 +0100 Subject: [PATCH 44/78] 74199: Lint and LGTM fixes + HoverClassDirective JSDocs and tests --- ...t-sidebar-search-list-element.component.ts | 1 - ...t-sidebar-search-list-element.component.ts | 1 - src/app/shared/hover-class.directive.spec.ts | 35 +++++++++++++++++++ src/app/shared/hover-class.directive.ts | 16 +++++++-- 4 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 src/app/shared/hover-class.directive.spec.ts diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts index 642c13f562..17e9790593 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts @@ -5,7 +5,6 @@ import { ItemSearchResult } from '../../../../../shared/object-collection/shared import { Component } from '@angular/core'; import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component'; import { Item } from '../../../../../core/shared/item.model'; -import { isNotEmpty } from '../../../../../shared/empty.util'; @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.SideBarSearchModal) @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent) diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts index 0d109c55f0..6fbb9d26fc 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts @@ -5,7 +5,6 @@ import { ItemSearchResult } from '../../../../../shared/object-collection/shared import { Component } from '@angular/core'; import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component'; import { Item } from '../../../../../core/shared/item.model'; -import { isNotEmpty } from '../../../../../shared/empty.util'; @listableObjectComponent('ProjectSearchResult', ViewMode.ListElement, Context.SideBarSearchModal) @listableObjectComponent('ProjectSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent) diff --git a/src/app/shared/hover-class.directive.spec.ts b/src/app/shared/hover-class.directive.spec.ts new file mode 100644 index 0000000000..9c593f27c8 --- /dev/null +++ b/src/app/shared/hover-class.directive.spec.ts @@ -0,0 +1,35 @@ +import { Component, DebugElement } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { HoverClassDirective } from './hover-class.directive'; +import { By } from '@angular/platform-browser'; + +@Component({ + template: `
` +}) +class TestComponent { } + +describe('HoverClassDirective', () => { + let component: TestComponent; + let fixture: ComponentFixture; + let el: DebugElement; + + beforeEach(() => { + fixture = TestBed.configureTestingModule({ + declarations: [TestComponent, HoverClassDirective] + }).createComponent(TestComponent); + + fixture.detectChanges(); + component = fixture.componentInstance; + el = fixture.debugElement.query(By.css('div')); + }); + + it('should add the class on mouseenter and remove on mouseleave', () => { + el.triggerEventHandler('mouseenter', null); + fixture.detectChanges(); + expect(el.nativeElement.classList).toContain('ds-hover'); + + el.triggerEventHandler('mouseleave', null); + fixture.detectChanges(); + expect(el.nativeElement.classList).not.toContain('ds-hover'); + }); +}); diff --git a/src/app/shared/hover-class.directive.ts b/src/app/shared/hover-class.directive.ts index e5c4ad200e..551e81a463 100644 --- a/src/app/shared/hover-class.directive.ts +++ b/src/app/shared/hover-class.directive.ts @@ -3,15 +3,27 @@ import { Directive, ElementRef, HostListener, Input } from '@angular/core'; @Directive({ selector: '[dsHoverClass]' }) +/** + * A directive adding a class to an element when hovered over + */ export class HoverClassDirective { -​ - constructor(public elementRef: ElementRef) { } + /** + * The name of the class to add on hover + */ @Input('dsHoverClass') hoverClass: string; ​ + constructor(public elementRef: ElementRef) { } +​ + /** + * On mouse enter, add the class to the element's class list + */ @HostListener('mouseenter') onMouseEnter() { this.elementRef.nativeElement.classList.add(this.hoverClass); } ​ + /** + * On mouse leave, remove the class from the element's class list + */ @HostListener('mouseleave') onMouseLeave() { this.elementRef.nativeElement.classList.remove(this.hoverClass); } From cba71fc53fc738d82bd7205f8bdd319908d6df72 Mon Sep 17 00:00:00 2001 From: Samuel Date: Thu, 9 Apr 2020 13:55:51 +0200 Subject: [PATCH 45/78] PR 545 Create relationships as an admin in edit item --- .../edit-relationship-list.component.html | 21 +- .../edit-relationship-list.component.scss | 4 +- .../edit-relationship-list.component.spec.ts | 197 +++++++++------ .../edit-relationship-list.component.ts | 226 ++++++++++++++++-- .../edit-relationship.component.html | 7 +- .../edit-relationship.component.spec.ts | 14 +- .../edit-relationship.component.ts | 64 +++-- .../item-relationships.component.html | 21 +- .../item-relationships.component.ts | 160 +++++++++---- src/app/core/data/entity-type.service.ts | 17 +- .../object-updates/object-updates.reducer.ts | 15 +- src/app/core/data/relationship.service.ts | 20 +- .../person/person-list-element.component.html | 7 +- ...-search-result-list-element.component.html | 2 +- ...on-search-result-list-element.component.ts | 6 + ...esult-list-submission-element.component.ts | 2 +- ...ng-metadata-list-element.component.spec.ts | 2 +- ...xisting-metadata-list-element.component.ts | 2 +- ...table-object-component-loader.component.ts | 3 + .../abstract-listable-element.component.ts | 2 + src/assets/i18n/en.json5 | 53 +++- 21 files changed, 654 insertions(+), 191 deletions(-) diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html index 1a7cc2e2df..7a4461b03b 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html +++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html @@ -1,15 +1,26 @@ -
{{getRelationshipMessageKey() | async | translate}}
+
+ {{getRelationshipMessageKey() | async | translate}} + +
+ [ngClass]="{ + 'alert-success': updateValue.changeType === 1, + 'alert-warning': updateValue.changeType === 0, + 'alert-danger': updateValue.changeType === 2 + }"> +
{{"item.edit.relationships.no-relationships" | translate}}
 -
no relationships
+ diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.scss b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.scss index e0c20d299f..54498499d7 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.scss +++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.scss @@ -1,8 +1,8 @@ -.relationship-row:not(.alert-danger) { +.relationship-row:not(.alert) { padding: $alert-padding-y 0; } -.relationship-row.alert-danger { +.relationship-row.alert { margin-left: -$alert-padding-x; margin-right: -$alert-padding-x; margin-top: -1px; diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts index 1d4d91da0b..cd583fd22b 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts +++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts @@ -1,5 +1,5 @@ import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { TranslateModule } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs/internal/observable/of'; @@ -8,6 +8,7 @@ import { FieldChangeType } from '../../../../core/data/object-updates/object-upd import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service'; import { PaginatedList } from '../../../../core/data/paginated-list'; import { RelationshipTypeService } from '../../../../core/data/relationship-type.service'; +import { RelationshipService } from '../../../../core/data/relationship.service'; import { RemoteData } from '../../../../core/data/remote-data'; import { ItemType } from '../../../../core/shared/item-relationships/item-type.model'; import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model'; @@ -15,6 +16,7 @@ import { Relationship } from '../../../../core/shared/item-relationships/relatio import { Item } from '../../../../core/shared/item.model'; import { PageInfo } from '../../../../core/shared/page-info.model'; import { getMockLinkService } from '../../../../shared/mocks/link-service.mock'; +import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service'; import { SharedModule } from '../../../../shared/shared.module'; import { EditRelationshipListComponent } from './edit-relationship-list.component'; @@ -22,72 +24,123 @@ let comp: EditRelationshipListComponent; let fixture: ComponentFixture; let de: DebugElement; +let linkService; let objectUpdatesService; -let entityTypeService; +let relationshipService; +let selectableListService; const url = 'http://test-url.com/test-url'; let item; +let entityType; +let relatedEntityType; let author1; let author2; let fieldUpdate1; let fieldUpdate2; -let relationship1; -let relationship2; +let relationships; let relationshipType; -let entityType; -let relatedEntityType; describe('EditRelationshipListComponent', () => { - beforeEach(() => { + beforeEach(async(() => { entityType = Object.assign(new ItemType(), { - id: 'entityType', + id: 'Publication', + uuid: 'Publication', + label: 'Publication', }); relatedEntityType = Object.assign(new ItemType(), { - id: 'relatedEntityType', + id: 'Author', + uuid: 'Author', + label: 'Author', }); relationshipType = Object.assign(new RelationshipType(), { id: '1', uuid: '1', + leftType: observableOf(new RemoteData( + false, + false, + true, + undefined, + entityType, + )), + rightType: observableOf(new RemoteData( + false, + false, + true, + undefined, + relatedEntityType, + )), leftwardType: 'isAuthorOfPublication', rightwardType: 'isPublicationOfAuthor', - leftType: observableOf(new RemoteData(false, false, true, undefined, entityType)), - rightType: observableOf(new RemoteData(false, false, true, undefined, relatedEntityType)), }); - relationship1 = Object.assign(new Relationship(), { - _links: { - self: { - href: url + '/2' - } - }, - id: '2', - uuid: '2', - leftId: 'author1', - rightId: 'publication', - leftItem: observableOf(new RemoteData(false, false, true, undefined, item)), - rightItem: observableOf(new RemoteData(false, false, true, undefined, author1)), - relationshipType: observableOf(new RemoteData(false, false, true, undefined, relationshipType)) + author1 = Object.assign(new Item(), { + id: 'author1', + uuid: 'author1' + }); + author2 = Object.assign(new Item(), { + id: 'author2', + uuid: 'author2' }); - relationship2 = Object.assign(new Relationship(), { - _links: { - self: { - href: url + '/3' - } - }, - id: '3', - uuid: '3', - leftId: 'author2', - rightId: 'publication', - leftItem: observableOf(new RemoteData(false, false, true, undefined, item)), - rightItem: observableOf(new RemoteData(false, false, true, undefined, author2)), - relationshipType: observableOf(new RemoteData(false, false, true, undefined, relationshipType)) - }); + relationships = [ + Object.assign(new Relationship(), { + self: url + '/2', + id: '2', + uuid: '2', + relationshipType: observableOf(new RemoteData( + false, + false, + true, + undefined, + relationshipType + )), + leftItem: observableOf(new RemoteData( + false, + false, + true, + undefined, + item, + )), + rightItem: observableOf(new RemoteData( + false, + false, + true, + undefined, + author1, + )), + }), + Object.assign(new Relationship(), { + self: url + '/3', + id: '3', + uuid: '3', + relationshipType: observableOf(new RemoteData( + false, + false, + true, + undefined, + relationshipType + )), + leftItem: observableOf(new RemoteData( + false, + false, + true, + undefined, + item, + )), + rightItem: observableOf(new RemoteData( + false, + false, + true, + undefined, + author2, + )), + }) + ]; item = Object.assign(new Item(), { _links: { @@ -100,84 +153,82 @@ describe('EditRelationshipListComponent', () => { false, true, undefined, - new PaginatedList(new PageInfo(), [relationship1, relationship2]) + new PaginatedList(new PageInfo(), relationships), )) }); - author1 = Object.assign(new Item(), { - id: 'author1', - uuid: 'author1' - }); - author2 = Object.assign(new Item(), { - id: 'author2', - uuid: 'author2' - }); - fieldUpdate1 = { - field: author1, + field: { + uuid: relationships[0].uuid, + relationship: relationships[0], + type: relationshipType, + }, changeType: undefined }; fieldUpdate2 = { - field: author2, + field: { + uuid: relationships[1].uuid, + relationship: relationships[1], + type: relationshipType, + }, changeType: FieldChangeType.REMOVE }; objectUpdatesService = jasmine.createSpyObj('objectUpdatesService', { getFieldUpdates: observableOf({ - [author1.uuid]: fieldUpdate1, - [author2.uuid]: fieldUpdate2 + [relationships[0].uuid]: fieldUpdate1, + [relationships[1].uuid]: fieldUpdate2 }) } ); - entityTypeService = jasmine.createSpyObj('entityTypeService', + relationshipService = jasmine.createSpyObj('relationshipService', { - getEntityTypeByLabel: observableOf(new RemoteData( - false, - false, - true, - null, - entityType, - )), - getEntityTypeRelationships: observableOf(new RemoteData( - false, - false, - true, - null, - new PaginatedList(new PageInfo(), [relationshipType]), - )), + getRelatedItemsByLabel: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), [author1, author2]))), + getItemRelationshipsByLabel: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), relationships))), + isLeftItem: observableOf(true), } ); + selectableListService = {}; + + linkService = { + resolveLink: () => null, + resolveLinks: () => null, + }; + TestBed.configureTestingModule({ imports: [SharedModule, TranslateModule.forRoot()], declarations: [EditRelationshipListComponent], providers: [ { provide: ObjectUpdatesService, useValue: objectUpdatesService }, - { provide: RelationshipTypeService, useValue: {} }, - { provide: LinkService, useValue: getMockLinkService() }, + { provide: RelationshipService, useValue: relationshipService }, + { provide: SelectableListService, useValue: selectableListService }, + { provide: LinkService, useValue: linkService }, ], schemas: [ NO_ERRORS_SCHEMA ] }).compileComponents(); + })); + beforeEach(() => { fixture = TestBed.createComponent(EditRelationshipListComponent); comp = fixture.componentInstance; de = fixture.debugElement; - comp.item = item; comp.itemType = entityType; comp.url = url; comp.relationshipType = relationshipType; - fixture.detectChanges(); }); describe('changeType is REMOVE', () => { - it('the div should have class alert-danger', () => { - + beforeEach(() => { fieldUpdate1.changeType = FieldChangeType.REMOVE; + fixture.detectChanges(); + }); + it('the div should have class alert-danger', () => { const element = de.queryAll(By.css('.relationship-row'))[1].nativeElement; expect(element.classList).toContain('alert-danger'); }); diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts index c17762e4a0..59b4730018 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts +++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts @@ -1,11 +1,23 @@ import { Component, Input, OnInit } from '@angular/core'; +import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { LinkService } from '../../../../core/cache/builders/link.service'; +import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions'; import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service'; import { Observable } from 'rxjs/internal/Observable'; -import {FieldUpdate, FieldUpdates} from '../../../../core/data/object-updates/object-updates.reducer'; +import { + FieldUpdate, + FieldUpdates, + RelationshipIdentifiable +} from '../../../../core/data/object-updates/object-updates.reducer'; +import { RelationshipService } from '../../../../core/data/relationship.service'; import {Item} from '../../../../core/shared/item.model'; -import { map, switchMap, tap } from 'rxjs/operators'; -import {hasValue} from '../../../../shared/empty.util'; +import { + defaultIfEmpty, filter, flatMap, + map, startWith, + switchMap, + take, tap, +} from 'rxjs/operators'; +import { hasValue, isNotEmptyOperator } from '../../../../shared/empty.util'; import {Relationship} from '../../../../core/shared/item-relationships/relationship.model'; import {RelationshipType} from '../../../../core/shared/item-relationships/relationship-type.model'; import { @@ -13,8 +25,13 @@ import { getRemoteDataPayload, getSucceededRemoteData } from '../../../../core/shared/operators'; -import { combineLatest as observableCombineLatest } from 'rxjs'; +import { combineLatest as observableCombineLatest, of } from 'rxjs'; import { ItemType } from '../../../../core/shared/item-relationships/item-type.model'; +import { DsDynamicLookupRelationModalComponent } from '../../../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component'; +import { RelationshipOptions } from '../../../../shared/form/builder/models/relationship-options.model'; +import { ItemSearchResult } from '../../../../shared/object-collection/shared/item-search-result.model'; +import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service'; +import { SearchResult } from '../../../../shared/search/search-result.model'; import { followLink } from '../../../../shared/utils/follow-link-config.model'; @Component({ @@ -46,14 +63,29 @@ export class EditRelationshipListComponent implements OnInit { */ @Input() relationshipType: RelationshipType; + private relatedEntityType$: Observable; + + /** + * The list ID to save selected entities under + */ + listId: string; + /** * The FieldUpdates for the relationships in question */ updates$: Observable; + /** + * A reference to the lookup window + */ + modalRef: NgbModalRef; + constructor( protected objectUpdatesService: ObjectUpdatesService, - protected linkService: LinkService + protected linkService: LinkService, + protected relationshipService: RelationshipService, + protected modalService: NgbModal, + protected selectableListService: SelectableListService, ) { } @@ -77,7 +109,6 @@ export class EditRelationshipListComponent implements OnInit { * Get the relevant label for this relationship type */ private getLabel(): Observable { - return observableCombineLatest([ this.relationshipType.leftType, this.relationshipType.rightType, @@ -99,19 +130,189 @@ export class EditRelationshipListComponent implements OnInit { return update && update.field ? update.field.uuid : undefined; } + /** + * Open the dynamic lookup modal to search for items to add as relationships + */ + openLookup() { + + this.modalRef = this.modalService.open(DsDynamicLookupRelationModalComponent, { + size: 'lg' + }); + const modalComp: DsDynamicLookupRelationModalComponent = this.modalRef.componentInstance; + modalComp.repeatable = true; + modalComp.listId = this.listId; + modalComp.item = this.item; + modalComp.select = (...selectableObjects: Array>) => { + selectableObjects.forEach((searchResult) => { + const relatedItem: Item = searchResult.indexableObject; + this.getFieldUpdatesForRelatedItem(relatedItem) + .subscribe((identifiables) => { + identifiables.forEach((identifiable) => + this.objectUpdatesService.removeSingleFieldUpdate(this.url, identifiable.uuid) + ); + if (identifiables.length === 0) { + this.relationshipService.getNameVariant(this.listId, relatedItem.uuid) + .subscribe((nameVariant) => { + const update = { + uuid: this.relationshipType.id + '-' + relatedItem.uuid, + nameVariant, + type: this.relationshipType, + relatedItem, + } as RelationshipIdentifiable; + this.objectUpdatesService.saveAddFieldUpdate(this.url, update); + }) + } + }); + }) + }; + modalComp.deselect = (...selectableObjects: Array>) => { + selectableObjects.forEach((searchResult) => { + const relatedItem: Item = searchResult.indexableObject; + this.objectUpdatesService.removeSingleFieldUpdate(this.url, this.relationshipType.id + '-' + relatedItem.uuid); + this.getFieldUpdatesForRelatedItem(relatedItem) + .subscribe((identifiables) => + identifiables.forEach((identifiable) => + this.objectUpdatesService.saveRemoveFieldUpdate(this.url, identifiable) + ) + ); + }) + }; + this.relatedEntityType$ + .pipe(take(1)) + .subscribe((relatedEntityType) => { + modalComp.relationshipOptions = Object.assign( + new RelationshipOptions(), { + relationshipType: relatedEntityType.label, + // filter: this.getRelationshipMessageKey(), + searchConfiguration: relatedEntityType.label.toLowerCase(), + nameVariants: true, + } + ); + }); + + this.selectableListService.deselectAll(this.listId); + this.updates$.pipe( + switchMap((updates) => observableCombineLatest( + Object.values(updates) + .filter((update) => update.changeType !== FieldChangeType.REMOVE) + .map((update) => { + const field = update.field as RelationshipIdentifiable; + if (field.relationship) { + return this.getRelatedItem(field.relationship); + } else { + return of(field.relatedItem); + } + }) + )), + take(1), + map((items) => items.map((item) => { + const searchResult = new ItemSearchResult(); + searchResult.indexableObject = item; + searchResult.hitHighlights = {}; + return searchResult; + })), + ).subscribe((items) => { + this.selectableListService.select(this.listId, items); + }); + } + + /** + * Get the existing field updates regarding a relationship with a given item + * @param relatedItem The item for which to get the existing field updates + */ + private getFieldUpdatesForRelatedItem(relatedItem: Item): Observable { + + return this.updates$.pipe( + take(1), + map((updates) => Object.values(updates) + .map((update) => update.field as RelationshipIdentifiable) + .filter((field) => field.relationship) + ), + flatMap((identifiables) => + observableCombineLatest( + identifiables.map((identifiable) => this.getRelatedItem(identifiable.relationship)) + ).pipe( + defaultIfEmpty([]), + map((relatedItems) => + identifiables.filter((identifiable, index) => relatedItems[index].uuid === relatedItem.uuid) + ), + ) + ), + ); + } + + /** + * Get the related item for a given relationship + * @param relationship The relationship for which to get the related item + */ + private getRelatedItem(relationship: Relationship): Observable { + return this.relationshipService.isLeftItem(relationship, this.item).pipe( + switchMap((isLeftItem) => isLeftItem ? relationship.rightItem : relationship.leftItem), + getSucceededRemoteData(), + getRemoteDataPayload(), + ) + } + ngOnInit(): void { - this.updates$ = this.item.relationships.pipe( + this.listId = 'edit-relationship-' + this.itemType.id; + + this.relatedEntityType$ = + observableCombineLatest([ + this.relationshipType.leftType, + this.relationshipType.rightType, + ].map((type) => type.pipe( + getSucceededRemoteData(), + getRemoteDataPayload(), + ))).pipe( + map((relatedTypes) => relatedTypes.find((relatedType) => relatedType.uuid !== this.itemType.uuid)), + ); + + this.updates$ = this.getItemRelationships().pipe( + switchMap((relationships) => + observableCombineLatest( + relationships.map((relationship) => this.relationshipService.isLeftItem(relationship, this.item)) + ).pipe( + defaultIfEmpty([]), + map((isLeftItemArray) => isLeftItemArray.map((isLeftItem, index) => { + const relationship = relationships[index]; + const nameVariant = isLeftItem ? relationship.rightwardValue : relationship.leftwardValue; + return { + uuid: relationship.id, + type: this.relationshipType, + relationship, + nameVariant, + } as RelationshipIdentifiable + })), + )), + switchMap((initialFields) => this.objectUpdatesService.getFieldUpdates(this.url, initialFields).pipe( + map((fieldUpdates) => { + const fieldUpdatesFiltered: FieldUpdates = {}; + Object.keys(fieldUpdates).forEach((uuid) => { + const field = fieldUpdates[uuid].field; + if ((field as RelationshipIdentifiable).type.id === this.relationshipType.id) { + fieldUpdatesFiltered[uuid] = fieldUpdates[uuid]; + } + }); + return fieldUpdatesFiltered; + }), + )), + ); + } + + private getItemRelationships() { + this.linkService.resolveLink(this.item, followLink('relationships')); + return this.item.relationships.pipe( getAllSucceededRemoteData(), map((relationships) => relationships.payload.page.filter((relationship) => relationship)), - map((relationships: Relationship[]) => - relationships.map((relationship: Relationship) => { + filter((relationships) => relationships.every((relationship) => !!relationship)), + tap((relationships: Relationship[]) => + relationships.forEach((relationship: Relationship) => { this.linkService.resolveLinks( relationship, followLink('relationshipType'), followLink('leftItem'), followLink('rightItem'), ); - return relationship; }) ), switchMap((itemRelationships: Relationship[]) => @@ -122,15 +323,12 @@ export class EditRelationshipListComponent implements OnInit { getRemoteDataPayload(), )) ).pipe( + defaultIfEmpty([]), map((relationshipTypes) => itemRelationships.filter( (relationship, index) => relationshipTypes[index].id === this.relationshipType.id) ), - map((relationships) => relationships.map((relationship) => - Object.assign(new Relationship(), relationship, {uuid: relationship.id}) - )), ) ), - switchMap((initialFields) => this.objectUpdatesService.getFieldUpdates(this.url, initialFields)), ); } } diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html index 7e61e8958f..e65cd237a3 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html +++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html @@ -1,6 +1,11 @@
- + +
diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts index 9eca3f270d..6e81319f28 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts +++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts @@ -1,5 +1,5 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { async, TestBed } from '@angular/core/testing'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs/internal/observable/of'; import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions'; @@ -25,7 +25,7 @@ let fieldUpdate2; let relationships; let relationshipType; -let fixture; +let fixture: ComponentFixture; let comp: EditRelationshipComponent; let de; let el; @@ -91,11 +91,17 @@ describe('EditRelationshipComponent', () => { }); fieldUpdate1 = { - field: relationships[0], + field: { + uuid: relationships[0].uuid, + relationship: relationships[0], + }, changeType: undefined }; fieldUpdate2 = { - field: relationships[1], + field: { + uuid: relationships[1].uuid, + relationship: relationships[1], + }, changeType: FieldChangeType.REMOVE }; diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts index 2badaf80b0..265bca7529 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts +++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts @@ -1,10 +1,13 @@ import { Component, Input, OnChanges, OnInit } from '@angular/core'; -import { combineLatest as observableCombineLatest, Observable } from 'rxjs'; +import { combineLatest as observableCombineLatest, Observable, of } from 'rxjs'; import { filter, map, switchMap, take, tap } from 'rxjs/operators'; import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions'; -import { DeleteRelationship, FieldUpdate } from '../../../../core/data/object-updates/object-updates.reducer'; +import { + DeleteRelationship, + FieldUpdate, + RelationshipIdentifiable +} from '../../../../core/data/object-updates/object-updates.reducer'; import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service'; -import { Relationship } from '../../../../core/shared/item-relationships/relationship.model'; import { Item } from '../../../../core/shared/item.model'; import { getRemoteDataPayload, getSucceededRemoteData } from '../../../../core/shared/operators'; import { ViewMode } from '../../../../core/shared/view-mode.model'; @@ -36,8 +39,16 @@ export class EditRelationshipComponent implements OnChanges { /** * The relationship being edited */ - get relationship(): Relationship { - return this.fieldUpdate.field as Relationship; + get relationship() { + return this.update.relationship; + } + + get update() { + return this.fieldUpdate.field as RelationshipIdentifiable; + } + + get nameVariant() { + return this.update.nameVariant; } public leftItem$: Observable; @@ -68,24 +79,28 @@ export class EditRelationshipComponent implements OnChanges { * Sets the current relationship based on the fieldUpdate input field */ ngOnChanges(): void { - this.leftItem$ = this.relationship.leftItem.pipe( - getSucceededRemoteData(), - getRemoteDataPayload(), - filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid)) - ); - this.rightItem$ = this.relationship.rightItem.pipe( - getSucceededRemoteData(), - getRemoteDataPayload(), - filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid)) - ); - this.relatedItem$ = observableCombineLatest( - this.leftItem$, - this.rightItem$, - ).pipe( - map((items: Item[]) => - items.find((item) => item.uuid !== this.editItem.uuid) - ) - ); + if (this.relationship) { + this.leftItem$ = this.relationship.leftItem.pipe( + getSucceededRemoteData(), + getRemoteDataPayload(), + filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid)) + ); + this.rightItem$ = this.relationship.rightItem.pipe( + getSucceededRemoteData(), + getRemoteDataPayload(), + filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid)) + ); + this.relatedItem$ = observableCombineLatest( + this.leftItem$, + this.rightItem$, + ).pipe( + map((items: Item[]) => + items.find((item) => item.uuid !== this.editItem.uuid) + ) + ); + } else { + this.relatedItem$ = of(this.update.relatedItem); + } } /** @@ -136,7 +151,8 @@ export class EditRelationshipComponent implements OnChanges { * Check if a user should be allowed to remove this field */ canRemove(): boolean { - return this.fieldUpdate.changeType !== FieldChangeType.REMOVE; + return this.fieldUpdate.changeType !== FieldChangeType.REMOVE + && this.fieldUpdate.changeType !== FieldChangeType.ADD; } /** diff --git a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.html b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.html index 0c9d92dfbf..7692494fd8 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.html +++ b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.html @@ -19,14 +19,19 @@  {{"item.edit.metadata.save-button" | translate}}
-
- -
+ + +
+ +
+ + +
@@ -34,14 +34,15 @@
{{ process.processStatus }}
- - 
{{ (outputLogs$ | async)?.join('\n') }}
-

+ *ngIf="showOutputLogs && (outputLogs$ | async)?.length > 0">{{ (outputLogs$ | async) }} +

{{ 'process.detail.logs.none' | translate }}

diff --git a/src/app/process-page/detail/process-detail.component.spec.ts b/src/app/process-page/detail/process-detail.component.spec.ts index 8d4a3f0e62..b81eedabad 100644 --- a/src/app/process-page/detail/process-detail.component.spec.ts +++ b/src/app/process-page/detail/process-detail.component.spec.ts @@ -1,11 +1,22 @@ -import { ProcessOutputDataService } from '../../core/data/process-output-data.service'; -import { ProcessOutput } from '../processes/process-output.model'; +import { HttpClient } from '@angular/common/http'; +import { AuthService } from '../../core/auth/auth.service'; +import { BitstreamDataService } from '../../core/data/bitstream-data.service'; +import { AuthServiceMock } from '../../shared/mocks/auth.service.mock'; import { ProcessDetailComponent } from './process-detail.component'; -import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; +import { + async, + ComponentFixture, + discardPeriodicTasks, + fakeAsync, + flush, + flushMicrotasks, + TestBed, + tick +} from '@angular/core/testing'; import { VarDirective } from '../../shared/utils/var.directive'; import { TranslateModule } from '@ngx-translate/core'; import { RouterTestingModule } from '@angular/router/testing'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { ProcessDetailFieldComponent } from './process-detail-field/process-detail-field.component'; import { Process } from '../processes/process.model'; import { ActivatedRoute } from '@angular/router'; @@ -23,8 +34,9 @@ describe('ProcessDetailComponent', () => { let fixture: ComponentFixture; let processService: ProcessDataService; - let processOutputService: ProcessOutputDataService; let nameService: DSONameService; + let bitstreamDataService: BitstreamDataService; + let httpClient: HttpClient; let process: Process; let fileName: string; @@ -33,13 +45,11 @@ describe('ProcessDetailComponent', () => { let processOutput; function init() { - processOutput = Object.assign(new ProcessOutput(), { - logs: ['Process started', 'Process completed'] - } - ); + processOutput = 'Process Started' process = Object.assign(new Process(), { processId: 1, scriptName: 'script-name', + processStatus: 'COMPLETED', parameters: [ { name: '-f', @@ -76,15 +86,24 @@ describe('ProcessDetailComponent', () => { } }) ]; + const logBitstream = Object.assign(new Bitstream(), { + id: 'output.log', + _links: { + content: { href: 'log-selflink' } + } + }); processService = jasmine.createSpyObj('processService', { getFiles: createSuccessfulRemoteDataObject$(createPaginatedList(files)) }); - processOutputService = jasmine.createSpyObj('processOutputService', { - findByHref: createSuccessfulRemoteDataObject$(processOutput) + bitstreamDataService = jasmine.createSpyObj('bitstreamDataService', { + findByHref: createSuccessfulRemoteDataObject$(logBitstream) }); nameService = jasmine.createSpyObj('nameService', { getName: fileName }); + httpClient = jasmine.createSpyObj('httpClient', { + get: observableOf(processOutput) + }); } beforeEach(async(() => { @@ -98,10 +117,12 @@ describe('ProcessDetailComponent', () => { useValue: { data: observableOf({ process: createSuccessfulRemoteDataObject(process) }) } }, { provide: ProcessDataService, useValue: processService }, - { provide: ProcessOutputDataService, useValue: processOutputService }, - { provide: DSONameService, useValue: nameService } + { provide: BitstreamDataService, useValue: bitstreamDataService }, + { provide: DSONameService, useValue: nameService }, + { provide: AuthService, useValue: new AuthServiceMock() }, + { provide: HttpClient, useValue: httpClient }, ], - schemas: [NO_ERRORS_SCHEMA] + schemas: [CUSTOM_ELEMENTS_SCHEMA] }).compileComponents(); })); @@ -109,6 +130,14 @@ describe('ProcessDetailComponent', () => { fixture = TestBed.createComponent(ProcessDetailComponent); component = fixture.componentInstance; }); + afterEach(fakeAsync(() => { + TestBed.resetTestingModule(); + fixture.destroy(); + flush(); + flushMicrotasks(); + discardPeriodicTasks(); + component = null; + })); it('should display the script\'s name', () => { fixture.detectChanges(); @@ -134,6 +163,7 @@ describe('ProcessDetailComponent', () => { beforeEach(fakeAsync(() => { spyOn(component, 'showProcessOutputLogs').and.callThrough(); fixture.detectChanges(); + const showOutputButton = fixture.debugElement.query(By.css('#showOutputButton')); showOutputButton.triggerEventHandler('click', { preventDefault: () => {/**/ @@ -147,20 +177,16 @@ describe('ProcessDetailComponent', () => { it('should display the process\'s output logs', () => { fixture.detectChanges(); const outputProcess = fixture.debugElement.query(By.css('#process-output pre')); - expect(outputProcess.nativeElement.textContent).toContain('Process started'); + expect(outputProcess.nativeElement.textContent).toContain(processOutput); }); }); - describe('if press show output logs and process has no output logs (yet)', () => { + describe('if press show output logs and process has no output logs', () => { beforeEach(fakeAsync(() => { jasmine.getEnv().allowRespy(true); - const emptyProcessOutput = Object.assign(new ProcessOutput(), { - logs: [] - }); - spyOn(processOutputService, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(emptyProcessOutput)); + spyOn(httpClient, 'get').and.returnValue(observableOf(null)); fixture = TestBed.createComponent(ProcessDetailComponent); component = fixture.componentInstance; - fixture.detectChanges(); spyOn(component, 'showProcessOutputLogs').and.callThrough(); fixture.detectChanges(); const showOutputButton = fixture.debugElement.query(By.css('#showOutputButton')); diff --git a/src/app/process-page/detail/process-detail.component.ts b/src/app/process-page/detail/process-detail.component.ts index 13f9814923..c4b94aa729 100644 --- a/src/app/process-page/detail/process-detail.component.ts +++ b/src/app/process-page/detail/process-detail.component.ts @@ -1,19 +1,23 @@ +import { HttpClient } from '@angular/common/http'; import { Component, NgZone, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; import { Observable } from 'rxjs/internal/Observable'; -import { ProcessOutputDataService } from '../../core/data/process-output-data.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { ProcessOutput } from '../processes/process-output.model'; -import { Process } from '../processes/process.model'; -import { finalize, map, switchMap, take } from 'rxjs/operators'; -import { getFirstSucceededRemoteDataPayload, redirectOn404Or401 } from '../../core/shared/operators'; -import { AlertType } from '../../shared/alert/aletr-type'; -import { ProcessDataService } from '../../core/data/processes/process-data.service'; -import { PaginatedList } from '../../core/data/paginated-list'; -import { Bitstream } from '../../core/shared/bitstream.model'; +import { finalize, map, mergeMap, switchMap, take, tap } from 'rxjs/operators'; +import { AuthService } from '../../core/auth/auth.service'; import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; +import { BitstreamDataService } from '../../core/data/bitstream-data.service'; +import { PaginatedList } from '../../core/data/paginated-list'; +import { ProcessDataService } from '../../core/data/processes/process-data.service'; +import { RemoteData } from '../../core/data/remote-data'; +import { Bitstream } from '../../core/shared/bitstream.model'; +import { DSpaceObject } from '../../core/shared/dspace-object.model'; +import { getFirstSucceededRemoteDataPayload, redirectOn404Or401 } from '../../core/shared/operators'; +import { URLCombiner } from '../../core/url-combiner/url-combiner'; +import { AlertType } from '../../shared/alert/aletr-type'; +import { hasValue } from '../../shared/empty.util'; +import { ProcessStatus } from '../processes/process-status.model'; +import { Process } from '../processes/process.model'; @Component({ selector: 'ds-process-detail', @@ -40,26 +44,33 @@ export class ProcessDetailComponent implements OnInit { */ filesRD$: Observable>>; + /** + * File link that contain the output logs with auth token + */ + outputLogFileUrl$: Observable; + /** * The Process's Output logs */ - outputLogs$: Observable; + outputLogs$: Observable; /** * Boolean on whether or not to show the output logs */ - showOutputLogs = false; + showOutputLogs; /** * When it's retrieving the output logs from backend, to show loading component */ - retrievingOutputLogs$ = new BehaviorSubject(false); + retrievingOutputLogs$: BehaviorSubject; constructor(protected route: ActivatedRoute, protected router: Router, protected processService: ProcessDataService, - protected processOutputService: ProcessOutputDataService, + protected bitstreamDataService: BitstreamDataService, protected nameService: DSONameService, - private zone: NgZone) { + private zone: NgZone, + protected authService: AuthService, + protected http: HttpClient) { } /** @@ -67,8 +78,12 @@ export class ProcessDetailComponent implements OnInit { * Display a 404 if the process doesn't exist */ ngOnInit(): void { + this.showOutputLogs = false; + this.retrievingOutputLogs$ = new BehaviorSubject(false); this.processRD$ = this.route.data.pipe( - map((data) => data.process as RemoteData), + map((data) => { + return data.process as RemoteData + }), redirectOn404Or401(this.router) ); @@ -93,20 +108,58 @@ export class ProcessDetailComponent implements OnInit { showProcessOutputLogs() { this.retrievingOutputLogs$.next(true); this.zone.runOutsideAngular(() => { - const processOutputRD$: Observable> = this.processRD$.pipe( + const processOutputRD$: Observable> = this.processRD$.pipe( getFirstSucceededRemoteDataPayload(), - switchMap((process: Process) => this.processOutputService.findByHref(process._links.output.href)) + switchMap((process: Process) => { + return this.bitstreamDataService.findByHref(process._links.output.href); + }) ); - this.outputLogs$ = processOutputRD$.pipe( - getFirstSucceededRemoteDataPayload(), - map((processOutput: ProcessOutput) => { - this.showOutputLogs = true; - return processOutput.logs; + this.outputLogFileUrl$ = processOutputRD$.pipe( + tap((processOutputFileRD: RemoteData) => { + if (processOutputFileRD.statusCode === 204) { + this.zone.run(() => this.retrievingOutputLogs$.next(false)); + this.showOutputLogs = true; + } }), - finalize(() => this.zone.run(() => this.retrievingOutputLogs$.next(false))), + getFirstSucceededRemoteDataPayload(), + mergeMap((processOutput: Bitstream) => { + const url = processOutput._links.content.href; + return this.authService.getShortlivedToken().pipe(take(1), + map((token: string) => { + return hasValue(token) ? new URLCombiner(url, `?authentication-token=${token}`).toString() : url; + })); + }) ) }); + this.outputLogs$ = this.outputLogFileUrl$.pipe(take(1), + mergeMap((url: string) => { + return this.getTextFile(url); + }), + finalize(() => this.zone.run(() => this.retrievingOutputLogs$.next(false))), + ); this.outputLogs$.pipe(take(1)).subscribe(); } + getTextFile(filename: string): Observable { + // The Observable returned by get() is of type Observable + // because a text response was specified. + // There's no need to pass a type parameter to get(). + return this.http.get(filename, { responseType: 'text' }) + .pipe( + finalize(() => { + this.showOutputLogs = true; + }), + ); + } + + /** + * Whether or not the given process has Completed or Failed status + * @param process Process to check if completed or failed + */ + isProcessFinished(process: Process): boolean { + return (hasValue(process) && hasValue(process.processStatus) && + (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString() + || process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString())); + } + } diff --git a/src/app/process-page/processes/process-output.model.ts b/src/app/process-page/processes/process-output.model.ts deleted file mode 100644 index 4ae1731d26..0000000000 --- a/src/app/process-page/processes/process-output.model.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { PROCESS_OUTPUT_TYPE } from '../../core/shared/process-output.resource-type'; -import { CacheableObject } from '../../core/cache/object-cache.reducer'; -import { HALLink } from '../../core/shared/hal-link.model'; -import { autoserialize, deserialize } from 'cerialize'; -import { excludeFromEquals } from '../../core/utilities/equals.decorators'; -import { ResourceType } from '../../core/shared/resource-type'; -import { typedObject } from '../../core/cache/builders/build-decorators'; - -/** - * Object representing a process output object - */ -@typedObject -export class ProcessOutput implements CacheableObject { - static type = PROCESS_OUTPUT_TYPE; - - /** - * The object type - */ - @excludeFromEquals - @autoserialize - type: ResourceType; - - /** - * The output strings for this ProcessOutput - */ - @autoserialize - logs: string[]; - - /** - * The {@link HALLink}s for this ProcessOutput - */ - @deserialize - _links: { - self: HALLink, - }; -} diff --git a/src/app/process-page/processes/process.model.ts b/src/app/process-page/processes/process.model.ts index 891acb626d..74bb82b890 100644 --- a/src/app/process-page/processes/process.model.ts +++ b/src/app/process-page/processes/process.model.ts @@ -1,5 +1,5 @@ +import { Bitstream } from '../../core/shared/bitstream.model'; import { PROCESS_OUTPUT_TYPE } from '../../core/shared/process-output.resource-type'; -import { ProcessOutput } from './process-output.model'; import { ProcessStatus } from './process-status.model'; import { ProcessParameter } from './process-parameter.model'; import { CacheableObject } from '../../core/cache/object-cache.reducer'; @@ -93,5 +93,5 @@ export class Process implements CacheableObject { * Will be undefined unless the output {@link HALLink} has been resolved. */ @link(PROCESS_OUTPUT_TYPE) - output?: Observable>; + output?: Observable>; } diff --git a/src/app/shared/mocks/auth.service.mock.ts b/src/app/shared/mocks/auth.service.mock.ts index a168ffd8e5..0f3a7d13d1 100644 --- a/src/app/shared/mocks/auth.service.mock.ts +++ b/src/app/shared/mocks/auth.service.mock.ts @@ -1,4 +1,6 @@ /* tslint:disable:no-empty */ +import { Observable, of as observableOf } from 'rxjs'; + export class AuthServiceMock { public checksAuthenticationToken() { return @@ -6,4 +8,8 @@ export class AuthServiceMock { public buildAuthHeader() { return 'auth-header'; } + + public getShortlivedToken(): Observable { + return observableOf('token'); + } } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 930c59cee5..dc0d2ec2fb 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2270,7 +2270,7 @@ "process.detail.logs.loading": "Retrieving", - "process.detail.logs.none": "This process has no output yet", + "process.detail.logs.none": "This process has no output", "process.detail.output-files" : "Output Files", From 7b160cdbd3eb0fc83f9b29995639500417efab61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20P=C3=A9ter=20Sipos?= Date: Fri, 13 Nov 2020 14:12:27 +0100 Subject: [PATCH 58/78] #674 revert eror throw and ad set/get for grid communities and collections --- src/app/+search-page/search.component.ts | 2 +- .../core/cache/builders/link.service.spec.ts | 9 +++-- src/app/core/cache/builders/link.service.ts | 3 +- .../collection-grid-element.component.ts | 24 +++++++++++- .../community-grid-element.component.ts | 24 +++++++++++- .../grid-thumbnail.component.ts | 1 + ...on-search-result-grid-element.component.ts | 34 ++++++++++++++++- ...ty-search-result-grid-element.component.ts | 37 +++++++++++++++++-- 8 files changed, 118 insertions(+), 16 deletions(-) diff --git a/src/app/+search-page/search.component.ts b/src/app/+search-page/search.component.ts index 4e50a82827..999d703dd5 100644 --- a/src/app/+search-page/search.component.ts +++ b/src/app/+search-page/search.component.ts @@ -123,7 +123,7 @@ export class SearchComponent implements OnInit { this.searchLink = this.getSearchLink(); this.searchOptions$ = this.getSearchOptions(); this.sub = this.searchOptions$.pipe( - switchMap((options) => this.service.search(options, null, followLink('logo')).pipe(getSucceededRemoteData(), startWith(undefined)))) + switchMap((options) => this.service.search(options).pipe(getSucceededRemoteData(), startWith(undefined)))) .subscribe((results) => { this.resultsRD$.next(results); }); diff --git a/src/app/core/cache/builders/link.service.spec.ts b/src/app/core/cache/builders/link.service.spec.ts index 6b7c154137..95a7570207 100644 --- a/src/app/core/cache/builders/link.service.spec.ts +++ b/src/app/core/cache/builders/link.service.spec.ts @@ -139,10 +139,13 @@ describe('LinkService', () => { }); describe(`when the specified link doesn't exist on the model's class`, () => { - it('should return with the same model', () => { - expect( + beforeEach(() => { + spyOnFunction(decorators, 'getLinkDefinition').and.returnValue(undefined); + }); + it('should throw an error', () => { + expect(() => { service.resolveLink(testModel, followLink('predecessor', {}, true, followLink('successor'))) - ).toEqual(testModel); + }).toThrow(); }); }); diff --git a/src/app/core/cache/builders/link.service.ts b/src/app/core/cache/builders/link.service.ts index 35c2fbac9c..8d0def71fc 100644 --- a/src/app/core/cache/builders/link.service.ts +++ b/src/app/core/cache/builders/link.service.ts @@ -42,8 +42,7 @@ export class LinkService { const matchingLinkDef = getLinkDefinition(model.constructor, linkToFollow.name); if (hasNoValue(matchingLinkDef)) { - console.error(`followLink('${linkToFollow.name}') was used for a ${model.constructor.name}, but there is no property on ${model.constructor.name} models with an @link() for ${linkToFollow.name}`); - return model; + throw new Error(`followLink('${linkToFollow.name}') was used for a ${model.constructor.name}, but there is no property on ${model.constructor.name} models with an @link() for ${linkToFollow.name}`); } else { const provider = getDataServiceFor(matchingLinkDef.resourceType); diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts index 6f8bf5264e..4ffaafa0f3 100644 --- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts +++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts @@ -1,9 +1,12 @@ -import { Component, Inject } from '@angular/core'; +import { Component, Inject, Input } from '@angular/core'; import { Collection } from '../../../core/shared/collection.model'; import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; import { ViewMode } from '../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator'; +import { hasNoValue, hasValue } from '../../empty.util'; +import { followLink } from '../../utils/follow-link-config.model'; +import { LinkService } from '../../../core/cache/builders/link.service'; /** * Component representing a grid element for collection @@ -15,4 +18,21 @@ import { listableObjectComponent } from '../../object-collection/shared/listable }) @listableObjectComponent(Collection, ViewMode.GridElement) -export class CollectionGridElementComponent extends AbstractListableElementComponent {} +export class CollectionGridElementComponent extends AbstractListableElementComponent { + private _object: Collection; + + constructor( private linkService: LinkService){ + super(); + } + + @Input() set object(object: Collection) { + this._object = object; + if (hasValue(this._object) && hasNoValue(this._object.logo)) { + this.linkService.resolveLink(this._object, followLink('logo')) + } + } + + get object(): Collection { + return this._object; + } +} diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts index 05c84b683b..47ab77de5f 100644 --- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts +++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts @@ -1,9 +1,12 @@ -import { Component } from '@angular/core'; +import { Component, Input } from '@angular/core'; import { Community } from '../../../core/shared/community.model'; import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; import { ViewMode } from '../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator'; +import { followLink } from '../../utils/follow-link-config.model'; +import { LinkService } from '../../../core/cache/builders/link.service'; +import { hasNoValue, hasValue } from '../../empty.util'; /** * Component representing a grid element for a community @@ -15,4 +18,21 @@ import { listableObjectComponent } from '../../object-collection/shared/listable }) @listableObjectComponent(Community, ViewMode.GridElement) -export class CommunityGridElementComponent extends AbstractListableElementComponent {} +export class CommunityGridElementComponent extends AbstractListableElementComponent { + private _object: Community; + + constructor( private linkService: LinkService){ + super(); + } + + @Input() set object(object: Community) { + this._object = object; + if (hasValue(this._object) && hasNoValue(this._object.logo)) { + this.linkService.resolveLink(this._object, followLink('logo')) + } + } + + get object(): Community { + return this._object; + } +} diff --git a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts index 92d93686dc..8e6af1e1a7 100644 --- a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts +++ b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts @@ -53,6 +53,7 @@ export class GridThumbnailComponent implements OnInit, OnChanges { !hasValue(changes.thumbnail.previousValue) && hasValue(changes.thumbnail.currentValue) ) { + console.log('this.thumbnail', changes.thumbnail.currentValue); this.checkThumbnail(changes.thumbnail.currentValue); } } diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts index a834327736..cf5a93aa56 100644 --- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts +++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts @@ -1,10 +1,15 @@ -import { Component } from '@angular/core'; +import { Component, Input } from '@angular/core'; import { SearchResultGridElementComponent } from '../search-result-grid-element.component'; import { Collection } from '../../../../core/shared/collection.model'; import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model'; import { ViewMode } from '../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator'; +import { hasNoValue, hasValue } from '../../../empty.util'; +import { followLink } from '../../../utils/follow-link-config.model'; +import { LinkService } from '../../../../core/cache/builders/link.service'; +import { TruncatableService } from '../../../truncatable/truncatable.service'; +import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; @Component({ selector: 'ds-collection-search-result-grid-element', @@ -15,4 +20,29 @@ import { listableObjectComponent } from '../../../object-collection/shared/lista * Component representing a grid element for a collection search result */ @listableObjectComponent(CollectionSearchResult, ViewMode.GridElement) -export class CollectionSearchResultGridElementComponent extends SearchResultGridElementComponent {} +export class CollectionSearchResultGridElementComponent extends SearchResultGridElementComponent< CollectionSearchResult, Collection > { + private _dso: Collection; + + constructor( + private linkService: LinkService, + protected truncatableService: TruncatableService, + protected bitstreamDataService: BitstreamDataService + ) { + super(truncatableService, bitstreamDataService); + } + + @Input() set dso(dso: Collection) { + this._dso = dso; + console.log('aaasdasd') + if (hasValue(this._dso) && hasNoValue(this._dso.logo)) { + this.linkService.resolveLink( + this._dso, + followLink('logo') + ); + } + } + + get dso(): Collection { + return this._dso; + } +} diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts index e726c3e803..b622651e10 100644 --- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts +++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts @@ -1,18 +1,47 @@ -import { Component } from '@angular/core'; +import { Component, Input } from '@angular/core'; import { Community } from '../../../../core/shared/community.model'; import { SearchResultGridElementComponent } from '../search-result-grid-element.component'; import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model'; import { ViewMode } from '../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator'; +import { LinkService } from '../../../../core/cache/builders/link.service'; +import { TruncatableService } from '../../../truncatable/truncatable.service'; +import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; +import { hasNoValue, hasValue } from '../../../empty.util'; +import { followLink } from '../../../utils/follow-link-config.model'; @Component({ selector: 'ds-community-search-result-grid-element', - styleUrls: ['../search-result-grid-element.component.scss', 'community-search-result-grid-element.component.scss'], - templateUrl: 'community-search-result-grid-element.component.html' + styleUrls: [ + '../search-result-grid-element.component.scss', + 'community-search-result-grid-element.component.scss', + ], + templateUrl: 'community-search-result-grid-element.component.html', }) /** * Component representing a grid element for a community search result */ @listableObjectComponent(CommunitySearchResult, ViewMode.GridElement) -export class CommunitySearchResultGridElementComponent extends SearchResultGridElementComponent { +export class CommunitySearchResultGridElementComponent extends SearchResultGridElementComponent { + private _dso: Community; + + constructor( + private linkService: LinkService, + protected truncatableService: TruncatableService, + protected bitstreamDataService: BitstreamDataService + ) { + super(truncatableService, bitstreamDataService); + } + + @Input() set dso(dso: Community) { + this._dso = dso; + console.log('aaasdasd'); + if (hasValue(this._dso) && hasNoValue(this._dso.logo)) { + this.linkService.resolveLink(this._dso, followLink('logo')); + } + } + + get dso(): Community { + return this._dso; + } } From cb3131e31bfba9b8674f0079da6c2ef93c0226be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20P=C3=A9ter=20Sipos?= Date: Fri, 13 Nov 2020 14:29:03 +0100 Subject: [PATCH 59/78] #674 remove un used imports --- src/app/+search-page/search.component.ts | 1 - src/app/core/cache/builders/link.service.spec.ts | 1 - .../collection-grid-element.component.ts | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/app/+search-page/search.component.ts b/src/app/+search-page/search.component.ts index 999d703dd5..bbbfdba513 100644 --- a/src/app/+search-page/search.component.ts +++ b/src/app/+search-page/search.component.ts @@ -18,7 +18,6 @@ import { SearchService } from '../core/shared/search/search.service'; import { currentPath } from '../shared/utils/route.utils'; import { Router } from '@angular/router'; import { Context } from '../core/shared/context.model'; -import { followLink } from '../shared/utils/follow-link-config.model'; @Component({ selector: 'ds-search', diff --git a/src/app/core/cache/builders/link.service.spec.ts b/src/app/core/cache/builders/link.service.spec.ts index 95a7570207..871be7e9ae 100644 --- a/src/app/core/cache/builders/link.service.spec.ts +++ b/src/app/core/cache/builders/link.service.spec.ts @@ -6,7 +6,6 @@ import { HALLink } from '../../shared/hal-link.model'; import { HALResource } from '../../shared/hal-resource.model'; import { ResourceType } from '../../shared/resource-type'; import * as decorators from './build-decorators'; -import { getDataServiceFor } from './build-decorators'; import { LinkService } from './link.service'; const spyOnFunction = (obj: T, func: keyof T) => { diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts index 4ffaafa0f3..2e1688a0a9 100644 --- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts +++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts @@ -1,4 +1,4 @@ -import { Component, Inject, Input } from '@angular/core'; +import { Component, Input } from '@angular/core'; import { Collection } from '../../../core/shared/collection.model'; import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; From bb1d8634709a9d5967f9c8eca17a7ce3512aa055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20P=C3=A9ter=20Sipos?= Date: Fri, 13 Nov 2020 16:08:52 +0100 Subject: [PATCH 60/78] #674 fix tests --- ...min-search-result-grid-element.component.spec.ts | 7 +++++++ ...min-search-result-grid-element.component.spec.ts | 7 +++++++ .../collection-grid-element.component.spec.ts | 13 ++++++++++++- .../community-grid-element.component.spec.ts | 8 +++++++- ...ion-search-result-grid-element.component.spec.ts | 5 +++++ ...llection-search-result-grid-element.component.ts | 1 - ...ity-search-result-grid-element.component.spec.ts | 5 +++++ ...ommunity-search-result-grid-element.component.ts | 1 - 8 files changed, 43 insertions(+), 4 deletions(-) diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts index 34db71db77..8ca02fa8ad 100644 --- a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts +++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts @@ -13,6 +13,7 @@ import { Collection } from '../../../../../core/shared/collection.model'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; import { getCollectionEditRoute } from '../../../../../+collection-page/collection-page-routing-paths'; +import { LinkService } from '../../../../../core/cache/builders/link.service'; describe('CollectionAdminSearchResultGridElementComponent', () => { let component: CollectionAdminSearchResultGridElementComponent; @@ -26,6 +27,11 @@ describe('CollectionAdminSearchResultGridElementComponent', () => { searchResult.indexableObject = new Collection(); searchResult.indexableObject.uuid = id; } + + const linkService = jasmine.createSpyObj('linkService', { + resolveLink: {} + }); + beforeEach(async(() => { init(); TestBed.configureTestingModule({ @@ -39,6 +45,7 @@ describe('CollectionAdminSearchResultGridElementComponent', () => { providers: [ { provide: TruncatableService, useValue: mockTruncatableService }, { provide: BitstreamDataService, useValue: {} }, + { provide: LinkService, useValue: linkService} ] }) .compileComponents(); diff --git a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts index 85c81d55a4..f6a4d02c13 100644 --- a/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts +++ b/src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts @@ -16,6 +16,7 @@ import { CommunitySearchResult } from '../../../../../shared/object-collection/s import { Community } from '../../../../../core/shared/community.model'; import { CommunityAdminSearchResultListElementComponent } from '../../admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component'; import { getCommunityEditRoute } from '../../../../../+community-page/community-page-routing-paths'; +import { LinkService } from '../../../../../core/cache/builders/link.service'; describe('CommunityAdminSearchResultGridElementComponent', () => { let component: CommunityAdminSearchResultGridElementComponent; @@ -29,6 +30,11 @@ describe('CommunityAdminSearchResultGridElementComponent', () => { searchResult.indexableObject = new Community(); searchResult.indexableObject.uuid = id; } + + const linkService = jasmine.createSpyObj('linkService', { + resolveLink: {} + }); + beforeEach(async(() => { init(); TestBed.configureTestingModule({ @@ -42,6 +48,7 @@ describe('CommunityAdminSearchResultGridElementComponent', () => { providers: [ { provide: TruncatableService, useValue: mockTruncatableService }, { provide: BitstreamDataService, useValue: {} }, + { provide: LinkService, useValue: linkService} ], schemas: [NO_ERRORS_SCHEMA] }) diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts index 66807c6b20..9101561a51 100644 --- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts +++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts @@ -3,10 +3,16 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core'; import { By } from '@angular/platform-browser'; import { Collection } from '../../../core/shared/collection.model'; +import { of } from 'rxjs'; +import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; +import { Bitstream } from '../../../core/shared/bitstream.model'; +import { LinkService } from '../../../core/cache/builders/link.service'; let collectionGridElementComponent: CollectionGridElementComponent; let fixture: ComponentFixture; + + const mockCollectionWithAbstract: Collection = Object.assign(new Collection(), { metadata: { 'dc.description.abstract': [ @@ -29,12 +35,17 @@ const mockCollectionWithoutAbstract: Collection = Object.assign(new Collection() } }); +const linkService = jasmine.createSpyObj('linkService', { + resolveLink: mockCollectionWithAbstract +}); + describe('CollectionGridElementComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ declarations: [ CollectionGridElementComponent ], providers: [ - { provide: 'objectElementProvider', useValue: (mockCollectionWithAbstract)} + { provide: 'objectElementProvider', useValue: (mockCollectionWithAbstract)}, + { provide: LinkService, useValue: linkService} ], schemas: [ NO_ERRORS_SCHEMA ] diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts index bb6c81144a..dfcac7dc1f 100644 --- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts +++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts @@ -3,6 +3,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core'; import { By } from '@angular/platform-browser'; import { Community } from '../../../core/shared/community.model'; +import { LinkService } from '../../../core/cache/builders/link.service'; let communityGridElementComponent: CommunityGridElementComponent; let fixture: ComponentFixture; @@ -29,12 +30,17 @@ const mockCommunityWithoutAbstract: Community = Object.assign(new Community(), { } }); +const linkService = jasmine.createSpyObj('linkService', { + resolveLink: mockCommunityWithAbstract +}); + describe('CommunityGridElementComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ declarations: [ CommunityGridElementComponent ], providers: [ - { provide: 'objectElementProvider', useValue: (mockCommunityWithAbstract)} + { provide: 'objectElementProvider', useValue: (mockCommunityWithAbstract)}, + { provide: LinkService, useValue: linkService} ], schemas: [ NO_ERRORS_SCHEMA ] diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts index d065f9c7e4..d40b99316a 100644 --- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts +++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts @@ -19,6 +19,7 @@ import { TruncatableService } from '../../../truncatable/truncatable.service'; import { TruncatePipe } from '../../../utils/truncate.pipe'; import { CollectionSearchResultGridElementComponent } from './collection-search-result-grid-element.component'; import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service'; +import { LinkService } from '../../../../core/cache/builders/link.service'; let collectionSearchResultGridElementComponent: CollectionSearchResultGridElementComponent; let fixture: ComponentFixture; @@ -52,6 +53,9 @@ mockCollectionWithoutAbstract.indexableObject = Object.assign(new Collection(), ] } }); +const linkService = jasmine.createSpyObj('linkService', { + resolveLink: mockCollectionWithAbstract +}); describe('CollectionSearchResultGridElementComponent', () => { beforeEach(async(() => { @@ -72,6 +76,7 @@ describe('CollectionSearchResultGridElementComponent', () => { { provide: DSOChangeAnalyzer, useValue: {} }, { provide: DefaultChangeAnalyzer, useValue: {} }, { provide: BitstreamFormatDataService, useValue: {} }, + { provide: LinkService, useValue: linkService} ], schemas: [ NO_ERRORS_SCHEMA ] diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts index cf5a93aa56..e0182c3fb4 100644 --- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts +++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts @@ -33,7 +33,6 @@ export class CollectionSearchResultGridElementComponent extends SearchResultGrid @Input() set dso(dso: Collection) { this._dso = dso; - console.log('aaasdasd') if (hasValue(this._dso) && hasNoValue(this._dso.logo)) { this.linkService.resolveLink( this._dso, diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts index 0d59273111..7b3fe0a7dc 100644 --- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts +++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts @@ -19,6 +19,7 @@ import { TruncatableService } from '../../../truncatable/truncatable.service'; import { TruncatePipe } from '../../../utils/truncate.pipe'; import { CommunitySearchResultGridElementComponent } from './community-search-result-grid-element.component'; import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service'; +import { LinkService } from '../../../../core/cache/builders/link.service'; let communitySearchResultGridElementComponent: CommunitySearchResultGridElementComponent; let fixture: ComponentFixture; @@ -52,6 +53,9 @@ mockCommunityWithoutAbstract.indexableObject = Object.assign(new Community(), { ] } }); +const linkService = jasmine.createSpyObj('linkService', { + resolveLink: mockCommunityWithAbstract +}); describe('CommunitySearchResultGridElementComponent', () => { beforeEach(async(() => { @@ -72,6 +76,7 @@ describe('CommunitySearchResultGridElementComponent', () => { { provide: DSOChangeAnalyzer, useValue: {} }, { provide: DefaultChangeAnalyzer, useValue: {} }, { provide: BitstreamFormatDataService, useValue: {} }, + { provide: LinkService, useValue: linkService} ], schemas: [ NO_ERRORS_SCHEMA ] diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts index b622651e10..5c4deb1064 100644 --- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts +++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts @@ -35,7 +35,6 @@ export class CommunitySearchResultGridElementComponent extends SearchResultGridE @Input() set dso(dso: Community) { this._dso = dso; - console.log('aaasdasd'); if (hasValue(this._dso) && hasNoValue(this._dso.logo)) { this.linkService.resolveLink(this._dso, followLink('logo')); } From 5923a973363db8e4115fc6a9aad38e09bbc88cfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20P=C3=A9ter=20Sipos?= Date: Fri, 13 Nov 2020 16:51:23 +0100 Subject: [PATCH 61/78] #674 remove un used imports --- .../collection-grid-element.component.spec.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts index 9101561a51..5a3cb2c74b 100644 --- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts +++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts @@ -3,9 +3,6 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core'; import { By } from '@angular/platform-browser'; import { Collection } from '../../../core/shared/collection.model'; -import { of } from 'rxjs'; -import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; -import { Bitstream } from '../../../core/shared/bitstream.model'; import { LinkService } from '../../../core/cache/builders/link.service'; let collectionGridElementComponent: CollectionGridElementComponent; From c377a3e45ad61ed81a7e87b265283c9578106c87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20P=C3=A9ter=20Sipos?= Date: Fri, 13 Nov 2020 17:31:05 +0100 Subject: [PATCH 62/78] #674 fix --- .../collection-grid-element.component.spec.ts | 2 -- .../collection-grid-element.component.ts | 15 +++++++++------ .../community-grid-element.component.ts | 3 +-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts index 5a3cb2c74b..efd4d0645c 100644 --- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts +++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts @@ -8,8 +8,6 @@ import { LinkService } from '../../../core/cache/builders/link.service'; let collectionGridElementComponent: CollectionGridElementComponent; let fixture: ComponentFixture; - - const mockCollectionWithAbstract: Collection = Object.assign(new Collection(), { metadata: { 'dc.description.abstract': [ diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts index 2e1688a0a9..bbb729d0ca 100644 --- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts +++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts @@ -1,5 +1,4 @@ import { Component, Input } from '@angular/core'; - import { Collection } from '../../../core/shared/collection.model'; import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; import { ViewMode } from '../../../core/shared/view-mode.model'; @@ -14,21 +13,25 @@ import { LinkService } from '../../../core/cache/builders/link.service'; @Component({ selector: 'ds-collection-grid-element', styleUrls: ['./collection-grid-element.component.scss'], - templateUrl: './collection-grid-element.component.html' + templateUrl: './collection-grid-element.component.html', }) - @listableObjectComponent(Collection, ViewMode.GridElement) -export class CollectionGridElementComponent extends AbstractListableElementComponent { +export class CollectionGridElementComponent extends AbstractListableElementComponent< + Collection +> { private _object: Collection; - constructor( private linkService: LinkService){ + constructor(private linkService: LinkService) { super(); } @Input() set object(object: Collection) { this._object = object; if (hasValue(this._object) && hasNoValue(this._object.logo)) { - this.linkService.resolveLink(this._object, followLink('logo')) + this.linkService.resolveLink( + this._object, + followLink('logo') + ); } } diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts index 47ab77de5f..3bf6ffe104 100644 --- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts +++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts @@ -1,5 +1,4 @@ import { Component, Input } from '@angular/core'; - import { Community } from '../../../core/shared/community.model'; import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; import { ViewMode } from '../../../core/shared/view-mode.model'; @@ -21,7 +20,7 @@ import { hasNoValue, hasValue } from '../../empty.util'; export class CommunityGridElementComponent extends AbstractListableElementComponent { private _object: Community; - constructor( private linkService: LinkService){ + constructor( private linkService: LinkService) { super(); } From 82811ebafd0af55ddefb435449bd0c8cad62ecb7 Mon Sep 17 00:00:00 2001 From: Yana De Pauw Date: Mon, 16 Nov 2020 09:34:34 +0100 Subject: [PATCH 63/78] 74348: Add comments and update rate limit config --- src/environments/environment.common.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/environments/environment.common.ts b/src/environments/environment.common.ts index 7e3d7c6543..a7c8b2a5ff 100644 --- a/src/environments/environment.common.ts +++ b/src/environments/environment.common.ts @@ -13,9 +13,10 @@ export const environment: GlobalConfig = { port: 4000, // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript nameSpace: '/', + // The rateLimiter settings limit each IP to a "max" of 120 requests per "windowMs" (1 minute). rateLimiter: { - windowMs: 1 * 60 * 1000, - max: 100 + windowMs: 1 * 60 * 1000, // 1 minute + max: 120 // limit each IP to 120 requests per windowMs } }, // The REST API server settings. From 140f660cf46fd4153d5264f829abb3c80d7f00ad Mon Sep 17 00:00:00 2001 From: Marie Verdonck Date: Mon, 16 Nov 2020 17:57:59 +0100 Subject: [PATCH 64/78] 74345: Fix com/col tree issues (#899 & #908): https://github.com/DSpace/dspace-angular/issues/899 https://github.com/DSpace/dspace-angular/issues/908 --- .../community-list-datasource.ts | 23 ++++----- .../community-list-service.ts | 48 ++++++++++++------- .../community-list.component.html | 2 +- .../community-list.component.ts | 11 ++--- 4 files changed, 50 insertions(+), 34 deletions(-) diff --git a/src/app/community-list-page/community-list-datasource.ts b/src/app/community-list-page/community-list-datasource.ts index b77cbb5246..041785e9e8 100644 --- a/src/app/community-list-page/community-list-datasource.ts +++ b/src/app/community-list-page/community-list-datasource.ts @@ -1,9 +1,10 @@ -import { NgZone } from '@angular/core'; +import { Subscription } from 'rxjs/internal/Subscription'; import { FindListOptions } from '../core/data/request.models'; +import { hasValue } from '../shared/empty.util'; import { CommunityListService, FlatNode } from './community-list-service'; import { CollectionViewer, DataSource } from '@angular/cdk/typings/collections'; import { BehaviorSubject, Observable, } from 'rxjs'; -import { finalize, take, } from 'rxjs/operators'; +import { finalize } from 'rxjs/operators'; /** * DataSource object needed by a CDK Tree to render its nodes. @@ -15,9 +16,9 @@ export class CommunityListDatasource implements DataSource { private communityList$ = new BehaviorSubject([]); public loading$ = new BehaviorSubject(false); + private subLoadCommunities: Subscription; - constructor(private communityListService: CommunityListService, - private zone: NgZone) { + constructor(private communityListService: CommunityListService) { } connect(collectionViewer: CollectionViewer): Observable { @@ -26,13 +27,13 @@ export class CommunityListDatasource implements DataSource { loadCommunities(findOptions: FindListOptions, expandedNodes: FlatNode[]) { this.loading$.next(true); - this.zone.runOutsideAngular(() => { - this.communityListService.loadCommunities(findOptions, expandedNodes).pipe( - take(1), - finalize(() => this.zone.run(() => this.loading$.next(false))), - ).subscribe((flatNodes: FlatNode[]) => { - this.zone.run(() => this.communityList$.next(flatNodes)); - }); + if (hasValue(this.subLoadCommunities)) { + this.subLoadCommunities.unsubscribe(); + } + this.subLoadCommunities = this.communityListService.loadCommunities(findOptions, expandedNodes).pipe( + finalize(() => this.loading$.next(false)), + ).subscribe((flatNodes: FlatNode[]) => { + this.communityList$.next(flatNodes); }); } diff --git a/src/app/community-list-page/community-list-service.ts b/src/app/community-list-page/community-list-service.ts index 4699e6faaa..5905fd8639 100644 --- a/src/app/community-list-page/community-list-service.ts +++ b/src/app/community-list-page/community-list-service.ts @@ -2,13 +2,12 @@ import { Injectable } from '@angular/core'; import { createSelector, Store } from '@ngrx/store'; import { combineLatest as observableCombineLatest } from 'rxjs/internal/observable/combineLatest'; import { Observable, of as observableOf } from 'rxjs'; +import { map, switchMap } from 'rxjs/operators'; import { AppState } from '../app.reducer'; import { CommunityDataService } from '../core/data/community-data.service'; import { FindListOptions } from '../core/data/request.models'; -import { map, flatMap } from 'rxjs/operators'; import { Community } from '../core/shared/community.model'; import { Collection } from '../core/shared/collection.model'; -import { getSucceededRemoteData } from '../core/shared/operators'; import { PageInfo } from '../core/shared/page-info.model'; import { hasValue, isNotEmpty } from '../shared/empty.util'; import { RemoteData } from '../core/data/remote-data'; @@ -148,7 +147,7 @@ export class CommunityListService { return new PaginatedList(newPageInfo, newPage); }) ); - return topComs$.pipe(flatMap((topComs: PaginatedList) => this.transformListOfCommunities(topComs, 0, null, expandedNodes))); + return topComs$.pipe(switchMap((topComs: PaginatedList) => this.transformListOfCommunities(topComs, 0, null, expandedNodes))); }; /** @@ -228,9 +227,13 @@ export class CommunityListService { currentPage: i }) .pipe( - getSucceededRemoteData(), - flatMap((rd: RemoteData>) => - this.transformListOfCommunities(rd.payload, level + 1, communityFlatNode, expandedNodes)) + switchMap((rd: RemoteData>) => { + if (hasValue(rd) && hasValue(rd.payload)) { + return this.transformListOfCommunities(rd.payload, level + 1, communityFlatNode, expandedNodes); + } else { + return []; + } + }) ); subcoms = [...subcoms, nextSetOfSubcommunitiesPage]; @@ -246,14 +249,17 @@ export class CommunityListService { currentPage: i }) .pipe( - getSucceededRemoteData(), map((rd: RemoteData>) => { - let nodes = rd.payload.page - .map((collection: Collection) => toFlatNode(collection, observableOf(false), level + 1, false, communityFlatNode)); - if (currentCollectionPage < rd.payload.totalPages && currentCollectionPage === rd.payload.currentPage) { - nodes = [...nodes, showMoreFlatNode('collection', level + 1, communityFlatNode)]; + if (hasValue(rd) && hasValue(rd.payload)) { + let nodes = rd.payload.page + .map((collection: Collection) => toFlatNode(collection, observableOf(false), level + 1, false, communityFlatNode)); + if (currentCollectionPage < rd.payload.totalPages && currentCollectionPage === rd.payload.currentPage) { + nodes = [...nodes, showMoreFlatNode('collection', level + 1, communityFlatNode)]; + } + return nodes; + } else { + return []; } - return nodes; }), ); collections = [...collections, nextSetOfCollectionsPage]; @@ -275,14 +281,24 @@ export class CommunityListService { let hasColls$: Observable; hasSubcoms$ = this.communityDataService.findByParent(community.uuid, { elementsPerPage: 1 }) .pipe( - getSucceededRemoteData(), - map((results) => results.payload.totalElements > 0), + map((rd: RemoteData>) => { + if (hasValue(rd) && hasValue(rd.payload)) { + return rd.payload.totalElements > 0; + } else { + return false; + } + }), ); hasColls$ = this.collectionDataService.findByParent(community.uuid, { elementsPerPage: 1 }) .pipe( - getSucceededRemoteData(), - map((results) => results.payload.totalElements > 0), + map((rd: RemoteData>) => { + if (hasValue(rd) && hasValue(rd.payload)) { + return rd.payload.totalElements > 0; + } else { + return false; + } + }), ); let hasChildren$: Observable; diff --git a/src/app/community-list-page/community-list/community-list.component.html b/src/app/community-list-page/community-list/community-list.component.html index c179715bf1..07e06f3131 100644 --- a/src/app/community-list-page/community-list/community-list.component.html +++ b/src/app/community-list-page/community-list/community-list.component.html @@ -28,7 +28,7 @@ diff --git a/src/app/community-list-page/community-list/community-list.component.ts b/src/app/community-list-page/community-list/community-list.component.ts index be96ff1a0a..49065c5ec5 100644 --- a/src/app/community-list-page/community-list/community-list.component.ts +++ b/src/app/community-list-page/community-list/community-list.component.ts @@ -1,4 +1,4 @@ -import { Component, NgZone, OnDestroy, OnInit } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { take } from 'rxjs/operators'; import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model'; import { FindListOptions } from '../../core/data/request.models'; @@ -24,15 +24,14 @@ export class CommunityListComponent implements OnInit, OnDestroy { public loadingNode: FlatNode; treeControl = new FlatTreeControl( - (node) => node.level, (node) => true + (node: FlatNode) => node.level, (node: FlatNode) => true ); dataSource: CommunityListDatasource; paginationConfig: FindListOptions; - constructor(private communityListService: CommunityListService, - private zone: NgZone) { + constructor(private communityListService: CommunityListService) { this.paginationConfig = new FindListOptions(); this.paginationConfig.elementsPerPage = 2; this.paginationConfig.currentPage = 1; @@ -40,7 +39,7 @@ export class CommunityListComponent implements OnInit, OnDestroy { } ngOnInit() { - this.dataSource = new CommunityListDatasource(this.communityListService, this.zone); + this.dataSource = new CommunityListDatasource(this.communityListService); this.communityListService.getLoadingNodeFromStore().pipe(take(1)).subscribe((result) => { this.loadingNode = result; }); @@ -65,7 +64,7 @@ export class CommunityListComponent implements OnInit, OnDestroy { } /** - * Toggles the expanded variable of a node, adds it to the exapanded nodes list and reloads the tree so this node is expanded + * Toggles the expanded variable of a node, adds it to the expanded nodes list and reloads the tree so this node is expanded * @param node Node we want to expand */ toggleExpanded(node: FlatNode) { From c40f31279f820a80570cd82ef01ab53d065628b1 Mon Sep 17 00:00:00 2001 From: Corrado Lombardi Date: Tue, 17 Nov 2020 09:29:01 +0100 Subject: [PATCH 65/78] [CSTPER-66] moved refreshCache function to common ComColDataService, tests have been moved accordingly. Used HalEndpointService to discover communities search top endpoint --- src/app/core/data/comcol-data.service.spec.ts | 89 ++++++++++++++++++- src/app/core/data/comcol-data.service.ts | 21 +++++ .../create-comcol-page.component.spec.ts | 82 ++--------------- .../create-comcol-page.component.ts | 21 +---- .../delete-comcol-page.component.spec.ts | 79 ++-------------- .../delete-comcol-page.component.ts | 24 +---- 6 files changed, 125 insertions(+), 191 deletions(-) diff --git a/src/app/core/data/comcol-data.service.spec.ts b/src/app/core/data/comcol-data.service.spec.ts index 1ba19df18c..f48022e6f1 100644 --- a/src/app/core/data/comcol-data.service.spec.ts +++ b/src/app/core/data/comcol-data.service.spec.ts @@ -17,6 +17,7 @@ import { DSOChangeAnalyzer } from './dso-change-analyzer.service'; import { FindByIDRequest, FindListOptions } from './request.models'; import { RequestEntry } from './request.reducer'; import { RequestService } from './request.service'; +import {createNoContentRemoteDataObject$, createSuccessfulRemoteDataObject$} from '../../shared/remote-data.utils'; const LINK_NAME = 'test'; @@ -51,7 +52,9 @@ describe('ComColDataService', () => { let objectCache: ObjectCacheService; let halService: any = {}; - const rdbService = {} as RemoteDataBuildService; + const rdbService = { + buildSingle : () => null + } as any; const store = {} as Store; const notificationsService = {} as NotificationsService; const http = {} as HttpClient; @@ -178,6 +181,90 @@ describe('ComColDataService', () => { }); }); + describe('cache refresh', () => { + let communityWithoutParentHref; + let data; + + beforeEach(() => { + scheduler = getTestScheduler(); + halService = { + getEndpoint: (linkPath) => 'https://rest.api/core/' + linkPath + }; + service = initTestService(); + + }) + describe('cache refreshed top level community', () => { + beforeEach(() => { + spyOn(rdbService, 'buildSingle').and.returnValue(createNoContentRemoteDataObject$()); + data = { + dso: Object.assign(new Community(), { + metadata: [{ + key: 'dc.title', + value: 'top level community' + }] + }), + _links: { + parentCommunity: { + href: 'topLevel/parentCommunity' + } + } + }; + communityWithoutParentHref = { + dso: Object.assign(new Community(), { + metadata: [{ + key: 'dc.title', + value: 'top level community' + }] + }), + _links: {} + }; + }); + it('top level community cache refreshed', () => { + scheduler.schedule(() => (service as any).refreshCache(data)); + scheduler.flush(); + expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith('https://rest.api/core/communities/search/top'); + }); + it('top level community without parent link, cache not refreshed', () => { + scheduler.schedule(() => (service as any).refreshCache(communityWithoutParentHref)); + scheduler.flush(); + expect(requestService.removeByHrefSubstring).not.toHaveBeenCalled(); + }); + }); + + describe('cache refreshed child community', () => { + beforeEach(() => { + const parentCommunity = Object.assign(new Community(), { + uuid: 'a20da287-e174-466a-9926-f66as300d399', + id: 'a20da287-e174-466a-9926-f66as300d399', + metadata: [{ + key: 'dc.title', + value: 'parent community' + }], + _links: {} + }); + spyOn(rdbService, 'buildSingle').and.returnValue(createSuccessfulRemoteDataObject$(parentCommunity)); + data = { + dso: Object.assign(new Community(), { + metadata: [{ + key: 'dc.title', + value: 'child community' + }] + }), + _links: { + parentCommunity: { + href: 'child/parentCommunity' + } + } + }; + }); + it('child level community cache refreshed', () => { + scheduler.schedule(() => (service as any).refreshCache(data)); + scheduler.flush(); + expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith('a20da287-e174-466a-9926-f66as300d399'); + }); + }); + }); + }); }); diff --git a/src/app/core/data/comcol-data.service.ts b/src/app/core/data/comcol-data.service.ts index d83518a3b0..86731b9696 100644 --- a/src/app/core/data/comcol-data.service.ts +++ b/src/app/core/data/comcol-data.service.ts @@ -21,12 +21,14 @@ import { configureRequest, getRemoteDataPayload, getResponseFromEntry, + getSucceededOrNoContentResponse, getSucceededRemoteData } from '../shared/operators'; import { CacheableObject } from '../cache/object-cache.reducer'; import { RestResponse } from '../cache/response.models'; import { Bitstream } from '../shared/bitstream.model'; import { DSpaceObject } from '../shared/dspace-object.model'; +import {Collection} from '../shared/collection.model'; export abstract class ComColDataService extends DataService { protected abstract cds: CommunityDataService; @@ -119,4 +121,23 @@ export abstract class ComColDataService extends DataS ); } } + + public refreshCache(dso: T) { + const parentCommunityUrl = this.parentCommunityUrl(dso as any); + if (!hasValue(parentCommunityUrl)) { + return; + } + this.findByHref(parentCommunityUrl).pipe( + getSucceededOrNoContentResponse(), + take(1), + ).subscribe((rd: RemoteData) => { + const href = rd.hasSucceeded && !isEmpty(rd.payload.id) ? rd.payload.id : this.halService.getEndpoint('communities/search/top'); + this.requestService.removeByHrefSubstring(href) + }); + } + + private parentCommunityUrl(dso: Collection | Community) { + const parentCommunity = dso._links.parentCommunity; + return isNotEmpty(parentCommunity) ? parentCommunity.href : null; + } } diff --git a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts index a7496fbf7a..d7827957a1 100644 --- a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts +++ b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts @@ -79,7 +79,8 @@ describe('CreateComColPageComponent', () => { })), create: (com, uuid?) => createSuccessfulRemoteDataObject$(newCommunity), getLogoEndpoint: () => observableOf(logoEndpoint), - findByHref: () => null + findByHref: () => null, + refreshCache: () => {return} }; routeServiceStub = { @@ -150,21 +151,21 @@ describe('CreateComColPageComponent', () => { it('should navigate and refresh cache when successful', () => { spyOn(router, 'navigate'); - spyOn((comp as any), 'refreshCache') + spyOn((dsoDataService as any), 'refreshCache') scheduler.schedule(() => comp.onSubmit(data)); scheduler.flush(); expect(router.navigate).toHaveBeenCalled(); - expect((comp as any).refreshCache).toHaveBeenCalled(); + expect((dsoDataService as any).refreshCache).toHaveBeenCalled(); }); it('should neither navigate nor refresh cache on failure', () => { spyOn(router, 'navigate'); spyOn(dsoDataService, 'create').and.returnValue(createFailedRemoteDataObject$(newCommunity)); - spyOn((comp as any), 'refreshCache') + spyOn(dsoDataService, 'refreshCache') scheduler.schedule(() => comp.onSubmit(data)); scheduler.flush(); expect(router.navigate).not.toHaveBeenCalled(); - expect((comp as any).refreshCache).not.toHaveBeenCalled(); + expect((dsoDataService as any).refreshCache).not.toHaveBeenCalled(); }); }); @@ -212,76 +213,5 @@ describe('CreateComColPageComponent', () => { expect(data.uploader.uploadAll).toHaveBeenCalled(); }); }); - - describe('cache refresh', () => { - let communityWithoutParentHref; - - beforeEach(() => { - scheduler = getTestScheduler(); - - }) - describe('cache refreshed top level community', () => { - beforeEach(() => { - spyOn(dsoDataService, 'findByHref').and.returnValue(createNoContentRemoteDataObject$()); - data = { - dso: Object.assign(new Community(), { - metadata: [{ - key: 'dc.title', - value: 'top level community' - }] - }), - _links: { - parentCommunity: { - href: 'topLevel/parentCommunity' - } - } - }; - communityWithoutParentHref = { - dso: Object.assign(new Community(), { - metadata: [{ - key: 'dc.title', - value: 'top level community' - }] - }), - _links: {} - }; - }); - it('top level community cache refreshed', () => { - scheduler.schedule(() => (comp as any).refreshCache(data)); - scheduler.flush(); - expect(requestServiceStub.removeByHrefSubstring).toHaveBeenCalledWith('communities/search/top'); - }); - it('top level community without parent link, cache not refreshed', () => { - scheduler.schedule(() => (comp as any).refreshCache(communityWithoutParentHref)); - scheduler.flush(); - expect(requestServiceStub.removeByHrefSubstring).not.toHaveBeenCalled(); - }); - }); - - describe('cache refreshed child community', () => { - beforeEach(() => { - spyOn(dsoDataService, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(parentCommunity)); - data = { - dso: Object.assign(new Community(), { - metadata: [{ - key: 'dc.title', - value: 'child community' - }] - }), - _links: { - parentCommunity: { - href: 'child/parentCommunity' - } - } - }; - }); - it('child level community cache refreshed', () => { - scheduler.schedule(() => (comp as any).refreshCache(data)); - scheduler.flush(); - expect(requestServiceStub.removeByHrefSubstring).toHaveBeenCalledWith('a20da287-e174-466a-9926-f66as300d399'); - }); - }); - }); - }); }); diff --git a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts index 336998aab3..cb1f41dd23 100644 --- a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts +++ b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts @@ -101,7 +101,7 @@ export class CreateComColPageComponent implements } else { this.navigateToNewPage(); } - this.refreshCache(dsoRD); + this.dsoDataService.refreshCache(dsoRD); } this.notificationsService.success(null, this.translate.get(this.type.value + '.create.notifications.success')); }); @@ -115,23 +115,4 @@ export class CreateComColPageComponent implements this.router.navigate([this.frontendURL + this.newUUID]); } } - - private refreshCache(dso: TDomain) { - const parentCommunityUrl = this.parentCommunityUrl(dso as any); - if (!hasValue(parentCommunityUrl)) { - return; - } - this.dsoDataService.findByHref(parentCommunityUrl).pipe( - getSucceededOrNoContentResponse(), - take(1), - ).subscribe((rd: RemoteData) => { - const href = rd.hasSucceeded && !isEmpty(rd.payload.id) ? rd.payload.id : 'communities/search/top'; - this.requestService.removeByHrefSubstring(href) - }); - } - - private parentCommunityUrl(dso: Collection | Community) { - const parentCommunity = dso._links.parentCommunity; - return isNotEmpty(parentCommunity) ? parentCommunity.href : null; - } } diff --git a/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts b/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts index b5a3ccea5d..6669f4c395 100644 --- a/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts +++ b/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts @@ -16,6 +16,7 @@ import { NotificationsServiceStub } from '../../testing/notifications-service.st import {RequestService} from '../../../core/data/request.service'; import {getTestScheduler} from 'jasmine-marbles'; import {createNoContentRemoteDataObject$, createSuccessfulRemoteDataObject$} from '../../remote-data.utils'; +import {ComColDataService} from '../../../core/data/comcol-data.service'; describe('DeleteComColPageComponent', () => { let comp: DeleteComColPageComponent; @@ -67,7 +68,8 @@ describe('DeleteComColPageComponent', () => { 'dsoDataService', { delete: observableOf({ isSuccessful: true }), - findByHref: jasmine.createSpy('findByHref') + findByHref: jasmine.createSpy('findByHref'), + refreshCache: jasmine.createSpy('refreshCache') }); routerStub = { @@ -93,7 +95,7 @@ describe('DeleteComColPageComponent', () => { TestBed.configureTestingModule({ imports: [TranslateModule.forRoot(), SharedModule, CommonModule, RouterTestingModule], providers: [ - { provide: DataService, useValue: dsoDataService }, + { provide: ComColDataService, useValue: dsoDataService }, { provide: Router, useValue: routerStub }, { provide: ActivatedRoute, useValue: routeStub }, { provide: NotificationsService, useValue: new NotificationsServiceStub() }, @@ -153,23 +155,21 @@ describe('DeleteComColPageComponent', () => { it('should show an error notification on failure', () => { (dsoDataService.delete as any).and.returnValue(observableOf({ isSuccessful: false })); spyOn(router, 'navigate'); - spyOn((comp as any), 'refreshCache'); scheduler.schedule(() => comp.onConfirm(data2)); scheduler.flush(); fixture.detectChanges(); expect(notificationsService.error).toHaveBeenCalled(); - expect((comp as any).refreshCache).not.toHaveBeenCalled(); + expect(dsoDataService.refreshCache).not.toHaveBeenCalled(); expect(router.navigate).toHaveBeenCalled(); }); it('should show a success notification on success and navigate', () => { spyOn(router, 'navigate'); - spyOn((comp as any), 'refreshCache'); scheduler.schedule(() => comp.onConfirm(data1)); scheduler.flush(); fixture.detectChanges(); expect(notificationsService.success).toHaveBeenCalled(); - expect((comp as any).refreshCache).toHaveBeenCalled(); + expect(dsoDataService.refreshCache).toHaveBeenCalled(); expect(router.navigate).toHaveBeenCalled(); }); @@ -178,73 +178,6 @@ describe('DeleteComColPageComponent', () => { fixture.detectChanges(); expect(dsoDataService.delete).toHaveBeenCalledWith(data1.id); }); - - describe('cache refresh', () => { - let communityWithoutParentHref; - let deletedCommunity; - - describe('cache refreshed top level community', () => { - beforeEach(() => { - (dsoDataService.findByHref as any).and.returnValue(createNoContentRemoteDataObject$()); - deletedCommunity = { - dso: Object.assign(new Community(), { - metadata: [{ - key: 'dc.title', - value: 'top level community' - }] - }), - _links: { - parentCommunity: { - href: 'topLevel/parentCommunity' - } - } - }; - communityWithoutParentHref = { - dso: Object.assign(new Community(), { - metadata: [{ - key: 'dc.title', - value: 'top level community' - }] - }), - _links: {} - }; - }); - it('top level community cache refreshed', () => { - scheduler.schedule(() => (comp as any).refreshCache(deletedCommunity)); - scheduler.flush(); - expect(requestServiceStub.removeByHrefSubstring).toHaveBeenCalledWith('communities/search/top'); - }); - it('top level community without parent link, cache not refreshed', () => { - scheduler.schedule(() => (comp as any).refreshCache(communityWithoutParentHref)); - scheduler.flush(); - expect(requestServiceStub.removeByHrefSubstring).not.toHaveBeenCalled(); - }); - }); - - describe('cache refreshed child community', () => { - beforeEach(() => { - (dsoDataService.findByHref as any).and.returnValue(createSuccessfulRemoteDataObject$(parentCommunity)); - deletedCommunity = { - dso: Object.assign(new Community(), { - metadata: [{ - key: 'dc.title', - value: 'child community' - }] - }), - _links: { - parentCommunity: { - href: 'child/parentCommunity' - } - } - }; - }); - it('child level community cache refreshed', () => { - scheduler.schedule(() => (comp as any).refreshCache(deletedCommunity)); - scheduler.flush(); - expect(requestServiceStub.removeByHrefSubstring).toHaveBeenCalledWith('a20da287-e174-466a-9926-f66as300d399'); - }); - }); - }); }); describe('onCancel', () => { diff --git a/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts b/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts index 835d302de3..d71660b297 100644 --- a/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts +++ b/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts @@ -15,6 +15,7 @@ import { } from '../../../core/shared/operators'; import {Community} from '../../../core/shared/community.model'; import {Collection} from '../../../core/shared/collection.model'; +import {ComColDataService} from '../../../core/data/comcol-data.service'; /** * Component representing the delete page for communities and collections @@ -34,7 +35,7 @@ export class DeleteComColPageComponent implements public dsoRD$: Observable>; public constructor( - protected dsoDataService: DataService, + protected dsoDataService: ComColDataService, protected router: Router, protected route: ActivatedRoute, protected notifications: NotificationsService, @@ -58,7 +59,7 @@ export class DeleteComColPageComponent implements if (response.isSuccessful) { const successMessage = this.translate.instant((dso as any).type + '.delete.notification.success'); this.notifications.success(successMessage) - this.refreshCache(dso); + this.dsoDataService.refreshCache(dso); } else { const errorMessage = this.translate.instant((dso as any).type + '.delete.notification.fail'); this.notifications.error(errorMessage) @@ -74,23 +75,4 @@ export class DeleteComColPageComponent implements onCancel(dso: TDomain) { this.router.navigate([this.frontendURL + '/' + dso.uuid + '/edit']); } - - private refreshCache(dso: TDomain) { - const parentCommunityUrl = this.parentCommunityUrl(dso as any); - if (!hasValue(parentCommunityUrl)) { - return; - } - this.dsoDataService.findByHref(parentCommunityUrl).pipe( - getSucceededOrNoContentResponse(), - take(1), - ).subscribe((rd: RemoteData) => { - const href = rd.hasSucceeded && !isEmpty(rd.payload.id) ? rd.payload.id : 'communities/search/top'; - this.requestService.removeByHrefSubstring(href) - }); - } - - private parentCommunityUrl(dso: Collection | Community): string { - const parentCommunity = dso._links.parentCommunity; - return isNotEmpty(parentCommunity) ? parentCommunity.href : null; - } } From 55b6486cda74466842fa1f78ff42c4f334012d58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20P=C3=A9ter=20Sipos?= Date: Tue, 17 Nov 2020 14:09:03 +0100 Subject: [PATCH 66/78] #674 fix --- .../collection-grid-element.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts index bbb729d0ca..4d7e91b0c9 100644 --- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts +++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts @@ -1,4 +1,4 @@ -import { Component, Input } from '@angular/core'; +import { Input, Component } from '@angular/core'; import { Collection } from '../../../core/shared/collection.model'; import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; import { ViewMode } from '../../../core/shared/view-mode.model'; From 0a0decfc33b0717599b33b24c88be5945df64eb9 Mon Sep 17 00:00:00 2001 From: Yana De Pauw Date: Tue, 17 Nov 2020 14:21:14 +0100 Subject: [PATCH 67/78] 74609: Fix TypeError on search pages --- .../edit-in-place-field.component.html | 4 +- .../edit-in-place-field.component.spec.ts | 4 +- .../filter-input-suggestions.component.html | 12 ++- ...filter-input-suggestions.component.spec.ts | 12 +-- .../filter-input-suggestions.component.ts | 47 +--------- .../validation-suggestions.component.html | 24 ++++++ .../validation-suggestions.component.spec.ts | 63 ++++++++++++++ .../validation-suggestions.component.ts | 85 +++++++++++++++++++ src/app/shared/shared.module.ts | 2 + 9 files changed, 189 insertions(+), 64 deletions(-) create mode 100644 src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html create mode 100644 src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts create mode 100644 src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts diff --git a/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html b/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html index 8f0776e4d3..cf226f7733 100644 --- a/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html +++ b/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html @@ -4,7 +4,7 @@ {{metadata?.key?.split('.').join('.​')}}
- + >
{{"item.edit.metadata.metadatafield.invalid" | translate}} diff --git a/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts b/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts index 60419f41b2..4ecdb21e24 100644 --- a/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts +++ b/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts @@ -20,9 +20,9 @@ import { } from '../../../../shared/remote-data.utils'; import { followLink } from '../../../../shared/utils/follow-link-config.model'; import { EditInPlaceFieldComponent } from './edit-in-place-field.component'; -import { FilterInputSuggestionsComponent } from '../../../../shared/input-suggestions/filter-suggestions/filter-input-suggestions.component'; import { MockComponent, MockDirective } from 'ng-mocks'; import { DebounceDirective } from '../../../../shared/utils/debounce.directive'; +import { ValidationSuggestionsComponent } from '../../../../shared/input-suggestions/validation-suggestions/validation-suggestions.component'; let comp: EditInPlaceFieldComponent; let fixture: ComponentFixture; @@ -88,7 +88,7 @@ describe('EditInPlaceFieldComponent', () => { declarations: [ EditInPlaceFieldComponent, MockDirective(DebounceDirective), - MockComponent(FilterInputSuggestionsComponent) + MockComponent(ValidationSuggestionsComponent) ], providers: [ { provide: RegistryService, useValue: metadataFieldService }, diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html index 91d8217ade..7a9481f2f1 100644 --- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html +++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html @@ -1,15 +1,14 @@ -
- + + [ngModelOptions]="{standalone: true}" autocomplete="off"/>
@@ -20,5 +19,4 @@
- - + \ No newline at end of file diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.spec.ts b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.spec.ts index cb36071c28..51664039f7 100644 --- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.spec.ts +++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.spec.ts @@ -3,11 +3,9 @@ import { ChangeDetectionStrategy, DebugElement, NO_ERRORS_SCHEMA } from '@angula import { TranslateModule } from '@ngx-translate/core'; import { By } from '@angular/platform-browser'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { FormsModule } from '@angular/forms'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; -import { MetadataFieldDataService } from '../../../core/data/metadata-field-data.service'; -import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; import { FilterInputSuggestionsComponent } from './filter-input-suggestions.component'; describe('FilterInputSuggestionsComponent', () => { @@ -23,13 +21,9 @@ describe('FilterInputSuggestionsComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NoopAnimationsModule, FormsModule, ReactiveFormsModule], + imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NoopAnimationsModule, FormsModule], declarations: [FilterInputSuggestionsComponent], - providers: [FormsModule, - ReactiveFormsModule, - { provide: MetadataFieldDataService, useValue: {} }, - { provide: ObjectUpdatesService, useValue: {} }, - ], + providers: [], schemas: [NO_ERRORS_SCHEMA] }).overrideComponent(FilterInputSuggestionsComponent, { set: { changeDetection: ChangeDetectionStrategy.Default } diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts index 49aa46b757..9e7d84d9ed 100644 --- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts +++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts @@ -1,8 +1,5 @@ -import { Component, forwardRef, Input, OnInit } from '@angular/core'; -import { FormControl, FormGroup, NG_VALUE_ACCESSOR, Validators } from '@angular/forms'; -import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; -import { MetadatumViewModel } from '../../../core/shared/metadata.models'; -import { MetadataFieldValidator } from '../../utils/metadatafield-validator.directive'; +import { Component, forwardRef, Input } from '@angular/core'; +import { NG_VALUE_ACCESSOR } from '@angular/forms'; import { InputSuggestionsComponent } from '../input-suggestions.component'; import { InputSuggestion } from '../input-suggestions.model'; @@ -24,39 +21,12 @@ import { InputSuggestion } from '../input-suggestions.model'; /** * Component representing a form with a autocomplete functionality */ -export class FilterInputSuggestionsComponent extends InputSuggestionsComponent implements OnInit { - - form: FormGroup; - - /** - * The current url of this page - */ - @Input() url: string; - - /** - * The metadatum of this field - */ - @Input() metadata: MetadatumViewModel; - +export class FilterInputSuggestionsComponent extends InputSuggestionsComponent { /** * The suggestions that should be shown */ @Input() suggestions: InputSuggestion[] = []; - constructor(private metadataFieldValidator: MetadataFieldValidator, - private objectUpdatesService: ObjectUpdatesService) { - super(); - } - - ngOnInit() { - this.form = new FormGroup({ - metadataNameField: new FormControl(this._value, { - asyncValidators: [this.metadataFieldValidator.validate.bind(this.metadataFieldValidator)], - validators: [Validators.required] - }) - }); - } - onSubmit(data) { this.value = data; this.submitSuggestion.emit(data); @@ -70,15 +40,4 @@ export class FilterInputSuggestionsComponent extends InputSuggestionsComponent i this.queryInput.nativeElement.focus(); return false; } - - /** - * Check if the input is valid according to validator and send (in)valid state to store - * @param form Form with input - */ - checkIfValidInput(form) { - this.valid = !(form.get('metadataNameField').status === 'INVALID' && (form.get('metadataNameField').dirty || form.get('metadataNameField').touched)); - this.objectUpdatesService.setValidFieldUpdate(this.url, this.metadata.uuid, this.valid); - return this.valid; - } - } diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html new file mode 100644 index 0000000000..91d8217ade --- /dev/null +++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html @@ -0,0 +1,24 @@ +
+ + +
+
+
+ + + +
+
+
+
+ diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts new file mode 100644 index 0000000000..82e838effc --- /dev/null +++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts @@ -0,0 +1,63 @@ +import { ChangeDetectionStrategy, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; + +import { TranslateModule } from '@ngx-translate/core'; +import { By } from '@angular/platform-browser'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { RouterTestingModule } from '@angular/router/testing'; +import { MetadataFieldDataService } from '../../../core/data/metadata-field-data.service'; +import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; +import { ValidationSuggestionsComponent } from './validation-suggestions.component'; + +describe('ValidationSuggestionsComponent', () => { + + let comp: ValidationSuggestionsComponent; + let fixture: ComponentFixture; + let de: DebugElement; + let el: HTMLElement; + const suggestions = [{ displayValue: 'suggestion uno', value: 'suggestion uno' }, { + displayValue: 'suggestion dos', + value: 'suggestion dos' + }, { displayValue: 'suggestion tres', value: 'suggestion tres' }]; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NoopAnimationsModule, FormsModule, ReactiveFormsModule], + declarations: [ValidationSuggestionsComponent], + providers: [FormsModule, + ReactiveFormsModule, + { provide: MetadataFieldDataService, useValue: {} }, + { provide: ObjectUpdatesService, useValue: {} }, + ], + schemas: [NO_ERRORS_SCHEMA] + }).overrideComponent(ValidationSuggestionsComponent, { + set: { changeDetection: ChangeDetectionStrategy.Default } + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ValidationSuggestionsComponent); + + comp = fixture.componentInstance; // LoadingComponent test instance + comp.suggestions = suggestions; + // query for the message