Merge pull request #36 from globalfund/fix/partner-breadcrumb

fix: partners breadcrumb fix
globalfund · May 19, 2023 · 4d03c27 · 4d03c27
2 parents e559f86 + 2ec1ec1
commit 4d03c27
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 31 deletions.
diff --git a/src/app/hooks/useClearDataPathStepsOnDatasetChange.tsx b/src/app/hooks/useClearDataPathStepsOnDatasetChange.tsx
@@ -92,7 +92,6 @@ export function useClearDataPathStepsOnDatasetChange() {
         if (newDataPathSteps.length > 0) {
           newDataPathSteps[newDataPathSteps.length - 1].path =
             location.pathname;
-          console.log("newDataPathSteps", newDataPathSteps);
           setDataPathSteps(newDataPathSteps);
         }
       }

diff --git a/src/app/modules/partner-detail-module/index.tsx b/src/app/modules/partner-detail-module/index.tsx
@@ -96,22 +96,6 @@ export default function PartnerDetail() {
     return 0;
   }
 
-  useUpdateEffect(() => {
-    if (
-      partnerInfoData &&
-      partnerInfoData.partnerName &&
-      !dataPathSteps.find((item) => item.id === partnerInfoData.partnerName)
-    ) {
-      addDataPathSteps([
-        {
-          id: "partner",
-          name: partnerInfoData.partnerName,
-          path: location.pathname,
-        },
-      ]);
-    }
-  }, [partnerInfoData]);
-
   return (
     <div
       css={`
@@ -188,6 +172,7 @@ export default function PartnerDetail() {
               type="Signed"
               code={paramCode}
               toolboxOpen={openToolboxPanel}
+              partnerName={partnerInfoData.partnerName}
             />
           </Route>
           <Route path={`/partner/${params.code}/signed/table`}>

diff --git a/src/app/modules/viz-module/sub-modules/investments/disbursed/data-wrappers/partnerDetail.tsx b/src/app/modules/viz-module/sub-modules/investments/disbursed/data-wrappers/partnerDetail.tsx
@@ -13,6 +13,7 @@ interface Props {
   code: string;
   toolboxOpen?: boolean;
   type: "Disbursed" | "Signed" | "Commitment";
+  partnerName?: string;
 }
 
 export function PartnerDetailInvestmentsDisbursedWrapper(props: Props) {
@@ -114,6 +115,7 @@ export function PartnerDetailInvestmentsDisbursedWrapper(props: Props) {
       isDrilldownLoading={false}
       setVizSelected={setVizSelected}
       toolboxOpen={props.toolboxOpen}
+      partnerName={props.partnerName}
     />
   );
 }
diff --git a/src/app/modules/viz-module/sub-modules/investments/disbursed/index.tsx b/src/app/modules/viz-module/sub-modules/investments/disbursed/index.tsx
@@ -36,6 +36,7 @@ interface InvestmentsDisbursedModuleProps {
   toolboxOpen?: boolean;
   setOpenToolboxPanel?: (value: boolean) => void;
   codeParam?: string;
+  partnerName?: string;
   isGrantDetail?: boolean;
   isPartnerDetail?: boolean;
   isLocationDetail?: boolean;
@@ -122,27 +123,46 @@ export function InvestmentsDisbursedModule(
         ]);
       } else if (
         props.isPartnerDetail &&
-        !find(dataPathSteps, (step) => step.path.indexOf("/partner/") > -1)
+        !find(dataPathSteps, (step) => step.path.indexOf("/partner/") > -1) &&
+        props.partnerName
       ) {
         addDataPathSteps([
           {
             id: "partner",
-            name: props.codeParam || "Partner",
+            name: props.partnerName as string,
             path: `${history.location.pathname}${history.location.search}`,
           },
         ]);
       }
-      if (
-        dataPathSteps.length === 0 ||
-        !find(dataPathSteps, { name: `Grant Implementation: ${props.type}` })
-      ) {
-        addDataPathSteps([
-          {
-            id: uniqueId(),
-            name: `Grant Implementation: ${props.type}`,
-            path: `${history.location.pathname}${history.location.search}`,
-          },
-        ]);
+      if (props.isPartnerDetail) {
+        if (
+          props.partnerName &&
+          (dataPathSteps.length === 0 ||
+            !find(dataPathSteps, {
+              name: `Grant Implementation: ${props.type}`,
+            }))
+        ) {
+          addDataPathSteps([
+            {
+              id: uniqueId(),
+              name: `Grant Implementation: ${props.type}`,
+              path: `${history.location.pathname}${history.location.search}`,
+            },
+          ]);
+        }
+      } else {
+        if (
+          dataPathSteps.length === 0 ||
+          !find(dataPathSteps, { name: `Grant Implementation: ${props.type}` })
+        ) {
+          addDataPathSteps([
+            {
+              id: uniqueId(),
+              name: `Grant Implementation: ${props.type}`,
+              path: `${history.location.pathname}${history.location.search}`,
+            },
+          ]);
+        }
       }
     }
     if (props.vizLevel > 0 && props.vizSelected) {
@@ -158,7 +178,7 @@ export function InvestmentsDisbursedModule(
         },
       ]);
     }
-  }, [props.vizLevel, props.vizSelected]);
+  }, [props.vizLevel, props.vizSelected, props.partnerName]);
 
   const setToolboxPanelDisbursementsSliderMaxValue = useStoreActions(
     (store) => store.ToolBoxPanelDisbursementsSliderValues.setMax