reduce compare operation in item filter

Signed-off-by: GRBurst <[email protected]>
GRBurst · May 26, 2024 · 494b020 · 494b020
1 parent 2f1d30d
commit 494b020
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/frontend/src/components/FilterableJobList.tsx b/frontend/src/components/FilterableJobList.tsx
@@ -5,7 +5,7 @@ import sanitizeHtml from "sanitize-html";
 
 import { Item } from "../models/Item";
 import { TagFilter, TagFilters, tagFilterToString } from "../models/TagFilter";
-import { filterByRegexAny, flatFilters, itemFilter } from "../utils/hn";
+import { filterByRegexAny, flatFilters, itemFilter, itemPrefilter } from "../utils/hn";
 import { TagFilterDrawer } from "./TagFilterBar";
 import { AppConfig } from "../utils/config";
 import { JobStatistics } from "./JobStatistics";
@@ -161,14 +161,18 @@ const FilterableJobList = ({
   };
 
   console.debug("ItemList: ", items);
-  const filteredItems = items !== undefined ? itemFilter(
+  const cleansedItems = items !== undefined ? itemPrefilter(
     items,
-    flatActive,
-    searchFilter,
     parentItemId,
     userId
   ) : undefined;
 
+  const filteredItems = cleansedItems !== undefined ? itemFilter(
+    cleansedItems,
+    flatActive,
+    searchFilter,
+  ) : undefined;
+
   console.debug("FilteredItemList: ", filteredItems);
 
   return (
@@ -200,7 +204,7 @@ const FilterableJobList = ({
           onSearch={(needle: string | undefined) => setSearchFilter(needle)}
         />
         <JobStatistics
-          allItems={items ?? []}
+          allItems={cleansedItems ?? []}
           items={filteredItems ?? []}
           activeFilters={flatActive}
         />

diff --git a/frontend/src/utils/hn.ts b/frontend/src/utils/hn.ts
@@ -49,10 +49,9 @@ const filterByRegex = (haystack: string | undefined, patterns: RegExp[]): boolea
     patterns
         .reduce<boolean>((acc, pattern) => acc && (haystack !== undefined && haystack.search(pattern) > -1), true)
 
-const itemFilter = (items: Item[], tagFilters: TagFilter[], searchFilter: string | undefined = undefined, parentFilter: number | undefined = undefined, userFilter: string | undefined = undefined, filterFlagged: boolean = true) => {
+const itemPrefilter = (items: Item[], parentFilter: number | undefined = undefined, userFilter: string | undefined = undefined, filterFlagged: boolean = true) => {
     try {
         return items
-            .filter(item => item.id == item.id || parentFilter == parentFilter || filterFlagged == filterFlagged || tagFilters == tagFilters || searchFilter == searchFilter || true)
             .filter(item => 
                 item.text !== undefined
                 && item.text !== null
@@ -64,15 +63,25 @@ const itemFilter = (items: Item[], tagFilters: TagFilter[], searchFilter: string
                 && (parentFilter !== undefined && parentFilter !== null ? item.parent == parentFilter : true)
                 && (userFilter !== undefined && userFilter !== null ? item.by == userFilter : true)
             )
-            .filter(item => filterByRegex(item.text, tagFilters.map(tag => tag.pattern)))
-            .filter(item => searchFilter !== undefined ? item.text?.includes(searchFilter) : true)
             .reverse()
     } catch (e) {
         console.warn(e)
         return []
     }
 }
 
+const itemFilter = (items: Item[], tagFilters: TagFilter[], searchFilter: string | undefined = undefined) => {
+    try {
+        return items
+            .filter(item => 
+                filterByRegex(item.text, tagFilters.map(tag => tag.pattern))
+                && searchFilter !== undefined ? item.text?.includes(searchFilter) : true)
+    } catch (e) {
+        console.warn(e)
+        return []
+    }
+}
+
 const flatFilters = (filters: Map<string, TagFilters>): TagFilter[] => Array.from(filters.values()).map(filterSet => Array.from(filterSet)).flat()
 
-export { filterByRegex, filterByRegexAny, flatFilters, getItemFromId, getItemsFromIds, getItemsFromQueryId, getItemsFromQueryIds, getKidItemsFromIds, itemFilter };
+export { filterByRegex, filterByRegexAny, flatFilters, getItemFromId, getItemsFromIds, getItemsFromQueryId, getItemsFromQueryIds, getKidItemsFromIds, itemPrefilter, itemFilter };