goosebit 0.2.4__py3-none-any.whl → 0.2.6__py3-none-any.whl

goosebit/ui/static/js/devices.js

@@ -1,29 +1,62 @@
 let dataTable;
 
+const renderFunctions = {
+    force_update: (data, type) => {
+        if (type === "display") {
+            const color = data ? "success" : "muted";
+            return `
+            <div class="text-${color}">
+                ●
+            </div>
+            `;
+        }
+        return data;
+    },
+    progress: (data, type) => {
+        if (type === "display" || type === "filter") {
+            return data ? `${data}%` : "-";
+        }
+        return data;
+    },
+    polling: (data, type) => {
+        return data ? "on time" : "overdue";
+    },
+    last_seen: (data, type) => {
+        if (type === "display" || type === "filter") {
+            return secondsToRecentDate(data);
+        }
+        return data;
+    },
+};
+
 document.addEventListener("DOMContentLoaded", async () => {
+    const columnConfig = await get_request("/ui/bff/devices/columns");
+    for (const col in columnConfig.columns) {
+        const colDesc = columnConfig.columns[col];
+        const colName = colDesc.data;
+        if (renderFunctions[colName]) {
+            columnConfig.columns[col].render = renderFunctions[colName];
+        }
+    }
+
     dataTable = new DataTable("#device-table", {
         responsive: true,
         paging: true,
         processing: false,
         serverSide: true,
-        order: [],
+        order: { name: "id", dir: "asc" },
         scrollCollapse: true,
         scroller: true,
         scrollY: "65vh",
         stateSave: true,
-        stateLoadParams: (settings, data) => {
-            // if save state is older than last breaking code change...
-            if (data.time <= 1722434189000) {
-                // ... delete it
-                for (const key of Object.keys(data)) {
-                    delete data[key];
-                }
-            }
-        },
         select: true,
-        rowId: "uuid",
+        rowId: "id",
         ajax: {
-            url: "/ui/bff/devices/",
+            url: "/ui/bff/devices",
+            data: (data) => {
+                // biome-ignore lint/performance/noDelete: really has to be deleted
+                delete data.columns;
+            },
             contentType: "application/json",
         },
         initComplete: () => {
@@ -37,64 +70,7 @@ document.addEventListener("DOMContentLoaded", async () => {
                 render: (data) => data || "-",
             },
         ],
-        columns: [
-            {
-                data: "online",
-                render: (data, type) => {
-                    if (type === "display" || type === "filter") {
-                        const color = data ? "success" : "danger";
-                        return `
-                        <div class="text-${color}">
-                            ●
-                        </div>
-                        `;
-                    }
-                    return data;
-                },
-            },
-            { data: "uuid", searchable: true, orderable: true },
-            { data: "name", searchable: true, orderable: true },
-            { data: "hw_model" },
-            { data: "hw_revision" },
-            { data: "feed", searchable: true, orderable: true },
-            { data: "sw_version", searchable: true, orderable: true },
-            { data: "sw_target_version" },
-            { data: "update_mode", searchable: true, orderable: true },
-            { data: "last_state", searchable: true, orderable: true },
-            {
-                data: "force_update",
-                render: (data, type) => {
-                    if (type === "display" || type === "filter") {
-                        const color = data ? "success" : "muted";
-                        return `
-                        <div class="text-${color}">
-                            ●
-                        </div>
-                        `;
-                    }
-                    return data;
-                },
-            },
-            {
-                data: "progress",
-                render: (data, type) => {
-                    if (type === "display" || type === "filter") {
-                        return data ? `${data}%` : "-";
-                    }
-                    return data;
-                },
-            },
-            { data: "last_ip" },
-            {
-                data: "last_seen",
-                render: (data, type) => {
-                    if (type === "display" || type === "filter") {
-                        return secondsToRecentDate(data);
-                    }
-                    return data;
-                },
-            },
-        ],
+        columns: columnConfig.columns,
         layout: {
             top1Start: {
                 buttons: [
@@ -112,7 +88,7 @@ document.addEventListener("DOMContentLoaded", async () => {
                         text: '<i class="bi bi-file-text"></i>',
                         action: () => {
                             const selectedDevice = dataTable.rows({ selected: true }).data().toArray()[0];
-                            window.location.href = `/ui/logs/${selectedDevice.uuid}`;
+                            window.location.href = `/ui/logs/${selectedDevice.id}`;
                         },
                         className: "buttons-logs",
                         titleAttr: "View Log",
@@ -141,7 +117,7 @@ document.addEventListener("DOMContentLoaded", async () => {
                                 .rows({ selected: true })
                                 .data()
                                 .toArray()
-                                .map((d) => d.uuid);
+                                .map((d) => d.id);
                             await deleteDevices(selectedDevices);
                         },
                         className: "buttons-delete",
@@ -154,7 +130,7 @@ document.addEventListener("DOMContentLoaded", async () => {
                                 .rows({ selected: true })
                                 .data()
                                 .toArray()
-                                .map((d) => d.uuid);
+                                .map((d) => d.id);
                             await forceUpdateDevices(selectedDevices);
                         },
                         className: "buttons-force-update",
@@ -167,7 +143,7 @@ document.addEventListener("DOMContentLoaded", async () => {
                                 .rows({ selected: true })
                                 .data()
                                 .toArray()
-                                .map((d) => d.uuid);
+                                .map((d) => d.id);
                             await pinDevices(selectedDevices);
                         },
                         className: "buttons-pin",
@@ -187,7 +163,7 @@ document.addEventListener("DOMContentLoaded", async () => {
         });
 
     setInterval(() => {
-        dataTable.ajax.reload(null, false);
+        updateDeviceList();
     }, TABLE_UPDATE_TIME);
 
     await updateSoftwareSelection();
@@ -307,7 +283,7 @@ async function updateDeviceName() {
         .rows({ selected: true })
         .data()
         .toArray()
-        .map((d) => d.uuid);
+        .map((d) => d.id);
     const name = document.getElementById("device-name").value;
 
     try {
@@ -324,7 +300,7 @@ async function updateDeviceRollout() {
         .rows({ selected: true })
         .data()
         .toArray()
-        .map((d) => d.uuid);
+        .map((d) => d.id);
     const feed = document.getElementById("device-selected-feed").value;
     const software = "rollout";
 
@@ -342,7 +318,7 @@ async function updateDeviceManualSoftware() {
         .rows({ selected: true })
         .data()
         .toArray()
-        .map((d) => d.uuid);
+        .map((d) => d.id);
     const feed = null;
     const software = document.getElementById("selected-sw").value;
 
@@ -360,7 +336,7 @@ async function updateDeviceLatest() {
         .rows({ selected: true })
         .data()
         .toArray()
-        .map((d) => d.uuid);
+        .map((d) => d.id);
     const feed = null;
     const software = "latest";
 
@@ -404,5 +380,21 @@ async function pinDevices(devices) {
 }
 
 function updateDeviceList() {
-    dataTable.ajax.reload();
+    const scrollPosition = $("#device-table").parent().scrollTop(); // Get current scroll position
+
+    const selectedRows = dataTable
+        .rows({ selected: true })
+        .data()
+        .toArray()
+        .map((d) => d.id);
+
+    dataTable.ajax.reload(() => {
+        dataTable.rows().every(function () {
+            const rowData = this.data();
+            if (selectedRows.includes(rowData.id)) {
+                this.select();
+            }
+        });
+        $("#device-table").parent().scrollTop(scrollPosition); // Restore scroll position after reload
+    }, false);
 }

goosebit/ui/static/js/login.js

@@ -1,4 +1,5 @@
-loginForm = document.getElementById("login_form");
+const loginForm = document.getElementById("login_form");
+const errorContainer = document.getElementById("login_error");
 
 async function login() {
     const formData = new FormData(loginForm);
@@ -8,16 +9,31 @@ async function login() {
             method: "POST",
             body: formData,
         });
-        tokenData = await response.json();
+
+        if (response.status === 401) {
+            const result = await response.json();
+            errorContainer.textContent = result.detail || "Failed to login.";
+            errorContainer.classList.remove("d-none");
+            return;
+        }
+
+        if (!response.ok) {
+            errorContainer.textContent = "Something went wrong. Please try again.";
+            errorContainer.classList.remove("d-none");
+            return;
+        }
+
+        const tokenData = await response.json();
         document.cookie = `session_id=${tokenData.access_token}; path=/`;
         location.reload();
-    } catch (e) {
-        // handle form errors later
-        console.error(e);
+    } catch (error) {
+        errorContainer.textContent = "Network error. Please try again.";
+        errorContainer.classList.remove("d-none");
     }
 }
 
 loginForm.addEventListener("submit", (event) => {
     event.preventDefault();
+    errorContainer.classList.add("d-none"); // Hide error before new attempt
     login();
 });

goosebit/ui/static/js/logs.js

@@ -1,25 +1,10 @@
-document.addEventListener("DOMContentLoaded", () => {
-    const logs_ws = create_ws(`/realtime/logs/${device}`);
+document.addEventListener("DOMContentLoaded", async () => {
+    const res = await get_request(`/ui/bff/devices/${device}/log`);
 
-    logs_ws.addEventListener("message", (event) => {
-        const res = JSON.parse(event.data);
+    const logElem = document.getElementById("device-log");
+    logElem.textContent = res.log;
 
-        const logElem = document.getElementById("device-log");
-        if (res.clear) {
-            logElem.textContent = "";
-        }
-        logElem.textContent += res.log;
-
-        const progressElem = document.getElementById("install-progress");
-        progressElem.style.width = `${res.progress}%`;
-        progressElem.innerHTML = `${res.progress}%`;
-    });
+    const progressElem = document.getElementById("install-progress");
+    progressElem.style.width = `${res.progress}%`;
+    progressElem.innerHTML = `${res.progress}%`;
 });
-
-function create_ws(s) {
-    const l = window.location;
-    const protocol = l.protocol === "https:" ? "wss://" : "ws://";
-    const port = l.port !== "80" || l.port !== "443" ? l.port : "";
-    const url = `${protocol}${l.hostname}:${port}${s}`;
-    return new WebSocket(url);
-}

goosebit/ui/static/js/rollouts.js

@@ -1,29 +1,51 @@
 let dataTable;
 
+const renderFunctions = {
+    paused: (data, type) => {
+        if (type === "display") {
+            const color = data ? "danger" : "muted";
+            return `
+            <div class="text-${color}">
+                ●
+            </div>
+            `;
+        }
+        return data;
+    },
+    created_at: (data, type) => new Date(data).toLocaleString(),
+};
+
 document.addEventListener("DOMContentLoaded", async () => {
+    const columnConfig = await get_request("/ui/bff/rollouts/columns");
+    for (const col in columnConfig.columns) {
+        const colDesc = columnConfig.columns[col];
+        const colName = colDesc.data;
+        if (renderFunctions[colName]) {
+            columnConfig.columns[col].render = renderFunctions[colName];
+        }
+    }
+
     dataTable = new DataTable("#rollout-table", {
         responsive: true,
         paging: true,
         processing: true,
         serverSide: true,
-        order: [1, "desc"],
+        order: {
+            name: "created_at",
+            dir: "desc",
+        },
         scrollCollapse: true,
         scroller: true,
         scrollY: "65vh",
         stateSave: true,
-        stateLoadParams: (settings, data) => {
-            // if save state is older than last breaking code change...
-            if (data.time <= 1722413708000) {
-                // ... delete it
-                for (const key of Object.keys(data)) {
-                    delete data[key];
-                }
-            }
-        },
         select: true,
         rowId: "id",
         ajax: {
             url: "/ui/bff/rollouts",
+            data: (data) => {
+                // biome-ignore lint/performance/noDelete: really has to be deleted
+                delete data.columns;
+            },
             contentType: "application/json",
         },
         initComplete: () => {
@@ -34,32 +56,10 @@ document.addEventListener("DOMContentLoaded", async () => {
                 targets: "_all",
                 searchable: false,
                 orderable: false,
+                render: (data) => data || "-",
             },
         ],
-        columns: [
-            { data: "id", visible: false },
-            { data: "created_at", orderable: true, render: (data) => new Date(data).toLocaleString() },
-            { data: "name", searchable: true, orderable: true },
-            { data: "feed", searchable: true, orderable: true },
-            { data: "sw_file" },
-            { data: "sw_version" },
-            {
-                data: "paused",
-                render: (data, type) => {
-                    if (type === "display" || type === "filter") {
-                        const color = data ? "danger" : "muted";
-                        return `
-                        <div class="text-${color}">
-                            ●
-                        </div>
-                        `;
-                    }
-                    return data;
-                },
-            },
-            { data: "success_count" },
-            { data: "failure_count" },
-        ],
+        columns: columnConfig.columns,
         layout: {
             top1Start: {
                 buttons: [],
@@ -191,7 +191,11 @@ async function createRollout() {
 }
 
 function updateRolloutList() {
-    dataTable.ajax.reload();
+    const scrollPosition = $("#rollout-table").parent().scrollTop(); // Get current scroll position
+
+    dataTable.ajax.reload(() => {
+        $("#rollout-table").parent().scrollTop(scrollPosition); // Restore scroll position after reload
+    }, false);
 }
 
 async function deleteRollouts(ids) {