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/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts

@@ -186,7 +186,6 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
    */
   openDropdown(sdRef: NgbDropdown) {
     if (!this.model.readOnly) {
-      this.group.markAsUntouched();
       this.inputText = null;
       this.updatePageInfo(this.model.maxOptions, 1);
       this.loadOptions(false);
@@ -339,4 +338,9 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
     this.currentValue = result;
   }
 
+  onBlur(event: Event) {
+    super.onBlur(event);
+    this.group.markAsTouched();
+  }
+
 }

src/app/shared/form/form.service.ts

@@ -217,7 +217,7 @@ export class FormService {
       });
     }
 
-    field.markAsUntouched();
+    field.markAsUntouched({ onlySelf: true });
   }
 
   public resetForm(formGroup: UntypedFormGroup, groupModel: DynamicFormControlModel[], formId: string) {