chore: incremental

globalfund · Aug 19, 2024 · cc2c57e · cc2c57e
1 parent 33182a9
commit cc2c57e
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 83 deletions.
diff --git a/src/app/components/breadcrumbs/data.ts b/src/app/components/breadcrumbs/data.ts
diff --git a/src/app/components/breadcrumbs/index.tsx b/src/app/components/breadcrumbs/index.tsx
diff --git a/src/app/pages/datasets/access-to-funding/index.tsx b/src/app/pages/datasets/access-to-funding/index.tsx
@@ -680,7 +680,6 @@ export const AccessToFundingPage: React.FC = () => {
       const blockChartType = location.hash.slice(1).split("|")[1];
       if (blockId && blockChartType && blockId === "allocation") {
         setDropdownSelected(decodeURIComponent(blockChartType));
-        break;
       }
     }
   }, [location.hash]);
@@ -692,7 +691,6 @@ export const AccessToFundingPage: React.FC = () => {
       filterGroups={filterGroups}
       appliedFilters={pageAppliedFilters}
       handleResetFilters={handleResetFilters}
-      breadcrumbs={[{ label: "Datasets" }, { label: "Access to Funding" }]}
     >
       <Box width="100%" marginTop="50px">
         <Box>

diff --git a/src/app/pages/datasets/annual-results/index.tsx b/src/app/pages/datasets/annual-results/index.tsx
@@ -380,7 +380,6 @@ export const AnnualResultsPage: React.FC = () => {
       handleResetFilters={handleResetFilters}
       toolbarRightContent={toolbarRightContent}
       subtitle="Indicator results reported as part of annual Results Report."
-      breadcrumbs={[{ label: "Datasets" }, { label: "Annual Results" }]}
     >
       <Box width="100%" marginTop="50px">
         <HomeResultsStats stats={dataStats} loading={loadingResults} />

diff --git a/src/app/pages/datasets/common/page/DatasetPage.stories.tsx b/src/app/pages/datasets/common/page/DatasetPage.stories.tsx
@@ -27,6 +27,5 @@ export const Primary: StoryType = {
     children: <div>Content</div>,
     subtitle:
       "Government, private sector, non-government and other donor pledges and contributions.",
-    breadcrumbs: [{ label: "Datasets" }, { label: "Resource Mobilization" }],
   },
 };
diff --git a/src/app/pages/datasets/common/page/data.tsx b/src/app/pages/datasets/common/page/data.tsx
@@ -1,14 +1,12 @@
 import React from "react";
 import Typography from "@mui/material/Typography";
-import { BreadcrumbItem } from "app/components/breadcrumbs/data";
 import { FilterGroupModel } from "app/components/filters/list/data";
 
 export interface DatasetPageProps {
   title: string;
   subtitle: string;
   appliedFilters: string[];
   children: React.ReactNode;
-  breadcrumbs: BreadcrumbItem[];
   handleResetFilters: () => void;
   filterGroups: FilterGroupModel[];
   toolbarRightContent?: React.ReactNode;

diff --git a/src/app/pages/datasets/grant-implementation/index.tsx b/src/app/pages/datasets/grant-implementation/index.tsx
@@ -1491,8 +1491,8 @@ export const GrantImplementationPage: React.FC = () => {
         location.search.includes("principalRecipientSubTypes=")) ||
       chart3AppliedFiltersData.principalRecipientSubTypes.length > 0
     ) {
-      filterString += `${
-        filterString.length > 0 ? "&" : ""
+      value += `${
+        value.length > 0 ? "&" : ""
       }principalRecipientSubTypes=${encodeURIComponent(
         uniq([
           ...appliedFiltersData.principalRecipientSubTypes,
@@ -1533,8 +1533,8 @@ export const GrantImplementationPage: React.FC = () => {
       // const yearTo = financialMetricsCycleDropdownSelected
       //   .replace(/ /g, "")
       //   .split("-")[1];
-      // filterString += `${
-      //   filterString.length > 0 ? "&" : ""
+      // value += `${
+      //   value.length > 0 ? "&" : ""
       // }years=${encodeURIComponent(year)}&yearsTo=${encodeURIComponent(yearTo)}`;
       value += `${
         value.length > 0 ? "&" : ""
@@ -1593,8 +1593,8 @@ export const GrantImplementationPage: React.FC = () => {
         location.search.includes("principalRecipientSubTypes=")) ||
       chart4AppliedFiltersData.principalRecipientSubTypes.length > 0
     ) {
-      filterString += `${
-        filterString.length > 0 ? "&" : ""
+      value += `${
+        value.length > 0 ? "&" : ""
       }principalRecipientSubTypes=${encodeURIComponent(
         uniq([
           ...appliedFiltersData.principalRecipientSubTypes,
@@ -1720,16 +1720,16 @@ export const GrantImplementationPage: React.FC = () => {
   }, [chart2FilterString, componentsGrouping, geographyGrouping]);
 
   React.useEffect(() => {
-    let filterString = chart2FilterString;
+    let value = chart2FilterString;
     if (budgetTableDataType === dropdownItemsBudgetsTableDataTypes[1].value) {
-      filterString += `${filterString.length > 0 ? "&" : ""}var2=${
+      value += `${value.length > 0 ? "&" : ""}var2=${
         componentsGrouping === componentsGroupingOptions[0].value
           ? "activityAreaGroup"
           : "activityArea"
       }`;
     }
     fetchBudgetTable({
-      filterString,
+      filterString: value,
       routeParams: {
         componentField:
           componentsGrouping === componentsGroupingOptions[0].value
@@ -1912,7 +1912,6 @@ export const GrantImplementationPage: React.FC = () => {
       appliedFilters={pageAppliedFilters}
       handleResetFilters={handleResetFilters}
       subtitle="See the disbursements, budgets and expenditures datasets and relating insights."
-      breadcrumbs={[{ label: "Datasets" }, { label: "Financial Insights" }]}
       toolbarRightContent={toolbarRightContent}
     >
       <Box width="100%" marginTop="50px">

diff --git a/src/app/pages/datasets/resource-mobilization/index.tsx b/src/app/pages/datasets/resource-mobilization/index.tsx
@@ -354,7 +354,6 @@ export const ResourceMobilizationPage: React.FC = () => {
       filterGroups={filterGroups}
       appliedFilters={pageAppliedFilters}
       handleResetFilters={handleResetFilters}
-      breadcrumbs={[{ label: "Datasets" }, { label: "Resource Mobilization" }]}
       subtitle="Government, private sector, non-government and other donor pledges and contributions"
     >
       <Box width="100%" marginTop="50px">