Merge branch 'w2p-136580_Replace-plaintext-relationship-7.6' into w2p-136580_Replace-plaintext-relationship-main

Author: Atmire-Kristof

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"

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

@@ -47,6 +47,7 @@ import {
   RemoveRelationshipAction,
   ReplaceRelationshipAction,
 } from './relationship.actions';
+import { SubmissionService } from '../../../../../submission/submission.service';
 
 describe('DsDynamicLookupRelationModalComponent', () => {
   let component: DsDynamicLookupRelationModalComponent;
@@ -71,6 +72,7 @@ describe('DsDynamicLookupRelationModalComponent', () => {
   let lookupRelationService;
   let rdbService;
   let submissionId;
+  let submissionService;
 
   const externalSources = [
     Object.assign(new ExternalSource(), {
@@ -125,6 +127,9 @@ describe('DsDynamicLookupRelationModalComponent', () => {
       aggregate: createSuccessfulRemoteDataObject$(externalSources),
     });
     submissionId = '1234';
+    submissionService = jasmine.createSpyObj('submissionService', {
+      getSubmissionSaveProcessingStatus: observableOf(false),
+    });
   }
 
   beforeEach(waitForAsync(() => {
@@ -156,6 +161,7 @@ describe('DsDynamicLookupRelationModalComponent', () => {
         },
         { provide: XSRFService, useValue: {} },
         { provide: NgZone, useValue: new NgZone({}) },
+        { provide: SubmissionService, useValue: submissionService },
         { provide: APP_DATA_SERVICES_MAP, useValue: {} },
         { provide: APP_CONFIG, useValue: { cache: { msToLive: { default: 15 * 60 * 1000 } } } },
         NgbActiveModal,

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

@@ -72,6 +72,7 @@ import {
 } from './relationship.actions';
 import { ThemedDynamicLookupRelationSearchTabComponent } from './search-tab/themed-dynamic-lookup-relation-search-tab.component';
 import { DsDynamicLookupRelationSelectionTabComponent } from './selection-tab/dynamic-lookup-relation-selection-tab.component';
+import { SubmissionService } from '../../../../../submission/submission.service';
 
 @Component({
   selector: 'ds-dynamic-lookup-relation-modal',
@@ -231,6 +232,16 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
    */
   isPending = false;
 
+  /**
+   * Show a loading indicator if the form is currently submitting to avoid race conditions between requests
+   */
+  isSubmitting = false;
+
+  /**
+   * Open subscriptions
+   */
+  subs = [];
+
   constructor(
     public modal: NgbActiveModal,
     private selectableListService: SelectableListService,
@@ -242,6 +253,7 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
     private zone: NgZone,
     private store: Store<AppState>,
     private router: Router,
+    protected submissionService: SubmissionService,
   ) {
 
   }
@@ -294,6 +306,14 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
         }));
     }
 
+    if (hasValue(this.submissionId)) {
+      this.subs.push(
+        this.submissionService.getSubmissionSaveProcessingStatus(this.submissionId).subscribe((isSubmitting) => {
+          this.isSubmitting = isSubmitting;
+        }),
+      );
+    }
+
     this.setTotals();
   }
 
@@ -407,6 +427,7 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
   ngOnDestroy() {
     this.router.navigate([], {});
     Object.values(this.subMap).forEach((subscription) => subscription.unsubscribe());
+    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
   }
 
   /* eslint-disable no-empty,@typescript-eslint/no-empty-function */