Merge pull request #2055 from fedspendingtransparency/qat

Sprint 213: Qat -> Staging

Author: dpb-bah

src/_scss/sharedComponents/_base.scss

@@ -148,6 +148,13 @@ img {
     margin-left: 8.33%;
 }
 
+.col-sm-6 {
+    @media(min-width: $small-screen) {
+        width: 50%;
+        float: left;
+    }
+}
+
 .col-sm-12 {
     @media(min-width: $small-screen) {
         width: 100%;
@@ -245,9 +252,9 @@ img {
     }
 }
 
-.col-xs-1, .col-xs-3, .col-xs-4, .col-xs-6, .col-xs-8, .col-xs-11, .col-xs-12, .col-sm-12, .col-md-1, .col-md-2,
-.col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12,
-.col-lg-8, .col-lg-12 {
+.col-xs-1, .col-xs-3, .col-xs-4, .col-xs-6, .col-xs-8, .col-xs-11, .col-xs-12, .col-sm-6, .col-sm-12, .col-md-1,
+.col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11,
+.col-md-12, .col-lg-8, .col-lg-12 {
     min-height: rem(1);
     padding-left: rem(15);
     padding-right: rem(15);

src/help/changelog.md

@@ -1,5 +1,5 @@
-#### November 12, 2025{section=changelog}
+#### December 18, 2025{section=changelog}
 In this release of the Broker, we:
 
-* Updated various aspects of the Broker to handle alphanumeric characters in assistance listing numbers to align with the Grants Data Standards update. Note, no assistance listing numbers have been processed yet with the format change. Only FABS36 (which checks the assistance listing format) has been changed from a fatal error to a warning until the GSDM v1.2 Draft Annual Release can be finalized.
-* Resolved a minor frontend bug on the initial DABS upload page.
+* Updated publication and certification statements for clarity.
+* Added additional checks for `/v1/restart_validation` to prevent revalidation after FABS publication.

src/help/history.md

@@ -1,4 +1,10 @@
-#### October 21, 2025{section=changelog}
+#### November 12, 2025{section=changelog}
+In this release of the Broker, we:
+
+* Updated various aspects of the Broker to handle alphanumeric characters in assistance listing numbers to align with the Grants Data Standards update. Note, no assistance listing numbers have been processed yet with the format change. Only FABS36 (which checks the assistance listing format) has been changed from a fatal error to a warning until the GSDM v1.2 Draft Annual Release can be finalized.
+* Resolved a minor frontend bug on the initial DABS upload page.
+
+#### October 21, 2025
 In this release of the Broker, we:
 
 * Started pulling in several data elements (`genericBoolean`) into the Broker FPDS data via the FPDS loader.

src/help/technical.md

@@ -1,7 +1,6 @@
-#### November 12, 2025{section=technical}
+#### December 18, 2025{section=technical}
 
 In this release, here is a list of technical changes that may require infrastructure or database updates, or represents additional functionality.
 
-* Standardized all scripts with date arguments to be of the same format for consistency.
-* Resolved minor bug with the initializing script for developers.
-* Reworked the frontend code for the DABS Generate E/F page for comprehensiveness.
+* Updated several aspects of the frontend code to be functional components.
+* Updated comment statement on the DABS review page for clarity and resolved a minor bug with comments files appearing on the Raw Files page.

src/help/technicalHistory.md

@@ -1,4 +1,12 @@
-#### October 21, 2025{section=technical}
+#### November 12, 2025{section=technical}
+
+In this release, here is a list of technical changes that may require infrastructure or database updates, or represents additional functionality.
+
+* Standardized all scripts with date arguments to be of the same format for consistency.
+* Resolved minor bug with the initializing script for developers.
+* Reworked the frontend code for the DABS Generate E/F page for comprehensiveness.
+
+#### October 21, 2025
 
 In this release, here is a list of technical changes that may require infrastructure or database updates, or represents additional functionality.
 

src/js/components/help/RawFilesItem.jsx

@@ -26,8 +26,7 @@ export default class RawFilesItem extends React.Component {
     }
 
     itemAction() {
-        this.props.itemAction(this.props.currentLevel, this.props.item.id, this.props.item.label,
-            this.props.item.filetype);
+        this.props.itemAction(this.props.currentLevel, this.props.item.id, this.props.item.label);
     }
 
     render() {

src/js/components/help/RawFilesPage.jsx

@@ -12,7 +12,6 @@ import Banner from 'components/SharedComponents/Banner';
 import Footer from 'components/SharedComponents/FooterComponent';
 import RawFilesContent from 'components/help/RawFilesContent';
 import HelpNav from './helpNav';
-import { kGlobalConstants } from '../../GlobalConstants';
 
 const propTypes = {
     session: PropTypes.object,
@@ -58,21 +57,15 @@ export default class RawFilesPage extends React.Component {
             });
     }
 
-    itemAction(level, id, label, fileType) {
+    itemAction(level, id, label) {
         if (level === 'download') {
-            if (fileType !== 'comments') {
-                HelpHelper.downloadPublishedFile(id)
-                    .then((res) => {
-                        window.open(res.data.url);
-                    })
-                    .catch((error) => {
-                        console.error(error);
-                    });
-            }
-            else {
-                const urlType = kGlobalConstants.PROD ? '' : '-nonprod';
-                window.open(`https://files${urlType}.usaspending.gov/agency_submissions/${label}`);
-            }
+            HelpHelper.downloadPublishedFile(id)
+                .then((res) => {
+                    window.open(res.data.url);
+                })
+                .catch((error) => {
+                    console.error(error);
+                });
         }
         else {
             const tmpState = Object.assign({}, this.state);

src/js/components/login/AuthPage.jsx

@@ -3,36 +3,35 @@
 * Created by Kevin Li 10/24/16
 */
 
-import React from 'react';
 import AuthContainer from 'containers/login/AuthContainer';
 import { kGlobalConstants } from '../../GlobalConstants';
 import LoginWarningTxt from './LoginWarningTxt';
 import LoginIntro from './LoginIntro';
 import TestEnvironmentBanner from '../SharedComponents/banners/TestEnvironmentBanner';
 
 
-export default class AuthPage extends React.Component {
-    render() {
-        let testBanner = null;
-        if (!kGlobalConstants.PROD) {
-            testBanner = <TestEnvironmentBanner />;
-        }
+const AuthPage = (props) => {
+    let testBanner = null;
+    if (!kGlobalConstants.PROD) {
+        testBanner = <TestEnvironmentBanner />;
+    }
 
-        return (
-            <div className="usa-da-login-page">
-                <div className="flex-wrapper">
-                    <div className="usa-da-login container-fluid">
-                        {testBanner}
-                        <div className="login-banner-wrap">
-                            <div className="usa-da-login-wrap">
-                                <LoginIntro />
-                                <AuthContainer {...this.props} />
-                            </div>
+    return (
+        <div className="usa-da-login-page">
+            <div className="flex-wrapper">
+                <div className="usa-da-login container-fluid">
+                    {testBanner}
+                    <div className="login-banner-wrap">
+                        <div className="usa-da-login-wrap">
+                            <LoginIntro />
+                            <AuthContainer {...props} />
                         </div>
-                        <LoginWarningTxt />
                     </div>
+                    <LoginWarningTxt />
                 </div>
             </div>
-        );
-    }
-}
+        </div>
+    );
+};
+
+export default AuthPage;

src/js/components/login/LoginBanner.jsx

@@ -3,19 +3,18 @@
 * Created by Kyle Fox 2/19/16
 */
 
-import React from 'react';
 import LoginIntro from './LoginIntro';
 import LoginContainer from '../../containers/login/LoginContainer';
 
-export default class LoginBanner extends React.Component {
-    render() {
-        return (
-            <div className="login-banner-wrap">
-                <div className="usa-da-login-wrap">
-                    <LoginIntro />
-                    <LoginContainer {...this.props} />
-                </div>
+const LoginBanner = (props) => {
+    return (
+        <div className="login-banner-wrap">
+            <div className="usa-da-login-wrap">
+                <LoginIntro />
+                <LoginContainer {...props} />
             </div>
-        );
-    }
-}
+        </div>
+    );
+};
+
+export default LoginBanner;

src/js/components/login/LoginCaia.jsx

@@ -3,9 +3,8 @@
   * Createdd by Kevin Li 10/13/16
   */
 
-import React from 'react';
+import { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import _ from 'lodash';
 import Cookies from 'js-cookie';
 import { kGlobalConstants } from '../../GlobalConstants';
 import { getRedirectPath } from '../../helpers/loginHelper';
@@ -14,52 +13,41 @@ const propTypes = {
     location: PropTypes.object
 };
 
-const defaultProps = {
-    location: null
-};
+const LoginCaia = ({location = null}) => {
+    const [loginRedirect, setLoginRedirect] = useState('');
 
-export default class LoginCaia extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-            redirect: ''
-        };
-        this.handleClick = this.handleClick.bind(this);
-    }
+    useEffect(() => {
+        detectRedirection();
+    }, []);
 
-    componentDidMount() {
-        this.detectRedirection();
-    }
+    useEffect(() => {
+        detectRedirection();
+    }, [location]);
 
-    componentDidUpdate(prevProps) {
-        if (!_.isEqual(prevProps.location, this.props.location)) {
-            this.detectRedirection();
+    useEffect(() => {
+        if(loginRedirect === '') {
+            // remove the redirect destination cookie
+            Cookies.remove('brokerRedirect');
+        }
+        else {
+            // save the redirect destination as a cookie, expire after 5 min (expressed in units of
+            // days per library documentation)
+            Cookies.set('brokerRedirect', loginRedirect, { expires: (5 / (24 * 60)) });
         }
-    }
+    }, [loginRedirect]);
 
-    detectRedirection() {
+    const detectRedirection = () => {
         // check if the URL has a redirect param, save it in the state
-        const redirectPath = getRedirectPath(this.props.location);
+        const redirectPath = getRedirectPath(location);
         if (redirectPath) {
-            this.setState({
-                redirect: redirectPath
-            }, () => {
-                // save the redirect destination as a cookie, expire after 5 min (expressed in units of
-                // days per library documentation)
-                Cookies.set('brokerRedirect', this.state.redirect, { expires: (5 / (24 * 60)) });
-            });
+            setLoginRedirect(redirectPath);
         }
         else {
-            this.setState({
-                redirect: ''
-            }, () => {
-                // remove the redirect destination cookie
-                Cookies.remove('brokerRedirect');
-            });
+            setLoginRedirect('');
         }
-    }
+    };
 
-    handleClick(e) {
+    const handleClick = (e) => {
         if (e.keyCode === '13' || !e.keyCode) {
             const scope = "openid email profile address phone";
             const url = `${kGlobalConstants.CAIA_ROOT}/as/authorization.oauth2?`
@@ -69,28 +57,26 @@ export default class LoginCaia extends React.Component {
                 + `&client_id=${encodeURIComponent(kGlobalConstants.CAIA_CLIENT)}`;
             window.location.assign(url);
         }
-    }
+    };
 
-    render() {
-        return (
-            <div className="row">
-                <div className="col-xs-12">
-                    <p className="instructions">
-                        Sign in or register for the Data Broker using your CAIA login.
-                    </p>
-                    <button
-                        className="usa-da-button btn-primary btn-lg btn-full bottom-login-button"
-                        tabIndex="0"
-                        role="link"
-                        onKeyDown={this.handleClick}
-                        onClick={this.handleClick}>
-                        Sign In Using CAIA
-                    </button>
-                </div>
+    return (
+        <div className="row">
+            <div className="col-xs-12">
+                <p className="instructions">
+                    Sign in or register for the Data Broker using your CAIA login.
+                </p>
+                <button
+                    className="usa-da-button btn-primary btn-lg btn-full bottom-login-button"
+                    tabIndex="0"
+                    role="link"
+                    onKeyDown={handleClick}
+                    onClick={handleClick}>
+                    Sign In Using CAIA
+                </button>
             </div>
-        );
-    }
-}
+        </div>
+    );
+};
 
 LoginCaia.propTypes = propTypes;
-LoginCaia.defaultProps = defaultProps;
+export default LoginCaia;