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

Author: Atmire-Kristof

src/app/init.service.ts

@@ -13,7 +13,7 @@ import {
   TransferState,
   Type,
 } from '@angular/core';
-import { DYNAMIC_FORM_CONTROL_MAP_FN } from '@ng-dynamic-forms/core';
+import { DYNAMIC_FORM_CONTROL_MAP_FN, DYNAMIC_VALIDATORS } from '@ng-dynamic-forms/core';
 import {
   select,
   Store,
@@ -45,6 +45,7 @@ import { MenuService } from './shared/menu/menu.service';
 import { MenuProviderService } from './shared/menu/menu-provider.service';
 import { ThemeService } from './shared/theme-support/theme.service';
 import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider';
+import { CUSTOM_VALIDATORS } from './shared/form/builder/parsers/field-parser';
 
 /**
  * Performs the initialization of the app.
@@ -120,6 +121,10 @@ export abstract class InitService {
         provide: DYNAMIC_FORM_CONTROL_MAP_FN,
         useValue: dsDynamicFormControlMapFn,
       },
+      {
+        provide: DYNAMIC_VALIDATORS,
+        useValue: CUSTOM_VALIDATORS,
+      },
     ];
   }
 

src/app/shared/form/builder/parsers/field-parser.ts

@@ -36,6 +36,7 @@ import { VisibilityType } from './../../../../submission/sections/visibility-typ
 import { setLayout } from './parser.utils';
 import { ParserOptions } from './parser-options';
 import { ParserType } from './parser-type';
+import { AbstractControl, ValidatorFn } from '@angular/forms';
 
 export const SUBMISSION_ID: InjectionToken<string> = new InjectionToken<string>('submissionId');
 export const CONFIG_DATA: InjectionToken<FormFieldModel> = new InjectionToken<FormFieldModel>('configData');
@@ -48,6 +49,28 @@ export const PARSER_OPTIONS: InjectionToken<ParserOptions> = new InjectionToken<
  */
 export const REGEX_FIELD_VALIDATOR = new RegExp('(\\/?)(.+)\\1([gimsuy]*)', 'i');
 
+/**
+ * Define custom form validators here
+ *
+ * Register them by adding their key to a model's validator property, e.g:
+ * ```ts
+ * model.validators = Object.assign({}, model.validators, { notRepeatable: null });
+ * ```
+ */
+export const CUSTOM_VALIDATORS = new Map<string, ValidatorFn>([
+  ['notRepeatable', notRepeatableValidator],
+]);
+
+export function notRepeatableValidator(control: AbstractControl) {
+  const value = control.value;
+  if (!Array.isArray(value) || value.length < 2) {
+    return null;
+  }
+  return {
+    notRepeatable: true,
+  };
+}
+
 export abstract class FieldParser {
 
   protected fieldId: string;
@@ -131,7 +154,11 @@ export abstract class FieldParser {
         },
       };
 
-      return new DynamicRowArrayModel(config, layout);
+      const model = new DynamicRowArrayModel(config, layout);
+      if (config.notRepeatable) {
+        this.addNotRepeatableValidator(model);
+      }
+      return model;
 
     } else {
       const model = this.modelFactory(this.getInitFieldValue());
@@ -426,6 +453,17 @@ export abstract class FieldParser {
       { required: this.configData.mandatoryMessage });
   }
 
+  protected addNotRepeatableValidator(controlModel) {
+    controlModel.validators = Object.assign({}, controlModel.validators, { notRepeatable: null });
+    controlModel.errorMessages = Object.assign(
+      {},
+      controlModel.errorMessages,
+      {
+        notRepeatable: 'error.validation.not.repeatable',
+      },
+    );
+  }
+
   protected setLabel(controlModel, label = true, labelEmpty = false) {
     if (label) {
       controlModel.label = (labelEmpty) ? '&nbsp;' : this.configData.label;

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

@@ -298,6 +298,9 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
    * @private
    */
   private inCurrentSubmissionScope(field: string): boolean {
+    if (!this.sectionMetadata.includes(field)) {
+      return false;
+    }
     const scope = this.formConfig?.rows.find((row: FormRowModel) => {
       if (row.fields?.[0]?.selectableMetadata) {
         return row.fields?.[0]?.selectableMetadata?.[0]?.metadata === field;

src/assets/i18n/en.json5

@@ -1910,6 +1910,8 @@
 
   "error.validation.required": "This field is required",
 
+  "error.validation.not.repeatable": "This field only accepts one value. Please discard the additional ones.",
+
   "error.validation.NotValidEmail": "This is not a valid email",
 
   "error.validation.emailTaken": "This email is already taken",