Merge pull request #186 from TogetherCrew/fix/deselect-overview-boxes

add ability to deselect
TogetherCrew · Sep 14, 2023 · 5440938 · 5440938
2 parents 2ab1815 + 1d6d1c7
commit 5440938
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 11 deletions.
diff --git a/src/components/pages/statistics/ActiveMembersComposition.tsx b/src/components/pages/statistics/ActiveMembersComposition.tsx
@@ -225,7 +225,11 @@ export default function ActiveMembersComposition({
 
     if (existingFilterIndex !== -1) {
       // If it exists, replace the existing filter's label with the new label
-      existingFilters[existingFilterIndex].label = label;
+      if (existingFilters[existingFilterIndex].label !== label) {
+        existingFilters[existingFilterIndex].label = label;
+      } else {
+        existingFilters.splice(existingFilterIndex, 1); // remove the item
+      }
     } else {
       // If it doesn't exist, add the new filter to the array
       existingFilters.push(newFilter);

diff --git a/src/components/pages/statistics/DisengagedMembersComposition.tsx b/src/components/pages/statistics/DisengagedMembersComposition.tsx
@@ -210,7 +210,11 @@ export default function DisengagedMembersComposition({
 
     if (existingFilterIndex !== -1) {
       // If it exists, replace the existing filter's label with the new label
-      existingFilters[existingFilterIndex].label = label;
+      if (existingFilters[existingFilterIndex].label !== label) {
+        existingFilters[existingFilterIndex].label = label;
+      } else {
+        existingFilters.splice(existingFilterIndex, 1); // remove the item
+      }
     } else {
       // If it doesn't exist, add the new filter to the array
       existingFilters.push(newFilter);

diff --git a/src/components/pages/statistics/Onboarding.tsx b/src/components/pages/statistics/Onboarding.tsx
@@ -187,7 +187,11 @@ export default function Onboarding({
 
     if (existingFilterIndex !== -1) {
       // If it exists, replace the existing filter's label with the new label
-      existingFilters[existingFilterIndex].label = label;
+      if (existingFilters[existingFilterIndex].label !== label) {
+        existingFilters[existingFilterIndex].label = label;
+      } else {
+        existingFilters.splice(existingFilterIndex, 1); // remove the item
+      }
     } else {
       // If it doesn't exist, add the new filter to the array
       existingFilters.push(newFilter);

diff --git a/src/components/pages/statistics/memberBreakdowns/activeMembers/ActiveMemberBreakdown.tsx b/src/components/pages/statistics/memberBreakdowns/activeMembers/ActiveMemberBreakdown.tsx
@@ -116,6 +116,10 @@ export default function ActiveMemberBreakdown() {
             const matchedValue = matchedOption.value;
             handleActivityOptionSelectionChange([matchedValue]);
           }
+        } else {
+          handleActivityOptionSelectionChange(
+            options.map((option) => option.value)
+          );
         }
       }
     }

diff --git a/...s/memberBreakdowns/disengagedMembersComposition/DisengagedMembersCompositionBreakdown.tsx b/...s/memberBreakdowns/disengagedMembersComposition/DisengagedMembersCompositionBreakdown.tsx
@@ -46,10 +46,7 @@ const options: IActivityCompositionOptions[] = [
 ];
 
 export default function DisengagedMembersCompositionBreakdown() {
-  const {
-    getDisengagedMembersCompositionTable,
-    isDisengagedMembersCompositionBreakdownLoading,
-  } = useAppStore();
+  const { getDisengagedMembersCompositionTable } = useAppStore();
 
   const tableTopRef = useRef<HTMLDivElement>(null);
 
@@ -130,6 +127,10 @@ export default function DisengagedMembersCompositionBreakdown() {
             const matchedValue = matchedOption.value;
             handleActivityOptionSelectionChange([matchedValue]);
           }
+        } else {
+          handleActivityOptionSelectionChange(
+            options.map((option) => option.value)
+          );
         }
       }
     }

diff --git a/...onents/pages/statistics/memberBreakdowns/onboardingMembers/OnboardingMembersBreakdown.tsx b/...onents/pages/statistics/memberBreakdowns/onboardingMembers/OnboardingMembersBreakdown.tsx
@@ -34,10 +34,7 @@ const options: IActivityCompositionOptions[] = [
 ];
 
 export default function OnboardingMembersBreakdown() {
-  const {
-    getOnboardingMemberCompositionTable,
-    isOnboardingMembersBreakdownLoading,
-  } = useAppStore();
+  const { getOnboardingMemberCompositionTable } = useAppStore();
 
   const tableTopRef = useRef<HTMLDivElement>(null);
 
@@ -118,6 +115,10 @@ export default function OnboardingMembersBreakdown() {
             const matchedValue = matchedOption.value;
             handleActivityOptionSelectionChange([matchedValue]);
           }
+        } else {
+          handleActivityOptionSelectionChange(
+            options.map((option) => option.value)
+          );
         }
       }
     }