diff --git a/src/app/core/data/relationship-type.service.ts b/src/app/core/data/relationship-type.service.ts index 04ce49c3c4..a9daab1986 100644 --- a/src/app/core/data/relationship-type.service.ts +++ b/src/app/core/data/relationship-type.service.ts @@ -56,11 +56,10 @@ export class RelationshipTypeService { /* Flatten the page so we can treat it like an observable */ switchMap((typeListRD: RemoteData>) => typeListRD.payload.page), switchMap((type: RelationshipType) => { - if (type.leftLabel === label) return this.checkType(type, firstType, secondType); - else if (type.rightLabel === label) return this.checkType(type, secondType, firstType); + if (type.rightLabel === label) return this.checkType(type, firstType, secondType); + else if (type.leftLabel === label) return this.checkType(type, secondType, firstType); else return []; }), - tap((t) => console.log(t)) ); } diff --git a/src/app/core/dspace-rest-v2/mocks/mock-response-map.ts b/src/app/core/dspace-rest-v2/mocks/mock-response-map.ts index 573a724c5a..cea526b078 100644 --- a/src/app/core/dspace-rest-v2/mocks/mock-response-map.ts +++ b/src/app/core/dspace-rest-v2/mocks/mock-response-map.ts @@ -6,5 +6,5 @@ export class MockResponseMap extends Map {}; export const MOCK_RESPONSE_MAP: InjectionToken = new InjectionToken('mockResponseMap'); export const mockResponseMap: MockResponseMap = new Map([ - [ '/config/submissionforms/traditionalpageone', mockSubmissionResponse ] + // [ '/config/submissionforms/traditionalpageone', mockSubmissionResponse ] ]); diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts index b388889c15..5a39d4b827 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts @@ -4,7 +4,8 @@ import { ComponentFactoryResolver, ContentChildren, EventEmitter, - Input, NgZone, + Input, + NgZone, OnChanges, OnInit, Output, @@ -69,7 +70,7 @@ import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-a import { DsDynamicRelationGroupComponent } from './models/relation-group/dynamic-relation-group.components'; import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './models/relation-group/dynamic-relation-group.model'; import { DsDatePickerInlineComponent } from './models/date-picker-inline/dynamic-date-picker-inline.component'; -import { map, switchMap, take, tap } from 'rxjs/operators'; +import { map, switchMap, take } from 'rxjs/operators'; import { SelectableListState } from '../../../object-list/selectable-list/selectable-list.reducer'; import { Observable } from 'rxjs'; import { SearchResult } from '../../../search/search-result.model'; @@ -81,14 +82,7 @@ import { DsDynamicDisabledComponent } from './models/disabled/dynamic-disabled.c import { DYNAMIC_FORM_CONTROL_TYPE_DISABLED } from './models/disabled/dynamic-disabled.model'; import { DsDynamicLookupRelationModalComponent } from './relation-lookup-modal/dynamic-lookup-relation-modal.component'; import { ItemViewMode } from '../../../items/item-type-decorator'; -import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model'; -import { MetadatumRepresentation } from '../../../../core/shared/metadata-representation/metadatum/metadatum-representation.model'; -import { relationship } from '../../../../core/cache/builders/build-decorators'; import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model'; -import { RelationshipTypeService } from '../../../../core/data/relationship-type.service'; -import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model'; -import { RelationshipOptions } from '../models/relationship-options.model'; -import { DsDynamicInputModel } from './models/ds-dynamic-input.model'; import { getSucceededRemoteData } from '../../../../core/shared/operators'; import { RemoteData } from '../../../../core/data/remote-data'; import { Item } from '../../../../core/shared/item.model'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts index fc618023f9..4b76c0d504 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts @@ -2,6 +2,8 @@ import { DynamicFormControlLayout, DynamicFormGroupModel, DynamicFormGroupModelC import { isNotEmpty } from '../../../../empty.util'; import { DsDynamicInputModel } from './ds-dynamic-input.model'; import { FormFieldMetadataValueObject } from '../../models/form-field-metadata-value.model'; +import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model'; +import { RelationshipOptions } from '../../models/relationship-options.model'; export const CONCAT_GROUP_SUFFIX = '_CONCAT_GROUP'; export const CONCAT_FIRST_INPUT_SUFFIX = '_CONCAT_FIRST_INPUT'; @@ -9,12 +11,19 @@ export const CONCAT_SECOND_INPUT_SUFFIX = '_CONCAT_SECOND_INPUT'; export interface DynamicConcatModelConfig extends DynamicFormGroupModelConfig { separator: string; + value?: any; + workspaceItem: WorkspaceItem; + relationship?: RelationshipOptions; + repeatable: boolean; } export class DynamicConcatModel extends DynamicFormGroupModel { @serializable() separator: string; @serializable() hasLanguages = false; + @serializable() workspaceItem: WorkspaceItem; + @serializable() relationship?: RelationshipOptions; + @serializable() repeatable?: boolean; isCustomGroup = true; constructor(config: DynamicConcatModelConfig, layout?: DynamicFormControlLayout) { @@ -22,6 +31,9 @@ export class DynamicConcatModel extends DynamicFormGroupModel { super(config, layout); this.separator = config.separator + ' '; + this.relationship = config.relationship; + this.workspaceItem = config.workspaceItem; + this.repeatable = config.repeatable; } get value() { diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html index 02a93641b7..706e96a26d 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html @@ -5,77 +5,22 @@ -
-
- -
-
- -
- -
-
-
-
-
-
- - - - -
-
-
- - -
- - - - -
-
-
-
- - -
-
+
+ + + + + + + + +
{{ ('submission.sections.describe.relationship-lookup.selected' | translate:{size: (selection$ | async)?.length || 0}) }} diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.scss index 11c8e51888..4fb77a7590 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.scss +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.scss @@ -1,11 +1,3 @@ -.result-list-element { - flex: 1; -} - .modal-footer { justify-content: space-between; } - -.position-absolute { - right: $spacer; -} \ No newline at end of file diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts index ed192aa193..70230b6928 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts @@ -1,32 +1,14 @@ -import { Component, NgZone, OnDestroy, OnInit } from '@angular/core'; -import { PaginatedList } from '../../../../../core/data/paginated-list'; -import { SearchResult } from '../../../../search/search-result.model'; -import { RemoteData } from '../../../../../core/data/remote-data'; -import { from, Observable, ReplaySubject } from 'rxjs'; -import { SearchService } from '../../../../../core/shared/search/search.service'; -import { PaginatedSearchOptions } from '../../../../search/paginated-search-options.model'; -import { DSpaceObject } from '../../../../../core/shared/dspace-object.model'; -import { PaginationComponentOptions } from '../../../../pagination/pagination-component-options.model'; +import { Component, OnInit } from '@angular/core'; +import { Observable } from 'rxjs'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { hasValue, hasValueOperator, isNotEmpty } from '../../../../empty.util'; -import { concat, map, mergeMap, multicast, switchMap, take, takeWhile, tap } from 'rxjs/operators'; -import { Router } from '@angular/router'; +import { hasValue } from '../../../../empty.util'; +import { map } from 'rxjs/operators'; import { SEARCH_CONFIG_SERVICE } from '../../../../../+my-dspace-page/my-dspace-page.component'; import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service'; import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service'; import { SelectableListState } from '../../../../object-list/selectable-list/selectable-list.reducer'; import { ListableObject } from '../../../../object-collection/shared/listable-object.model'; -import { RouteService } from '../../../../services/route.service'; -import { getSucceededRemoteData } from '../../../../../core/shared/operators'; -import { RelationshipTypeService } from '../../../../../core/data/relationship-type.service'; -import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model'; -import { RelationshipService } from '../../../../../core/data/relationship.service'; -import { Item } from '../../../../../core/shared/item.model'; import { RelationshipOptions } from '../../models/relationship-options.model'; -import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model'; -import { Store } from '@ngrx/store'; -import { AppState } from '../../../../../app.reducer'; -import { AddRelationshipAction, RemoveRelationshipAction } from './relationship.actions'; @Component({ selector: 'ds-dynamic-lookup-relation-modal', @@ -40,172 +22,26 @@ import { AddRelationshipAction, RemoveRelationshipAction } from './relationship. ] }) -export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy { +export class DsDynamicLookupRelationModalComponent implements OnInit { label: string; relationship: RelationshipOptions; listId: string; - resultsRD$: Observable>>>; - searchConfig: PaginatedSearchOptions; - repeatable: boolean; - searchQuery; - allSelected: boolean; - someSelected$: Observable; - selectAllLoading: boolean; - subscription; - initialPagination = Object.assign(new PaginationComponentOptions(), { - id: 'submission-relation-list', - pageSize: 5 - }); - selection$: Observable; itemRD$; + repeatable: boolean; + selection$: Observable; constructor( public modal: NgbActiveModal, - private searchService: SearchService, - private router: Router, private selectableListService: SelectableListService, - private searchConfigService: SearchConfigurationService, - private routeService: RouteService, - private relationshipService: RelationshipService, - private relationshipTypeService: RelationshipTypeService, - private zone: NgZone, - private store: Store ) { } ngOnInit(): void { - this.resetRoute(); - this.routeService.setParameter('fixedFilterQuery', this.relationship.filter); - this.routeService.setParameter('configuration', this.relationship.searchConfiguration); - this.selection$ = this.selectableListService.getSelectableList(this.listId).pipe(map((listState: SelectableListState) => hasValue(listState) && hasValue(listState.selection) ? listState.selection : [])); - this.someSelected$ = this.selection$.pipe(map((selection) => isNotEmpty(selection))); - this.resultsRD$ = this.searchConfigService.paginatedSearchOptions.pipe( - map((options) => { - return Object.assign(new PaginatedSearchOptions({}), options, { fixedFilter: this.relationship.filter, configuration: this.relationship.searchConfiguration }) - }), - switchMap((options) => { - this.searchConfig = options; - return this.searchService.search(options).pipe( - /* Make sure to only listen to the first x results, until loading is finished */ - /* TODO: in Rxjs 6.4.0 and up, we can replace this by takeWhile(predicate, true) - see https://stackoverflow.com/a/44644237 */ - multicast( - () => new ReplaySubject(1), - subject => subject.pipe( - takeWhile((rd: RemoteData>>) => rd.isLoading), - concat(subject.pipe(take(1)) - ) - ) - ) as any - ) - }) - ); - } - search(query: string) { - this.allSelected = false; - this.searchQuery = query; - this.resetRoute(); - } close() { this.modal.close(); } - - resetRoute() { - this.router.navigate([], { - queryParams: Object.assign({}, { page: 1, query: this.searchQuery, pageSize: this.initialPagination.pageSize }), - }); - } - - selectPage(page: SearchResult[]) { - this.selection$ - .pipe(take(1)) - .subscribe((selection: SearchResult[]) => { - const filteredPage = page.filter((pageItem) => selection.findIndex((selected) => selected.equals(pageItem)) < 0) - this.select(...filteredPage); - }); - this.selectableListService.select(this.listId, page); - } - - deselectPage(page: SearchResult[]) { - this.allSelected = false; - this.selection$ - .pipe(take(1)) - .subscribe((selection: SearchResult[]) => { - const filteredPage = page.filter((pageItem) => selection.findIndex((selected) => selected.equals(pageItem)) >= 0) - this.deselect(...filteredPage); - }); - this.selectableListService.deselect(this.listId, page); - } - - selectAll() { - this.allSelected = true; - this.selectAllLoading = true; - const fullPagination = Object.assign(new PaginationComponentOptions(), { - query: this.searchQuery, - currentPage: 1, - pageSize: 9999 - }); - const fullSearchConfig = Object.assign(this.searchConfig, { pagination: fullPagination }); - const results$ = this.searchService.search(fullSearchConfig) as Observable>>>; - results$.pipe( - getSucceededRemoteData(), - map((resultsRD) => resultsRD.payload.page), - tap(() => this.selectAllLoading = false), - ).subscribe((results) => { - this.selection$ - .pipe(take(1)) - .subscribe((selection: SearchResult[]) => { - const filteredResults = results.filter((pageItem) => selection.findIndex((selected) => selected.equals(pageItem)) < 0); - this.select(...filteredResults); - }); - this.selectableListService.select(this.listId, results); - } - ); - } - - deselectAll() { - this.allSelected = false; - this.selection$ - .pipe(take(1)) - .subscribe((selection: SearchResult[]) => this.deselect(...selection)); - this.selectableListService.deselectAll(this.listId); - } - - - select(...selectableObjects: SearchResult[]) { - this.zone.runOutsideAngular( - () => this.itemRD$ - .pipe( - getSucceededRemoteData(), - tap((itemRD: RemoteData) => { - return selectableObjects.forEach((object) => - this.store.dispatch(new AddRelationshipAction(itemRD.payload, object.indexableObject, this.relationship.relationshipType)) - ); - }) - ).subscribe()); - } - - - deselect(...selectableObjects: SearchResult[]) { - this.zone.runOutsideAngular( - () => this.itemRD$.pipe( - getSucceededRemoteData(), - tap((itemRD: RemoteData) => { - return selectableObjects.forEach((object) => - this.store.dispatch(new RemoveRelationshipAction(itemRD.payload, object.indexableObject, this.relationship.relationshipType)) - ); - }) - ).subscribe() - ); - } - - ngOnDestroy(): void { - if (hasValue(this.subscription) - ) { - this.subscription.unsubscribe(); - } - } } \ No newline at end of file diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts index 1a9bd0433d..92143c5bb8 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts @@ -69,21 +69,22 @@ export class RelationshipEffects { private createIdentifier(item1: Item, item2: Item, relationshipType: string): string { - return `${item1.uuid}-${item2.uuid}-${relationshipType}$`; + return `${item1.uuid}-${item2.uuid}-${relationshipType}`; } private addRelationship(item1: Item, item2: Item, relationshipType: string) { - const type1: string = item1.firstMetadataValue('relationship.type'); + // const type1: string = item1.firstMetadataValue('relationship.type'); + const type1: string = 'JournalVolume'; const type2: string = item2.firstMetadataValue('relationship.type'); return this.relationshipTypeService.getRelationshipTypeByLabelAndTypes(relationshipType, type1, type2) .pipe( mergeMap((type: RelationshipType) => { - const isSwitched = type.rightLabel === relationshipType; + const isSwitched = type.leftLabel === relationshipType; if (isSwitched) { - return this.relationshipService.addRelationship(type.id, cloneDeep(item2), cloneDeep(item1)); + return this.relationshipService.addRelationship(type.id, item2, item1); } else { - return this.relationshipService.addRelationship(type.id, cloneDeep(item1), cloneDeep(item2)); + return this.relationshipService.addRelationship(type.id, item1, item2); } } ) diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html new file mode 100644 index 0000000000..a3fba7119d --- /dev/null +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html @@ -0,0 +1,70 @@ +
+ +
+
+ +
+ +
+
+
+
+
+
+ + + + +
+
+
+ + +
+ + + + +
+
+
+
+ + +
+
\ No newline at end of file diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.scss new file mode 100644 index 0000000000..4562a95080 --- /dev/null +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.scss @@ -0,0 +1,3 @@ +.position-absolute { + right: $spacer; +} \ No newline at end of file diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts new file mode 100644 index 0000000000..0d2257f198 --- /dev/null +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts @@ -0,0 +1,204 @@ +import { Component, Input, NgZone, OnDestroy, OnInit } from '@angular/core'; +import { SEARCH_CONFIG_SERVICE } from '../../../../../../+my-dspace-page/my-dspace-page.component'; +import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service'; +import { Item } from '../../../../../../core/shared/item.model'; +import { PaginatedSearchOptions } from '../../../../../search/paginated-search-options.model'; +import { SearchResult } from '../../../../../search/search-result.model'; +import { PaginatedList } from '../../../../../../core/data/paginated-list'; +import { RemoteData } from '../../../../../../core/data/remote-data'; +import { Observable, ReplaySubject } from 'rxjs'; +import { RelationshipOptions } from '../../../models/relationship-options.model'; +import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model'; +import { ListableObject } from '../../../../../object-collection/shared/listable-object.model'; +import { SearchService } from '../../../../../../core/shared/search/search.service'; +import { Router } from '@angular/router'; +import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service'; +import { RouteService } from '../../../../../services/route.service'; +import { RelationshipService } from '../../../../../../core/data/relationship.service'; +import { RelationshipTypeService } from '../../../../../../core/data/relationship-type.service'; +import { Store } from '@ngrx/store'; +import { AppState } from '../../../../../../app.reducer'; +import { SelectableListState } from '../../../../../object-list/selectable-list/selectable-list.reducer'; +import { hasValue, isNotEmpty } from '../../../../../empty.util'; +import { concat, map, multicast, switchMap, take, takeWhile, tap } from 'rxjs/operators'; +import { DSpaceObject } from '../../../../../../core/shared/dspace-object.model'; +import { getSucceededRemoteData } from '../../../../../../core/shared/operators'; +import { AddRelationshipAction, RemoveRelationshipAction } from '../relationship.actions'; + +@Component({ + selector: 'ds-dynamic-lookup-relation-search-tab', + styleUrls: ['./dynamic-lookup-relation-search-tab.component.scss'], + templateUrl: './dynamic-lookup-relation-search-tab.component.html', + providers: [ + { + provide: SEARCH_CONFIG_SERVICE, + useClass: SearchConfigurationService + } + ] +}) + +export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDestroy { + @Input() label: string; + @Input() relationship: RelationshipOptions; + @Input() listId: string; + @Input() itemRD$; + @Input() repeatable: boolean; + @Input() selection$: Observable; + + resultsRD$: Observable>>>; + searchConfig: PaginatedSearchOptions; + searchQuery; + allSelected: boolean; + someSelected$: Observable; + selectAllLoading: boolean; + subscription; + initialPagination = Object.assign(new PaginationComponentOptions(), { + id: 'submission-relation-list', + pageSize: 5 + }); + + constructor( + private searchService: SearchService, + private router: Router, + private selectableListService: SelectableListService, + private searchConfigService: SearchConfigurationService, + private routeService: RouteService, + private relationshipService: RelationshipService, + private relationshipTypeService: RelationshipTypeService, + private zone: NgZone, + private store: Store + ) { + } + + ngOnInit(): void { + this.resetRoute(); + this.routeService.setParameter('fixedFilterQuery', this.relationship.filter); + this.routeService.setParameter('configuration', this.relationship.searchConfiguration); + + this.selection$ = this.selectableListService.getSelectableList(this.listId).pipe(map((listState: SelectableListState) => hasValue(listState) && hasValue(listState.selection) ? listState.selection : [])); + this.someSelected$ = this.selection$.pipe(map((selection) => isNotEmpty(selection))); + this.resultsRD$ = this.searchConfigService.paginatedSearchOptions.pipe( + map((options) => { + return Object.assign(new PaginatedSearchOptions({}), options, { fixedFilter: this.relationship.filter, configuration: this.relationship.searchConfiguration }) + }), + switchMap((options) => { + this.searchConfig = options; + return this.searchService.search(options).pipe( + /* Make sure to only listen to the first x results, until loading is finished */ + /* TODO: in Rxjs 6.4.0 and up, we can replace this with takeWhile(predicate, true) - see https://stackoverflow.com/a/44644237 */ + multicast( + () => new ReplaySubject(1), + subject => subject.pipe( + takeWhile((rd: RemoteData>>) => rd.isLoading), + concat(subject.pipe(take(1)) + ) + ) + ) as any + ) + }) + ); + + } + + search(query: string) { + this.allSelected = false; + this.searchQuery = query; + this.resetRoute(); + } + + resetRoute() { + this.router.navigate([], { + queryParams: Object.assign({}, { page: 1, query: this.searchQuery, pageSize: this.initialPagination.pageSize }), + }); + } + + selectPage(page: SearchResult[]) { + this.selection$ + .pipe(take(1)) + .subscribe((selection: SearchResult[]) => { + const filteredPage = page.filter((pageItem) => selection.findIndex((selected) => selected.equals(pageItem)) < 0) + this.select(...filteredPage); + }); + this.selectableListService.select(this.listId, page); + } + + deselectPage(page: SearchResult[]) { + this.allSelected = false; + this.selection$ + .pipe(take(1)) + .subscribe((selection: SearchResult[]) => { + const filteredPage = page.filter((pageItem) => selection.findIndex((selected) => selected.equals(pageItem)) >= 0) + this.deselect(...filteredPage); + }); + this.selectableListService.deselect(this.listId, page); + } + + selectAll() { + this.allSelected = true; + this.selectAllLoading = true; + const fullPagination = Object.assign(new PaginationComponentOptions(), { + query: this.searchQuery, + currentPage: 1, + pageSize: 9999 + }); + const fullSearchConfig = Object.assign(this.searchConfig, { pagination: fullPagination }); + const results$ = this.searchService.search(fullSearchConfig) as Observable>>>; + results$.pipe( + getSucceededRemoteData(), + map((resultsRD) => resultsRD.payload.page), + tap(() => this.selectAllLoading = false), + ).subscribe((results) => { + this.selection$ + .pipe(take(1)) + .subscribe((selection: SearchResult[]) => { + const filteredResults = results.filter((pageItem) => selection.findIndex((selected) => selected.equals(pageItem)) < 0); + this.select(...filteredResults); + }); + this.selectableListService.select(this.listId, results); + } + ); + } + + deselectAll() { + this.allSelected = false; + this.selection$ + .pipe(take(1)) + .subscribe((selection: SearchResult[]) => this.deselect(...selection)); + this.selectableListService.deselectAll(this.listId); + } + + + select(...selectableObjects: SearchResult[]) { + this.zone.runOutsideAngular( + () => this.itemRD$ + .pipe( + getSucceededRemoteData(), + tap((itemRD: RemoteData) => { + return selectableObjects.forEach((object) => + this.store.dispatch(new AddRelationshipAction(itemRD.payload, object.indexableObject, this.relationship.relationshipType)) + ); + }) + ).subscribe()); + } + + + deselect(...selectableObjects: SearchResult[]) { + this.zone.runOutsideAngular( + () => this.itemRD$.pipe( + getSucceededRemoteData(), + tap((itemRD: RemoteData) => { + return selectableObjects.forEach((object) => + this.store.dispatch(new RemoveRelationshipAction(itemRD.payload, object.indexableObject, this.relationship.relationshipType)) + ); + }) + ).subscribe() + ); + } + + ngOnDestroy(): void { + if (hasValue(this.subscription) + ) { + this.subscription.unsubscribe(); + } + } +} \ No newline at end of file diff --git a/src/app/shared/object-list/object-list.component.ts b/src/app/shared/object-list/object-list.component.ts index 0b7dc6bf85..d7c53870e7 100644 --- a/src/app/shared/object-list/object-list.component.ts +++ b/src/app/shared/object-list/object-list.component.ts @@ -116,7 +116,6 @@ export class ObjectListComponent { if (value) { this.selectionService.selectSingle(this.selectionConfig.listId, object); this.selectObject.emit(object); - } else { this.selectionService.deselectSingle(this.selectionConfig.listId, object); this.deselectObject.emit(object); @@ -139,7 +138,5 @@ export class ObjectListComponent { this.selectObject.emit(object); } }); - - } } diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index f994f19868..cada35f65a 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -160,6 +160,7 @@ import { SearchFacetRangeOptionComponent } from './search/search-filters/search- import { SearchSwitchConfigurationComponent } from './search/search-switch-configuration/search-switch-configuration.component'; import { SearchAuthorityFilterComponent } from './search/search-filters/search-filter/search-authority-filter/search-authority-filter.component'; import { DsDynamicDisabledComponent } from './form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component'; +import { DsDynamicLookupRelationSearchTabComponent } from './form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component'; const MODULES = [ // Do NOT include UniversalModule, HttpModule, or JsonpModule here @@ -360,7 +361,8 @@ const ENTRY_COMPONENTS = [ SearchFacetOptionComponent, SearchFacetSelectedOptionComponent, SearchFacetRangeOptionComponent, - SearchAuthorityFilterComponent + SearchAuthorityFilterComponent, + DsDynamicLookupRelationSearchTabComponent ]; const SHARED_ITEM_PAGE_COMPONENTS = [