@@ -117,8 +125,8 @@ const AboutTheDataPage = ({
types={[
{
internal: 'submissions',
- label: "Statistics by Reporting Period",
- labelContent:
+ label: "Statistics by Submission Period",
+ labelContent:
},
{
internal: 'publications',
@@ -150,14 +158,13 @@ const AboutTheDataPage = ({
mounted={!!showModal.length}
type={showModal}
className={modalClassNames[showModal]}
- title={modalTitles[showModal]}
+ title={modalTitles(modalData?.type)[showModal]}
agencyData={{
...modalData,
fiscalYear: parseInt(selectedFy, 10),
fiscalPeriod: parseInt(selectedPeriod?.id, 10) || 0
}}
- closeModal={closeModal}
- totalObligationsNotInGTAS={45999} />
+ closeModal={closeModal} />
+
@@ -95,7 +95,9 @@ const AgencyDetailsPage = () => {
<>
{agencyOverview.name}
@@ -132,10 +134,9 @@ const AgencyDetailsPage = () => {
mounted={!!showModal.length}
type={showModal}
className={modalClassNames[showModal]}
- title={modalTitles[showModal]}
+ title={modalTitles(modalData?.type)[showModal]}
agencyData={modalData}
- closeModal={closeModal}
- totalObligationsNotInGTAS={45999} />
+ closeModal={closeModal} />
diff --git a/src/js/components/aboutTheData/AgencyDownloadLinkCell.jsx b/src/js/components/aboutTheData/AgencyDownloadLinkCell.jsx
index b62334ed1a..0a72478ffe 100644
--- a/src/js/components/aboutTheData/AgencyDownloadLinkCell.jsx
+++ b/src/js/components/aboutTheData/AgencyDownloadLinkCell.jsx
@@ -1,22 +1,21 @@
import React from 'react';
import PropTypes from 'prop-types';
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import kGlobalConstants from 'GlobalConstants';
const propTypes = {
file: PropTypes.string
};
-const AgencyDownloadLinkCell = ({ file }) => (
+const AgencyDownloadLinkCell = ({ file }) => (file ? (
+ aria-label="Download agency comments">
-);
+) : '--');
AgencyDownloadLinkCell.propTypes = propTypes;
export default AgencyDownloadLinkCell;
diff --git a/src/js/components/aboutTheData/CellWithModal.jsx b/src/js/components/aboutTheData/CellWithModal.jsx
index 630301c3ef..ce9de5d080 100644
--- a/src/js/components/aboutTheData/CellWithModal.jsx
+++ b/src/js/components/aboutTheData/CellWithModal.jsx
@@ -8,9 +8,9 @@ import PropTypes, { oneOfType, oneOf } from 'prop-types';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
const propTypes = {
- data: oneOfType([PropTypes.string, PropTypes.object]),
+ data: oneOfType([PropTypes.string, PropTypes.object, PropTypes.number]),
openModal: PropTypes.func.isRequired,
- modalType: oneOf(['publicationDates', 'missingAccountBalance', 'reportingDifferences']).isRequired,
+ modalType: oneOf(['publicationDates', 'missingAccountBalance', 'reportingDifferences', 'unlinkedData']).isRequired,
agencyData: PropTypes.object
};
@@ -23,7 +23,7 @@ const CellWithModal = ({
{data}
-
+
diff --git a/src/js/components/aboutTheData/DrilldownCell.jsx b/src/js/components/aboutTheData/DrilldownCell.jsx
index 4c29329ace..00c803c1d3 100644
--- a/src/js/components/aboutTheData/DrilldownCell.jsx
+++ b/src/js/components/aboutTheData/DrilldownCell.jsx
@@ -25,7 +25,10 @@ const DrilldownCell = ({
{searchTerm ? replaceString(data, searchTerm, 'matched-str') : data}
-
diff --git a/src/js/components/aboutTheData/TimeFilters.jsx b/src/js/components/aboutTheData/TimeFilters.jsx
index 63af93ffba..5bfd09052a 100644
--- a/src/js/components/aboutTheData/TimeFilters.jsx
+++ b/src/js/components/aboutTheData/TimeFilters.jsx
@@ -118,7 +118,7 @@ const TimePeriodFilters = ({
}, [submissionPeriods, urlFy, urlPeriod, latestPeriod, latestFy]);
const generatePeriodDropdown = (fy, periods) => (
- parsePeriods(fy, periods)
+ parsePeriods(fy, periods.toJS())
.map((p) => ({
...p,
component: p.component,
diff --git a/src/js/components/aboutTheData/dataMapping/modals/modalContentMapping.jsx b/src/js/components/aboutTheData/dataMapping/modals/modalContentMapping.jsx
index 4cd777f08d..013f9bd0d1 100644
--- a/src/js/components/aboutTheData/dataMapping/modals/modalContentMapping.jsx
+++ b/src/js/components/aboutTheData/dataMapping/modals/modalContentMapping.jsx
@@ -2,9 +2,11 @@ import React from 'react';
import PublicationDatesContainer from 'containers/aboutTheData/modals/PublicationDatesContainer';
import MissingAccountBalanceContainer from 'containers/aboutTheData/modals/MissingAccountBalanceContainer';
import ReportingDifferencesContainer from 'containers/aboutTheData/modals/ReportingDifferencesContainer';
+import UnlinkedDataContainer from 'containers/aboutTheData/modals/UnlinkedDataContainer';
export const modalContentMapping = (data) => ({
publicationDates: (
),
missingAccountBalance: (
),
- reportingDifferences: (
)
+ reportingDifferences: (
),
+ unlinkedData: (
)
});
diff --git a/src/js/components/aboutTheData/dataMapping/tooltipContentMapping.jsx b/src/js/components/aboutTheData/dataMapping/tooltipContentMapping.jsx
index 3617f0a039..fc1756d5e3 100644
--- a/src/js/components/aboutTheData/dataMapping/tooltipContentMapping.jsx
+++ b/src/js/components/aboutTheData/dataMapping/tooltipContentMapping.jsx
@@ -45,7 +45,7 @@ export const columnTooltips = {
),
- 'Number of TASs Missing in Account Balance Data': (
+ 'Number of TASs Missing from Account Balance Data': (
<>
Agencies submit account balance data grouped by Treasury Account Symbols (TAS) in two ways: 1) to USAspending.gov in File A and 2) to GTAS, a separate system that is the authoritative source of governmentwide TAS account balances. This column shows the number of TAS that are in GTAS but missing in USAspending.gov data.
@@ -97,7 +97,7 @@ export const columnTooltips = {
),
- 'Agency Disclosures': (
+ 'Agency Comments': (
Agency Assurance Statements are optional and provided by agencies at the time they submit their data to USAspending.gov in the required dataset formats (File A, B, C, D1, and D2). For more information about the DATA Act reporting flow, visit https://fiscal.treasury.gov/files/data-transparency/daims-information-flow-diagram.pdf
diff --git a/src/js/components/award/Award.jsx b/src/js/components/award/Award.jsx
index e2231349ec..3c193947eb 100644
--- a/src/js/components/award/Award.jsx
+++ b/src/js/components/award/Award.jsx
@@ -34,7 +34,8 @@ const propTypes = {
isDownloadPending: PropTypes.bool,
isSubAwardIdClicked: PropTypes.bool,
subAwardIdClicked: PropTypes.func,
- isLoading: PropTypes.bool
+ isLoading: PropTypes.bool,
+ defCodes: PropTypes.array
};
const awardSections = [
@@ -108,7 +109,8 @@ export default class Award extends React.Component {
counts={{ subawardCount: overview.subawardCount }}
jumpToSection={this.jumpToSection}
isSubAwardIdClicked={this.props.isSubAwardIdClicked}
- subAwardIdClicked={this.props.subAwardIdClicked} />
+ subAwardIdClicked={this.props.subAwardIdClicked}
+ defCodes={this.props.defCodes} />
);
}
else if (overview.category === 'idv') {
@@ -117,7 +119,8 @@ export default class Award extends React.Component {
awardId={awardId}
overview={overview}
details={this.props.award.idvDetails}
- jumpToSection={this.jumpToSection} />
+ jumpToSection={this.jumpToSection}
+ defCodes={this.props.defCodes} />
);
}
else if (this.props.noAward) {
@@ -136,7 +139,8 @@ export default class Award extends React.Component {
overview={overview}
jumpToSection={this.jumpToSection}
isSubAwardIdClicked={this.props.isSubAwardIdClicked}
- subAwardIdClicked={this.props.subAwardIdClicked} />
+ subAwardIdClicked={this.props.subAwardIdClicked}
+ defCodes={this.props.defCodes} />
);
}
diff --git a/src/js/components/award/contract/ContractContent.jsx b/src/js/components/award/contract/ContractContent.jsx
index db70cffb4d..387e7dced8 100644
--- a/src/js/components/award/contract/ContractContent.jsx
+++ b/src/js/components/award/contract/ContractContent.jsx
@@ -26,7 +26,8 @@ const propTypes = {
jumpToSection: PropTypes.func,
counts: PropTypes.object,
isSubAwardIdClicked: PropTypes.bool,
- subAwardIdClicked: PropTypes.func
+ subAwardIdClicked: PropTypes.func,
+ defCodes: PropTypes.array
};
const ContractContent = ({
@@ -35,7 +36,8 @@ const ContractContent = ({
jumpToSection,
counts,
isSubAwardIdClicked,
- subAwardIdClicked
+ subAwardIdClicked,
+ defCodes
}) => {
const [activeTab, setActiveTab] = useState('transaction');
@@ -49,7 +51,7 @@ const ContractContent = ({
};
const awardAmountData = Object.create(BaseAwardAmounts);
- awardAmountData.populate(overview, overview.category);
+ awardAmountData.populate(overview, overview.category, defCodes);
const jumpToTransactionHistoryTable = () => {
setActiveTab('transaction');
diff --git a/src/js/components/award/financialAssistance/FinancialAssistanceContent.jsx b/src/js/components/award/financialAssistance/FinancialAssistanceContent.jsx
index bb739f6fb7..f59cf0a4a8 100644
--- a/src/js/components/award/financialAssistance/FinancialAssistanceContent.jsx
+++ b/src/js/components/award/financialAssistance/FinancialAssistanceContent.jsx
@@ -26,7 +26,8 @@ const propTypes = {
overview: PropTypes.object,
jumpToSection: PropTypes.func,
isSubAwardIdClicked: PropTypes.bool,
- subAwardIdClicked: PropTypes.func
+ subAwardIdClicked: PropTypes.func,
+ defCodes: PropTypes.array
};
const FinancialAssistanceContent = ({
@@ -34,7 +35,8 @@ const FinancialAssistanceContent = ({
overview = { generatedId: '', fileC: { obligations: [] } },
jumpToSection,
isSubAwardIdClicked,
- subAwardIdClicked
+ subAwardIdClicked,
+ defCodes
}) => {
const [activeTab, setActiveTab] = useState("transaction");
const [CFDAOverviewLinkClicked, setCFDAOverviewLinkClicked] = useState(false);
@@ -70,7 +72,7 @@ const FinancialAssistanceContent = ({
});
const awardAmountData = Object.create(BaseAwardAmounts);
- awardAmountData.populate(overview, overview.category);
+ awardAmountData.populate(overview, overview.category, defCodes);
const [idLabel, identifier] = isAwardAggregate(overview.generatedId) ? ['URI', overview.uri] : ['FAIN', overview.fain];
const isGrant = overview.category === 'grant';
diff --git a/src/js/components/award/shared/awardAmountsSection/charts/SharedBarComponents.jsx b/src/js/components/award/shared/awardAmountsSection/charts/SharedBarComponents.jsx
index 6059e8a9a8..d4bda42263 100644
--- a/src/js/components/award/shared/awardAmountsSection/charts/SharedBarComponents.jsx
+++ b/src/js/components/award/shared/awardAmountsSection/charts/SharedBarComponents.jsx
@@ -21,7 +21,7 @@ const BarValue = ({
onKeyPress={onEnter}
onMouseMove={onEnter}
onMouseEnter={onEnter}
- onMousedown={onEnter}
+ onMouseDown={onEnter}
onMouseLeave={onLeave}
onClick={onEnter}>
diff --git a/src/js/components/homepage/Homepage.jsx b/src/js/components/homepage/Homepage.jsx
index c33d2512ab..dc950559a4 100644
--- a/src/js/components/homepage/Homepage.jsx
+++ b/src/js/components/homepage/Homepage.jsx
@@ -7,15 +7,12 @@ import React from 'react';
import * as MetaTagHelper from 'helpers/metaTagHelper';
import Footer from 'containers/Footer';
-import GlobalConstants from 'GlobalConstants';
-import CovidHighlights from 'containers/covid19/homepage/CovidHighlights';
+import CovidHighlights from 'containers/homepage/CovidHighlights';
import Header from 'containers/shared/HeaderContainer';
import GlobalModalContainer from 'containers/globalModal/GlobalModalContainer';
import MetaTags from '../sharedComponents/metaTags/MetaTags';
-
-import Hero from './hero/Hero';
import Features from './features/Features';
import Download from './download/Download';
import Community from './community/Community';
@@ -29,12 +26,7 @@ export default class Homepage extends React.Component {
- {GlobalConstants.CARES_ACT_RELEASED_2 && (
-
-
-
- {
- this.props.label === "Profiles" &&
- kGlobalConstants.CARES_ACT_RELEASED &&
-
-
+ return (
+
+
+
+ {containsNewNavItem &&
+
+
- }
- {this.props.label}
-
-
-
-
}
+ {label}
+
+
+ {items.map((item, index) => (
+
- );
- }
-}
+
+ );
+};
Dropdown.propTypes = propTypes;
+
+export default Dropdown;
+
diff --git a/src/js/components/sharedComponents/header/DropdownItem.jsx b/src/js/components/sharedComponents/header/DropdownItem.jsx
index ed75cac05a..7ad97a1716 100644
--- a/src/js/components/sharedComponents/header/DropdownItem.jsx
+++ b/src/js/components/sharedComponents/header/DropdownItem.jsx
@@ -5,10 +5,11 @@
import React from 'react';
import PropTypes from 'prop-types';
-import { Link } from 'react-router-dom';
+import { Link, useLocation } from 'react-router-dom';
import Analytics from 'helpers/analytics/Analytics';
import * as redirectHelper from 'helpers/redirectHelper';
+import { getNewUrlForGlossary } from 'helpers/glossaryHelper';
import DropdownComingSoon from './DropdownComingSoon';
@@ -16,9 +17,11 @@ const propTypes = {
url: PropTypes.string,
label: PropTypes.node,
enabled: PropTypes.bool,
- newTab: PropTypes.bool,
+ shouldOpenNewTab: PropTypes.bool,
+ isNewTab: PropTypes.bool,
isFirst: PropTypes.bool,
- externalLink: PropTypes.bool
+ externalLink: PropTypes.bool,
+ appendToExistingUrl: PropTypes.bool
};
const clickedHeaderLink = (route) => {
@@ -28,84 +31,104 @@ const clickedHeaderLink = (route) => {
});
};
-export default class DropdownItem extends React.Component {
- constructor(props) {
- super(props);
-
- this.redirect = this.redirect.bind(this);
+const DropdownItem = ({
+ url = '',
+ label,
+ enabled = true,
+ shouldOpenNewTab = false,
+ externalLink = false,
+ isFirst = false,
+ isNewTab = false,
+ appendToExistingUrl = false
+}) => {
+ const { pathname, search } = useLocation();
+ const newUrl = appendToExistingUrl
+ ? getNewUrlForGlossary(pathname, url, search)
+ : url;
+
+ const handleClick = () => {
+ redirectHelper.showRedirectModal(newUrl);
+ clickedHeaderLink(newUrl);
+ };
+
+ let className = 'nav-children__link_disabled';
+ let comingSoon = (
+
+
+ );
+
+ const newLabel = isNewTab && enabled
+ ? (
+ <>
+ {label}
+
NEW
+
+ )
+ : null;
+
+ if (enabled) {
+ className = '';
+ comingSoon = null;
}
- redirect() {
- redirectHelper.showRedirectModal(this.props.url);
- clickedHeaderLink(`${this.props.url}`);
+ const newTabProps = {};
+ if (shouldOpenNewTab) {
+ newTabProps.target = '_blank';
+ newTabProps.rel = 'noopener noreferrer';
}
- render() {
- let className = 'nav-children__link_disabled';
- let comingSoon = (
-
-
+ let link = (
+
+ {!newLabel && label}
+ {newLabel}
+ {comingSoon}
+
+ );
+
+ if (enabled && externalLink) {
+ // Trigger the redirect modal
+ link = (
+
+ {!newLabel && label}
+ {newLabel}
+
);
+ }
- if (this.props.enabled) {
- className = '';
- comingSoon = null;
- }
-
- const newTabProps = {};
- if (this.props.newTab) {
- newTabProps.target = '_blank';
- newTabProps.rel = 'noopener noreferrer';
- }
-
- let link = (
-
- {this.props.label}
+ {!newLabel && label}
+ {newLabel}
{comingSoon}
-
+
);
+ }
- if (this.props.enabled && this.props.externalLink) {
- // Trigger the redirect modal
- link = (
-
- {this.props.label}
-
- );
- }
-
- if (this.props.url.includes('http')) {
- link = (
-
- {this.props.label}
- {comingSoon}
-
- );
- }
-
- let firstClass = '';
- if (this.props.isFirst) {
- firstClass = 'nav-children__list-separator_hidden';
- }
-
- return (
-
-
- );
+ let firstClass = '';
+ if (isFirst) {
+ firstClass = 'nav-children__list-separator_hidden';
}
-}
+
+ return (
+
+
+ );
+};
DropdownItem.propTypes = propTypes;
+
+export default DropdownItem;
diff --git a/src/js/components/sharedComponents/header/NavBar.jsx b/src/js/components/sharedComponents/header/NavBar.jsx
index 9055d5442b..27ea1339d4 100644
--- a/src/js/components/sharedComponents/header/NavBar.jsx
+++ b/src/js/components/sharedComponents/header/NavBar.jsx
@@ -7,13 +7,13 @@ import { faEnvelope } from "@fortawesome/free-regular-svg-icons";
import Analytics from 'helpers/analytics/Analytics';
import GlossaryButtonWrapperContainer from 'containers/glossary/GlossaryButtonWrapperContainer';
-import { searchOptions, profileOptions, downloadOptions } from 'dataMapping/navigation/menuOptions';
+import { searchOptions, profileOptions, downloadGlobalNavigationOptions, resourceOptions } from 'dataMapping/navigation/menuOptions';
import EmailSignUp from 'components/homepage/EmailSignUp';
-import { DEV } from '../../../GlobalConstants';
-import NavBarGlossaryLink from './NavBarGlossaryLink';
+import { DEV, QAT } from '../../../GlobalConstants';
import Dropdown from './Dropdown';
import MobileNav from './mobile/MobileNav';
+import NavBarGlossaryLink from './NavBarGlossaryLink';
const clickedHeaderLink = (route) => {
Analytics.event({
@@ -22,6 +22,8 @@ const clickedHeaderLink = (route) => {
});
};
+const isDevOrQat = (DEV || QAT);
+
export default class NavBar extends React.Component {
constructor(props) {
super(props);
@@ -184,15 +186,23 @@ export default class NavBar extends React.Component {
className="full-menu__item"
role="menuitem">
+ title={isDevOrQat ? "Download" : "Download Center"}
+ label={isDevOrQat ? "Download" : "Download Center"}
+ items={downloadGlobalNavigationOptions} />
-
+ {isDevOrQat && (
+
+
+ )}
+ {!isDevOrQat && (
-
+ )}
- {
- this.props.label === "Profiles" &&
- kGlobalConstants.CARES_ACT_RELEASED &&
+ {containsNewNavItem &&
diff --git a/src/js/components/sharedComponents/header/mobile/MobileDropdownItem.jsx b/src/js/components/sharedComponents/header/mobile/MobileDropdownItem.jsx
index d0bb502dbb..4d4429870b 100644
--- a/src/js/components/sharedComponents/header/mobile/MobileDropdownItem.jsx
+++ b/src/js/components/sharedComponents/header/mobile/MobileDropdownItem.jsx
@@ -5,9 +5,10 @@
import React from 'react';
import PropTypes from 'prop-types';
-import { Link } from 'react-router-dom';
+import { Link, useLocation } from 'react-router-dom';
import Analytics from 'helpers/analytics/Analytics';
+import { getNewUrlForGlossary } from 'helpers/glossaryHelper';
import * as redirectHelper from 'helpers/redirectHelper';
import DropdownComingSoon from '../DropdownComingSoon';
@@ -16,9 +17,12 @@ const propTypes = {
active: PropTypes.bool,
comingSoon: PropTypes.bool,
url: PropTypes.string,
+ search: PropTypes.string,
title: PropTypes.oneOfType([PropTypes.element, PropTypes.string]),
hideMobileNav: PropTypes.func,
- externalLink: PropTypes.bool
+ externalLink: PropTypes.bool,
+ isNewTab: PropTypes.bool,
+ appendToExistingUrl: PropTypes.bool
};
const clickedHeaderLink = (route) => {
@@ -28,66 +32,75 @@ const clickedHeaderLink = (route) => {
});
};
-export default class MobileDropdownItem extends React.Component {
- constructor(props) {
- super(props);
+const MobileDropdownItem = ({
+ url,
+ title = '',
+ active = false,
+ comingSoon = false,
+ hideMobileNav = false,
+ externalLink = false,
+ isNewTab = false,
+ appendToExistingUrl = false
+}) => {
+ const { pathname, search } = useLocation();
+ const newUrl = appendToExistingUrl
+ ? getNewUrlForGlossary(pathname, url, search)
+ : url;
- this.clickedLink = this.clickedLink.bind(this);
- }
-
- clickedLink() {
- clickedHeaderLink(this.props.url);
- this.props.hideMobileNav();
- if (this.props.externalLink) {
- redirectHelper.showRedirectModal(this.props.url);
+ const clickedLink = () => {
+ clickedHeaderLink(newUrl);
+ hideMobileNav();
+ if (externalLink) {
+ redirectHelper.showRedirectModal(newUrl);
}
+ };
+
+ let activeClass = '';
+ if (active) {
+ activeClass = 'mobile-dropdown__link_active';
}
- render() {
- let activeClass = '';
- if (this.props.active) {
- activeClass = 'mobile-dropdown__link_active';
- }
+ let comingSoonClass = '';
+ let comingSoonDecorator = null;
+ if (comingSoon) {
+ comingSoonClass = 'mobile-dropdown__item_coming-soon';
+ comingSoonDecorator = (
+
+
+ );
+ }
- let comingSoonClass = '';
- let comingSoonDecorator = null;
- if (this.props.comingSoon) {
- comingSoonClass = 'mobile-dropdown__item_coming-soon';
- comingSoonDecorator = (
-
-
- );
- }
+ let link = (
+
+ NEW }
+
+ {comingSoonDecorator}
+
+ );
- let link = (
+ if (externalLink) {
+ // Trigger the redirect modal
+ link = (
-
);
-
- if (this.props.externalLink) {
- // Trigger the redirect modal
- link = (
-
-
- {this.props.title}
-
- {comingSoonDecorator}
-
- );
- }
-
- return link;
}
-}
+
+ return link;
+};
MobileDropdownItem.propTypes = propTypes;
+
+export default MobileDropdownItem;
diff --git a/src/js/components/sharedComponents/header/mobile/MobileNav.jsx b/src/js/components/sharedComponents/header/mobile/MobileNav.jsx
index 419717b1de..bcb91aba30 100644
--- a/src/js/components/sharedComponents/header/mobile/MobileNav.jsx
+++ b/src/js/components/sharedComponents/header/mobile/MobileNav.jsx
@@ -8,10 +8,11 @@ import PropTypes from 'prop-types';
import { withRouter, Link } from 'react-router-dom';
import Analytics from 'helpers/analytics/Analytics';
+import { DEV, QAT } from 'GlobalConstants';
import GlossaryButtonWrapperContainer from 'containers/glossary/GlossaryButtonWrapperContainer';
-import { searchOptions, profileOptions, downloadOptions } from 'dataMapping/navigation/menuOptions';
+import { searchOptions, profileOptions, downloadGlobalNavigationOptions, resourceOptions } from 'dataMapping/navigation/menuOptions';
import MobileTop from './MobileTop';
import MobileGlossaryButton from './MobileGlossaryButton';
@@ -29,6 +30,8 @@ const propTypes = {
location: PropTypes.object
};
+const isDevOrQat = (DEV || QAT);
+
export class MobileNav extends React.Component {
constructor(props) {
super(props);
@@ -99,17 +102,29 @@ export class MobileNav extends React.Component {
-
-
+ {isDevOrQat && (
+
+
+ )}
+ {!isDevOrQat && (
+
+
+ )}
diff --git a/src/js/containers/Footer.jsx b/src/js/containers/Footer.jsx
index 8c24868972..670f7c6153 100644
--- a/src/js/containers/Footer.jsx
+++ b/src/js/containers/Footer.jsx
@@ -9,6 +9,7 @@ import React from 'react';
import { Link } from 'react-router-dom';
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faFacebookSquare, faLinkedin, faGithub, faTwitter } from "@fortawesome/free-brands-svg-icons";
+import { QAT, DEV } from 'GlobalConstants';
import { showModal } from 'redux/actions/modal/modalActions';
@@ -34,6 +35,8 @@ const clickedFooterLink = (route) => {
});
};
+const isDevOrQat = (DEV || QAT);
+
const Footer = ({
filters,
redirectUser
@@ -113,33 +116,35 @@ const Footer = ({
-
-
+ {!isDevOrQat && (
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
Developers
@@ -155,8 +160,30 @@ const Footer = ({
link="https://github.com/fedspendingtransparency/usaspending-website/tree/master"
title="Explore the Code" />
+ {isDevOrQat && (
+
+
+ )}
+ {isDevOrQat && (
+
+ )}
diff --git a/src/js/containers/aboutTheData/AgenciesContainer.jsx b/src/js/containers/aboutTheData/AgenciesContainer.jsx
index 60f10d3161..f2fca6358c 100644
--- a/src/js/containers/aboutTheData/AgenciesContainer.jsx
+++ b/src/js/containers/aboutTheData/AgenciesContainer.jsx
@@ -8,9 +8,9 @@ import DrilldownCell from 'components/aboutTheData/DrilldownCell';
import CellWithModal from 'components/aboutTheData/CellWithModal';
import { setTableData, setTableSort, setTotals, setSearchResults } from 'redux/actions/aboutTheData';
import { getTotalBudgetaryResources, getAgenciesReportingData, getSubmissionPublicationDates, usePagination, isPeriodSelectable } from 'helpers/aboutTheDataHelper';
-import ReportingOverviewRow from 'models/v2/aboutTheData/ReportingOverviewRow';
+import BaseAgencyRow from 'models/v2/aboutTheData/BaseAgencyRow';
import PublicationOverviewRow from 'models/v2/aboutTheData/PublicationOverviewRow';
-
+import AgencyDownloadLinkCell from 'components/aboutTheData/AgencyDownloadLinkCell';
import { agenciesTableColumns } from './AgencyTableMapping';
const propTypes = {
@@ -21,11 +21,10 @@ const propTypes = {
};
const parsePeriods = (periods) => periods
- .map(({ publicationDate, showNotCertified, isQuarterly }) => (
+ .map(({ publicationDate, showNotCertified }) => (
- {(!isQuarterly && publicationDate) && publicationDate}
- {isQuarterly && "Submitted quarterly"}
- {!publicationDate && "Not submitted"}
+ {(publicationDate) && publicationDate}
+ {!publicationDate && "--"}
{showNotCertified && publicationDate && NOT CERTIFIED }
));
@@ -92,7 +91,7 @@ const AgenciesContainer = ({
return submissionsReq.current.promise
.then(({ data: { results, page_metadata: { total: totalItems } } }) => {
const parsedResults = results.map((d) => {
- const row = Object.create(ReportingOverviewRow);
+ const row = Object.create(BaseAgencyRow);
const federalTotal = federalTotals.find(({ fiscal_year: y, fiscal_period: p }) => (
y === parseInt(selectedFy, 10) &&
p === parseInt(selectedPeriod, 10)
@@ -241,18 +240,19 @@ const AgenciesContainer = ({
.map(({
name: agencyName,
code,
- publicationDate,
+ mostRecentPublicationDate,
discrepancyCount: GtasNotInFileA,
obligationDifference,
- tasTotals,
+ _gtasObligationTotal,
percentageOfTotalFederalBudget,
- unlinkedContractAwards,
- unlinkedAssistanceAwards
+ unlinkedContracts,
+ unlinkedAssistance,
+ assuranceStatement
}) => [
({percentageOfTotalFederalBudget}
),
({unlinkedContractAwards}
),
- ({unlinkedAssistanceAwards}
)
+ unlinkedContracts !== '0' ? ({unlinkedContracts}
),
+ unlinkedAssistance !== '0' ? ({unlinkedAssistance}
),
+ ()
]);
const handlePageChange = (page) => {
@@ -306,7 +327,7 @@ const AgenciesContainer = ({
return (
<>
-
+
{activeTab === 'submissions' && (
(
-
- {columnTooltips[title]}
-
- )} />
-);
-
-Tooltip.propTypes = {
- title: PropTypes.string.isRequired,
- position: PropTypes.oneOf(['left', 'right'])
-};
-
-const columns = [
- {
- title: "fiscal_year",
- displayName: "Reporting Period"
- },
- {
- title: "percent_of_total_budgetary_resources",
- displayName: "Percent of Total Federal Budget"
- },
- {
- title: "recent_publication_date",
- displayName: "Most Recent Update",
- icon: ({ rowData.reportingPeriod }
),
- ({ rowData.percentOfBudget }
),
- ({rowData.reportingPeriod},
+ {rowData.percentOfBudget}
,
+ {rowData.unlinkedContracts}
),
- ({rowData.unlinkedAssistance}
),
- ()
- ]);
- })
- );
+ }} />,
+ rowData._unlinkedContracts !== 0 ? (
+ {rowData.unlinkedContracts}
+ ),
+ rowData._unlinkedAssistance !== 0 ? (
+ {rowData.unlinkedAssistance}
+ ),
+
+ ];
+ });
const fetchTableData = () => {
if (tableRequest.current) {
@@ -210,7 +172,7 @@ const AgencyDetailsContainer = ({
(
+const Tooltip = ({ title, position = 'right' }) => (
- {columnTooltips[title]}
-
- )} />
+ tooltipComponent={
+ {columnTooltips[title]}
+ } />
);
Tooltip.propTypes = {
@@ -25,13 +23,17 @@ Tooltip.propTypes = {
};
export const agenciesTableColumns = {
- publications: [
- { title: 'agency_name', displayName: 'Agency Name', icon: Test content for tooltip
} /> },
- { title: 'current_total_budget_authority_amount', displayName: 'Percent of Total Federal Budget' },
+ publications: (fy) => [
+ { title: 'agency_name', displayName: 'Agency Name' },
+ {
+ title: 'current_total_budget_authority_amount',
+ right: true,
+ displayName: 'Percent of Total Federal Budget'
+ },
{
title: 'Q1',
- displayName: 'FY 2020 Q1',
- columnSpan: "2",
+ displayName: `FY ${fy} Q1`,
+ columnSpan: '2',
subColumnNames: [
{ displayName: 'P01 - P02', title: 'publication_date,2' },
{ displayName: 'P03', title: 'publication_date,3' }
@@ -39,8 +41,8 @@ export const agenciesTableColumns = {
},
{
title: 'Q2',
- displayName: 'FY 2020 Q2',
- columnSpan: "3",
+ displayName: `FY ${fy} Q2`,
+ columnSpan: '3',
subColumnNames: [
{ displayName: 'P04', title: 'publication_date,4' },
{ displayName: 'P05', title: 'publication_date,5' },
@@ -49,8 +51,8 @@ export const agenciesTableColumns = {
},
{
title: 'Q3',
- displayName: 'FY 2020 Q3',
- columnSpan: "3",
+ displayName: `FY ${fy} Q3`,
+ columnSpan: '3',
subColumnNames: [
{ displayName: 'P07', title: 'publication_date,7' },
{ displayName: 'P08', title: 'publication_date,8' },
@@ -59,8 +61,8 @@ export const agenciesTableColumns = {
},
{
title: 'Q4',
- displayName: 'FY 2020 Q4',
- columnSpan: "3",
+ displayName: `FY ${fy} Q4`,
+ columnSpan: '3',
subColumnNames: [
{ displayName: 'P10', title: 'publication_date,10' },
{ displayName: 'P11', title: 'publication_date,11' },
@@ -70,378 +72,93 @@ export const agenciesTableColumns = {
],
submissions: [
{
- title: "agency_name",
- displayName: "Agency Name"
+ title: 'agency_name',
+ displayName: 'Agency Name'
+ },
+ {
+ title: 'current_total_budget_authority_amount',
+ displayName: 'Percent of Total Federal Budget',
+ right: true
},
{
- title: "current_total_budget_authority_amount",
- displayName: "Percent of Total Federal Budget"
+ title: 'recent_publication_date',
+ displayName: 'Most Recent Update',
+ icon:
-
- {column.displayName}
-
-
({
+ displayName: column.displayName,
+ title: '',
+ right: true,
+ bodyHeader: i === 0
+ }))} />
+ );
+};
+
+UnlinkedDataContainer.propTypes = propTypes;
+export default UnlinkedDataContainer;
diff --git a/src/js/containers/award/AwardContainer.jsx b/src/js/containers/award/AwardContainer.jsx
index 2ff459b176..a83212e871 100644
--- a/src/js/containers/award/AwardContainer.jsx
+++ b/src/js/containers/award/AwardContainer.jsx
@@ -20,6 +20,7 @@ import {
setDownloadExpectedUrl
} from 'redux/actions/bulkDownload/bulkDownloadActions';
import { subAwardIdClicked } from 'redux/actions/search/searchSubAwardTableActions';
+import { setDEFCodes } from 'redux/actions/covid19/covid19Actions';
import BaseContract from 'models/v2/award/BaseContract';
import BaseIdv from 'models/v2/award/BaseIdv';
@@ -29,6 +30,7 @@ import {
fetchContractDownloadFile,
fetchAssistanceDownloadFile
} from 'helpers/downloadHelper';
+import { fetchDEFCodes } from 'helpers/disasterHelper';
require('pages/award/awardPage.scss');
@@ -44,7 +46,9 @@ const propTypes = {
award: PropTypes.object,
isDownloadPending: PropTypes.bool,
isSubAwardIdClicked: PropTypes.bool,
- match: PropTypes.object
+ match: PropTypes.object,
+ defCodes: PropTypes.array,
+ setDEFCodes: PropTypes.func
};
export class AwardContainer extends React.Component {
@@ -53,6 +57,7 @@ export class AwardContainer extends React.Component {
this.awardRequest = null;
this.downloadRequest = null;
+ this.defcRequest = null;
this.state = {
noAward: false,
@@ -60,10 +65,15 @@ export class AwardContainer extends React.Component {
};
this.downloadData = this.downloadData.bind(this);
this.fetchAwardDownloadFile = this.fetchAwardDownloadFile.bind(this);
+ this.fetchCodes = this.fetchCodes.bind(this);
}
componentDidMount() {
this.getSelectedAward(this.props.match.params.awardId);
+ if (!this.props.defCodes || this.props.defCodes.length === 0) {
+ // If we don't already have COVID-19 DEF Codes in redux, make a request for them
+ this.fetchCodes();
+ }
}
componentDidUpdate(prevProps) {
@@ -183,6 +193,25 @@ export class AwardContainer extends React.Component {
}
}
+ async fetchCodes() {
+ if (this.defcRequest) {
+ this.defcRequest.cancel();
+ }
+
+ this.defcRequest = fetchDEFCodes();
+
+ try {
+ const { data } = await this.defcRequest.promise;
+ const defCodes = data.codes.filter((c) => c.disaster === 'covid_19');
+ this.props.setDEFCodes(defCodes);
+ this.defcRequest = null;
+ }
+ catch (err) {
+ console.error('Error fetching DEF Codes', err);
+ this.defcRequest = null;
+ }
+ }
+
render() {
return (
{
SearchContainer.propTypes = propTypes;
export default SearchContainer;
+
+export const SearchContainerRedirect = () => {
+ const { urlHash: pathHash } = useParams();
+ return (
+
- COVID-19 Spending
- NEW
- );
+const {
+ QAT,
+ DEV,
+ FILES_SERVER_BASE_URL,
+ API
+} = GlobalConstants;
+
+const isLowerEnv = (QAT || DEV);
export const searchOptions = [
{
@@ -47,12 +49,53 @@ export const profileOptions = [
enabled: true
},
{
- label: