From bb541f7e690a5291b80424d22b37950e1103e599 Mon Sep 17 00:00:00 2001
From: NJadhavXoriant <Nikita.Jadhav@Xoriant.Com>
Date: Tue, 1 Aug 2023 12:02:22 +0530
Subject: [PATCH 1/2] code changes for excluded fields of Matrix

---
 js/libs/form.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/js/libs/form.js b/js/libs/form.js
index ec800471..d6bf2b18 100644
--- a/js/libs/form.js
+++ b/js/libs/form.js
@@ -1040,6 +1040,16 @@ Fliplet().then(function() {
                     append: false
                   };
                 }
+
+                if (field._type === 'flMatrix') {
+                  formData._flSchema.excludedFields = [];
+
+                  _.forEach(field.rowOptions, function(row) {
+                    var val = row.id ? row.id : row.label;
+
+                    formData._flSchema.excludedFields.push(`${field.name} [${val}]`);
+                  });
+                }
               });
 
               if (entryId && entry && data.dataSourceId) {

From c2df121f0e4db8b92aea88fa5263db00ba1bade1 Mon Sep 17 00:00:00 2001
From: NJadhavXoriant <Nikita.Jadhav@Xoriant.Com>
Date: Wed, 2 Aug 2023 16:06:05 +0530
Subject: [PATCH 2/2] code changes as per PR comments

---
 js/libs/form.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/libs/form.js b/js/libs/form.js
index d6bf2b18..639fb31d 100644
--- a/js/libs/form.js
+++ b/js/libs/form.js
@@ -175,7 +175,7 @@ Fliplet().then(function() {
             _.mapKeys(Fliplet.Navigate.query, function(value, key) {
               if (key === field.defaultValueKey) {
                 _.forEach(field.rowOptions, function(row) {
-                  var val = row.id ? row.id : row.label;
+                  var val = row.id || row.label;
 
                   if (!_.has(matrixValue, val)) {
                     matrixValue[val] = value;
@@ -305,7 +305,7 @@ Fliplet().then(function() {
                 }
 
                 _.forEach(field.rowOptions, function(row) {
-                  var val = row.id ? row.id : row.label;
+                  var val = row.id || row.label;
                   var matrixKey = entry.data[`${fieldKey} [${val}]`] ? entry.data[`${fieldKey} [${val}]`] : entry.data[`${fieldKey}`];
 
                   if (isResetAction) {
@@ -1012,7 +1012,7 @@ Fliplet().then(function() {
                     });
                   } else {
                     _.forEach(field.rowOptions, function(row) {
-                      var val = row.id ? row.id : row.label;
+                      var val = row.id || row.label;
 
                       appendField(`${field.name} [${val}]`, '');
                     });
@@ -1045,7 +1045,7 @@ Fliplet().then(function() {
                   formData._flSchema.excludedFields = [];
 
                   _.forEach(field.rowOptions, function(row) {
-                    var val = row.id ? row.id : row.label;
+                    var val = row.id || row.label;
 
                     formData._flSchema.excludedFields.push(`${field.name} [${val}]`);
                   });