From 65a66a104c59a104a2ebbf8e807b09a127f7ad2f Mon Sep 17 00:00:00 2001 From: lotte Date: Mon, 15 Jul 2019 16:26:27 +0200 Subject: [PATCH] continued refactoring --- ...namic-lookup-relation-modal.component.html | 2 +- ...dynamic-lookup-relation-modal.component.ts | 13 ++-- .../dynamic-lookup-relation.component.html | 28 ++++---- .../dynamic-lookup-relation.component.ts | 71 ++++++++++++------- .../dynamic-lookup-relation.model.ts | 2 +- .../selectable-list.actions.ts | 4 +- 6 files changed, 69 insertions(+), 51 deletions(-) diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.html index 16b700f93e..751bef7e54 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.html +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.html @@ -117,7 +117,7 @@
- Selected {{selection.length}} items + Selected {{(selection | async)?.length || 0}} items
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.ts index 2b4ea67d0f..0f815e51fd 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation-modal.component.ts @@ -15,11 +15,11 @@ import { Router } from '@angular/router'; 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 { ListableObject } from '../../../../../object-collection/shared/listable-object.model'; +import { SelectableListState } from '../../../../../object-list/selectable-list/selectable-list.reducer'; const RELATION_TYPE_FILTER_PREFIX = 'f.entityType='; -/* TODO take a look at this when the REST entities submission is finished: we will probably need to get the fixed filter from the REST instead of filtering is out from the metadata field */ -const RELATION_TYPE_METADATA_PREFIX = 'relation.isPublicationOf'; @Component({ selector: 'ds-dynamic-lookup-relation-modal', @@ -35,25 +35,24 @@ const RELATION_TYPE_METADATA_PREFIX = 'relation.isPublicationOf'; export class DsDynamicLookupRelationModalComponent implements OnInit { relationKey: string; fieldName: string; + listId: string; resultsRD$: Observable>>>; searchConfig: PaginatedSearchOptions; repeatable: boolean; - previousSelection: DSpaceObject[] = []; searchQuery; initialPagination = Object.assign(new PaginationComponentOptions(), { id: 'submission-relation-list', pageSize: 10 }); - listId; + selection: Observable; constructor(public modal: NgbActiveModal, private searchService: SearchService, private router: Router, private selectableListService: SelectableListService) { } ngOnInit(): void { this.resetRoute(); - this.fieldName = this.relationKey.substring(RELATION_TYPE_METADATA_PREFIX.length); - this.listId = 'list-' + this.fieldName; this.onPaginationChange(this.initialPagination); + this.selectableListService.getSelectableList(this.listId).pipe(map((listState: SelectableListState) => hasValue(listState) && hasValue(listState.selection) ? listState.selection : [])); } search(query: string) { @@ -84,7 +83,7 @@ export class DsDynamicLookupRelationModalComponent implements OnInit { } close() { - this.modal.close(this.selectableListService.getSelectableList(this.listId)); + this.modal.close(); } resetRoute() { diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.component.html index c1bb0cc070..9baf2e4af8 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.component.html +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.component.html @@ -1,6 +1,6 @@
-
+
{{'form.lookup' | translate}}
-
- -
+ + + + + + + + + +
    -
  • +
  • + {{value.name}} @@ -43,6 +44,7 @@ [ngModel]="value.uuid" [disabled]="true" [readonly]="true"> +
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.component.ts index 7f49d75106..00f8cadc73 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.component.ts @@ -6,13 +6,22 @@ import { DynamicFormValidationService } from '@ng-dynamic-forms/core'; import { FormGroup } from '@angular/forms'; -import { isNotEmpty } from '../../../../../empty.util'; +import { hasValue, isNotEmpty } from '../../../../../empty.util'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { DsDynamicLookupRelationModalComponent } from './dynamic-lookup-relation-modal.component'; import { DynamicLookupRelationModel } from './dynamic-lookup-relation.model'; import { DSpaceObject } from '../../../../../../core/shared/dspace-object.model'; import { RelationshipService } from '../../../../../../core/data/relationship.service'; import { Item } from '../../../../../../core/shared/item.model'; +import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service'; +import { SelectableListState } from '../../../../../object-list/selectable-list/selectable-list.reducer'; +import { Observable } from 'rxjs'; +import { ListableObject } from '../../../../../object-collection/shared/listable-object.model'; +import { map } from 'rxjs/operators'; +import { SearchResult } from '../../../../../search/search-result.model'; + +/* TODO take a look at this when the REST entities submission is finished: we will probably need to get the fixed filter from the REST instead of filtering is out from the metadata field */ +const RELATION_TYPE_METADATA_PREFIX = 'relation.isPublicationOf'; @Component({ selector: 'ds-dynamic-lookup-relation', @@ -30,50 +39,58 @@ export class DsDynamicLookupRelationComponent extends DynamicFormControlComponen modalRef: NgbModalRef; modalValuesString = ''; - selectedResults: Item[]; + fieldName: string; + listId: string; constructor(private modalService: NgbModal, protected layoutService: DynamicFormLayoutService, protected validationService: DynamicFormValidationService, - private relationService: RelationshipService + private relationService: RelationshipService, + private selectableListService: SelectableListService ) { super(layoutService, validationService); } ngOnInit(): void { + this.fieldName = this.model.name.substring(RELATION_TYPE_METADATA_PREFIX.length); + this.listId = 'list-' + this.fieldName; + this.model.value = this.selectableListService.getSelectableList(this.listId).pipe( + map((listState: SelectableListState) => hasValue(listState) && hasValue(listState.selection) ? listState.selection : []), + ); } - public hasResultsSelected() { - return isNotEmpty(this.selectedResults); + public hasResultsSelected(): Observable { + return this.model.value.pipe(map((list: SearchResult[]) => isNotEmpty(list))); } openLookup() { this.modalRef = this.modalService.open(DsDynamicLookupRelationModalComponent, { size: 'lg' }); - this.modalRef.componentInstance.repeatable = this.model.repeatable; - this.modalRef.componentInstance.selection = this.selectedResults || []; - this.modalRef.componentInstance.previousSelection = this.model.value || []; - this.modalRef.componentInstance.relationKey = this.model.name; - this.modalRef.result.then((resultList) => { - this.selectedResults = resultList; - this.modalValuesString = resultList.map((dso: DSpaceObject) => dso.name).join('; '); + const modalComp = this.modalRef.componentInstance; + modalComp.repeatable = this.model.repeatable; + modalComp.relationKey = this.model.name; + modalComp.listId = this.listId; + modalComp.fieldName = this.fieldName; + + this.modalRef.result.then((resultString = '') => { + this.modalValuesString = resultString; }); } - add() { - if (isNotEmpty(this.model.value)) { - this.model.value = [...this.model.value, ...this.selectedResults]; - } else { - this.model.value = this.selectedResults; - } + // add() { + // if (isNotEmpty(this.model.value)) { + // this.model.value = [...this.model.value, ...this.selectedResults]; + // } else { + // this.model.value = this.selectedResults; + // } + // + // this.modalValuesString = ''; + // this.selectedResults = []; + // this.selectedResults.forEach((item: Item) => { + // this.relationService.addRelationship(this.model.item, item); + // }) + // } - this.modalValuesString = ''; - this.selectedResults = []; - this.selectedResults.forEach((item: Item) => { - this.relationService.addRelationship(this.model.item, item); - }) - } - - removeSelection(uuid: string) { - this.model.value = this.model.value.filter((dso: DSpaceObject) => dso.uuid !== uuid); + removeSelection(object: SearchResult) { + this.selectableListService.deselectSingle(this.listId, object); } } diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.model.ts index 93910fe5d5..e0e580e1f8 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.model.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup-relation/dynamic-lookup-relation.model.ts @@ -13,7 +13,7 @@ export interface DynamicLookupRelationModelConfig extends DsDynamicInputModelCon export class DynamicLookupRelationModel extends DsDynamicInputModel { @serializable() readonly type: string = DYNAMIC_FORM_CONTROL_TYPE_LOOKUP_RELATION; - @serializable() value: any[]; + @serializable() value: any; @serializable() repeatable: boolean; item: Item; diff --git a/src/app/shared/object-list/selectable-list/selectable-list.actions.ts b/src/app/shared/object-list/selectable-list/selectable-list.actions.ts index c1d41b1d92..0b757149b5 100644 --- a/src/app/shared/object-list/selectable-list/selectable-list.actions.ts +++ b/src/app/shared/object-list/selectable-list/selectable-list.actions.ts @@ -32,7 +32,7 @@ export class SelectableListSelectAction extends SelectableListAction { payload: ListableObject[]; constructor(id: string, objects: ListableObject[]) { - super(SelectableListActionTypes.SELECT_SINGLE, id); + super(SelectableListActionTypes.SELECT, id); this.payload = objects; } } @@ -44,7 +44,7 @@ export class SelectableListSelectSingleAction extends SelectableListAction { }; constructor(id: string, object: ListableObject, multipleSelectionsAllowed: boolean = true) { - super(SelectableListActionTypes.SELECT, id); + super(SelectableListActionTypes.SELECT_SINGLE, id); this.payload = { object, multipleSelectionsAllowed }; } }