Merge pull request #340 from adhocteam/kw-test

Debug intermittent rendering issue

.circleci/config.yml

@@ -164,7 +164,7 @@ parameters:
     default: "main"
     type: string
   sandbox_git_branch:  # change to feature branch to test deployment
-    default: "kw-fix-region-order"
+    default: "kw-test"
     type: string
   prod_new_relic_app_id:
     default: "877570491"

frontend/src/App.js

@@ -145,7 +145,6 @@ function App() {
     <>
       <Helmet titleTemplate="%s - TTA Smart Hub" defaultTitle="TTA Smart Hub">
         <meta charSet="utf-8" />
-        <script src="https://touchpoints.app.cloud.gov/touchpoints/7d519b5e.js" async />
       </Helmet>
       <BrowserRouter>
         {authenticated && (

frontend/src/components/SiteNav.js

@@ -1,7 +1,7 @@
 /* eslint-disable react/no-array-index-key, react/jsx-props-no-spreading */
-import React, { useState, useEffect } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
-import { NavLink as Link, withRouter } from 'react-router-dom';
+import { NavLink as Link } from 'react-router-dom';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faChartBar } from '@fortawesome/free-solid-svg-icons';
 
@@ -33,7 +33,6 @@ const SiteNav = ({
   authenticated,
   logout,
   user,
-  location,
 }) => {
   const navItems = [
     <button type="button" onClick={() => logout(false)} className={`usa-button--unstyled width-full ${navLinkClasses}`}>
@@ -47,25 +46,11 @@ const SiteNav = ({
     </NavLink>,
   ];
 
-  const [showActivityReportSurveyButton, setShowActivityReportSurveyButton] = useState(false);
-
-  useEffect(() => {
-    if (location.pathname === '/activity-reports') {
-      setShowActivityReportSurveyButton(true);
-    } else {
-      setShowActivityReportSurveyButton(false);
-    }
-  }, [location.pathname]);
-
   const items = admin ? navItems.concat(adminNavItem) : navItems;
 
   return (
-    <div>
-      <div className="position-relative z-top">
-        <button id="tp-ar-landing-survey" className={`usa-button position-fixed  bottom-2 right-1 display-${showActivityReportSurveyButton ? 'block' : 'none'}`} aria-label="Please leave feedback" type="button">Please leave feedback</button>
-      </div>
-      <div className="smart-hub-sitenav pin-y position-fixed z-0 padding-top-9 font-ui text-white smart-hub-bg-blue width-15 tablet:width-card desktop:width-card-lg no-print">
-        {authenticated && (
+    <div className="smart-hub-sitenav pin-y position-fixed z-0 padding-top-9 font-ui text-white smart-hub-bg-blue width-15 tablet:width-card desktop:width-card-lg no-print">
+      {authenticated && (
         <>
           <div className="width-full smart-hub-sitenav-separator--after">
             <div role="complementary" className="padding-2 smart-hub-sitenav-word-wrap--break">
@@ -95,8 +80,7 @@ const SiteNav = ({
             </div>
           </nav>
         </>
-        )}
-      </div>
+      )}
     </div>
   );
 };
@@ -107,7 +91,6 @@ SiteNav.propTypes = {
   authenticated: PropTypes.bool,
   logout: PropTypes.func,
   user: PropTypes.shape({ name: PropTypes.string, email: PropTypes.string }),
-  location: PropTypes.shape({ pathname: PropTypes.string }).isRequired,
 };
 
 SiteNav.defaultProps = {
@@ -120,4 +103,4 @@ SiteNav.defaultProps = {
   },
 };
 
-export default withRouter(SiteNav);
+export default SiteNav;

frontend/src/pages/Landing/index.css

@@ -2,10 +2,6 @@
   font-family: 'Merriweather', serif;
 }
 
-.fba-modal .fba-modal-dialog {
-  margin-top: 120px;
-}
-
 .pagination {
   float: right;
   white-space: nowrap;

src/app.js

@@ -26,11 +26,8 @@ app.use(express.urlencoded({ extended: true }));
 app.use(helmet({
   contentSecurityPolicy: {
     directives: {
-      ...omit(helmet.contentSecurityPolicy.getDefaultDirectives(), 'upgrade-insecure-requests', 'block-all-mixed-content', 'script-src', 'img-src', 'default-src'),
+      ...omit(helmet.contentSecurityPolicy.getDefaultDirectives(), 'upgrade-insecure-requests', 'block-all-mixed-content'),
       'form-action': ["'self'"],
-      scriptSrc: ["'self'", 'https://touchpoints.app.cloud.gov/touchpoints/7d519b5e.js'],
-      imgSrc: ["'self'", 'data:', 'https://touchpoints.app.cloud.gov'],
-      defaultSrc: ["'self'", 'https://touchpoints.app.cloud.gov/touchpoints/7d519b5e/submissions.json'],
     },
   },
 }));