From efc2c9933a344e32c3214cc2488c05fea0199c8c Mon Sep 17 00:00:00 2001 From: lotte Date: Mon, 18 Nov 2019 11:24:01 +0100 Subject: [PATCH] autoselect + small fixes --- .../name-variant-modal.component.html | 2 +- ...esult-list-submission-element.component.ts | 2 +- ...ynamic-form-control-container.component.ts | 2 +- ...electable-list-item-control.component.html | 0 .../selectable-list-item-control.component.ts | 20 +++++++++++-------- .../selectable-list.service.ts | 4 +--- src/app/shared/shared.module.ts | 2 +- 7 files changed, 17 insertions(+), 15 deletions(-) rename src/app/shared/object-collection/shared/{ => selectable-list-item-control}/selectable-list-item-control.component.html (100%) rename src/app/shared/object-collection/shared/{ => selectable-list-item-control}/selectable-list-item-control.component.ts (80%) diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/name-variant-modal/name-variant-modal.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/person/name-variant-modal/name-variant-modal.component.html index f46319d16b..8bf283ae3d 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/name-variant-modal/name-variant-modal.component.html +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/name-variant-modal/name-variant-modal.component.html @@ -7,7 +7,7 @@
{{'submission.sections.describe.relationship-lookup.name-variant.notification.content' | translate: { value: value } }}
-
+
\ No newline at end of file diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts index 5c50aa403c..5f1bafe554 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts @@ -96,7 +96,7 @@ export class PersonSearchResultListSubmissionElementComponent extends SearchResu } openModal(value): Promise { - const modalRef = this.modalService.open(NameVariantModalComponent, { size: 'lg' }); + const modalRef = this.modalService.open(NameVariantModalComponent, { centered: true }); const modalComp = modalRef.componentInstance; modalComp.value = value; return modalRef.result; 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 4eb58688cf..a2ba71f101 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 @@ -276,7 +276,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo openLookup() { this.item$.subscribe((item: Item) => { - this.modalRef = this.modalService.open(DsDynamicLookupRelationModalComponent, { size: 'lg' }); + this.modalRef = this.modalService.open(DsDynamicLookupRelationModalComponent, { size: 'lg', centered: true}); const modalComp = this.modalRef.componentInstance; modalComp.repeatable = this.model.repeatable; modalComp.listId = this.listId; diff --git a/src/app/shared/object-collection/shared/selectable-list-item-control.component.html b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html similarity index 100% rename from src/app/shared/object-collection/shared/selectable-list-item-control.component.html rename to src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html diff --git a/src/app/shared/object-collection/shared/selectable-list-item-control.component.ts b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.ts similarity index 80% rename from src/app/shared/object-collection/shared/selectable-list-item-control.component.ts rename to src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.ts index 4a4eea600b..91ada1cbe8 100644 --- a/src/app/shared/object-collection/shared/selectable-list-item-control.component.ts +++ b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.ts @@ -1,7 +1,7 @@ import { Component, ComponentFactoryResolver, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; -import { ListableObject } from './listable-object.model'; -import { SelectableListService } from '../../object-list/selectable-list/selectable-list.service'; -import { map, take } from 'rxjs/operators'; +import { ListableObject } from '../listable-object.model'; +import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service'; +import { map, skip, take } from 'rxjs/operators'; import { Observable } from 'rxjs'; @Component({ @@ -32,6 +32,7 @@ export class SelectableListItemControlComponent implements OnInit { selected$: Observable; + constructor(private selectionService: SelectableListService) { } @@ -39,19 +40,22 @@ export class SelectableListItemControlComponent implements OnInit { * Setup the dynamic child component */ ngOnInit(): void { - this.selected$ = this.selectionService?.isObjectSelected(this.selectionConfig.listId, this.object); - this.selected$.subscribe((selected: ListableObject) => { - + this.selected$ = this.selectionService.isObjectSelected(this.selectionConfig.listId, this.object); + this.selected$ + .pipe(skip(1)).subscribe((selected: boolean) => { + if (selected) { + this.selectObject.emit(this.object); + } else { + this.deselectObject.emit(this.object); + } }) } selectCheckbox(value: boolean, object: ListableObject) { 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); } } diff --git a/src/app/shared/object-list/selectable-list/selectable-list.service.ts b/src/app/shared/object-list/selectable-list/selectable-list.service.ts index 84483df3e8..b698e3540e 100644 --- a/src/app/shared/object-list/selectable-list/selectable-list.service.ts +++ b/src/app/shared/object-list/selectable-list/selectable-list.service.ts @@ -85,9 +85,7 @@ export class SelectableListService { */ isObjectSelected(id: string, object: ListableObject): Observable { return this.getSelectableList(id).pipe( - filter((state: SelectableListState) => hasValue(state)), - map((state: SelectableListState) => isNotEmpty(state.selection) && hasValue(state.selection.find((selected) => selected.equals(object)))), - startWith(false), + map((state: SelectableListState) => hasValue(state) && isNotEmpty(state.selection) && hasValue(state.selection.find((selected) => selected.equals(object)))), distinctUntilChanged() ); } diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 45848fdde7..7e73cc4689 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -169,7 +169,7 @@ import { ListableObjectDirective } from './object-collection/shared/listable-obj import { SearchLabelComponent } from './search/search-labels/search-label/search-label.component'; import { ItemMetadataRepresentationListElementComponent } from './object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component'; import { MetadataRepresentationListComponent } from '../+item-page/simple/metadata-representation-list/metadata-representation-list.component'; -import { SelectableListItemControlComponent } from './object-collection/shared/selectable-list-item-control.component'; +import { SelectableListItemControlComponent } from './object-collection/shared/selectable-list-item-control/selectable-list-item-control.component'; const MODULES = [ // Do NOT include UniversalModule, HttpModule, or JsonpModule here