From ccbe52b86b2ada43ee86b1dad7626b70543a5816 Mon Sep 17 00:00:00 2001
From: Seph Coster <joseph.coster@cfpb.gov>
Date: Mon, 8 Jun 2020 14:46:09 -0400
Subject: [PATCH 1/3] updated for gtm tags, updated failing time diff test

---
 src/__tests__/__snapshots__/App.spec.jsx.snap             | 1 -
 src/components/ActionBar.jsx                              | 1 -
 src/components/Map/MapToolbar.jsx                         | 2 +-
 .../__tests__/__snapshots__/ActionBar.spec.jsx.snap       | 1 -
 .../__tests__/__snapshots__/ListPanel.spec.jsx.snap       | 8 --------
 .../__tests__/__snapshots__/MapPanel.spec.jsx.snap        | 2 --
 .../__tests__/__snapshots__/MapToolbar.spec.jsx.snap      | 1 +
 .../__tests__/__snapshots__/ResultsPanel.spec.jsx.snap    | 4 ----
 src/reducers/__tests__/query.spec.jsx                     | 8 ++++----
 9 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/src/__tests__/__snapshots__/App.spec.jsx.snap b/src/__tests__/__snapshots__/App.spec.jsx.snap
index 19d2d255a..e02f5df31 100644
--- a/src/__tests__/__snapshots__/App.spec.jsx.snap
+++ b/src/__tests__/__snapshots__/App.spec.jsx.snap
@@ -1157,7 +1157,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
index 6ce20db11..0e7246547 100644
--- 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
index 09a206560..a24a57976 100644
--- 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
index 075c75fd0..fb0897534 100644
--- 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
index 468d8be48..f8248d2e5 100644
--- 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
@@ -308,7 +307,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
@@ -780,7 +778,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
@@ -1252,7 +1249,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
@@ -1724,7 +1720,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
@@ -1976,7 +1971,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
@@ -2448,7 +2442,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
@@ -2896,7 +2889,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
index 60b393275..75c0fd73c 100644
--- 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
@@ -254,7 +253,6 @@ exports[`component:MapPanel 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__/MapToolbar.spec.jsx.snap b/src/components/__tests__/__snapshots__/MapToolbar.spec.jsx.snap
index b102ad6a3..1c272f44b 100644
--- 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
index d30826f39..0a4c58483 100644
--- 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
@@ -553,7 +552,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
@@ -762,7 +760,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
@@ -1212,7 +1209,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
diff --git a/src/reducers/__tests__/query.spec.jsx b/src/reducers/__tests__/query.spec.jsx
index e194fb5de..39469f31f 100644
--- a/src/reducers/__tests__/query.spec.jsx
+++ b/src/reducers/__tests__/query.spec.jsx
@@ -816,11 +816,11 @@ describe( 'reducer:query', () => {
         expect( result.date_received_min ).toEqual( new Date( types.DATE_RANGE_MIN ) )
       } )
 
-      it( 'handles 3m range', () => {
-        action.dateRange = '3m'
+      it( 'handles 1y range', () => {
+        action.dateRange = '1y'
         result = target( {}, action )
-        const min = new Date( moment().subtract( 3, 'months' ).calendar() )
-        const diffMin = moment( min ).diff( moment( result.date_received_min ), 'months' )
+        const min = new Date( moment().subtract( 1, 'year' ).calendar() )
+        const diffMin = moment( min ).diff( moment( result.date_received_min ), 'years' )
         expect( diffMin ).toEqual( 0 )
       } )
 

From 3483cf303b9a03bea5ef7673d74d8f7158d2ab7a Mon Sep 17 00:00:00 2001
From: Jeffrey Farley <JeffreyMFarley@users.noreply.github.com>
Date: Tue, 30 Jun 2020 10:39:17 -0400
Subject: [PATCH 2/3] fix: Also remove hidden children when unchecking a parent

---
 src/components/Filters/AggregationBranch.jsx  | 30 ++++++++++++-------
 .../__tests__/AggregationBranch.spec.jsx      | 10 +++++--
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/components/Filters/AggregationBranch.jsx b/src/components/Filters/AggregationBranch.jsx
index 720404a58..394219efb 100644
--- a/src/components/Filters/AggregationBranch.jsx
+++ b/src/components/Filters/AggregationBranch.jsx
@@ -26,19 +26,23 @@ export class AggregationBranch extends React.Component {
   }
 
   _decideClickAction() {
-    const { item, subitems, fieldName, checkedState } = this.props
-
-    // List all the filters
-    const values = [ item.key ]
-    subitems.forEach( sub => {
-      values.push( slugify( item.key, sub.key ) )
-    } )
+    const {
+      activeChildren, item, subitems, fieldName, checkedState
+    } = this.props
+
+    const values = new Set()
+    // Add the parent
+    values.add( item.key )
+    // Add the shown subitems
+    subitems.forEach( sub => { values.add( slugify( item.key, sub.key ) ) } )
+    // Add the active filters (that might be hidden)
+    activeChildren.forEach( child => values.add( child ) )
 
     const action = checkedState === CHECKED ?
       this.props.uncheckParent :
       this.props.checkParent
 
-    action( fieldName, values )
+    action( fieldName, [ ...values ] )
   }
 
   _toggleChildDisplay() {
@@ -128,6 +132,7 @@ export class AggregationBranch extends React.Component {
 }
 
 AggregationBranch.propTypes = {
+  activeChildren: PropTypes.array,
   checkParent: PropTypes.func.isRequired,
   checkedState: PropTypes.string,
   fieldName: PropTypes.string.isRequired,
@@ -155,19 +160,22 @@ export const mapStateToProps = ( state, ownProps ) => {
   const hasKey = candidates.filter( x => x.indexOf( ownProps.item.key ) === 0 )
 
   // Does the key contain the separator?
-  const activeChild = hasKey.filter( x => x.indexOf( SLUG_SEPARATOR ) !== -1 )
+  const activeChildren = hasKey.filter(
+    x => x.indexOf( SLUG_SEPARATOR ) !== -1
+  )
   const activeParent = hasKey.filter( x => x === ownProps.item.key )
 
   let checkedState = UNCHECKED
-  if ( activeParent.length === 0 && activeChild.length > 0 ) {
+  if ( activeParent.length === 0 && activeChildren.length > 0 ) {
     checkedState = INDETERMINATE
   } else if ( activeParent.length > 0 ) {
     checkedState = CHECKED
   }
 
   return {
+    activeChildren,
     checkedState,
-    showChildren: activeChild.length > 0
+    showChildren: activeChildren.length > 0
   }
 }
 
diff --git a/src/components/Filters/__tests__/AggregationBranch.spec.jsx b/src/components/Filters/__tests__/AggregationBranch.spec.jsx
index 8c89fb7ee..62419919d 100644
--- a/src/components/Filters/__tests__/AggregationBranch.spec.jsx
+++ b/src/components/Filters/__tests__/AggregationBranch.spec.jsx
@@ -26,6 +26,12 @@ const subitems = [
 
 function setupEnzyme(checkedState=UNCHECKED) {
   const props = {
+    activeChildren: [
+      // not hidden
+      slugify( 'foo', 'bar' ),
+      // hidden
+      slugify( 'foo', 'quux' )
+    ],
     checkedState,
     checkParent: jest.fn(),
     fieldName: "issue",
@@ -111,7 +117,7 @@ describe('component::AggregationBranch', () => {
       const checkbox = target.find('li.parent input[type="checkbox"]')
       checkbox.simulate('change')
       expect(props.uncheckParent).toHaveBeenCalledWith(
-        'issue', ['foo', 'foo•bar', 'foo•baz', 'foo•qaz']
+        'issue', ['foo', 'foo•bar', 'foo•baz', 'foo•qaz', 'foo•quux']
       )
       expect(props.checkParent).not.toHaveBeenCalled()
     })
@@ -122,7 +128,7 @@ describe('component::AggregationBranch', () => {
       checkbox.simulate('change')
       expect(props.uncheckParent).not.toHaveBeenCalled()
       expect(props.checkParent).toHaveBeenCalledWith(
-        'issue', ['foo', 'foo•bar', 'foo•baz', 'foo•qaz']
+        'issue', ['foo', 'foo•bar', 'foo•baz', 'foo•qaz', 'foo•quux']
       )
     })
   })

From 6a5c72994bcf88d27dff6a7c31c59bacec91290b Mon Sep 17 00:00:00 2001
From: Jeff Farley <JeffreyMFarley@users.noreply.github.com>
Date: Tue, 30 Jun 2020 11:52:16 -0400
Subject: [PATCH 3/3] chore: Add node setup to backend ci action

---
 .github/workflows/ci.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4902b6dfa..1a7a58dfe 100644
--- 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