feat: update budget lines filter to allow filter by fiscal year

HHS · Feb 25, 2025 · bbcc631 · bbcc631
1 parent dd8a726
commit bbcc631
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/frontend/src/components/Portfolios/PortfolioSpending/PortfolioSpending.jsx b/frontend/src/components/Portfolios/PortfolioSpending/PortfolioSpending.jsx
@@ -4,6 +4,7 @@ import { useLazyGetBudgetLineItemQuery } from "../../../api/opsAPI";
 import { getTypesCounts } from "../../../pages/cans/detail/Can.helpers";
 import CANBudgetLineTable from "../../CANs/CANBudgetLineTable";
 import PortfolioBudgetSummary from "../PortfolioBudgetSummary";
+import DebugCode from "../../DebugCode";
 
 const PortfolioSpending = () => {
     const [budgetLineItems, setBudgetLineItems] = React.useState([]);
@@ -20,11 +21,12 @@ const PortfolioSpending = () => {
         });
 
         try {
-            const budgetLineItems = await Promise.all(promises);
-            setBudgetLineItems(budgetLineItems);
-            const newBudgetLineTypesCount = getTypesCounts(budgetLineItems ?? [], "status");
+            const budgetLineItemsData = await Promise.all(promises);
+            const filteredBudgetLineItems = budgetLineItemsData.filter((item) => item.fiscal_year === fiscalYear);
+            setBudgetLineItems(filteredBudgetLineItems);
+            const newBudgetLineTypesCount = getTypesCounts(filteredBudgetLineItems ?? [], "status");
             setBudgetLineTypesCount(newBudgetLineTypesCount);
-            const budgetLinesAgreements = budgetLineItems?.map((item) => item.agreement) ?? [];
+            const budgetLinesAgreements = filteredBudgetLineItems?.map((item) => item.agreement) ?? [];
             const uniqueBudgetLineAgreements =
                 budgetLinesAgreements?.reduce((acc, item) => {
                     if (!acc.some((existingItem) => existingItem.name === item.name)) {
@@ -80,6 +82,7 @@ const PortfolioSpending = () => {
                 totalFunding={portfolioFunding?.total_funding.amount}
                 tableType="portfolio"
             />
+            <DebugCode title="spending tab" data={{budgetLineItems}} />
         </>
     );
 };

diff --git a/frontend/src/pages/portfolios/detail/PortfolioDetail.jsx b/frontend/src/pages/portfolios/detail/PortfolioDetail.jsx
@@ -13,6 +13,7 @@ import FiscalYear from "../../../components/UI/FiscalYear/FiscalYear";
 import Hero from "../../../components/UI/Hero/Hero";
 import { getTypesCounts } from "../../cans/detail/Can.helpers";
 import { setSelectedFiscalYear } from "./portfolioSlice";
+import DebugCode from "../../../components/DebugCode";
 
 const PortfolioDetail = () => {
     /**
@@ -25,7 +26,7 @@ const PortfolioDetail = () => {
     const { data: portfolio, isLoading: portfolioIsLoading } = useGetPortfolioByIdQuery(portfolioId);
     const { data: portfolioCans, isLoading: portfolioCansLoading } = useGetPortfolioCansByIdQuery({
         portfolioId,
-        year: fiscalYear,
+        // year: fiscalYear, // disabling fiscalYear for now pending completion of #3531
         refetchOnMountOrArgChange: true
     });
     const { data: portfolioFunding, isLoading: portfolioFundingLoading } = useGetPortfolioFundingSummaryQuery({
@@ -89,6 +90,7 @@ const PortfolioDetail = () => {
                     }}
                 />
             </div>
+            <DebugCode data={{ budgetLineIds, portfolioCans }} />
         </App>
     );
 };