View composer fix (#1581)

* VIEW COMPOSER ENHANCE FOR NO CARDSTYLE * package update * changes for card logic
egovernments · Oct 19, 2024 · af16cb3 · af16cb3
1 parent d486681
commit af16cb3
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 21 deletions.
diff --git a/micro-ui/web/core/package.json b/micro-ui/web/core/package.json
@@ -23,7 +23,7 @@
     "@egovernments/digit-ui-module-open-payment":"0.0.1",
     "@egovernments/digit-ui-module-hrms": "1.8.1-beta.1",
     "@egovernments/digit-ui-module-pgr": "1.8.1-beta.1",
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.14",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.15",
     "babel-loader": "8.1.0",
     "react": "17.0.2",
     "react-dom": "17.0.2",

diff --git 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.14",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.15",
     "@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
@@ -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.14",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.15",
     "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
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@egovernments/digit-ui-components": "0.0.2-beta.48",
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.14",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.15",
     "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
@@ -18,7 +18,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.14",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.15",
     "@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
@@ -15,7 +15,7 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.14",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.15",
     "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
@@ -18,7 +18,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.14",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.15",
     "@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
@@ -18,7 +18,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.14",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.15",
     "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
@@ -18,7 +18,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.14",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.15",
     "@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
@@ -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.14",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.15",
     "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
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@egovernments/digit-ui-components": "0.0.2-beta.48",
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.14",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.15",
     "@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
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-react-components",
-  "version": "1.8.2-beta.14",
+  "version": "1.8.2-beta.15",
   "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
@@ -196,13 +196,19 @@ const ViewComposer = ({ isLoading = false, data, cardErrors, ...props }) => {
         {cards
           ?.filter((card) => card?.navigationKey)
           ?.map((card, cardIdx) => {
-            const { sections } = card;
+            const { sections, noCardStyle } = card;
             return (
-              <Card style={activeNav && card.navigationKey ? (activeNav !== card.navigationKey ? { display: "none" } : {}) : {}} className={`employeeCard-override ${card?.cardStyle ? card?.cardStyle : ""}`}>
-                {sections?.map((section, sectionIdx) => {
-                  return renderCardSectionJSX(section);
-                })}
-              </Card>
+              noCardStyle ?
+                <div>
+                  {sections?.map((section, sectionIdx) => {
+                    return renderCardSectionJSX(section);
+                  })}
+                </div> :
+                <Card style={activeNav && card.navigationKey ? (activeNav !== card.navigationKey ? { display: "none" } : {}) : {}} className={`employeeCard-override ${card?.cardStyle ? card?.cardStyle : ""}`}>
+                  {sections?.map((section, sectionIdx) => {
+                    return renderCardSectionJSX(section);
+                  })}
+                </Card>
             );
           })}
       </HorizontalNav>

diff --git a/micro-ui/web/package.json b/micro-ui/web/package.json
@@ -21,7 +21,7 @@
     "@egovernments/digit-ui-module-open-payment":"0.0.1",
     "@egovernments/digit-ui-module-hrms": "1.8.1-beta.1",
     "@egovernments/digit-ui-module-pgr": "1.8.1-beta.1",
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.14",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.15",
     "@egovernments/digit-ui-components": "0.0.2-beta.48",
     "@egovernments/digit-ui-module-dss": "1.8.1",
     "@egovernments/digit-ui-module-common": "1.8.0",

diff --git a/micro-ui/web/sandbox/package.json b/micro-ui/web/sandbox/package.json
@@ -28,7 +28,7 @@
     "@egovernments/digit-ui-module-hrms": "1.8.1-beta.1",
     "@egovernments/digit-ui-module-pgr": "1.8.1-beta.1",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.39",
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.14",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.15",
     "babel-loader": "8.1.0",
     "react": "17.0.2",
     "react-dom": "17.0.2",

diff --git a/micro-ui/web/workbench/package.json b/micro-ui/web/workbench/package.json
@@ -19,7 +19,7 @@
     "@egovernments/digit-ui-components": "0.0.2-beta.48",
     "@egovernments/digit-ui-module-core": "1.8.2-beta.24",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.39",
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.14",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.15",
     "babel-loader": "8.1.0",
     "react": "17.0.2",
     "react-dom": "17.0.2",