From 48b513803bd5b7ef8b7c7696fb74ecc03aaa5d51 Mon Sep 17 00:00:00 2001
From: NabeelAyubee <nayubi7@gmail.com>
Date: Thu, 5 Sep 2024 18:47:33 +0530
Subject: [PATCH 01/23] Application Management Updated

> module master added
> boundary update
> workbench enhance
---
 .../example/src/setupProxy.js                 |   3 +-
 .../css/src/pages/employee/sandbox.scss       |  65 +++++-
 .../packages/libraries/src/hooks/store.js     |   2 +-
 .../libraries/src/services/atoms/urls.js      |   1 +
 .../services/elements/TenantConfigService.js  |  13 ++
 .../src/services/molecules/Store/service.js   |  25 ++-
 .../packages/modules/core/src/Module.js       |   2 +-
 .../core/src/components/ErrorBoundaries.js    |   6 +-
 .../core/src/components/ErrorComponent.js     |  14 +-
 .../modules/core/src/components/Home.js       |   2 +-
 .../core/src/hooks/useTenantConfigSearch.js   |  16 ++
 .../core/src/pages/employee/SignUp/config.js  |   2 +-
 .../core/src/pages/employee/ViewUrl/index.js  |  25 ++-
 .../sandbox/src/configs/UICustomizations.js   |  33 +--
 .../modules/sandbox/src/hooks/index.js        |   8 +-
 .../src/hooks/useDefaultMasterHandler.js      |  26 +++
 .../applicationMgmt/ApplicationHome.js        |   3 +-
 .../applicationMgmt/ModuleMasterTable.js      |  81 ++++++-
 .../employee/applicationMgmt/SetupMaster.js   | 197 ++++++++++++++++++
 .../config/setupMasterConfig.js               |  77 +++++++
 .../sandbox/src/pages/employee/index.js       |   2 +
 .../workbench/src/configs/searchMDMSConfig.js |   2 +-
 .../src/pages/employee/MDMSSearchv2.js        |  21 +-
 .../workbench/src/pages/employee/MDMSView.js  |  16 +-
 .../workbench/src/pages/employee/index.js     | 106 ++++++----
 25 files changed, 655 insertions(+), 93 deletions(-)
 create mode 100644 micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/TenantConfigService.js
 create mode 100644 micro-ui/web/micro-ui-internals/packages/modules/core/src/hooks/useTenantConfigSearch.js
 create mode 100644 micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/hooks/useDefaultMasterHandler.js
 create mode 100644 micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/SetupMaster.js
 create mode 100644 micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/config/setupMasterConfig.js

diff --git a/micro-ui/web/micro-ui-internals/example/src/setupProxy.js b/micro-ui/web/micro-ui-internals/example/src/setupProxy.js
index 8b80311fdb0..e4d96aefb02 100644
--- a/micro-ui/web/micro-ui-internals/example/src/setupProxy.js
+++ b/micro-ui/web/micro-ui-internals/example/src/setupProxy.js
@@ -92,7 +92,8 @@ module.exports = function (app) {
     "/project-factory",
     "/project-factory/v1/data/_autoGenerateBoundaryCode",
     "/billing-service/bill/v2/_fetchbill",
-    "/tenant-management"
+    "/tenant-management",
+    "/default-data-handler"
   ].forEach((location) => app.use(location, createProxy));
   ["/pb-egov-assets"].forEach((location) => app.use(location, assetsProxy));
   ["/mdms-v2/v2/_create"].forEach((location) => app.use(location, mdmsProxy));
diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss
index 7345361a20d..dd9bc74070c 100644
--- a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss
+++ b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss
@@ -92,7 +92,7 @@
   align-self: flex-start;
   margin-bottom: 3rem;
   font-size: 14px;
-  margin-top: -2.5rem;
+  margin-top: -0.5rem;
   color: #505a5f;
   font-family: "Roboto";
 }
@@ -240,7 +240,7 @@
     margin-top: 0.5rem;
   }
   .sandbox-url-footer {
-    margin-top: -1.5rem;
+    margin-top: 0.5rem;
   }
   .digit-button-primary {
     width: 100%;
@@ -254,3 +254,64 @@
     color: #00703c !important;
   }
 }
+.sandbox-url-wrapper {
+  display: flex;
+  width: 100%;
+  .digit-text-input-field.urlInputText {
+  }
+  .digit-button-secondary.large.copyButton {
+    width: 30%;
+    padding: 0;
+  }
+}
+
+.setupMasterSetupActionBar {
+  margin-top: 2.5rem;
+  margin-bottom: -1rem;
+  margin-left: -1rem;
+  margin-right: -1rem;
+  z-index: 1000;
+  box-shadow: 0 -0.063rem 0.125rem 0 rgba(0, 0, 0, 0.14902);
+  padding: 1.5rem;
+  display: flex;
+  flex-direction: row-reverse;
+}
+.digit-employee-card.sandboxSetupMasterInfo {
+  .h1.headerFlex {
+    display: flex;
+    gap: 1rem;
+    align-items: center;
+  }
+  .digit-card-header.subHeader {
+    font-size: 1.5rem;
+    font-weight: 700;
+    color: unset !important;
+  }
+}
+.digit-card-header.setupMaster-subheading {
+  font-size: 1.5rem;
+  color: unset !important;
+  margin-left: 1.5rem;
+}
+.digit-popup-wrapper.masterHandlerPopup {
+  .digit-popup-header {
+    .header-close-container {
+      .digit-popup-close {
+        display: none !important;
+      }
+    }
+  }
+}
+.digit-topbar-ulb {
+  .state {
+    width: 80px;
+    height: 19px;
+  }
+}
+.digit-popup-footer.masterHandlerPopUpFooter {
+  .digit-popup-footer-buttons {
+    margin-left: unset;
+    width: 100%;
+    justify-content: center;
+  }
+}
diff --git a/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/store.js b/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/store.js
index f9550c4d1df..bb12fab4fa6 100644
--- a/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/store.js
+++ b/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/store.js
@@ -10,7 +10,7 @@ export const useStore = ({ stateCode, moduleCode, language ,modulePrefix = "rain
 export const useInitStore = (stateCode, enabledModules,modulePrefix = "rainmaker" ) => {
   const { isLoading, error, isError, data } = useQuery(
     ["initStore", stateCode, enabledModules,modulePrefix],
-    () => StoreService.digitInitData(stateCode, enabledModules ,modulePrefix),
+    () => StoreService.digitInitData(stateCode, enabledModules ,modulePrefix, window?.globalPath === "sandbox-ui" ? true : false),
     {
       staleTime: Infinity,
     }
diff --git a/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js b/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js
index b14bb453e3d..778ae369ac2 100644
--- a/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js
+++ b/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js
@@ -2,6 +2,7 @@ const mdmsV1Path = window?.globalConfigs?.getConfig("MDMS_V1_CONTEXT_PATH") || "
 const mdmsV2Path = window?.globalConfigs?.getConfig("MDMS_V2_CONTEXT_PATH") || "mdms-v2";
 const Urls = {
   MDMS: `/${mdmsV1Path}/v1/_search`,
+  TenantConfigSearch: `/tenant-management/tenant/config/_search`,
   WorkFlow: `/egov-workflow-v2/egov-wf/businessservice/_search`,
   WorkFlowProcessSearch: `/egov-workflow-v2/egov-wf/process/_search`,
   localization: `/localization/messages/v1/_search`,
diff --git a/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/TenantConfigService.js b/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/TenantConfigService.js
new file mode 100644
index 00000000000..33e42326452
--- /dev/null
+++ b/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/TenantConfigService.js
@@ -0,0 +1,13 @@
+import { ServiceRequest } from "../atoms/Utils/Request";
+import Urls from "../atoms/urls";
+
+export const TenantConfigSearch = {
+  tenant: (stateCode) =>
+    ServiceRequest({
+      serviceName: "tenantConfigSearch",
+      url: Urls.TenantConfigSearch,
+      data: {},
+      useCache: true,
+      params: { code: stateCode },
+    }),
+};
diff --git a/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Store/service.js b/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Store/service.js
index 13016c84380..ffa862b2394 100644
--- a/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Store/service.js
+++ b/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Store/service.js
@@ -2,6 +2,7 @@ import { LocalizationService } from "../../elements/Localization/service";
 import { MdmsService } from "../../elements/MDMS";
 import { Storage } from "../../atoms/Utils/Storage";
 import { ApiCacheService } from "../../atoms/ApiCacheService";
+import { TenantConfigSearch } from "../../elements/TenantConfigService";
 
 const getImgUrl = (url, fallbackUrl) => {
   if (!url && fallbackUrl) {
@@ -30,7 +31,7 @@ const addLogo = (id, url, fallbackUrl = "") => {
 
 const renderTenantLogos = (stateInfo, tenants) => {
   addLogo(stateInfo.code, stateInfo.logoUrl);
-  tenants.forEach((tenant) => {
+  tenants?.forEach((tenant) => {
     addLogo(tenant.code, tenant.logoId, stateInfo.logoUrl);
   });
 };
@@ -54,21 +55,25 @@ export const StoreService = {
     });
     return await Promise.all(allBoundries);
   },
-  digitInitData: async (stateCode, enabledModules , modulePrefix) => {
+  digitInitData: async (stateCode, enabledModules, modulePrefix, tenantConfigFetch) => {
     const { MdmsRes } = await MdmsService.init(stateCode);
-    const stateInfo = MdmsRes["common-masters"]?.StateInfo?.[0]||{};
-    const uiHomePage = MdmsRes["common-masters"]?.uiHomePage?.[0]||{};
+    const stateInfo = MdmsRes["common-masters"]?.StateInfo?.[0] || {};
+    const uiHomePage = MdmsRes["common-masters"]?.uiHomePage?.[0] || {};
+    const tenantConfigs = await TenantConfigSearch.tenant(stateCode);
+    const tenantConfigSearch = tenantConfigs?.tenantConfigs ? tenantConfigs?.tenantConfigs : null;
     const localities = {};
     const revenue_localities = {};
     const initData = {
       languages: stateInfo.hasLocalisation ? stateInfo.languages : [{ label: "ENGLISH", value: Digit.Utils.getDefaultLanguage() }],
       stateInfo: {
-        code: stateInfo.code,
-        name: stateInfo.name,
-        logoUrl: stateInfo.logoUrl,
-        statelogo: stateInfo.statelogo,
-        logoUrlWhite: stateInfo.logoUrlWhite,
-        bannerUrl: stateInfo.bannerUrl,
+        code: tenantConfigFetch ? tenantConfigSearch?.[0]?.code : stateInfo.code,
+        name: tenantConfigFetch ? tenantConfigSearch?.[0]?.name : stateInfo.name,
+        logoUrl: tenantConfigFetch ? tenantConfigSearch?.[0]?.documents?.find((item) => item.type === "logoUrl")?.url : stateInfo.logoUrl,
+        statelogo: tenantConfigFetch ? tenantConfigSearch?.[0]?.documents?.find((item) => item.type === "statelogo")?.url : stateInfo.statelogo,
+        logoUrlWhite: tenantConfigFetch
+          ? tenantConfigSearch?.[0]?.documents?.find((item) => item.type === "logoUrlWhite")?.url
+          : stateInfo.logoUrlWhite,
+        bannerUrl: tenantConfigFetch ? tenantConfigSearch?.[0]?.documents?.find((item) => item.type === "bannerUrl")?.url : stateInfo.bannerUrl,
       },
       localizationModules: stateInfo.localizationModules,
       modules: MdmsRes?.tenant?.citymodule?.filter((module) => module?.active)?.filter((module) => enabledModules?.includes(module?.code))?.sort((x,y)=>x?.order-y?.order)|| [],
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/Module.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/Module.js
index d7beef867e3..f9374c23234 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/Module.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/Module.js
@@ -120,7 +120,7 @@ const componentsToRegister = {
   ChangeCity,
   ChangeLanguage,
   PrivacyComponent,
-  OtpComponent
+  OtpComponent,
 };
 
 export const initCoreComponents = () => {
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/ErrorBoundaries.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/ErrorBoundaries.js
index 42b619b3c7a..61ff0d99d61 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/ErrorBoundaries.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/ErrorBoundaries.js
@@ -18,12 +18,12 @@ const Redircter = () => {
 class ErrorBoundary extends React.Component {
   constructor(props) {
     super(props);
-    this.state = { error: null, errorStack: null, hasError: false };
+    this.state = { error: null, errorStack: null, hasError: false, module: null, action: null, info: null };
   }
 
   static getDerivedStateFromError(error) {
     // Update state so the next render will show the fallback UI.
-    return { error: error?.message, hasError: true, errorStack: error?.stack };
+    return { error: error?.message, hasError: true, errorStack: error?.stack, module: error?.module, action: error?.action, info: error?.info };
   }
 
   componentDidCatch(error, errorInfo) {
@@ -40,7 +40,7 @@ class ErrorBoundary extends React.Component {
       return (
         <div className="error-boundary">
           <Redircter />
-          <ErrorComponent initData={this.props.initData} />
+          <ErrorComponent initData={this.props.initData} errorData={this.state} />
 
           {/* <summary>Something went wrong</summary>
           <details style={{ whiteSpace: "pre-wrap" }}>
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/ErrorComponent.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/ErrorComponent.js
index de347f17efe..e1cbe998713 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/ErrorComponent.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/ErrorComponent.js
@@ -19,11 +19,19 @@ const ErrorConfig = {
   },
 };
 
+const ModuleBasedErrorConfig = {
+  sandbox: {
+    imgUrl: `https://s3.ap-south-1.amazonaws.com/egov-qa-assets/error-image.png`,
+    infoMessage: "WRONG_TENANT_SIGN_UP",
+    buttonInfo: "CREATE_TENANT_ERROR_BUTTON",
+  },
+};
+
 const ErrorComponent = (props) => {
   const { type = "error" } = Digit.Hooks.useQueryParams();
-  const config = ErrorConfig[type];
+  const module = props?.errorData?.module;
   const { t } = useTranslation();
-
+  const config = module ? ModuleBasedErrorConfig[module] : ErrorConfig[type];
   const stateInfo = props.stateInfo;
 
   return (
@@ -33,7 +41,7 @@ const ErrorComponent = (props) => {
         <h1>{t(config.infoMessage)}</h1>
         <button
           onClick={() => {
-            props.goToHome();
+            module ? props?.errorData?.action() : props.goToHome();
           }}
         >
           {t(config.buttonInfo)}
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Home.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Home.js
index 1035c5e3e92..a9d05d0fb6e 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Home.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Home.js
@@ -143,7 +143,7 @@ const EmployeeHome = ({ modules, additionalComponent }) => {
     <>
       <div className="employee-app-container digit-home-employee-app">
         <div className="ground-container moduleCardWrapper gridModuleWrapper digit-home-moduleCardWrapper">
-          {modules.map(({ code }, index) => {
+          {modules?.map(({ code }, index) => {
             const Card =
               Digit.ComponentRegistryService.getComponent(`${code}Card`) ||
               (() => <React.Fragment />);
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/hooks/useTenantConfigSearch.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/hooks/useTenantConfigSearch.js
new file mode 100644
index 00000000000..cf0c8ce267f
--- /dev/null
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/hooks/useTenantConfigSearch.js
@@ -0,0 +1,16 @@
+import { useQuery } from "react-query";
+
+const tenantConfigSearchService = async ({ tenantId, filter, pagination }) => {
+  const response = await Digit.CustomService.getResponse({
+    url: "/tenant-management/tenant/config/_search",
+    body: {},
+    params: {
+      code: tenantId,
+    },
+  });
+  return response?.tenantConfigs;
+};
+
+export const useTenantConfigSearch = ({ tenantId, filter, pagination, config = {} }) => {
+  return useQuery(["SEARCH_TENANT_CONFIG", tenantId, filter, pagination], () => tenantConfigSearchService({ tenantId, filter, pagination }), config);
+};
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/employee/SignUp/config.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/employee/SignUp/config.js
index bcc7e36731d..a0512c0b8b5 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/employee/SignUp/config.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/employee/SignUp/config.js
@@ -28,7 +28,7 @@ export const SignUpConfig = [
           name: "accountName",
           validation: {
             required: true,
-            patter: /^[A-Za-z][A-Za-z-' ]*[A-Za-z]$/,
+            pattern: /^[A-Za-z]+( [A-Za-z]+)*$/,
           },
           error: "ERR_ACCOUNT_NAME_REQUIRED",
         },
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/employee/ViewUrl/index.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/employee/ViewUrl/index.js
index 0e8720b7b1d..196cda49623 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/employee/ViewUrl/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/employee/ViewUrl/index.js
@@ -1,5 +1,5 @@
-import React from "react";
-import { BackLink, Button, Card, CardHeader, CardText, FieldV1, SVG } from "@egovernments/digit-ui-components";
+import React, { useRef } from "react";
+import { BackLink, Button, Card, CardHeader, CardLabel, CardText, FieldV1, SVG, TextInput } from "@egovernments/digit-ui-components";
 import { useTranslation } from "react-i18next";
 import { useRouteMatch, useHistory, useLocation } from "react-router-dom";
 import Background from "../../../components/Background";
@@ -10,6 +10,7 @@ const ViewUrl = () => {
   const location = useLocation();
   const { tenant } = location.state || {};
   const history = useHistory();
+  const ref = useRef(null);
 
   const onButtonClick = () => {
     window.location.href = `/${window?.globalPath}/${tenant}/employee`;
@@ -17,6 +18,11 @@ const ViewUrl = () => {
     // pathname: `/${window?.globalPath}/${tenant}/employee`,
     // });
   };
+
+  const handleCopyUrl = () => {
+    navigator.clipboard.writeText(ref.current.value);
+  };
+
   return (
     <Background>
       <div className="employeeBackbuttonAlign">
@@ -31,7 +37,7 @@ const ViewUrl = () => {
           {t("SANDBOX_HEADER")}
         </CardHeader>
         <CardText className="cardText-sandbox">{t("SAMDBOX_URL_SUB")}</CardText>
-        <FieldV1
+        {/* <FieldV1
           className="field-sandbox"
           withoutLabel={false}
           label={t("SANDBOX_URL")}
@@ -40,7 +46,18 @@ const ViewUrl = () => {
           value={`${window.location.host}/${window?.globalPath}/${tenant}`}
           placeholder={t("SANDBOX_URL_PLACEHOLDER")}
           populators={{}}
-        />
+        /> */}
+        <CardLabel> {t("SANDBOX_URL")} </CardLabel>
+        <div className="sandbox-url-wrapper">
+          <TextInput
+            inputRef={ref}
+            className={"urlInputText"}
+            onChange={() => {}}
+            nonEditable={true}
+            value={`${window.location.host}/${window?.globalPath}/${tenant}`}
+          />
+          <Button className="copyButton" variation={"secondary"} onClick={() => handleCopyUrl()} label={t("COPY_URL")}></Button>
+        </div>
         <div className="sandbox-url-footer">{t("SANDBOX_URL_FOOT")}</div>
         <Button onClick={onButtonClick} label={t("SIGN_IN")}></Button>
       </Card>
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/configs/UICustomizations.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/configs/UICustomizations.js
index c42cb548851..0c1d80d5df1 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/configs/UICustomizations.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/configs/UICustomizations.js
@@ -180,7 +180,7 @@ export const UICustomizations = {
     preProcess: (data, additionalDetails) => {
       const tenantId = Digit.ULBService.getCurrentTenantId();
       data.params = {
-        tenantId: tenantId
+        tenantId: tenantId,
       };
       data.body = { RequestInfo: data.body.RequestInfo };
       data.body.MdmsCriteria = {
@@ -200,7 +200,7 @@ export const UICustomizations = {
         const temp = data?.MdmsRes?.["sandbox-ui"]?.ModuleMasterConfig?.find((item) => item?.module === additionalDetails?.moduleName);
         return {
           module: temp?.module,
-          master: temp?.master?.filter((item) => item.type === "module" || item.type === "common"),
+          master: temp?.master?.filter((item) => item.type === "module" || item.type === "common" || item.type === "boundary"),
         };
       };
 
@@ -235,19 +235,28 @@ export const UICustomizations = {
           return value;
 
         case "SANDBOX_ACTIONS":
-          const handleRedirect = (value) => {
-            window.history.pushState(
-              null,
-              "",
-              `/${window.contextPath}/employee/workbench/mdms-search-v2?moduleName=${value?.split(".")?.[0]}&masterName=${value?.split(".")?.[1]}`
-            );
-            const navEvent = new PopStateEvent("popstate");
-            window.dispatchEvent(navEvent);
+          const handleRedirect = (value, type) => {
+            if (type === "boundary") {
+              window.history.pushState(
+                null,
+                "",
+                `/${window.contextPath}/employee/workbench/upload-boundary?hierarchyType=${value}&from=sandbox`
+              );
+              const navEvent = new PopStateEvent("popstate");
+              window.dispatchEvent(navEvent);
+            } else {
+              window.history.pushState(
+                null,
+                "",
+                `/${window.contextPath}/employee/workbench/mdms-search-v2?moduleName=${value?.split(".")?.[0]}&masterName=${value?.split(".")?.[1]}`
+              );
+              const navEvent = new PopStateEvent("popstate");
+              window.dispatchEvent(navEvent);
+            }
           };
-
           return (
             <div>
-              <SVG.Edit style={{ cursor: "pointer" }} onClick={() => handleRedirect(row?.code)} />
+              <SVG.Edit style={{ cursor: "pointer" }} onClick={() => handleRedirect(row?.code, row?.type)} />
             </div>
           );
         default:
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/hooks/index.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/hooks/index.js
index 47137510d10..f837af04ab0 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/hooks/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/hooks/index.js
@@ -1,16 +1,18 @@
 import { useIndividualView } from "./useIndividualView";
 import utils from "../utils";
+import useDefaultMasterHandler from "./useDefaultMasterHandler";
 const sandbox = {
-  useIndividualView
+  useIndividualView,
+  useDefaultMasterHandler,
 };
 
 const Hooks = {
-  sandbox
+  sandbox,
 };
 
 const Utils = {
   browser: {
-    sandbox: () => { },
+    sandbox: () => {},
   },
   sandbox: {
     ...utils,
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/hooks/useDefaultMasterHandler.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/hooks/useDefaultMasterHandler.js
new file mode 100644
index 00000000000..72752fd020a
--- /dev/null
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/hooks/useDefaultMasterHandler.js
@@ -0,0 +1,26 @@
+import { useMutation } from "react-query";
+
+const defaultMasterHandlerService = async (reqData, tenantId) => {
+  try {
+    const response = await Digit.CustomService.getResponse({
+      url: "/default-data-handler/defaultdata/setup",
+      body: {
+        targetTenantId: tenantId,
+        module: reqData?.module,
+        onlySchemas: reqData?.onlySchemas,
+      },
+      params: {},
+    });
+    return response;
+  } catch (error) {
+    throw new Error(error?.response?.data?.Errors?.[0].description);
+  }
+};
+
+const useDefaultMasterHandler = (tenantId) => {
+  return useMutation((reqData) => {
+    return defaultMasterHandlerService(reqData, tenantId);
+  });
+};
+
+export default useDefaultMasterHandler;
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/ApplicationHome.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/ApplicationHome.js
index f95257835a2..9448b85ab13 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/ApplicationHome.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/ApplicationHome.js
@@ -34,7 +34,8 @@ const ApplicationHome = () => {
             className="sandbox-module-card"
             label={t(`SANDBOX_APPLICATION_MODULE_${item?.module}`)}
             buttonLabel={t(`SANDBOX_VIEW`)}
-            onButtonClick={() => history.push(`/${window?.contextPath}/employee/sandbox/application-management/module?module=${item?.module}`)}
+            onButtonClick={() => history.push(`/${window?.contextPath}/employee/sandbox/application-management/setup-master?module=${item?.module}`)}
+            // onButtonClick={() => history.push(`/${window?.contextPath}/employee/sandbox/application-management/module?module=${item?.module}`)}
           />
         ))}
       </div>
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/ModuleMasterTable.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/ModuleMasterTable.js
index 36f919334d4..e4a6ab0c1ff 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/ModuleMasterTable.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/ModuleMasterTable.js
@@ -1,6 +1,7 @@
-import React from "react";
+import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Header, InboxSearchComposer } from "@egovernments/digit-ui-react-components";
+import { Button, PopUp, Toast } from "@egovernments/digit-ui-components";
 import { useHistory, useLocation } from "react-router-dom";
 import { moduleMasterConfig } from "./config/moduleMasterConfig";
 
@@ -11,11 +12,42 @@ const ModuleMasterTable = () => {
   const searchParams = new URLSearchParams(location.search);
   const module = searchParams.get("module");
   const config = moduleMasterConfig(module);
-
+  const tenantId = Digit.ULBService.getCurrentTenantId();
+  const [showPopUp, setShowPopUp] = useState(true);
+  const { mutate: useDefaultMasterHandler } = Digit.Hooks.sandbox.useDefaultMasterHandler(tenantId);
+  const [showToast, setShowToast] = useState(null);
   const onClickRow = ({ original: row }) => {
     const value = row?.code;
-    history.push(
-      `/${window.contextPath}/employee/workbench/mdms-search-v2?moduleName=${value?.split(".")?.[0]}&masterName=${value?.split(".")?.[1]}`
+    const type = row?.type;
+    if (type === "boundary") {
+      history.push(
+        `/${window.contextPath}/employee/workbench/upload-boundary?hierarchyType=${value}&from=sandbox&module=${module}`
+      );
+    } else {
+      history.push(
+        `/${window.contextPath}/employee/workbench/mdms-search-v2?moduleName=${value?.split(".")?.[0]}&masterName=${
+          value?.split(".")?.[1]
+        }&from=sandbox&screen=applicationManagement&action=view`
+      );
+    }
+  };
+  const handleMasterData = async (check) => {
+    await useDefaultMasterHandler(
+      {
+        module: module,
+        onlySchemas: check,
+      },
+      {
+        onError: (error, variables) => {
+          console.log(error);
+          setShowPopUp(false);
+          setShowToast({ key: "error", label: error, isError: true });
+        },
+        onSuccess: async (data) => {
+          setShowPopUp(false);
+          setShowToast({ key: "success", label: "SUCCESS" });
+        },
+      }
     );
   };
   return (
@@ -31,6 +63,47 @@ const ModuleMasterTable = () => {
           }}
         ></InboxSearchComposer>
       </div>
+      {showPopUp && (
+        <PopUp
+          type={"default"}
+          className={"masterHandlerPopup"}
+          footerclassName={"masterHandlerPopUpFooter"}
+          heading={t("ES_CAMPAIGN_UPLOAD_BOUNDARY_DATA_MODAL_HEADER")}
+          children={[<div>{t("ES_CAMPAIGN_UPLOAD_BOUNDARY_DATA_MODAL_TEXT")}</div>]}
+          onOverlayClick={() => {}}
+          footerChildren={[
+            <Button
+              type={"button"}
+              size={"large"}
+              variation={"secondary"}
+              label={t("SANDBOX_MANNUAL_MASTER_LOAD")}
+              onClick={() => {
+                handleMasterData(true);
+              }}
+            />,
+            <Button
+              type={"button"}
+              size={"large"}
+              variation={"primary"}
+              label={t("SANDBOX_DEFAULT_MASTER_LOAD")}
+              onClick={() => {
+                handleMasterData(false);
+              }}
+            />,
+          ]}
+          sortFooterChildren={true}
+          onClose={() => {}}
+        ></PopUp>
+      )}
+      {showToast && (
+        <Toast
+          type={showToast?.isError ? "error" : "success"}
+          // error={showToast?.isError}
+          label={t(showToast?.label)}
+          isDleteBtn={"true"}
+          onClose={() => setShowToast(false)}
+        />
+      )}
     </React.Fragment>
   );
 };
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/SetupMaster.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/SetupMaster.js
new file mode 100644
index 00000000000..76c07abbce2
--- /dev/null
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/SetupMaster.js
@@ -0,0 +1,197 @@
+import React, { Fragment, useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { CardSubHeader, Header, InboxSearchComposer } from "@egovernments/digit-ui-react-components";
+import { useHistory, useLocation } from "react-router-dom";
+import { moduleMasterConfig } from "./config/moduleMasterConfig";
+import { Button, Card, CardHeader, CardText, SVG } from "@egovernments/digit-ui-components";
+import { setupMasterConfig } from "./config/setupMasterConfig";
+
+const renderHierarchy = (categories) => {
+  return (
+    <ul>
+      {categories.map((category, index) => (
+        <li key={index}>
+          <CardText className="setupMaster-subChild">{index + 1 + ") " + category.master}</CardText>
+          {category.child && category.child.length > 0 && (
+            <ul>
+              {category.child.map((subCategory, subIndex) => (
+                <li key={subIndex}>
+                  <CardText>{String.fromCharCode(97 + subIndex) + ") " + subCategory.master}</CardText>
+                  {subCategory.child && subCategory.child.length > 0 && (
+                    <ul>
+                      {subCategory.child.map((grandChild, grandIndex) => (
+                        <li key={grandIndex}>
+                          <CardText>{String.fromCharCode(97 + grandIndex) + ") " + grandChild.master}</CardText>
+                        </li>
+                      ))}
+                    </ul>
+                  )}
+                </li>
+              ))}
+            </ul>
+          )}
+        </li>
+      ))}
+    </ul>
+  );
+};
+
+const SetupMaster = () => {
+  const { t } = useTranslation();
+  const location = useLocation();
+  const history = useHistory();
+  const tenantId = Digit.ULBService.getCurrentTenantId();
+  const searchParams = new URLSearchParams(location.search);
+  const module = searchParams.get("module");
+  const config = setupMasterConfig?.SetupMaster?.filter((item) => item.module === module)?.[0];
+  const [showMaster, setShowMaster] = useState(false);
+  const { isLoading: moduleMasterLoading, data: moduleMasterData } = Digit.Hooks.useCustomMDMS(
+    tenantId,
+    "sandbox-ui",
+    [{ name: "ModuleMasterConfig" }],
+    {
+      select: (data) => {
+        // return data?.["sandbox-ui"]?.ModuleMasterConfig?.filter((item) => item?.module === module);
+        function categorizeData(data) {
+          const result = {};
+
+          data.forEach((item) => {
+            const masterItems = item.master;
+            masterItems.forEach((entry) => {
+              const { code, type } = entry;
+
+              // Initialize type category
+              if (!result[type]) {
+                result[type] = [];
+              }
+
+              // Extract code before and after the dot
+              const [beforeDot, afterDot] = code.split(".");
+
+              // Find or create the category before the dot
+              let category = result[type].find((cat) => cat.master === beforeDot);
+              if (!category) {
+                category = { master: beforeDot, child: [] };
+                result[type].push(category);
+              }
+
+              // If there is an afterDot, add it as a child
+              if (afterDot) {
+                category.child.push({ master: afterDot });
+              } else {
+                // If there is no dot, just add the item to the child array of its own category
+                if (code !== beforeDot) {
+                  // Avoid adding items without dots
+                  category.child.push({ master: code });
+                }
+              }
+            });
+          });
+
+          return result;
+        }
+
+        // Transform the data
+        return categorizeData(data?.["sandbox-ui"]?.ModuleMasterConfig?.filter((item) => item?.module === module));
+      },
+      enabled: true,
+    },
+    true
+  );
+
+  const onClickRow = ({ original: row }) => {
+    const value = row?.code;
+    history.push(
+      `/${window.contextPath}/employee/workbench/mdms-search-v2?moduleName=${value?.split(".")?.[0]}&masterName=${
+        value?.split(".")?.[1]
+      }&from=sandbox&screen=applicationManagement&action=view`
+    );
+  };
+
+  return (
+    <Card className={"sandboxSetupMasterInfo"}>
+      {!showMaster && (
+        <>
+          <Header className="headerFlex" styles={{ fontSize: "32px" }}>
+            <SVG.Announcement height={40} width={40} />
+            {t(config?.header || "N/A")}
+          </Header>
+          <CardText>{t(config?.description)}</CardText>
+          {config?.features?.length > 0 && <CardHeader className="subHeader"> {t("FEATURES")}</CardHeader>}
+          {config?.features?.length > 0 &&
+            config?.features?.map((item, index) => (
+              <li key={index} style={{ display: "flex", alignItems: "center" }}>
+                <span style={{ marginRight: "0.5rem" }}>{index + 1}. </span>
+                <span style={{ marginRight: "0.5rem" }}>{t(item.name)}</span>
+              </li>
+            ))}
+          <div className="setupMasterSetupActionBar">
+            <Button
+              className="actionButton"
+              label={t(config.actionText)}
+              variation={"secondary"}
+              icon="ArrowForward"
+              isSuffix={true}
+              onClick={(e) => {
+                e.preventDefault();
+                setShowMaster(true);
+              }}
+            ></Button>
+          </div>
+        </>
+      )}
+      {showMaster && (
+        <>
+          <Header className="headerFlex" styles={{ fontSize: "32px" }}>
+            <SVG.Announcement height={40} width={40} />
+            {t(config?.header || "N/A")}
+          </Header>
+          <CardText>{t(config?.description)}</CardText>
+          {/* {Object.keys(moduleMasterData)?.length > 0 &&
+            Object.keys(moduleMasterData)?.map((item, index) => (
+              <li key={index} style={{ display: "flex", alignItems: "center" }}>
+                <span style={{ marginRight: "0.5rem" }}>{t(item)}</span>
+                {moduleMasterData?.[item]?.length > 0 &&
+                  moduleMasterData?.[item]?.map((subItem, subIndex) => (
+                    <li key={subIndex} style={{ display: "flex", alignItems: "center" }}>
+                      <span style={{ marginRight: "0.5rem" }}>{subIndex + 1}. </span>
+                      <span style={{ marginRight: "0.5rem" }}>{t(subItem)}</span>
+                      {subItem?.child?.length > 0 &&
+                        subItem.child.map((grandChild, grandIndex) => (
+                          <li key={grandIndex} style={{ display: "flex", alignItems: "center" }}>
+                            <span style={{ marginRight: "0.5rem" }}>{String.fromCharCode(97 + grandIndex)} . </span>
+                            <span style={{ marginRight: "0.5rem" }}>{t(grandChild)}</span>
+                          </li>
+                        ))}
+                    </li>
+                  ))}
+              </li>
+            ))} */}
+          <div>
+            {Object.entries(moduleMasterData).map(([type, categories], index) => (
+              <div key={index}>
+                <CardHeader className="setupMaster-subheading">{type.charAt(0).toUpperCase() + type.slice(1)}</CardHeader>
+                {renderHierarchy(categories)}
+              </div>
+            ))}
+          </div>
+          <div className="setupMasterSetupActionBar">
+            <Button
+              className="actionButton"
+              label={t("SETUP_MASTER")}
+              variation={"secondary"}
+              icon="ArrowForward"
+              isSuffix={true}
+              onClick={(e) => {
+                e.preventDefault();
+                history.push(`/${window?.contextPath}/employee/sandbox/application-management/module?module=${module}`);
+              }}
+            ></Button>
+          </div>
+        </>
+      )}
+    </Card>
+  );
+};
+
+export default SetupMaster;
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/config/setupMasterConfig.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/config/setupMasterConfig.js
new file mode 100644
index 00000000000..cdb1ab8b1fd
--- /dev/null
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/config/setupMasterConfig.js
@@ -0,0 +1,77 @@
+export const setupMasterConfig = {
+  tenantId: "pg",
+  moduleName: "commonUiConfig",
+  SetupMaster: [
+    {
+      header: "COMPLAINT_MANAGEMENT",
+      module: "PGR",
+      active: true,
+      description: "COMPLAINT_MANAGEMENT_DESCRIPTION",
+      actionText: "SETUP_NOW",
+      features: [
+        {
+          id: 1,
+          name: "COMPLAINT_MANAGEMENT_REGISTRATION",
+        },
+        {
+          id: 2,
+          name: "COMPLAINT_MANAGEMENT_FEATURE_LOGIN_CREATION",
+        },
+        {
+          id: 3,
+          name: "COMPLAINT_MANAGEMENT_LODGING_FILE",
+        },
+        {
+          id: 4,
+          name: "COMPLAINT_MANAGEMENT_ASSIGNING_COMPLAINT",
+        },
+        {
+          id: 5,
+          name: "COMPLAINT_MANAGEMENT_RESOLVING_COMPLAINT",
+        },
+        {
+          id: 6,
+          name: "COMPLAINT_MANAGEMENT_MANAGE_COMPLAINTS",
+        },
+        {
+          id: 7,
+          name: "COMPLAINT_MANAGEMENT_TRACK_COMPLAINTS",
+        },
+        {
+          id: 8,
+          name: "COMPLAINT_MANAGEMENT_DASHBOARD_REPORTS",
+        },
+      ],
+    },
+    {
+      header: "HCM",
+      module: "HCM",
+      active: true,
+      description: "HCM_DESCRIPTION",
+      actionText: "SETUP_NOW",
+      features: [
+        {
+          id: 1,
+          name: "HCM_FEATURE_1",
+        },
+      ],
+    },
+    {
+      header: "HRMS",
+      module: "HRMS",
+      active: true,
+      description: "HRMS_DESCRIPTION",
+      actionText: "SETUP_NOW",
+      features: [
+        {
+          id: 1,
+          name: "HRMS_REGISTRATION",
+        },
+        {
+          id: 2,
+          name: "HRMS_LOGIN_CREATION",
+        },
+      ],
+    },
+  ],
+};
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/index.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/index.js
index 337c874dc5f..09e5377e712 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/index.js
@@ -9,6 +9,7 @@ import TenantView from "./tenantMgmt/TenantView";
 import TenantCreate from "./tenantMgmt/TenantCreate";
 import ApplicationHome from "./applicationMgmt/ApplicationHome";
 import ModuleMasterTable from "./applicationMgmt/ModuleMasterTable";
+import SetupMaster from "./applicationMgmt/SetupMaster";
 
 const bredCrumbStyle = { maxWidth: "min-content" };
 
@@ -57,6 +58,7 @@ const App = ({ path, stateCode, userType, tenants }) => {
         <PrivateRoute path={`${path}/tenant-management/search`} component={() => <TenantView />} />
         <PrivateRoute path={`${path}/application-management/home`} component={() => <ApplicationHome />} />
         <PrivateRoute path={`${path}/application-management/module-master`} component={() => <SandboxSearch />} />
+        <PrivateRoute path={`${path}/application-management/setup-master`} component={() => <SetupMaster />} />
         <PrivateRoute path={`${path}/application-management/module`} component={() => <ModuleMasterTable />} />
       </AppContainer>
     </Switch>
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/configs/searchMDMSConfig.js b/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/configs/searchMDMSConfig.js
index 84edeb4b8f5..2847d5793de 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/configs/searchMDMSConfig.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/configs/searchMDMSConfig.js
@@ -2,7 +2,7 @@ export const Config = {
   label: "WBH_SEARCH_MDMS",
   type: "search",
   actionLabel: "WBH_ADD_MDMS",
-  actionRoles: ["MDMS_ADMIN","CAMPAIGN_ADMIN"],
+  actionRoles: ["MDMS_ADMIN","CAMPAIGN_ADMIN","SUPERUSER"],
   actionLink: "workbench/mdms-add-v2",
   apiDetails: {
     serviceName: `/mdms-v2/v2/_search`,
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/MDMSSearchv2.js b/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/MDMSSearchv2.js
index c423e6c171a..32c1b68ec11 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/MDMSSearchv2.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/MDMSSearchv2.js
@@ -24,6 +24,19 @@ const MDMSSearchv2 = () => {
   const history = useHistory();
   
   let {masterName:modulee,moduleName:master,tenantId} = Digit.Hooks.useQueryParams()
+  let {from, screen, action} = Digit.Hooks.useQueryParams()
+
+  const additionalParams = {
+    from: from,
+    screen: screen,
+    action: action
+  }
+  
+  Object.keys(additionalParams).forEach(key => {
+    if (additionalParams[key] === undefined || additionalParams[key] === null) {
+      delete additionalParams[key];
+    }
+  });
   
   const [availableSchemas, setAvailableSchemas] = useState([]);
   const [currentSchema, setCurrentSchema] = useState(null);
@@ -157,15 +170,17 @@ const MDMSSearchv2 = () => {
 
   const handleAddMasterData = () => {
     let actionLink=updatedConfig?.actionLink
+    const additionalParamString = new URLSearchParams(additionalParams).toString();
     if(modulee&&master){
-      actionLink= `workbench/mdms-add-v2?moduleName=${master}&masterName=${modulee}`
+      actionLink= `workbench/mdms-add-v2?moduleName=${master}&masterName=${modulee}${additionalParamString ? "&"+additionalParamString : ""}`
     }
-    history.push(`/${window?.contextPath}/employee/${actionLink}`);
+    history.push(`/${window?.contextPath}/employee/${actionLink}${additionalParamString ? "&"+additionalParamString : ""}`);
   }
 
   const onClickRow = ({original:row}) => {
     const [moduleName,masterName] = row.schemaCode.split(".")
-    history.push(`/${window.contextPath}/employee/workbench/mdms-view?moduleName=${moduleName}&masterName=${masterName}&uniqueIdentifier=${row.uniqueIdentifier}`)
+    const additionalParamString = new URLSearchParams(additionalParams).toString();
+    history.push(`/${window.contextPath}/employee/workbench/mdms-view?moduleName=${moduleName}&masterName=${masterName}&uniqueIdentifier=${row.uniqueIdentifier}${additionalParamString ? "&"+additionalParamString : ""}`)
   }
 
   if (isLoading) return <Loader />;
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/MDMSView.js b/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/MDMSView.js
index 456afcb757f..597bce22a2a 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/MDMSView.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/MDMSView.js
@@ -10,6 +10,19 @@ const MDMSView = ({...props}) => {
   const { t } = useTranslation()
   const [showToast, setShowToast] = useState(false);
   let { moduleName, masterName, tenantId,uniqueIdentifier } = Digit.Hooks.useQueryParams();
+  let {from, screen, action} = Digit.Hooks.useQueryParams()
+
+  const additionalParams = {
+    from: from,
+    screen: screen,
+    action: action
+  }
+  
+  Object.keys(additionalParams).forEach(key => {
+    if (additionalParams[key] === undefined || additionalParams[key] === null) {
+      delete additionalParams[key];
+    }
+  });
   // const stateId = Digit.ULBService.getStateId();
   tenantId = Digit.ULBService.getCurrentTenantId();
   const fetchActionItems = (data) => {
@@ -115,7 +128,8 @@ const MDMSView = ({...props}) => {
     const {action:actionSelected} = action 
     //action===EDIT go to edit screen 
     if(actionSelected==="EDIT") {
-      history.push(`/${window?.contextPath}/employee/workbench/mdms-edit?moduleName=${moduleName}&masterName=${masterName}&uniqueIdentifier=${uniqueIdentifier}`)
+      const additionalParamString = new URLSearchParams(additionalParams).toString();
+      history.push(`/${window?.contextPath}/employee/workbench/mdms-edit?moduleName=${moduleName}&masterName=${masterName}&uniqueIdentifier=${uniqueIdentifier}${additionalParamString ? "&"+additionalParamString : ""}`)
     }
     //action===DISABLE || ENABLE call update api and show toast respectively
     else{
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/index.js b/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/index.js
index 7323cd7b205..b53b255c22c 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/index.js
@@ -21,49 +21,73 @@ const WorkbenchBreadCrumb = ({ location, defaultPath }) => {
   const { t } = useTranslation();
   const search = useLocation().search;
   const fromScreen = new URLSearchParams(search).get("from") || null;
-  const pathVar = location.pathname.replace(defaultPath + '/', "").split("?")?.[0];
-  const { masterName, moduleName, uniqueIdentifier } = Digit.Hooks.useQueryParams()
+  const pathVar = location.pathname.replace(defaultPath + "/", "").split("?")?.[0];
+  const { masterName, moduleName, uniqueIdentifier, from, screen, action } = Digit.Hooks.useQueryParams();
 
-  const crumbs = [
-    {
-      path: `/${window?.contextPath}/employee`,
-      content: t("WORKBENCH_HOME"),
-      show: true,
-    },
-    {
-      path: `/${window.contextPath}/employee/workbench/manage-master-data`,
-      content: t(`WBH_MANAGE_MASTER_DATA`),
-      show: pathVar.includes("mdms-") ? true : false,
-      // query:`moduleName=${moduleName}&masterName=${masterName}`
-    },
-    {
-      path: `/${window.contextPath}/employee/workbench/localisation-search`,
-      content: t(`LOCALISATION_SEARCH`),
-      show: pathVar.includes("localisation-") ? true : false,
-      isBack: pathVar.includes("localisation-search") ? true : false
-      // query:`moduleName=${moduleName}&masterName=${masterName}`
-    },
+  const crumbs = from
+    ? [
+        {
+          path: `/${window?.contextPath}/employee`,
+          content: t("WORKBENCH_HOME"),
+          show: true,
+        },
+        {
+          path: pathVar !== "mdms-search-v2" ? `/${window.contextPath}/employee/workbench/mdms-search-v2` : "",
+          query: `moduleName=${moduleName}&masterName=${masterName}&from=${from}&screen=${screen}&action=${action}`,
+          content: t(`${Digit.Utils.workbench.getMDMSLabel(pathVar, masterName, moduleName)}`),
+          show: masterName && moduleName ? true : false,
+        },
+        {
+          path: `/${window.contextPath}/employee/workbench/mdms-view`,
+          content: t(`MDMS_VIEW`),
+          show: pathVar.includes("mdms-edit") ? true : false,
+          query: `moduleName=${moduleName}&masterName=${masterName}&uniqueIdentifier=${uniqueIdentifier}&from=${from}&screen=${screen}&action=${action}`,
+        },
+        {
+          path: `/${window.contextPath}/employee/masters/response`,
+          content: t(`${Digit.Utils.workbench.getMDMSLabel(pathVar, "", "")}`),
+          show: Digit.Utils.workbench.getMDMSLabel(pathVar, "", "", ["mdms-search-v2", "localisation-search"]) ? true : false,
+        },
+      ]
+    : [
+        {
+          path: `/${window?.contextPath}/employee`,
+          content: t("WORKBENCH_HOME"),
+          show: true,
+        },
+        {
+          path: `/${window.contextPath}/employee/workbench/manage-master-data`,
+          content: t(`WBH_MANAGE_MASTER_DATA`),
+          show: pathVar.includes("mdms-") ? true : false,
+          // query:`moduleName=${moduleName}&masterName=${masterName}`
+        },
+        {
+          path: `/${window.contextPath}/employee/workbench/localisation-search`,
+          content: t(`LOCALISATION_SEARCH`),
+          show: pathVar.includes("localisation-") ? true : false,
+          isBack: pathVar.includes("localisation-search") ? true : false,
+          // query:`moduleName=${moduleName}&masterName=${masterName}`
+        },
 
-    {
-      path: `/${window.contextPath}/employee/workbench/mdms-search-v2`,
-      query: `moduleName=${moduleName}&masterName=${masterName}`,
-      content: t(`${Digit.Utils.workbench.getMDMSLabel(pathVar, masterName, moduleName)}`),
-      show: (masterName && moduleName) ? true : false,
-      isBack: pathVar.includes("mdms-search-v2") ? true : false
-    },
-    {
-      path: `/${window.contextPath}/employee/workbench/mdms-view`,
-      content: t(`MDMS_VIEW`),
-      show: pathVar.includes("mdms-edit") ? true : false,
-      query: `moduleName=${moduleName}&masterName=${masterName}&uniqueIdentifier=${uniqueIdentifier}`
-    },
-    {
-      path: `/${window.contextPath}/employee/masters/response`,
-      content: t(`${Digit.Utils.workbench.getMDMSLabel(pathVar, "", "")}`),
-      show: Digit.Utils.workbench.getMDMSLabel(pathVar, "", "", ["mdms-search-v2", "localisation-search"]) ? true : false,
-    },
-
-  ];
+        {
+          path: `/${window.contextPath}/employee/workbench/mdms-search-v2`,
+          query: `moduleName=${moduleName}&masterName=${masterName}`,
+          content: t(`${Digit.Utils.workbench.getMDMSLabel(pathVar, masterName, moduleName)}`),
+          show: masterName && moduleName ? true : false,
+          isBack: pathVar.includes("mdms-search-v2") ? true : false,
+        },
+        {
+          path: `/${window.contextPath}/employee/workbench/mdms-view`,
+          content: t(`MDMS_VIEW`),
+          show: pathVar.includes("mdms-edit") ? true : false,
+          query: `moduleName=${moduleName}&masterName=${masterName}&uniqueIdentifier=${uniqueIdentifier}`,
+        },
+        {
+          path: `/${window.contextPath}/employee/masters/response`,
+          content: t(`${Digit.Utils.workbench.getMDMSLabel(pathVar, "", "")}`),
+          show: Digit.Utils.workbench.getMDMSLabel(pathVar, "", "", ["mdms-search-v2", "localisation-search"]) ? true : false,
+        },
+      ];
   return <BreadCrumb className="workbench-bredcrumb" crumbs={crumbs} spanStyle={{ maxWidth: "min-content" }} />;
 };
 

From fedc0cd92f009a07d4cac3f34dd6ce42589a370e Mon Sep 17 00:00:00 2001
From: aaradhya-egov <137176709+aaradhya-egov@users.noreply.github.com>
Date: Thu, 5 Sep 2024 18:56:31 +0530
Subject: [PATCH 02/23] Pgr sandbox (#1360)

* pgr

* pgr (#1357)

* fix (#1358)

* Update index.html

---------

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.org>
---
 .../example/public/index.html                 |  2 +-
 .../micro-ui-internals/example/src/index.js   |  4 +-
 .../src/services/molecules/Ulb/index.js       | 26 ++++--
 .../packages/libraries/src/utils/index.js     |  4 +-
 .../modules/core/src/components/Home.js       | 35 +++----
 .../SideBar/StaticCitizenSideBar.js           |  2 +-
 .../pages/citizen/Home/LocationSelection.js   | 57 ++++++++++--
 .../core/src/pages/citizen/Home/index.js      |  2 +-
 .../core/src/pages/citizen/Login/SelectOtp.js |  3 +-
 .../core/src/pages/citizen/Login/index.js     |  4 +-
 .../modules/core/src/pages/citizen/index.js   |  7 +-
 .../modules/pgr/src/components/PGRCard.js     | 20 ++--
 .../citizen/Create/Steps/SelectAddress.js     | 48 +++++++++-
 .../pages/employee/CreateComplaint/index.js   | 92 ++++++++++++++++---
 .../react-components/src/atoms/UploadFile.js  |  6 +-
 15 files changed, 242 insertions(+), 70 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/example/public/index.html b/micro-ui/web/micro-ui-internals/example/public/index.html
index 54d67aa1210..44d50910291 100644
--- a/micro-ui/web/micro-ui-internals/example/public/index.html
+++ b/micro-ui/web/micro-ui-internals/example/public/index.html
@@ -24,4 +24,4 @@
   <div id="root"></div>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/micro-ui/web/micro-ui-internals/example/src/index.js b/micro-ui/web/micro-ui-internals/example/src/index.js
index 2fe226ec483..abfc8a9170c 100644
--- a/micro-ui/web/micro-ui-internals/example/src/index.js
+++ b/micro-ui/web/micro-ui-internals/example/src/index.js
@@ -66,7 +66,9 @@ const initDigitUI = () => {
     const pathname = window.location.pathname;
     const context = window?.globalConfigs?.getConfig("CONTEXT_PATH");
     const start = pathname.indexOf(context) + context.length + 1;
-    const end = pathname.indexOf("employee");
+    const employeeIndex = pathname.indexOf("employee");
+    const citizenIndex = pathname.indexOf("citizen");
+    const end = (employeeIndex !== -1) ? employeeIndex : (citizenIndex !== -1) ? citizenIndex : -1;
     const tenant = end > start ? pathname.substring(start, end).replace(/\/$/, "") : "";
     window.contextPath = window?.globalConfigs?.getConfig("CONTEXT_PATH") + `${tenant ? `/${tenant}` : ""}` || "digit-ui";
     window.globalPath = window?.globalConfigs?.getConfig("CONTEXT_PATH") || "digit-ui";
diff --git a/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Ulb/index.js b/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Ulb/index.js
index 41d62051594..2737c329cf2 100644
--- a/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Ulb/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Ulb/index.js
@@ -29,15 +29,25 @@ export const ULBService = {
    */
   getCurrentTenantId: () => {
     // TODO: change when setter is done.
+
     const user = UserService.getUser();
+    const isMultiRootTenant = window?.globalConfigs?.getConfig("MULTI_ROOT_TENANT") || false;
+    const pathname = window.location.pathname;
+    const context = window?.globalConfigs?.getConfig("CONTEXT_PATH");
+    const start = pathname.indexOf(context) + context.length + 1;
+    const employeeIndex = pathname.indexOf("employee");
+    const citizenIndex = pathname.indexOf("citizen");
+    const end = (employeeIndex !== -1) ? employeeIndex : (citizenIndex !== -1) ? citizenIndex : -1;
+    const tenant = end > start ? pathname.substring(start, end).replace(/\/$/, "") : "";
     if (user?.extraRoleInfo) {
       const isDsoRoute = Digit.Utils.detectDsoRoute(window.location.pathname);
       if (isDsoRoute) {
         return user.extraRoleInfo?.tenantId;
       }
     }
+
     //TODO: fix tenant id from userinfo
-    const tenantId =
+    const tenantId = user?.info?.type !== "EMPLOYEE" && isMultiRootTenant && tenant ? tenant :
       user?.info?.type === "EMPLOYEE" && user?.info?.tenantId ? user?.info?.tenantId : window?.globalConfigs.getConfig("STATE_LEVEL_TENANT_ID");
     return tenantId;
   },
@@ -56,7 +66,9 @@ export const ULBService = {
     const pathname = window.location.pathname;
     const context = window?.globalConfigs?.getConfig("CONTEXT_PATH");
     const start = pathname.indexOf(context) + context.length + 1;
-    const end = pathname.indexOf("employee");
+    const employeeIndex = pathname.indexOf("employee");
+    const citizenIndex = pathname.indexOf("citizen");
+    const end = (employeeIndex !== -1) ? employeeIndex : (citizenIndex !== -1) ? citizenIndex : -1;
     const tenant = end > start ? pathname.substring(start, end).replace(/\/$/, "") : "";
 
     return isMultiRootTenant && tenant ? tenant : window?.globalConfigs?.getConfig("STATE_LEVEL_TENANT_ID");
@@ -74,7 +86,7 @@ export const ULBService = {
   getCurrentUlb: () => {
     const initData = StoreService.getInitData();
     const tenantId = ULBService.getCurrentTenantId();
-    return initData?.tenants?.find((tenant) => tenant?.code === tenantId)||ULBService.getStateId();
+    return initData?.tenants?.find((tenant) => tenant?.code === tenantId) || ULBService.getStateId();
   }
   /**
    * Custom method to get citizen's current selected city
@@ -88,12 +100,12 @@ export const ULBService = {
    * 
    * @returns {String}
    */,
-  getCitizenCurrentTenant: (selectedCity=false) => {
-    const homeCity=Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY")?.code;
-    if(selectedCity){
+  getCitizenCurrentTenant: (selectedCity = false) => {
+    const homeCity = Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY")?.code;
+    if (selectedCity) {
       return homeCity;
     }
-    return homeCity|| Digit.UserService.getUser()?.info?.permanentCity || ULBService.getStateId();
+    return homeCity || Digit.UserService.getUser()?.info?.permanentCity || ULBService.getStateId();
   },
   /**
    * Custom method to get all ulb's which the loggedin employee has access to
diff --git a/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/index.js b/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/index.js
index 6eef77a4731..6ecc8702939 100644
--- a/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/index.js
@@ -187,7 +187,9 @@ const pgrAccess = () => {
   const userInfo = Digit.UserService.getUser();
   const userRoles = userInfo?.info?.roles?.map((roleData) => roleData?.code);
   const pgrRoles = ["PGR_LME", "PGR-ADMIN", "CSR", "CEMP", "FEMP", "DGRO", "ULB Operator", "GRO", "GO", "RO", "GA"];
-
+  if (window.globalPath === "sandbox-ui") {
+    pgrRoles.push("SUPERUSER");
+  }
   const PGR_ACCESS = userRoles?.filter((role) => pgrRoles.includes(role));
 
   return PGR_ACCESS?.length > 0;
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Home.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Home.js
index a9d05d0fb6e..7f08548bdae 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Home.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Home.js
@@ -1,12 +1,10 @@
 import {
-  BackButton,
+  BackLink,
   CitizenHomeCard,
   CitizenInfoLabel,
   Loader,
-  FSMIcon,
-  MCollectIcon,
-  BillsIcon
 } from "@egovernments/digit-ui-components";
+import { CustomSVG } from "@egovernments/digit-ui-components";
 
 import React, { Fragment } from "react";
 import { useTranslation } from "react-i18next";
@@ -18,7 +16,12 @@ export const processLinkData = (newData, code, t) => {
   const obj = newData?.[`${code}`];
   if (obj) {
     obj.map((link) => {
-      (link.link = link["navigationURL"]), (link.i18nKey = t(link["name"]));
+      if (window.globalPath === "sandbox-ui") {
+        link["navigationURL"] = link["navigationURL"].replace("/sandbox-ui/citizen", `/sandbox-ui/${Digit.ULBService.getCurrentTenantId()}/citizen`);
+      }
+      link.link = link["navigationURL"];
+      link.i18nKey = t(link["name"]);
+     
     });
   }
   const newObj = {
@@ -56,23 +59,23 @@ export const processLinkData = (newData, code, t) => {
 const iconSelector = (code) => {
   switch (code) {
     case "PT":
-      return <PTIcon className="fill-path-primary-main" />;
+      return <CustomSVG.PTIcon className="fill-path-primary-main" />;
     case "WS":
-      return <WSICon className="fill-path-primary-main" />;
+      return <CustomSVG.WSICon className="fill-path-primary-main" />;
     case "FSM":
-      return <FSMIcon className="fill-path-primary-main" />;
+      return <CustomSVG.FSMIcon className="fill-path-primary-main" />;
     case "MCollect":
-      return <MCollectIcon className="fill-path-primary-main" />;
+      return <CustomSVG.MCollectIcon className="fill-path-primary-main" />;
     case "PGR":
-      return <PGRIcon className="fill-path-primary-main" />;
+      return <CustomSVG.PGRIcon className="fill-path-primary-main" />;
     case "TL":
-      return <TLIcon className="fill-path-primary-main" />;
+      return <CustomSVG.TLIcon className="fill-path-primary-main" />;
     case "OBPS":
-      return <OBPSIcon className="fill-path-primary-main" />;
+      return <CustomSVG.OBPSIcon className="fill-path-primary-main" />;
     case "Bills":
-      return <BillsIcon className="fill-path-primary-main" />;
+      return <CustomSVG.BillsIcon className="fill-path-primary-main" />;
     default:
-      return <PTIcon className="fill-path-primary-main" />;
+      return <CustomSVG.PTIcon className="fill-path-primary-main" />;
   }
 };
 const CitizenHome = ({
@@ -88,14 +91,14 @@ const CitizenHome = ({
   if (isLoading) {
     return <Loader />;
   }
-
+ 
   return (
     <React.Fragment>
       <div className="citizen-all-services-wrapper">
         {location.pathname.includes(
           "sanitation-ui/citizen/all-services"
         ) ? null : (
-          <BackButton />
+          <BackLink />
         )}
         <div className="citizenAllServiceGrid">
           {moduleArray
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 4fe2e6d8b77..7fdb4622a42 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
@@ -18,7 +18,7 @@ import {
   DeathIcon,
   FirenocIcon,
   Loader
-} from "@egovernments/digit-ui-components";
+} from "@egovernments/digit-ui-react-components";
 import { Link, useLocation } from "react-router-dom";
 import SideBarMenu from "../../../config/sidebar-menu";
 import { useTranslation } from "react-i18next";
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js
index a75b9391bed..26f90ec5bce 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js
@@ -1,4 +1,4 @@
-import { BackButton, CardHeader, CardLabelError, PageBasedInput, SearchOnRadioButtons } from "@egovernments/digit-ui-components";
+import { BackLink, CardHeader, CardLabelError, PageBasedInput, SearchOnRadioButtons } from "@egovernments/digit-ui-components";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useHistory, useLocation } from "react-router-dom";
@@ -7,7 +7,49 @@ const LocationSelection = () => {
   const { t } = useTranslation();
   const history = useHistory();
   const location = useLocation();
-  const { data: cities, isLoading } = Digit.Hooks.useTenants();
+  let hookResult = { data: null, isLoading: false };
+
+// Check the value of window.globalPath
+if (window?.globalPath === 'sandbox-ui') {
+  // Call the useTenants hook only if the condition is met
+  hookResult = Digit.Hooks.useTenants();
+}
+
+// Destructure the result
+const { data: cities, isLoading } = hookResult;
+  // Define the requestCriteria
+let requestCriteria = null;
+
+// Check the value of window.globalPath
+if (window?.globalPath === 'sandbox-ui') {
+  requestCriteria = {
+    url: "/tenant-management/tenant/_search",
+    params: {
+      code: Digit.ULBService.getCurrentTenantId(),
+      includeSubTenants: true
+    },
+    body: {
+      "inbox": {
+        "limit": 10,
+        "offset": 0
+      },
+      apiOperation: "SEARCH",
+    },
+    config: {
+      select: (data) => {
+        return data?.Tenants;
+      },
+    },
+  };
+}
+
+// Use the requestCriteria only if it's not null
+const { data: subTenants, refetch, isLoading: isLoadingSubTenants } = requestCriteria
+  ? Digit.Hooks.useCustomAPIHook(requestCriteria)
+  : { data: null, refetch: () => {}, isLoading: false };
+
+// Now you can use subTenants, refetch, and isLoadingSubTenants
+
 
   const [selectedCity, setSelectedCity] = useState(() => ({ code: Digit.ULBService.getCitizenCurrentTenant(true) }));
   const [showError, setShowError] = useState(false);
@@ -27,18 +69,21 @@ const LocationSelection = () => {
 
   const RadioButtonProps = useMemo(() => {
     return {
-      options: cities,
-      optionsKey: "i18nKey",
+      options: window?.globalPath === "sandbox-ui" ? subTenants : cities,
+      optionsKey: window?.globalPath === "sandbox-ui"? "name" :"i18nKey",
       additionalWrapperClass: "digit-reverse-radio-selection-wrapper",
       onSelect: selectCity,
       selectedOption: selectedCity,
     };
-  }, [cities, t, selectedCity]);
+  }, [subTenants,cities, t, selectedCity]);
 
   function onSubmit() {
     if (selectedCity) {
       Digit.SessionStorage.set("CITIZEN.COMMON.HOME.CITY", selectedCity);
       const redirectBackTo = location.state?.redirectBackTo;
+      if(window?.globalPath === "sandbox-ui"){
+        history.push(`/${window?.contextPath}/citizen/all-services`);
+      }
       if (redirectBackTo) {
         history.replace(redirectBackTo);
       } else history.push(`/${window?.contextPath}/citizen`);
@@ -51,7 +96,7 @@ const LocationSelection = () => {
     <loader />
   ) : (
     <div className="selection-card-wrapper">
-      <BackButton />
+      <BackLink />
       <PageBasedInput texts={texts} onSubmit={onSubmit} className="location-selection-container">
         <CardHeader>{t("CS_COMMON_CHOOSE_LOCATION")}</CardHeader>
         <SearchOnRadioButtons {...RadioButtonProps} placeholder={t("COMMON_TABLE_SEARCH")} />
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/index.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/index.js
index 5bb709751d5..df0cc952679 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/index.js
@@ -58,7 +58,7 @@ const Home = () => {
     history.push(`/${window?.contextPath}/citizen/${redirectURL}`);
   }
   /* fix for sanitation ui */
-  if (window?.location?.href?.includes?.("sanitation-ui")) {
+  if (window?.location?.href?.includes?.("sanitation-ui")|| window?.location?.href?.includes?.("sandbox-ui")) {
     history.push(`/${window?.contextPath}/citizen/all-services`);
   }
 
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Login/SelectOtp.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Login/SelectOtp.js
index 64461b2d209..f759af0811b 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Login/SelectOtp.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Login/SelectOtp.js
@@ -1,6 +1,7 @@
-import { CardText, CardLabelError, FormStep, OTPInput } from "@egovernments/digit-ui-components";
+import { CardText, CardLabelError, FormStep } from "@egovernments/digit-ui-components";
 import React, { Fragment, useState } from "react";
 import useInterval from "../../../hooks/useInterval";
+import { OTPInput } from "@egovernments/digit-ui-react-components";
 
 const SelectOtp = ({ config, otp, onOtpChange, onResend, onSelect, t, error, userType = "citizen", canSubmit }) => {
   const [timeLeft, setTimeLeft] = useState(30);
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Login/index.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Login/index.js
index 36f26850c3f..b4f2092a6cb 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Login/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Login/index.js
@@ -1,4 +1,4 @@
-import { AppContainer, BackButton ,Toast} from "@egovernments/digit-ui-components";
+import { AppContainer, BackLink ,Toast} from "@egovernments/digit-ui-components";
 import React, { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Route, Switch, useHistory, useLocation, useRouteMatch } from "react-router-dom";
@@ -233,7 +233,7 @@ const Login = ({ stateCode, isUserRegistered = true }) => {
     <div className="citizen-form-wrapper">
       <Switch>
         <AppContainer>
-          <BackButton />
+          <BackLink />
           <Route path={`${path}`} exact>
             <SelectMobileNumber
               onSelect={selectMobileNumber}
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/index.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/index.js
index 74e041144a7..11a8af77881 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/index.js
@@ -1,4 +1,4 @@
-import { BackButton, CitizenHomeCard, CitizenInfoLabel } from "@egovernments/digit-ui-components";
+import { BackLink, CitizenHomeCard, CitizenInfoLabel } from "@egovernments/digit-ui-components";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { Route, Switch, useHistory, useRouteMatch } from "react-router-dom";
@@ -51,7 +51,7 @@ const Home = ({
     [
       {
         name: "actions-test",
-        filter: `[?(@.url == '${window.contextPath}-card')]`,
+        filter: `[?(@.url == '${window.globalPath === "sandbox-ui" ? window.globalPath : window.contextPath}-card')]`,
       },
     ],
     {
@@ -66,7 +66,6 @@ const Home = ({
       },
     }
   );
-
   const classname = Digit.Hooks.useRouteSubscription(pathname);
   const { t } = useTranslation();
   const { path } = useRouteMatch();
@@ -99,7 +98,7 @@ const Home = ({
         <Route key={index} path={`${path}/${code.toLowerCase()}-home`}>
           <div className="moduleLinkHomePage">
             <img src={bannerImage || stateInfo?.bannerUrl} alt="noimagefound" />
-            <BackButton className="moduleLinkHomePageBackButton" />
+            <BackLink className="moduleLinkHomePageBackButton" />
             <h1>{t("MODULE_" + code.toUpperCase())}</h1>
             <div className="moduleLinkHomePageModuleLinks">
               {mdmsDataObj && (
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js
index 55b9b3726d5..592044da686 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js
@@ -21,13 +21,19 @@ const PGRCard = () => {
     <path d="M20 2H4c-1.1 0-1.99.9-1.99 2L2 22l4-4h14c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm-7 9h-2V5h2v6zm0 4h-2v-2h2v2z" fill="white"></path>
   </svg>
 
-  let propsForCSR =[
-    {
-      label: t("ES_PGR_NEW_COMPLAINT"),
-      link: `/${window?.contextPath}/employee/pgr/complaint/create`,
-      role: "CSR"
-    }
-  ]
+  let role = "CSR";
+
+if (window.globalPath === "sandbox-ui") {
+  role = "SUPERUSER";
+}
+
+let propsForCSR = [
+  {
+    label: t("ES_PGR_NEW_COMPLAINT"),
+    link: `/${window?.contextPath}/employee/pgr/complaint/create`,
+    role: role
+  }
+];
 
   propsForCSR = propsForCSR.filter(link => link.role && Digit.Utils.didEmployeeHasRole(link.role) );
 
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js
index 9741b1bd34b..ce56dcc9c86 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js
@@ -1,9 +1,43 @@
 import React, { useEffect, useState, useRef } from "react";
 import { CardLabel, Dropdown, FormStep, RadioButtons } from "@egovernments/digit-ui-react-components";
+import { subtract } from "lodash";
 
 const SelectAddress = ({ t, config, onSelect, value }) => {
-  const allCities = Digit.Hooks.pgr.useTenants();
+  const allCities = window.globalPath === "sandbox-ui"  ? Digit.Hooks.pgr.useTenants(): null;
   const cities = value?.pincode ? allCities.filter((city) => city?.pincode?.some((pin) => pin == value["pincode"])) : allCities;
+  // Define the requestCriteria
+let requestCriteria = null;
+
+// Check the value of window.globalPath
+if (window.globalPath === 'sandbox-ui') {
+  requestCriteria = {
+    url: "/tenant-management/tenant/_search",
+    params: {
+      code: Digit.ULBService.getCurrentTenantId(),
+      includeSubTenants: true
+    },
+    body: {
+      "inbox": {
+        "limit": 10,
+        "offset": 0
+      },
+      apiOperation: "SEARCH",
+    },
+    config: {
+      select: (data) => {
+        return data?.Tenants;
+      },
+    },
+  };
+}
+
+// Use the requestCriteria only if it's not null
+const { data: subTenants, refetch, isLoading: isLoadingSubTenants } = requestCriteria
+  ? Digit.Hooks.useCustomAPIHook(requestCriteria)
+  : { data: null, refetch: () => {}, isLoading: false };
+
+// Now you can use subTenants, refetch, and isLoadingSubTenants
+
 
   const [selectedCity, setSelectedCity] = useState(() => {
     const { city_complaint } = value;
@@ -11,7 +45,7 @@ const SelectAddress = ({ t, config, onSelect, value }) => {
   });
   const { data: fetchedLocalities } = Digit.Hooks.useBoundaryLocalities(
     selectedCity?.code,
-    "admin",
+    window.globalPath === "sandbox-ui" ? "REVENUE" : "admin",
     {
       enabled: !!selectedCity,
     },
@@ -51,10 +85,14 @@ const SelectAddress = ({ t, config, onSelect, value }) => {
     <FormStep config={config} onSelect={onSubmit} t={t} isDisabled={selectedLocality ? false : true}>
       <div>
         <CardLabel>{t("MYCITY_CODE_LABEL")}</CardLabel>
-        {cities?.length < 5 ? (
-          <RadioButtons selectedOption={selectedCity} options={cities} optionsKey="i18nKey" onSelect={selectCity} />
+        {(window.globalPath === "sandbox-ui" ? subTenants?.length : cities?.length) < 5 ? (
+          <RadioButtons selectedOption={selectedCity} options={
+            window.globalPath === "sandbox-ui" ? subTenants : cities
+          } optionsKey={window.globalPath === "sandbox-ui" ? "name" : "i18nKey"} onSelect={selectCity} />
         ) : (
-          <Dropdown isMandatory selected={selectedCity} option={cities} select={selectCity} optionKey="i18nKey" t={t} />
+          <Dropdown isMandatory selected={selectedCity} option={
+            window.globalPath === "sandbox-ui" ? subTenants : cities
+          } select={selectCity} optionKey={window.globalPath === "sandbox-ui" ? "name" : "i18nKey"} t={t} />
         )}
         {selectedCity && localities && <CardLabel>{t("CS_CREATECOMPLAINT_MOHALLA")}</CardLabel>}
         {selectedCity && localities && (
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js
index a3313270966..8ea99cfbf91 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js
@@ -9,25 +9,76 @@ import { FormComposer } from "../../../components/FormComposer";
 import { createComplaint } from "../../../redux/actions/index";
 
 export const CreateComplaint = ({ parentUrl }) => {
-  const cities = Digit.Hooks.pgr.useTenants();
+  const cities = window.globalPath === "sandbox-ui" ? Digit.Hooks.pgr.useTenants() : null;
+
   const { t } = useTranslation();
 
   const getCities = () => cities?.filter((e) => e.code === Digit.ULBService.getCurrentTenantId()) || [];
 
+ // Define the requestCriteria
+let requestCriteria = null;
+
+// Check the value of window.globalPath
+if (window.globalPath === 'sandbox-ui') {
+  requestCriteria = {
+    url: "/tenant-management/tenant/_search",
+    params: {
+      code: Digit.ULBService.getCurrentTenantId(),
+      includeSubTenants: true
+    },
+    body: {
+      "inbox": {
+        "limit": 10,
+        "offset": 0
+      },
+      apiOperation: "SEARCH",
+    },
+    config: {
+      select: (data) => {
+        return data?.Tenants;
+      },
+    },
+  };
+}
+
+// Use the requestCriteria only if it's not null
+const { data: subTenants, refetch, isLoading: isLoadingSubTenants } = requestCriteria
+  ? Digit.Hooks.useCustomAPIHook(requestCriteria)
+  : { data: null, refetch: () => {}, isLoading: false };
+
+// Now you can use subTenants, refetch, and isLoadingSubTenants
+
+  const getSubTenants = () => subTenants?.filter((e) => e.code === Digit.ULBService.getCurrentTenantId()) || [];
+
   const [complaintType, setComplaintType] = useState({});
   const [subTypeMenu, setSubTypeMenu] = useState([]);
   const [subType, setSubType] = useState({});
   const [pincode, setPincode] = useState("");
-  const [selectedCity, setSelectedCity] = useState(getCities()[0] ? getCities()[0] : null);
+  const [selectedCity, setSelectedCity] = useState(
+    window.globalPath === "sandbox-ui"
+      ? getSubTenants()[0] || null
+      : getCities()[0] || null
+  );
+
+  const cityData = window.globalPath === "sandbox-ui" ? getSubTenants() : getCities();
 
   const { data: fetchedLocalities } = Digit.Hooks.useBoundaryLocalities(
-    getCities()[0]?.code,
-    "admin",
-    {
-      enabled: !!getCities()[0],
-    },
-    t
-  );
+  cityData[0]?.code,
+  window.globalPath === "sandbox-ui" ? "REVENUE" : "admin",
+  {
+    enabled: !!cityData[0],
+  },
+  t
+);
+
+  // const { data: fetchedLocalities } = Digit.Hooks.useBoundaryLocalities(
+  //   getCities()[0]?.code,
+  //   "admin",
+  //   {
+  //     enabled: !!getCities()[0],
+  //   },
+  //   t
+  // );
 
   const [localities, setLocalities] = useState(fetchedLocalities);
   const [selectedLocality, setSelectedLocality] = useState(null);
@@ -57,6 +108,7 @@ export const CreateComplaint = ({ parentUrl }) => {
   }, [fetchedLocalities]);
 
   useEffect(() => {
+    if(window.globalPath !== "sandbox-ui"){
     const city = cities.find((obj) => obj.pincode?.find((item) => item == pincode));
     if (city?.code&&city?.code === getCities()[0]?.code) {
       setPincodeNotValid(false);
@@ -71,8 +123,10 @@ export const CreateComplaint = ({ parentUrl }) => {
     } else {
       setPincodeNotValid(true);
     }
+  }
   }, [pincode]);
 
+
   async function selectedType(value) {
     if (value.key !== complaintType.key) {
       if (value.key === "Others") {
@@ -111,9 +165,17 @@ export const CreateComplaint = ({ parentUrl }) => {
   const onSubmit = async (data) => {
     if (!canSubmit) return;
     const cityCode = selectedCity.code;
-    const city = selectedCity.city.name;
-    const district = selectedCity.city.name;
-    const region = selectedCity.city.name;
+    const city = window.globalPath === "sandbox-ui"
+    ? selectedCity.name
+    : selectedCity.city.name;
+  
+  const district = window.globalPath === "sandbox-ui"
+    ? selectedCity.name
+    : selectedCity.city.name;
+  
+  const region = window.globalPath === "sandbox-ui"
+    ? selectedCity.name
+    : selectedCity.city.name;
     const localityCode = selectedLocality.code;
     const localityName = selectedLocality.name;
     const landmark = data.landmark;
@@ -210,10 +272,12 @@ export const CreateComplaint = ({ parentUrl }) => {
               isMandatory
               selected={selectedCity}
               freeze={true}
-              option={getCities()}
+              option={
+                window.globalPath === "sandbox-ui" ? getSubTenants() : getCities()
+              }
               id="city"
               select={selectCity}
-              optionKey="i18nKey"
+              optionKey={window.globalPath === "sandbox-ui" ? "name" : "i18nKey"}
               t={t}
             />
           ),
diff --git a/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/UploadFile.js b/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/UploadFile.js
index a251c89e3eb..cb09a145583 100644
--- a/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/UploadFile.js
+++ b/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/UploadFile.js
@@ -177,7 +177,7 @@ const UploadFile = (props) => {
   };
 
   const handleEmpty = () => {
-    if(inpRef.current.files.length <= 0 && prevSate !== null)
+    if(inpRef?.current?.files?.length <= 0 && prevSate !== null)
     { inpRef.current.value = "";
       props.onDelete();
     }
@@ -212,9 +212,9 @@ const UploadFile = (props) => {
                 <RemoveableTag extraStyles={extraStyles} key={index} text={file[0]} onClick={(e) => props?.removeTargetedFile(fileDetailsData, e)} />
               </div>
             })}
-            {props?.uploadedFiles.length === 0 && <h2 className="file-upload-status">{props?.message}</h2>}
+            {props?.uploadedFiles?.length === 0 && <h2 className="file-upload-status">{props?.message}</h2>}
           {!hasFile || props.error ? (
-            <h2 className="file-upload-status">{props.message}</h2>
+            <h2 className="file-upload-status">{props?.message}</h2>
           ) : (
             <div className="tag-container" style={extraStyles ? extraStyles?.tagContainerStyles : null}>
               <div className="tag" style={extraStyles ? extraStyles?.tagStyles : null}>

From aaae23bd3f603a262946326098ee2ec45ddaea1a Mon Sep 17 00:00:00 2001
From: mithunhegde-egov <152362871+mithunhegde-egov@users.noreply.github.com>
Date: Thu, 5 Sep 2024 20:43:58 +0530
Subject: [PATCH 03/23] hrms create and search (#1361)

* hrms create and search

* Update index.html

* review changes

* Update createEmployee.js

---------

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.org>
---
 micro-ui/web/micro-ui-internals/example/package.json          | 2 +-
 micro-ui/web/micro-ui-internals/package.json                  | 2 +-
 .../micro-ui-internals/packages/libraries/src/utils/index.js  | 2 +-
 .../web/micro-ui-internals/packages/modules/hrms/package.json | 2 +-
 .../micro-ui-internals/packages/modules/hrms/src/Module.js    | 2 +-
 .../packages/modules/hrms/src/components/InboxFilter.js       | 2 +-
 .../packages/modules/hrms/src/components/Utils/index.js       | 4 ++--
 .../packages/modules/hrms/src/components/hrmscard.js          | 2 +-
 .../src/components/pageComponents/SelectEmployeeGender.js     | 4 ++--
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/example/package.json b/micro-ui/web/micro-ui-internals/example/package.json
index 0d36ca5a625..cee9f67fd32 100644
--- a/micro-ui/web/micro-ui-internals/example/package.json
+++ b/micro-ui/web/micro-ui-internals/example/package.json
@@ -15,7 +15,7 @@
     "@egovernments/digit-ui-module-dss": "1.8.1",
     "@egovernments/digit-ui-module-core": "1.8.2-beta.18",
     "@egovernments/digit-ui-module-common": "1.8.0",
-    "@egovernments/digit-ui-module-hrms": "1.8.0",
+    "@egovernments/digit-ui-module-hrms": "1.8.1-beta.1",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.39",
     "@egovernments/digit-ui-module-open-payment":"0.0.1",
     "@egovernments/digit-ui-module-engagement": "1.5.20",
diff --git a/micro-ui/web/micro-ui-internals/package.json b/micro-ui/web/micro-ui-internals/package.json
index 2eeabaf59ba..c6bc79cd360 100644
--- a/micro-ui/web/micro-ui-internals/package.json
+++ b/micro-ui/web/micro-ui-internals/package.json
@@ -28,7 +28,7 @@
     "dev:example": "cd example && yarn start",
     "dev:core": "cd packages/modules/core && yarn start",
     "devD:dss": "cd packages/modules/dss && yarn start",
-    "devD:hrms": "cd packages/modules/hrms && yarn start",
+    "dev:hrms": "cd packages/modules/hrms && yarn start",
     "devD:common": "cd packages/modules/common && yarn start",
     "devD:utilities": "cd packages/modules/utilities && yarn start",
     "dev:workbench": "cd packages/modules/workbench && yarn start",
diff --git a/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/index.js b/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/index.js
index 6ecc8702939..4f2dfdf3c75 100644
--- a/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/index.js
@@ -305,7 +305,7 @@ const receiptsAccess = () => {
   const RECEIPTS_ACCESS = userRoles?.filter((role) => receiptsRoles?.includes(role));
   return RECEIPTS_ACCESS?.length > 0;
 };
-const hrmsRoles = ["HRMS_ADMIN"];
+const hrmsRoles = ["HRMS_ADMIN","SUPERUSER"];
 const hrmsAccess = () => {
   const userInfo = Digit.UserService.getUser();
   const userRoles = userInfo?.info?.roles?.map((roleData) => roleData?.code);
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json b/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json
index e9e8e2df20a..84ac61628aa 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json
+++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json
@@ -15,7 +15,7 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.5.22",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.12",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-hook-form": "6.15.8",
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/Module.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/Module.js
index 614e1ec816c..a7745f92a14 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/Module.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/Module.js
@@ -31,7 +31,7 @@ export const HRMSModule = ({ stateCode, userType, tenants }) => {
   const { path, url } = useRouteMatch();
   if (!Digit.Utils.hrmsAccess()) {
     return null;
-  }
+  } 
   if (userType === "employee") {
     return <EmployeeApp path={path} url={url} />;
   } else return null;
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/InboxFilter.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/InboxFilter.js
index ded77d1672a..847fd67388d 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/InboxFilter.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/InboxFilter.js
@@ -54,7 +54,7 @@ const Filter = ({ searchParams, onFilterChange, onSearch, removeParam, ...props
   });
 
   useEffect(() => {
-    if (tenantId.code) {
+    if (tenantId?.code) {
       setSearchParams({ ..._searchParams, tenantId: tenantId.code });
     }
   }, [tenantId]);
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/Utils/index.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/Utils/index.js
index 7f0149bf764..e2440e56001 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/Utils/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/Utils/index.js
@@ -63,8 +63,8 @@ export const getCityThatUserhasAccess = (cities = []) => {
   let roleObject = {};
   userInfo?.info?.roles.map((roleData) => { roleObject[roleData?.code] = roleObject[roleData?.code] ? [...roleObject[roleData?.code], roleData?.tenantId] : [roleData?.tenantId] });
   const tenant = Digit.ULBService.getCurrentTenantId();
-  if (roleObject[Digit.Utils?.hrmsRoles?.[0]].includes(Digit.ULBService.getStateId())) {
+  if (roleObject?.[Digit.Utils?.hrmsRoles?.[0]]?.includes(Digit.ULBService.getStateId())) {
     return cities;
   }
-  return cities.filter(city => roleObject[Digit.Utils?.hrmsRoles?.[0]]?.includes(city?.code));
+  return cities?.filter(city => roleObject?.[Digit.Utils?.hrmsRoles?.[0]]?.includes(city?.code));
 }
\ No newline at end of file
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/hrmscard.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/hrmscard.js
index 649c5ac3c2b..48af9efcda9 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/hrmscard.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/hrmscard.js
@@ -6,7 +6,7 @@ const HRMSCard = () => {
   const ADMIN = Digit.Utils.hrmsAccess();
   if (!ADMIN) {
     return null;
-  }
+  } 
     const { t } = useTranslation();
     const tenantId = Digit.ULBService.getCurrentTenantId();
     const { isLoading, isError, error, data, ...rest } = Digit.Hooks.hrms.useHRMSCount(tenantId);
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/SelectEmployeeGender.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/SelectEmployeeGender.js
index 9bbc1599732..96d1b317a8b 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/SelectEmployeeGender.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/SelectEmployeeGender.js
@@ -47,7 +47,7 @@ const SelectEmployeeGender = ({ t, config, onSelect, formData = {}, userType, re
             <div className="field">
               <RadioButtons
                 style={{ display: "flex", justifyContent: "space-between" }}
-                /*options={[
+               /* options={[
                   {
                     code: "MALE",
                     name: "COMMON_GENDER_MALE",
@@ -60,7 +60,7 @@ const SelectEmployeeGender = ({ t, config, onSelect, formData = {}, userType, re
                     code: "TRANSGENDER",
                     name: "COMMON_GENDER_TRANSGENDER",
                   },
-                ]}*/
+                ]} */
                 options={HRMenu}
                 key={input.name}
                 optionsKey="name"

From 58ff2f5f7639fae4e8b350bde3098f4d53951528 Mon Sep 17 00:00:00 2001
From: aaradhya-egov <137176709+aaradhya-egov@users.noreply.github.com>
Date: Thu, 5 Sep 2024 20:44:36 +0530
Subject: [PATCH 04/23] fix (#1362)

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.org>
---
 .../modules/pgr/src/pages/citizen/ComplaintDetails.js         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/ComplaintDetails.js b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/ComplaintDetails.js
index c4fd9bc9b65..175aa9f3b95 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/ComplaintDetails.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/ComplaintDetails.js
@@ -23,7 +23,7 @@ import TimeLine from "../../components/TimeLine";
 const WorkflowComponent = ({ complaintDetails, id, getWorkFlow, zoomImage }) => {
   const tenantId = Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY")?.code || complaintDetails.service.tenantId;
   let workFlowDetails = Digit.Hooks.useWorkflowDetails({ tenantId: tenantId, id, moduleCode: "PGR" });
-  const { data: ComplainMaxIdleTime, isLoading: ComplainMaxIdleTimeLoading } = Digit.Hooks.pgr.useMDMS.ComplainClosingTime(tenantId?.split(".")[0]);
+  // const { data: ComplainMaxIdleTime, isLoading: ComplainMaxIdleTimeLoading } = Digit.Hooks.pgr.useMDMS.ComplainClosingTime(tenantId?.split(".")[0]);
 
   useEffect(() => {
     getWorkFlow(workFlowDetails.data);
@@ -43,7 +43,7 @@ const WorkflowComponent = ({ complaintDetails, id, getWorkFlow, zoomImage }) =>
         rating={complaintDetails.audit.rating}
         zoomImage={zoomImage}
         complaintDetails={complaintDetails}
-        ComplainMaxIdleTime={ComplainMaxIdleTime}
+        // ComplainMaxIdleTime={ComplainMaxIdleTime}
       />
     )
   );

From 28cae30fd93b7da4c6a6483c7a852be9e9e4cbbb Mon Sep 17 00:00:00 2001
From: mithunhegde-egov <152362871+mithunhegde-egov@users.noreply.github.com>
Date: Thu, 5 Sep 2024 23:22:54 +0530
Subject: [PATCH 05/23] Tenant update (#1340)

* update component added

* update component added

* tenant update component

* update tenant search update

* revert index.html

---------

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.org>
---
 .../sandbox/src/configs/tenantSearchConfig.js |  1 -
 .../sandbox/src/configs/tenantUpdateConfig.js | 60 ++++++++++++
 .../sandbox/src/pages/employee/index.js       |  2 +
 .../pages/employee/tenantMgmt/TenantUpdate.js | 97 +++++++++++++++++++
 .../pages/employee/tenantMgmt/TenantView.js   |  5 +-
 .../sandbox/src/utils/TenantUpdateUtil.js     | 14 +++
 6 files changed, 177 insertions(+), 2 deletions(-)
 create mode 100644 micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/configs/tenantUpdateConfig.js
 create mode 100644 micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/tenantMgmt/TenantUpdate.js
 create mode 100644 micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/utils/TenantUpdateUtil.js

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/configs/tenantSearchConfig.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/configs/tenantSearchConfig.js
index 488aa785150..81bb521fef6 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/configs/tenantSearchConfig.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/configs/tenantSearchConfig.js
@@ -18,7 +18,6 @@ export const tenantSearchConfig = () =>
         tableFormJsonPath: "requestBody.inbox",
         filterFormJsonPath: "requestBody.tenant",
         searchFormJsonPath: "requestBody.tenant",
-
       },
       sections: {
         search: {
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/configs/tenantUpdateConfig.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/configs/tenantUpdateConfig.js
new file mode 100644
index 00000000000..2838103587a
--- /dev/null
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/configs/tenantUpdateConfig.js
@@ -0,0 +1,60 @@
+export const tenantUpdateConfig = [
+    {
+      head: null,
+      body: [
+        {
+          inline: true,
+          label: "SANDBOX_CREATE_TENANT_NAME_LABEL",
+          isMandatory: true,
+          key: "tenantName",
+          type: "text",
+          disable: true,
+          populators: { name: "tenantName", error: "Required", validation: { pattern: /^[A-Za-z0-9]+$/i } },
+        },
+        {
+          inline: true,
+          label: "SANDBOX_CREATE_TENANT_EMAIL_LABEL",
+          isMandatory: true,
+          key: "emailId",
+          type: "text",
+          disable: true,
+          populators: { name: "emailId", error: "Required", validation: { pattern: /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/i } },
+        },
+        {
+            inline: true,
+            label: "SANDBOX_CREATE_TENANT_CODE_LABEL",
+            isMandatory: true,
+            key: "tenantCode",
+            type: "text",
+            disable: true,
+            populators: { name: "tenantCode", error: "Required", validation: { pattern: /^[A-Za-z0-9.]+$/i } },
+          },
+        {
+          isMandatory: false,
+          key: "isActive",
+          type: "dropdown",
+          label: "SANDBOX_CREATE_TENANT_ACTIVE_LABEL",
+          disable: false,
+          populators: {
+            name: "isActive",
+            optionsKey: "name",
+            error: " Required",
+            required: true,
+            options: [
+              {
+                code: "true",
+                name: "TRUE",
+                active: true,
+              },
+              {
+                code: "false",
+                name: "FALSE",
+                active: true,
+              },
+            ],
+          },
+        },
+      ],
+    },
+  ];
+  
\ No newline at end of file
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/index.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/index.js
index 09e5377e712..f9daf343859 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/index.js
@@ -9,6 +9,7 @@ import TenantView from "./tenantMgmt/TenantView";
 import TenantCreate from "./tenantMgmt/TenantCreate";
 import ApplicationHome from "./applicationMgmt/ApplicationHome";
 import ModuleMasterTable from "./applicationMgmt/ModuleMasterTable";
+import TenantUpdate from "./tenantMgmt/TenantUpdate";
 import SetupMaster from "./applicationMgmt/SetupMaster";
 
 const bredCrumbStyle = { maxWidth: "min-content" };
@@ -56,6 +57,7 @@ const App = ({ path, stateCode, userType, tenants }) => {
         <PrivateRoute path={`${path}/tenant-search`} component={() => <SandboxSearch />} />
         <PrivateRoute path={`${path}/tenant-management/create`} component={() => <TenantCreate />} />
         <PrivateRoute path={`${path}/tenant-management/search`} component={() => <TenantView />} />
+        <PrivateRoute path={`${path}/tenant-management/update`} component={() => <TenantUpdate />} />
         <PrivateRoute path={`${path}/application-management/home`} component={() => <ApplicationHome />} />
         <PrivateRoute path={`${path}/application-management/module-master`} component={() => <SandboxSearch />} />
         <PrivateRoute path={`${path}/application-management/setup-master`} component={() => <SetupMaster />} />
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/tenantMgmt/TenantUpdate.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/tenantMgmt/TenantUpdate.js
new file mode 100644
index 00000000000..30703accc14
--- /dev/null
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/tenantMgmt/TenantUpdate.js
@@ -0,0 +1,97 @@
+import React, { useState, useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { useHistory ,useLocation} from "react-router-dom";
+import { FormComposerV2, Header, Toast } from "@egovernments/digit-ui-react-components";
+import { transformCreateData } from "../../../utils/TenantUpdateUtil";
+import { tenantUpdateConfig } from "../../../configs/tenantUpdateConfig";
+
+const fieldStyle = { marginRight: 0 };
+
+const TenantUpdate = () => {
+  const location = useLocation();
+  const { name,code,email} = location.state || {};
+  const defaultValue = {
+    tenantName:name,
+    tenantCode:code,
+    emailId:email,
+    isActive:""
+  };
+  const tenantId = Digit.ULBService.getCurrentTenantId();
+  const { t } = useTranslation();
+  const history = useHistory();
+  const [showToast, setShowToast] = useState(false);
+  
+  const closeToast = () => {
+    setTimeout(() => {
+      setShowToast(false);
+    }, 5000);
+  };
+  const reqCreate = {
+    url: `/tenant-management/subTenant/_update`,
+    params: {},
+    body: {},
+    config: {
+      enable: false,
+    },
+  };
+  const mutation = Digit.Hooks.useCustomAPIMutationHook(reqCreate);
+  const onSubmit = async (data) => {
+    if(tenantId==code){
+      setShowToast({
+        label: t("SANDBOX_TENANT_CANNOT_UPDATE_TOAST"),
+        isError: true,
+      });
+    }
+    else{
+      await mutation.mutate(
+        {
+          url: `/tenant-management/subTenant/_update`,
+          body: transformCreateData(data),
+          config: {
+            enable: true,
+          },
+        },
+        {
+          onError: (error, variables) => {
+            setShowToast({
+              label: error.toString(),
+              isError: true,
+            });
+            setTimeout(() => {
+              setShowToast(false);
+            }, 5000);
+          },
+          onSuccess: async (data) => {
+            setShowToast({ key: "success", label: t("SANDBOX_TENANT_UPDATE_SUCCESS_TOAST") });
+            setTimeout(() => {
+              closeToast();
+              history.push(`/${window?.contextPath}/employee/sandbox/tenant-management/search`);
+            }, 3000);
+          },
+        }
+      );
+    }
+  };
+  return (
+    <div>
+      <Header> {t("SANDBOX_UPDATE_TENANT_HEADER")}</Header>
+      <FormComposerV2
+        label={t("SANDBOX_UPDATE_TENANT_SUBMIT_BUTTON")}
+        config={tenantUpdateConfig.map((config) => {
+          return {
+            ...config,
+          };
+        })}
+        defaultValues={defaultValue}
+        onFormValueChange={(setValue, formData, formState, reset, setError, clearErrors, trigger, getValues) => {}}
+        onSubmit={(data) => onSubmit(data)}
+        fieldStyle={fieldStyle}
+        noBreakLine={true}
+      />
+
+      {showToast && <Toast error={showToast?.isError} label={showToast?.label} isDleteBtn={"true"} onClose={() => setShowToast(false)} />}
+    </div>
+  );
+};
+
+export default TenantUpdate;
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/tenantMgmt/TenantView.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/tenantMgmt/TenantView.js
index ae0d4c3aed2..c33639bb885 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/tenantMgmt/TenantView.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/tenantMgmt/TenantView.js
@@ -32,7 +32,10 @@ const TenantView = () => {
   }, []);
 
   const onClickRow = ({ original: row }) => {
-    const value = row?.code;
+    const code = row?.code;
+    const name= row?.name;
+    const email=row?.email;
+    history.push(`/${window?.contextPath}/employee/sandbox/tenant-management/update`, {name,code,email});
   };
 
   return (
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/utils/TenantUpdateUtil.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/utils/TenantUpdateUtil.js
new file mode 100644
index 00000000000..fdee7c17a72
--- /dev/null
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/utils/TenantUpdateUtil.js
@@ -0,0 +1,14 @@
+export const transformCreateData = (data) => {
+    const tenantId = Digit.ULBService.getCurrentTenantId();
+  
+    return {
+      tenant: {
+        name: data.tenantName,
+        email: data.emailId,
+        code: data.tenantCode,
+        isActive:data.isActive.code,
+        parentId: tenantId,
+      },
+    };
+  };
+  
\ No newline at end of file

From 88b1d15e2ff9eb494d6d044f9dca7b0aeeb3b34a Mon Sep 17 00:00:00 2001
From: nabeelmd-eGov <nabeel.md@egovernments.org>
Date: Fri, 6 Sep 2024 14:01:09 +0530
Subject: [PATCH 06/23] adding CSS changes (#1363)

Co-authored-by: NabeelAyubee <nayubi7@gmail.com>
---
 .../micro-ui-internals/example/package.json   |  2 +-
 micro-ui/web/micro-ui-internals/package.json  |  2 +-
 .../packages/css/src/index.scss               |  2 +-
 .../css/src/pages/employee/sandbox.scss       | 18 +++++++++++++
 .../packages/modules/core/package.json        |  2 +-
 .../modules/core/src/components/Home.js       |  8 +++---
 .../SideBar/StaticCitizenSideBar.js           | 14 +++++-----
 .../pages/citizen/Home/LocationSelection.js   |  4 ++-
 .../core/src/pages/citizen/Home/index.js      |  6 ++---
 .../core/src/pages/citizen/Login/index.js     |  4 +--
 .../modules/core/src/pages/citizen/index.js   |  2 +-
 .../packages/modules/dss/package.json         |  2 +-
 .../modules/open-payment/package.json         |  2 +-
 .../packages/modules/pgr/package.json         |  2 +-
 .../packages/modules/sandbox/package.json     |  2 +-
 .../packages/modules/sandbox/src/Module.js    |  8 +++++-
 .../applicationMgmt/ModuleMasterTable.js      |  8 +++---
 .../config/setupMasterConfig.js               | 27 ++++++++++---------
 .../packages/modules/utilities/package.json   |  2 +-
 .../packages/modules/workbench/package.json   |  2 +-
 .../packages/react-components/package.json    |  2 +-
 .../src/molecules/SearchOnRadioButtons.js     | 11 +++++++-
 22 files changed, 85 insertions(+), 47 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/example/package.json b/micro-ui/web/micro-ui-internals/example/package.json
index cee9f67fd32..00cd69f136b 100644
--- a/micro-ui/web/micro-ui-internals/example/package.json
+++ b/micro-ui/web/micro-ui-internals/example/package.json
@@ -20,7 +20,7 @@
     "@egovernments/digit-ui-module-open-payment":"0.0.1",
     "@egovernments/digit-ui-module-engagement": "1.5.20",
     "@egovernments/digit-ui-components": "0.0.2-beta.31",
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.12",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
     "@egovernments/digit-ui-module-sandbox": "0.0.1",
     "http-proxy-middleware": "^1.0.5",
     "react": "17.0.2",
diff --git a/micro-ui/web/micro-ui-internals/package.json b/micro-ui/web/micro-ui-internals/package.json
index c6bc79cd360..b46933a7627 100644
--- a/micro-ui/web/micro-ui-internals/package.json
+++ b/micro-ui/web/micro-ui-internals/package.json
@@ -73,7 +73,7 @@
     "lodash": "4.17.21",
     "microbundle-crl": "0.13.11",
     "@egovernments/digit-ui-components": "0.0.2-beta.31",
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.12",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-hook-form": "6.15.8",
diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/index.scss b/micro-ui/web/micro-ui-internals/packages/css/src/index.scss
index dc1b9de8341..68c86c61c4e 100644
--- a/micro-ui/web/micro-ui-internals/packages/css/src/index.scss
+++ b/micro-ui/web/micro-ui-internals/packages/css/src/index.scss
@@ -644,7 +644,7 @@ input[type="number"] {
   .citizen-form-wrapper {
     width: calc(100% - 219px);
     display: flex;
-    justify-content: center;
+    justify-content: flex-start;
     margin-top: 1rem;
     padding-left: 16px;
     padding-right: 16px;
diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss
index dd9bc74070c..8c5bc4f792a 100644
--- a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss
+++ b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss
@@ -315,3 +315,21 @@
     justify-content: center;
   }
 }
+.main.center-container.citizen-home-container {
+  z-index: 100;
+  justify-content: flex-start;
+}
+.SideBarStatic {
+  z-index: 10;
+  height: 100vh;
+}
+.citizen-home-footer {
+  position: absolute;
+  bottom: 0;
+}
+.citizen-form-wrapper {
+  justify-content: flex-start;
+  .citizen-card-input.citizen-card-input--front {
+    margin-bottom: 0;
+  }
+}
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 21a99fabcfa..8951d95c4c4 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
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@egovernments/digit-ui-components": "0.0.2-beta.31",
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.12",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-i18next": "11.16.2",
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Home.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Home.js
index 7f08548bdae..3cad29da039 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Home.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Home.js
@@ -1,10 +1,10 @@
 import {
-  BackLink,
   CitizenHomeCard,
   CitizenInfoLabel,
   Loader,
-} from "@egovernments/digit-ui-components";
-import { CustomSVG } from "@egovernments/digit-ui-components";
+} from "@egovernments/digit-ui-react-components";
+
+import { BackLink, CustomSVG } from "@egovernments/digit-ui-components";
 
 import React, { Fragment } from "react";
 import { useTranslation } from "react-i18next";
@@ -97,7 +97,7 @@ const CitizenHome = ({
       <div className="citizen-all-services-wrapper">
         {location.pathname.includes(
           "sanitation-ui/citizen/all-services"
-        ) ? null : (
+        ) || (location.pathname.includes("sandbox-ui") && location.pathname.includes("all-services")) ? null : (
           <BackLink />
         )}
         <div className="citizenAllServiceGrid">
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 7fdb4622a42..e5adb484541 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
@@ -183,24 +183,24 @@ const StaticCitizenSideBar = ({ linkData, islinkDataLoading }) => {
           <React.Fragment>
             {t("CS_COMMON_HELPLINE")}
             <div className="telephone" style={{ marginTop: "-10%" }}>
-              {storeData?.tenants.map((i) => {
+              {storeData?.tenants?.map((i) => {
                 i.code === tenantId ? (
                   <div className="link">
-                    <a href={`tel:${storeData?.tenants[i].contactNumber}`}>
-                      {storeData?.tenants[i].contactNumber}
+                    <a href={`tel:${storeData?.tenants?.[i].contactNumber}`}>
+                      {storeData?.tenants?.[i].contactNumber}
                     </a>
                   </div>
                 ) : (
                   <div className="link">
-                    <a href={`tel:${storeData?.tenants[0].contactNumber}`}>
-                      {storeData?.tenants[0].contactNumber}
+                    <a href={`tel:${storeData?.tenants?.[0].contactNumber}`}>
+                      {storeData?.tenants?.[0].contactNumber}
                     </a>
                   </div>
                 );
               })}
               <div className="link">
-                <a href={`tel:${storeData?.tenants[0].contactNumber}`}>
-                  {storeData?.tenants[0].contactNumber}
+                <a href={`tel:${storeData?.tenants?.[0].contactNumber}`}>
+                  {storeData?.tenants?.[0].contactNumber}
                 </a>
               </div>
             </div>
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js
index 26f90ec5bce..ba0ebe58401 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js
@@ -1,4 +1,5 @@
-import { BackLink, CardHeader, CardLabelError, PageBasedInput, SearchOnRadioButtons } from "@egovernments/digit-ui-components";
+import { BackLink } from "@egovernments/digit-ui-components";
+import { CardHeader, CardLabelError, PageBasedInput, SearchOnRadioButtons } from "@egovernments/digit-ui-react-components";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useHistory, useLocation } from "react-router-dom";
@@ -83,6 +84,7 @@ const { data: subTenants, refetch, isLoading: isLoadingSubTenants } = requestCri
       const redirectBackTo = location.state?.redirectBackTo;
       if(window?.globalPath === "sandbox-ui"){
         history.push(`/${window?.contextPath}/citizen/all-services`);
+        return;
       }
       if (redirectBackTo) {
         history.replace(redirectBackTo);
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/index.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/index.js
index df0cc952679..49feca963bc 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/index.js
@@ -9,7 +9,7 @@ import {
   PTIcon,
   Loader,
   WhatsNewCard,
-} from "@egovernments/digit-ui-components";
+} from "@egovernments/digit-ui-react-components";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { useHistory } from "react-router-dom";
@@ -57,8 +57,8 @@ const Home = () => {
   if (redirectURL) {
     history.push(`/${window?.contextPath}/citizen/${redirectURL}`);
   }
-  /* fix for sanitation ui */
-  if (window?.location?.href?.includes?.("sanitation-ui")|| window?.location?.href?.includes?.("sandbox-ui")) {
+  /* fix for sanitation ui & sandbox*/
+  if (window?.location?.href?.includes?.("sanitation-ui") || window?.location?.href?.includes?.("sandbox-ui")) {
     history.push(`/${window?.contextPath}/citizen/all-services`);
   }
 
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Login/index.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Login/index.js
index b4f2092a6cb..94976df4c7e 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Login/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Login/index.js
@@ -1,4 +1,4 @@
-import { AppContainer, BackLink ,Toast} from "@egovernments/digit-ui-components";
+import { AppContainer, BackLink, Toast } from "@egovernments/digit-ui-components";
 import React, { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Route, Switch, useHistory, useLocation, useRouteMatch } from "react-router-dom";
@@ -233,7 +233,7 @@ const Login = ({ stateCode, isUserRegistered = true }) => {
     <div className="citizen-form-wrapper">
       <Switch>
         <AppContainer>
-          <BackLink />
+          {location.pathname.includes("login") ? null : <BackLink />}
           <Route path={`${path}`} exact>
             <SelectMobileNumber
               onSelect={selectMobileNumber}
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/index.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/index.js
index 11a8af77881..109502bd53e 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/index.js
@@ -146,7 +146,7 @@ const Home = ({
         mobileView={mobileView}
         handleUserDropdownSelection={handleUserDropdownSelection}
         logoUrl={logoUrl}
-        showSidebar={true}
+        showSidebar={false}
         linkData={linkData}
         islinkDataLoading={islinkDataLoading}
       />
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json b/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json
index 0a0a933c14b..7dad46c7ed2 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json
+++ b/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json
@@ -18,7 +18,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.12",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
     "@egovernments/digit-ui-module-utilities":"1.0.1-beta.39",
     "jsonpath": "^1.1.1",
     "react": "17.0.2",
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/open-payment/package.json b/micro-ui/web/micro-ui-internals/packages/modules/open-payment/package.json
index 813872277e2..2dc71946773 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/open-payment/package.json
+++ b/micro-ui/web/micro-ui-internals/packages/modules/open-payment/package.json
@@ -18,7 +18,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.4",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
     "@egovernments/digit-ui-components": "0.0.2-beta.18",
     "react": "17.0.2",
     "react-dom": "17.0.2",
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json b/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json
index 39bea749219..a630eb76658 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json
+++ b/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json
@@ -18,7 +18,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.12",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
     "lodash.merge": "^4.6.2",
     "react": "17.0.2",
     "react-dom": "17.0.2",
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/package.json b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/package.json
index 93baad0872d..ce7db6919e3 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/package.json
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/package.json
@@ -18,7 +18,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.12",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
     "@egovernments/digit-ui-components": "0.0.2-beta.18",
     "react": "17.0.2",
     "react-date-range": "^1.4.0",
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/Module.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/Module.js
index fa6f1138b58..730ba868190 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/Module.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/Module.js
@@ -10,6 +10,7 @@ export const SandboxModule = ({ stateCode, userType, tenants }) => {
   const { path, url } = useRouteMatch();
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const moduleCode = ["sandbox"];
+  const MDMSmoduleCode = [`rainmaker-mdms`, `rainmaker-workbench`, `rainmaker-schema`];
   const language = Digit.StoreData.getCurrentLanguage();
   const { isLoading, data: store } = Digit.Services.useStore({
     stateCode,
@@ -18,7 +19,12 @@ export const SandboxModule = ({ stateCode, userType, tenants }) => {
     modulePrefix: "digit",
   });
 
-  if (isLoading) {
+  const { isLoading: isMDMSLoading, data: MDMSstore } = Digit.Services.useStore({
+    stateCode,
+    MDMSmoduleCode,
+    language,
+  });
+  if (isLoading && isMDMSLoading) {
     return <Loader />;
   }
   return <EmployeeApp path={path} stateCode={stateCode} userType={userType} tenants={tenants} />;
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/ModuleMasterTable.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/ModuleMasterTable.js
index e4a6ab0c1ff..d9236e6b311 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/ModuleMasterTable.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/ModuleMasterTable.js
@@ -41,11 +41,11 @@ const ModuleMasterTable = () => {
         onError: (error, variables) => {
           console.log(error);
           setShowPopUp(false);
-          setShowToast({ key: "error", label: error, isError: true });
+          setShowToast({ key: "error", label: check ? "MANNUAL_MASTER_SETUP_ERROR" : "DEFAULT_MASTER_SETUP_ERROR", isError: true });
         },
         onSuccess: async (data) => {
           setShowPopUp(false);
-          setShowToast({ key: "success", label: "SUCCESS" });
+          setShowToast({ key: "success", label: check ? "MANNUAL_MASTER_SETUP_SUCCESS" : "DEFAULT_MASTER_SETUP_SUCCESS" });
         },
       }
     );
@@ -68,8 +68,8 @@ const ModuleMasterTable = () => {
           type={"default"}
           className={"masterHandlerPopup"}
           footerclassName={"masterHandlerPopUpFooter"}
-          heading={t("ES_CAMPAIGN_UPLOAD_BOUNDARY_DATA_MODAL_HEADER")}
-          children={[<div>{t("ES_CAMPAIGN_UPLOAD_BOUNDARY_DATA_MODAL_TEXT")}</div>]}
+          heading={t("SANDBOX_SETUP_MASTER_MODAL_HEADER")}
+          children={[<div>{t("SANDBOX_SETUP_MASTER_MODAL_TEXT")}</div>]}
           onOverlayClick={() => {}}
           footerChildren={[
             <Button
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/config/setupMasterConfig.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/config/setupMasterConfig.js
index cdb1ab8b1fd..fc86c889c11 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/config/setupMasterConfig.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/config/setupMasterConfig.js
@@ -7,38 +7,35 @@ export const setupMasterConfig = {
       module: "PGR",
       active: true,
       description: "COMPLAINT_MANAGEMENT_DESCRIPTION",
+      masterDescription: "COMPLAINT_MANAGEMENT_SETUP_MASTER_DESCRIPTION",
       actionText: "SETUP_NOW",
       features: [
         {
           id: 1,
-          name: "COMPLAINT_MANAGEMENT_REGISTRATION",
+          name: "COMPLAINT_MANAGEMENT_REGISTRATION_LOGIN_CREATION",
         },
         {
           id: 2,
-          name: "COMPLAINT_MANAGEMENT_FEATURE_LOGIN_CREATION",
-        },
-        {
-          id: 3,
           name: "COMPLAINT_MANAGEMENT_LODGING_FILE",
         },
         {
-          id: 4,
+          id: 3,
           name: "COMPLAINT_MANAGEMENT_ASSIGNING_COMPLAINT",
         },
         {
-          id: 5,
+          id: 4,
           name: "COMPLAINT_MANAGEMENT_RESOLVING_COMPLAINT",
         },
         {
-          id: 6,
+          id: 5,
           name: "COMPLAINT_MANAGEMENT_MANAGE_COMPLAINTS",
         },
         {
-          id: 7,
+          id: 6,
           name: "COMPLAINT_MANAGEMENT_TRACK_COMPLAINTS",
         },
         {
-          id: 8,
+          id: 7,
           name: "COMPLAINT_MANAGEMENT_DASHBOARD_REPORTS",
         },
       ],
@@ -48,6 +45,7 @@ export const setupMasterConfig = {
       module: "HCM",
       active: true,
       description: "HCM_DESCRIPTION",
+      masterDescription: "HCM_SETUP_MASTER_DESCRIPTION",
       actionText: "SETUP_NOW",
       features: [
         {
@@ -61,15 +59,20 @@ export const setupMasterConfig = {
       module: "HRMS",
       active: true,
       description: "HRMS_DESCRIPTION",
+      masterDescription: "HRMS_SETUP_MASTER_DESCRIPTION",
       actionText: "SETUP_NOW",
       features: [
         {
           id: 1,
-          name: "HRMS_REGISTRATION",
+          name: "HRMS_REGISTRATION_LOGIN_CREATION",
         },
         {
           id: 2,
-          name: "HRMS_LOGIN_CREATION",
+          name: "HRMS_MODIFY_EMPLOYEE",
+        },
+        {
+          id: 3,
+          name: "HRMS_VIEW_EMPLOYEE",
         },
       ],
     },
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/utilities/package.json b/micro-ui/web/micro-ui-internals/packages/modules/utilities/package.json
index 7e6537a861e..09f4b4902de 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/utilities/package.json
+++ b/micro-ui/web/micro-ui-internals/packages/modules/utilities/package.json
@@ -20,7 +20,7 @@
   "dependencies": {
     "@cyntler/react-doc-viewer": "1.10.3",
     "@egovernments/digit-ui-components": "0.0.2-beta.18",
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.12",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
     "axios": "^1.7.2",
     "react": "17.0.2",
     "react-date-range": "^1.4.0",
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/workbench/package.json b/micro-ui/web/micro-ui-internals/packages/modules/workbench/package.json
index 8e642d31f1d..09f9f5941af 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/workbench/package.json
+++ b/micro-ui/web/micro-ui-internals/packages/modules/workbench/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@egovernments/digit-ui-components": "0.0.2-beta.18",
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.12",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
     "@rjsf/core": "5.10.0",
     "@rjsf/utils": "5.10.0",
     "@rjsf/validator-ajv8": "5.10.0",
diff --git a/micro-ui/web/micro-ui-internals/packages/react-components/package.json b/micro-ui/web/micro-ui-internals/packages/react-components/package.json
index 3faeaec3640..b5a8ab19948 100644
--- a/micro-ui/web/micro-ui-internals/packages/react-components/package.json
+++ b/micro-ui/web/micro-ui-internals/packages/react-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-react-components",
-  "version": "1.8.2-beta.12",
+  "version": "1.8.2-beta.13",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",
diff --git a/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/SearchOnRadioButtons.js b/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/SearchOnRadioButtons.js
index 318dd4b6aea..65de59c423b 100644
--- a/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/SearchOnRadioButtons.js
+++ b/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/SearchOnRadioButtons.js
@@ -1,4 +1,4 @@
-import React, { useReducer } from "react"
+import React, { useEffect, useReducer } from "react"
 import RadioButtons from "../atoms/RadioButtons"
 import TextInput from "../atoms/TextInput"
 import { SearchIconSvg } from "../atoms/svgindex"
@@ -9,9 +9,18 @@ const SearchOnRadioButtons = ({options,optionsKey,additionalWrapperClass,onSelec
         switch (action.type){
             case "filter":
                 return action.options.filter(i => i[optionsKey].toUpperCase().includes(action.payload.toUpperCase()))
+            default:
+                return state;
+                
         }
     }
 
+    useEffect(()=>{
+        if(options){
+            optionsDispatch({type: "filter", payload: "", options})
+        }
+    },[options])
+
     const [ filteredOptions, optionsDispatch ] = useReducer(optionsReducer, options)
 
     function defaultSearchQueryChange(e){

From d5dba8a7c4b4b73c6bbd7820c2b9967af6a39ff0 Mon Sep 17 00:00:00 2001
From: aaradhya-egov <137176709+aaradhya-egov@users.noreply.github.com>
Date: Fri, 6 Sep 2024 16:24:22 +0530
Subject: [PATCH 07/23] fix (#1364)

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.org>
---
 .../pages/citizen/Home/LocationSelection.js   |  4 ---
 .../citizen/Create/Steps/SelectAddress.js     | 23 +++++++++++---
 .../pages/employee/CreateComplaint/index.js   | 31 ++++++++++---------
 3 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js
index ba0ebe58401..b86feca27e5 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js
@@ -30,10 +30,6 @@ if (window?.globalPath === 'sandbox-ui') {
       includeSubTenants: true
     },
     body: {
-      "inbox": {
-        "limit": 10,
-        "offset": 0
-      },
       apiOperation: "SEARCH",
     },
     config: {
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js
index ce56dcc9c86..8d8c8cece8b 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js
@@ -17,10 +17,6 @@ if (window.globalPath === 'sandbox-ui') {
       includeSubTenants: true
     },
     body: {
-      "inbox": {
-        "limit": 10,
-        "offset": 0
-      },
       apiOperation: "SEARCH",
     },
     config: {
@@ -43,9 +39,26 @@ const { data: subTenants, refetch, isLoading: isLoadingSubTenants } = requestCri
     const { city_complaint } = value;
     return city_complaint ? city_complaint : null;
   });
+
+  const { isLoading: hierarchyLOading, data:hierarchyType } = Digit.Hooks.useCustomMDMS(
+    Digit.ULBService.getStateId(),
+     "sandbox-ui",
+      [
+        { name: "ModuleMasterConfig",filter:'[?(@.module == "PGR")].master[?(@.type == "boundary")]' 
+
+        }
+      ],
+      {
+        select: (data) => {
+          const formattedData = data?.["sandbox-ui"]?.["ModuleMasterConfig"]
+          return formattedData?.[0]?.code;
+        },
+      }
+    );
+
   const { data: fetchedLocalities } = Digit.Hooks.useBoundaryLocalities(
     selectedCity?.code,
-    window.globalPath === "sandbox-ui" ? "REVENUE" : "admin",
+    hierarchyType,
     {
       enabled: !!selectedCity,
     },
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js
index 8ea99cfbf91..db142311d82 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js
@@ -27,10 +27,6 @@ if (window.globalPath === 'sandbox-ui') {
       includeSubTenants: true
     },
     body: {
-      "inbox": {
-        "limit": 10,
-        "offset": 0
-      },
       apiOperation: "SEARCH",
     },
     config: {
@@ -62,24 +58,31 @@ const { data: subTenants, refetch, isLoading: isLoadingSubTenants } = requestCri
 
   const cityData = window.globalPath === "sandbox-ui" ? getSubTenants() : getCities();
 
+  const { isLoading: hierarchyLOading, data:hierarchyType } = Digit.Hooks.useCustomMDMS(
+    Digit.ULBService.getStateId(),
+     "sandbox-ui",
+      [
+        { name: "ModuleMasterConfig",filter:'[?(@.module == "PGR")].master[?(@.type == "boundary")]' 
+
+        }
+      ],
+      {
+        select: (data) => {
+          const formattedData = data?.["sandbox-ui"]?.["ModuleMasterConfig"]
+          return formattedData?.[0]?.code;
+        },
+      }
+    );
+
   const { data: fetchedLocalities } = Digit.Hooks.useBoundaryLocalities(
   cityData[0]?.code,
-  window.globalPath === "sandbox-ui" ? "REVENUE" : "admin",
+  hierarchyType,
   {
     enabled: !!cityData[0],
   },
   t
 );
 
-  // const { data: fetchedLocalities } = Digit.Hooks.useBoundaryLocalities(
-  //   getCities()[0]?.code,
-  //   "admin",
-  //   {
-  //     enabled: !!getCities()[0],
-  //   },
-  //   t
-  // );
-
   const [localities, setLocalities] = useState(fetchedLocalities);
   const [selectedLocality, setSelectedLocality] = useState(null);
   const [canSubmit, setSubmitValve] = useState(false);

From fb46da8d58bf6440491d005a4621b0e0b06083f8 Mon Sep 17 00:00:00 2001
From: aaradhya-egov <137176709+aaradhya-egov@users.noreply.github.com>
Date: Fri, 6 Sep 2024 18:29:51 +0530
Subject: [PATCH 08/23] fix (#1365)

* fix

* Update Home.js

---------

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.org>
---
 .../libraries/src/services/molecules/Ulb/index.js     | 11 +----------
 .../packages/modules/core/src/components/Home.js      |  4 ++--
 .../core/src/components/TopBarSideBar/TopBar.js       |  3 ++-
 .../core/src/pages/citizen/Home/LocationSelection.js  |  2 +-
 .../src/pages/citizen/Create/Steps/SelectAddress.js   |  2 +-
 5 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Ulb/index.js b/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Ulb/index.js
index 2737c329cf2..b5e98b99b40 100644
--- a/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Ulb/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Ulb/index.js
@@ -31,14 +31,6 @@ export const ULBService = {
     // TODO: change when setter is done.
 
     const user = UserService.getUser();
-    const isMultiRootTenant = window?.globalConfigs?.getConfig("MULTI_ROOT_TENANT") || false;
-    const pathname = window.location.pathname;
-    const context = window?.globalConfigs?.getConfig("CONTEXT_PATH");
-    const start = pathname.indexOf(context) + context.length + 1;
-    const employeeIndex = pathname.indexOf("employee");
-    const citizenIndex = pathname.indexOf("citizen");
-    const end = (employeeIndex !== -1) ? employeeIndex : (citizenIndex !== -1) ? citizenIndex : -1;
-    const tenant = end > start ? pathname.substring(start, end).replace(/\/$/, "") : "";
     if (user?.extraRoleInfo) {
       const isDsoRoute = Digit.Utils.detectDsoRoute(window.location.pathname);
       if (isDsoRoute) {
@@ -47,8 +39,7 @@ export const ULBService = {
     }
 
     //TODO: fix tenant id from userinfo
-    const tenantId = user?.info?.type !== "EMPLOYEE" && isMultiRootTenant && tenant ? tenant :
-      user?.info?.type === "EMPLOYEE" && user?.info?.tenantId ? user?.info?.tenantId : window?.globalConfigs.getConfig("STATE_LEVEL_TENANT_ID");
+    const tenantId =  user?.info?.type === "EMPLOYEE" && user?.info?.tenantId ? user?.info?.tenantId : window?.globalConfigs.getConfig("STATE_LEVEL_TENANT_ID");
     return tenantId;
   },
   /**
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Home.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Home.js
index 3cad29da039..6a4c5ca55dc 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Home.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Home.js
@@ -16,8 +16,8 @@ export const processLinkData = (newData, code, t) => {
   const obj = newData?.[`${code}`];
   if (obj) {
     obj.map((link) => {
-      if (window.globalPath === "sandbox-ui") {
-        link["navigationURL"] = link["navigationURL"].replace("/sandbox-ui/citizen", `/sandbox-ui/${Digit.ULBService.getCurrentTenantId()}/citizen`);
+      if (Digit.Utils.getMultiRootTenant()) {
+        link["navigationURL"] = link["navigationURL"].replace("/sandbox-ui/citizen", `/sandbox-ui/${Digit.ULBService.getStateId()}/citizen`);
       }
       link.link = link["navigationURL"];
       link.i18nKey = t(link["name"]);
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/TopBar.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/TopBar.js
index f3f02e4e8f8..1a36ef1179b 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/TopBar.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/TopBar.js
@@ -24,7 +24,8 @@ const TopBar = ({
   const [profilePic, setProfilePic] = React.useState(null);
 
   React.useEffect(async () => {
-    const tenant = Digit.ULBService.getCurrentTenantId();
+
+    const tenant = Digit.Utils.getMultiRootTenant() ? Digit.ULBService.getStateId(): Digit.ULBService.getCurrentTenantId();
     const uuid = userDetails?.info?.uuid;
     if (uuid) {
       const usersResponse = await Digit.UserService.userSearch(tenant, { uuid: [uuid] }, {});
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js
index b86feca27e5..963cb4607d5 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js
@@ -26,7 +26,7 @@ if (window?.globalPath === 'sandbox-ui') {
   requestCriteria = {
     url: "/tenant-management/tenant/_search",
     params: {
-      code: Digit.ULBService.getCurrentTenantId(),
+      code: Digit.ULBService.getStateId(),
       includeSubTenants: true
     },
     body: {
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js
index 8d8c8cece8b..acf46d921df 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js
@@ -13,7 +13,7 @@ if (window.globalPath === 'sandbox-ui') {
   requestCriteria = {
     url: "/tenant-management/tenant/_search",
     params: {
-      code: Digit.ULBService.getCurrentTenantId(),
+      code: Digit.ULBService.getStateId(),
       includeSubTenants: true
     },
     body: {

From 6b93638d4827632d6a807bb87248627f33aff229 Mon Sep 17 00:00:00 2001
From: mithunhegde-egov <152362871+mithunhegde-egov@users.noreply.github.com>
Date: Fri, 6 Sep 2024 18:43:51 +0530
Subject: [PATCH 09/23] hrms changes (#1367)

* hrms changes

* removed console log

* review changes

---------

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.org>
---
 .../components/pageComponents/assignment.js   |  4 +-
 .../components/pageComponents/jurisdiction.js | 64 +++++++++++++++----
 .../modules/hrms/src/pages/createEmployee.js  |  1 -
 3 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/assignment.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/assignment.js
index def4fed5001..ba81123112d 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/assignment.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/assignment.js
@@ -106,13 +106,13 @@ const Assignments = ({ t, config, onSelect, userType, formData }) => {
   const [focusIndex, setFocusIndex] = useState(-1);
 
   function getdepartmentdata() {
-    return data?.MdmsRes?.["common-masters"]?.Department.map((ele) => {
+    return data?.MdmsRes?.["common-masters"]?.Department?.map((ele) => {
       ele["i18key"] = t("COMMON_MASTERS_DEPARTMENT_" + ele.code);
       return ele;
     });
   }
   function getdesignationdata() {
-    return data?.MdmsRes?.["common-masters"]?.Designation.map((ele) => {
+    return data?.MdmsRes?.["common-masters"]?.Designation?.map((ele) => {
       ele["i18key"] = t("COMMON_MASTERS_DESIGNATION_" + ele.code);
       return ele;
     });
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/jurisdiction.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/jurisdiction.js
index 51e8f662617..f66681c9afb 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/jurisdiction.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/jurisdiction.js
@@ -1,17 +1,17 @@
-import { CardLabel, Dropdown, LabelFieldPair, Loader, RemoveableTag ,MultiSelectDropdown} from "@egovernments/digit-ui-react-components";
+import { CardLabel, Dropdown, LabelFieldPair, Loader, RemoveableTag, MultiSelectDropdown } from "@egovernments/digit-ui-react-components";
 import React, { useEffect, useState } from "react";
 import cleanup from "../Utils/cleanup";
 // import MultiSelectDropdown from "./Multiselect";
 
 const makeDefaultValues = (sessionFormData) => {
-  return sessionFormData?.Jurisdictions?.map((ele,index)=>{
+  return sessionFormData?.Jurisdictions?.map((ele, index) => {
     return {
       key: index,
       hierarchy: {
         code: ele?.hierarchy,
         name: ele?.hierarchy,
       },
-      boundaryType: { label: ele?.boundaryType, i18text:ele.boundaryType ?`EGOV_LOCATION_BOUNDARYTYPE_${ele.boundaryType?.toUpperCase()}`:null },
+      boundaryType: { label: ele?.boundaryType, i18text: ele.boundaryType ? `EGOV_LOCATION_BOUNDARYTYPE_${ele.boundaryType?.toUpperCase()}` : null },
       boundary: { code: ele?.boundary },
       roles: ele?.roles,
     }
@@ -24,10 +24,10 @@ const Jurisdictions = ({ t, config, onSelect, userType, formData }) => {
   const { data: data = {}, isLoading } = Digit.Hooks.hrms.useHrmsMDMS(tenantId, "egov-hrms", "HRMSRolesandDesignation") || {};
 
   const employeeCreateSession = Digit.Hooks.useSessionStorage("NEW_EMPLOYEE_CREATE", {});
-  const [sessionFormData,setSessionFormData, clearSessionFormData] = employeeCreateSession;
+  const [sessionFormData, setSessionFormData, clearSessionFormData] = employeeCreateSession;
   const isEdit = window.location.href.includes("hrms/edit")
   const [jurisdictions, setjurisdictions] = useState(
-    !isEdit && sessionFormData?.Jurisdictions?.length>0 ? makeDefaultValues(sessionFormData) : ( formData?.Jurisdictions ||  [
+    !isEdit && sessionFormData?.Jurisdictions?.length > 0 ? makeDefaultValues(sessionFormData) : (formData?.Jurisdictions || [
       {
         id: undefined,
         key: 1,
@@ -51,7 +51,7 @@ const Jurisdictions = ({ t, config, onSelect, userType, formData }) => {
       };
       res = cleanup(res);
       if (jurisdiction?.roles) {
-        res["roles"] = jurisdiction?.roles.map((ele) => {
+        res["roles"] = jurisdiction?.roles?.map((ele) => {
           delete ele.description;
           return ele;
         });
@@ -113,7 +113,7 @@ const Jurisdictions = ({ t, config, onSelect, userType, formData }) => {
   const [focusIndex, setFocusIndex] = useState(-1);
 
   function gethierarchylistdata() {
-    return data?.MdmsRes?.["egov-location"]["TenantBoundary"].map((ele) => ele.hierarchyType);
+    return data?.MdmsRes?.["egov-location"]["TenantBoundary"]?.map((ele) => ele.hierarchyType);
   }
 
   function getboundarydata() {
@@ -121,7 +121,7 @@ const Jurisdictions = ({ t, config, onSelect, userType, formData }) => {
   }
 
   function getroledata() {
-    return data?.MdmsRes?.["ACCESSCONTROL-ROLES"].roles.map(role => { return { code: role.code, name: role?.name ? role?.name : " " , labelKey: 'ACCESSCONTROL_ROLES_ROLES_' + role.code } });
+    return data?.MdmsRes?.["ACCESSCONTROL-ROLES"]?.roles?.map(role => { return { code: role.code, name: role?.name ? role?.name : " ", labelKey: 'ACCESSCONTROL_ROLES_ROLES_' + role.code } });
   }
 
   if (isLoading) {
@@ -169,8 +169,11 @@ function Jurisdiction({
   roleoption,
   index,
 }) {
+
+
   const [BoundaryType, selectBoundaryType] = useState([]);
   const [Boundary, selectboundary] = useState([]);
+  const cities = window.globalPath === "sandbox-ui" ? Digit.Hooks.pgr.useTenants() : null;
   useEffect(() => {
     selectBoundaryType(
       data?.MdmsRes?.["egov-location"]["TenantBoundary"]
@@ -181,10 +184,49 @@ function Jurisdiction({
     );
   }, [jurisdiction?.hierarchy, data?.MdmsRes]);
   const tenant = Digit.ULBService.getCurrentTenantId();
+  let requestCriteria = null;
+
+  requestCriteria = {
+    url: "/tenant-management/tenant/_search",
+    params: {
+      code: Digit.ULBService.getCurrentTenantId(),
+      includeSubTenants: true
+    },
+    body: {
+      "inbox": {
+        "limit": 10,
+        "offset": 0
+      },
+      apiOperation: "SEARCH",
+    },
+    config: {
+      select: (data) => {
+        return data?.Tenants;
+      },
+    },
+  };
+
+  // Use the requestCriteria only if it's not null
+  const { data: subTenants, refetch, isLoading: isLoadingSubTenants } = requestCriteria
+    ? Digit.Hooks.useCustomAPIHook(requestCriteria)
+    : { data: null, refetch: () => { }, isLoading: false };
+
+  // Now you can use subTenants, refetch, and isLoadingSubTenants
+
+  const getSubTenants = () => subTenants?.filter((e) => e.code === Digit.ULBService.getCurrentTenantId()) || [];
+  const subTenantList = getSubTenants();
+
   useEffect(() => {
-    selectboundary(data?.MdmsRes?.tenant?.tenants.filter(city => city.code != Digit.ULBService.getStateId()).map(city => { return { ...city, i18text: Digit.Utils.locale.getCityLocale(city.code) } }));
+    if (window.globalPath === 'sandbox-ui') {
+      selectboundary(subTenantList);
+    }
+    else {
+      selectboundary(data?.MdmsRes?.tenant?.tenants.filter(city => city.code != Digit.ULBService.getStateId()).map(city => { return { ...city, i18text: Digit.Utils.locale.getCityLocale(city.code) } }));
+    }
   }, [jurisdiction?.boundaryType, data?.MdmsRes]);
 
+
+
   useEffect(() => {
     if (Boundary?.length > 0) {
       selectedboundary(Boundary?.filter((ele) => ele.code == jurisdiction?.boundary?.code)[0]);
@@ -217,7 +259,7 @@ function Jurisdiction({
       res.push(ob?.[1]);
     });
 
-    res?.forEach(resData => {resData.labelKey = 'ACCESSCONTROL_ROLES_ROLES_' + resData.code})
+    res?.forEach(resData => { resData.labelKey = 'ACCESSCONTROL_ROLES_ROLES_' + resData.code })
 
     setjurisdictions((pre) => pre.map((item) => (item.key === jurisdiction.key ? { ...item, roles: res } : item)));
   };
@@ -283,7 +325,7 @@ function Jurisdiction({
             disable={Boundary?.length === 0}
             option={Boundary}
             select={selectedboundary}
-            optionKey="i18text"
+            optionKey={Digit.Utils.getMultiRootTenant() ? "code" : "i18text"}
             t={t}
           />
         </LabelFieldPair>
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 75005bbbc35..e96ead54bf4 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
@@ -137,7 +137,6 @@ const CreateEmployee = () => {
 
   
 
-
   const onSubmit = (data) => {
     if (data.Jurisdictions.filter(juris => juris.tenantId == tenantId).length == 0) {
       setShowToast({ key: true, label: "ERR_BASE_TENANT_MANDATORY" });

From 55e57832e69ba4a53ed2ff762e60c5ee5e20055f Mon Sep 17 00:00:00 2001
From: nabeelmd-eGov <nabeel.md@egovernments.org>
Date: Sun, 8 Sep 2024 11:58:48 +0530
Subject: [PATCH 10/23] PR comment resolve (#1368)

Co-authored-by: NabeelAyubee <nayubi7@gmail.com>
---
 .../packages/libraries/src/hooks/store.js     |   2 +-
 .../src/services/molecules/Store/service.js   |  43 +++--
 .../src/services/molecules/Ulb/index.js       |   4 +-
 .../packages/libraries/src/utils/index.js     |  26 ++-
 .../TopBarSideBar/SideBar/EmployeeSideBar.js  |   2 +-
 .../modules/pgr/src/components/PGRCard.js     |   4 +-
 .../citizen/Create/Steps/SelectAddress.js     |  12 +-
 .../pages/employee/CreateComplaint/index.js   |  18 +--
 .../packages/modules/sandbox/src/Module.js    |   3 +
 .../sandbox/src/components/SandboxCard.js     |  10 +-
 .../sandbox/src/configs/UICustomizations.js   |  12 +-
 .../employee/applicationMgmt/SetupMaster.js   | 152 +++++++++++++-----
 .../config/moduleMasterConfig.js              |  10 +-
 .../workbench/src/pages/employee/index.js     | 121 ++++++--------
 14 files changed, 255 insertions(+), 164 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/store.js b/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/store.js
index bb12fab4fa6..f9550c4d1df 100644
--- a/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/store.js
+++ b/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/store.js
@@ -10,7 +10,7 @@ export const useStore = ({ stateCode, moduleCode, language ,modulePrefix = "rain
 export const useInitStore = (stateCode, enabledModules,modulePrefix = "rainmaker" ) => {
   const { isLoading, error, isError, data } = useQuery(
     ["initStore", stateCode, enabledModules,modulePrefix],
-    () => StoreService.digitInitData(stateCode, enabledModules ,modulePrefix, window?.globalPath === "sandbox-ui" ? true : false),
+    () => StoreService.digitInitData(stateCode, enabledModules ,modulePrefix),
     {
       staleTime: Infinity,
     }
diff --git a/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Store/service.js b/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Store/service.js
index ffa862b2394..f3dc0eacb0d 100644
--- a/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Store/service.js
+++ b/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Store/service.js
@@ -55,32 +55,47 @@ export const StoreService = {
     });
     return await Promise.all(allBoundries);
   },
-  digitInitData: async (stateCode, enabledModules, modulePrefix, tenantConfigFetch) => {
+  digitInitData: async (stateCode, enabledModules, modulePrefix) => {
     const { MdmsRes } = await MdmsService.init(stateCode);
     const stateInfo = MdmsRes["common-masters"]?.StateInfo?.[0] || {};
     const uiHomePage = MdmsRes["common-masters"]?.uiHomePage?.[0] || {};
-    const tenantConfigs = await TenantConfigSearch.tenant(stateCode);
-    const tenantConfigSearch = tenantConfigs?.tenantConfigs ? tenantConfigs?.tenantConfigs : null;
+    const tenantConfigFetch = Digit.Utils.getMultiRootTenant();
     const localities = {};
     const revenue_localities = {};
-    const initData = {
+    const fetchTenantConfig = async () => {
+      const tenantConfigs = await TenantConfigSearch.tenant(stateCode);
+      const tenantConfigSearch = tenantConfigs?.tenantConfigs ? tenantConfigs?.tenantConfigs : null;
+      return {
+        languages: stateInfo.hasLocalisation ? stateInfo.languages : [{ label: "ENGLISH", value: Digit.Utils.getDefaultLanguage() }],
+        stateInfo: {
+          code: tenantConfigFetch ? tenantConfigSearch?.[0]?.code : stateInfo.code,
+          name: tenantConfigFetch ? tenantConfigSearch?.[0]?.name : stateInfo.name,
+          logoUrl: tenantConfigFetch ? tenantConfigSearch?.[0]?.documents?.find((item) => item.type === "logoUrl")?.url : stateInfo.logoUrl,
+          statelogo: tenantConfigFetch ? tenantConfigSearch?.[0]?.documents?.find((item) => item.type === "statelogo")?.url : stateInfo.statelogo,
+          logoUrlWhite: tenantConfigFetch
+            ? tenantConfigSearch?.[0]?.documents?.find((item) => item.type === "logoUrlWhite")?.url
+            : stateInfo.logoUrlWhite,
+          bannerUrl: tenantConfigFetch ? tenantConfigSearch?.[0]?.documents?.find((item) => item.type === "bannerUrl")?.url : stateInfo.bannerUrl,
+        },
+        localizationModules: stateInfo.localizationModules,
+        modules: MdmsRes?.tenant?.citymodule?.filter((module) => module?.active)?.filter((module) => enabledModules?.includes(module?.code))?.sort((x,y)=>x?.order-y?.order)|| [],
+        uiHomePage: uiHomePage
+      };
+    };
+    const initData = tenantConfigFetch ? await fetchTenantConfig() : {
       languages: stateInfo.hasLocalisation ? stateInfo.languages : [{ label: "ENGLISH", value: Digit.Utils.getDefaultLanguage() }],
       stateInfo: {
-        code: tenantConfigFetch ? tenantConfigSearch?.[0]?.code : stateInfo.code,
-        name: tenantConfigFetch ? tenantConfigSearch?.[0]?.name : stateInfo.name,
-        logoUrl: tenantConfigFetch ? tenantConfigSearch?.[0]?.documents?.find((item) => item.type === "logoUrl")?.url : stateInfo.logoUrl,
-        statelogo: tenantConfigFetch ? tenantConfigSearch?.[0]?.documents?.find((item) => item.type === "statelogo")?.url : stateInfo.statelogo,
-        logoUrlWhite: tenantConfigFetch
-          ? tenantConfigSearch?.[0]?.documents?.find((item) => item.type === "logoUrlWhite")?.url
-          : stateInfo.logoUrlWhite,
-        bannerUrl: tenantConfigFetch ? tenantConfigSearch?.[0]?.documents?.find((item) => item.type === "bannerUrl")?.url : stateInfo.bannerUrl,
+        code: stateInfo.code,
+        name:  stateInfo.name,
+        logoUrl: stateInfo.logoUrl,
+        statelogo: stateInfo.statelogo,
+        logoUrlWhite: stateInfo.logoUrlWhite,
+        bannerUrl: stateInfo.bannerUrl,
       },
       localizationModules: stateInfo.localizationModules,
       modules: MdmsRes?.tenant?.citymodule?.filter((module) => module?.active)?.filter((module) => enabledModules?.includes(module?.code))?.sort((x,y)=>x?.order-y?.order)|| [],
       uiHomePage: uiHomePage
     };
-
-  
     initData.selectedLanguage = Digit.SessionStorage.get("locale") || initData.languages[0].value;
 
     ApiCacheService.saveSetting(MdmsRes["DIGIT-UI"]?.ApiCachingSettings);
diff --git a/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Ulb/index.js b/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Ulb/index.js
index b5e98b99b40..4beb338f595 100644
--- a/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Ulb/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Ulb/index.js
@@ -27,7 +27,7 @@ export const ULBService = {
    *
    * @returns {String}
    */
-  getCurrentTenantId: () => {
+  s: () => {
     // TODO: change when setter is done.
 
     const user = UserService.getUser();
@@ -39,7 +39,7 @@ export const ULBService = {
     }
 
     //TODO: fix tenant id from userinfo
-    const tenantId =  user?.info?.type === "EMPLOYEE" && user?.info?.tenantId ? user?.info?.tenantId : window?.globalConfigs.getConfig("STATE_LEVEL_TENANT_ID");
+    const tenantId = user?.info?.type === "EMPLOYEE" && user?.info?.tenantId ? user?.info?.tenantId : window?.globalConfigs.getConfig("STATE_LEVEL_TENANT_ID");
     return tenantId;
   },
   /**
diff --git a/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/index.js b/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/index.js
index 4f2dfdf3c75..a87a7b76874 100644
--- a/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/index.js
@@ -123,6 +123,18 @@ const getStaticMapUrl = (latitude, longitude) => {
 const getLocaleRegion = () => {
   return window?.globalConfigs?.getConfig("LOCALE_REGION") || "IN";
 };
+
+const getMultiRootTenant = () => {
+  return window?.globalConfigs?.getConfig("MULTI_ROOT_TENANT") || false;
+};
+
+const getGlobalContext = () => {
+  return window?.globalConfigs?.getConfig("CONTEXT_PATH") || null;
+};
+
+const getOTPBasedLogin = () => {
+  return window?.globalConfigs?.getConfig("OTP_BASED_LOGIN") || false;
+};
 /**
  * Custom util to get the default locale
  *
@@ -313,6 +325,14 @@ const hrmsAccess = () => {
   return HRMS_ACCESS?.length > 0;
 };
 
+const sandboxAccess = () => {
+  const sandboxRoles = ["SUPERUSER"];
+  const userInfo = Digit.UserService.getUser();
+  const userRoles = userInfo?.info?.roles?.map((roleData) => roleData?.code);
+  const SANDBOX_ACCESS = userRoles?.filter((role) => sandboxRoles?.includes(role));
+  return SANDBOX_ACCESS?.length > 0;
+};
+
 const wsAccess = () => {
   const userInfo = Digit.UserService.getUser();
   const userRoles = userInfo?.info?.roles?.map((roleData) => roleData?.code);
@@ -380,5 +400,9 @@ export default {
   ...privacy,
   getDefaultLanguage,
   getLocaleDefault,
-  getLocaleRegion
+  getLocaleRegion,
+  getMultiRootTenant,
+  getGlobalContext,
+  getOTPBasedLogin,
+  sandboxAccess
 };
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 1b0a87c747e..82040fef326 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
@@ -3,7 +3,7 @@ import { Sidebar, Loader } from "@egovernments/digit-ui-components";
 import { useTranslation } from "react-i18next";
 import { useHistory } from "react-router-dom";
 
-const DIGIT_UI_CONTEXTS = ["digit-ui", "works-ui", "workbench-ui", "health-ui", "sanitation-ui", "core-ui", "mgramseva-web"];
+const DIGIT_UI_CONTEXTS = ["digit-ui", "works-ui", "workbench-ui", "health-ui", "sanitation-ui", "core-ui", "mgramseva-web", "sandbox-ui"];
 
 const EmployeeSideBar = () => {
   const { isLoading, data } = Digit.Hooks.useAccessControl();
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js
index 592044da686..5e3e48e100d 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js
@@ -21,10 +21,10 @@ const PGRCard = () => {
     <path d="M20 2H4c-1.1 0-1.99.9-1.99 2L2 22l4-4h14c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm-7 9h-2V5h2v6zm0 4h-2v-2h2v2z" fill="white"></path>
   </svg>
 
-  let role = "CSR";
+  let role = ["CSR"];
 
 if (window.globalPath === "sandbox-ui") {
-  role = "SUPERUSER";
+  role.push("SUPERUSER");
 }
 
 let propsForCSR = [
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js
index acf46d921df..dc6e1052d89 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js
@@ -3,7 +3,7 @@ import { CardLabel, Dropdown, FormStep, RadioButtons } from "@egovernments/digit
 import { subtract } from "lodash";
 
 const SelectAddress = ({ t, config, onSelect, value }) => {
-  const allCities = window.globalPath === "sandbox-ui"  ? Digit.Hooks.pgr.useTenants(): null;
+  const allCities = Digit.Hooks.pgr.useTenants();
   const cities = value?.pincode ? allCities.filter((city) => city?.pincode?.some((pin) => pin == value["pincode"])) : allCities;
   // Define the requestCriteria
 let requestCriteria = null;
@@ -98,14 +98,14 @@ const { data: subTenants, refetch, isLoading: isLoadingSubTenants } = requestCri
     <FormStep config={config} onSelect={onSubmit} t={t} isDisabled={selectedLocality ? false : true}>
       <div>
         <CardLabel>{t("MYCITY_CODE_LABEL")}</CardLabel>
-        {(window.globalPath === "sandbox-ui" ? subTenants?.length : cities?.length) < 5 ? (
+        {(Digit.Utils.getMultiRootTenant() ? subTenants?.length : cities?.length) < 5 ? (
           <RadioButtons selectedOption={selectedCity} options={
-            window.globalPath === "sandbox-ui" ? subTenants : cities
-          } optionsKey={window.globalPath === "sandbox-ui" ? "name" : "i18nKey"} onSelect={selectCity} />
+            Digit.Utils.getMultiRootTenant() ? subTenants : cities
+          } optionsKey={Digit.Utils.getMultiRootTenant() ? "name" : "i18nKey"} onSelect={selectCity} />
         ) : (
           <Dropdown isMandatory selected={selectedCity} option={
-            window.globalPath === "sandbox-ui" ? subTenants : cities
-          } select={selectCity} optionKey={window.globalPath === "sandbox-ui" ? "name" : "i18nKey"} t={t} />
+            Digit.Utils.getMultiRootTenant() ? subTenants : cities
+          } select={selectCity} optionKey={Digit.Utils.getMultiRootTenant() ? "name" : "i18nKey"} t={t} />
         )}
         {selectedCity && localities && <CardLabel>{t("CS_CREATECOMPLAINT_MOHALLA")}</CardLabel>}
         {selectedCity && localities && (
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js
index db142311d82..9a7639cb338 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js
@@ -9,7 +9,7 @@ import { FormComposer } from "../../../components/FormComposer";
 import { createComplaint } from "../../../redux/actions/index";
 
 export const CreateComplaint = ({ parentUrl }) => {
-  const cities = window.globalPath === "sandbox-ui" ? Digit.Hooks.pgr.useTenants() : null;
+  const cities = Digit.Hooks.pgr.useTenants();
 
   const { t } = useTranslation();
 
@@ -19,7 +19,7 @@ export const CreateComplaint = ({ parentUrl }) => {
 let requestCriteria = null;
 
 // Check the value of window.globalPath
-if (window.globalPath === 'sandbox-ui') {
+if (Digit.Utils.getMultiRootTenant()) {
   requestCriteria = {
     url: "/tenant-management/tenant/_search",
     params: {
@@ -51,12 +51,12 @@ const { data: subTenants, refetch, isLoading: isLoadingSubTenants } = requestCri
   const [subType, setSubType] = useState({});
   const [pincode, setPincode] = useState("");
   const [selectedCity, setSelectedCity] = useState(
-    window.globalPath === "sandbox-ui"
+    Digit.Utils.getMultiRootTenant()
       ? getSubTenants()[0] || null
       : getCities()[0] || null
   );
 
-  const cityData = window.globalPath === "sandbox-ui" ? getSubTenants() : getCities();
+  const cityData = Digit.Utils.getMultiRootTenant() ? getSubTenants() : getCities();
 
   const { isLoading: hierarchyLOading, data:hierarchyType } = Digit.Hooks.useCustomMDMS(
     Digit.ULBService.getStateId(),
@@ -168,15 +168,15 @@ const { data: subTenants, refetch, isLoading: isLoadingSubTenants } = requestCri
   const onSubmit = async (data) => {
     if (!canSubmit) return;
     const cityCode = selectedCity.code;
-    const city = window.globalPath === "sandbox-ui"
+    const city = Digit.Utils.getMultiRootTenant()
     ? selectedCity.name
     : selectedCity.city.name;
   
-  const district = window.globalPath === "sandbox-ui"
+  const district = Digit.Utils.getMultiRootTenant()
     ? selectedCity.name
     : selectedCity.city.name;
   
-  const region = window.globalPath === "sandbox-ui"
+  const region = Digit.Utils.getMultiRootTenant()
     ? selectedCity.name
     : selectedCity.city.name;
     const localityCode = selectedLocality.code;
@@ -276,11 +276,11 @@ const { data: subTenants, refetch, isLoading: isLoadingSubTenants } = requestCri
               selected={selectedCity}
               freeze={true}
               option={
-                window.globalPath === "sandbox-ui" ? getSubTenants() : getCities()
+                Digit.Utils.getMultiRootTenant() ? getSubTenants() : getCities()
               }
               id="city"
               select={selectCity}
-              optionKey={window.globalPath === "sandbox-ui" ? "name" : "i18nKey"}
+              optionKey={Digit.Utils.getMultiRootTenant() ? "name" : "i18nKey"}
               t={t}
             />
           ),
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/Module.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/Module.js
index 730ba868190..7c181bbb902 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/Module.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/Module.js
@@ -24,6 +24,9 @@ export const SandboxModule = ({ stateCode, userType, tenants }) => {
     MDMSmoduleCode,
     language,
   });
+  if (!Digit.Utils.sandboxAccess()) {
+    return null;
+  }
   if (isLoading && isMDMSLoading) {
     return <Loader />;
   }
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/components/SandboxCard.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/components/SandboxCard.js
index ca89a85a3d8..5998c89f254 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/components/SandboxCard.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/components/SandboxCard.js
@@ -8,6 +8,10 @@ const SandboxCard = () => {
   const ROLES = {
     SUPERUSER: ["SUPERUSER"],
   };
+
+  if (!Digit.Utils.sandboxAccess()) {
+    return null;
+  }
   const propsForModuleCard = {
     Icon: <PropertyHouse />,
     moduleName: t("SANDBOX_CARD_HEADER"),
@@ -16,17 +20,17 @@ const SandboxCard = () => {
       {
         label: t("SANDBOX_TENANT_CREATE_HOMECARD_LABEL"),
         link: `/${window?.contextPath}/employee/sandbox/tenant-management/create`,
-        // roles: ROLES.SUPERUSER,
+        roles: ROLES.SUPERUSER,
       },
       {
         label: t("SANDBOX_TENANT_SEARCH_HOMECARD_LABEL"),
         link: `/${window?.contextPath}/employee/sandbox/tenant-management/search`,
-        // roles: ROLES.SUPERUSER,
+        roles: ROLES.SUPERUSER,
       },
       {
         label: t("SANDBOX_APPLICATION_MANAGEMENT_HOMECARD_LABEL"),
         link: `/${window?.contextPath}/employee/sandbox/application-management/home`,
-        // roles: ROLES.SUPERUSER,
+        roles: ROLES.SUPERUSER,
       },
     ],
   };
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/configs/UICustomizations.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/configs/UICustomizations.js
index 0c1d80d5df1..8207b8ba785 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/configs/UICustomizations.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/configs/UICustomizations.js
@@ -224,24 +224,20 @@ export const UICustomizations = {
                   value?.split(".")?.[1]
                 }`}
               >
-                {value?.split(".")?.[0]}
+                {t(`SANDBOX_${value?.split(".")?.[0]}`)}
               </Link>
             </span>
           );
         case "SANDBOX_MASTER_NAME":
-          return row?.code?.split(".")?.[1] ? row?.code?.split(".")?.[1] : row?.code?.split(".")?.[0];
+          return row?.code?.split(".")?.[1] ? t(`SANDBOX_${row?.code?.split(".")?.[1]}`) : t(`SANDBOX_${row?.code?.split(".")?.[0]}`);
 
         case "SANDBOX_MASTER_TYPE":
-          return value;
+          return t(`SANDBOX_${value}`);
 
         case "SANDBOX_ACTIONS":
           const handleRedirect = (value, type) => {
             if (type === "boundary") {
-              window.history.pushState(
-                null,
-                "",
-                `/${window.contextPath}/employee/workbench/upload-boundary?hierarchyType=${value}&from=sandbox`
-              );
+              window.history.pushState(null, "", `/${window.contextPath}/employee/workbench/upload-boundary?hierarchyType=${value}&from=sandbox`);
               const navEvent = new PopStateEvent("popstate");
               window.dispatchEvent(navEvent);
             } else {
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/SetupMaster.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/SetupMaster.js
index 76c07abbce2..ec7e1b944ae 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/SetupMaster.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/SetupMaster.js
@@ -1,9 +1,8 @@
-import React, { Fragment, useEffect, useState } from "react";
+import React, { Fragment, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { CardSubHeader, Header, InboxSearchComposer } from "@egovernments/digit-ui-react-components";
+import { Header, Table } from "@egovernments/digit-ui-react-components";
 import { useHistory, useLocation } from "react-router-dom";
-import { moduleMasterConfig } from "./config/moduleMasterConfig";
-import { Button, Card, CardHeader, CardText, SVG } from "@egovernments/digit-ui-components";
+import { Button, Card, CardHeader, CardText, Loader, SVG } from "@egovernments/digit-ui-components";
 import { setupMasterConfig } from "./config/setupMasterConfig";
 
 const renderHierarchy = (categories) => {
@@ -51,48 +50,55 @@ const SetupMaster = () => {
     [{ name: "ModuleMasterConfig" }],
     {
       select: (data) => {
-        // return data?.["sandbox-ui"]?.ModuleMasterConfig?.filter((item) => item?.module === module);
-        function categorizeData(data) {
-          const result = {};
+        let xx = data?.["sandbox-ui"]?.ModuleMasterConfig?.filter((item) => item?.module === module)?.[0]?.master;
+        let respData = xx.map((i) => ({
+          masterName: t(i.code),
+          type: t(i.type),
+          description: t(`SANDBOX_MASTER_SETUP_DESC_${i.code}`),
+        }));
+        return respData;
+        // console.log("FFSFAFS", data)
+        // function categorizeData(data) {
+        //   const result = {};
 
-          data.forEach((item) => {
-            const masterItems = item.master;
-            masterItems.forEach((entry) => {
-              const { code, type } = entry;
+        //   data.forEach((item) => {
+        //     const masterItems = item.master;
+        //     masterItems.forEach((entry) => {
+        //       const { code, type } = entry;
 
-              // Initialize type category
-              if (!result[type]) {
-                result[type] = [];
-              }
+        //       // Initialize type category
+        //       if (!result[type]) {
+        //         result[type] = [];
+        //       }
 
-              // Extract code before and after the dot
-              const [beforeDot, afterDot] = code.split(".");
+        //       // Extract code before and after the dot
+        //       const [beforeDot, afterDot] = code.split(".");
 
-              // Find or create the category before the dot
-              let category = result[type].find((cat) => cat.master === beforeDot);
-              if (!category) {
-                category = { master: beforeDot, child: [] };
-                result[type].push(category);
-              }
+        //       // Find or create the category before the dot
+        //       let category = result[type].find((cat) => cat.master === beforeDot);
+        //       if (!category) {
+        //         category = { master: beforeDot, child: [] };
+        //         result[type].push(category);
+        //       }
 
-              // If there is an afterDot, add it as a child
-              if (afterDot) {
-                category.child.push({ master: afterDot });
-              } else {
-                // If there is no dot, just add the item to the child array of its own category
-                if (code !== beforeDot) {
-                  // Avoid adding items without dots
-                  category.child.push({ master: code });
-                }
-              }
-            });
-          });
+        //       // If there is an afterDot, add it as a child
+        //       if (afterDot) {
+        //         category.child.push({ master: afterDot });
+        //       } else {
+        //         // If there is no dot, just add the item to the child array of its own category
+        //         if (code !== beforeDot) {
+        //           // Avoid adding items without dots
+        //           category.child.push({ master: code });
+        //         }
+        //       }
+        //     });
+        //   });
 
-          return result;
-        }
+        //   return result;
+        // }
 
         // Transform the data
-        return categorizeData(data?.["sandbox-ui"]?.ModuleMasterConfig?.filter((item) => item?.module === module));
+        // return categorizeData(data?.["sandbox-ui"]?.ModuleMasterConfig?.filter((item) => item?.module === module));
       },
       enabled: true,
     },
@@ -108,6 +114,9 @@ const SetupMaster = () => {
     );
   };
 
+  if (moduleMasterLoading) {
+    return <Loader />;
+  }
   return (
     <Card className={"sandboxSetupMasterInfo"}>
       {!showMaster && (
@@ -167,14 +176,77 @@ const SetupMaster = () => {
                   ))}
               </li>
             ))} */}
-          <div>
+          {/* <div>
             {Object.entries(moduleMasterData).map(([type, categories], index) => (
               <div key={index}>
                 <CardHeader className="setupMaster-subheading">{type.charAt(0).toUpperCase() + type.slice(1)}</CardHeader>
                 {renderHierarchy(categories)}
               </div>
             ))}
-          </div>
+          </div> */}
+          <Table
+            pageSizeLimit={50}
+            className={"table"}
+            t={t}
+            customTableWrapperClassName={"dss-table-wrapper"}
+            disableSort={true}
+            autoSort={false}
+            data={moduleMasterData}
+            totalRecords={5}
+            columns={[
+              {
+                Header: "Master",
+                accessor: "masterName",
+                id: "masterName",
+              },
+              {
+                Header: "Type",
+                accessor: "type",
+                id: "type",
+              },
+              {
+                Header: "Description",
+                accessor: "description",
+                id: "description",
+              },
+            ]}
+            isPaginationRequired={false}
+            manualPagination={false}
+            getCellProps={(cellInfo) => {
+              return {
+                style: {
+                  padding: "20px 18px",
+                  fontSize: "16px",
+                  whiteSpace: "normal",
+                },
+              };
+            }}
+          />
+          {/* <Table
+            columns={[
+              {
+                Header: t("HR_EMP_ID_LABEL"),
+                disableSortBy: true,
+                Cell: ({ row }) => {
+                  return <span className="link">Hello</span>;
+                },
+              },
+              {
+                Header: t("HR_EMP_NAME_LABEL"),
+                disableSortBy: true,
+                Cell: ({ row }) => {
+                  // return GetCell(`${row.original?.user?.name}`);
+                  return <span className="link">Hello</span>;
+                },
+              },
+            ]}
+            data={[{ label: "HR_EMP_NAME_LABEL" }, { label: "HELLO" }]}
+            getCellProps={(cellInfo) => {
+              return {
+                style: {},
+              };
+            }}
+          /> */}
           <div className="setupMasterSetupActionBar">
             <Button
               className="actionButton"
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/config/moduleMasterConfig.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/config/moduleMasterConfig.js
index 49ab4996c66..9196ad9efff 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/config/moduleMasterConfig.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/config/moduleMasterConfig.js
@@ -85,11 +85,11 @@ export const moduleMasterConfig = (module) => ({
         searchResult: {
           uiConfig: {
             columns: [
-              {
-                label: "SANDBOX_MODULE_NAME",
-                jsonPath: "code",
-                additionalCustomization: true,
-              },
+              // {
+              //   label: "SANDBOX_MODULE_NAME",
+              //   jsonPath: "code",
+              //   additionalCustomization: true,
+              // },
               {
                 label: "SANDBOX_MASTER_NAME",
                 jsonPath: "master",
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/index.js b/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/index.js
index b53b255c22c..d345963aa9e 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/workbench/src/pages/employee/index.js
@@ -24,70 +24,49 @@ const WorkbenchBreadCrumb = ({ location, defaultPath }) => {
   const pathVar = location.pathname.replace(defaultPath + "/", "").split("?")?.[0];
   const { masterName, moduleName, uniqueIdentifier, from, screen, action } = Digit.Hooks.useQueryParams();
 
-  const crumbs = from
-    ? [
-        {
-          path: `/${window?.contextPath}/employee`,
-          content: t("WORKBENCH_HOME"),
-          show: true,
-        },
-        {
-          path: pathVar !== "mdms-search-v2" ? `/${window.contextPath}/employee/workbench/mdms-search-v2` : "",
-          query: `moduleName=${moduleName}&masterName=${masterName}&from=${from}&screen=${screen}&action=${action}`,
-          content: t(`${Digit.Utils.workbench.getMDMSLabel(pathVar, masterName, moduleName)}`),
-          show: masterName && moduleName ? true : false,
-        },
-        {
-          path: `/${window.contextPath}/employee/workbench/mdms-view`,
-          content: t(`MDMS_VIEW`),
-          show: pathVar.includes("mdms-edit") ? true : false,
-          query: `moduleName=${moduleName}&masterName=${masterName}&uniqueIdentifier=${uniqueIdentifier}&from=${from}&screen=${screen}&action=${action}`,
-        },
-        {
-          path: `/${window.contextPath}/employee/masters/response`,
-          content: t(`${Digit.Utils.workbench.getMDMSLabel(pathVar, "", "")}`),
-          show: Digit.Utils.workbench.getMDMSLabel(pathVar, "", "", ["mdms-search-v2", "localisation-search"]) ? true : false,
-        },
-      ]
-    : [
-        {
-          path: `/${window?.contextPath}/employee`,
-          content: t("WORKBENCH_HOME"),
-          show: true,
-        },
-        {
-          path: `/${window.contextPath}/employee/workbench/manage-master-data`,
-          content: t(`WBH_MANAGE_MASTER_DATA`),
-          show: pathVar.includes("mdms-") ? true : false,
-          // query:`moduleName=${moduleName}&masterName=${masterName}`
-        },
-        {
-          path: `/${window.contextPath}/employee/workbench/localisation-search`,
-          content: t(`LOCALISATION_SEARCH`),
-          show: pathVar.includes("localisation-") ? true : false,
-          isBack: pathVar.includes("localisation-search") ? true : false,
-          // query:`moduleName=${moduleName}&masterName=${masterName}`
-        },
+  const crumbs = [
+    {
+      path: `/${window?.contextPath}/employee`,
+      content: t("WORKBENCH_HOME"),
+      show: true,
+    },
+    {
+      path: `/${window.contextPath}/employee/workbench/manage-master-data`,
+      content: t(`WBH_MANAGE_MASTER_DATA`),
+      show: from ? false : pathVar.includes("mdms-") ? true : false,
+      // query:`moduleName=${moduleName}&masterName=${masterName}`
+    },
+    {
+      path: `/${window.contextPath}/employee/workbench/localisation-search`,
+      content: t(`LOCALISATION_SEARCH`),
+      show: from ? false : pathVar.includes("localisation-") ? true : false,
+      isBack: pathVar.includes("localisation-search") ? true : false,
+      // query:`moduleName=${moduleName}&masterName=${masterName}`
+    },
 
-        {
-          path: `/${window.contextPath}/employee/workbench/mdms-search-v2`,
-          query: `moduleName=${moduleName}&masterName=${masterName}`,
-          content: t(`${Digit.Utils.workbench.getMDMSLabel(pathVar, masterName, moduleName)}`),
-          show: masterName && moduleName ? true : false,
-          isBack: pathVar.includes("mdms-search-v2") ? true : false,
-        },
-        {
-          path: `/${window.contextPath}/employee/workbench/mdms-view`,
-          content: t(`MDMS_VIEW`),
-          show: pathVar.includes("mdms-edit") ? true : false,
-          query: `moduleName=${moduleName}&masterName=${masterName}&uniqueIdentifier=${uniqueIdentifier}`,
-        },
-        {
-          path: `/${window.contextPath}/employee/masters/response`,
-          content: t(`${Digit.Utils.workbench.getMDMSLabel(pathVar, "", "")}`),
-          show: Digit.Utils.workbench.getMDMSLabel(pathVar, "", "", ["mdms-search-v2", "localisation-search"]) ? true : false,
-        },
-      ];
+    {
+      path: pathVar !== "mdms-search-v2" ? `/${window.contextPath}/employee/workbench/mdms-search-v2` : null,
+      query: from
+        ? `moduleName=${moduleName}&masterName=${masterName}&from=${from}&screen=${screen}&action=${action}`
+        : `moduleName=${moduleName}&masterName=${masterName}`,
+      content: t(`${Digit.Utils.workbench.getMDMSLabel(pathVar, masterName, moduleName)}`),
+      show: masterName && moduleName ? true : false,
+      isBack: pathVar.includes("mdms-search-v2") ? true : false,
+    },
+    {
+      path: `/${window.contextPath}/employee/workbench/mdms-view`,
+      content: t(`MDMS_VIEW`),
+      show: pathVar.includes("mdms-edit") ? true : false,
+      query: from
+        ? `moduleName=${moduleName}&masterName=${masterName}&uniqueIdentifier=${uniqueIdentifier}&from=${from}&screen=${screen}&action=${action}`
+        : `moduleName=${moduleName}&masterName=${masterName}&uniqueIdentifier=${uniqueIdentifier}`,
+    },
+    {
+      path: `/${window.contextPath}/employee/masters/response`,
+      content: t(`${Digit.Utils.workbench.getMDMSLabel(pathVar, "", "")}`),
+      show: Digit.Utils.workbench.getMDMSLabel(pathVar, "", "", ["mdms-search-v2", "localisation-search"]) ? true : false,
+    },
+  ];
   return <BreadCrumb className="workbench-bredcrumb" crumbs={crumbs} spanStyle={{ maxWidth: "min-content" }} />;
 };
 
@@ -112,13 +91,13 @@ const App = ({ path }) => {
     };
     const currentUrl = window.location.href;
     if (!currentUrl.includes("mdms-add-v2") && !currentUrl.includes("mdms-add-v4") && !currentUrl.includes("mdms-view")) {
-      clearSessionStorageWithPrefix('MDMS_add');
+      clearSessionStorageWithPrefix("MDMS_add");
     }
     if (!currentUrl.includes("mdms-view")) {
-      clearSessionStorageWithPrefix('MDMS_view');
+      clearSessionStorageWithPrefix("MDMS_view");
     }
     if (!currentUrl.includes("mdms-edit")) {
-      clearSessionStorageWithPrefix('MDMS_edit');
+      clearSessionStorageWithPrefix("MDMS_edit");
     }
   }, [window.location.href]);
 
@@ -133,12 +112,10 @@ const App = ({ path }) => {
 
   return (
     <React.Fragment>
-        <div className="wbh-header-container">
-          <WorkbenchBreadCrumb location={location} defaultPath={path} />
-          {!isBoundaryPath && (
-            <WorkbenchHeader />
-          )}
-        </div>
+      <div className="wbh-header-container">
+        <WorkbenchBreadCrumb location={location} defaultPath={path} />
+        {!isBoundaryPath && <WorkbenchHeader />}
+      </div>
 
       <Switch>
         <AppContainer className="workbench">

From 56211afef786fa49912c5046037075da84a3af05 Mon Sep 17 00:00:00 2001
From: NabeelAyubee <nayubi7@gmail.com>
Date: Sun, 8 Sep 2024 12:02:37 +0530
Subject: [PATCH 11/23] css update

---
 micro-ui/web/micro-ui-internals/packages/css/package.json | 2 +-
 micro-ui/web/public/index.html                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/css/package.json b/micro-ui/web/micro-ui-internals/packages/css/package.json
index 941be736930..dad66a98283 100644
--- a/micro-ui/web/micro-ui-internals/packages/css/package.json
+++ b/micro-ui/web/micro-ui-internals/packages/css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-css",
-  "version": "1.8.2-beta.20",
+  "version": "1.8.2-beta.21",
   "license": "MIT",
   "main": "dist/index.css",
   "author": "Jagankumar <jagan.kumar@egov.org.in>",
diff --git a/micro-ui/web/public/index.html b/micro-ui/web/public/index.html
index c776075ff80..f464561a097 100644
--- a/micro-ui/web/public/index.html
+++ b/micro-ui/web/public/index.html
@@ -7,7 +7,7 @@
   <link
     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.2-beta.20/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.2-beta.21/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.26/dist/index.css"/>
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="theme-color" content="#00bcd1" />

From 2ee96909c0b231c7e7341d4e123705156cea7fa1 Mon Sep 17 00:00:00 2001
From: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com>
Date: Sun, 8 Sep 2024 18:12:34 +0530
Subject: [PATCH 12/23] Update index.js

---
 .../packages/libraries/src/services/molecules/Ulb/index.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Ulb/index.js b/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Ulb/index.js
index 4beb338f595..6335279ea2a 100644
--- a/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Ulb/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Ulb/index.js
@@ -27,7 +27,7 @@ export const ULBService = {
    *
    * @returns {String}
    */
-  s: () => {
+  getCurrentTenantId: () => {
     // TODO: change when setter is done.
 
     const user = UserService.getUser();

From a0ba9266a80bcd5293c34bcecac78387da7eb285 Mon Sep 17 00:00:00 2001
From: NabeelAyubee <nayubi7@gmail.com>
Date: Mon, 9 Sep 2024 10:35:49 +0530
Subject: [PATCH 13/23] PR resolve

---
 .../micro-ui-internals/packages/libraries/src/utils/index.js    | 2 +-
 .../packages/modules/core/src/pages/citizen/index.js            | 2 +-
 .../modules/hrms/src/components/pageComponents/jurisdiction.js  | 2 +-
 .../packages/modules/pgr/src/components/PGRCard.js              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/index.js b/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/index.js
index a87a7b76874..30bfa59b010 100644
--- a/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/index.js
@@ -199,7 +199,7 @@ const pgrAccess = () => {
   const userInfo = Digit.UserService.getUser();
   const userRoles = userInfo?.info?.roles?.map((roleData) => roleData?.code);
   const pgrRoles = ["PGR_LME", "PGR-ADMIN", "CSR", "CEMP", "FEMP", "DGRO", "ULB Operator", "GRO", "GO", "RO", "GA"];
-  if (window.globalPath === "sandbox-ui") {
+  if (Digit.Utils.getMultiRootTenant()) {
     pgrRoles.push("SUPERUSER");
   }
   const PGR_ACCESS = userRoles?.filter((role) => pgrRoles.includes(role));
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/index.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/index.js
index 109502bd53e..75bbf874622 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/index.js
@@ -51,7 +51,7 @@ const Home = ({
     [
       {
         name: "actions-test",
-        filter: `[?(@.url == '${window.globalPath === "sandbox-ui" ? window.globalPath : window.contextPath}-card')]`,
+        filter: `[?(@.url == '${Digit.Utils.getMultiRootTenant() ? window.globalPath : window.contextPath}-card')]`,
       },
     ],
     {
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/jurisdiction.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/jurisdiction.js
index f66681c9afb..8f85b2cd14e 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/jurisdiction.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/jurisdiction.js
@@ -173,7 +173,7 @@ function Jurisdiction({
 
   const [BoundaryType, selectBoundaryType] = useState([]);
   const [Boundary, selectboundary] = useState([]);
-  const cities = window.globalPath === "sandbox-ui" ? Digit.Hooks.pgr.useTenants() : null;
+  const cities = Digit.Utils.getMultiRootTenant() ? Digit.Hooks.pgr.useTenants() : null;
   useEffect(() => {
     selectBoundaryType(
       data?.MdmsRes?.["egov-location"]["TenantBoundary"]
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js
index 5e3e48e100d..a2a5ad4971c 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js
@@ -23,7 +23,7 @@ const PGRCard = () => {
 
   let role = ["CSR"];
 
-if (window.globalPath === "sandbox-ui") {
+if (Digit.Utils.getMultiRootTenant()) {
   role.push("SUPERUSER");
 }
 

From df011b7aef13ff869e37d354d8b0e4584afa2035 Mon Sep 17 00:00:00 2001
From: NabeelAyubee <nayubi7@gmail.com>
Date: Mon, 9 Sep 2024 10:39:53 +0530
Subject: [PATCH 14/23] pr resolve

---
 .../packages/modules/pgr/src/components/PGRCard.js            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js
index a2a5ad4971c..da716449c74 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js
@@ -31,11 +31,11 @@ let propsForCSR = [
   {
     label: t("ES_PGR_NEW_COMPLAINT"),
     link: `/${window?.contextPath}/employee/pgr/complaint/create`,
-    role: role
+    roles: role
   }
 ];
 
-  propsForCSR = propsForCSR.filter(link => link.role && Digit.Utils.didEmployeeHasRole(link.role) );
+  propsForCSR = propsForCSR.filter(link => link.roles && Digit.Utils.didEmployeeHasRole(link.roles) );
 
   const propsForModuleCard = {
     Icon: <Icon />,

From 37bf94c9a2bc0335fab9c466366b9cb1a81f0f21 Mon Sep 17 00:00:00 2001
From: NabeelAyubee <nayubi7@gmail.com>
Date: Mon, 9 Sep 2024 11:17:42 +0530
Subject: [PATCH 15/23] pr resolve

---
 .../packages/libraries/src/hooks/index.js     |  4 +-
 .../src/hooks/useTenantManagementSearch.js    | 23 ++++++++++
 .../pages/citizen/Home/LocationSelection.js   | 42 +++++--------------
 .../components/pageComponents/jurisdiction.js | 37 ++++------------
 .../citizen/Create/Steps/SelectAddress.js     | 37 +++++-----------
 .../pages/employee/CreateComplaint/index.js   | 38 +++++------------
 6 files changed, 66 insertions(+), 115 deletions(-)
 create mode 100644 micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/useTenantManagementSearch.js

diff --git a/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/index.js b/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/index.js
index 49c902d937b..9be2ca6ca29 100644
--- a/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/index.js
@@ -89,6 +89,7 @@ import useGetFAQsJSON from "./useGetFAQsJSON";
 import useGetHowItWorksJSON from "./useHowItWorksJSON";
 import { usePrivacyContext } from "./usePrivacyContext";
 import useStaticData from "./useStaticData";
+import { useTenantManagementSearch } from "./useTenantManagementSearch";
 
 
 
@@ -210,7 +211,8 @@ const Hooks = {
   useStaticData,
   useDynamicData,
   useBulkPdfDetails,
-  useLocation
+  useLocation,
+  useTenantManagementSearch
 };
 
 export default Hooks;
diff --git a/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/useTenantManagementSearch.js b/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/useTenantManagementSearch.js
new file mode 100644
index 00000000000..ae61bbfb29c
--- /dev/null
+++ b/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/useTenantManagementSearch.js
@@ -0,0 +1,23 @@
+import { useQuery } from "react-query";
+
+const tenantManagementSearchService = async ({ stateId, includeSubTenants = true, filter, pagination }) => {
+  const response = await Digit.CustomService.getResponse({
+    url: "/tenant-management/tenant/_search",
+    body: {
+      apiOperation: "SEARCH",
+    },
+    params: {
+      code: stateId,
+      includeSubTenants: includeSubTenants,
+    },
+  });
+  return response?.Tenants;
+};
+
+export const useTenantManagementSearch = ({ stateId, includeSubTenants = true, filter, pagination, config = {} }) => {
+  return useQuery(
+    ["SEARCH_TENANT_MANAGEMENT", stateId, filter, includeSubTenants, pagination],
+    () => tenantManagementSearchService({ stateId, includeSubTenants, filter, pagination }),
+    config
+  );
+};
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js
index 963cb4607d5..75a73382bd3 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js
@@ -18,35 +18,15 @@ if (window?.globalPath === 'sandbox-ui') {
 
 // Destructure the result
 const { data: cities, isLoading } = hookResult;
-  // Define the requestCriteria
-let requestCriteria = null;
-
-// Check the value of window.globalPath
-if (window?.globalPath === 'sandbox-ui') {
-  requestCriteria = {
-    url: "/tenant-management/tenant/_search",
-    params: {
-      code: Digit.ULBService.getStateId(),
-      includeSubTenants: true
-    },
-    body: {
-      apiOperation: "SEARCH",
-    },
-    config: {
-      select: (data) => {
-        return data?.Tenants;
-      },
-    },
-  };
-}
 
 // Use the requestCriteria only if it's not null
-const { data: subTenants, refetch, isLoading: isLoadingSubTenants } = requestCriteria
-  ? Digit.Hooks.useCustomAPIHook(requestCriteria)
-  : { data: null, refetch: () => {}, isLoading: false };
-
-// Now you can use subTenants, refetch, and isLoadingSubTenants
-
+const { data: TenantMngmtSearch, isLoading: isLoadingTenantMngmtSearch } = Digit.Hooks.useTenantManagementSearch({
+  stateId: Digit.ULBService.getStateId(),
+  includeSubTenants: true,
+  config : {
+    enabled: Digit.Utils.getMultiRootTenant()
+  }
+});
 
   const [selectedCity, setSelectedCity] = useState(() => ({ code: Digit.ULBService.getCitizenCurrentTenant(true) }));
   const [showError, setShowError] = useState(false);
@@ -66,19 +46,19 @@ const { data: subTenants, refetch, isLoading: isLoadingSubTenants } = requestCri
 
   const RadioButtonProps = useMemo(() => {
     return {
-      options: window?.globalPath === "sandbox-ui" ? subTenants : cities,
-      optionsKey: window?.globalPath === "sandbox-ui"? "name" :"i18nKey",
+      options: Digit.Utils.getMultiRootTenant() ? TenantMngmtSearch : cities,
+      optionsKey: Digit.Utils.getMultiRootTenant() ? "name" :"i18nKey",
       additionalWrapperClass: "digit-reverse-radio-selection-wrapper",
       onSelect: selectCity,
       selectedOption: selectedCity,
     };
-  }, [subTenants,cities, t, selectedCity]);
+  }, [TenantMngmtSearch,cities, t, selectedCity]);
 
   function onSubmit() {
     if (selectedCity) {
       Digit.SessionStorage.set("CITIZEN.COMMON.HOME.CITY", selectedCity);
       const redirectBackTo = location.state?.redirectBackTo;
-      if(window?.globalPath === "sandbox-ui"){
+      if(Digit.Utils.getMultiRootTenant()){
         history.push(`/${window?.contextPath}/citizen/all-services`);
         return;
       }
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/jurisdiction.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/jurisdiction.js
index 8f85b2cd14e..257f0e453d7 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/jurisdiction.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/jurisdiction.js
@@ -184,36 +184,15 @@ function Jurisdiction({
     );
   }, [jurisdiction?.hierarchy, data?.MdmsRes]);
   const tenant = Digit.ULBService.getCurrentTenantId();
-  let requestCriteria = null;
 
-  requestCriteria = {
-    url: "/tenant-management/tenant/_search",
-    params: {
-      code: Digit.ULBService.getCurrentTenantId(),
-      includeSubTenants: true
-    },
-    body: {
-      "inbox": {
-        "limit": 10,
-        "offset": 0
-      },
-      apiOperation: "SEARCH",
-    },
-    config: {
-      select: (data) => {
-        return data?.Tenants;
-      },
-    },
-  };
-
-  // Use the requestCriteria only if it's not null
-  const { data: subTenants, refetch, isLoading: isLoadingSubTenants } = requestCriteria
-    ? Digit.Hooks.useCustomAPIHook(requestCriteria)
-    : { data: null, refetch: () => { }, isLoading: false };
-
-  // Now you can use subTenants, refetch, and isLoadingSubTenants
-
-  const getSubTenants = () => subTenants?.filter((e) => e.code === Digit.ULBService.getCurrentTenantId()) || [];
+  const { data: TenantMngmtSearch, isLoading: isLoadingTenantMngmtSearch } = Digit.Hooks.useTenantManagementSearch({
+    stateId: Digit.ULBService.getStateId(),
+    includeSubTenants: true,
+    config : {
+      enabled: Digit.Utils.getMultiRootTenant()
+    }
+  });
+  const getSubTenants = () => TenantMngmtSearch?.filter((e) => e.code === Digit.ULBService.getCurrentTenantId()) || [];
   const subTenantList = getSubTenants();
 
   useEffect(() => {
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js
index dc6e1052d89..4e13a8e5cc2 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js
@@ -9,31 +9,14 @@ const SelectAddress = ({ t, config, onSelect, value }) => {
 let requestCriteria = null;
 
 // Check the value of window.globalPath
-if (window.globalPath === 'sandbox-ui') {
-  requestCriteria = {
-    url: "/tenant-management/tenant/_search",
-    params: {
-      code: Digit.ULBService.getStateId(),
-      includeSubTenants: true
-    },
-    body: {
-      apiOperation: "SEARCH",
-    },
-    config: {
-      select: (data) => {
-        return data?.Tenants;
-      },
-    },
-  };
-}
-
-// Use the requestCriteria only if it's not null
-const { data: subTenants, refetch, isLoading: isLoadingSubTenants } = requestCriteria
-  ? Digit.Hooks.useCustomAPIHook(requestCriteria)
-  : { data: null, refetch: () => {}, isLoading: false };
-
-// Now you can use subTenants, refetch, and isLoadingSubTenants
 
+const { data: TenantMngmtSearch, isLoading: isLoadingTenantMngmtSearch } = Digit.Hooks.useTenantManagementSearch({
+  stateId: Digit.ULBService.getStateId(),
+  includeSubTenants: true,
+  config : {
+    enabled: Digit.Utils.getMultiRootTenant()
+  }
+});
 
   const [selectedCity, setSelectedCity] = useState(() => {
     const { city_complaint } = value;
@@ -98,13 +81,13 @@ const { data: subTenants, refetch, isLoading: isLoadingSubTenants } = requestCri
     <FormStep config={config} onSelect={onSubmit} t={t} isDisabled={selectedLocality ? false : true}>
       <div>
         <CardLabel>{t("MYCITY_CODE_LABEL")}</CardLabel>
-        {(Digit.Utils.getMultiRootTenant() ? subTenants?.length : cities?.length) < 5 ? (
+        {(Digit.Utils.getMultiRootTenant() ? TenantMngmtSearch?.length : cities?.length) < 5 ? (
           <RadioButtons selectedOption={selectedCity} options={
-            Digit.Utils.getMultiRootTenant() ? subTenants : cities
+            Digit.Utils.getMultiRootTenant() ? TenantMngmtSearch : cities
           } optionsKey={Digit.Utils.getMultiRootTenant() ? "name" : "i18nKey"} onSelect={selectCity} />
         ) : (
           <Dropdown isMandatory selected={selectedCity} option={
-            Digit.Utils.getMultiRootTenant() ? subTenants : cities
+            Digit.Utils.getMultiRootTenant() ? TenantMngmtSearch : cities
           } select={selectCity} optionKey={Digit.Utils.getMultiRootTenant() ? "name" : "i18nKey"} t={t} />
         )}
         {selectedCity && localities && <CardLabel>{t("CS_CREATECOMPLAINT_MOHALLA")}</CardLabel>}
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js
index 9a7639cb338..9cb4a8d38e5 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js
@@ -10,41 +10,25 @@ import { createComplaint } from "../../../redux/actions/index";
 
 export const CreateComplaint = ({ parentUrl }) => {
   const cities = Digit.Hooks.pgr.useTenants();
+  const stateId = Digit.ULBService.getStateId();
 
   const { t } = useTranslation();
 
   const getCities = () => cities?.filter((e) => e.code === Digit.ULBService.getCurrentTenantId()) || [];
 
- // Define the requestCriteria
-let requestCriteria = null;
-
-// Check the value of window.globalPath
-if (Digit.Utils.getMultiRootTenant()) {
-  requestCriteria = {
-    url: "/tenant-management/tenant/_search",
-    params: {
-      code: Digit.ULBService.getCurrentTenantId(),
-      includeSubTenants: true
-    },
-    body: {
-      apiOperation: "SEARCH",
-    },
-    config: {
-      select: (data) => {
-        return data?.Tenants;
-      },
-    },
-  };
-}
 
 // Use the requestCriteria only if it's not null
-const { data: subTenants, refetch, isLoading: isLoadingSubTenants } = requestCriteria
-  ? Digit.Hooks.useCustomAPIHook(requestCriteria)
-  : { data: null, refetch: () => {}, isLoading: false };
+const { data: subTenants, refetch, isLoading: isLoadingSubTenants } = { data: null, refetch: () => {}, isLoading: false };
 
-// Now you can use subTenants, refetch, and isLoadingSubTenants
+const { data: TenantMngmtSearch, isLoading: isLoadingTenantMngmtSearch } = Digit.Hooks.useTenantManagementSearch({
+  stateId: stateId,
+  includeSubTenants: true,
+  config : {
+    enabled: Digit.Utils.getMultiRootTenant()
+  }
+});
 
-  const getSubTenants = () => subTenants?.filter((e) => e.code === Digit.ULBService.getCurrentTenantId()) || [];
+  const getSubTenants = () => Digit.Utils.getMultiRootTenant() ? TenantMngmtSearch?.filter((e) => e.code === Digit.ULBService.getCurrentTenantId()) : subTenants?.filter((e) => e.code === Digit.ULBService.getCurrentTenantId());
 
   const [complaintType, setComplaintType] = useState({});
   const [subTypeMenu, setSubTypeMenu] = useState([]);
@@ -58,7 +42,7 @@ const { data: subTenants, refetch, isLoading: isLoadingSubTenants } = requestCri
 
   const cityData = Digit.Utils.getMultiRootTenant() ? getSubTenants() : getCities();
 
-  const { isLoading: hierarchyLOading, data:hierarchyType } = Digit.Hooks.useCustomMDMS(
+  const { isLoading: hierarchyLOading, data: hierarchyType } = Digit.Hooks.useCustomMDMS(
     Digit.ULBService.getStateId(),
      "sandbox-ui",
       [

From 8642f0a0152e36498d42ca3e5ac5c2275f14b482 Mon Sep 17 00:00:00 2001
From: NabeelAyubee <nayubi7@gmail.com>
Date: Mon, 9 Sep 2024 11:21:20 +0530
Subject: [PATCH 16/23] pr resolve

---
 .../packages/modules/pgr/src/components/PGRCard.js              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js
index da716449c74..81c870cf485 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js
@@ -35,7 +35,7 @@ let propsForCSR = [
   }
 ];
 
-  propsForCSR = propsForCSR.filter(link => link.roles && Digit.Utils.didEmployeeHasRole(link.roles) );
+  propsForCSR = propsForCSR.filter(link => link?.roles ? Digit.Utils.didEmployeeHasAtleastOneRole(link.roles) : true );
 
   const propsForModuleCard = {
     Icon: <Icon />,

From 60c48616df6026f929056143080422b04406693b Mon Sep 17 00:00:00 2001
From: NabeelAyubee <nayubi7@gmail.com>
Date: Mon, 9 Sep 2024 11:56:39 +0530
Subject: [PATCH 17/23] Pr resolve

---
 .../css/src/pages/employee/sandbox.scss       |  7 ++
 .../packages/modules/hrms/package.json        |  2 +-
 .../modules/hrms/src/components/hrmscard.js   | 76 +++++++++++--------
 .../modules/pgr/src/components/PGRCard.js     | 15 +++-
 .../sandbox/src/components/SandboxCard.js     | 10 +--
 .../src/atoms/EmployeeModuleCard.js           | 33 ++++++--
 6 files changed, 96 insertions(+), 47 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss
index 8c5bc4f792a..41fc1cca0a6 100644
--- a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss
+++ b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss
@@ -333,3 +333,10 @@
     margin-bottom: 0;
   }
 }
+.action-bar-wrap{
+  .menu-wrap{
+    p{
+      margin: 0 !important;
+    }
+  }
+}
\ No newline at end of file
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json b/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json
index 84ac61628aa..e54496b6890 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json
+++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json
@@ -15,7 +15,7 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.8.2-beta.12",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-hook-form": "6.15.8",
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/hrmscard.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/hrmscard.js
index 48af9efcda9..e1addbad56a 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/hrmscard.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/hrmscard.js
@@ -6,40 +6,52 @@ const HRMSCard = () => {
   const ADMIN = Digit.Utils.hrmsAccess();
   if (!ADMIN) {
     return null;
-  } 
-    const { t } = useTranslation();
-    const tenantId = Digit.ULBService.getCurrentTenantId();
-    const { isLoading, isError, error, data, ...rest } = Digit.Hooks.hrms.useHRMSCount(tenantId);
+  }
+  const { t } = useTranslation();
+  const tenantId = Digit.ULBService.getCurrentTenantId();
+  const { isLoading, isError, error, data, ...rest } = Digit.Hooks.hrms.useHRMSCount(tenantId);
 
-    const propsForModuleCard = {
-        Icon : <PersonIcon/>,
-        moduleName: t("ACTION_TEST_HRMS"),
-        kpis: [
-            {
-                count:  isLoading ? "-" : data?.EmployeCount?.totalEmployee,
-                label: t("TOTAL_EMPLOYEES"),
-                link: `/${window?.contextPath}/employee/hrms/inbox`
-            },
-            {
-              count:  isLoading ? "-" : data?.EmployeCount?.activeEmployee,
-                label: t("ACTIVE_EMPLOYEES"),
-                link: `/${window?.contextPath}/employee/hrms/inbox`
-            }  
-        ],
-        links: [
-            {
-                label: t("HR_HOME_SEARCH_RESULTS_HEADING"),
-                link: `/${window?.contextPath}/employee/hrms/inbox`
-            },
-            {
-                label: t("HR_COMMON_CREATE_EMPLOYEE_HEADER"),
-                link: `/${window?.contextPath}/employee/hrms/create`
-            }           
-        ]
-    }
+  let role = ["SUPERUSER"];
 
-    return <EmployeeModuleCard {...propsForModuleCard} />
+  let propsForSandbox = [
+    {
+      label: t("CONFIGURE_MASTER"),
+      link: `/${window?.contextPath}/employee/sandbox/application-management/setup-master?module=HRMS`,
+      isOutsideModule: true,
+      roles: role,
+    },
+  ];
+  propsForSandbox = propsForSandbox.filter((link) => (link?.roles ? Digit.Utils.didEmployeeHasAtleastOneRole(link.roles) : true));
+
+  const propsForModuleCard = {
+    Icon: <PersonIcon />,
+    moduleName: t("ACTION_TEST_HRMS"),
+    kpis: [
+      {
+        count: isLoading ? "-" : data?.EmployeCount?.totalEmployee,
+        label: t("TOTAL_EMPLOYEES"),
+        link: `/${window?.contextPath}/employee/hrms/inbox`,
+      },
+      {
+        count: isLoading ? "-" : data?.EmployeCount?.activeEmployee,
+        label: t("ACTIVE_EMPLOYEES"),
+        link: `/${window?.contextPath}/employee/hrms/inbox`,
+      },
+    ],
+    links: [
+      {
+        label: t("HR_HOME_SEARCH_RESULTS_HEADING"),
+        link: `/${window?.contextPath}/employee/hrms/inbox`,
+      },
+      {
+        label: t("HR_COMMON_CREATE_EMPLOYEE_HEADER"),
+        link: `/${window?.contextPath}/employee/hrms/create`,
+      },
+      ...propsForSandbox,
+    ],
+  };
+
+  return <EmployeeModuleCard {...propsForModuleCard} />;
 };
 
 export default HRMSCard;
-
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js
index 81c870cf485..96c3ee7d32c 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js
@@ -35,8 +35,18 @@ let propsForCSR = [
   }
 ];
 
-  propsForCSR = propsForCSR.filter(link => link?.roles ? Digit.Utils.didEmployeeHasAtleastOneRole(link.roles) : true );
 
+let propsForSandbox = [
+  {
+    label: t("CONFIGURE_MASTER"),
+    link: `/${window?.contextPath}/employee/sandbox/application-management/setup-master?module=PGR`,
+    isOutsideModule : true,
+    roles: role
+  }
+];
+
+  propsForCSR = propsForCSR.filter(link => link?.roles ? Digit.Utils.didEmployeeHasAtleastOneRole(link.roles) : true );
+  propsForSandbox = propsForSandbox.filter(link => link?.roles ? Digit.Utils.didEmployeeHasAtleastOneRole(link.roles) : true );
   const propsForModuleCard = {
     Icon: <Icon />,
     moduleName: t("ES_PGR_HEADER_COMPLAINT"),
@@ -55,7 +65,8 @@ let propsForCSR = [
         label: t("ES_PGR_INBOX"),
         link: `/${window?.contextPath}/employee/pgr/inbox`
     },
-    ...propsForCSR
+    ...propsForCSR,
+    ...propsForSandbox
     ]
 }
 
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/components/SandboxCard.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/components/SandboxCard.js
index 5998c89f254..d2b2ac9fcf7 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/components/SandboxCard.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/components/SandboxCard.js
@@ -27,11 +27,11 @@ const SandboxCard = () => {
         link: `/${window?.contextPath}/employee/sandbox/tenant-management/search`,
         roles: ROLES.SUPERUSER,
       },
-      {
-        label: t("SANDBOX_APPLICATION_MANAGEMENT_HOMECARD_LABEL"),
-        link: `/${window?.contextPath}/employee/sandbox/application-management/home`,
-        roles: ROLES.SUPERUSER,
-      },
+      // {
+      //   label: t("SANDBOX_APPLICATION_MANAGEMENT_HOMECARD_LABEL"),
+      //   link: `/${window?.contextPath}/employee/sandbox/application-management/home`,
+      //   roles: ROLES.SUPERUSER,
+      // },
     ],
   };
 
diff --git a/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/EmployeeModuleCard.js b/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/EmployeeModuleCard.js
index 21fb1ae0a51..4270312a9d4 100644
--- a/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/EmployeeModuleCard.js
+++ b/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/EmployeeModuleCard.js
@@ -22,17 +22,32 @@ const EmployeeModuleCard = ({ Icon, moduleName, kpis = [], links = [], isCitizen
                     <span>{count || "-"}</span>
                   </div>
                   <div>
-                 
-                {link ? <span className="link" onClick={()=> history.push(`${link}`,{count})}>{label}</span> : null}
+                    {link ? (
+                      <span className="link" onClick={() => history.push(`${link}`, { count })}>
+                        {label}
+                      </span>
+                    ) : null}
                   </div>
                 </div>
               ))}
             </div>
           )}
           <div className="links-wrapper" style={{ width: "80%" }}>
-            {links.map(({ count, label, link }, index) => (
+            {links.map(({ count, label, link, isOutsideModule }, index) => (
               <span className="link" key={index}>
-                {link ? (link?.includes(`${window?.contextPath}/`)?<Link to={{ pathname:link, state: {count} }}>{label}</Link>:<a href={link}>{label}</a>) : null}
+                {link ? (
+                  link?.includes(`${window?.contextPath}/`) ? (
+                    isOutsideModule ? (
+                      <span className={"link"} onClick={() => history.push(`${link}`)}>
+                        {label}
+                      </span>
+                    ) : (
+                      <Link to={{ pathname: link, state: { count } }}>{label}</Link>
+                    )
+                  ) : (
+                    <a href={link}>{label}</a>
+                  )
+                ) : null}
                 {count ? (
                   <>
                     <span className={"inbox-total"} onClick={()=>history.push(`${link}`)}>{count || "-"}</span>
@@ -50,7 +65,7 @@ const EmployeeModuleCard = ({ Icon, moduleName, kpis = [], links = [], isCitizen
   );
 };
 
-const ModuleCardFullWidth = ({ moduleName,  links = [], isCitizen = false, className, styles, headerStyle, subHeader, subHeaderLink }) => {
+const ModuleCardFullWidth = ({ moduleName, links = [], isCitizen = false, className, styles, headerStyle, subHeader, subHeaderLink }) => {
   return (
     <div className={className ? className : "employeeCard card-home customEmployeeCard home-action-cards"} style={styles ? styles : {}}>
       <div className="complaint-links-container" style={{ padding: "10px" }}>
@@ -58,7 +73,11 @@ const ModuleCardFullWidth = ({ moduleName,  links = [], isCitizen = false, class
           <span className="text removeHeight">{moduleName}</span>
           <span className="link">
             <a href={subHeaderLink}>
-              <span className={"inbox-total"} style={{ display: "flex", alignItems: "center", color: "#F47738", fontWeight: "bold" }} onClick={()=>history.push(`${link}`)}>
+              <span
+                className={"inbox-total"}
+                style={{ display: "flex", alignItems: "center", color: "#F47738", fontWeight: "bold" }}
+                onClick={() => history.push(`${link}`)}
+              >
                 {subHeader || "-"}
                 <span style={{ marginLeft: "10px" }}>
                   {" "}
@@ -72,7 +91,7 @@ const ModuleCardFullWidth = ({ moduleName,  links = [], isCitizen = false, class
           <div className="links-wrapper" style={{ width: "100%", display: "flex", flexWrap: "wrap" }}>
             {links.map(({ count, label, link }, index) => (
               <span className="link full-employee-card-link" key={index}>
-                {link ? (link?.includes(`${window?.contextPath}/`)?<Link to={link}>{label}</Link>:<a href={link}>{label}</a>) : null}
+                {link ? link?.includes(`${window?.contextPath}/`) ? <Link to={link}>{label}</Link> : <a href={link}>{label}</a> : null}
               </span>
             ))}
           </div>

From 4545c041d0b342757694b99a3691278769c28dc4 Mon Sep 17 00:00:00 2001
From: NabeelAyubee <nayubi7@gmail.com>
Date: Mon, 9 Sep 2024 12:08:12 +0530
Subject: [PATCH 18/23] pr resolve

---
 .../sandbox/src/pages/employee/applicationMgmt/SetupMaster.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/SetupMaster.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/SetupMaster.js
index ec7e1b944ae..1e524847f51 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/SetupMaster.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/SetupMaster.js
@@ -50,7 +50,9 @@ const SetupMaster = () => {
     [{ name: "ModuleMasterConfig" }],
     {
       select: (data) => {
-        let xx = data?.["sandbox-ui"]?.ModuleMasterConfig?.filter((item) => item?.module === module)?.[0]?.master;
+        let xx = data?.["sandbox-ui"]?.ModuleMasterConfig?.filter((item) => item?.module === module)?.[0]?.master?.filter(
+          (item) => item.type === "module" || item.type === "common" || item.type === "boundary"
+        );
         let respData = xx.map((i) => ({
           masterName: t(i.code),
           type: t(i.type),

From 749c61d29faaaefbdf5f3165be8663809a2e5e0c Mon Sep 17 00:00:00 2001
From: aaradhya-egov <aaradhya.sahu@egovernments.org>
Date: Mon, 9 Sep 2024 12:17:19 +0530
Subject: [PATCH 19/23] prresolve

---
 .../pgr/src/pages/employee/CreateComplaint/index.js  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js
index 9cb4a8d38e5..b1662b49cdf 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js
@@ -36,8 +36,8 @@ const { data: TenantMngmtSearch, isLoading: isLoadingTenantMngmtSearch } = Digit
   const [pincode, setPincode] = useState("");
   const [selectedCity, setSelectedCity] = useState(
     Digit.Utils.getMultiRootTenant()
-      ? getSubTenants()[0] || null
-      : getCities()[0] || null
+      ? getSubTenants()?.[0] || null
+      : getCities()?.[0] || null
   );
 
   const cityData = Digit.Utils.getMultiRootTenant() ? getSubTenants() : getCities();
@@ -59,10 +59,10 @@ const { data: TenantMngmtSearch, isLoading: isLoadingTenantMngmtSearch } = Digit
     );
 
   const { data: fetchedLocalities } = Digit.Hooks.useBoundaryLocalities(
-  cityData[0]?.code,
+  cityData?.[0]?.code,
   hierarchyType,
   {
-    enabled: !!cityData[0],
+    enabled: !!cityData?.[0],
   },
   t
 );
@@ -95,9 +95,9 @@ const { data: TenantMngmtSearch, isLoading: isLoadingTenantMngmtSearch } = Digit
   }, [fetchedLocalities]);
 
   useEffect(() => {
-    if(window.globalPath !== "sandbox-ui"){
+    if(Digit.Utils.getMultiRootTenant()){
     const city = cities.find((obj) => obj.pincode?.find((item) => item == pincode));
-    if (city?.code&&city?.code === getCities()[0]?.code) {
+    if (city?.code&&city?.code === getCities()?.[0]?.code) {
       setPincodeNotValid(false);
       setSelectedCity(city);
       setSelectedLocality(null);

From e3124b0133ea55ae7b24058d345c4c41cfacfc7f Mon Sep 17 00:00:00 2001
From: aaradhya-egov <aaradhya.sahu@egovernments.org>
Date: Mon, 9 Sep 2024 12:26:33 +0530
Subject: [PATCH 20/23] resolve

---
 .../packages/css/src/pages/employee/sandbox.scss             | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss
index 41fc1cca0a6..54e1c14fcca 100644
--- a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss
+++ b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss
@@ -323,10 +323,7 @@
   z-index: 10;
   height: 100vh;
 }
-.citizen-home-footer {
-  position: absolute;
-  bottom: 0;
-}
+
 .citizen-form-wrapper {
   justify-content: flex-start;
   .citizen-card-input.citizen-card-input--front {

From 65cb39edf541a856579e84a9aaa61e29a1e5d57c Mon Sep 17 00:00:00 2001
From: aaradhya-egov <aaradhya.sahu@egovernments.org>
Date: Mon, 9 Sep 2024 12:51:27 +0530
Subject: [PATCH 21/23] pr resolve

---
 .../modules/core/src/pages/citizen/Home/LocationSelection.js    | 2 +-
 .../modules/pgr/src/pages/employee/CreateComplaint/index.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js
index 75a73382bd3..45cbbe30b56 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js
@@ -11,7 +11,7 @@ const LocationSelection = () => {
   let hookResult = { data: null, isLoading: false };
 
 // Check the value of window.globalPath
-if (window?.globalPath === 'sandbox-ui') {
+if (Digit.Utils.getMultiRootTenant()) {
   // Call the useTenants hook only if the condition is met
   hookResult = Digit.Hooks.useTenants();
 }
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js
index b1662b49cdf..6c8df59a414 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js
@@ -95,7 +95,7 @@ const { data: TenantMngmtSearch, isLoading: isLoadingTenantMngmtSearch } = Digit
   }, [fetchedLocalities]);
 
   useEffect(() => {
-    if(Digit.Utils.getMultiRootTenant()){
+    if(!Digit.Utils.getMultiRootTenant()){
     const city = cities.find((obj) => obj.pincode?.find((item) => item == pincode));
     if (city?.code&&city?.code === getCities()?.[0]?.code) {
       setPincodeNotValid(false);

From 914a49ae30476d37e5690fc9f08a290c847e70ba Mon Sep 17 00:00:00 2001
From: aaradhya-egov <aaradhya.sahu@egovernments.org>
Date: Mon, 9 Sep 2024 12:56:20 +0530
Subject: [PATCH 22/23] resolve

---
 .../modules/core/src/pages/citizen/Home/LocationSelection.js  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js
index 45cbbe30b56..d722237d0b9 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/LocationSelection.js
@@ -58,10 +58,6 @@ const { data: TenantMngmtSearch, isLoading: isLoadingTenantMngmtSearch } = Digit
     if (selectedCity) {
       Digit.SessionStorage.set("CITIZEN.COMMON.HOME.CITY", selectedCity);
       const redirectBackTo = location.state?.redirectBackTo;
-      if(Digit.Utils.getMultiRootTenant()){
-        history.push(`/${window?.contextPath}/citizen/all-services`);
-        return;
-      }
       if (redirectBackTo) {
         history.replace(redirectBackTo);
       } else history.push(`/${window?.contextPath}/citizen`);

From fc57dd68252332398f1eb490045cc31187ba450d Mon Sep 17 00:00:00 2001
From: aaradhya-egov <aaradhya.sahu@egovernments.org>
Date: Mon, 9 Sep 2024 13:00:12 +0530
Subject: [PATCH 23/23] resolve

---
 .../modules/hrms/src/components/pageComponents/jurisdiction.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/jurisdiction.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/jurisdiction.js
index 257f0e453d7..dfe2471e899 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/jurisdiction.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/jurisdiction.js
@@ -196,7 +196,7 @@ function Jurisdiction({
   const subTenantList = getSubTenants();
 
   useEffect(() => {
-    if (window.globalPath === 'sandbox-ui') {
+    if (Digit.Utils.getMultiRootTenant()) {
       selectboundary(subTenantList);
     }
     else {