Merge pull request #4450 from DSpace/backport-4434-to-dspace-7_x

[Port dspace-7_x] Resolve field instance models using index when filtering errors

Author: tdonohue

src/app/shared/form/form.component.ts

@@ -190,7 +190,7 @@ export class FormComponent implements OnDestroy, OnInit {
               }
 
               if (field) {
-                const model: DynamicFormControlModel = this.formBuilderService.findById(fieldId, formModel);
+                const model: DynamicFormControlModel = this.formBuilderService.findById(fieldId, formModel, fieldIndex);
                 this.formService.addErrorToField(field, model, error.message);
                 this.changeDetectorRef.detectChanges();
 
@@ -213,7 +213,7 @@ export class FormComponent implements OnDestroy, OnInit {
               }
 
               if (field) {
-                const model: DynamicFormControlModel = this.formBuilderService.findById(fieldId, formModel);
+                const model: DynamicFormControlModel = this.formBuilderService.findById(fieldId, formModel, fieldIndex);
                 this.formService.removeErrorFromField(field, model, error.message);
               }
             });