Merge branch 'master' into dev

cfpb · Jul 16, 2020 · ece1e7b · ece1e7b
2 parents 2850f43 + 196ddce
commit ece1e7b
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -47,6 +47,15 @@ jobs:
           python -m pip install --upgrade pip
           pip install tox
 
+      - name: Set up Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: 10.x
+
+      - name: Install Node dependencies
+        run: |
+          npm config set package-lock false
+      
       - name: Run back-end tests
         run: |
           tox
diff --git a/src/__tests__/__snapshots__/App.spec.jsx.snap b/src/__tests__/__snapshots__/App.spec.jsx.snap
@@ -1159,7 +1159,6 @@ exports[`initial state renders without crashing 1`] = `
                 </button>
                 <button
                   className="a-btn a-btn__link print-preview"
-                  data-gtm_ignore="true"
                   onClick={[Function]}
                 >
                   <svg

diff --git a/src/components/ActionBar.jsx b/src/components/ActionBar.jsx
@@ -32,7 +32,6 @@ export class ActionBar extends React.Component {
                 Export data
               </button>
               <button className="a-btn a-btn__link print-preview"
-                      data-gtm_ignore="true"
                       onClick={ this._showPrintView }>
                 { iconMap.getIcon( 'printer' ) }
                 Print

diff --git a/src/components/Map/MapToolbar.jsx b/src/components/Map/MapToolbar.jsx
@@ -23,7 +23,7 @@ export class MapToolbar extends React.Component {
         </section>
         { filteredStates &&
         <section className="state-navigation">
-          <a className="list"
+          <a href="#" className="list"
              onClick={ () => this.props.showComplaints() }>
             View complaints for filtered states
           </a>

diff --git a/src/components/__tests__/__snapshots__/ActionBar.spec.jsx.snap b/src/components/__tests__/__snapshots__/ActionBar.spec.jsx.snap
@@ -33,7 +33,6 @@ exports[`initial state renders without crashing 1`] = `
         </button>
         <button
           className="a-btn a-btn__link print-preview"
-          data-gtm_ignore="true"
           onClick={[Function]}
         >
           <svg

diff --git a/src/components/__tests__/__snapshots__/ListPanel.spec.jsx.snap b/src/components/__tests__/__snapshots__/ListPanel.spec.jsx.snap
@@ -37,7 +37,6 @@ exports[`component:ListPanel displays a message when an error has occurred 1`] =
           </button>
           <button
             className="a-btn a-btn__link print-preview"
-            data-gtm_ignore="true"
             onClick={[Function]}
           >
             <svg
@@ -315,7 +314,6 @@ exports[`component:ListPanel displays a message when only the narratives are sta
           </button>
           <button
             className="a-btn a-btn__link print-preview"
-            data-gtm_ignore="true"
             onClick={[Function]}
           >
             <svg
@@ -794,7 +792,6 @@ exports[`component:ListPanel displays a message when the data has issues 1`] = `
           </button>
           <button
             className="a-btn a-btn__link print-preview"
-            data-gtm_ignore="true"
             onClick={[Function]}
           >
             <svg
@@ -1273,7 +1270,6 @@ exports[`component:ListPanel displays a message when the data is stale 1`] = `
           </button>
           <button
             className="a-btn a-btn__link print-preview"
-            data-gtm_ignore="true"
             onClick={[Function]}
           >
             <svg
@@ -1752,7 +1748,6 @@ exports[`component:ListPanel displays a message when there are no results 1`] =
           </button>
           <button
             className="a-btn a-btn__link print-preview"
-            data-gtm_ignore="true"
             onClick={[Function]}
           >
             <svg
@@ -2011,7 +2006,6 @@ exports[`component:ListPanel only displays data message when both types are stal
           </button>
           <button
             className="a-btn a-btn__link print-preview"
-            data-gtm_ignore="true"
             onClick={[Function]}
           >
             <svg
@@ -2490,7 +2484,6 @@ exports[`component:ListPanel renders mobile filters without crashing 1`] = `
           </button>
           <button
             className="a-btn a-btn__link print-preview"
-            data-gtm_ignore="true"
             onClick={[Function]}
           >
             <svg
@@ -2945,7 +2938,6 @@ exports[`component:ListPanel renders without crashing 1`] = `
           </button>
           <button
             className="a-btn a-btn__link print-preview"
-            data-gtm_ignore="true"
             onClick={[Function]}
           >
             <svg

diff --git a/src/components/__tests__/__snapshots__/MapPanel.spec.jsx.snap b/src/components/__tests__/__snapshots__/MapPanel.spec.jsx.snap
@@ -37,7 +37,6 @@ exports[`component:MapPanel renders Print without crashing 1`] = `
           </button>
           <button
             className="a-btn a-btn__link print-preview"
-            data-gtm_ignore="true"
             onClick={[Function]}
           >
             <svg
@@ -221,7 +220,6 @@ exports[`component:MapPanel renders warning without crashing 1`] = `
           </button>
           <button
             className="a-btn a-btn__link print-preview"
-            data-gtm_ignore="true"
             onClick={[Function]}
           >
             <svg

diff --git a/src/components/__tests__/__snapshots__/MapToolbar.spec.jsx.snap b/src/components/__tests__/__snapshots__/MapToolbar.spec.jsx.snap
@@ -31,6 +31,7 @@ exports[`component: MapToolbar initial state renders without crashing 1`] = `
   >
     <a
       className="list"
+      href="#"
       onClick={[Function]}
     >
       View complaints for filtered states

diff --git a/src/components/__tests__/__snapshots__/ResultsPanel.spec.jsx.snap b/src/components/__tests__/__snapshots__/ResultsPanel.spec.jsx.snap
@@ -66,7 +66,6 @@ exports[`component:Results renders List print mode without crashing 1`] = `
             </button>
             <button
               className="a-btn a-btn__link print-preview"
-              data-gtm_ignore="true"
               onClick={[Function]}
             >
               <svg
@@ -560,7 +559,6 @@ exports[`component:Results renders Map print mode without crashing 1`] = `
             </button>
             <button
               className="a-btn a-btn__link print-preview"
-              data-gtm_ignore="true"
               onClick={[Function]}
             >
               <svg
@@ -759,7 +757,6 @@ exports[`component:Results renders list panel without crashing 1`] = `
             </button>
             <button
               className="a-btn a-btn__link print-preview"
-              data-gtm_ignore="true"
               onClick={[Function]}
             >
               <svg
@@ -1216,7 +1213,6 @@ exports[`component:Results renders map panel without crashing 1`] = `
             </button>
             <button
               className="a-btn a-btn__link print-preview"
-              data-gtm_ignore="true"
               onClick={[Function]}
             >
               <svg