From 8ee05d0f45e87ce55c99160bcd6b36e40409a7e1 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Mon, 30 Oct 2023 15:24:51 -0700 Subject: [PATCH 1/3] Only show manufacturers with device models --- package-lock.json | 8 ++++---- package.json | 2 +- .../SupportedDeviceTable/use-filtered-device-models.ts | 4 ++-- .../SupportedDeviceTable/use-filtered-manufacturers.ts | 9 ++++++++- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1347a0d6b..30b767ce6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ "@seamapi/fake-devicedb": "^1.1.0", "@seamapi/fake-seam-connect": "^1.37.1", "@seamapi/http": "^0.2.1", - "@seamapi/types": "^1.28.0", + "@seamapi/types": "^1.32.0", "@storybook/addon-designs": "^7.0.1", "@storybook/addon-essentials": "^7.0.2", "@storybook/addon-links": "^7.0.2", @@ -4706,9 +4706,9 @@ } }, "node_modules/@seamapi/types": { - "version": "1.28.0", - "resolved": "https://registry.npmjs.org/@seamapi/types/-/types-1.28.0.tgz", - "integrity": "sha512-1D/WM48lMgzTFGGP+HJ7BIoSoH4slHR/HBJFJ9vNcul7FKdF5xh998GK4260mm8uqYvdkV0j335bBBq7uCK1ig==", + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/@seamapi/types/-/types-1.32.0.tgz", + "integrity": "sha512-uFt+0TjeW4NCHo2wPTz2UnRnQ33hwskKSumjKvSfDyj4KCeIDLxxf9/p8WStbQh8r7OHyEwWS/fWVZ/Srt/cdA==", "dev": true, "engines": { "node": ">=16.13.0", diff --git a/package.json b/package.json index 818132ee4..b588ccc79 100644 --- a/package.json +++ b/package.json @@ -143,7 +143,7 @@ "@seamapi/fake-devicedb": "^1.1.0", "@seamapi/fake-seam-connect": "^1.37.1", "@seamapi/http": "^0.2.1", - "@seamapi/types": "^1.28.0", + "@seamapi/types": "^1.32.0", "@storybook/addon-designs": "^7.0.1", "@storybook/addon-essentials": "^7.0.2", "@storybook/addon-links": "^7.0.2", diff --git a/src/lib/seam/components/SupportedDeviceTable/use-filtered-device-models.ts b/src/lib/seam/components/SupportedDeviceTable/use-filtered-device-models.ts index 105350935..c2784add2 100644 --- a/src/lib/seam/components/SupportedDeviceTable/use-filtered-device-models.ts +++ b/src/lib/seam/components/SupportedDeviceTable/use-filtered-device-models.ts @@ -46,10 +46,10 @@ export const useFilteredDeviceModels = ({ params.manufacturer_ids = manufacturers.map((m) => m.manufacturer_id) } - const { deviceModels, ...query } = useDeviceModels(params) + const { deviceModels, ...rest } = useDeviceModels(params) return { - ...query, + ...rest, deviceModels: deviceModels?.filter( (deviceModel) => manufacturers?.some( diff --git a/src/lib/seam/components/SupportedDeviceTable/use-filtered-manufacturers.ts b/src/lib/seam/components/SupportedDeviceTable/use-filtered-manufacturers.ts index 06128a3bc..7064a3370 100644 --- a/src/lib/seam/components/SupportedDeviceTable/use-filtered-manufacturers.ts +++ b/src/lib/seam/components/SupportedDeviceTable/use-filtered-manufacturers.ts @@ -7,9 +7,16 @@ interface Params { export const useFilteredManufacturers = ( params: Params ): ReturnType => { - return useManufacturers({ + const { manufacturers, ...rest } = useManufacturers({ liqe_query: createLiqeQuery(params), }) + + return { + ...rest, + manufacturers: manufacturers?.filter( + (manufacturer) => manufacturer.device_model_count > 0 + ), + } } export const createLiqeQuery = ({ From 6c9925e978f5fe06ced2c200f3aa3fe605222745 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Mon, 30 Oct 2023 18:05:20 -0700 Subject: [PATCH 2/3] Update fake-seam-connect --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 30b767ce6..f82332668 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,7 +23,7 @@ "@mui/material": "^5.12.2", "@rxfork/r2wc-react-to-web-component": "^2.4.0", "@seamapi/fake-devicedb": "^1.1.0", - "@seamapi/fake-seam-connect": "^1.37.1", + "@seamapi/fake-seam-connect": "^1.41.0", "@seamapi/http": "^0.2.1", "@seamapi/types": "^1.32.0", "@storybook/addon-designs": "^7.0.1", @@ -4662,9 +4662,9 @@ } }, "node_modules/@seamapi/fake-seam-connect": { - "version": "1.37.1", - "resolved": "https://registry.npmjs.org/@seamapi/fake-seam-connect/-/fake-seam-connect-1.37.1.tgz", - "integrity": "sha512-MhjLZ65bp+LPRDR14DqwSoH4cIeyQVt6qRjLfl2aq3NZPv+9oghwOQlAByC9/qjLEpTUemHHf7AR3xVJlSwThw==", + "version": "1.41.0", + "resolved": "https://registry.npmjs.org/@seamapi/fake-seam-connect/-/fake-seam-connect-1.41.0.tgz", + "integrity": "sha512-fJ7HWLzdrt4KuRd8QjxQ7kRA126QhZIvyuhL6EP/iL8kgeG74nivHldtyOT3LpLUbRZOD0KBnfFwVBtvxdB4xw==", "dev": true, "bin": { "fake-seam-connect": "dist/server.js" diff --git a/package.json b/package.json index b588ccc79..cc570d3d0 100644 --- a/package.json +++ b/package.json @@ -141,7 +141,7 @@ "@mui/material": "^5.12.2", "@rxfork/r2wc-react-to-web-component": "^2.4.0", "@seamapi/fake-devicedb": "^1.1.0", - "@seamapi/fake-seam-connect": "^1.37.1", + "@seamapi/fake-seam-connect": "^1.41.0", "@seamapi/http": "^0.2.1", "@seamapi/types": "^1.32.0", "@storybook/addon-designs": "^7.0.1", From c5999b0dcbc8e790195a39fd135a6192ac24e833 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Mon, 30 Oct 2023 18:25:41 -0700 Subject: [PATCH 3/3] Update fake-devicedb --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index f82332668..ee7940052 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "@mui/icons-material": "^5.11.16", "@mui/material": "^5.12.2", "@rxfork/r2wc-react-to-web-component": "^2.4.0", - "@seamapi/fake-devicedb": "^1.1.0", + "@seamapi/fake-devicedb": "^1.2.0", "@seamapi/fake-seam-connect": "^1.41.0", "@seamapi/http": "^0.2.1", "@seamapi/types": "^1.32.0", @@ -4647,9 +4647,9 @@ } }, "node_modules/@seamapi/fake-devicedb": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@seamapi/fake-devicedb/-/fake-devicedb-1.1.0.tgz", - "integrity": "sha512-EI93LjoTR0d4Bv3oT0UAHiwY5c+g9FCBWH3GGrvpLxdTJKyZ6qLzUS21hSUGAg77RdIVaDall0MOMK+CxrPJ0w==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@seamapi/fake-devicedb/-/fake-devicedb-1.2.0.tgz", + "integrity": "sha512-Ve/K2CSMjDhKbYArAnWfoMpkbYABQNVWPmT7x8QSJ7IW6OdaQOJG4LakFSB1kOyOumCdcay/KJNOE/UFurQVOQ==", "dev": true, "engines": { "node": ">=16.13.0", diff --git a/package.json b/package.json index cc570d3d0..a61b009b1 100644 --- a/package.json +++ b/package.json @@ -140,7 +140,7 @@ "@mui/icons-material": "^5.11.16", "@mui/material": "^5.12.2", "@rxfork/r2wc-react-to-web-component": "^2.4.0", - "@seamapi/fake-devicedb": "^1.1.0", + "@seamapi/fake-devicedb": "^1.2.0", "@seamapi/fake-seam-connect": "^1.41.0", "@seamapi/http": "^0.2.1", "@seamapi/types": "^1.32.0",