From 97130884cd315c17bccd7a993c7bb50b3a86423c Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Tue, 27 Aug 2024 23:04:29 +0000
Subject: [PATCH] Logic fix..

- Do not return early, this is mistake!
- Correctly handle empty activeFilter state
---
 src/frontend/src/tables/FilterSelectDrawer.tsx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/frontend/src/tables/FilterSelectDrawer.tsx b/src/frontend/src/tables/FilterSelectDrawer.tsx
index 301e6909cdba..a9a1f97a3cf5 100644
--- a/src/frontend/src/tables/FilterSelectDrawer.tsx
+++ b/src/frontend/src/tables/FilterSelectDrawer.tsx
@@ -65,11 +65,13 @@ function FilterAddGroup({
   availableFilters: TableFilter[];
 }) {
   const filterOptions: TableFilterChoice[] = useMemo(() => {
-    if (!tableState?.activeFilters || tableState.activeFilters.length == 0) {
-      return [];
+    // List of filter names which are already active on this table
+    let activeFilterNames: string[] = [];
+
+    if (tableState.activeFilters && tableState.activeFilters.length > 0) {
+      activeFilterNames =
+        tableState.activeFilters?.map((flt) => flt.name) ?? [];
     }
-    let activeFilterNames =
-      tableState.activeFilters?.map((flt) => flt.name) ?? [];
 
     return (
       availableFilters
@@ -86,7 +88,7 @@ function FilterAddGroup({
 
   const valueOptions: TableFilterChoice[] = useMemo(() => {
     // Find the matching filter
-    let filter: TableFilter | undefined = availableFilters.find(
+    let filter: TableFilter | undefined = availableFilters?.find(
       (flt) => flt.name === selectedFilter
     );