Skip to content

Open-source status page, incident response and uptime monitoring

wip: grouped monitor index order (#1544)

Maximilian Kaske2e34e6e245a0
diff --git a/apps/dashboard/src/components/forms/status-page/form-monitors.tsx b/apps/dashboard/src/components/forms/status-page/form-monitors.tsx
index f5c52896b..dfe7bce88 100644
--- a/apps/dashboard/src/components/forms/status-page/form-monitors.tsx
+++ b/apps/dashboard/src/components/forms/status-page/form-monitors.tsx
@@ -318,8 +318,6 @@ export function FormMonitors({
function submitAction(values: FormValues) {
if (isPending) return;
- console.log("submitAction", values);
-
startTransition(async () => {
try {
const promise = onSubmit(values);
@@ -639,6 +637,7 @@ function MonitorGroup({
/>
</SortableItemHandle>
<FormField
+ key={`${group.id}-name-${groupIndex}`}
control={form.control}
name={`groups.${groupIndex}.name` as const}
render={({ field }) => (
@@ -657,6 +656,7 @@ function MonitorGroup({
/>
</div>
<FormField
+ key={`${group.id}-monitors-${groupIndex}`}
control={form.control}
name={`groups.${groupIndex}.monitors` as const}
render={({ field }) => (
diff --git a/apps/dashboard/src/components/forms/status-page/update.tsx b/apps/dashboard/src/components/forms/status-page/update.tsx
index b54f79365..b90948715 100644
--- a/apps/dashboard/src/components/forms/status-page/update.tsx
+++ b/apps/dashboard/src/components/forms/status-page/update.tsx
@@ -125,9 +125,8 @@ export function FormStatusPageUpdate() {
})),
groups: statusPage.monitorGroups.map((group) => {
const order =
- statusPage.monitors.find((m) => m.groupId === group.id)
- ?.groupOrder ?? 0;
- console.log(group);
+ statusPage.monitors.find((m) => m.groupId === group.id)?.order ??
+ 0;
return {
id: -1 * group.id, // negative id to avoid conflicts with monitors
order,
@@ -136,7 +135,7 @@ export function FormStatusPageUpdate() {
.filter((m) => m.groupId === group.id)
.map((monitor) => ({
id: monitor.id,
- order: monitor.order,
+ order: monitor.groupOrder,
active: monitor.active ?? null,
})),
};