+ {
on a quarterly and/or monthly basis to USAspending.gov. The table below
shows information about the status and content of these submissions. It will
be updated as agencies publish/certify new submissions or
- republish/recertify existing submissions. For more information about the data in this table, visit the Data Sources and Methodology page.
+ republish/recertify existing submissions. For more information about the data in this table, visit the Data Sources and Methodology page.
diff --git a/src/js/components/aboutTheData/AgencyDetailsPage.jsx b/src/js/components/aboutTheData/AgencyDetailsPage.jsx
index 1ed647cedb..7e4cfd5bf5 100644
--- a/src/js/components/aboutTheData/AgencyDetailsPage.jsx
+++ b/src/js/components/aboutTheData/AgencyDetailsPage.jsx
@@ -7,8 +7,8 @@ import { useParams, Link } from 'react-router-dom';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { LoadingMessage, ErrorMessage, PageHeader } from 'data-transparency-ui';
-import { agencyPageMetaTags } from 'helpers/metaTagHelper';
-import { fetchAgencyOverview } from 'helpers/agencyV2Helper';
+import { aboutTheDataAgencyDetails } from 'helpers/metaTagHelper';
+import { fetchAgencyOverview } from 'apis/agencyV2APIs';
import { getAgencyDetailEmail } from 'helpers/aboutTheDataHelper';
import { getBaseUrl, handleShareOptionClick } from 'helpers/socialShare';
import { getStickyBreakPointForSidebar } from 'helpers/stickyHeaderHelper';
@@ -86,7 +86,7 @@ const AgencyDetailsPage = () => {
return (
-
+ {agencyOverview && }
{
Back to All Agencies
diff --git a/src/js/components/aboutTheData/DataSourcesAndMethodologiesPage.jsx b/src/js/components/aboutTheData/DataSourcesAndMethodologiesPage.jsx
index f7d17154e1..014927520c 100644
--- a/src/js/components/aboutTheData/DataSourcesAndMethodologiesPage.jsx
+++ b/src/js/components/aboutTheData/DataSourcesAndMethodologiesPage.jsx
@@ -150,7 +150,7 @@ const DataSourcesAndMethodologiesPage = () => {
Calculation:
- The percentages are based on the total budgetary resources for all TAS submitted in File A that matches the Agency Identifier (AID). This can be replicated with total_budgetary_resources field in the Account Balances (File A) file in Custom Account Download.
+ The percentages are based on the total budgetary resources for all TAS submitted in File A that matches the Agency Identifier (AID) divided by the total budgetary resources reported in GTAS (Line 1910 of the SF-133).
- Please note that columns for the first and second period do not show data for agencies that are only required to report quarterly data.
-
-
- The columns for the last period of each quarter (i.e., P03, P06, P09, P12) do show data for all agencies. Fiscal years start in October (Period 1), and starting in FY 2022 (i.e., October 2021), all agencies will report monthly data to USAspending.gov.
-
-
- Cells with a “Not Certified” badge signal that an agency uploaded data but it is still under review.
-
-
- ),
+ 'Updates by Fiscal Year': (
The columns for the last period of each quarter (i.e., P03, P06, P09, P12) do show data for all agencies. Fiscal years start in October (Period 1), and starting in FY 2022 (i.e., October 2021), all agencies will report monthly data to USAspending.gov.
),
'Statistics by Submission Period': (
<>
@@ -41,7 +29,7 @@ export const columnTooltips = {
If you are viewing the last period in a quarter, you may notice agencies that report quarterly do not show data, or have a later report date than the agencies reporting monthly. This is because the quarterly submission deadline is slightly later than the monthly deadline. Such timing differences will disappear in October 2021 when all agencies transition to monthly reporting.
- If you see a “Not Certified” badge, it means that an agency uploaded data but it is still under review.
+ "--" indicates that an agency has not submitted data for this period.
Note that financing TAS, while present in GTAS, are completely excluded from this calculation, as they do not involve budgetary spending and therefore are not appropriate for publication on USAspending.
+
+ "--" indicates that an agency has not submitted data for this period.
+
+ This is an agency's total budgetary resources for the fiscal year through the selected period as a portion of all agency budgetary resources to-date.
+
+
+ "--" indicates that an agency has not submitted data for this period.
+
+
+ ),
+ percentOfBudgetPublications: (
+ <>
+
+ This is an agency's total budgetary resources for the most recent period of the selected fiscal year as a portion of all agency budgetary resources to-date.
+
+
+ "--" indicates that an agency has not submitted data for this period.
+
+
)
};
diff --git a/src/js/components/agencyV2/AgencyPage.jsx b/src/js/components/agencyV2/AgencyPage.jsx
index 5e2598d8cd..0c59660097 100644
--- a/src/js/components/agencyV2/AgencyPage.jsx
+++ b/src/js/components/agencyV2/AgencyPage.jsx
@@ -23,7 +23,7 @@ import Sidebar from 'components/sharedComponents/sidebar/Sidebar';
import Footer from 'containers/Footer';
import AccountSpending from 'components/agencyV2/accountSpending/AccountSpending';
import AgencySection from './AgencySection';
-import AgencyOverview from './AgencyOverview';
+import AgencyOverview from './overview/AgencyOverview';
require('pages/agencyV2/index.scss');
@@ -55,7 +55,7 @@ export const AgencyProfileV2 = ({
{
name: 'overview',
display: 'Overview',
- component:
+ component:
},
{
name: 'budget-category',
diff --git a/src/js/components/agencyV2/accountSpending/AccountSpending.jsx b/src/js/components/agencyV2/accountSpending/AccountSpending.jsx
index 2379ef7b12..d019569eae 100644
--- a/src/js/components/agencyV2/accountSpending/AccountSpending.jsx
+++ b/src/js/components/agencyV2/accountSpending/AccountSpending.jsx
@@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
import { useDispatch } from 'react-redux';
import { setBudgetaryResources } from 'redux/actions/agencyV2/agencyV2Actions';
-import { fetchBudgetaryResources } from 'helpers/agencyV2Helper';
+import { fetchBudgetaryResources } from 'apis/agencyV2APIs';
import BaseAgencyBudgetaryResources from 'models/v2/agency/BaseAgencyBudgetaryResources';
import CountTabContainer from 'containers/agencyV2/accountSpending/CountTabContainer';
diff --git a/src/js/components/agencyV2/AgencyOverview.jsx b/src/js/components/agencyV2/overview/AgencyOverview.jsx
similarity index 83%
rename from src/js/components/agencyV2/AgencyOverview.jsx
rename to src/js/components/agencyV2/overview/AgencyOverview.jsx
index ab225d4809..11c8fb569c 100644
--- a/src/js/components/agencyV2/AgencyOverview.jsx
+++ b/src/js/components/agencyV2/overview/AgencyOverview.jsx
@@ -13,12 +13,14 @@ import { LoadingMessage } from 'data-transparency-ui';
import { mediumScreen } from 'dataMapping/shared/mobileBreakpoints';
import ExternalLink from 'components/sharedComponents/ExternalLink';
import ReadMore from 'components/sharedComponents/ReadMore';
+import FySummary from './FySummary';
const propTypes = {
- isLoading: PropTypes.bool
+ isLoading: PropTypes.bool,
+ fy: PropTypes.string
};
-const AgencyOverview = ({ isLoading }) => {
+const AgencyOverview = ({ isLoading, fy }) => {
const {
name,
logo,
@@ -110,19 +112,25 @@ const AgencyOverview = ({ isLoading }) => {
);
}
- return isLoading ? :
- (
-
+);
+
+VisualizationSection.propTypes = propTypes;
+export default VisualizationSection;
diff --git a/src/js/components/agencyV2/visualizations/totalObligationsOverTime/TotalObligationsOverTimeVisualization.jsx b/src/js/components/agencyV2/visualizations/totalObligationsOverTime/TotalObligationsOverTimeVisualization.jsx
new file mode 100644
index 0000000000..2b43e8e9d5
--- /dev/null
+++ b/src/js/components/agencyV2/visualizations/totalObligationsOverTime/TotalObligationsOverTimeVisualization.jsx
@@ -0,0 +1,128 @@
+/**
+ * TotalObligationsOverTimeVisualization.jsx
+ * Created by Jonathan Hill 04/08/21
+ */
+
+import React, { useEffect, useState } from 'react';
+import PropTypes from 'prop-types';
+import { scaleLinear } from 'd3-scale';
+import { getYear } from 'date-fns';
+
+import { getYDomain, getMilliseconds } from 'helpers/agencyV2/visualizations/TotalObligationsOverTimeVisualizationHelper';
+import { xLabelHeightPlusPadding, yOffsetForPathStrokeWidth, defaultPadding } from 'dataMapping/agencyV2/visualizations/totalObligationsOverTime';
+import Paths from 'components/agencyV2/visualizations/totalObligationsOverTime/paths/Paths';
+import Axis from './axis/Axis';
+
+const propTypes = {
+ height: PropTypes.number,
+ width: PropTypes.number,
+ padding: PropTypes.shape({
+ left: PropTypes.number,
+ right: PropTypes.number,
+ bottom: PropTypes.number,
+ top: PropTypes.number
+ }),
+ data: PropTypes.arrayOf(PropTypes.shape({
+ period: PropTypes.number,
+ obligated: PropTypes.number
+ })),
+ fy: PropTypes.string
+};
+
+const TotalObligationsOverTimeVisualization = ({
+ height = 168,
+ width = 0,
+ padding = defaultPadding,
+ data = [],
+ fy = getYear(new Date(Date.now()))
+}) => {
+ const [xDomain, setXDomain] = useState([]);
+ const [yDomain, setYDomain] = useState([]);
+ const [xScale, setXScale] = useState(null);
+ const [xScaleForPath, setXScaleForPath] = useState(null);
+ const [yScale, setYScale] = useState(null);
+ const [yScaleForPath, setYScaleForPath] = useState(null);
+ const [xTicks, setXTicks] = useState([]);
+ const [dataWithFirstCoordinate, setDataWithFirstCoordinate] = useState([]);
+ // x domain
+ useEffect(() => {
+ // start of the domain is October 1st of the prior selected fiscal year midnight local time
+ const start = new Date(parseInt(fy, 10) - 1, 9, 1);
+ // end of the domain is September 30th midnight local time
+ const end = new Date(`${fy}`, 8, 30);
+ setXDomain([getMilliseconds(start), getMilliseconds(end)]);
+ }, [fy]);
+ // add first data point as start of graph
+ useEffect(() => {
+ if (xDomain.length && data.length) {
+ setDataWithFirstCoordinate([{ endDate: xDomain[0], obligated: 0 }, ...data]);
+ }
+ }, [xDomain, data]);
+ // y domain
+ useEffect(() => setYDomain(getYDomain(data)), [data]);
+ /**
+ * set x scale
+ * - The range max value removes padding left and right since that is padding for the
+ * x-axis labels overflowing outside of the graph based on the mock
+ * and not going to be part of the graphable width.
+ */
+ useEffect(() => {
+ setXScale(() => scaleLinear().domain(xDomain).range([0, width - padding.left - padding.right]));
+ setXScaleForPath(() => scaleLinear().domain(xDomain).range([0, width - padding.left - padding.right]));
+ },
+ [xDomain, width]);
+ /**
+ * set y scale
+ * - The range max value removes padding top and bottom since that is padding for the top based on the mock and
+ * bottom x-axis labels and not going to be part of the graphable width.
+ */
+ useEffect(() => {
+ setYScale(() => scaleLinear().domain(yDomain).range([0, height - padding.top - padding.bottom]));
+ setYScaleForPath(() => scaleLinear().domain(yDomain).range([1, height - padding.top - padding.bottom - yOffsetForPathStrokeWidth]));
+ }, [yDomain, data]);
+
+ // set x ticks
+ useEffect(() => {
+ if (xScale) {
+ setXTicks([
+ {
+ x: isNaN(xScale(xDomain[0])) ? 0 : xScale(xDomain[0]) + padding.left,
+ y: (height - padding.bottom - padding.top) + xLabelHeightPlusPadding,
+ label: `Oct FY${fy.substring(2)}`
+ },
+ {
+ x: isNaN(xScale(xDomain[1])) ? 0 : xScale(xDomain[1]) + padding.left,
+ y: (height - padding.bottom - padding.top) + xLabelHeightPlusPadding,
+ label: `Sep FY${fy.substring(2)}`
+ }
+ ]);
+ }
+ }, [xScale, xDomain]);
+
+ return (
+
+ );
+};
+
+TotalObligationsOverTimeVisualization.propTypes = propTypes;
+export default TotalObligationsOverTimeVisualization;
diff --git a/src/js/components/agencyV2/visualizations/totalObligationsOverTime/axis/Axis.jsx b/src/js/components/agencyV2/visualizations/totalObligationsOverTime/axis/Axis.jsx
new file mode 100644
index 0000000000..4f407cc1ed
--- /dev/null
+++ b/src/js/components/agencyV2/visualizations/totalObligationsOverTime/axis/Axis.jsx
@@ -0,0 +1,53 @@
+/**
+ * Axis.jsx
+ * Created by Jonathan Hill 04/09/21
+ */
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import XAxis from './XAxis';
+import YAxis from './YAxis';
+
+const propTypes = {
+ padding: PropTypes.shape({
+ right: PropTypes.number,
+ left: PropTypes.number,
+ top: PropTypes.number,
+ bottom: PropTypes.number
+ }),
+ width: PropTypes.number,
+ height: PropTypes.number,
+ xTicks: PropTypes.array,
+ yTicks: PropTypes.array
+};
+
+const Axis = ({
+ padding = {
+ right: 0,
+ left: 0,
+ top: 0,
+ bottom: 0
+ },
+ width = 0,
+ height = 0,
+ xTicks = [],
+ yTicks = []
+}) => (
+
+
+
+
+);
+
+Axis.propTypes = propTypes;
+export default Axis;
diff --git a/src/js/components/agencyV2/visualizations/totalObligationsOverTime/axis/AxisLabel.jsx b/src/js/components/agencyV2/visualizations/totalObligationsOverTime/axis/AxisLabel.jsx
new file mode 100644
index 0000000000..9f40dc3303
--- /dev/null
+++ b/src/js/components/agencyV2/visualizations/totalObligationsOverTime/axis/AxisLabel.jsx
@@ -0,0 +1,32 @@
+/**
+ * AxisLabel.jsx
+ * Created by Jonathan Hill 04/09/21
+ */
+
+import React from 'react';
+import PropTypes from 'prop-types';
+
+const propTypes = {
+ axis: PropTypes.string,
+ x: PropTypes.number,
+ y: PropTypes.number,
+ label: PropTypes.string,
+ index: PropTypes.number
+};
+
+const AxisLabel = ({
+ axis = 'x',
+ x = 0,
+ y = 0,
+ label = ''
+}) => (
+
+ {label}
+
+);
+
+AxisLabel.propTypes = propTypes;
+export default AxisLabel;
diff --git a/src/js/components/agencyV2/visualizations/totalObligationsOverTime/axis/XAxis.jsx b/src/js/components/agencyV2/visualizations/totalObligationsOverTime/axis/XAxis.jsx
new file mode 100644
index 0000000000..4ea7eab26b
--- /dev/null
+++ b/src/js/components/agencyV2/visualizations/totalObligationsOverTime/axis/XAxis.jsx
@@ -0,0 +1,55 @@
+/**
+ * XAxis.jsx
+ * Created by Jonathan Hill 04/09/21
+ */
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import AxisLabel from './AxisLabel';
+
+const propTypes = {
+ className: PropTypes.string,
+ ticks: PropTypes.arrayOf(PropTypes.shape({
+ label: PropTypes.string,
+ x: PropTypes.number,
+ y: PropTypes.number
+ })),
+ x1: PropTypes.number,
+ x2: PropTypes.number,
+ y1: PropTypes.number,
+ y2: PropTypes.number
+};
+
+const XAxis = ({
+ className,
+ ticks,
+ x1,
+ x2,
+ y1,
+ y2
+}) => (
+
+ The X-Axis
+ The X-Axis consisting of a horizontal line and labels
+
+
+ The X-Axis Labels
+ {
+ ticks.map((tick, i) => (
+
+ ))
+ }
+
+
+);
+
+XAxis.propTypes = propTypes;
+export default XAxis;
diff --git a/src/js/components/agencyV2/visualizations/totalObligationsOverTime/axis/YAxis.jsx b/src/js/components/agencyV2/visualizations/totalObligationsOverTime/axis/YAxis.jsx
new file mode 100644
index 0000000000..d26bd2e93f
--- /dev/null
+++ b/src/js/components/agencyV2/visualizations/totalObligationsOverTime/axis/YAxis.jsx
@@ -0,0 +1,55 @@
+/**
+ * YAxis.jsx
+ * Created by Jonathan Hill 04/09/21
+ */
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import AxisLabel from './AxisLabel';
+
+const propTypes = {
+ className: PropTypes.string,
+ ticks: PropTypes.arrayOf(PropTypes.shape({
+ label: PropTypes.string,
+ x: PropTypes.number,
+ y: PropTypes.number
+ })),
+ x1: PropTypes.number,
+ x2: PropTypes.number,
+ y1: PropTypes.number,
+ y2: PropTypes.number
+};
+
+const YAxis = ({
+ className,
+ ticks,
+ x1,
+ x2,
+ y1,
+ y2
+}) => (
+
+ The Y-Axis
+ The Y-Axis consisting of a vertical line and labels
+
+
+ {
+ ticks.map((tick, i) => (
+
+ ))
+ }
+
+
+);
+
+YAxis.propTypes = propTypes;
+export default YAxis;
diff --git a/src/js/components/agencyV2/visualizations/totalObligationsOverTime/paths/AreaPath.jsx b/src/js/components/agencyV2/visualizations/totalObligationsOverTime/paths/AreaPath.jsx
new file mode 100644
index 0000000000..f252a7105b
--- /dev/null
+++ b/src/js/components/agencyV2/visualizations/totalObligationsOverTime/paths/AreaPath.jsx
@@ -0,0 +1,63 @@
+/**
+ * AreaPath.jsx
+ * Created by Jonathan Hill 04/12/21
+ */
+
+import React, { useEffect, useState } from 'react';
+import PropTypes from 'prop-types';
+
+const propTypes = {
+ classname: PropTypes.string,
+ data: PropTypes.array,
+ xScale: PropTypes.func,
+ yScale: PropTypes.func,
+ xProperty: PropTypes.string,
+ yProperty: PropTypes.string,
+ height: PropTypes.number,
+ width: PropTypes.number,
+ padding: PropTypes.shape({
+ left: PropTypes.number,
+ right: PropTypes.number,
+ bottom: PropTypes.number,
+ top: PropTypes.number
+ })
+};
+
+const AreaPath = ({
+ classname = "",
+ data = [],
+ xScale = () => {},
+ yScale = () => {},
+ xProperty = 'endDate',
+ yProperty = 'obligated',
+ height = 0,
+ padding = {
+ top: 0,
+ bottom: 0,
+ right: 0,
+ left: 0
+ }
+}) => {
+ const [d, setD] = useState('');
+ useEffect(() => {
+ if (xScale && yScale) {
+ setD(data.reduce((path, currentItem, i, originalArray) => {
+ if (i === 0) {
+ const updatedPath = `${path}${xScale(currentItem[xProperty]) + padding.left},${height - yScale(currentItem[yProperty]) - padding.top - padding.bottom}`;
+ return updatedPath;
+ }
+ if (originalArray.length === i + 1) {
+ const updatedPath = `${path}L${xScale(currentItem[xProperty]) + padding.left},${height - yScale(currentItem[yProperty]) - padding.top - padding.bottom}L${xScale(currentItem[xProperty]) + padding.left},${height - padding.bottom - padding.top}Z`;
+ return updatedPath;
+ }
+ const updatedPath = `${path}L${xScale(currentItem[xProperty]) + padding.left},${height - yScale(currentItem[yProperty]) - padding.top - padding.bottom}`;
+ return updatedPath;
+ }, 'M'));
+ }
+ }, [data, xScale, yScale]);
+
+ return ();
+};
+
+AreaPath.propTypes = propTypes;
+export default AreaPath;
diff --git a/src/js/components/agencyV2/visualizations/totalObligationsOverTime/paths/Path.jsx b/src/js/components/agencyV2/visualizations/totalObligationsOverTime/paths/Path.jsx
new file mode 100644
index 0000000000..bd6510ae85
--- /dev/null
+++ b/src/js/components/agencyV2/visualizations/totalObligationsOverTime/paths/Path.jsx
@@ -0,0 +1,57 @@
+/**
+ * Path.jsx
+ * Created by Jonathan Hill 04/13/21
+ */
+
+import React, { useEffect, useState } from 'react';
+import PropTypes from 'prop-types';
+
+const propTypes = {
+ data: PropTypes.array,
+ xScale: PropTypes.func,
+ yScale: PropTypes.func,
+ xProperty: PropTypes.string,
+ yProperty: PropTypes.string,
+ height: PropTypes.number,
+ padding: PropTypes.shape({
+ left: PropTypes.number,
+ right: PropTypes.number,
+ bottom: PropTypes.number,
+ top: PropTypes.number
+ })
+};
+
+const Path = ({
+ data = [],
+ xScale = () => {},
+ yScale = () => {},
+ xProperty = 'endDate',
+ yProperty = 'obligated',
+ height = 0,
+ padding = {
+ top: 0,
+ bottom: 0,
+ right: 0,
+ left: 0
+ }
+}) => {
+ const [d, setD] = useState('');
+
+ useEffect(() => {
+ if (xScale && yScale) {
+ setD(data.reduce((path, currentItem, i) => {
+ if (i === 0) {
+ const updatedPath = `${path}${xScale(currentItem[xProperty]) + padding.left},${height - yScale(currentItem[yProperty]) - padding.top - padding.bottom}`;
+ return updatedPath;
+ }
+ const updatedPath = `${path}L${xScale(currentItem[xProperty]) + padding.left},${height - yScale(currentItem[yProperty]) - padding.top - padding.bottom}`;
+ return updatedPath;
+ }, 'M'));
+ }
+ }, [data, xScale, yScale]);
+
+ return ;
+};
+
+Path.propTypes = propTypes;
+export default Path;
diff --git a/src/js/components/agencyV2/visualizations/totalObligationsOverTime/paths/Paths.jsx b/src/js/components/agencyV2/visualizations/totalObligationsOverTime/paths/Paths.jsx
new file mode 100644
index 0000000000..a771a175bb
--- /dev/null
+++ b/src/js/components/agencyV2/visualizations/totalObligationsOverTime/paths/Paths.jsx
@@ -0,0 +1,62 @@
+/**
+ * Paths.jsx
+ * Created by Jonathan Hill 04/13/21
+ */
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import Path from './Path';
+import AreaPath from './AreaPath';
+
+const propTypes = {
+ data: PropTypes.array,
+ xScale: PropTypes.func,
+ xScaleForPath: PropTypes.func,
+ yScale: PropTypes.func,
+ yScaleForPath: PropTypes.func,
+ xProperty: PropTypes.string,
+ yProperty: PropTypes.string,
+ height: PropTypes.number,
+ width: PropTypes.number,
+ padding: PropTypes.shape({
+ left: PropTypes.number,
+ right: PropTypes.number,
+ bottom: PropTypes.number,
+ top: PropTypes.number
+ })
+};
+
+const Paths = ({
+ data = [],
+ xScale = () => {},
+ xScaleForPath = () => {},
+ yScale = () => {},
+ yScaleForPath = () => {},
+ height = 0,
+ width = 0,
+ padding = {
+ top: 0,
+ bottom: 0,
+ right: 0,
+ left: 0
+ }
+}) => (
+
+
+ a.endDate - b.endDate)}
+ xScale={xScaleForPath}
+ yScale={yScaleForPath}
+ height={height}
+ padding={padding} />
+
+);
+
+Paths.propTypes = propTypes;
+export default Paths;
diff --git a/src/js/components/bulkDownload/BulkDownloadPage.jsx b/src/js/components/bulkDownload/BulkDownloadPage.jsx
index ef51d57d0a..bf15e3641a 100644
--- a/src/js/components/bulkDownload/BulkDownloadPage.jsx
+++ b/src/js/components/bulkDownload/BulkDownloadPage.jsx
@@ -11,7 +11,6 @@ import {
downloadArchivePageMetaTags,
downloadAwardPageMetaTags,
downloadAccountPageMetaTags,
- dataDictionaryPageMetaTags,
metadataDownloadPageMetaTags
} from 'helpers/metaTagHelper';
import { getStickyBreakPointForSidebar } from 'helpers/stickyHeaderHelper';
@@ -19,15 +18,12 @@ import { getStickyBreakPointForSidebar } from 'helpers/stickyHeaderHelper';
import Footer from 'containers/Footer';
import Header from 'containers/shared/HeaderContainer';
-
import MetaTags from 'components/sharedComponents/metaTags/MetaTags';
import MetadataDownload from 'components/bulkDownload/MetadataDownload';
import AwardDataContainer from 'containers/bulkDownload/awards/AwardDataContainer';
import AccountDataContainer from 'containers/bulkDownload/accounts/AccountDataContainer';
import AwardDataArchiveContainer from 'containers/bulkDownload/archive/AwardDataArchiveContainer';
-import BulkDownloadModalContainer from
- 'containers/bulkDownload/modal/BulkDownloadModalContainer';
-import DataDictionaryContainer from 'containers/bulkDownload/dictionary/DataDictionaryContainer';
+import BulkDownloadModalContainer from 'containers/bulkDownload/modal/BulkDownloadModalContainer';
import BulkDownloadSidebar from './sidebar/BulkDownloadSidebar';
const propTypes = {
@@ -39,7 +35,6 @@ const propTypes = {
};
const metaTagsByDataType = {
- data_dictionary: dataDictionaryPageMetaTags,
awards: downloadAwardPageMetaTags,
accounts: downloadAccountPageMetaTags,
award_data_archive: downloadArchivePageMetaTags,
@@ -106,11 +101,6 @@ export default class BulkDownloadPage extends React.Component {
clickedDownload={this.clickedDownload} />
);
}
- if (this.props.dataType === 'data_dictionary') {
- downloadDataContent = (
-
- );
- }
if (this.props.dataType === 'dataset_metadata') {
downloadDataContent = (
diff --git a/src/js/components/covid19/AwardQuestions.jsx b/src/js/components/covid19/AwardQuestions.jsx
index 5216efa290..31514b231b 100644
--- a/src/js/components/covid19/AwardQuestions.jsx
+++ b/src/js/components/covid19/AwardQuestions.jsx
@@ -15,8 +15,8 @@ const AwardQuestion = () => (
- Award spending is a subset of total spending and refers to money given through contracts or financial assistance to individuals, organizations, businesses, or state, local, or tribal governments.
- There are two main categories of awards: contracts and financial assistance. Loan spending is a type of financial assistance with two components: face value and subsidy cost.
+ Award spending is a subset of total spending and refers to money given through contracts or financial assistance to individuals, organizations, businesses, or state, local, or tribal governments.
+ There are two main categories of awards: contracts and financial assistance. Loan spending is a type of financial assistance with two components: face value and subsidy cost.
+ What COVID-19 spending does USAspending track?
+
+
+
+ Congress introduced and defined the concept of "covered funds" in the
+ CARES Act to make it clear which supplemental appropriation spending related to
+ the coronavirus response they wanted to be tracked, audited, and published for
+ transparency and accountability purposes. The act (as amended) defines covered funds
+ as follows:
+
+
+
+ (6) the term "covered funds" means any funds, including loans, that are made available in any form to any non-Federal entity, not including an individual, under—
+
+
+ (A) the Coronavirus Aid, Relief, and Economic Security Act (divisions A and B);
+
+
+ (B) the Coronavirus Preparedness and Response Supplemental Appropriations Act, 2020 (Public Law 116–123);
+
+
+ (C) the Families First Coronavirus Response Act (Public Law 116–127);
+
+
+ (D) the Paycheck Protection Program and Health Care Enhancement Act (Public Law 116–139); or
+
+
+ (E) divisions M and N of the Consolidated Appropriations Act, 2021;
+
+
+
+
+
+ Given the above, OMB centered their guidance in M-20-21 on the covered funds concept and elected to use
+ the DEFC as the means to track these covered funds in USAspending. New DEFC (see below) were issued to
+ track each component of covered funds, consistent with the original and continued purpose of the DEFC to
+ track Disaster, Emergency, and Wildfire Suppression spending under BBEDCA; covered funds that fell outside
+ of the BBEDCA categories (and the specific statutory language that triggers their use) were captured in a
+ Non-emergency DEFC, O.
+
+
+ One result of the covered funds concept and M-20-21 is that some spending that is clearly associated with the coronavirus response is not
+ tracked as ‘COVID-19 spending’ on our site. Examples include:
+
+
+
+ Any spending funded from general appropriations (rather than the supplemental appropriations that constitute "covered funds"). Examples
+ include any contracts with a National Interest Action code (NIA) of "P20C" (indicating a COVID-19 related purpose) that are funded by
+ general appropriations only and not ‘covered funds’ and that therefore do not appear on this page. The NIA is assigned by contracting officers
+ based on spending purpose and has nothing to do with funding; in contrast, the CARES Act and M-20-21 are concerned with tracking spending
+ from specific funding sources and not based on purpose alone. The NIA has no direct bearing on whether a contract is considered ‘COVID-19 spending’
+ on our site.
+
+
+ Any spending from entities that were appropriated covered funds from Congress but that do not report to USAspending under the DATA Act. M-20-21 was an expansion
+ of existing DATA Act reporting requirements but did not change the population of federal agencies or other entities subject to those requirements. Examples include
+ any component of the legislative and judicial branches (though GAO does voluntarily report).
+
+
+ Any spending from the Consolidated Appropriations Act, 2021 (PL 116-260) outside of Division M and N. Per the covered funds definition, Congress only
+ intended these two divisions to be tracked under the requirements of the CARES Act. An example that is arguably ‘coronavirus-related’; but is not
+ tracked and displayed as such on USAspending is the $635,000,000 appropriated in Division A "for necessary expenses for salary and related costs associated
+ with Agriculture Quarantine and Inspection Services [...] to offset the loss resulting from the coronavirus pandemic of quarantine and inspection fees."
+
In early 2020, the U.S. Congress appropriated funds in response to the COVID-19 pandemic. These funds were made possible through the Coronavirus Aid, Relief, and Economic Security (CARES) Act and other supplemental legislation.
- In response to guidance from the Office of Management and Budget (OMB), we updated our data model to capture the journey of COVID-19 dollars from appropriation to obligation and outlay by federal agencies.1 2 See who received funding, which agencies spent the funds, which programs were funded, and more.
+ In response to guidance from the Office of Management and Budget (OMB), we updated our data model to capture the journey of COVID-19 dollars from appropriation to obligation and outlay by federal agencies.1 2 See who received funding, which agencies spent the funds, which programs were funded, and more.
Visit our and sections to learn more about the underlying data and find resources about COVID-19 from other agencies.
diff --git a/src/js/components/covid19/assistanceListing/SpendingByCFDA.jsx b/src/js/components/covid19/assistanceListing/SpendingByCFDA.jsx
index 978c35a916..aaa861e098 100644
--- a/src/js/components/covid19/assistanceListing/SpendingByCFDA.jsx
+++ b/src/js/components/covid19/assistanceListing/SpendingByCFDA.jsx
@@ -127,7 +127,7 @@ const SpendingByCFDA = () => {
- Catalog of Federal Domestic Assistance (CFDA) Programs, also known as Assistance Listings, are programs that provide financial assistance to individuals, organizations, businesses, or state, local, or tribal governments. Some examples of Assistance Listings include the Supplemental Nutrition Assistance Program (SNAP) and the Coronavirus Relief Fund. All financial assistance awards must be associated with a CFDA Program, all of which must be explicitly authorized by law.
+ Catalog of Federal Domestic Assistance (CFDA) Programs, also known as Assistance Listings, are programs that provide financial assistance to individuals, organizations, businesses, or state, local, or tribal governments. Some examples of Assistance Listings include the Supplemental Nutrition Assistance Program (SNAP) and the Coronavirus Relief Fund. All financial assistance awards must be associated with a CFDA Program, all of which must be explicitly authorized by law.
- In this section, we present the total amount of COVID-19 funding divided into three high-level budget categories: the Agencies who are authorizing the funds to be spent; the Federal Accounts from which agencies authorize spending; and the Object Classes of the goods and services purchased with this funding.
+ In this section, we present the total amount of COVID-19 funding divided into three high-level budget categories: the Agencies who are authorizing the funds to be spent; the Federal Accounts from which agencies authorize spending; and the Object Classes of the goods and services purchased with this funding.
{kGlobalConstants.CARES_ACT_RELEASED_2 && (
diff --git a/src/js/components/bulkDownload/dictionary/DataDictionary.jsx b/src/js/components/dataDictionary/DataDictionary.jsx
similarity index 97%
rename from src/js/components/bulkDownload/dictionary/DataDictionary.jsx
rename to src/js/components/dataDictionary/DataDictionary.jsx
index 7d39ce1ab8..983a24f651 100644
--- a/src/js/components/bulkDownload/dictionary/DataDictionary.jsx
+++ b/src/js/components/dataDictionary/DataDictionary.jsx
@@ -9,7 +9,7 @@ import PropTypes from 'prop-types';
import Analytics from 'helpers/analytics/Analytics';
import { Spreadsheet } from 'components/sharedComponents/icons/Icons';
import DataDictionaryTable from './table/DataDictionaryTable';
-import DataDictionarySearchBar from "./DataDictionarySearchBar";
+import DataDictionarySearchBar from './DataDictionarySearchBar';
const propTypes = {
loading: PropTypes.bool,
diff --git a/src/js/components/dataDictionary/DataDictionaryPage.jsx b/src/js/components/dataDictionary/DataDictionaryPage.jsx
new file mode 100644
index 0000000000..e91c1c7cce
--- /dev/null
+++ b/src/js/components/dataDictionary/DataDictionaryPage.jsx
@@ -0,0 +1,35 @@
+/**
+ * DataDictionaryPage.jsx
+ * Created by Brett Varney 4/22/2021
+ */
+
+import React from 'react';
+import { PageHeader } from "data-transparency-ui";
+
+import { dataDictionaryPageMetaTags } from 'helpers/metaTagHelper';
+import MetaTags from 'components/sharedComponents/metaTags/MetaTags';
+import Header from 'containers/shared/HeaderContainer';
+import Footer from "containers/Footer";
+import { getStickyBreakPointForSidebar } from 'helpers/stickyHeaderHelper';
+
+import DataDictionaryContainer from 'containers/dataDictionary/DataDictionaryContainer';
+
+require('pages/dataDictionary/dataDictionaryPage.scss');
+
+export default class DataDictionaryPage extends React.Component {
+ render = () => (
+
+
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/src/js/components/bulkDownload/dictionary/DataDictionarySearchBar.jsx b/src/js/components/dataDictionary/DataDictionarySearchBar.jsx
similarity index 100%
rename from src/js/components/bulkDownload/dictionary/DataDictionarySearchBar.jsx
rename to src/js/components/dataDictionary/DataDictionarySearchBar.jsx
diff --git a/src/js/components/bulkDownload/dictionary/table/DataDictionaryTable.jsx b/src/js/components/dataDictionary/table/DataDictionaryTable.jsx
similarity index 100%
rename from src/js/components/bulkDownload/dictionary/table/DataDictionaryTable.jsx
rename to src/js/components/dataDictionary/table/DataDictionaryTable.jsx
diff --git a/src/js/components/bulkDownload/dictionary/table/DataDictionaryTableSorter.jsx b/src/js/components/dataDictionary/table/DataDictionaryTableSorter.jsx
similarity index 100%
rename from src/js/components/bulkDownload/dictionary/table/DataDictionaryTableSorter.jsx
rename to src/js/components/dataDictionary/table/DataDictionaryTableSorter.jsx
diff --git a/src/js/components/search/visualizations/geo/GeoVisualizationSection.jsx b/src/js/components/search/visualizations/geo/GeoVisualizationSection.jsx
index f6383b0d7d..5b06de327f 100644
--- a/src/js/components/search/visualizations/geo/GeoVisualizationSection.jsx
+++ b/src/js/components/search/visualizations/geo/GeoVisualizationSection.jsx
@@ -11,6 +11,8 @@ import MapboxGL from 'mapbox-gl/dist/mapbox-gl';
import ResultsTableErrorMessage from 'components/search/table/ResultsTableErrorMessage';
import LoadingSpinner from 'components/sharedComponents/LoadingSpinner';
import { ExclamationTriangle } from 'components/sharedComponents/icons/Icons';
+import Note from 'components/sharedComponents/Note';
+import { noteMessage } from 'dataMapping/search/geoVisualizationSection';
import GeoVisualizationScopeButton from './GeoVisualizationScopeButton';
import MapWrapper from './MapWrapper';
@@ -211,6 +213,7 @@ export default class GeoVisualizationSection extends React.Component {
{disclaimer}
{message}
+
);
}
diff --git a/src/js/components/sharedComponents/GlossaryLink.jsx b/src/js/components/sharedComponents/GlossaryLink.jsx
index e4677e1c2f..66c8343d45 100644
--- a/src/js/components/sharedComponents/GlossaryLink.jsx
+++ b/src/js/components/sharedComponents/GlossaryLink.jsx
@@ -5,19 +5,25 @@
import React from 'react';
import PropTypes from 'prop-types';
+import { Link, useLocation } from 'react-router-dom';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { Link } from 'react-router-dom';
+
+import { getNewUrlForGlossary } from 'helpers/glossaryHelper';
const propTypes = {
term: PropTypes.string.isRequired,
currentUrl: PropTypes.string.isRequired
};
-const GlossaryLink = ({ term, currentUrl }) => (
-
-
-
-);
+const GlossaryLink = ({ term }) => {
+ const { pathname, search } = useLocation();
+ const newUrl = getNewUrlForGlossary(pathname, `/?glossary=${term}`, search);
+ return (
+
+
+
+ );
+};
GlossaryLink.propTypes = propTypes;
export default GlossaryLink;
diff --git a/src/js/components/sharedComponents/header/NavBar.jsx b/src/js/components/sharedComponents/header/NavBar.jsx
index a74e1fb4a2..e52db1610c 100644
--- a/src/js/components/sharedComponents/header/NavBar.jsx
+++ b/src/js/components/sharedComponents/header/NavBar.jsx
@@ -6,14 +6,12 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { faEnvelope } from "@fortawesome/free-regular-svg-icons";
import Analytics from 'helpers/analytics/Analytics';
-import GlossaryButtonWrapperContainer from 'containers/glossary/GlossaryButtonWrapperContainer';
import { searchOptions, profileOptions, downloadGlobalNavigationOptions, resourceOptions } from 'dataMapping/navigation/menuOptions';
import EmailSignUp from 'components/homepage/EmailSignUp';
-import { DEV, QAT, STAGING } from '../../../GlobalConstants';
+import { DEV } from '../../../GlobalConstants';
import Dropdown from './Dropdown';
import MobileNav from './mobile/MobileNav';
-import NavBarGlossaryLink from './NavBarGlossaryLink';
const clickedHeaderLink = (route) => {
Analytics.event({
@@ -22,8 +20,6 @@ const clickedHeaderLink = (route) => {
});
};
-const isNotProd = (DEV || QAT || STAGING);
-
export default class NavBar extends React.Component {
constructor(props) {
super(props);
@@ -186,23 +182,18 @@ export default class NavBar extends React.Component {
className="full-menu__item"
role="menuitem">
- {isNotProd && (
-
-
-
- )}
- {!isNotProd && (
-
- )}
+
+
+
diff --git a/src/js/components/sharedComponents/header/mobile/MobileNav.jsx b/src/js/components/sharedComponents/header/mobile/MobileNav.jsx
index ccafd487f3..c6d6cf62bc 100644
--- a/src/js/components/sharedComponents/header/mobile/MobileNav.jsx
+++ b/src/js/components/sharedComponents/header/mobile/MobileNav.jsx
@@ -8,14 +8,10 @@ import PropTypes from 'prop-types';
import { withRouter, Link } from 'react-router-dom';
import Analytics from 'helpers/analytics/Analytics';
-import { DEV, QAT, STAGING } from 'GlobalConstants';
-
-import GlossaryButtonWrapperContainer from 'containers/glossary/GlossaryButtonWrapperContainer';
import { searchOptions, profileOptions, downloadGlobalNavigationOptions, resourceOptions } from 'dataMapping/navigation/menuOptions';
import MobileTop from './MobileTop';
-import MobileGlossaryButton from './MobileGlossaryButton';
import MobileDropdown from './MobileDropdown';
const clickedHeaderLink = (route) => {
@@ -30,8 +26,6 @@ const propTypes = {
location: PropTypes.object
};
-const isNotProd = (DEV || QAT || STAGING);
-
export class MobileNav extends React.Component {
constructor(props) {
super(props);
@@ -102,29 +96,19 @@ export class MobileNav extends React.Component {