From 42026b36d52b4468cc93b6e1f0ad8c108bad9211 Mon Sep 17 00:00:00 2001
From: Alisa Ismailati <alisa.ismailati@4science.com>
Date: Fri, 16 Jun 2023 15:31:45 +0200
Subject: [PATCH] [DURACOM-152] refactored concatenated fields visibility

---
 .../ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts    | 2 ++
 src/app/shared/form/builder/parsers/concat-field-parser.ts  | 6 +-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts
index 1d6037a409..dc7c796648 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts
@@ -46,6 +46,7 @@ export class DynamicConcatModel extends DynamicFormGroupModel {
   @serializable() submissionId: string;
   @serializable() hasSelectableMetadata: boolean;
   @serializable() metadataValue: MetadataValue;
+  @serializable() readOnly?: boolean;
 
   isCustomGroup = true;
   valueUpdates: Subject<string>;
@@ -65,6 +66,7 @@ export class DynamicConcatModel extends DynamicFormGroupModel {
     this.valueUpdates = new Subject<string>();
     this.valueUpdates.subscribe((value: string) => this.value = value);
     this.typeBindRelations = config.typeBindRelations ? config.typeBindRelations : [];
+    this.readOnly = config.disabled;
   }
 
   get value() {
diff --git a/src/app/shared/form/builder/parsers/concat-field-parser.ts b/src/app/shared/form/builder/parsers/concat-field-parser.ts
index b849698857..e86de70c81 100644
--- a/src/app/shared/form/builder/parsers/concat-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/concat-field-parser.ts
@@ -19,8 +19,6 @@ import {
   SUBMISSION_ID
 } from './field-parser';
 import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-form-ui/models/ds-dynamic-input.model';
-import { VisibilityType } from '../../../../submission/sections/visibility-type';
-import isEqual from 'lodash/isEqual';
 
 export class ConcatFieldParser extends FieldParser {
 
@@ -85,9 +83,7 @@ export class ConcatFieldParser extends FieldParser {
       input1ModelConfig.required = true;
     }
 
-    if (isNotEmpty(this.configData.visibility) && isEqual(this.configData.visibility.main, VisibilityType.READONLY)) {
-      concatGroup.disabled = true;
-    }
+    concatGroup.disabled = input1ModelConfig.readOnly;
 
     if (isNotEmpty(this.firstPlaceholder)) {
       input1ModelConfig.placeholder = this.firstPlaceholder;