diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/StaticCitizenSideBar.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/StaticCitizenSideBar.js index 929d1c4c856..9cad3e8c00e 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/StaticCitizenSideBar.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/StaticCitizenSideBar.js @@ -114,6 +114,10 @@ const StaticCitizenSideBar = ({ linkData, islinkDataLoading }) => { history.push(`/${window?.contextPath}/citizen/user/profile`); }; + const closeSidebar = () => { + history.push(`/${window?.contextPath}/citizen/all-services`); + }; + let menuItems = [ ...SideBarMenu(t, showProfilePage, redirectToLoginPage, isEmployee), ]; @@ -164,6 +168,16 @@ const StaticCitizenSideBar = ({ linkData, islinkDataLoading }) => { menuItems = menuItems.filter((item) => item?.id !== "login-btn"); menuItems = [ ...menuItems, + { + type: "link", + icon: "HomeIcon", + element: "HOME", + text: t("COMMON_BOTTOM_NAVIGATION_HOME"), + link: isEmployee ? `/${window?.contextPath}/employee` : `/${window?.contextPath}/citizen`, + populators: { + onClick: closeSidebar, + }, + }, { text: t("EDIT_PROFILE"), element: "PROFILE", diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/config/sidebar-menu.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/config/sidebar-menu.js index 06ea554fc12..6408b5f6f7f 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/config/sidebar-menu.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/config/sidebar-menu.js @@ -3,16 +3,6 @@ import { LanguageIcon, LogoutIcon, AddressBookIcon, LocationIcon } from "@egover import ChangeLanguage from "../components/ChangeLanguage"; const SideBarMenu = (t, closeSidebar, redirectToLoginPage, isEmployee) => [ - { - type: "link", - element: "HOME", - text: t("COMMON_BOTTOM_NAVIGATION_HOME"), - link: isEmployee ? `/${window?.contextPath}/employee` : `/${window?.contextPath}/citizen`, - icon: "HomeIcon", - populators: { - onClick: closeSidebar, - }, - }, { type: "component", element: "LANGUAGE", diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/createEmployee.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/createEmployee.js index 51ea3258f37..2f27bd098e1 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/createEmployee.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/createEmployee.js @@ -16,6 +16,7 @@ const CreateEmployee = () => { const { t } = useTranslation(); const history = useHistory(); const isMobile = window.Digit.Utils.browser.isMobile(); + const isMultiRootTenant = Digit.Utils.getMultiRootTenant(); const { data: mdmsData,isLoading } = Digit.Hooks.useCommonMDMS(Digit.ULBService.getStateId(), "egov-hrms", ["CommonFieldsConfig"], { select: (data) => { @@ -146,12 +147,12 @@ const CreateEmployee = () => { const onSubmit = async (data) => { const hasCurrentAssignment = data?.Assignments?.some(assignment => assignment?.isCurrentAssignment === true); - let selectedCity= data?.Jurisdictions?.boundary; + const selectedCity= data?.Jurisdictions?.[0]?.boundary; data.Jurisdictions = data?.Jurisdictions?.map((juris) => { return { ...juris, - boundary: tenantId, - tenantId: tenantId, + boundary: selectedCity, + tenantId: tenantId }; }); // If no current assignment, throw an error @@ -178,7 +179,12 @@ const CreateEmployee = () => { } let roles = data?.Jurisdictions?.map((ele) => { return ele.roles?.map((item) => { - item["tenantId"] = ele.boundary; + if(isMultiRootTenant){ + item["tenantId"] = tenantId; + } + else{ + item["tenantId"] = ele.boundary; + } return item; }); });