From c687d3ff5d1d6a6008718c885329b1d0017a2db4 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Thu, 30 May 2024 10:58:23 +0200 Subject: [PATCH 1/3] 115046: Fixed performance issues in virtual metadata popup --- .../virtual-metadata.component.html | 12 ++--- .../virtual-metadata.component.spec.ts | 1 + .../virtual-metadata.component.ts | 50 +++++++++++++++---- 3 files changed, 46 insertions(+), 17 deletions(-) diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html index b83b93d8f10..927f7dbb48d 100644 --- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html +++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html @@ -5,9 +5,9 @@
- -
+
- + -
+
{{metadata.metadataField}}
@@ -31,7 +31,7 @@
diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts index 9391df4755c..b835031e30e 100644 --- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts +++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts @@ -61,6 +61,7 @@ describe('VirtualMetadataComponent', () => { comp.url = url; comp.leftItem = item; comp.rightItem = relatedItem; + comp.ngOnChanges(); comp.relationshipId = relationshipId; fixture.detectChanges(); 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 6f8991dc732..7b66f400103 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,9 +1,18 @@ -import { Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core'; -import {Observable} from 'rxjs'; +import { Component, EventEmitter, Inject, Input, OnInit, Output, OnChanges, OnDestroy } from '@angular/core'; +import { Observable, Subscription, BehaviorSubject } from 'rxjs'; import {Item} from '../../../core/shared/item.model'; import {MetadataValue} from '../../../core/shared/metadata.models'; import {ObjectUpdatesService} from '../../../core/data/object-updates/object-updates.service'; import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface'; +import { hasValue } from '../../../shared/empty.util'; + +interface ItemDTO { + + item: Item; + + isSelectedVirtualMetadataItem$: Observable; + +} @Component({ selector: 'ds-virtual-metadata', @@ -14,7 +23,7 @@ import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface'; * The component is shown when a relationship is marked to be deleted. * Each item has a checkbox to indicate whether its virtual metadata should be saved as real metadata. */ -export class VirtualMetadataComponent implements OnInit { +export class VirtualMetadataComponent implements OnInit, OnChanges, OnDestroy { /** * The current url of this page @@ -55,9 +64,9 @@ export class VirtualMetadataComponent implements OnInit { /** * Get an array of the left and the right item of the relationship to be deleted. */ - get items() { - return [this.leftItem, this.rightItem]; - } + itemDTOs$: BehaviorSubject = new BehaviorSubject([]); + + subs: Subscription[] = []; public virtualMetadata: Map = new Map(); @@ -109,14 +118,33 @@ export class VirtualMetadataComponent implements OnInit { /** * Prevent unnecessary rerendering so fields don't lose focus */ - trackItem(index, item: Item) { - return item && item.uuid; + trackItemDTO(index, itemDTO: ItemDTO): string { + return itemDTO?.item?.uuid; } ngOnInit(): void { - this.items.forEach((item) => { - this.virtualMetadata.set(item.uuid, this.getVirtualMetadata(item)); - }); + this.subs.push(this.itemDTOs$.subscribe((itemDTOs: ItemDTO[]) => { + itemDTOs.forEach((itemDTO: ItemDTO) => this.virtualMetadata.set(itemDTO.item.uuid, this.getVirtualMetadata(itemDTO.item))); + })); + } + + ngOnChanges(): void { + if (hasValue(this.leftItem) && hasValue(this.rightItem)) { + this.itemDTOs$.next([ + { + item: this.leftItem, + isSelectedVirtualMetadataItem$: this.isSelectedVirtualMetadataItem(this.leftItem), + }, + { + item: this.rightItem, + isSelectedVirtualMetadataItem$: this.isSelectedVirtualMetadataItem(this.rightItem), + }, + ]); + } + } + + ngOnDestroy(): void { + this.subs.forEach((sub: Subscription) => sub.unsubscribe()); } } From 4a70382072507ce876f26834b070e056a68e49dd Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Tue, 28 May 2024 13:38:23 +0200 Subject: [PATCH 2/3] 115046: Fixed incorrect name variant being saved in the store when marking relationship ready for deletion --- .../edit-relationship-list.component.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 57f8116b9cc..30e274dd358 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 @@ -305,16 +305,16 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy { modalComp.submitEv = () => { modalComp.isPending = true; const isLeft = this.currentItemIsLeftItem$.getValue(); - const addOperations = modalComp.toAdd.map((searchResult: any) => ({ type: 'add', searchResult })); - const removeOperations = modalComp.toRemove.map((searchResult: any) => ({ type: 'remove', searchResult })); + const addOperations = modalComp.toAdd.map((searchResult: ItemSearchResult) => ({ type: 'add', searchResult })); + const removeOperations = modalComp.toRemove.map((searchResult: ItemSearchResult) => ({ type: 'remove', searchResult })); observableFrom([...addOperations, ...removeOperations]).pipe( - concatMap(({ type, searchResult }: { type: string, searchResult: any }) => { + concatMap(({ type, searchResult }: { type: string, searchResult: ItemSearchResult }) => { + const relatedItem: Item = searchResult.indexableObject; if (type === 'add') { - const relatedItem = searchResult.indexableObject; return this.relationshipService.getNameVariant(this.listId, relatedItem.uuid).pipe( map((nameVariant) => { const update = { - uuid: this.relationshipType.id + '-' + searchResult.indexableObject.uuid, + uuid: `${this.relationshipType.id}-${relatedItem.uuid}`, nameVariant, type: this.relationshipType, originalIsLeft: isLeft, @@ -327,7 +327,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy { take(1) ); } else if (type === 'remove') { - return this.relationshipService.getNameVariant(this.listId, searchResult.indexableObjectuuid).pipe( + return this.relationshipService.getNameVariant(this.listId, relatedItem.uuid).pipe( switchMap((nameVariant) => { return this.getRelationFromId(searchResult.indexableObject).pipe( map( (relationship: Relationship) => { From 227d47154ce2d65c635174a1a132cc4ee2de06fd Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Thu, 30 May 2024 16:55:35 +0200 Subject: [PATCH 3/3] 115046: Fixed issue where store operations would sometimes be performed in incorrect order --- .../object-updates/object-updates.service.ts | 18 +++++++++++++++--- .../edit-relationship-list.component.ts | 10 ++++------ 2 files changed, 19 insertions(+), 9 deletions(-) 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 2fb6d47d31c..c3746f02835 100644 --- a/src/app/core/data/object-updates/object-updates.service.ts +++ b/src/app/core/data/object-updates/object-updates.service.ts @@ -19,7 +19,7 @@ import { SetEditableFieldUpdateAction, SetValidFieldUpdateAction } from './object-updates.actions'; -import { distinctUntilChanged, filter, map, switchMap } from 'rxjs/operators'; +import { distinctUntilChanged, filter, map, switchMap, take } from 'rxjs/operators'; import { hasNoValue, hasValue, @@ -198,8 +198,14 @@ export class ObjectUpdatesService { * @param url The page's URL for which the changes are saved * @param field An updated field for the page's object */ - saveAddFieldUpdate(url: string, field: Identifiable) { + saveAddFieldUpdate(url: string, field: Identifiable): Observable { + const update$: Observable = this.getFieldUpdatesExclusive(url, [field]).pipe( + filter((fieldUpdates: FieldUpdates) => fieldUpdates[field.uuid].changeType === FieldChangeType.ADD), + take(1), + map(() => true), + ); this.saveFieldUpdate(url, field, FieldChangeType.ADD); + return update$; } /** @@ -207,8 +213,14 @@ export class ObjectUpdatesService { * @param url The page's URL for which the changes are saved * @param field An updated field for the page's object */ - saveRemoveFieldUpdate(url: string, field: Identifiable) { + saveRemoveFieldUpdate(url: string, field: Identifiable): Observable { + const update$: Observable = this.getFieldUpdatesExclusive(url, [field]).pipe( + filter((fieldUpdates: FieldUpdates) => fieldUpdates[field.uuid].changeType === FieldChangeType.REMOVE), + take(1), + map(() => true), + ); this.saveFieldUpdate(url, field, FieldChangeType.REMOVE); + return update$; } /** 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 30e274dd358..c4b2bba36f4 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 @@ -312,7 +312,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy { const relatedItem: Item = searchResult.indexableObject; if (type === 'add') { return this.relationshipService.getNameVariant(this.listId, relatedItem.uuid).pipe( - map((nameVariant) => { + switchMap((nameVariant) => { const update = { uuid: `${this.relationshipType.id}-${relatedItem.uuid}`, nameVariant, @@ -321,8 +321,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy { originalItem: this.item, relatedItem, } as RelationshipIdentifiable; - this.objectUpdatesService.saveAddFieldUpdate(this.url, update); - return update; + return this.objectUpdatesService.saveAddFieldUpdate(this.url, update); }), take(1) ); @@ -339,9 +338,8 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy { originalItem: this.item, relationship, } as RelationshipIdentifiable; - this.objectUpdatesService.saveRemoveFieldUpdate(this.url,update); - return update; - }) + return this.objectUpdatesService.saveRemoveFieldUpdate(this.url,update); + }), ); }), take(1)