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 = ({
{location.pathname.includes( "sanitation-ui/citizen/all-services" - ) ? null : ( + ) || (location.pathname.includes("sandbox-ui") && location.pathname.includes("all-services")) ? null : ( )}
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 }) => { {t("CS_COMMON_HELPLINE")}
- {storeData?.tenants.map((i) => { + {storeData?.tenants?.map((i) => { i.code === tenantId ? ( ) : ( ); })}
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 }) => {
- + {location.pathname.includes("login") ? null : } 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 ; } return ; 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={[
{t("ES_CAMPAIGN_UPLOAD_BOUNDARY_DATA_MODAL_TEXT")}
]} + heading={t("SANDBOX_SETUP_MASTER_MODAL_HEADER")} + children={[
{t("SANDBOX_SETUP_MASTER_MODAL_TEXT")}
]} onOverlayClick={() => {}} footerChildren={[