BUGFIX/HCMPRE-1634: fix for versions #149 #158 (#2031)

* Update UserManagement.js (#2017) Co-authored-by: Nipun Arora <aroranipun1@gmail.com> * updated core version (#2020) * Bugfix/hcmpre 1583 (#2021) * Update MicroplanSearch.js * Pagination issues --------- Co-authored-by: Nipun Arora <aroranipun1@gmail.com> * BUGFIX/HCMPRE-1634: fix for versions (#2024) * Revert "Bugfix/hcmpre 1583 (#2021)" This reverts commit 201a0ce. * BUGFIX/HCMPRE-1634 Revert ing"updated core version (#2020)" * BUGFIX/HCMPRE-1583 fixes --------- Co-authored-by: Swathi-eGov <swathi.chatrathi@egovernments.org> * FEATURE/HCMPRE-1634:Fixed all the version updates (#2026) FEATURE/HCMPRE-1634: Fixed all the version updates * Update package.json --------- Co-authored-by: Swathi-eGov <137176788+Swathi-eGov@users.noreply.github.com> Co-authored-by: Nipun Arora <aroranipun1@gmail.com> Co-authored-by: abishekTa-egov <abishek.t@egovernments.org> Co-authored-by: Swathi-eGov <swathi.chatrathi@egovernments.org>
egovernments · Dec 16, 2024 · 6f6f7d5 · 6f6f7d5
1 parent 3b51c0a
commit 6f6f7d5
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 29 deletions.
diff --git a/health/micro-ui/web/core/package.json b/health/micro-ui/web/core/package.json
@@ -14,10 +14,10 @@
   "dependencies": {
     "@egovernments/digit-ui-libraries": "1.8.6",
     "@egovernments/digit-ui-module-workbench": "1.0.11",
-    "@egovernments/digit-ui-module-core": "1.8.11",
+    "@egovernments/digit-ui-module-core": "1.8.12",
     "@egovernments/digit-ui-module-utilities": "1.0.10",
     "@egovernments/digit-ui-components":"0.0.2-beta.56",
-    "@egovernments/digit-ui-react-components": "1.8.10",
+    "@egovernments/digit-ui-react-components": "1.8.12",
     "@egovernments/digit-ui-module-hcmworkbench":"0.1.0",
     "@egovernments/digit-ui-module-campaign-manager": "0.3.0",
     "react": "17.0.2",

diff --git a/health/micro-ui/web/micro-ui-internals/example/package.json b/health/micro-ui/web/micro-ui-internals/example/package.json
@@ -11,10 +11,10 @@
   "devDependencies": {
     "@egovernments/digit-ui-libraries": "1.8.6",
     "@egovernments/digit-ui-module-workbench": "1.0.11",
-    "@egovernments/digit-ui-components": "0.0.2-beta.56",
-    "@egovernments/digit-ui-module-core": "1.8.11",
+    "@egovernments/digit-ui-components": "0.0.2-beta.58",
+    "@egovernments/digit-ui-module-core": "1.8.12",
     "@egovernments/digit-ui-module-utilities": "1.0.3",
-    "@egovernments/digit-ui-react-components": "1.8.10",
+    "@egovernments/digit-ui-react-components": "1.8.12",
     "@egovernments/digit-ui-module-hcmworkbench": "0.1.0",
     "@egovernments/digit-ui-module-campaign-manager": "0.3.0",
     "@egovernments/digit-ui-module-microplan": "0.0.1",

diff --git a/health/micro-ui/web/micro-ui-internals/example/public/index.html b/health/micro-ui/web/micro-ui-internals/example/public/index.html
@@ -11,8 +11,8 @@
   <meta name="theme-color" content="#00bcd1" />
   <title>DIGIT</title>
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.3/dist/index.css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.42/dist/index.css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.2.2/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.43/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.2.3/dist/index.css" />
 
 
   <!-- added below css for hcm-workbench module inclusion-->

diff --git a/health/micro-ui/web/micro-ui-internals/package.json b/health/micro-ui/web/micro-ui-internals/package.json
@@ -51,8 +51,8 @@
     "*.{js,css,md}": "prettier --write"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.8.10",
-    "@egovernments/digit-ui-components": "0.0.2-beta.56",
+    "@egovernments/digit-ui-react-components": "1.8.12",
+    "@egovernments/digit-ui-components": "0.0.2-beta.58",
     "ajv": "8.12.0",
     "lodash": "4.17.21",
     "microbundle-crl": "0.13.11",

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/package.json b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/package.json
@@ -19,8 +19,8 @@
   },
   "dependencies": {
     "@cyntler/react-doc-viewer": "1.10.3",
-    "@egovernments/digit-ui-components": "0.0.2-beta.56",
-    "@egovernments/digit-ui-react-components": "1.8.10",
+    "@egovernments/digit-ui-components": "0.0.2-beta.58",
+    "@egovernments/digit-ui-react-components": "1.8.12",
     "@rjsf/core": "5.10.0",
     "@rjsf/utils": "5.10.0",
     "@rjsf/validator-ajv8": "5.10.0",

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/package.json b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/package.json
@@ -18,8 +18,8 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.8.10",
-    "@egovernments/digit-ui-components": "0.0.2-beta.56",
+    "@egovernments/digit-ui-react-components": "1.8.12",
+    "@egovernments/digit-ui-components": "0.0.2-beta.58",
     "react": "17.0.2",
     "react-date-range": "^1.4.0",
     "react-dom": "17.0.2",

diff --git a/...i/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/MicroplanSearch.js b/...i/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/MicroplanSearch.js
@@ -16,6 +16,7 @@ const MicroplanSearch = () => {
   const [tabData, setTabData] = useState(
     TabSearchconfig?.TabSearchconfig?.map((configItem, index) => ({ key: index, label: configItem.label, active: index === 0 ? true : false }))
   ); // setting number of tab component and making first index enable as default
+  const [key,setKey] = useState(0)
   useEffect(() => {
     // Set default values when component mounts
     setDefaultValues(defaultSearchValues);
@@ -28,10 +29,10 @@ const MicroplanSearch = () => {
     const url = new URL(window.location.href);
     url.searchParams.set("tabId", `${n}`);
     window.history.replaceState({}, "", url);
-
+    setKey(prev => prev+1)
   };
   return (
-    <React.Fragment>
+    <React.Fragment key={key}>
 
       <Header styles={{ fontSize: "32px" }}>{ t(`SEARCH_${config?.label}`) }</Header>
       <div className="inbox-search-wrapper">

diff --git a/...o-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/MyMicroplans.js b/...o-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/MyMicroplans.js
@@ -20,18 +20,18 @@ const MyMicroplans = () => {
     // Set default values when component mounts
     setDefaultValues(defaultSearchValues);
   }, []);
-
+  const [key,setKey] = useState(0);
   const onTabChange = (n) => {
 
     setTabData((prev) => prev.map((i, c) => ({ ...i, active: c === n ? true : false }))); //setting tab enable which is being clicked
     // setConfig(TabSearchconfig?.TabSearchconfig?.[n]);// as per tab number filtering the config
     const url = new URL(window.location.href);
     url.searchParams.set("tabId", `${n}`);
     window.history.replaceState({}, "", url);
-
+    setKey((prev)=>prev+1);
   };
   return (
-    <React.Fragment>
+    <React.Fragment key={key}>
 
       <Header styles={{ fontSize: "32px" }}>{t("MY_MICROPLANS_HEADING")}</Header>
       <div className="inbox-search-wrapper">

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/workbench-hcm/package.json b/health/micro-ui/web/micro-ui-internals/packages/modules/workbench-hcm/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@egovernments/digit-ui-libraries": "1.8.0-beta.2",
-    "@egovernments/digit-ui-react-components": "1.8.10",
+    "@egovernments/digit-ui-react-components": "1.8.12",
     "@rjsf/core": "5.10.0",
     "@rjsf/utils": "5.10.0",
     "@rjsf/validator-ajv8": "5.10.0",

diff --git a/health/micro-ui/web/microplan/package.json b/health/micro-ui/web/microplan/package.json
@@ -14,12 +14,12 @@
   "homepage": "/microplan-ui",
   "dependencies": {
     "@egovernments/digit-ui-libraries": "1.8.6",
-    "@egovernments/digit-ui-module-core": "1.8.11",
+    "@egovernments/digit-ui-module-core": "1.8.12",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.23",
-    "@egovernments/digit-ui-react-components": "1.8.10",
+    "@egovernments/digit-ui-react-components": "1.8.12",
     "@egovernments/digit-ui-module-hcmmicroplanning": "0.0.2",
     "@egovernments/digit-ui-module-microplan": "0.0.1",
-    "@egovernments/digit-ui-components": "0.0.2-beta.56",
+    "@egovernments/digit-ui-components": "0.0.2-beta.58",
     "@egovernments/digit-ui-module-campaign-manager": "0.3.0",
     "babel-loader": "8.1.0",
     "clean-webpack-plugin": "4.0.0",

diff --git a/health/micro-ui/web/package.json b/health/micro-ui/web/package.json
@@ -16,10 +16,10 @@
   "dependencies": {
     "@egovernments/digit-ui-libraries": "1.8.2-beta.8",
     "@egovernments/digit-ui-module-workbench": "1.0.2-beta.7",
-    "@egovernments/digit-ui-module-core": "1.8.11",
+    "@egovernments/digit-ui-module-core": "1.8.12",
     "@egovernments/digit-ui-module-hrms": "1.8.0-beta.2",
-    "@egovernments/digit-ui-react-components": "1.8.10",
-    "@egovernments/digit-ui-components": "0.0.2-beta.56",
+    "@egovernments/digit-ui-react-components": "1.8.12",
+    "@egovernments/digit-ui-components": "0.0.2-beta.58",
     "@egovernments/digit-ui-module-dss": "1.8.0-beta",
     "@egovernments/digit-ui-module-common": "1.8.0-beta",
     "@egovernments/digit-ui-module-utilities": "1.0.0-beta",

diff --git a/health/micro-ui/web/public/index.html b/health/micro-ui/web/public/index.html
@@ -8,7 +8,7 @@
     href="https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400;500;700&family=Roboto:wght@400;500;700&display=swap"
     rel="stylesheet" type="text/css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.3/dist/index.css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.42/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.43/dist/index.css" />
   <!-- added below css for hcm-workbench module inclusion-->
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.2.2/dist/index.css" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />

diff --git a/health/micro-ui/web/workbench/package.json b/health/micro-ui/web/workbench/package.json
@@ -14,10 +14,10 @@
   "dependencies": {
     "@egovernments/digit-ui-libraries": "1.8.6",
     "@egovernments/digit-ui-module-workbench": "1.0.11",
-    "@egovernments/digit-ui-module-core": "1.8.11",
+    "@egovernments/digit-ui-module-core": "1.8.12",
     "@egovernments/digit-ui-module-utilities": "1.0.10",
-    "@egovernments/digit-ui-components": "0.0.2-beta.56",
-    "@egovernments/digit-ui-react-components": "1.8.10",
+    "@egovernments/digit-ui-components": "0.0.2-beta.58",
+    "@egovernments/digit-ui-react-components": "1.8.12",
     "@egovernments/digit-ui-module-hcmworkbench":"0.1.0",
     "@egovernments/digit-ui-module-campaign-manager": "0.3.0",
     "react": "17.0.2",