Merge pull request #294 from JeffreyMFarley/hotfix-1073

[patch] Also remove hidden children when unchecking a parent

.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

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
   }
 }
 

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']
       )
     })
   })