Some optimizations

egovernments · Nov 29, 2024 · 301f631 · 301f631
1 parent 7956071
commit 301f631
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 13 deletions.
diff --git a/...-ui/web/micro-ui-internals/packages/modules/microplan/src/components/GenericKpiFromDSS.js b/...-ui/web/micro-ui-internals/packages/modules/microplan/src/components/GenericKpiFromDSS.js
@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next';
 import useKpiDssSearch from '../hooks/useKpiDssSearch';
 
 const GenericKpiFromDSS = (props) => {
-    const { module, planId, campaignType, config, planEmployee={}, boundariesForKpi=[] } = props;
+    const { module, planId, campaignType, planEmployee={}, boundariesForKpi=[] } = props;
 
     // Create a copy of the boundariesForKpi array
     const localBoundariesForKpi = [...boundariesForKpi];
@@ -30,7 +30,6 @@ const GenericKpiFromDSS = (props) => {
         module,
         planId,
         campaignType,
-        config,
         boundariesForKpi: localBoundariesForKpi
     });
 

diff --git a/.../web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchDssChartV2.js b/.../web/micro-ui-internals/packages/modules/microplan/src/hooks/services/searchDssChartV2.js
@@ -2,9 +2,9 @@ const searchDssChartV2 = async (module, planId, config, campaignType, boundaries
     try {
 
         // Validate inputs
-        if (!module || !planId || !campaignType) {
-            console.error("Invalid module or planId or campaignType provided");
-            throw new Error("Invalid module or planId or campaignType provided");
+        if (!module || !planId || !campaignType || !config) {
+            console.error("Any of module, planId, campaignType or config is invalid for searchDssChartV2");
+            throw new Error("Any of module, planId, campaignType or config is invalid for searchDssChartV2");
         }
 
         // Find the configuration for the provided module

diff --git a/...h/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/useKpiDssSearch.js b/...h/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/useKpiDssSearch.js
@@ -1,12 +1,14 @@
 import { useQuery } from "react-query";
+import { useMyContext } from "../utils/context";
 import searchDssChartV2 from "./services/searchDssChartV2";
 
 const useKpiDssSearch = (moduleAndPlanConfig) => {
+    const { state } = useMyContext();
     const module = moduleAndPlanConfig?.module;
     const planId = moduleAndPlanConfig?.planId;
     const campaignType = moduleAndPlanConfig?.campaignType;
     const boundaries = moduleAndPlanConfig?.boundariesForKpi;
-    const config = moduleAndPlanConfig?.config;
+    const config = state?.DssKpiConfigs;;
     const queryString = `dss-${module}-${planId}_${campaignType}_${JSON.stringify(boundaries)}`;
     const { isLoading, data, isFetching, refetch } = useQuery([queryString, "/dashboard-analytics/dashboard/getChartV2"], () => searchDssChartV2(module, planId, config, campaignType, boundaries), {
         ...{},

diff --git a/...ro-ui-internals/packages/modules/microplan/src/pages/employee/FacilityCatchmentMapping.js b/...ro-ui-internals/packages/modules/microplan/src/pages/employee/FacilityCatchmentMapping.js
@@ -7,12 +7,10 @@ import { Loader, ActionBar, Button } from "@egovernments/digit-ui-components";
 import WorkflowCommentPopUp from "../../components/WorkflowCommentPopUp";
 import ConfirmationPopUp from "../../components/ConfirmationPopUp";
 import GenericKpiFromDSS from "../../components/GenericKpiFromDSS";
-import { useMyContext } from "../../utils/context";
 
 const FacilityCatchmentMapping = () => {
   const [actionBarPopUp, setactionBarPopUp] = useState(false);
   const { t } = useTranslation();
-  const { state } = useMyContext();
   const history = useHistory();
   const url = Digit.Hooks.useQueryParams();
   const tenantId = Digit.ULBService.getCurrentTenantId();
@@ -200,7 +198,7 @@ const FacilityCatchmentMapping = () => {
 
       </div>
       <div style={{ marginBottom: "1rem" }}>
-        <GenericKpiFromDSS module="MICROPLAN-FACILITY" planId={url?.microplanId} config={state?.DssKpiConfigs} campaignType={campaignObject?.projectType} planEmployee={planEmployee} />
+        <GenericKpiFromDSS module="MICROPLAN-FACILITY" planId={url?.microplanId} campaignType={campaignObject?.projectType} planEmployee={planEmployee} />
       </div>
       <div className="inbox-search-wrapper">
         <InboxSearchComposer

diff --git a/...icro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js b/...icro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js
@@ -819,7 +819,7 @@ const PlanInbox = () => {
           <div>{`${t("LOGGED_IN_AS")} ${userName} - ${t(userRole)}`}</div>
         </div>
       </div>
-      <GenericKpiFromDSS module="MICROPLAN" config={state?.DssKpiConfigs} planId={microplanId} campaignType={campaignObject?.projectType} planEmployee={planEmployee} boundariesForKpi={defaultBoundaries}/>
+      <GenericKpiFromDSS module="MICROPLAN"  planId={microplanId} campaignType={campaignObject?.projectType} planEmployee={planEmployee} boundariesForKpi={defaultBoundaries}/>
       <SearchJurisdiction
         boundaries={boundaries}
         defaultHierarchy={defaultHierarchy}

diff --git a/...micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PopInbox.js b/...micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PopInbox.js
@@ -9,11 +9,9 @@ import WorkflowCommentPopUp from "../../components/WorkflowCommentPopUp";
 import { Header } from "@egovernments/digit-ui-react-components";
 import ConfirmationPopUp from "../../components/ConfirmationPopUp";
 import GenericKpiFromDSS from "../../components/GenericKpiFromDSS";
-import { useMyContext } from "../../utils/context";
 
 const PopInbox = () => {
   const { t } = useTranslation();
-  const { state } = useMyContext();
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const history = useHistory();
   const url = Digit.Hooks.useQueryParams();
@@ -617,7 +615,7 @@ const PopInbox = () => {
 
         </div>
       </div>
-      <GenericKpiFromDSS module="CENSUS" planId={microplanId} config={state?.DssKpiConfigs} campaignType={campaignObject?.projectType} planEmployee={planEmployee} boundariesForKpi={defaultBoundaries}/>
+      <GenericKpiFromDSS module="CENSUS" planId={microplanId} campaignType={campaignObject?.projectType} planEmployee={planEmployee} boundariesForKpi={defaultBoundaries}/>
       <SearchJurisdiction
         boundaries={boundaries}
         defaultHierarchy={defaultHierarchy}