diff --git a/frontend/cypress/e2e/canList.cy.js b/frontend/cypress/e2e/canList.cy.js index c947491673..0444ce86c5 100644 --- a/frontend/cypress/e2e/canList.cy.js +++ b/frontend/cypress/e2e/canList.cy.js @@ -4,6 +4,7 @@ import { terminalLog, testLogin } from "./utils"; beforeEach(() => { testLogin("division-director"); cy.visit("/cans").wait(1000); + cy.get("#fiscal-year-select").select("2023"); }); afterEach(() => { @@ -29,10 +30,9 @@ describe("CAN List", () => { }); it("should correctly filter all cans or my cans", () => { - cy.visit("/cans/"); cy.get("tbody").children().should("have.length.greaterThan", 2); - cy.visit("/cans/?filter=my-cans"); + cy.get("#fiscal-year-select").select("2023"); cy.get("tbody").children().should("have.length", 1); }); diff --git a/frontend/src/components/CANs/CANBudgetSummary/CANBudgetSummary.jsx b/frontend/src/components/CANs/CANBudgetSummary/CANBudgetSummary.jsx index 7ea39313cc..56f38933ce 100644 --- a/frontend/src/components/CANs/CANBudgetSummary/CANBudgetSummary.jsx +++ b/frontend/src/components/CANs/CANBudgetSummary/CANBudgetSummary.jsx @@ -6,13 +6,14 @@ import { useEffect } from "react"; import styles from "./CANBudgetSummary.module.css"; import constants from "../../../constants"; import { getPendingFunds } from "./util"; -import FiscalYear from "../../UI/FiscalYear/FiscalYear"; +import FiscalYear from "../../UI/FiscalYear"; const CANBudgetSummary = () => { const dispatch = useDispatch(); const canFiscalYear = useSelector((state) => state.canDetail.canFiscalYearObj); const pendingFunds = useSelector((state) => state.canDetail.pendingFunds); const selectedFiscalYear = useSelector((state) => state.canDetail.selectedFiscalYear); + const fiscalYear = Number(selectedFiscalYear.value); const urlPathParams = useParams(); const canFiscalYearId = parseInt(urlPathParams.id); @@ -54,7 +55,7 @@ const CANBudgetSummary = () => {
No CANs found
; } @@ -36,16 +47,16 @@ const CANTable = ({ cans }) => { name={can.display_name ?? "TBD"} nickname={can.nick_name ?? "TBD"} portfolio={can.portfolio.abbreviation} - fiscalYear={can.funding_budgets[0]?.fiscal_year ?? "TBD"} + fiscalYear={findFundingBudgetFYByFiscalYear(can, fiscalYear)} activePeriod={can.active_period ?? 0} obligateBy={formatObligateBy(can.obligate_by)} transfer={can.funding_details.method_of_transfer ?? "TBD"} - fyBudget={can.funding_budgets[0]?.budget ?? 0} + fyBudget={findFundingBudgetBudgetByFiscalYear(can, fiscalYear)} /> ))}