Merged in task/dspace-cris-2023_02_x/DSC-1876 (pull request DSpace#2140)

[DSC-1876] port of [CST-14979] block type binding in modal

Approved-by: Francesco Molinaro

Author: NikitaKr1vonosov

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

@@ -361,7 +361,7 @@ export class FormBuilderService extends DynamicFormService {
 
   modelFromConfiguration(submissionId: string, json: string | SubmissionFormsModel, scopeUUID: string, sectionData: any = {},
                          submissionScope?: string, readOnly = false, typeBindModel = null,
-                         isInnerForm = false, securityConfig: any = null): DynamicFormControlModel[] | never {
+                         isInnerForm = false, securityConfig: any = null, setTypeBind: boolean = true): DynamicFormControlModel[] | never {
      let rows: DynamicFormControlModel[] = [];
      const rawData = typeof json === 'string' ? JSON.parse(json, parseReviver) : json;
     if (rawData.rows && !isEmpty(rawData.rows)) {
@@ -378,12 +378,14 @@ export class FormBuilderService extends DynamicFormService {
       });
     }
 
-    if (hasNoValue(typeBindModel)) {
-      typeBindModel = this.findById(this.typeField, rows);
-    }
+    if (setTypeBind) {
+      if (hasNoValue(typeBindModel)) {
+        typeBindModel = this.findById(this.typeField, rows);
+      }
 
-    if (hasValue(typeBindModel)) {
-      this.setTypeBindModel(typeBindModel);
+      if (hasValue(typeBindModel)) {
+        this.setTypeBindModel(typeBindModel);
+      }
     }
     return rows;
   }

src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts

@@ -314,7 +314,12 @@ export class SubmissionSectionUploadFileEditComponent
       configForm,
       this.collectionId,
       this.fileData.metadata,
-      this.submissionService.getSubmissionScope()
+      this.submissionService.getSubmissionScope(),
+      false,
+      null,
+      false,
+      null,
+      false
     );
     formModel.push(new DynamicFormGroupModel(metadataGroupModelConfig, BITSTREAM_METADATA_FORM_GROUP_LAYOUT));
     const accessConditionTypeModelConfig = Object.assign({}, BITSTREAM_FORM_ACCESS_CONDITION_TYPE_CONFIG);