Merge branch 'develop' into citizen-redirect-logout

egovernments · Oct 23, 2024 · b237ffd · b237ffd
2 parents 599541d + f394ec7
commit b237ffd
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 7 deletions.
diff --git a/micro-ui/web/core/package.json b/micro-ui/web/core/package.json
@@ -18,7 +18,7 @@
     "@egovernments/digit-ui-components": "0.0.2-beta.48",
     "@egovernments/digit-ui-libraries": "1.8.2-beta.8",
     "@egovernments/digit-ui-module-workbench": "1.0.2-beta.8",
-    "@egovernments/digit-ui-module-core": "1.8.2-beta.24",
+    "@egovernments/digit-ui-module-core": "1.8.2-beta.25",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.39",
     "@egovernments/digit-ui-module-open-payment":"0.0.1",
     "@egovernments/digit-ui-module-hrms": "1.8.1-beta.1",

diff --git a/micro-ui/web/micro-ui-internals/example/package.json b/micro-ui/web/micro-ui-internals/example/package.json
@@ -13,7 +13,7 @@
     "@egovernments/digit-ui-module-workbench": "1.0.2-beta.8",
     "@egovernments/digit-ui-module-pgr": "1.8.1-beta.1",
     "@egovernments/digit-ui-module-dss": "1.8.1",
-    "@egovernments/digit-ui-module-core": "1.8.2-beta.24",
+    "@egovernments/digit-ui-module-core": "1.8.2-beta.25",
     "@egovernments/digit-ui-module-common": "1.8.0",
     "@egovernments/digit-ui-module-hrms": "1.8.1-beta.1",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.39",

diff --git a/micro-ui/web/micro-ui-internals/package.json b/micro-ui/web/micro-ui-internals/package.json
@@ -57,6 +57,7 @@
   "resolutions": {
     "**/@babel/runtime": "7.20.1",
     "**/babel-preset-react-app": "10.0.0",
+    "**/styled-components": "5.0.0",
     "fast-uri":"2.1.0"
   },
   "devDependencies": {

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
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-module-core",
-  "version": "1.8.2-beta.24",
+  "version": "1.8.2-beta.25",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",

diff --git a/...i-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/EmployeeSideBar.js b/...i-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/EmployeeSideBar.js
@@ -126,7 +126,7 @@ const EmployeeSideBar = () => {
       const children = Object.keys(value).map((childKey) => transformItem(childKey, value[childKey]));
       const iconKey = extractLeftIcon(value);
       return {
-        label: key,
+        label: t(key),
         icon: { icon: iconKey, width: "1.5rem", height: "1.5rem" },
         children: children,
       };

diff --git a/micro-ui/web/package.json b/micro-ui/web/package.json
@@ -16,7 +16,7 @@
   "dependencies": {
     "@egovernments/digit-ui-libraries": "1.8.2-beta.8",
     "@egovernments/digit-ui-module-workbench": "1.0.2-beta.8",
-    "@egovernments/digit-ui-module-core": "1.8.2-beta.24",
+    "@egovernments/digit-ui-module-core": "1.8.2-beta.25",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.39",
     "@egovernments/digit-ui-module-open-payment":"0.0.1",
     "@egovernments/digit-ui-module-hrms": "1.8.1-beta.1",

diff --git a/micro-ui/web/sandbox/package.json b/micro-ui/web/sandbox/package.json
@@ -24,7 +24,7 @@
     "@egovernments/digit-ui-module-workbench": "1.0.2-beta.8",
     "@egovernments/digit-ui-components": "0.0.2-beta.48",
     "@egovernments/digit-ui-module-dss": "1.8.1",
-    "@egovernments/digit-ui-module-core": "1.8.2-beta.24",
+    "@egovernments/digit-ui-module-core": "1.8.2-beta.25",
     "@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",
@@ -59,6 +59,7 @@
     "**/babel-loader": "8.2.2",
     "**/@babel/core": "7.14.0",
     "**/@babel/preset-env": "7.14.0",
+    "**/styled-components": "5.0.0",
     "**/@babel/plugin-transform-modules-commonjs": "7.14.0",
     "**/polished":"4.2.2",
     "fast-uri":"2.1.0"

diff --git a/micro-ui/web/workbench/package.json b/micro-ui/web/workbench/package.json
@@ -17,7 +17,7 @@
     "@egovernments/digit-ui-libraries": "1.8.2-beta.8",
     "@egovernments/digit-ui-module-workbench": "1.0.2-beta.8",
     "@egovernments/digit-ui-components": "0.0.2-beta.48",
-    "@egovernments/digit-ui-module-core": "1.8.2-beta.24",
+    "@egovernments/digit-ui-module-core": "1.8.2-beta.25",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.39",
     "@egovernments/digit-ui-react-components": "1.8.2-beta.16",
     "babel-loader": "8.1.0",