Merge branch 'develop' into how-it-works

egovernments · Oct 18, 2024 · 9af2089 · 9af2089
2 parents b8eb25e + ec8808a
commit 9af2089
Show file tree

Hide file tree

Showing 17 changed files with 44 additions and 30 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.13",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.14",
     "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.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
@@ -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
@@ -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/.../web/micro-ui-internals/packages/modules/core/src/pages/employee/QuickStart/QuickSetup.js b/.../web/micro-ui-internals/packages/modules/core/src/pages/employee/QuickStart/QuickSetup.js
@@ -11,6 +11,12 @@ const FaqComponent = (props) => {
   const { t } = useTranslation();
   const tenantId = Digit.ULBService.getStateId();
   const ListTag = type === "number" ? "ol" : "ul";
+  const handleClick = (e, link) => {
+    e.stopPropagation(); // Stop the event from bubbling up to the parent div
+    if (link) {
+      window.open(link, '_blank', 'noopener noreferrer');
+    }
+  };
   return (
     <div className="faqs border-none" onClick={() => toggleOpen(!isOpen)}>
       <div className="faq-question" style={{ justifyContent: "space-between", display: "flex" }}>
@@ -28,9 +34,13 @@ const FaqComponent = (props) => {
             <li key={index} style={{ listStyleType: ListTag === "ul" ? "disc" : "auto", margin: "8px 0" }}>
               {isLabelLink ? (
                 action?.label ? (
-                  <a className="quickLink" href={`${window.location.host}/${window?.globalPath}/${tenantId}/${action?.link}`} target="_blank" rel="noopener noreferrer">
-                    {t(action?.label)}:
-                  </a>
+                  <a
+                  className="quickLink"
+                  href="#"
+                  onClick={(e) => handleClick(e, `${window.location.host}/${window?.globalPath}/${tenantId}/${action?.link}`)}
+                >
+                  {t(action?.label)}:
+                </a>
                 ) : null
               ) : (
                 action?.label ? <strong>{t(action?.label)}:</strong> : null

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.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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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) */}

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.13",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.14",
     "@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.13",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.14",
     "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.23",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.39",
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.14",
     "babel-loader": "8.1.0",
     "react": "17.0.2",
     "react-dom": "17.0.2",