diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json index 831b2f6802..c713e3476b 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json @@ -18,9 +18,9 @@ "@egovernments/digit-ui-module-attendencemgmt": "0.4.9", "@egovernments/digit-ui-module-contracts": "0.4.8", "@egovernments/digit-ui-module-measurement":"0.2.8", - "@egovernments/digit-ui-module-estimate": "0.4.13", - "@egovernments/digit-ui-module-masters": "0.4.12", - "@egovernments/digit-ui-module-project": "0.4.8", + "@egovernments/digit-ui-module-estimate": "0.4.14", + "@egovernments/digit-ui-module-masters": "0.4.13", + "@egovernments/digit-ui-module-project": "0.4.9", "@egovernments/digit-ui-module-expenditure": "0.4.6", "@egovernments/digit-ui-customisation-mukta": "0.2.6", "@egovernments/digit-ui-module-rate-analysis": "0.4.6", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/useLocation.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/useLocation.js index 0e5cfa320e..1a8e69716b 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/useLocation.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/useLocation.js @@ -1,12 +1,12 @@ import { useQuery } from 'react-query'; import { LocationService } from "../services/elements/Location"; -const useLocation = (tenantId, locationType, config = {}) => { +const useLocation = (tenantId, locationType, config = {},includeChildren) => { switch(locationType) { case 'Locality': return useQuery(["LOCALITY_DETAILS", tenantId ], () => LocationService.getLocalities(tenantId), config); case 'Ward': - return useQuery(["WARD_DETAILS", tenantId ], () => LocationService.getWards(tenantId), config); + return useQuery(["WARD_DETAILS", tenantId ], () => LocationService.getWards(tenantId,includeChildren), config); default: break } diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js index 2c97a7ee92..e1e72bc928 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js @@ -1,12 +1,12 @@ const Urls = { - MDMS: `/egov-mdms-service/v1/_search`, + MDMS: `/mdms-v2/v1/_search`, WorkFlow: `/egov-workflow-v2/egov-wf/businessservice/_search`, WorkFlowProcessSearch: `/egov-workflow-v2/egov-wf/process/_search`, localization: `/localization/messages/v1/_search`, location: { - localities: `/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=ADMIN&boundaryType=Locality`, - wards: `/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=ADMIN&boundaryType=Ward`, - revenue_localities: `/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=REVENUE&boundaryType=Locality`, + localities: `/boundary-service/boundary-relationships/_search?hierarchyType=ADMIN&boundaryType=locality`, + wards: `/boundary-service/boundary-relationships/_search?hierarchyType=ADMIN&boundaryType=Ward`, + revenue_localities: `/boundary-service/boundary-relationships/_search?hierarchyType=REVENUE&boundaryType=locality`, }, pgr_search: `/pgr-services/v2/request/_search`, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/Location.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/Location.js index 0263422505..4fa6c86e1b 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/Location.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/Location.js @@ -19,11 +19,11 @@ export const LocationService = { }); return response; }, - getWards: (tenantId) => { + getWards: (tenantId,includeChildren) => { return ServiceRequest({ serviceName: "getWards", url: Urls.location.wards, - params: { tenantId: tenantId }, + params: { tenantId: tenantId, includeChildren: includeChildren }, useCache: true, }); } diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/package.json index 89510d0ec2..1d3bac94b1 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-estimate", - "version": "0.4.13", + "version": "0.4.14", "description": "Estimate Module UI", "main": "dist/index.js", "module": "dist/index.modern.js", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/NonSORTable.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/NonSORTable.js index 296b65f76f..68396ee8c6 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/NonSORTable.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pageComponents/NonSORTable.js @@ -274,7 +274,7 @@ const NonSORTable = ({ control, watch,config, ...props }) => { render={(props) => getDropDownDataFromMDMS(t, row, "uom", props, register, "name", { mdmsConfig: { - masterName: "uom", + masterName: "UOM", moduleName: "common-masters", localePrefix: "ES_COMMON_UOM", }, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/Estimates/CreateDetailedEstimate/CreateEstimate.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/Estimates/CreateDetailedEstimate/CreateEstimate.js index 9828173fc2..f5691dad88 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/Estimates/CreateDetailedEstimate/CreateEstimate.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/Estimates/CreateDetailedEstimate/CreateEstimate.js @@ -99,7 +99,7 @@ const CreateEstimate = ({ props }) => { actionMB = actionMB && (isEdit || isEditRevisionEstimate) && estimate && estimate?.wfStatus === "PENDINGFORCORRECTION" - ? actionMB?.filter((ob) => ob?.name !== "DRAFT") + ? actionMB?.filter((ob) => ob?.name !== "WF_DRAFT") : actionMB; const searchParams = { @@ -196,12 +196,12 @@ const CreateEstimate = ({ props }) => { "common-masters", [ { - name: "uom", + name: "UOM", }, ], { select: (data) => { - return data?.["common-masters"]?.uom; + return data?.["common-masters"]?.UOM; }, } ); @@ -445,7 +445,7 @@ const CreateEstimate = ({ props }) => { parseInt(getLabourMaterialAnalysisCost(_data, ["MHA"])) || _data?.labourMaterialAnalysis?.labour + _data?.labourMaterialAnalysis?.material + _data?.labourMaterialAnalysis?.machinery; //here check totalEst amount should be less than material+labour - if (_data.totalEstimateAmount < totalLabourAndMaterial && action !== "DRAFT") { + if (_data.totalEstimateAmount < totalLabourAndMaterial && action !== "WF_DRAFT") { setShowToast({ type: "warning", label: "ERR_ESTIMATE_AMOUNT_MISMATCH" }); setIsButtonDisabled(false); closeToast(); @@ -461,7 +461,7 @@ const CreateEstimate = ({ props }) => { setInputFormData((prevState) => _data); //first do whatever processing you want on form data then pass it over to modal's onSubmit function - if (action === "DRAFT") onModalSubmit(_data, action); + if (action === "WF_DRAFT") onModalSubmit(_data, action); else setShowModal(true); }; @@ -498,7 +498,7 @@ const CreateEstimate = ({ props }) => { }; removeNonsortableObjectWithoutRequiredParams(completeFormData); - let validated = action !== "DRAFT" ? validateData(completeFormData) : true; + let validated = action !== "WF_DRAFT" ? validateData(completeFormData) : true; if(validated){ const payload = createEstimatePayload(completeFormData, projectData, isEdit, currentEstimate, isCreateRevisionEstimate, isEditRevisionEstimate); setShowModal(false); @@ -541,7 +541,7 @@ const CreateEstimate = ({ props }) => { }, ], }; - if(action === "DRAFT") + if(action === "WF_DRAFT") { setShowToast({ label: t("WORKS_ESTIMATE_APPLICATION_DRAFTED") }); if(isCreateRevisionEstimate || isEditRevisionEstimate) @@ -582,7 +582,7 @@ const CreateEstimate = ({ props }) => { }, ], }; - if(action === "DRAFT") + if(action === "WF_DRAFT") { setShowToast({ label: t("WORKS_ESTIMATE_APPLICATION_DRAFTED") }); if(isCreateRevisionEstimate || isEditRevisionEstimate) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/Estimates/CreateDetailedEstimate/createEstimatePayload.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/Estimates/CreateDetailedEstimate/createEstimatePayload.js index e128bd2dfe..7eef59a49b 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/Estimates/CreateDetailedEstimate/createEstimatePayload.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Estimate/src/pages/employee/Estimates/CreateDetailedEstimate/createEstimatePayload.js @@ -247,9 +247,9 @@ export const createEstimatePayload = (data, projectData, isEdit, estimate, isCre }, }, workflow: { - action: (estimate?.wfStatus === "PENDINGFORCORRECTION" && (data?.wfAction === "SUBMIT" || data?.workflowAction === "SUBMIT")) ? "RE-SUBMIT" : data?.workflowAction, + action: (estimate?.wfStatus === "PENDINGFORCORRECTION" && (data?.wfAction === "WF_SUBMIT" || data?.workflowAction === "WF_SUBMIT")) ? "RE-SUBMIT" : data?.workflowAction?.split("_")?.[1], comment: filteredFormData?.comments, - assignees: [data?.workflowAction === "DRAFT" ? Digit.UserService.getUser()?.info?.uuid : (filteredFormData?.selectedApprover?.uuid ? filteredFormData?.selectedApprover?.uuid : undefined)], + assignees: [data?.workflowAction === "WF_DRAFT" ? Digit.UserService.getUser()?.info?.uuid : (filteredFormData?.selectedApprover?.uuid ? filteredFormData?.selectedApprover?.uuid : undefined)], }, }; @@ -302,9 +302,9 @@ export const createEstimatePayload = (data, projectData, isEdit, estimate, isCre }, }, workflow: { - action: data?.workflowAction, + action: data?.workflowAction?.includes("WF")? data?.workflowAction?.split("_")?.[1] : data?.workflowAction, comment: filteredFormData?.comments, - assignees: [data?.workflowAction === "DRAFT" ? Digit.UserService.getUser()?.info?.uuid : (filteredFormData?.selectedApprover?.uuid ? filteredFormData?.selectedApprover?.uuid : undefined)], + assignees: [data?.workflowAction === "WF_DRAFT" ? Digit.UserService.getUser()?.info?.uuid : (filteredFormData?.selectedApprover?.uuid ? filteredFormData?.selectedApprover?.uuid : undefined)], }, }; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json index 009bd2ab6c..e5635e4bc6 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-masters", - "version": "0.4.12", + "version": "0.4.13", "description": "Masters Module UI", "main": "dist/index.js", "module": "dist/index.modern.js", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/components/CreateOrganization/CreateOrganizationForm.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/components/CreateOrganization/CreateOrganizationForm.js index f1fca61393..1542b5be37 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/components/CreateOrganization/CreateOrganizationForm.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/components/CreateOrganization/CreateOrganizationForm.js @@ -19,14 +19,14 @@ const CreateOrganizationForm = ({setCreateOrgStatus, sessionFormData, setSession const wards = [] const localities = {} data?.TenantBoundary[0]?.boundary.forEach((item) => { - localities[item?.code] = item?.children.map(item => ({ code: item.code, name: item.name, i18nKey: `${headerLocale}_ADMIN_${item?.code}` })) - wards.push({ code: item.code, name: item.name, i18nKey: `${headerLocale}_ADMIN_${item?.code}` }) + localities[item?.code] = item?.children.map(item => ({ code: item.code, name: t(`${headerLocale}_ADMIN_${item?.code}`), i18nKey: `${headerLocale}_ADMIN_${item?.code}` })) + wards.push({ code: item.code, name: t(`${headerLocale}_ADMIN_${item?.code}`), i18nKey: `${headerLocale}_ADMIN_${item?.code}` }) }); return { wards, localities } }, - }) + },includeChildren = true) const filteredLocalities = isLoading ? [] : wardsAndLocalities?.localities[selectedWard] diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/configs/configWageSeekerRegistrationForm.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/configs/configWageSeekerRegistrationForm.js index 8a5892c519..2d6b3f8d46 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/configs/configWageSeekerRegistrationForm.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/configs/configWageSeekerRegistrationForm.js @@ -13,7 +13,7 @@ const ConfigWageSeekerRegistrationForm = ({selectFile, uploadedFile, setUploade tenantId, 'Locality', { select: (data) => { - return data?.TenantBoundary[0]?.boundary.map((item) => ({ code: item.code, name: item.name, i18nKey: `${headerLocale}_ADMIN_${item?.code}` })); + return data?.TenantBoundary[0]?.boundary.map((item) => ({ code: item.code, name: t(`${headerLocale}_ADMIN_${item?.code}`), i18nKey: `${headerLocale}_ADMIN_${item?.code}` })); }, }) @@ -21,7 +21,7 @@ const ConfigWageSeekerRegistrationForm = ({selectFile, uploadedFile, setUploade tenantId, 'Ward', { select: (data) => { - return data?.TenantBoundary[0]?.boundary.map((item) => ({ code: item.code, name: item.name, i18nKey: `${headerLocale}_ADMIN_${item?.code}` })); + return data?.TenantBoundary[0]?.boundary.map((item) => ({ code: item.code, name: t(`${headerLocale}_ADMIN_${item?.code}`), i18nKey: `${headerLocale}_ADMIN_${item?.code}` })); }, }) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/Organisation/CreateOrganization/CreateOrganizationForm.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/Organisation/CreateOrganization/CreateOrganizationForm.js index e2e7ee5150..0a2d521460 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/Organisation/CreateOrganization/CreateOrganizationForm.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/Organisation/CreateOrganization/CreateOrganizationForm.js @@ -56,14 +56,14 @@ const CreateOrganizationForm = ({ createOrganizationConfig, sessionFormData, set const wards = [] const localities = {} data?.TenantBoundary[0]?.boundary.forEach((item) => { - localities[item?.code] = item?.children.map(item => ({ code: item.code, name: item.name, i18nKey: `${headerLocale}_ADMIN_${item?.code}`, label : item?.label })) - wards.push({ code: item.code, name: item.name, i18nKey: `${headerLocale}_ADMIN_${item?.code}` }) + localities[item?.code] = item?.children.map(item => ({ code: item.code, name: t(`${headerLocale}_ADMIN_${item?.code}`), i18nKey: `${headerLocale}_ADMIN_${item?.code}`, label : item?.label })) + wards.push({ code: item.code, name: t(`${headerLocale}_ADMIN_${item?.code}`), i18nKey: `${headerLocale}_ADMIN_${item?.code}` }) }); return { wards, localities } } - }); + },includeChildren = true); const filteredLocalities = wardsAndLocalities?.localities[selectedWard]; //org data diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/WageSeeker/ModifyWageSeeker/ModifyWageSeekerForm.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/WageSeeker/ModifyWageSeeker/ModifyWageSeekerForm.js index 3bc936e1a7..5e53a789b5 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/WageSeeker/ModifyWageSeeker/ModifyWageSeekerForm.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Masters/src/pages/employee/WageSeeker/ModifyWageSeeker/ModifyWageSeekerForm.js @@ -88,14 +88,14 @@ const requestCriteria = { const wards = [] const localities = {} data?.TenantBoundary[0]?.boundary.forEach((item) => { - localities[item?.code] = item?.children.map(item => ({ code: item.code, name: item.name, i18nKey: `${headerLocale}_ADMIN_${item?.code}`, label : item?.label })) - wards.push({ code: item.code, name: item.name, i18nKey: `${headerLocale}_ADMIN_${item?.code}` }) + localities[item?.code] = item?.children.map(item => ({ code: item.code, name: t(`${headerLocale}_ADMIN_${item?.code}`), i18nKey: `${headerLocale}_ADMIN_${item?.code}`, label : item?.label })) + wards.push({ code: item.code, name: t(`${headerLocale}_ADMIN_${item?.code}`), i18nKey: `${headerLocale}_ADMIN_${item?.code}` }) }); return { wards, localities } } - }); + },includeChildren = true); const filteredLocalities = wardsAndLocalities?.localities[selectedWard]; //wage seeker form config diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/package.json index bd00cc015f..744f56105e 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-project", - "version": "0.4.8", + "version": "0.4.9", "description": "Project Module UI", "main": "dist/index.js", "module": "dist/index.modern.js", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/src/components/SubProjectDetailsTable.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/src/components/SubProjectDetailsTable.js index b0523b0483..c84072013e 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/src/components/SubProjectDetailsTable.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/src/components/SubProjectDetailsTable.js @@ -60,14 +60,14 @@ const SubProjectDetailsTable = ({t, register, control, setValue, onChange, error const wards = [] const localities = {} data?.TenantBoundary[0]?.boundary.forEach((item) => { - localities[item?.code] = item?.children.map(item => ({ code: item.code, name: item.name, i18nKey: `${headerLocale}_ADMIN_${item?.code}`, label : item?.label })) - wards.push({ code: item.code, name: item.name, i18nKey: `${headerLocale}_ADMIN_${item?.code}` }) + localities[item?.code] = item?.children.map(item => ({ code: item.code, name: t(`${headerLocale}_ADMIN_${item?.code}`), i18nKey: `${headerLocale}_ADMIN_${item?.code}`, label : item?.label })) + wards.push({ code: item.code, name: t(`${headerLocale}_ADMIN_${item?.code}`), i18nKey: `${headerLocale}_ADMIN_${item?.code}` }) }); return { wards, localities } } - }); + },includeChildren = true); useEffect(()=>{ let filteredSubTypeOfProject = ( subProjectTypeOfProjectOptions && subProjectTypeOfProjectOptions?.projectSubType ) ? ( diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/src/configs/createProjectConfigMUKTA.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/src/configs/createProjectConfigMUKTA.js index df152c02f5..ab2e401b5a 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/src/configs/createProjectConfigMUKTA.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/src/configs/createProjectConfigMUKTA.js @@ -252,9 +252,9 @@ export const createProjectConfigMUKTA = { "name": "noSubProject_locality", "optionsKey": "i18nKey", "allowMultiSelect": false, - "url": "/egov-location/location/v11/boundarys/_search", - "params": { "hierarchyTypeCode" : "ADMIN", "boundaryType": "locality" }, - "selectFun": "return data?.TenantBoundary[0]?.boundary?.map(item => ({ code: item.code, name: item.name, i18nKey: `${headerLocale}_ADMIN_${item?.code}` }))" + "url": "/boundary-service/boundary-relationships/_search?", + "params": { "hierarchyType" : "ADMIN", "boundaryType": "LOCALITY" }, + "selectFun": "return data?.boundary?.map(item => ({ code: item.code, i18nKey: `${headerLocale}_ADMIN_${item?.code}` }))" } } ] diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/src/pages/employee/CreateProject/CreateProjectForm.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/src/pages/employee/CreateProject/CreateProjectForm.js index 21d7778029..c1fb7f9433 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/src/pages/employee/CreateProject/CreateProjectForm.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Project/src/pages/employee/CreateProject/CreateProjectForm.js @@ -58,14 +58,14 @@ const CreateProjectForm = ({t, sessionFormData, setSessionFormData, clearSession const wards = [] const localities = {} data?.TenantBoundary[0]?.boundary.forEach((item) => { - localities[item?.code] = item?.children.map(item => ({ code: item.code, name: item.name, i18nKey: `${headerLocale}_ADMIN_${item?.code}`, label : item?.label })) - wards.push({ code: item.code, name: item.name, i18nKey: `${headerLocale}_ADMIN_${item?.code}` }) + localities[item?.code] = item?.children.map(item => ({ code: item.code, name: t(`${headerLocale}_ADMIN_${item?.code}`), i18nKey: `${headerLocale}_ADMIN_${item?.code}`, label : item?.label })) + wards.push({ code: item.code, name: t(`${headerLocale}_ADMIN_${item?.code}`), i18nKey: `${headerLocale}_ADMIN_${item?.code}` }) }); return { wards, localities } } - }); + },true); const filteredLocalities = wardsAndLocalities?.localities[selectedWard]; const config = useMemo( () => Digit.Utils.preProcessMDMSConfig(t, createProjectConfig, { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/LocationDropdownWrapper.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/LocationDropdownWrapper.js index 574a9514d1..610a34b689 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/LocationDropdownWrapper.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/LocationDropdownWrapper.js @@ -25,15 +25,15 @@ const LocationDropdownWrapper = ({populators,formData,props,inputRef,errors,setV const wards = [] const localities = {} data?.TenantBoundary[0]?.boundary.forEach((item) => { - localities[item?.code] = item?.children.map(item => ({ code: item.code, name: item.name, i18nKey: `${headerLocale}_ADMIN_${item?.code}`, label: item?.label })) - wards.push({ code: item.code, name: item.name, i18nKey: `${headerLocale}_ADMIN_${item?.code}` }) + localities[item?.code] = item?.children.map(item => ({ code: item.code, name: t(`${headerLocale}_ADMIN_${item?.code}`), i18nKey: `${headerLocale}_ADMIN_${item?.code}`, label: item?.label })) + wards.push({ code: item.code, name: t(`${headerLocale}_ADMIN_${item?.code}`), i18nKey: `${headerLocale}_ADMIN_${item?.code}` }) }); return { wards, localities } } - }); + },true); useEffect(() => { diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json index 90ac379352..3e41553adb 100644 --- a/frontend/micro-ui/web/package.json +++ b/frontend/micro-ui/web/package.json @@ -25,9 +25,9 @@ "@egovernments/digit-ui-module-attendencemgmt": "0.4.9", "@egovernments/digit-ui-module-contracts": "0.4.8", "@egovernments/digit-ui-module-measurement":"0.2.8", - "@egovernments/digit-ui-module-estimate": "0.4.13", - "@egovernments/digit-ui-module-masters": "0.4.12", - "@egovernments/digit-ui-module-project": "0.4.8", + "@egovernments/digit-ui-module-estimate": "0.4.14", + "@egovernments/digit-ui-module-masters": "0.4.13", + "@egovernments/digit-ui-module-project": "0.4.9", "@egovernments/digit-ui-module-expenditure": "0.4.6", "@egovernments/digit-ui-customisation-mukta": "0.2.6", "@egovernments/digit-ui-module-rate-analysis": "0.4.6",