mirror/Checkmate
1
0
Fork 0
mirror of https://github.com/bluewave-labs/Checkmate.git synced 2026-05-20 08:28:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

sorting

Browse Source
This commit is contained in:
Alex Holliday
2026-02-03 22:07:59 +00:00
parent e3921beac4
commit 0a408f8cfd
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/Hooks/useStatusPageForm.ts
+1 -1
View File
@@ -28,7 +28,7 @@ export const useStatusPageForm = ({
url: data?.url || generateDefaultUrl(),
timezone: data?.timezone || Intl.DateTimeFormat().resolvedOptions().timeZone,
color: data?.color || "#4169E1",
monitors: monitors?.map((m) => m.id) || [],
monitors: data?.monitors || [],
isPublished: data?.isPublished ?? false,
showCharts: data?.showCharts ?? true,
showUptimePercentage: data?.showUptimePercentage ?? true,
server/src/controllers/statusPageController.ts
+9 -1
View File
@@ -82,7 +82,15 @@ class StatusPageController {
const showURL = settings.showURL;
const monitors = await this.monitorsRepository.findByIds(statusPage.monitors);
const normalizedMonitors = monitors.map((monitor) => {
// Sort monitors according to the order in statusPage.monitors
const monitorOrder = new Map(statusPage.monitors.map((id, index) => [id, index]));
const sortedMonitors = [...monitors].sort((a, b) => {
const orderA = monitorOrder.get(a.id) ?? Number.MAX_SAFE_INTEGER;
const orderB = monitorOrder.get(b.id) ?? Number.MAX_SAFE_INTEGER;
return orderA - orderB;
});
const normalizedMonitors = sortedMonitors.map((monitor) => {
const normalizedChecks = NormalizeData(monitor.recentChecks, 10, 100);
if (!showURL) {
const { url, port, secret, notifications, ...rest } = monitor;