From 464357c2e6e57b003e91c67c908af5ac1453eaaa Mon Sep 17 00:00:00 2001
From: abishekTa-egov <abishek.t@egovernments.org>
Date: Fri, 18 Oct 2024 17:26:19 +0530
Subject: [PATCH] VIEW COMPOSER ENHANCE FOR NO CARDSTYLE (#1567)

* VIEW COMPOSER ENHANCE FOR NO CARDSTYLE

* package update
---
 .../micro-ui-internals/example/package.json   |  2 +-
 micro-ui/web/micro-ui-internals/package.json  |  2 +-
 .../packages/modules/core/package.json        |  2 +-
 .../packages/modules/dss/package.json         |  2 +-
 .../packages/modules/hrms/package.json        |  2 +-
 .../modules/open-payment/package.json         |  2 +-
 .../packages/modules/pgr/package.json         |  2 +-
 .../packages/modules/sandbox/package.json     |  2 +-
 .../packages/modules/utilities/package.json   |  2 +-
 .../packages/modules/workbench/package.json   |  2 +-
 .../packages/react-components/package.json    |  2 +-
 .../src/hoc/ViewComposer/index.js             | 28 +++++++++++--------
 12 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/example/package.json b/micro-ui/web/micro-ui-internals/example/package.json
index 5cbc8bafc25..6bf21fd1bb5 100644
--- a/micro-ui/web/micro-ui-internals/example/package.json
+++ b/micro-ui/web/micro-ui-internals/example/package.json
@@ -20,7 +20,7 @@
     "@egovernments/digit-ui-module-open-payment":"0.0.1",
     "@egovernments/digit-ui-module-engagement": "1.5.20",
     "@egovernments/digit-ui-components": "0.0.2-beta.48",
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.14",
     "@egovernments/digit-ui-module-sandbox": "0.0.1",
     "http-proxy-middleware": "^1.0.5",
     "react": "17.0.2",
diff --git a/micro-ui/web/micro-ui-internals/package.json b/micro-ui/web/micro-ui-internals/package.json
index 5cc9e0bcce9..01f1509248b 100644
--- a/micro-ui/web/micro-ui-internals/package.json
+++ b/micro-ui/web/micro-ui-internals/package.json
@@ -73,7 +73,7 @@
     "lodash": "4.17.21",
     "microbundle-crl": "0.13.11",
     "@egovernments/digit-ui-components": "0.0.2-beta.48",
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.14",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-hook-form": "6.15.8",
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/package.json b/micro-ui/web/micro-ui-internals/packages/modules/core/package.json
index 2572cfcfcec..1d4c047c0f7 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/package.json
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/package.json
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@egovernments/digit-ui-components": "0.0.2-beta.48",
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.14",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-i18next": "11.16.2",
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json b/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json
index 7dad46c7ed2..5b061d03d7d 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json
+++ b/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json
@@ -18,7 +18,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.14",
     "@egovernments/digit-ui-module-utilities":"1.0.1-beta.39",
     "jsonpath": "^1.1.1",
     "react": "17.0.2",
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json b/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json
index e54496b6890..baa7bad12fd 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json
+++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json
@@ -15,7 +15,7 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.14",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-hook-form": "6.15.8",
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/open-payment/package.json b/micro-ui/web/micro-ui-internals/packages/modules/open-payment/package.json
index 2dc71946773..5d26bdb638b 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/open-payment/package.json
+++ b/micro-ui/web/micro-ui-internals/packages/modules/open-payment/package.json
@@ -18,7 +18,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.14",
     "@egovernments/digit-ui-components": "0.0.2-beta.18",
     "react": "17.0.2",
     "react-dom": "17.0.2",
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json b/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json
index a630eb76658..9e83a7f9721 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json
+++ b/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json
@@ -18,7 +18,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.14",
     "lodash.merge": "^4.6.2",
     "react": "17.0.2",
     "react-dom": "17.0.2",
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/package.json b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/package.json
index 9a3bb471f30..b8d2039dcd1 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/package.json
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/package.json
@@ -18,7 +18,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.14",
     "@egovernments/digit-ui-components": "0.0.2-beta.48",
     "react": "17.0.2",
     "react-date-range": "^1.4.0",
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/utilities/package.json b/micro-ui/web/micro-ui-internals/packages/modules/utilities/package.json
index d1ac0b38a2a..ce49f31ad17 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/utilities/package.json
+++ b/micro-ui/web/micro-ui-internals/packages/modules/utilities/package.json
@@ -20,7 +20,7 @@
   "dependencies": {
     "@cyntler/react-doc-viewer": "1.10.3",
     "@egovernments/digit-ui-components": "0.0.2-beta.48",
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.14",
     "axios": "^1.7.2",
     "react": "17.0.2",
     "react-date-range": "^1.4.0",
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/workbench/package.json b/micro-ui/web/micro-ui-internals/packages/modules/workbench/package.json
index 066ee7e298a..ced75f0dc36 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/workbench/package.json
+++ b/micro-ui/web/micro-ui-internals/packages/modules/workbench/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@egovernments/digit-ui-components": "0.0.2-beta.48",
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.14",
     "@rjsf/core": "5.10.0",
     "@rjsf/utils": "5.10.0",
     "@rjsf/validator-ajv8": "5.10.0",
diff --git a/micro-ui/web/micro-ui-internals/packages/react-components/package.json b/micro-ui/web/micro-ui-internals/packages/react-components/package.json
index 7cac65d3afa..b374e396e9a 100644
--- a/micro-ui/web/micro-ui-internals/packages/react-components/package.json
+++ b/micro-ui/web/micro-ui-internals/packages/react-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-react-components",
-  "version": "1.8.2-beta.13",
+  "version": "1.8.2-beta.14",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",
diff --git a/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/ViewComposer/index.js b/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/ViewComposer/index.js
index fd9874aa576..ebb252fc1fe 100644
--- a/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/ViewComposer/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/ViewComposer/index.js
@@ -164,20 +164,24 @@ const ViewComposer = ({ isLoading = false, data, cardErrors, ...props }) => {
       {cards
         ?.filter((card) => !card?.navigationKey && card?.sections)
         ?.map((card, cardIdx) => {
-          const { sections } = card;
+          const { sections, noCardStyle } = card;
           const hasErrors = cardErrors?.[card?.errorName]?.filter((i) => i?.name === card?.name)?.length > 0;
           return (
-            <Card
-              style={activeNav && card.navigationKey ? (activeNav !== card.navigationKey ? { display: "none" } : {}) : {}}
-              className={`employeeCard-override ${card?.cardStyle ? card?.cardStyle : ""} ${hasErrors ? "card-error" : ""}`}
-              ReactRef={hasErrors ? (el) => (cardRefs.current[cardIdx] = el) : null}
-
->
-              {hasErrors && scrollToCard(cardIdx)}
-              {sections?.map((section, sectionIdx) => {
-                return renderCardSectionJSX(section, cardErrors?.[card?.errorName ? card?.errorName : card?.name]);
-              })}
-            </Card>
+            noCardStyle ?
+              <div>
+                {sections?.map((section, sectionIdx) => {
+                  return renderCardSectionJSX(section, cardErrors?.[card?.errorName ? card?.errorName : card?.name]);
+                })}
+              </div> :
+              <Card
+                style={activeNav && card.navigationKey ? (activeNav !== card.navigationKey ? { display: "none" } : {}) : {}}
+                className={`employeeCard-override ${card?.cardStyle ? card?.cardStyle : ""} ${hasErrors ? "card-error" : ""}`}
+                ReactRef={hasErrors ? (el) => (cardRefs.current[cardIdx] = el) : null}>
+                {hasErrors && scrollToCard(cardIdx)}
+                {sections?.map((section, sectionIdx) => {
+                  return renderCardSectionJSX(section, cardErrors?.[card?.errorName ? card?.errorName : card?.name]);
+                })}
+              </Card>
           );
         })}
       {/* This second section is for rendering cards that are part of the navBar) */}