From ed4a165d42dc2308999be720aa5ed396a669568c Mon Sep 17 00:00:00 2001 From: Swathi-eGov <137176788+Swathi-eGov@users.noreply.github.com> Date: Wed, 23 Oct 2024 09:05:12 +0530 Subject: [PATCH 1/2] added localization for parent keys in sidebar (#1624) --- micro-ui/web/core/package.json | 2 +- micro-ui/web/micro-ui-internals/example/package.json | 2 +- .../web/micro-ui-internals/packages/modules/core/package.json | 2 +- .../src/components/TopBarSideBar/SideBar/EmployeeSideBar.js | 2 +- micro-ui/web/package.json | 2 +- micro-ui/web/sandbox/package.json | 2 +- micro-ui/web/workbench/package.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/micro-ui/web/core/package.json b/micro-ui/web/core/package.json index 20cddac0646..d32347da9ff 100644 --- 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 index d0ee06ee5d6..4891e7eb08d 100644 --- 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/packages/modules/core/package.json b/micro-ui/web/micro-ui-internals/packages/modules/core/package.json index fd8941c11ad..24a479552a9 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 @@ -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/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/EmployeeSideBar.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/EmployeeSideBar.js index 37c3b6764e4..bf32300eb5a 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/EmployeeSideBar.js +++ b/micro-ui/web/micro-ui-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 index 5b3a14d1c7a..8f0bad8a774 100644 --- 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 index 4fb97eb1e08..6975302bbde 100644 --- 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", diff --git a/micro-ui/web/workbench/package.json b/micro-ui/web/workbench/package.json index 228d35337e8..ab271ba5130 100644 --- 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", From f394ec7256ead03f5f863dd1f2b638cfb5ce89e2 Mon Sep 17 00:00:00 2001 From: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> Date: Wed, 23 Oct 2024 12:00:42 +0530 Subject: [PATCH 2/2] build issue fix --- micro-ui/web/micro-ui-internals/package.json | 1 + micro-ui/web/sandbox/package.json | 1 + 2 files changed, 2 insertions(+) diff --git a/micro-ui/web/micro-ui-internals/package.json b/micro-ui/web/micro-ui-internals/package.json index 62b7b9b73e1..6649cc90af1 100644 --- 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/sandbox/package.json b/micro-ui/web/sandbox/package.json index 6975302bbde..9bd5be78859 100644 --- a/micro-ui/web/sandbox/package.json +++ b/micro-ui/web/sandbox/package.json @@ -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"