Refactor

kausaltech · Oct 17, 2024 · 369fd80 · 369fd80
1 parent 125336c
commit 369fd80
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/components/actions/ActionListFilters.tsx b/components/actions/ActionListFilters.tsx
@@ -668,7 +668,6 @@ class CategoryFilter extends DefaultFilter<FilterValue> {
       (cat) => cat.parent,
       (cat) => cat.children
     );
-    console.log('sortedcats', sortedCats);
     this.catById = this.filterByCommonCategory
       ? new Map(sortedCats.map((c) => [c.common.id, c]))
       : new Map(sortedCats.map((c) => [c.id, c]));

diff --git a/components/indicators/IndicatorList.tsx b/components/indicators/IndicatorList.tsx
@@ -292,17 +292,12 @@ const filterIndicators = (
   includeRelatedPlans: boolean,
   categoryIdentifier?: string
 ) => {
-  const filterByCategory = (indicator) => {
-    if (
-      !categoryIdentifier ||
-      !filters[getCategoryString(categoryIdentifier)]
-    ) {
-      return true;
-    }
-    return indicator.categories.some(
+  const filterByCategory = (indicator) =>
+    !categoryIdentifier ||
+    !filters[getCategoryString(categoryIdentifier)] ||
+    !!indicator.categories.find(
       ({ type, id }) => filters[getCategoryString(type.identifier)] === id
     );
-  };
 
   const filterByCommonCategory = (indicator) => {
     const activeFilters = Object.entries(filters).filter(
@@ -323,12 +318,9 @@ const filterIndicators = (
     });
   };
 
-  const filterBySearch = (indicator) => {
-    if (!filters['name']) {
-      return true;
-    }
-    return indicator.name.toLowerCase().includes(filters['name'].toLowerCase());
-  };
+  const filterBySearch = (indicator) =>
+    !filters['name'] ||
+    indicator.name.toLowerCase().includes(filters['name'].toLowerCase());
 
   return indicators.filter((indicator) => {
     const categoryResult = filterByCategory(indicator);
@@ -447,7 +439,7 @@ const IndicatorList = ({
     ? getFilterConfig(
         categoryType,
         indicators,
-        includeRelatedPlans ? commonCategories : []
+        includeRelatedPlans ? commonCategories : null
       )
     : {};