diff --git a/src/layouts/explainer/sections/government-revenue/federal-revenue-trends-over-time/revenue-trends-line-chart/custom-tooltip/custom-tooltip.jsx b/src/layouts/explainer/sections/government-revenue/federal-revenue-trends-over-time/revenue-trends-line-chart/custom-tooltip/custom-tooltip.jsx index 9f9aba222..5841e489f 100644 --- a/src/layouts/explainer/sections/government-revenue/federal-revenue-trends-over-time/revenue-trends-line-chart/custom-tooltip/custom-tooltip.jsx +++ b/src/layouts/explainer/sections/government-revenue/federal-revenue-trends-over-time/revenue-trends-line-chart/custom-tooltip/custom-tooltip.jsx @@ -28,7 +28,7 @@ const CustomTooltip = (currentSlice, totalRevByYear) => { }; const determineIfZeroNeeded = value => { - if (value.toString().split('.')[1].length < 2) { + if (value.toString().split('.')[1]?.length < 2) { return `${value}0`; } return value; diff --git a/src/layouts/explainer/sections/government-revenue/federal-revenue-trends-over-time/revenue-trends-line-chart/revenue-trends-line-chart.jsx b/src/layouts/explainer/sections/government-revenue/federal-revenue-trends-over-time/revenue-trends-line-chart/revenue-trends-line-chart.jsx index 11e891d01..00f0fec2d 100644 --- a/src/layouts/explainer/sections/government-revenue/federal-revenue-trends-over-time/revenue-trends-line-chart/revenue-trends-line-chart.jsx +++ b/src/layouts/explainer/sections/government-revenue/federal-revenue-trends-over-time/revenue-trends-line-chart/revenue-trends-line-chart.jsx @@ -60,7 +60,7 @@ const RevenueTrendsLineChart = ({ width, cpiDataByYear }) => { }, [isLoading]); useEffect(() => { - const endPointURL = 'v1/accounting/mts/mts_table_9?filter=record_type_cd:eq:RSG,record_calendar_month:eq:09&sort=-record_date'; + const endPointURL = 'v1/accounting/mts/mts_table_9?filter=record_type_cd:eq:RSG,record_calendar_month:eq:09&page[size]=1000&sort=-record_date'; basicFetch(`${apiPrefix}${endPointURL}`).then(res => { if (res.data) { setLastChartYear(res.data[0].record_fiscal_year); @@ -303,7 +303,21 @@ const RevenueTrendsLineChart = ({ width, cpiDataByYear }) => { tickSize: 6, tickPadding: 5, tickRotation: 0, - tickValues: chartYears, + tickValues: (() => { + const start = 2016; + const end = lastChartYear; + const ticks = []; + for (let y = start; y <= end; y += 2) { + ticks.push(y); + } + const MAX_TICKS = 10; + + if (ticks.length <= MAX_TICKS) { + return ticks; + } + const ratio = Math.ceil(ticks.length / MAX_TICKS); + return ticks.filter((_, i) => i % ratio === 0); + })(), }} axisLeft={{ format: formatCurrency, diff --git a/src/layouts/explainer/sections/government-revenue/federal-revenue-trends-over-time/revenue-trends-over-time.spec.js b/src/layouts/explainer/sections/government-revenue/federal-revenue-trends-over-time/revenue-trends-over-time.spec.js index d618aa025..5e7a43da1 100644 --- a/src/layouts/explainer/sections/government-revenue/federal-revenue-trends-over-time/revenue-trends-over-time.spec.js +++ b/src/layouts/explainer/sections/government-revenue/federal-revenue-trends-over-time/revenue-trends-over-time.spec.js @@ -250,7 +250,7 @@ describe('revenue trends over time section', () => { { repeat: 1 } ); fetchMock.get( - `https://www.transparency.treasury.gov/services/api/fiscal_service/v1/accounting/mts/mts_table_9?filter=record_type_cd:eq:RSG,record_calendar_month:eq:09&sort=-record_date`, + `https://www.transparency.treasury.gov/services/api/fiscal_service/v1/accounting/mts/mts_table_9?filter=record_type_cd:eq:RSG,record_calendar_month:eq:09&page[size]=1000&sort=-record_date`, mockDataChart, { overwriteRoutes: true }, { repeat: 1 } diff --git a/static/data/CPI/cpi_100.csv b/static/data/CPI/cpi_100.csv index 11289aa9d..e282144d5 100644 --- a/static/data/CPI/cpi_100.csv +++ b/static/data/CPI/cpi_100.csv @@ -100,3 +100,7 @@ year,period,value 2019,09,256.759 2020,09,260.280 2021,09,274.310 +2022,09,296.421 +2023,09,307.374 +2024,09,314.851 +2025,09,324.368