Merge pull request #36 from concord-consortium/186752847-attribute-se…

…lection-fix Fixes attribute selection after All has been selected
concord-consortium · Jan 29, 2024 · 697ffc8 · 697ffc8
2 parents fc14888 + cc2f503
commit 697ffc8
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/components/attribute-selector.tsx b/src/components/attribute-selector.tsx
@@ -55,12 +55,11 @@ export const AttributesSelector = () => {
       if (allSelected) {
         setAllSelected(false);
         draft.frequencies[selectedFrequency] = {attrs: [], filters};
-        selectedAttr && draft.frequencies[selectedFrequency].attrs.push(selectedAttr);
-      }
-      if (selectedAttrName) {
-        const attrIndex = draftAttrNames.indexOf(selectedAttrName);
-        if (selectedAttr) {
+        selectedAttr !== undefined && draft.frequencies[selectedFrequency].attrs.push(selectedAttr);
+      } else if (selectedAttrName) {
+        if (selectedAttr !== undefined) {
           if (draftAttrNames.includes(selectedAttrName)) {
+            const attrIndex = draftAttrNames.indexOf(selectedAttrName);
             if (attrIndex !== null) {
               draft.frequencies[selectedFrequency].attrs.splice(attrIndex, 1);
             }