openstatus.dev
Openstatus
www.openstatus.dev
wip: grouped monitor index order (#1544)
* wip: grouped monitor index order
* fix: group order
authored by
Maximilian Kaske
and committed by
GitHub
2e34e6e2
35040bae
+5
-6
+2
-2
apps/dashboard/src/components/forms/status-page/form-monitors.tsx
+2
-2
apps/dashboard/src/components/forms/status-page/form-monitors.tsx
···
318
318
function submitAction(values: FormValues) {
319
319
if (isPending) return;
320
320
321
-
console.log("submitAction", values);
322
-
323
321
startTransition(async () => {
324
322
try {
325
323
const promise = onSubmit(values);
···
639
637
/>
640
638
</SortableItemHandle>
641
639
<FormField
640
+
key={`${group.id}-name-${groupIndex}`}
642
641
control={form.control}
643
642
name={`groups.${groupIndex}.name` as const}
644
643
render={({ field }) => (
···
657
656
/>
658
657
</div>
659
658
<FormField
659
+
key={`${group.id}-monitors-${groupIndex}`}
660
660
control={form.control}
661
661
name={`groups.${groupIndex}.monitors` as const}
662
662
render={({ field }) => (
+3
-4
apps/dashboard/src/components/forms/status-page/update.tsx
+3
-4
apps/dashboard/src/components/forms/status-page/update.tsx
···
125
125
})),
126
126
groups: statusPage.monitorGroups.map((group) => {
127
127
const order =
128
-
statusPage.monitors.find((m) => m.groupId === group.id)
129
-
?.groupOrder ?? 0;
130
-
console.log(group);
128
+
statusPage.monitors.find((m) => m.groupId === group.id)?.order ??
129
+
0;
131
130
return {
132
131
id: -1 * group.id, // negative id to avoid conflicts with monitors
133
132
order,
···
136
135
.filter((m) => m.groupId === group.id)
137
136
.map((monitor) => ({
138
137
id: monitor.id,
139
-
order: monitor.order,
138
+
order: monitor.groupOrder,
140
139
active: monitor.active ?? null,
141
140
})),
142
141
};