Skip to content

Open-source status page, incident response and uptime monitoring

chore: order inactive monitors

Maximilian Kasked77fbcf381e3
diff --git a/apps/web/src/components/data-table/monitor/data-table.tsx b/apps/web/src/components/data-table/monitor/data-table.tsx
index 3aa4f4fdf..4ada7d05e 100644
--- a/apps/web/src/components/data-table/monitor/data-table.tsx
+++ b/apps/web/src/components/data-table/monitor/data-table.tsx
@@ -73,6 +73,8 @@ export function DataTable<TData, TValue>({
pagination,
sorting,
},
+ // @ts-expect-error - REMINDER: unfortunately we cannot pass a function from a RSC to a client component
+ getRowId: (row, index) => row.monitor?.id?.toString() ?? index,
onPaginationChange: setPagination,
getPaginationRowModel: getPaginationRowModel(),
onColumnFiltersChange: setColumnFilters,
diff --git a/apps/workflows/src/scripts/tinybird.ts b/apps/workflows/src/scripts/tinybird.ts
index bb69300f8..4493ee698 100644
--- a/apps/workflows/src/scripts/tinybird.ts
+++ b/apps/workflows/src/scripts/tinybird.ts
@@ -28,7 +28,7 @@ function calculatePastTimestamp(days: number) {
const date = new Date();
date.setDate(date.getDate() - days);
const timestamp = date.getTime();
- console.log(`${days}: ${timestamp}`);
+ console.log(`${days}d back: ${timestamp}`);
return timestamp;
}
@@ -95,7 +95,7 @@ async function main() {
const lastTwoWeeks = calculatePastTimestamp(14);
const lastThreeMonths = calculatePastTimestamp(90);
const lastYear = calculatePastTimestamp(365);
- const _lastTwoYears = calculatePastTimestamp(730);
+ // const _lastTwoYears = calculatePastTimestamp(730);
const starters = await getWorkspaceIdsByPlan("starter");
const teams = await getWorkspaceIdsByPlan("team");
diff --git a/packages/api/src/router/monitor.ts b/packages/api/src/router/monitor.ts
index dc6981c69..67ae80194 100644
--- a/packages/api/src/router/monitor.ts
+++ b/packages/api/src/router/monitor.ts
@@ -627,6 +627,7 @@ export const monitorRouter = createTRPCRouter({
with: {
monitorTagsToMonitors: { with: { monitorTag: true } },
},
+ orderBy: (monitor, { desc }) => [desc(monitor.active)],
});
return z