From 8dcf7c3bb941f7d8ce9864215f5bff919cac0ce8 Mon Sep 17 00:00:00 2001 From: Ross Leitch Date: Tue, 20 Feb 2024 12:54:04 +1300 Subject: [PATCH] Alarm views --- .../src/pages/device-control/utils/report.ts | 1 + packages/core-ui/command-surface/src/views/alarms.tsx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/app/hivecommand-frontend/src/pages/device-control/utils/report.ts b/packages/app/hivecommand-frontend/src/pages/device-control/utils/report.ts index a5feeb252..8f771150f 100644 --- a/packages/app/hivecommand-frontend/src/pages/device-control/utils/report.ts +++ b/packages/app/hivecommand-frontend/src/pages/device-control/utils/report.ts @@ -54,6 +54,7 @@ export const useDeviceReports = (id: string) => { } } + export const useDeviceReportData = (deviceId: string, reportId: string, horizon: {start: Date, end?: Date}) => { const { data: reportData, loading } = useQuery(gql` query ReportDataValue($id: ID, $reportId: ID, $startDate: DateTime, $endDate: DateTime){ diff --git a/packages/core-ui/command-surface/src/views/alarms.tsx b/packages/core-ui/command-surface/src/views/alarms.tsx index 23a4815d4..f7da90aee 100644 --- a/packages/core-ui/command-surface/src/views/alarms.tsx +++ b/packages/core-ui/command-surface/src/views/alarms.tsx @@ -8,7 +8,7 @@ export const AlarmList = () => { const { alarms } = useContext(DeviceControlContext); - const sortedAlarms = alarms?.slice()?.sort((a,b) => a.createdAt?.getTime() - b.createdAt?.getTime()) + const sortedAlarms = alarms?.slice()?.sort((a,b) => new Date(a.createdAt)?.getTime() - new Date(b.createdAt)?.getTime()) const [ expanded, setExpanded ] = useState([])