Merge pull request #334 from seamapi/fix-excluded-brands

Author: razor-x

src/lib/seam/components/SupportedDeviceTable/SupportedDeviceFilterArea.tsx

@@ -139,7 +139,10 @@ const useAvailableBrands = (
     })
     .filter((brand) => {
       if (brands === null) return true
-      return brands.includes(brand) && !excludedBrands.includes(brand)
+      return brands.includes(brand)
+    })
+    .filter((brand) => {
+      return !excludedBrands.includes(brand)
     })
     .map((brand) => capitalize(brand))
 

src/lib/seam/components/SupportedDeviceTable/use-filtered-device-models.ts

@@ -35,16 +35,17 @@ export const useFilteredDeviceModels = ({
 
   const query = useDeviceModels(params)
 
-  if (brands === null) {
-    return query
-  }
-
   // UPSTREAM: The API does not have a brands or excludedBrands query parameter,
   // so selected brands are filtered here.
   return {
     ...query,
-    deviceModels: query.deviceModels?.filter(
-      ({ brand }) => brands.includes(brand) && !excludedBrands.includes(brand)
-    ),
+    deviceModels: query.deviceModels
+      ?.filter(({ brand }) => {
+        if (brands === null) return true
+        return brands.includes(brand)
+      })
+      .filter(({ brand }) => {
+        return !excludedBrands.includes(brand)
+      }),
   }
 }