Backport device sort from development

amberstarlight · Jul 17, 2024 · 3f28f56 · 3f28f56
1 parent 3a14f47
commit 3f28f56
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -48,5 +48,6 @@
     "husky": "^7.0.4",
     "prettier": "^2.4.1",
     "react-scripts": "4.0.3"
-  }
+  },
+  "packageManager": "[email protected]+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
 }
diff --git a/src/components/DeviceList/DeviceList.js b/src/components/DeviceList/DeviceList.js
@@ -3,10 +3,17 @@
 import { Link } from 'wouter';
 import DeviceCard from '../DeviceCard/DeviceCard';
 
+const deviceSort = (a, b) => {
+  a.friendly_name[0] - b.friendly_name[0] ||
+    a.friendly_name.localeCompare(b.friendly_name, undefined, {
+      numeric: true,
+    });
+};
+
 function DeviceList(props) {
   return (
     <div>
-      {props.devices.map((device) => (
+      {props.devices.sort(deviceSort).map((device) => (
         <Link
           href={`/devices/${device.friendly_name}`}
           key={device.ieee_address}