Merge branch 'main' into backend

+ Do the filtering and sorting in the API
amberstarlight · Aug 21, 2024 · e99c914 · e99c914
2 parents c3ac542 + b744df4
commit e99c914
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 15 deletions.
diff --git a/packages/api/routes/devices.ts b/packages/api/routes/devices.ts
@@ -5,18 +5,28 @@ import express, { Request, Response, Router } from "express";
 import { Zigbee2MqttService } from "../zigbee2mqttService";
 import { ApiError } from "./api";
 import { range } from "../utils";
-import { Scene } from "@starlight/types";
+import { type Device, Scene } from "@starlight/types";
 
 const router = express.Router();
 
+const deviceSort = (a: Device, b: Device) => {
+  const x: number = parseInt(a.friendly_name[0]);
+  const y: number = parseInt(b.friendly_name[0]);
+
+  return (
+    +isFinite(x) - +isFinite(y) ||
+    a.friendly_name.localeCompare(b.friendly_name, undefined, { numeric: true })
+  );
+};
+
 export function deviceRouter(zigbee2mqttService: Zigbee2MqttService): Router {
   // get data about all existing devices
   router.get("/", async (req: Request, res: Response) => {
     const devices = await zigbee2mqttService.getDevices();
     const deviceQuery = req.query.parameter?.toString();
-    const filteredDevices = devices.filter(
-      (device) => device.device.type !== "Coordinator",
-    );
+    const cleanedDevices = devices
+      .filter((device) => device.device.type !== "Coordinator")
+      .sort((a, b) => deviceSort(a.device, b.device));
 
     if (deviceQuery !== undefined) {
       const queriedData = devices.map((device) => device.device[deviceQuery]);
@@ -26,7 +36,7 @@ export function deviceRouter(zigbee2mqttService: Zigbee2MqttService): Router {
     }
 
     return res.status(200).json({
-      data: filteredDevices,
+      data: cleanedDevices,
     });
   });
 

diff --git a/packages/ui/src/components/DeviceCard/DeviceCard.tsx b/packages/ui/src/components/DeviceCard/DeviceCard.tsx
@@ -7,12 +7,13 @@ import { StyledText, StyledHeader } from "../../utils/theme";
 import { type Device } from "@starlight/types";
 
 const emojiLookup = {
-  light: "💡",
-  switch: "🔌",
-  fan: "🌡️",
+  numeric: "📶",
+  climate: "❄️️",
   cover: "🪟",
+  fan: "🌡️",
+  light: "💡",
   lock: "🔒",
-  climate: "❄️️",
+  switch: "🔌",
 };
 
 const Card = styled.div`
@@ -21,6 +22,8 @@ const Card = styled.div`
   cursor: pointer;
   border-radius: 2rem;
 
+  opacity: ${(props) => (props.dimmed ? 1 : 0.5)};
+
   &:hover {
     background-color: ${({ theme }) => theme.hover};
   }
@@ -35,7 +38,7 @@ function DeviceCard(props: { device: Device; onClick: Function }) {
   }
 
   return (
-    <Card onClick={props.onClick}>
+    <Card onClick={props.onClick} dimmed={props.device.supported}>
       <StyledHeader>
         {deviceEmoji} {props.device.friendly_name}
       </StyledHeader>

diff --git a/packages/ui/src/components/DeviceList/DeviceList.tsx b/packages/ui/src/components/DeviceList/DeviceList.tsx
@@ -5,14 +5,10 @@ import { Link } from "wouter";
 import DeviceCard from "../DeviceCard/DeviceCard";
 import { type Device } from "@starlight/types";
 
-const deviceSort = (a: Device, b: Device) =>
-  +isFinite(a.friendly_name[0]) - +isFinite(b.friendly_name[0]) ||
-  a.friendly_name.localeCompare(b.friendly_name, undefined, { numeric: true });
-
 function DeviceList(props: { devices: Device[]; onClick: Function }) {
   return (
     <div>
-      {props.devices.sort(deviceSort).map((device: Device) => (
+      {props.devices.map((device: Device) => (
         <Link
           href={`/devices/${device.ieee_address}`}
           key={device.ieee_address}