Merge 5084d2dcb2 into 8a432ac937

fix(status page): Make sure the group deletion is correctly handled when groupIDList is empty (#5340 )
Change the LIMIT to 100 to ensure enough data for even a 4K display (3840px wide)
2024-11-23 14:54:05 +00:00 · 2024-11-12 18:00:27 +00:00 · 2024-11-12 19:00:09 +01:00 · 2024-10-24 15:56:06 +00:00 · 2024-10-24 15:50:15 +00:00
4 changed files with 15 additions and 11 deletions
--- a/server/routers/status-page-router.js
+++ b/server/routers/status-page-router.js
@ -85,7 +85,7 @@ router.get("/api/status-page/heartbeat/:slug", cache("1 minutes"), async (reques
                    SELECT * FROM heartbeat
                    WHERE monitor_id = ?
                    ORDER BY time DESC
-                    LIMIT 50
+                    LIMIT 100
            `, [
                monitorID,
            ]);
--- a/server/socket-handlers/status-page-socket-handler.js
+++ b/server/socket-handlers/status-page-socket-handler.js
@ -220,13 +220,17 @@ module.exports.statusPageSocketHandler = (socket) => {

            // Delete groups that are not in the list
            log.debug("socket", "Delete groups that are not in the list");
-            const slots = groupIDList.map(() => "?").join(",");
+            if (groupIDList.length === 0) {
+                await R.exec("DELETE FROM `group` WHERE status_page_id = ?", [ statusPage.id ]);
+            } else {
+                const slots = groupIDList.map(() => "?").join(",");

-            const data = [
-                ...groupIDList,
-                statusPage.id
-            ];
-            await R.exec(`DELETE FROM \`group\` WHERE id NOT IN (${slots}) AND status_page_id = ?`, data);
+                const data = [
+                    ...groupIDList,
+                    statusPage.id
+                ];
+                await R.exec(`DELETE FROM \`group\` WHERE id NOT IN (${slots}) AND status_page_id = ?`, data);
+            }

            const server = UptimeKumaServer.getInstance();

--- a/src/components/MonitorListItem.vue
+++ b/src/components/MonitorListItem.vue
@ -14,7 +14,7 @@

            <router-link :to="monitorURL(monitor.id)" class="item" :class="{ 'disabled': ! monitor.active }">
                <div class="row">
-                    <div class="col-9 col-md-8 small-padding" :class="{ 'monitor-item': $root.userHeartbeatBar == 'bottom' || $root.userHeartbeatBar == 'none' }">
+                    <div class="col-6 small-padding" :class="{ 'monitor-item': $root.userHeartbeatBar == 'bottom' || $root.userHeartbeatBar == 'none' }">
                        <div class="info">
                            <Uptime :monitor="monitor" type="24" :pill="true" />
                            <span v-if="hasChildren" class="collapse-padding" @click.prevent="changeCollapsed">
@ -26,7 +26,7 @@
                            <Tag v-for="tag in monitor.tags" :key="tag" :item="tag" :size="'sm'" />
                        </div>
                    </div>
-                    <div v-show="$root.userHeartbeatBar == 'normal'" :key="$root.userHeartbeatBar" class="col-3 col-md-4">
+                    <div v-show="$root.userHeartbeatBar == 'normal'" :key="$root.userHeartbeatBar" class="col-6">
                        <HeartbeatBar ref="heartbeatBar" size="small" :monitor-id="monitor.id" />
                    </div>
                </div>
--- a/src/components/PublicGroupList.vue
+++ b/src/components/PublicGroupList.vue
@ -33,7 +33,7 @@
                        <template #item="monitor">
                            <div class="item" data-testid="monitor">
                                <div class="row">
-                                    <div class="col-9 col-md-8 small-padding">
+                                    <div class="col-6 small-padding">
                                        <div class="info">
                                            <font-awesome-icon v-if="editMode" icon="arrows-alt-v" class="action drag me-3" />
                                            <font-awesome-icon v-if="editMode" icon="times" class="action remove me-3" @click="removeMonitor(group.index, monitor.index)" />
@ -71,7 +71,7 @@
                                            </div>
                                        </div>
                                    </div>
-                                    <div :key="$root.userHeartbeatBar" class="col-3 col-md-4">
+                                    <div :key="$root.userHeartbeatBar" class="col-6">
                                        <HeartbeatBar size="mid" :monitor-id="monitor.element.id" />
                                    </div>
                                </div>
Author	SHA1	Message	Date
Ryo Hanafusa	73d074dc14	Merge `5084d2dcb2` into `8a432ac937`	2024-11-12 18:00:27 +00:00
Ionys	8a432ac937	fix(status page): Make sure the group deletion is correctly handled when `groupIDList` is empty (#5340 ) Some checks failed Auto Test / check-linters (push) Has been cancelled Details Auto Test / armv7-simple-test (18, ARMv7) (push) Has been cancelled Details Auto Test / armv7-simple-test (20, ARMv7) (push) Has been cancelled Details Auto Test / e2e-test (push) Has been cancelled Details CodeQL / Analyze (push) Has been cancelled Details Merge Conflict Labeler / Labeling (push) Has been cancelled Details validate / json-yaml-validate (push) Has been cancelled Details validate / validate (push) Has been cancelled Details Auto Test / auto-test (18, ARM64) (push) Has been cancelled Details Auto Test / auto-test (18, macos-latest) (push) Has been cancelled Details Auto Test / auto-test (18, ubuntu-latest) (push) Has been cancelled Details Auto Test / auto-test (18, windows-latest) (push) Has been cancelled Details Auto Test / auto-test (20, ARM64) (push) Has been cancelled Details Auto Test / auto-test (20, macos-latest) (push) Has been cancelled Details Auto Test / auto-test (20, ubuntu-latest) (push) Has been cancelled Details Auto Test / auto-test (20, windows-latest) (push) Has been cancelled Details	2024-11-12 19:00:09 +01:00
Ryo Hanafusa	5084d2dcb2	Change the LIMIT to 100 to ensure enough data for even a 4K display (3840px wide)	2024-10-24 15:56:06 +00:00
Ryo Hanafusa	dfb921b319	Standardize column size to `col-6` and expand heart beat area	2024-10-24 15:50:15 +00:00