Merged in task/dspace-cris-2024_02_x/DSC-2480 (pull request DSpace#3497)

Fix broken read-only form field mechanism in submission forms

Approved-by: Vincenzo Mecca

Author: atarix83

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

@@ -11,14 +11,11 @@ import {
 import { TranslateService } from '@ngx-translate/core';
 import uniqueId from 'lodash/uniqueId';
 
-import {
-  SubmissionVisibilityType,
-  SubmissionVisibilityValue,
-} from '../../../../core/config/models/config-submission-section.model';
+import { SubmissionVisibilityType } from '../../../../core/config/models/config-submission-section.model';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
 import { Metadata } from '../../../../core/shared/metadata.utils';
-import { SubmissionScopeType } from '../../../../core/submission/submission-scope-type';
 import { VocabularyOptions } from '../../../../core/submission/vocabularies/models/vocabulary-options.model';
+import { SubmissionVisibility } from '../../../../submission/utils/visibility.util';
 import { isNgbDateStruct } from '../../../date.util';
 import {
   hasValue,
@@ -330,7 +327,7 @@ export abstract class FieldParser {
 
     // Set read only option
     controlModel.readOnly = this.parserOptions.readOnly
-      || this.isFieldReadOnly(this.configData.visibility, 'test', this.parserOptions.submissionScope);
+      || this.isFieldReadOnly(this.configData.visibility, this.parserOptions.submissionScope);
     controlModel.disabled = controlModel.readOnly;
     controlModel.isModelOfInnerForm = this.parserOptions.isInnerForm;
     if (hasValue(this.configData.selectableRelationship)) {
@@ -372,23 +369,12 @@ export abstract class FieldParser {
   }
 
   /**
-   * Check if a field is read-only with the given scope
+   * Check if a field is read-only within the given scope
    * @param visibility
    * @param submissionScope
    */
-  private isFieldReadOnly(visibility: SubmissionVisibilityType, fieldScope: string, submissionScope: string) {
-    return isNotEmpty(submissionScope)
-      && isNotEmpty(fieldScope)
-      && isNotEmpty(visibility)
-      && ((
-        submissionScope === SubmissionScopeType.WorkspaceItem.valueOf()
-          && visibility.main === SubmissionVisibilityValue.ReadOnly
-      )
-        ||
-          (visibility.other === SubmissionVisibilityValue.ReadOnly
-          && submissionScope === SubmissionScopeType.WorkflowItem.valueOf()
-          )
-      );
+  private isFieldReadOnly(visibility: SubmissionVisibilityType, submissionScope) {
+    return isNotEmpty(submissionScope) && SubmissionVisibility.isReadOnly(visibility, submissionScope);
   }
 
   /**