Merge remote-tracking branch 'contrib/w2p-129946_enforce-non-repeatable-fields-in-submission-forms-7.6' into w2p-129946_enforce-non-repeatable-fields-in-submission-forms-main

Author: ybnd

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

@@ -279,7 +279,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
           true,
           true,
           ... itemLinksToFollow(this.fetchThumbnail, this.appConfig.item.showAccessStatuses)).pipe(
-          getAllSucceededRemoteData(),
+          getFirstSucceededRemoteData(),
           getRemoteDataPayload());
         this.relationshipValue$ = observableCombineLatest([this.item$.pipe(take(1)), relationship$]).pipe(
           switchMap(([item, relationship]: [Item, Relationship]) =>

src/app/submission/sections/form/section-form.component.ts

@@ -275,17 +275,23 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
       }
     });
 
-    const diffResult = [];
-
     // compare current form data state with section data retrieved from store
-    const diffObj = difference(sectionDataToCheck, this.formData);
+    const diffFromObj = this.hasDifferences(sectionDataToCheck, this.formData);
+    const diffToObj = this.hasDifferences(this.formData, sectionDataToCheck);
+
+    return diffFromObj || diffToObj;
+  }
+
+  private hasDifferences(object1: object, object2: object) {
+    const diffResult = [];
+    const diffObj = difference(object1, object2);
 
     // iterate over differences to check whether they are actually different
     Object.keys(diffObj)
       .forEach((key) => {
         diffObj[key].forEach((value) => {
           // the findIndex extra check excludes values already present in the form but in different positions
-          if (value.hasOwnProperty('value') && findIndex(this.formData[key], { value: value.value }) < 0) {
+          if (value.hasOwnProperty('value') && findIndex(object2[key], { value: value.value }) < 0) {
             diffResult.push(value);
           }
         });

src/app/submission/sections/sections.service.ts

@@ -522,6 +522,9 @@ export class SectionsService {
       rawData.rows.forEach((currentRow) => {
         if (currentRow.fields && !isEmpty(currentRow.fields)) {
           currentRow.fields.forEach((field) => {
+            if (field.selectableRelationship) {
+              metadata.push(`relation.${field.selectableRelationship.relationshipType}`);
+            }
             if (field.selectableMetadata && !isEmpty(field.selectableMetadata)) {
               field.selectableMetadata.forEach((selectableMetadata) => {
                 if (!metadata.includes(selectableMetadata.metadata)) {