Merge pull request #1851 from newrelic/liz/filter-bug

Refactor disabled checks and add additional filtering
newrelic · Nov 5, 2021 · 11ecd21 · 11ecd21
2 parents e56bb10 + 3977026
commit 11ecd21
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/pages/instant-observability.js b/src/pages/instant-observability.js
@@ -140,6 +140,9 @@ const QuickstartsPage = ({ data, location }) => {
     setIsCategoriesOverlayOpen(false);
   };
 
+  const filterByContentTypes = (quickstart) =>
+    filters.every((filter) => filterByContentType(filter)(quickstart));
+
   const handleFilter = (value, e) => {
     const currentFilters = filters.slice();
     const params = new URLSearchParams(location.search);
@@ -230,13 +233,15 @@ const QuickstartsPage = ({ data, location }) => {
     ...cat,
     count: quickstarts
       .filter(filterBySearch(search))
-      .filter(filterByCategory(cat.value)).length,
+      .filter(filterByCategory(cat.value))
+      .filter(filterByContentTypes).length,
   }));
 
   const filtersWithCount = FILTERS.map((filter) => ({
     ...filter,
     count: quickstarts
       .filter(filterBySearch(search))
+      .filter(filterByContentTypes)
       .filter(filterByContentType(filter.type))
       .filter(filterByCategory(category)).length,
   }));
@@ -365,7 +370,7 @@ const QuickstartsPage = ({ data, location }) => {
                         type={type}
                         icon={icon}
                         count={count}
-                        isChecked={filters.includes(type)}
+                        isChecked={filters.includes(type) && count !== 0}
                         handleFilter={handleFilter}
                       />
                     ))}
@@ -377,6 +382,7 @@ const QuickstartsPage = ({ data, location }) => {
                     <Button
                       type="button"
                       key={value}
+                      disabled={count === 0}
                       onClick={() => handleCategory(value)}
                       css={css`
                         padding: 1rem 0.5rem;