diff --git a/src/app/+item-page/edit-item-page/edit-item-page.module.ts b/src/app/+item-page/edit-item-page/edit-item-page.module.ts index 6d86e7f35c73f6d5410e45b0569fa8758f591ce0..5eda9aef101c1b143ed10bc997e67080cb0d58ac 100644 --- a/src/app/+item-page/edit-item-page/edit-item-page.module.ts +++ b/src/app/+item-page/edit-item-page/edit-item-page.module.ts @@ -21,7 +21,7 @@ import { ItemRelationshipsComponent } from './item-relationships/item-relationsh import { EditRelationshipComponent } from './item-relationships/edit-relationship/edit-relationship.component'; import { EditRelationshipListComponent } from './item-relationships/edit-relationship-list/edit-relationship-list.component'; import { ItemMoveComponent } from './item-move/item-move.component'; -import {VirtualMetadataComponent} from "./virtual-metadata/virtual-metadata.component"; +import {VirtualMetadataComponent} from './virtual-metadata/virtual-metadata.component'; /** * Module that contains all components related to the Edit Item page administrator functionality 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 e7d1a1420020b3a1463cf6b9e29fdb6c8d7e4fd1..7645b2b4b74c09fd6dade827188a62ab867056d3 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 @@ -6,7 +6,7 @@ import { RelationshipService } from '../../../../core/data/relationship.service' import { Item } from '../../../../core/shared/item.model'; import { map, switchMap} from 'rxjs/operators'; import { hasValue } from '../../../../shared/empty.util'; -import {Relationship} from "../../../../core/shared/item-relationships/relationship.model"; +import {Relationship} from '../../../../core/shared/item-relationships/relationship.model'; @Component({ selector: 'ds-edit-relationship-list', @@ -66,7 +66,7 @@ export class EditRelationshipListComponent implements OnInit, OnChanges { */ public getUpdatesByLabel(label: string): Observable<FieldUpdates> { return this.relationshipService.getItemRelationshipsByLabel(this.item, label).pipe( - map(relationsRD => relationsRD.payload.page.map(relationship => + map((relationsRD) => relationsRD.payload.page.map((relationship) => Object.assign(new Relationship(), relationship, {uuid: relationship.id}) )), switchMap((initialFields) => this.objectUpdatesService.getFieldUpdatesExclusive(this.url, initialFields)), 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 7c1780da58ef8e9386fcb212ca340a2a70b7ab12..220582a5fd3449ffaa1a1e6fe144c8ee1b5c48d4 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 @@ -9,7 +9,7 @@ import {Item} from '../../../../core/shared/item.model'; import {getRemoteDataPayload, getSucceededRemoteData} from '../../../../core/shared/operators'; import {ViewMode} from '../../../../core/shared/view-mode.model'; import {hasValue, isNotEmpty} from '../../../../shared/empty.util'; -import {NgbModal, NgbModalRef} from "@ng-bootstrap/ng-bootstrap"; +import {NgbModal, NgbModalRef} from '@ng-bootstrap/ng-bootstrap'; @Component({ // tslint:disable-next-line:component-selector @@ -53,6 +53,11 @@ export class EditRelationshipComponent implements OnChanges { */ viewMode = ViewMode.ListElement; + /** + * Reference to NgbModal + */ + public modalRef: NgbModalRef; + constructor( private objectUpdatesService: ObjectUpdatesService, private modalService: NgbModal, @@ -93,17 +98,16 @@ export class EditRelationshipComponent implements OnChanges { this.rightItem$, ).pipe( map((items: Item[]) => - items.map(item => this.objectUpdatesService + items.map((item) => this.objectUpdatesService .isSelectedVirtualMetadataItem(this.url, this.relationship.id, item.uuid)) ), - switchMap((selection$: Observable<boolean>[]) => observableCombineLatest(selection$)), + switchMap((selection$) => observableCombineLatest(selection$)), map((selection: boolean[]) => { return Object.assign({}, this.fieldUpdate.field, { - uuid: this.relationship.id, - keepLeftVirtualMetadata: selection[0] == true, - keepRightVirtualMetadata: selection[1] == true, + keepLeftVirtualMetadata: selection[0] === true, + keepRightVirtualMetadata: selection[1] === true, } ) as DeleteRelationship }), @@ -113,11 +117,6 @@ export class EditRelationshipComponent implements OnChanges { ); } - /** - * Reference to NgbModal - */ - public modalRef: NgbModalRef; - openVirtualMetadataModal(content: any) { this.modalRef = this.modalService.open(content); } diff --git a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts index 92b138e962d656daf91e28caf27f18a46627c316..fadba3b981393fa1f815ecfe6014e0ef0e7616cd 100644 --- a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts +++ b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts @@ -110,7 +110,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent impl public submit(): void { // Get all the relationships that should be removed const removedRelationshipIDs$ = this.relationshipService.getItemRelationshipsArray(this.item).pipe( - map((relationships: Relationship[]) => relationships.map(relationship => + map((relationships: Relationship[]) => relationships.map((relationship) => Object.assign(new Relationship(), relationship, {uuid: relationship.id}) )), switchMap((relationships: Relationship[]) => { @@ -124,7 +124,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent impl take(1), switchMap((deleteRelationships: DeleteRelationship[]) => observableZip(...deleteRelationships.map((deleteRelationship) => { - let copyVirtualMetadata : string; + let copyVirtualMetadata: string; if (deleteRelationship.keepLeftVirtualMetadata && deleteRelationship.keepRightVirtualMetadata) { copyVirtualMetadata = 'all'; } else if (deleteRelationship.keepLeftVirtualMetadata) { diff --git a/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts b/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts index c3379750a2f99728678d3feb4ce88566487bdef2..170c3aec0c80245369a2ceb8dd13072d91cc8a29 100644 --- a/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts +++ b/src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts @@ -1,11 +1,11 @@ import {Component, EventEmitter, Input, OnChanges, Output} from '@angular/core'; import {ActivatedRoute} from '@angular/router'; import {Observable} from 'rxjs'; -import {Item} from "../../../core/shared/item.model"; -import {Relationship} from "../../../core/shared/item-relationships/relationship.model"; -import {MetadataValue} from "../../../core/shared/metadata.models"; -import {getRemoteDataPayload, getSucceededRemoteData} from "../../../core/shared/operators"; -import {ObjectUpdatesService} from "../../../core/data/object-updates/object-updates.service"; +import {Item} from '../../../core/shared/item.model'; +import {Relationship} from '../../../core/shared/item-relationships/relationship.model'; +import {MetadataValue} from '../../../core/shared/metadata.models'; +import {getRemoteDataPayload, getSucceededRemoteData} from '../../../core/shared/operators'; +import {ObjectUpdatesService} from '../../../core/data/object-updates/object-updates.service'; @Component({ selector: 'ds-virtual-metadata', @@ -26,15 +26,15 @@ export class VirtualMetadataComponent implements OnChanges { @Output() close = new EventEmitter(); @Output() save = new EventEmitter(); + leftItem$: Observable<Item>; + rightItem$: Observable<Item>; + constructor( protected route: ActivatedRoute, protected objectUpdatesService: ObjectUpdatesService, ) { } - leftItem$: Observable<Item>; - rightItem$: Observable<Item>; - ngOnChanges(): void { this.leftItem$ = this.relationship.leftItem.pipe( getSucceededRemoteData(), diff --git a/src/app/core/data/object-updates/object-updates.reducer.ts b/src/app/core/data/object-updates/object-updates.reducer.ts index 41d1704797c194f9895dcb952fe50c56c9dedfda..daf7555692e93c9b31a1f71fd5fc70e9e2e9b752 100644 --- a/src/app/core/data/object-updates/object-updates.reducer.ts +++ b/src/app/core/data/object-updates/object-updates.reducer.ts @@ -13,7 +13,7 @@ import { SelectVirtualMetadataAction, } from './object-updates.actions'; import { hasNoValue, hasValue } from '../../../shared/empty.util'; -import {Relationship} from "../../shared/item-relationships/relationship.model"; +import {Relationship} from '../../shared/item-relationships/relationship.model'; /** * Path where discarded objects are saved diff --git a/src/app/core/data/object-updates/object-updates.service.ts b/src/app/core/data/object-updates/object-updates.service.ts index 0e8b1c8d07f06757843cd9a8f99273351478d9da..5063a8a005e1a852c220d143481fdddf3cb92765 100644 --- a/src/app/core/data/object-updates/object-updates.service.ts +++ b/src/app/core/data/object-updates/object-updates.service.ts @@ -26,10 +26,10 @@ import { import {distinctUntilChanged, filter, map} from 'rxjs/operators'; import {hasNoValue, hasValue, isEmpty, isNotEmpty} from '../../../shared/empty.util'; import {INotification} from '../../../shared/notifications/models/notification.model'; -import {Item} from "../../shared/item.model"; -import {Relationship} from "../../shared/item-relationships/relationship.model"; -import {MetadataValue} from "../../shared/metadata.models"; -import {VirtualMetadata} from "../../../+item-page/edit-item-page/virtual-metadata/virtual-metadata.component"; +import {Item} from '../../shared/item.model'; +import {Relationship} from '../../shared/item-relationships/relationship.model'; +import {MetadataValue} from '../../shared/metadata.models'; +import {VirtualMetadata} from '../../../+item-page/edit-item-page/virtual-metadata/virtual-metadata.component'; function objectUpdatesStateSelector(): MemoizedSelector<CoreState, ObjectUpdatesState> { return createSelector(coreSelector, (state: CoreState) => state['cache/object-updates']); @@ -226,7 +226,7 @@ export class ObjectUpdatesService { return this.store .pipe( select(virtualMetadataSourceSelector(url, relationship)), - map(virtualMetadataSource => virtualMetadataSource && virtualMetadataSource[item]), + map((virtualMetadataSource) => virtualMetadataSource && virtualMetadataSource[item]), ); } diff --git a/src/app/core/data/relationship.service.ts b/src/app/core/data/relationship.service.ts index a4a24e8aaa08c994e13ee463d094848af4051bc2..895cb46ed1f93cb7fa09a451b8e435e81244cd4f 100644 --- a/src/app/core/data/relationship.service.ts +++ b/src/app/core/data/relationship.service.ts @@ -88,7 +88,7 @@ export class RelationshipService extends DataService<Relationship> { isNotEmptyOperator(), distinctUntilChanged(), map((endpointURL: string) => - new DeleteRequest(this.requestService.generateRequestId(), endpointURL + "?copyVirtualMetadata=" + copyVirtualMetadata) + new DeleteRequest(this.requestService.generateRequestId(), endpointURL + '?copyVirtualMetadata=' + copyVirtualMetadata) ), configureRequest(this.requestService), switchMap((restRequest: RestRequest) => this.requestService.getByUUID(restRequest.uuid)),