From ba253dcce9e49fbd26db0a301945ab9d25024604 Mon Sep 17 00:00:00 2001 From: natalie beatty Date: Fri, 3 Apr 2026 12:52:51 -0400 Subject: [PATCH 1/3] fix sorting issues in miMD and openXDA --- .../TSX/SystemCenter/DeviceIssuesPage/MiMDIssuesPage.tsx | 4 +++- .../TSX/SystemCenter/DeviceIssuesPage/OpenXDAIssuesPage.tsx | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/DeviceIssuesPage/MiMDIssuesPage.tsx b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/DeviceIssuesPage/MiMDIssuesPage.tsx index f8667d425..62ce68835 100644 --- a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/DeviceIssuesPage/MiMDIssuesPage.tsx +++ b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/DeviceIssuesPage/MiMDIssuesPage.tsx @@ -46,7 +46,9 @@ function MiMDIssuesPage(props: { Meter: OpenXDA.Types.Meter }) { const settingStatus = useAppSelector(SystemCenterSettingSlice.Status); const order = React.useCallback((data: SC.MiMDDailyStatistic[]) => { - return _.orderBy(data, [sortField], [ascending ? 'asc' : 'desc']) + const sortedData = _.sortBy(data, [(e) => { sortField == 'Date' ? moment(e['Date']) : e[sortField] }]) + if (ascending) return sortedData + return sortedData.reverse() }, [sortField, ascending]); React.useEffect(() => { diff --git a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/DeviceIssuesPage/OpenXDAIssuesPage.tsx b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/DeviceIssuesPage/OpenXDAIssuesPage.tsx index e3882daf0..882817461 100644 --- a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/DeviceIssuesPage/OpenXDAIssuesPage.tsx +++ b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/DeviceIssuesPage/OpenXDAIssuesPage.tsx @@ -40,7 +40,9 @@ function OpenXDAIssuesPage(props: { Meter: OpenXDA.Types.Meter }) { const [ascending, setAscending] = React.useState(false); const order = React.useCallback((data: SC.OpenXDADailyStatistic[]) => { - return _.orderBy(data, [sortField], [ascending ? 'asc' : 'desc']) + const sortedData = _.sortBy(data, [(e) => { sortField == 'Date' ? moment(e['Date']) : e[sortField] }]) + if (ascending) return sortedData + return sortedData.reverse() }, [sortField, ascending]); React.useEffect(() => { @@ -52,7 +54,7 @@ function OpenXDAIssuesPage(props: { Meter: OpenXDA.Types.Meter }) { return () => { if (handle.abort != undefined) handle.abort(); } - }, [props.Meter.AssetKey]); + }, [props.Meter.AssetKey, ascending, sortField]); React.useEffect(() => { if (data.length === 0) return; From 1a5768dd32819cf4b4316c951a68c476c0a81b23 Mon Sep 17 00:00:00 2001 From: natalie beatty Date: Wed, 8 Apr 2026 12:10:09 -0400 Subject: [PATCH 2/3] fix sorting issues --- .../TSX/SystemCenter/DeviceIssuesPage/MiMDIssuesPage.tsx | 2 +- .../TSX/SystemCenter/DeviceIssuesPage/OpenXDAIssuesPage.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/DeviceIssuesPage/MiMDIssuesPage.tsx b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/DeviceIssuesPage/MiMDIssuesPage.tsx index 62ce68835..386aa5a70 100644 --- a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/DeviceIssuesPage/MiMDIssuesPage.tsx +++ b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/DeviceIssuesPage/MiMDIssuesPage.tsx @@ -46,7 +46,7 @@ function MiMDIssuesPage(props: { Meter: OpenXDA.Types.Meter }) { const settingStatus = useAppSelector(SystemCenterSettingSlice.Status); const order = React.useCallback((data: SC.MiMDDailyStatistic[]) => { - const sortedData = _.sortBy(data, [(e) => { sortField == 'Date' ? moment(e['Date']) : e[sortField] }]) + const sortedData = _.sortBy(data, [(e) => { return sortField == 'Date' ? moment(e['Date']) : e[sortField] }]) if (ascending) return sortedData return sortedData.reverse() }, [sortField, ascending]); diff --git a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/DeviceIssuesPage/OpenXDAIssuesPage.tsx b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/DeviceIssuesPage/OpenXDAIssuesPage.tsx index 882817461..afd551094 100644 --- a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/DeviceIssuesPage/OpenXDAIssuesPage.tsx +++ b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/DeviceIssuesPage/OpenXDAIssuesPage.tsx @@ -40,7 +40,7 @@ function OpenXDAIssuesPage(props: { Meter: OpenXDA.Types.Meter }) { const [ascending, setAscending] = React.useState(false); const order = React.useCallback((data: SC.OpenXDADailyStatistic[]) => { - const sortedData = _.sortBy(data, [(e) => { sortField == 'Date' ? moment(e['Date']) : e[sortField] }]) + const sortedData = _.sortBy(data, [(e) => { return sortField == 'Date' ? moment(e['Date']) : e[sortField] }]) if (ascending) return sortedData return sortedData.reverse() }, [sortField, ascending]); From a0b424fb1af5d6d8739ca72e2fec63e99b1da856 Mon Sep 17 00:00:00 2001 From: natalie beatty Date: Thu, 9 Apr 2026 14:55:54 -0400 Subject: [PATCH 3/3] remove unneeded dependencies --- .../TSX/SystemCenter/DeviceIssuesPage/MiMDIssuesPage.tsx | 2 +- .../TSX/SystemCenter/DeviceIssuesPage/OpenXDAIssuesPage.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/DeviceIssuesPage/MiMDIssuesPage.tsx b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/DeviceIssuesPage/MiMDIssuesPage.tsx index 386aa5a70..3c5007541 100644 --- a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/DeviceIssuesPage/MiMDIssuesPage.tsx +++ b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/DeviceIssuesPage/MiMDIssuesPage.tsx @@ -60,7 +60,7 @@ function MiMDIssuesPage(props: { Meter: OpenXDA.Types.Meter }) { return () => { if (handle != null || handle.abort != null) handle.abort(); } - }, [props.Meter.AssetKey, sortField, ascending]); + }, [props.Meter.AssetKey]); React.useEffect(() => { if (data.length === 0) return; diff --git a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/DeviceIssuesPage/OpenXDAIssuesPage.tsx b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/DeviceIssuesPage/OpenXDAIssuesPage.tsx index afd551094..9a8d6bd4a 100644 --- a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/DeviceIssuesPage/OpenXDAIssuesPage.tsx +++ b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/DeviceIssuesPage/OpenXDAIssuesPage.tsx @@ -54,7 +54,7 @@ function OpenXDAIssuesPage(props: { Meter: OpenXDA.Types.Meter }) { return () => { if (handle.abort != undefined) handle.abort(); } - }, [props.Meter.AssetKey, ascending, sortField]); + }, [props.Meter.AssetKey]); React.useEffect(() => { if (data.length === 0) return;