From 51f8e4da7aa0b77178268a5b32ad37f2739ffcad Mon Sep 17 00:00:00 2001 From: Swathi-eGov <137176788+Swathi-eGov@users.noreply.github.com> Date: Tue, 15 Oct 2024 17:21:25 +0530 Subject: [PATCH] fixed redirection issue (#1527) * fixed redirection issue * added review cahnge --- 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 | 3 ++- micro-ui/web/package.json | 2 +- micro-ui/web/sandbox/package.json | 2 +- micro-ui/web/workbench/package.json | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/micro-ui/web/core/package.json b/micro-ui/web/core/package.json index e56887adcea..2ef8d67661b 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.44", "@egovernments/digit-ui-libraries": "1.8.2-beta.7", "@egovernments/digit-ui-module-workbench": "1.0.2-beta.8", - "@egovernments/digit-ui-module-core": "1.8.2-beta.20", + "@egovernments/digit-ui-module-core": "1.8.2-beta.21", "@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 fedb9e9a566..5c10bf4eb25 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.20", + "@egovernments/digit-ui-module-core": "1.8.2-beta.21", "@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 18c26fa95b4..5b99a5a923c 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.20", + "version": "1.8.2-beta.21", "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 0ff5296058c..37c3b6764e4 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 @@ -94,11 +94,12 @@ const EmployeeSideBar = () => { if(isMultiRootTenant){ url=url.replace("/sandbox-ui/employee", `/sandbox-ui/${tenantId}/employee`); updatedUrl = url; + history.push(updatedUrl); } else{ updatedUrl = DIGIT_UI_CONTEXTS?.every((e) => url?.indexOf(`/${e}`) === -1) ? hostUrl + "/employee/" + url : hostUrl + url; + window.location.href = updatedUrl; } - history.push(updatedUrl); } else { history.push(url); } diff --git a/micro-ui/web/package.json b/micro-ui/web/package.json index be4172c3971..bfdf14ee546 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.7", "@egovernments/digit-ui-module-workbench": "1.0.2-beta.8", - "@egovernments/digit-ui-module-core": "1.8.2-beta.20", + "@egovernments/digit-ui-module-core": "1.8.2-beta.21", "@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 d7b47598efd..915572c869b 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.44", "@egovernments/digit-ui-module-dss": "1.8.1", - "@egovernments/digit-ui-module-core": "1.8.2-beta.20", + "@egovernments/digit-ui-module-core": "1.8.2-beta.21", "@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 2360039f5da..bcd6d9a1f1d 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.7", "@egovernments/digit-ui-module-workbench": "1.0.2-beta.8", "@egovernments/digit-ui-components": "0.0.2-beta.44", - "@egovernments/digit-ui-module-core": "1.8.2-beta.20", + "@egovernments/digit-ui-module-core": "1.8.2-beta.21", "@egovernments/digit-ui-module-utilities": "1.0.1-beta.39", "@egovernments/digit-ui-react-components": "1.8.2-beta.13", "babel-loader": "8.1.0",