Submission - Replace plaintext with relationship on lookup - main

src/app/core/submission/workflowitem-data.service.spec.ts

@@ -12,6 +12,7 @@ import { RemoteDataBuildService } from '../cache/builders/remote-data-build.serv
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { RestResponse } from '../cache/response.models';
 import { CoreState } from '../core-state.model';
+import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
 import { HrefOnlyDataService } from '../data/href-only-data.service';
 import { RequestService } from '../data/request.service';
 import { RequestEntry } from '../data/request-entry.model';
@@ -91,6 +92,7 @@ describe('WorkflowItemDataService test', () => {
       objectCache,
       halService,
       notificationsService,
+      new DefaultChangeAnalyzer(),
     );
   }
 

src/app/core/submission/workflowitem-data.service.ts

@@ -1,5 +1,7 @@
 import { Injectable } from '@angular/core';
+import { RestRequestMethod } from '@dspace/config/rest-request-method';
 import { hasValue } from '@dspace/shared/utils/empty.util';
+import { Operation } from 'fast-json-patch';
 import { Observable } from 'rxjs';
 import {
   find,
@@ -14,10 +16,15 @@ import {
   DeleteDataImpl,
 } from '../data/base/delete-data';
 import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from '../data/base/patch-data';
 import {
   SearchData,
   SearchDataImpl,
 } from '../data/base/search-data';
+import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
 import { FindListOptions } from '../data/find-list-options.model';
 import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
@@ -30,28 +37,41 @@ import { NoContent } from '../shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../shared/operators';
 import { WorkflowItem } from './models/workflowitem.model';
 
+/**
+ * Constructs an endpoint taking into account that the WorkflowItem's "uuid" has a prefix by removing that prefix from the ID
+ * @param endpoint    Endpoint to append ID to
+ * @param resourceID  WorkflowItem's "uuid" including the prefix to remove
+ */
+const constructWorkflowItemIdEndpoint = (endpoint, resourceID) => {
+  const regex = new RegExp(`^${WorkflowItem.type.value}-`);
+  return `${endpoint}/${resourceID.replace(regex, '')}`;
+};
+
 /**
  * A service that provides methods to make REST requests with workflow items endpoint.
  */
 @Injectable({ providedIn: 'root' })
-export class WorkflowItemDataService extends IdentifiableDataService<WorkflowItem> implements SearchData<WorkflowItem>, DeleteData<WorkflowItem> {
+export class WorkflowItemDataService extends IdentifiableDataService<WorkflowItem> implements SearchData<WorkflowItem>, DeleteData<WorkflowItem>, PatchData<WorkflowItem> {
   protected searchByItemLinkPath = 'item';
   protected responseMsToLive = 10 * 1000;
 
   private searchData: SearchDataImpl<WorkflowItem>;
   private deleteData: DeleteDataImpl<WorkflowItem>;
+  private patchData: PatchDataImpl<WorkflowItem>;
 
   constructor(
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
+    protected comparator: DefaultChangeAnalyzer<WorkflowItem>,
   ) {
     super('workflowitems', requestService, rdbService, objectCache, halService);
 
     this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
     this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+    this.patchData = new PatchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.comparator, this.responseMsToLive, constructWorkflowItemIdEndpoint);
   }
 
   /**
@@ -148,4 +168,20 @@ export class WorkflowItemDataService extends IdentifiableDataService<WorkflowIte
   public deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
     return this.deleteData.deleteByHref(href, copyVirtualMetadata);
   }
+
+  commitUpdates(method?: RestRequestMethod): void {
+    this.patchData.commitUpdates(method);
+  }
+
+  createPatchFromCache(object: WorkflowItem): Observable<Operation[]> {
+    return this.patchData.createPatchFromCache(object);
+  }
+
+  patch(object: WorkflowItem, operations: Operation[]): Observable<RemoteData<WorkflowItem>> {
+    return this.patchData.patch(object, operations);
+  }
+
+  update(object: WorkflowItem): Observable<RemoteData<WorkflowItem>> {
+    return this.patchData.update(object);
+  }
 }

src/app/core/submission/workspaceitem-data.service.ts

@@ -3,8 +3,10 @@ import {
   HttpHeaders,
 } from '@angular/common/http';
 import { Injectable } from '@angular/core';
+import { RestRequestMethod } from '@dspace/config/rest-request-method';
 import { hasValue } from '@dspace/shared/utils/empty.util';
 import { Store } from '@ngrx/store';
+import { Operation } from 'fast-json-patch';
 import { Observable } from 'rxjs';
 import {
   find,
@@ -20,6 +22,10 @@ import {
   DeleteDataImpl,
 } from '../data/base/delete-data';
 import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from '../data/base/patch-data';
 import {
   SearchData,
   SearchDataImpl,
@@ -37,15 +43,26 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { NoContent } from '../shared/NoContent.model';
 import { WorkspaceItem } from './models/workspaceitem.model';
 
+/**
+ * Constructs an endpoint taking into account that the WorkspaceItem's "uuid" has a prefix by removing that prefix from the ID
+ * @param endpoint    Endpoint to append ID to
+ * @param resourceID  WorkspaceItem's "uuid" including the prefix to remove
+ */
+const constructWorkspaceItemIdEndpoint = (endpoint, resourceID) => {
+  const regex = new RegExp(`^${WorkspaceItem.type.value}-`);
+  return `${endpoint}/${resourceID.replace(regex, '')}`;
+};
+
 /**
  * A service that provides methods to make REST requests with workspaceitems endpoint.
  */
 @Injectable({ providedIn: 'root' })
-export class WorkspaceitemDataService extends IdentifiableDataService<WorkspaceItem> implements DeleteData<WorkspaceItem>, SearchData<WorkspaceItem>{
+export class WorkspaceitemDataService extends IdentifiableDataService<WorkspaceItem> implements DeleteData<WorkspaceItem>, SearchData<WorkspaceItem>, PatchData<WorkspaceItem> {
   protected linkPath = 'workspaceitems';
   protected searchByItemLinkPath = 'item';
   private deleteData: DeleteData<WorkspaceItem>;
   private searchData: SearchDataImpl<WorkspaceItem>;
+  private patchData: PatchDataImpl<WorkspaceItem>;
 
   constructor(
     protected comparator: DSOChangeAnalyzer<WorkspaceItem>,
@@ -55,10 +72,12 @@ export class WorkspaceitemDataService extends IdentifiableDataService<WorkspaceI
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
-    protected store: Store<CoreState>) {
+    protected store: Store<CoreState>,
+  ) {
     super('workspaceitems', requestService, rdbService, objectCache, halService);
     this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
     this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.patchData = new PatchDataImpl<WorkspaceItem>(this.linkPath, requestService, rdbService, objectCache, halService, this.comparator, this.responseMsToLive, constructWorkspaceItemIdEndpoint);
   }
   public delete(objectId: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
     return this.deleteData.delete(objectId, copyVirtualMetadata);
@@ -137,4 +156,21 @@ export class WorkspaceitemDataService extends IdentifiableDataService<WorkspaceI
   searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<WorkspaceItem>[]): Observable<RemoteData<PaginatedList<WorkspaceItem>>> {
     return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
+
+  commitUpdates(method?: RestRequestMethod): void {
+    this.patchData.commitUpdates(method);
+  }
+
+  createPatchFromCache(object: WorkspaceItem): Observable<Operation[]> {
+    return this.patchData.createPatchFromCache(object);
+  }
+
+  patch(object: WorkspaceItem, operations: Operation[]): Observable<RemoteData<WorkspaceItem>> {
+    return this.patchData.patch(object, operations);
+  }
+
+  update(object: WorkspaceItem): Observable<RemoteData<WorkspaceItem>> {
+    return this.patchData.update(object);
+  }
+
 }

src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts

@@ -276,6 +276,7 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
         { provide: DYNAMIC_FORM_CONTROL_MAP_FN, useValue: dsDynamicFormControlMapFn },
         { provide: LiveRegionService, useValue: getLiveRegionServiceStub() },
         { provide: Actions, useValue: actions$ },
+        { provide: 'sectionDataProvider', useValue: { id: 'mock-section-id' } },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents().then(() => {

src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts

@@ -19,6 +19,7 @@ import {
   OnChanges,
   OnDestroy,
   OnInit,
+  Optional,
   Output,
   PLATFORM_ID,
   QueryList,
@@ -124,6 +125,7 @@ import {
 import { AppState } from '../../../../app.reducer';
 import { EditMetadataSecurityComponent } from '../../../../item-page/edit-item-page/edit-metadata-security/edit-metadata-security.component';
 import { SubmissionObjectActionTypes } from '../../../../submission/objects/submission-objects.actions';
+import { SectionDataObject } from '../../../../submission/sections/models/section-data.model';
 import { SubmissionService } from '../../../../submission/submission.service';
 import { SubmissionObjectService } from '../../../../submission/submission-object.service';
 import { LiveRegionService } from '../../../live-region/live-region.service';
@@ -174,6 +176,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
   @Input() hasErrorMessaging = false;
   @Input() layout = null as DynamicFormLayout;
   @Input() model: any;
+  @Input() arrayIndex: number;
   securityLevel: number;
   relationshipValue$: Observable<ReorderableRelationship>;
   isRelationship: boolean;
@@ -235,6 +238,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
     private actions$: Actions,
     protected renderer: Renderer2,
     @Inject(PLATFORM_ID) protected platformId: string,
+    @Optional() @Inject('sectionDataProvider') public sectionData: SectionDataObject,
   ) {
     super(ref, componentFactoryResolver, layoutService, validationService, dynamicFormComponentService, relationService);
     this.fetchThumbnail = this.appConfig.browseBy.showThumbnails;
@@ -485,6 +489,13 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
       } else if (typeof this.model.value.value === 'string') {
         modalComp.query = this.model.value.value;
       }
+
+      // If the existing value is not virtual, store properties on the modal required to perform a replace operation
+      if (hasValue(this.sectionData) && !this.model.value.isVirtual) {
+        modalComp.replaceValuePlace = this.arrayIndex || 0;
+        modalComp.replaceValueMetadataField = this.model.name;
+        modalComp.replaceValueSection = this.sectionData?.id;
+      }
     }
 
     modalComp.repeatable = this.model.repeatable;

src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html

@@ -40,6 +40,7 @@
               [class.d-none]="_model.hidden"
               [layout]="formLayout"
               [model]="_model"
+              [arrayIndex]="idx"
               [templates]="templates"
               [ngClass]="[getClass('element', 'host', _model), getClass('grid', 'host', _model)]"
               (dfBlur)="onBlur($event)"

src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.spec.ts

@@ -69,6 +69,7 @@ describe('DsDynamicFormArrayComponent', () => {
         { provide: APP_CONFIG, useValue: environment },
         { provide: DYNAMIC_FORM_CONTROL_MAP_FN, useValue: dsDynamicFormControlMapFn },
         { provide: LiveRegionService, useValue: getLiveRegionServiceStub() },
+        { provide: 'sectionDataProvider', useValue: { id: 'mock-section-id' } },
       ],
     }).overrideComponent(DsDynamicFormArrayComponent, {
       remove: {

src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts

@@ -255,6 +255,7 @@ describe('DsDynamicRelationGroupComponent test suite', () => {
         { provide: APP_DATA_SERVICES_MAP, useValue: {} },
         { provide: DYNAMIC_FORM_CONTROL_MAP_FN, useValue: dsDynamicFormControlMapFn },
         { provide: LiveRegionService, useValue: getLiveRegionServiceStub() },
+        { provide: 'sectionDataProvider', useValue: { id: 'mock-section-id' } },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
     })

src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html

@@ -5,10 +5,10 @@ <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relat
   </button>
 </div>
 <div class="modal-body">
-  @if (!item || !collection) {
+  @if (!item || !collection || isSubmitting) {
     <ds-loading></ds-loading>
   }
-  @if (item && collection) {
+  @if (item && collection && !isSubmitting) {
     <ul ngbNav #nav="ngbNav" class="nav-tabs">
       <li ngbNavItem role="presentation">
         <a ngbNavLink>{{'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + relationshipOptions.relationshipType | translate  : { count: (totalInternal$ | async)} }}</a>
@@ -78,18 +78,18 @@ <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relat
   <small>{{ ('submission.sections.describe.relationship-lookup.selected' | translate: {size: (selection$ | async)?.length || 0}) }}</small>
   <div class="d-flex float-end space-children-mr">
     <div class="close-button">
-      <button type="button" [dsBtnDisabled]="isPending" class="btn btn-outline-secondary" (click)="close()">
+      <button type="button" [dsBtnDisabled]="isPending || isSubmitting" class="btn btn-outline-secondary" (click)="close()">
       {{ ('submission.sections.describe.relationship-lookup.close' | translate) }}</button>
     </div>
     @if (isEditRelationship) {
       <button class="btn btn-danger discard"
-        [dsBtnDisabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
+        [dsBtnDisabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending || isSubmitting"
         (click)="discardEv()">
         <i class="fas fa-times"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
       </button>
       <button class="btn btn-primary submit"
-        [dsBtnDisabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
+        [dsBtnDisabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending || isSubmitting"
         (click)="submitEv()">
         @if (isPending) {
           <span class="spinner-border spinner-border-sm me-1" role="status"