Skip to content

Commit 4950cee

Browse files
abishekTa-egovabishekTa-egov
committed
Merge branch 'BUGFIX/HCMPRE-0112' of https://github.com/egovernments/DIGIT-Frontend into BUGFIX/HCMPRE-0112
2 parents 48c5926 + 8a592d9 commit 4950cee

File tree

7 files changed

+83
-62
lines changed

7 files changed

+83
-62
lines changed

‎health/micro-ui/web/micro-ui-internals/example/public/index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<meta name="theme-color" content="#00bcd1" />
1212
<title>DIGIT</title>
1313
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
14-
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.44/dist/index.css" />
15-
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.2.50/dist/index.css" />
14+
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.2.0/dist/index.css" />
15+
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.3.1/dist/index.css" />
1616

1717
<!-- added below css for hcm-workbench module inclusion-->
1818
<!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" /> -->

‎health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/Module.js

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { TourProvider } from "@egovernments/digit-ui-react-components";
1+
import { TourProvider } from "@egovernments/digit-ui-react-components";
22
import { Loader } from "@egovernments/digit-ui-components";
33
import React from "react";
44
import { useRouteMatch } from "react-router-dom";
@@ -68,27 +68,30 @@ export const CONSOLE_MDMS_MODULENAME = "HCM-ADMIN-CONSOLE";
6868
*/
6969
const CampaignModule = ({ stateCode, userType, tenants }) => {
7070
const tenantId = Digit.ULBService.getCurrentTenantId();
71+
const moduleName = Digit.Utils.campaign.getModuleName();
7172
const { data: BOUNDARY_HIERARCHY_TYPE, isLoading: hierarchyLoading } = Digit.Hooks.useCustomMDMS(
7273
tenantId,
7374
CONSOLE_MDMS_MODULENAME,
7475
[
7576
{
7677
name: "HierarchySchema",
77-
filter: `[?(@.type=='${window.Digit.Utils.campaign.getModuleName()}')]`,
78+
filter: `[?(@.type=='${moduleName}')]`,
7879
},
7980
],
8081
{
8182
select: (data) => {
8283
return data?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema?.[0]?.hierarchy;
8384
},
8485
},
85-
{ schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` }
86+
{ schemaCode: "HierarchySchema" }
8687
);
8788

8889
const hierarchyData = Digit.Hooks.campaign.useBoundaryRelationshipSearch({ BOUNDARY_HIERARCHY_TYPE, tenantId });
8990
const modulePrefix = "hcm";
9091

91-
const moduleCode = BOUNDARY_HIERARCHY_TYPE ? [`boundary-${BOUNDARY_HIERARCHY_TYPE}`] : ["campaignmanager", "schema", "admin-schemas", "checklist", "appconfiguration"];
92+
const moduleCode = BOUNDARY_HIERARCHY_TYPE
93+
? [`boundary-${BOUNDARY_HIERARCHY_TYPE}`]
94+
: ["campaignmanager", "schema", "admin-schemas", "checklist", "appconfiguration"];
9295

9396
const { path, url } = useRouteMatch();
9497
const language = Digit.StoreData.getCurrentLanguage();
@@ -100,7 +103,7 @@ const CampaignModule = ({ stateCode, userType, tenants }) => {
100103
});
101104

102105
if (isLoading) {
103-
return <Loader page={true} variant={"PageLoader"}/>;
106+
return <Loader page={true} variant={"PageLoader"} />;
104107
}
105108

106109
return (

‎health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/DataUploadWrapper.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ function DataUploadWrapper({ formData, props, onSelect }) {
6262
<TextBlock subHeader={t("HCM_UPLOAD_DATA")} subHeaderClassName={"stepper-subheader"} wrapperClassName={"stepper-wrapper"} />
6363
</Card>
6464
<Card className="stepper-card">
65-
<Stepper customSteps={categories} currentStep={currentStep} onStepClick={onStepClick} direction={"vertical"} />
65+
<Stepper customSteps={categories} currentStep={currentStep} onStepClick={() => {}} direction={"vertical"} />
6666
</Card>
6767
</div>
6868
)}

‎health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadDataMapping.js

+17-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1-
import { Button, CardLabel, CardText, Chip, Dropdown, LabelFieldPair, Loader, PopUp, Switch, Toast , CardHeader } from "@egovernments/digit-ui-components";
1+
import {
2+
Button,
3+
CardLabel,
4+
CardText,
5+
Chip,
6+
Dropdown,
7+
LabelFieldPair,
8+
Loader,
9+
PopUp,
10+
Switch,
11+
Toast,
12+
CardHeader,
13+
} from "@egovernments/digit-ui-components";
214
import React, { Fragment, useEffect, useReducer, useState, useRef } from "react";
315
import DataTable from "react-data-table-component";
416
import { useTranslation } from "react-i18next";
@@ -7,7 +19,7 @@ import { CONSOLE_MDMS_MODULENAME } from "../Module";
719
import MultiSelectDropdown from "./MultiSelectDropdown";
820
import NoResultsFound from "./NoResultsFound";
921
import AddOrEditMapping from "./AddOrEditMapping";
10-
import {CustomSVG} from "@egovernments/digit-ui-components";
22+
import { CustomSVG } from "@egovernments/digit-ui-components";
1123
import Ajv from "ajv";
1224

1325
const initialState = {
@@ -691,13 +703,15 @@ function UploadDataMapping({ formData, onSelect, currentCategories }) {
691703
payload: childData,
692704
schemas: Schemas,
693705
t: t,
706+
currentCategories: currentCategories,
694707
});
695708
} else {
696709
dispatch({
697710
type: "EDIT_DATA",
698711
payload: childData,
699712
schemas: Schemas,
700713
t: t,
714+
currentCategories: currentCategories,
701715
});
702716
}
703717

@@ -1180,7 +1194,7 @@ function UploadDataMapping({ formData, onSelect, currentCategories }) {
11801194
const endRow = Math.min(state.currentPage * state.rowsPerPage, state.totalRows);
11811195

11821196
return (
1183-
<div style={{ display: "flex", justifyContent: "space-between", alignItems: "center" , paddingTop:"1rem" }}>
1197+
<div style={{ display: "flex", justifyContent: "space-between", alignItems: "center", paddingTop: "1rem" }}>
11841198
<Button
11851199
className="custom-class"
11861200
variation={"secondary"}

‎health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useBoundaryRelationshipSearch.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export const useBoundaryRelationshipSearch = ({BOUNDARY_HIERARCHY_TYPE , tenantI
1414
},
1515
};
1616

17-
const { data: hierarchyData, refetch, isLoading } = Digit.Hooks.useCustomAPIHook(reqCriteria);
17+
const { data: hierarchyData, isLoading } = Digit.Hooks.useCustomAPIHook(reqCriteria);
1818
return hierarchyData?.TenantBoundary?.[0]?.boundary;
1919
};
2020

‎health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js

+26-35
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import React, { useState, useEffect, useMemo } from "react";
33
import { useTranslation } from "react-i18next";
44
import { useHistory } from "react-router-dom";
55
import { CampaignConfig } from "../../configs/CampaignConfig";
6-
import { Stepper, Toast, Button, Footer , Loader} from "@egovernments/digit-ui-components";
6+
import { Stepper, Toast, Button, Footer, Loader } from "@egovernments/digit-ui-components";
77
import {
88
updateUrlParams,
99
transformDraftDataToFormData,
@@ -26,7 +26,7 @@ import { CONSOLE_MDMS_MODULENAME } from "../../Module";
2626
* triggers API calls to create or update the campaign
2727
*/
2828

29-
const SetupCampaign = ({ hierarchyType, hierarchyData }) => {
29+
const SetupCampaign = React.memo(({ hierarchyType, hierarchyData }) => {
3030
const tenantId = Digit.ULBService.getCurrentTenantId();
3131
const { t } = useTranslation();
3232
const history = useHistory();
@@ -93,18 +93,20 @@ const SetupCampaign = ({ hierarchyType, hierarchyData }) => {
9393
{ schemaCode: `${"HCM-PROJECT-TYPES"}.projectTypes` }
9494
);
9595

96-
const reqCriteria = {
97-
url: `/boundary-service/boundary-hierarchy-definition/_search`,
98-
changeQueryName: `${hierarchyType}`,
99-
body: {
100-
BoundaryTypeHierarchySearchCriteria: {
101-
tenantId: tenantId,
102-
limit: 2,
103-
offset: 0,
104-
hierarchyType: hierarchyType,
96+
const reqCriteria = useMemo(() => {
97+
return {
98+
url: `/boundary-service/boundary-hierarchy-definition/_search`,
99+
changeQueryName: `${hierarchyType}`,
100+
body: {
101+
BoundaryTypeHierarchySearchCriteria: {
102+
tenantId: tenantId,
103+
limit: 2,
104+
offset: 0,
105+
hierarchyType: hierarchyType,
106+
},
105107
},
106-
},
107-
};
108+
};
109+
}, [tenantId, hierarchyType]);
108110

109111
const { data: hierarchyDefinition } = Digit.Hooks.useCustomAPIHook(reqCriteria);
110112

@@ -952,27 +954,16 @@ const SetupCampaign = ({ hierarchyType, hierarchyData }) => {
952954
setShowToast(null);
953955
}, [currentKey]);
954956

955-
useEffect(async () => {
956-
if (totalFormData?.HCM_CAMPAIGN_DELIVERY_DATA?.deliveryRule) {
957-
// const temp = restructureData(totalFormData?.HCM_CAMPAIGN_DELIVERY_DATA?.deliveryRule);
958-
const temp = restructureData(
959-
totalFormData?.HCM_CAMPAIGN_DELIVERY_DATA?.deliveryRule,
960-
totalFormData?.HCM_CAMPAIGN_CYCLE_CONFIGURE?.cycleConfigure,
961-
DeliveryConfig
962-
);
963-
}
964-
}, [shouldUpdate]);
965-
966957
const closeToast = () => {
967958
setShowToast(null);
968959
};
969960

970961
if (isPreview === "true" && !draftData) {
971-
return <Loader page={true} variant={"PageLoader"}/>;
962+
return <Loader page={true} variant={"PageLoader"} />;
972963
}
973964

974965
if (isDraft === "true" && !draftData) {
975-
return <Loader page={true} variant={"PageLoader"}/>;
966+
return <Loader page={true} variant={"PageLoader"} />;
976967
}
977968

978969
function onActionSelect(action) {
@@ -1022,14 +1013,14 @@ const SetupCampaign = ({ hierarchyType, hierarchyData }) => {
10221013

10231014
return (
10241015
<React.Fragment>
1025-
{loader && <Loader page={true} variant={"PageLoader"} loaderText={t("PLEASE_WAIT_WHILE_UPDATING")}/> }
1016+
{loader && <Loader page={true} variant={"PageLoader"} loaderText={t("PLEASE_WAIT_WHILE_UPDATING")} />}
10261017
{noAction !== "false" && (
10271018
<Stepper
10281019
customSteps={["HCM_CAMPAIGN_SETUP_DETAILS", "HCM_BOUNDARY_DETAILS", "HCM_DELIVERY_DETAILS", "HCM_UPLOAD_DATA", "HCM_REVIEW_DETAILS"]}
10291020
currentStep={currentStep + 1}
10301021
onStepClick={onStepClick}
10311022
activeSteps={active}
1032-
// className={"campaign-flow-stepper"}
1023+
// className={"campaign-flow-stepper"}
10331024
/>
10341025
)}
10351026
<FormComposerV2
@@ -1053,12 +1044,12 @@ const SetupCampaign = ({ hierarchyType, hierarchyData }) => {
10531044
isChangeDates === "true" && currentKey == 16
10541045
? t("HCM_UPDATE_DATE")
10551046
: isChangeDates === "true"
1056-
? null
1057-
: noAction === "false"
1058-
? null
1059-
: filteredConfig?.[0]?.form?.[0]?.isLast === true
1060-
? t("HCM_SUBMIT")
1061-
: t("HCM_NEXT")
1047+
? null
1048+
: noAction === "false"
1049+
? null
1050+
: filteredConfig?.[0]?.form?.[0]?.isLast === true
1051+
? t("HCM_SUBMIT")
1052+
: t("HCM_NEXT")
10621053
}
10631054
/>
10641055
{actionBar === "true" && (
@@ -1101,6 +1092,6 @@ const SetupCampaign = ({ hierarchyType, hierarchyData }) => {
11011092
)}
11021093
</React.Fragment>
11031094
);
1104-
};
1095+
});
11051096

11061097
export default SetupCampaign;

‎health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/index.js

+28-15
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import React, { useEffect } from "react";
1+
import React, { useEffect, useMemo } from "react";
22
import { Switch, useLocation } from "react-router-dom";
33
import { useTranslation } from "react-i18next";
44
import { PrivateRoute, AppContainer, BreadCrumb } from "@egovernments/digit-ui-react-components";
55
import SetupCampaign from "./SetupCampaign";
66
import ConfigureApp from "./ConfigureApp";
7-
import { CreateChecklist} from "./CreateChecklist";
7+
import { CreateChecklist } from "./CreateChecklist";
88
import SearchChecklist from "./SearchChecklist";
99
import UpdateCampaign from "./UpdateCampaign";
1010
import BoundaryRelationCreate from "./BoundaryRelationCreate";
@@ -24,7 +24,7 @@ import FetchFromMicroplan from "../../components/fetchFromMicroplan";
2424
*/
2525
const CampaignBreadCrumb = ({ location, defaultPath }) => {
2626
const { t } = useTranslation();
27-
27+
2828
const search = useLocation().search;
2929
const pathVar = location.pathname.replace(defaultPath + "/", "").split("?")?.[0];
3030
const crumbs = [
@@ -36,22 +36,30 @@ const CampaignBreadCrumb = ({ location, defaultPath }) => {
3636
{
3737
path: pathVar === "my-campaign" ? "" : `/${window?.contextPath}/employee/campaign/my-campaign`,
3838
content: t("MY_CAMPAIGN"),
39-
show: pathVar === "my-campaign" || pathVar === "checklist/search" || pathVar === "checklist/create" || pathVar === "checklist/view" || pathVar === "checklist/update" || pathVar === "update-dates-boundary" ? true : false,
39+
show:
40+
pathVar === "my-campaign" ||
41+
pathVar === "checklist/search" ||
42+
pathVar === "checklist/create" ||
43+
pathVar === "checklist/view" ||
44+
pathVar === "checklist/update" ||
45+
pathVar === "update-dates-boundary"
46+
? true
47+
: false,
4048
},
4149
{
4250
path: pathVar === "setup-campaign" ? "" : `/${window?.contextPath}/employee/campaign/setup-campaign`,
4351
content: t("CREATE_NEW_CAMPAIGN"),
44-
show: pathVar === "setup-campaign" ? true : false,
52+
show: pathVar === "setup-campaign" ? true : false,
4553
},
4654
{
4755
path: pathVar === "update-dates-boundary" ? "" : `/${window?.contextPath}/employee/campaign/my-campaign`,
4856
content: t("UPDATE_DATE_CHANGE"),
49-
show: pathVar === "update-dates-boundary" ? true: false,
57+
show: pathVar === "update-dates-boundary" ? true : false,
5058
},
5159
{
5260
path: "",
5361
content: t("ACTION_LABEL_CONFIGURE_APP"),
54-
show:pathVar === "checklist/search" ? true : false,
62+
show: pathVar === "checklist/search" ? true : false,
5563
},
5664
{
5765
path: "",
@@ -77,7 +85,7 @@ const CampaignBreadCrumb = ({ location, defaultPath }) => {
7785
path: pathVar === "update-campaign" ? "" : `/${window?.contextPath}/employee/campaign/update-campaign`,
7886
content: t("UPDATE_CAMPAIGN"),
7987
show: pathVar.match("update-campaign") ? true : false,
80-
}
88+
},
8189
];
8290

8391
return <BreadCrumb className="campaign-breadcrumb" crumbs={crumbs} spanStyle={{ maxWidth: "min-content" }} />;
@@ -91,10 +99,12 @@ const CampaignBreadCrumb = ({ location, defaultPath }) => {
9199
* the `Switch` component, there are several `PrivateRoute` components with different paths and
92100
* corresponding components such as `UploadBoundaryData`, `CycleConfiguration`, `DeliveryRule`, `
93101
*/
94-
const App = ({ path, BOUNDARY_HIERARCHY_TYPE, hierarchyData }) => {
102+
const App = ({ path, BOUNDARY_HIERARCHY_TYPE: BoundaryHierarchy, hierarchyData: propsHierarchyData }) => {
95103
const location = useLocation();
96104
const userId = Digit.UserService.getUser().info.uuid;
97-
const microplanStatus = "RESOURCE_ESTIMATIONS_APPROVED"
105+
const BOUNDARY_HIERARCHY_TYPE = useMemo(() => BoundaryHierarchy, [BoundaryHierarchy]);
106+
const hierarchyData = useMemo(() => propsHierarchyData, [propsHierarchyData]);
107+
const microplanStatus = "RESOURCE_ESTIMATIONS_APPROVED";
98108
const UploadBoundaryData = Digit?.ComponentRegistryService?.getComponent("UploadBoundaryData");
99109
const CycleConfiguration = Digit?.ComponentRegistryService?.getComponent("CycleConfiguration");
100110
const DeliveryRule = Digit?.ComponentRegistryService?.getComponent("DeliveryRule");
@@ -135,7 +145,10 @@ const App = ({ path, BOUNDARY_HIERARCHY_TYPE, hierarchyData }) => {
135145
<PrivateRoute path={`${path}/create-campaign/upload-boundary-data`} component={() => <UploadBoundaryData />} />
136146
<PrivateRoute path={`${path}/create-campaign/cycle-configure`} component={() => <CycleConfiguration />} />
137147
<PrivateRoute path={`${path}/create-campaign/delivery-details`} component={() => <DeliveryRule />} />
138-
<PrivateRoute path={`${path}/setup-campaign`} component={() => <SetupCampaign hierarchyType={BOUNDARY_HIERARCHY_TYPE} hierarchyData={hierarchyData}/>} />
148+
<PrivateRoute
149+
path={`${path}/setup-campaign`}
150+
component={() => <SetupCampaign hierarchyType={BOUNDARY_HIERARCHY_TYPE} hierarchyData={hierarchyData} />}
151+
/>
139152
<PrivateRoute path={`${path}/my-campaign`} component={() => <MyCampaign />} />
140153
<PrivateRoute path={`${path}/fetch-from-microplan`} component={() => <FetchFromMicroplan />} />
141154
<PrivateRoute path={`${path}/preview`} component={() => <CampaignSummary />} />
@@ -147,10 +160,10 @@ const App = ({ path, BOUNDARY_HIERARCHY_TYPE, hierarchyData }) => {
147160
<PrivateRoute path={`${path}/checklist/search`} component={() => <SearchChecklist />} />
148161
<PrivateRoute path={`${path}/checklist/view`} component={() => <ViewChecklist />} />
149162
<PrivateRoute path={`${path}/checklist/update`} component={() => <UpdateChecklist />} />
150-
<PrivateRoute path={`${path}/boundary/home`} component={()=> <BoundaryHome />} />
151-
<PrivateRoute path={`${path}/boundary/create`} component={()=> <BoundaryRelationCreate />} />
152-
<PrivateRoute path={`${path}/boundary/view-all-hierarchy`} component={()=> <ViewBoundary />} />
153-
<PrivateRoute path={`${path}/boundary/data`} component={()=> <ViewHierarchy />} />
163+
<PrivateRoute path={`${path}/boundary/home`} component={() => <BoundaryHome />} />
164+
<PrivateRoute path={`${path}/boundary/create`} component={() => <BoundaryRelationCreate />} />
165+
<PrivateRoute path={`${path}/boundary/view-all-hierarchy`} component={() => <ViewBoundary />} />
166+
<PrivateRoute path={`${path}/boundary/data`} component={() => <ViewHierarchy />} />
154167
<PrivateRoute path={`${path}/update-campaign`} component={() => <UpdateCampaign />} />
155168
<PrivateRoute path={`${path}/setup-from-microplan`} component={() => <ApprovedMicroplans />} />
156169
<PrivateRoute path={`${path}/app-configuration`} component={() => <AppConfigurationWrapper />} />

0 commit comments

Comments
 (0)