From 049113b792f29c8aee98551741c3ec4c9514af2a Mon Sep 17 00:00:00 2001
From: Anton K <ntnkonon@gmail.com>
Date: Tue, 21 Jan 2025 03:32:24 +0100
Subject: [PATCH 1/2] FIO-9515 Fixed Edit grid conditional values not displayed
 in Edit submission

---
 src/components/_classes/component/Component.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/_classes/component/Component.js b/src/components/_classes/component/Component.js
index c6350cfe07..9368766ead 100644
--- a/src/components/_classes/component/Component.js
+++ b/src/components/_classes/component/Component.js
@@ -2207,7 +2207,9 @@ export default class Component extends Element {
     const isConditionallyHidden = this.checkConditionallyHidden(data, row) || this._parentConditionallyHidden;
     if (isConditionallyHidden !== this._conditionallyHidden) {
       this._conditionallyHidden = isConditionallyHidden;
-      this.clearOnHide();
+      if (!this.root.pristine) {
+        this.clearOnHide();
+      }
     }
 
     // Check visibility

From 43e013e02d62a626b41d2cbbf5eb9d69771af049 Mon Sep 17 00:00:00 2001
From: Anton K <ntnkonon@gmail.com>
Date: Wed, 5 Feb 2025 14:51:48 +0100
Subject: [PATCH 2/2] FIO-9515 Added new condition to the EditGrid visibility
 for clearOnHide logic

---
 src/components/editgrid/EditGrid.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/editgrid/EditGrid.js b/src/components/editgrid/EditGrid.js
index 5c21ff9f09..a534ce540f 100644
--- a/src/components/editgrid/EditGrid.js
+++ b/src/components/editgrid/EditGrid.js
@@ -388,7 +388,7 @@ export default class EditGridComponent extends NestedArrayComponent {
       }
     };
 
-    if (_.isEmpty(rows)) {
+    if (!this.root.pristine && _.isEmpty(rows)) {
       const rowComponents = this.createRowComponents({}, 0);
       let checkComponent;