Skip to content

Commit b520399

Browse files
committed
[DSC-2480] Align code with 2023_02_x version
1 parent 09a903a commit b520399

1 file changed

Lines changed: 3 additions & 16 deletions

File tree

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

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import uniqueId from 'lodash/uniqueId';
1414
import { SubmissionVisibilityType } from '../../../../core/config/models/config-submission-section.model';
1515
import { MetadataValue } from '../../../../core/shared/metadata.models';
1616
import { Metadata } from '../../../../core/shared/metadata.utils';
17-
import { SubmissionScopeType } from '../../../../core/submission/submission-scope-type';
1817
import { VocabularyOptions } from '../../../../core/submission/vocabularies/models/vocabulary-options.model';
1918
import { SubmissionVisibility } from '../../../../submission/utils/visibility.util';
2019
import { isNgbDateStruct } from '../../../date.util';
@@ -328,7 +327,7 @@ export abstract class FieldParser {
328327

329328
// Set read only option
330329
controlModel.readOnly = this.parserOptions.readOnly
331-
|| this.isFieldReadOnly(this.configData.visibility, 'test', this.parserOptions.submissionScope);
330+
|| this.isFieldReadOnly(this.configData.visibility, this.parserOptions.submissionScope);
332331
controlModel.disabled = controlModel.readOnly;
333332
controlModel.isModelOfInnerForm = this.parserOptions.isInnerForm;
334333
if (hasValue(this.configData.selectableRelationship)) {
@@ -372,22 +371,10 @@ export abstract class FieldParser {
372371
/**
373372
* Check if a field is read-only within the given scope
374373
* @param visibility
375-
* @param fieldScope
376374
* @param submissionScope
377375
*/
378-
private isFieldReadOnly(visibility: SubmissionVisibilityType, fieldScope: string, submissionScope: string) {
379-
return isNotEmpty(submissionScope)
380-
&& isNotEmpty(fieldScope)
381-
&& isNotEmpty(visibility)
382-
&& ((
383-
submissionScope === SubmissionScopeType.WorkspaceItem.valueOf()
384-
&& SubmissionVisibility.isReadOnly(visibility, SubmissionScopeType.WorkspaceItem)
385-
)
386-
||
387-
(submissionScope === SubmissionScopeType.WorkflowItem.valueOf()
388-
&& SubmissionVisibility.isReadOnly(visibility, SubmissionScopeType.WorkflowItem)
389-
)
390-
);
376+
private isFieldReadOnly(visibility: SubmissionVisibilityType, submissionScope) {
377+
return isNotEmpty(submissionScope) && SubmissionVisibility.isReadOnly(visibility, submissionScope);
391378
}
392379

393380
/**

0 commit comments

Comments
 (0)