goosebit 0.2.3__py3-none-any.whl → 0.2.5__py3-none-any.whl

goosebit/ui/static/js/devices.js

@@ -1,29 +1,70 @@
 let dataTable;
 
+const renderFunctions = {
+    online: (data, type) => {
+        if (type === "display" || type === "filter") {
+            const color = data ? "success" : "danger";
+            return `
+            <div class="text-${color}">
+                ●
+            </div>
+            `;
+        }
+        return data;
+    },
+    force_update: (data, type) => {
+        if (type === "display" || type === "filter") {
+            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;
+    },
+    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: "uuid", 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",
         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 +78,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: [
@@ -124,20 +108,11 @@ document.addEventListener("DOMContentLoaded", async () => {
                     {
                         text: '<i class="bi bi-pen" ></i>',
                         action: () => {
-                            const selectedDevice = dataTable.rows({ selected: true }).data().toArray()[0];
-                            $("#device-selected-name").val(selectedDevice.name);
+                            const selectedDevices = dataTable.rows({ selected: true }).data().toArray();
+                            const selectedDevice = selectedDevices[0];
+                            updateSoftwareSelection(selectedDevices);
+                            $("#device-name").val(selectedDevice.name);
                             $("#device-selected-feed").val(selectedDevice.feed);
-
-                            let selectedValue;
-                            if (selectedDevice.update_mode === "Rollout") {
-                                selectedValue = "rollout";
-                            } else if (selectedDevice.update_mode === "Latest") {
-                                selectedValue = "latest";
-                            } else {
-                                selectedValue = selectedDevice.sw_assigned;
-                            }
-                            $("#selected-sw").val(selectedValue);
-
                             new bootstrap.Modal("#device-config-modal").show();
                         },
                         className: "buttons-config",
@@ -199,22 +174,89 @@ document.addEventListener("DOMContentLoaded", async () => {
         dataTable.ajax.reload(null, false);
     }, TABLE_UPDATE_TIME);
 
-    await updateSoftwareSelection(true);
+    await updateSoftwareSelection();
 
-    // Config form submit
-    const configForm = document.getElementById("device-config-form");
-    configForm.addEventListener(
+    // Name update form submit
+    const nameForm = document.getElementById("device-name-form");
+    nameForm.addEventListener(
         "submit",
         async (event) => {
-            if (configForm.checkValidity() === false) {
+            if (nameForm.checkValidity() === false) {
                 event.preventDefault();
                 event.stopPropagation();
-                configForm.classList.add("was-validated");
+                nameForm.classList.add("was-validated");
             } else {
                 event.preventDefault();
-                await updateDeviceConfig();
-                configForm.classList.remove("was-validated");
-                configForm.reset();
+                await updateDeviceName();
+                nameForm.classList.remove("was-validated");
+                nameForm.reset();
+                const modal = bootstrap.Modal.getInstance(document.getElementById("device-config-modal"));
+                modal.hide();
+            }
+        },
+        false,
+    );
+
+    // Rollout form submit
+    const rolloutForm = document.getElementById("device-software-rollout-form");
+    rolloutForm.addEventListener(
+        "submit",
+        async (event) => {
+            if (rolloutForm.checkValidity() === false) {
+                event.preventDefault();
+                event.stopPropagation();
+                rolloutForm.classList.add("was-validated");
+            } else {
+                event.preventDefault();
+                await updateDeviceRollout();
+                rolloutForm.classList.remove("was-validated");
+                rolloutForm.reset();
+                const modal = bootstrap.Modal.getInstance(document.getElementById("device-config-modal"));
+                modal.hide();
+            }
+        },
+        false,
+    );
+
+    // Manual software form submit
+    const manualSoftwareForm = document.getElementById("device-software-manual-form");
+    manualSoftwareForm.addEventListener(
+        "submit",
+        async (event) => {
+            if (manualSoftwareForm.checkValidity() === false) {
+                event.preventDefault();
+                event.stopPropagation();
+                manualSoftwareForm.classList.add("was-validated");
+                if (document.getElementById("selected-sw").value === "") {
+                    document.getElementById("selected-sw").parentElement.classList.add("is-invalid");
+                }
+            } else {
+                event.preventDefault();
+                await updateDeviceManualSoftware();
+                manualSoftwareForm.classList.remove("was-validated");
+                document.getElementById("selected-sw").parentElement.classList.remove("is-invalid");
+                manualSoftwareForm.reset();
+                const modal = bootstrap.Modal.getInstance(document.getElementById("device-config-modal"));
+                modal.hide();
+            }
+        },
+        false,
+    );
+
+    // Latest software form submit
+    const latestSoftwareForm = document.getElementById("device-software-latest-form");
+    latestSoftwareForm.addEventListener(
+        "submit",
+        async (event) => {
+            if (latestSoftwareForm.checkValidity() === false) {
+                event.preventDefault();
+                event.stopPropagation();
+                latestSoftwareForm.classList.add("was-validated");
+            } else {
+                event.preventDefault();
+                await updateDeviceLatest();
+                latestSoftwareForm.classList.remove("was-validated");
+                latestSoftwareForm.reset();
                 const modal = bootstrap.Modal.getInstance(document.getElementById("device-config-modal"));
                 modal.hide();
             }
@@ -244,18 +286,70 @@ function updateBtnState() {
     }
 }
 
-async function updateDeviceConfig() {
+async function updateDeviceName() {
+    const devices = dataTable
+        .rows({ selected: true })
+        .data()
+        .toArray()
+        .map((d) => d.uuid);
+    const name = document.getElementById("device-name").value;
+
+    try {
+        await patch_request("/ui/bff/devices", { devices, name });
+    } catch (error) {
+        console.error("Update device config failed:", error);
+    }
+
+    setTimeout(updateDeviceList, 50);
+}
+
+async function updateDeviceRollout() {
     const devices = dataTable
         .rows({ selected: true })
         .data()
         .toArray()
         .map((d) => d.uuid);
-    const name = document.getElementById("device-selected-name").value;
     const feed = document.getElementById("device-selected-feed").value;
+    const software = "rollout";
+
+    try {
+        await patch_request("/ui/bff/devices", { devices, feed, software });
+    } catch (error) {
+        console.error("Update device config failed:", error);
+    }
+
+    setTimeout(updateDeviceList, 50);
+}
+
+async function updateDeviceManualSoftware() {
+    const devices = dataTable
+        .rows({ selected: true })
+        .data()
+        .toArray()
+        .map((d) => d.uuid);
+    const feed = null;
     const software = document.getElementById("selected-sw").value;
 
     try {
-        await patch_request("/ui/bff/devices", { devices, name, feed, software });
+        await patch_request("/ui/bff/devices", { devices, feed, software });
+    } catch (error) {
+        console.error("Update device config failed:", error);
+    }
+
+    setTimeout(updateDeviceList, 50);
+}
+
+async function updateDeviceLatest() {
+    const devices = dataTable
+        .rows({ selected: true })
+        .data()
+        .toArray()
+        .map((d) => d.uuid);
+    const feed = null;
+    const software = "latest";
+
+    try {
+        await patch_request("/ui/bff/devices", { devices, feed, software });
     } catch (error) {
         console.error("Update device config failed:", error);
     }

goosebit/ui/static/js/rollouts.js

@@ -6,24 +6,22 @@ document.addEventListener("DOMContentLoaded", async () => {
         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: () => {
@@ -38,9 +36,14 @@ document.addEventListener("DOMContentLoaded", async () => {
         ],
         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: "created_at",
+                name: "created_at",
+                orderable: true,
+                render: (data) => new Date(data).toLocaleString(),
+            },
+            { data: "name", name: "name", searchable: true, orderable: true },
+            { data: "feed", name: "feed", searchable: true, orderable: true },
             { data: "sw_file" },
             { data: "sw_version" },
             {
@@ -136,6 +139,9 @@ document.addEventListener("DOMContentLoaded", async () => {
         "submit",
         (event) => {
             if (form.checkValidity() === false) {
+                if (document.getElementById("selected-sw").value === "") {
+                    document.getElementById("selected-sw").parentElement.classList.add("is-invalid");
+                }
                 event.preventDefault();
                 event.stopPropagation();
                 form.classList.add("was-validated");
@@ -143,6 +149,7 @@ document.addEventListener("DOMContentLoaded", async () => {
                 event.preventDefault();
                 createRollout();
                 form.classList.remove("was-validated");
+                document.getElementById("selected-sw").parentElement.classList.remove("is-invalid");
                 form.reset();
                 const modal = bootstrap.Modal.getInstance(document.getElementById("rollout-create-modal"));
                 modal.hide();

goosebit/ui/static/js/software.js

@@ -172,22 +172,16 @@ document.addEventListener("DOMContentLoaded", () => {
         paging: true,
         processing: false,
         serverSide: true,
-        order: [2, "desc"],
         scrollCollapse: true,
         scroller: true,
         scrollY: "60vh",
         stateSave: true,
-        stateLoadParams: (settings, data) => {
-            // if save state is older than last breaking code change...
-            if (data.time <= 1722415428000) {
-                // ... delete it
-                for (const key of Object.keys(data)) {
-                    delete data[key];
-                }
-            }
-        },
         ajax: {
             url: "/ui/bff/software",
+            data: (data) => {
+                // biome-ignore lint/performance/noDelete: really has to be deleted
+                delete data.columns;
+            },
             contentType: "application/json",
         },
         initComplete: () => {
@@ -204,7 +198,7 @@ document.addEventListener("DOMContentLoaded", () => {
         columns: [
             { data: "id", visible: false },
             { data: "name" },
-            { data: "version", searchable: true, orderable: true },
+            { data: "version", name: "version", searchable: true, orderable: true },
             {
                 data: "compatibility",
                 render: (data) => {

goosebit/ui/static/js/util.js

@@ -20,27 +20,22 @@ function secondsToRecentDate(t) {
     return s + (s === 1 ? " second" : " seconds");
 }
 
-async function updateSoftwareSelection(addSpecialMode = false) {
+async function updateSoftwareSelection(devices = null) {
     try {
-        const response = await fetch("/ui/bff/software");
+        const url = new URL("/ui/bff/software?order[0][dir]=desc&order[0][name]=version", window.location.origin);
+        if (devices != null) {
+            for (const device of devices) {
+                url.searchParams.append("uuids", device.uuid);
+            }
+        }
+        const response = await fetch(url.toString());
         if (!response.ok) {
             console.error("Retrieving software list failed.");
             return;
         }
         const data = (await response.json()).data;
         const selectElem = document.getElementById("selected-sw");
-
-        if (addSpecialMode) {
-            let optionElem = document.createElement("option");
-            optionElem.value = "rollout";
-            optionElem.textContent = "Rollout";
-            selectElem.appendChild(optionElem);
-
-            optionElem = document.createElement("option");
-            optionElem.value = "latest";
-            optionElem.textContent = "Latest";
-            selectElem.appendChild(optionElem);
-        }
+        selectElem.innerHTML = "";
 
         for (const item of data) {
             const optionElem = document.createElement("option");
@@ -50,11 +45,45 @@ async function updateSoftwareSelection(addSpecialMode = false) {
             optionElem.textContent = `${item.version} (${models})`;
             selectElem.appendChild(optionElem);
         }
+        $("#selected-sw").selectpicker("destroy");
+        if (data.length === 0) {
+            selectElem.title = "No valid software found for selected device";
+            if (devices != null) {
+                if (devices.length > 1) {
+                    selectElem.title += "s";
+                }
+            }
+            selectElem.disabled = true;
+        } else {
+            selectElem.disabled = false;
+            selectElem.title = "Select Software";
+        }
+        $("#selected-sw").selectpicker();
     } catch (error) {
         console.error("Failed to fetch device data:", error);
     }
 }
 
+async function get_request(url) {
+    const response = await fetch(url, {
+        method: "GET",
+    });
+
+    const result = await response.json();
+    if (!response.ok) {
+        if (result.detail) {
+            Swal.fire({
+                title: "Warning",
+                text: result.detail,
+                icon: "warning",
+                confirmButtonText: "Understood",
+            });
+        }
+
+        throw new Error(`POST ${url} failed for ${JSON.stringify(object)}`);
+    }
+    return result;
+}
 async function post_request(url, object) {
     const response = await fetch(url, {
         method: "POST",