Skip to content

Commit 42026b3

Browse files
[DURACOM-152] refactored concatenated fields visibility
1 parent d00ad0c commit 42026b3

2 files changed

Lines changed: 3 additions & 5 deletions

File tree

src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ export class DynamicConcatModel extends DynamicFormGroupModel {
4646
@serializable() submissionId: string;
4747
@serializable() hasSelectableMetadata: boolean;
4848
@serializable() metadataValue: MetadataValue;
49+
@serializable() readOnly?: boolean;
4950

5051
isCustomGroup = true;
5152
valueUpdates: Subject<string>;
@@ -65,6 +66,7 @@ export class DynamicConcatModel extends DynamicFormGroupModel {
6566
this.valueUpdates = new Subject<string>();
6667
this.valueUpdates.subscribe((value: string) => this.value = value);
6768
this.typeBindRelations = config.typeBindRelations ? config.typeBindRelations : [];
69+
this.readOnly = config.disabled;
6870
}
6971

7072
get value() {

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ import {
1919
SUBMISSION_ID
2020
} from './field-parser';
2121
import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-form-ui/models/ds-dynamic-input.model';
22-
import { VisibilityType } from '../../../../submission/sections/visibility-type';
23-
import isEqual from 'lodash/isEqual';
2422

2523
export class ConcatFieldParser extends FieldParser {
2624

@@ -85,9 +83,7 @@ export class ConcatFieldParser extends FieldParser {
8583
input1ModelConfig.required = true;
8684
}
8785

88-
if (isNotEmpty(this.configData.visibility) && isEqual(this.configData.visibility.main, VisibilityType.READONLY)) {
89-
concatGroup.disabled = true;
90-
}
86+
concatGroup.disabled = input1ModelConfig.readOnly;
9187

9288
if (isNotEmpty(this.firstPlaceholder)) {
9389
input1ModelConfig.placeholder = this.firstPlaceholder;

0 commit comments

Comments
 (0)