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

goosebit/ui/bff/devices/responses.py

@@ -1,11 +1,12 @@
 from __future__ import annotations
 
-import asyncio
+from typing import Callable
 
-from fastapi.requests import Request
 from pydantic import BaseModel, Field
+from tortoise.queryset import QuerySet
 
 from goosebit.schema.devices import DeviceSchema
+from goosebit.ui.bff.common.requests import DataTableRequest
 
 
 class BFFDeviceResponse(BaseModel):
@@ -15,25 +16,16 @@ class BFFDeviceResponse(BaseModel):
     records_filtered: int = Field(serialization_alias="recordsFiltered")
 
     @classmethod
-    async def convert(cls, request: Request, query, search_filter, total_records):
-        params = request.query_params
+    async def convert(cls, dt_query: DataTableRequest, query: QuerySet, search_filter: Callable):
+        total_records = await query.count()
+        if dt_query.search.value:
+            query = query.filter(search_filter(dt_query.search.value))
 
-        draw = int(params.get("draw", 1))
-        start = int(params.get("start", 0))
-        length = int(params.get("length", 10))
-        search_value = params.get("search[value]", None)
-        order_column_index = params.get("order[0][column]", None)
-        order_column = params.get(f"columns[{order_column_index}][data]", None)
-        order_dir = params.get("order[0][dir]", None)
-
-        if search_value:
-            query = query.filter(search_filter(search_value))
-
-        if order_column:
-            query = query.order_by(f"{'-' if order_dir == 'desc' else ''}{order_column}")
+        if dt_query.order_query:
+            query = query.order_by(dt_query.order_query)
 
         filtered_records = await query.count()
-        devices = await query.offset(start).limit(length).all()
-        data = await asyncio.gather(*[DeviceSchema.convert(d) for d in devices])
+        devices = await query.offset(dt_query.start).limit(dt_query.length).all()
+        data = [DeviceSchema.model_validate(d) for d in devices]
 
-        return cls(data=data, draw=draw, records_total=total_records, records_filtered=filtered_records)
+        return cls(data=data, draw=dt_query.draw, records_total=total_records, records_filtered=filtered_records)

goosebit/ui/bff/devices/routes.py

@@ -1,6 +1,8 @@
 from __future__ import annotations
 
-from fastapi import APIRouter, Security
+from typing import Annotated
+
+from fastapi import APIRouter, Depends, Security
 from fastapi.requests import Request
 from tortoise.expressions import Q
 
@@ -8,6 +10,8 @@ from goosebit.api.responses import StatusResponse
 from goosebit.api.v1.devices import routes
 from goosebit.auth import validate_user_permissions
 from goosebit.db.models import Device, Software, UpdateModeEnum, UpdateStateEnum
+from goosebit.ui.bff.common.requests import DataTableRequest
+from goosebit.ui.bff.common.util import parse_datatables_query
 from goosebit.updater.manager import get_update_manager
 
 from .requests import DevicesPatchRequest
@@ -20,8 +24,8 @@ router = APIRouter(prefix="/devices")
     "",
     dependencies=[Security(validate_user_permissions, scopes=["home.read"])],
 )
-async def devices_get(request: Request) -> BFFDeviceResponse:
-    def search_filter(search_value):
+async def devices_get(dt_query: Annotated[DataTableRequest, Depends(parse_datatables_query)]) -> BFFDeviceResponse:
+    def search_filter(search_value: str):
         return (
             Q(uuid__icontains=search_value)
             | Q(name__icontains=search_value)
@@ -31,10 +35,9 @@ async def devices_get(request: Request) -> BFFDeviceResponse:
             | Q(last_state=int(UpdateStateEnum.from_str(search_value)))
         )
 
-    query = Device.all().prefetch_related("assigned_software", "hardware")
-    total_records = await Device.all().count()
+    query = Device.all().prefetch_related("assigned_software", "hardware", "assigned_software__compatibility")
 
-    return await BFFDeviceResponse.convert(request, query, search_filter, total_records)
+    return await BFFDeviceResponse.convert(dt_query, query, search_filter)
 
 
 @router.patch(

goosebit/ui/bff/rollouts/responses.py

@@ -1,9 +1,10 @@
-import asyncio
+from typing import Callable
 
-from fastapi.requests import Request
 from pydantic import BaseModel, Field
+from tortoise.queryset import QuerySet
 
 from goosebit.schema.rollouts import RolloutSchema
+from goosebit.ui.bff.common.requests import DataTableRequest
 
 
 class BFFRolloutsResponse(BaseModel):
@@ -13,25 +14,16 @@ class BFFRolloutsResponse(BaseModel):
     records_filtered: int = Field(serialization_alias="recordsFiltered")
 
     @classmethod
-    async def convert(cls, request: Request, query, search_filter, total_records):
-        params = request.query_params
+    async def convert(cls, dt_query: DataTableRequest, query: QuerySet, search_filter: Callable):
+        total_records = await query.count()
+        if dt_query.search.value:
+            query = query.filter(search_filter(dt_query.search.value))
 
-        draw = int(params.get("draw", 1))
-        start = int(params.get("start", 0))
-        length = int(params.get("length", 10))
-        search_value = params.get("search[value]", None)
-        order_column_index = params.get("order[0][column]", None)
-        order_column = params.get(f"columns[{order_column_index}][data]", None)
-        order_dir = params.get("order[0][dir]", None)
-
-        if search_value:
-            query = query.filter(search_filter(search_value))
-
-        if order_column:
-            query = query.order_by(f"{'-' if order_dir == 'desc' else ''}{order_column}")
+        if dt_query.order_query:
+            query = query.order_by(dt_query.order_query)
 
         filtered_records = await query.count()
-        rollouts = await query.offset(start).limit(length).all()
-        data = await asyncio.gather(*[RolloutSchema.convert(r) for r in rollouts])
+        rollouts = await query.offset(dt_query.start).limit(dt_query.length).all()
+        data = [RolloutSchema.model_validate(r) for r in rollouts]
 
-        return cls(data=data, draw=draw, records_total=total_records, records_filtered=filtered_records)
+        return cls(data=data, draw=dt_query.draw, records_total=total_records, records_filtered=filtered_records)

goosebit/ui/bff/rollouts/routes.py

@@ -1,10 +1,13 @@
-from fastapi import APIRouter, Security
-from fastapi.requests import Request
+from typing import Annotated
+
+from fastapi import APIRouter, Depends, Security
 from tortoise.expressions import Q
 
 from goosebit.api.v1.rollouts import routes
 from goosebit.auth import validate_user_permissions
 from goosebit.db.models import Rollout
+from goosebit.ui.bff.common.requests import DataTableRequest
+from goosebit.ui.bff.common.util import parse_datatables_query
 
 from .responses import BFFRolloutsResponse
 
@@ -15,14 +18,13 @@ router = APIRouter(prefix="/rollouts")
     "",
     dependencies=[Security(validate_user_permissions, scopes=["rollout.read"])],
 )
-async def rollouts_get(request: Request) -> BFFRolloutsResponse:
+async def rollouts_get(dt_query: Annotated[DataTableRequest, Depends(parse_datatables_query)]) -> BFFRolloutsResponse:
     def search_filter(search_value):
         return Q(name__icontains=search_value) | Q(feed__icontains=search_value)
 
-    query = Rollout.all().prefetch_related("software")
-    total_records = await Rollout.all().count()
+    query = Rollout.all().prefetch_related("software", "software__compatibility")
 
-    return await BFFRolloutsResponse.convert(request, query, search_filter, total_records)
+    return await BFFRolloutsResponse.convert(dt_query, query, search_filter)
 
 
 router.add_api_route(

goosebit/ui/bff/software/responses.py

@@ -1,9 +1,11 @@
-import asyncio
+from typing import Callable
 
-from fastapi.requests import Request
 from pydantic import BaseModel, Field
+from tortoise.expressions import Q
+from tortoise.queryset import QuerySet
 
 from goosebit.schema.software import SoftwareSchema
+from goosebit.ui.bff.common.requests import DataTableRequest
 
 
 class BFFSoftwareResponse(BaseModel):
@@ -13,25 +15,23 @@ class BFFSoftwareResponse(BaseModel):
     records_filtered: int = Field(serialization_alias="recordsFiltered")
 
     @classmethod
-    async def convert(cls, request: Request, query, search_filter, total_records):
-        params = request.query_params
+    async def convert(cls, dt_query: DataTableRequest, query: QuerySet, search_filter: Callable, alt_filter: Q):
+        total_records = await query.count()
+        query = query.filter(alt_filter)
+        if dt_query.search.value:
+            query = query.filter(search_filter(dt_query.search.value))
 
-        draw = int(params.get("draw", 1))
-        start = int(params.get("start", 0))
-        length = int(params.get("length", 10))
-        search_value = params.get("search[value]", None)
-        order_column_index = params.get("order[0][column]", None)
-        order_column = params.get(f"columns[{order_column_index}][data]", None)
-        order_dir = params.get("order[0][dir]", None)
+        if dt_query.order_query:
+            query = query.order_by(dt_query.order_query)
 
-        if search_value:
-            query = query.filter(search_filter(search_value))
+        filtered_records = await query.count()
 
-        if order_column:
-            query = query.order_by(f"{'-' if order_dir == 'desc' else ''}{order_column}")
+        query = query.offset(dt_query.start)
 
-        filtered_records = await query.count()
-        devices = await query.offset(start).limit(length).all()
-        data = await asyncio.gather(*[SoftwareSchema.convert(d) for d in devices])
+        if not dt_query.length == 0:
+            query = query.limit(dt_query.length)
+
+        devices = await query.all()
+        data = [SoftwareSchema.model_validate(d) for d in devices]
 
-        return cls(data=data, draw=draw, records_total=total_records, records_filtered=filtered_records)
+        return cls(data=data, draw=dt_query.draw, records_total=total_records, records_filtered=filtered_records)

goosebit/ui/bff/software/routes.py

@@ -1,14 +1,18 @@
 from __future__ import annotations
 
-import aiofiles
-from fastapi import APIRouter, Form, HTTPException, Security, UploadFile
+from typing import Annotated
+
+from anyio import Path, open_file
+from fastapi import APIRouter, Depends, Form, HTTPException, Query, Security, UploadFile
 from fastapi.requests import Request
 from tortoise.expressions import Q
 
 from goosebit.api.v1.software import routes
 from goosebit.auth import validate_user_permissions
-from goosebit.db.models import Rollout, Software
+from goosebit.db.models import Hardware, Rollout, Software
 from goosebit.settings import config
+from goosebit.ui.bff.common.requests import DataTableRequest
+from goosebit.ui.bff.common.util import parse_datatables_query
 from goosebit.updates import create_software_update
 
 from .responses import BFFSoftwareResponse
@@ -20,14 +24,23 @@ router = APIRouter(prefix="/software")
     "",
     dependencies=[Security(validate_user_permissions, scopes=["software.read"])],
 )
-async def software_get(request: Request) -> BFFSoftwareResponse:
+async def software_get(
+    dt_query: Annotated[DataTableRequest, Depends(parse_datatables_query)],
+    uuids: list[str] = Query(default=None),
+) -> BFFSoftwareResponse:
+    filters: list[Q] = []
+
     def search_filter(search_value):
-        return Q(uri__icontains=search_value) | Q(version__icontains=search_value)
+        base_filter = Q(Q(uri__icontains=search_value), Q(version__icontains=search_value), join_type="OR")
+        return Q(base_filter, *filters, join_type="AND")
 
     query = Software.all().prefetch_related("compatibility")
-    total_records = await Software.all().count()
 
-    return await BFFSoftwareResponse.convert(request, query, search_filter, total_records)
+    if uuids:
+        hardware = await Hardware.filter(devices__uuid__in=uuids).distinct()
+        filters.append(Q(*[Q(compatibility__id=c.id) for c in hardware], join_type="AND"))
+
+    return await BFFSoftwareResponse.convert(dt_query, query, search_filter, Q(*filters))
 
 
 router.add_api_route(
@@ -64,20 +77,20 @@ async def post_update(
         await create_software_update(url, None)
     else:
         # local file
-        file = config.artifacts_dir.joinpath(filename)
-        config.artifacts_dir.mkdir(parents=True, exist_ok=True)
+        artifacts_dir = Path(config.artifacts_dir)
+        file = artifacts_dir.joinpath(filename)
+        await artifacts_dir.mkdir(parents=True, exist_ok=True)
 
         temp_file = file.with_suffix(".tmp")
         if init:
-            temp_file.unlink(missing_ok=True)
-
-        contents = await chunk.read()
+            await temp_file.unlink(missing_ok=True)
 
-        async with aiofiles.open(temp_file, mode="ab") as f:
-            await f.write(contents)
+        async with await open_file(temp_file, "ab") as f:
+            await f.write(await chunk.read())
 
         if done:
             try:
-                await create_software_update(file.absolute().as_uri(), temp_file)
+                absolute = await file.absolute()
+                await create_software_update(absolute.as_uri(), temp_file)
             finally:
-                temp_file.unlink(missing_ok=True)
+                await temp_file.unlink(missing_ok=True)

goosebit/ui/nav.py

@@ -2,7 +2,7 @@ class Navigation:
     def __init__(self):
         self.items = []
 
-    def route(self, text: str, permissions: str = None):
+    def route(self, text: str, permissions: str | None = None):
         def decorator(func):
             self.items.append({"function": func.__name__, "text": text, "permissions": permissions})
             return func

goosebit/ui/routes.py

@@ -24,7 +24,7 @@ async def ui_root(request: Request):
     "/home",
     dependencies=[Security(validate_user_permissions, scopes=["home.read"])],
 )
-@nav.route("Home", permissions=["home.read"])
+@nav.route("Home", permissions="home.read")
 async def home_ui(request: Request):
     return templates.TemplateResponse(request, "index.html.jinja", context={"title": "Home"})
 
@@ -33,7 +33,7 @@ async def home_ui(request: Request):
     "/devices",
     dependencies=[Security(validate_user_permissions, scopes=["device.read"])],
 )
-@nav.route("Devices", permissions=["device.read"])
+@nav.route("Devices", permissions="device.read")
 async def devices_ui(request: Request):
     return templates.TemplateResponse(request, "devices.html.jinja", context={"title": "Devices"})
 
@@ -42,7 +42,7 @@ async def devices_ui(request: Request):
     "/software",
     dependencies=[Security(validate_user_permissions, scopes=["software.read"])],
 )
-@nav.route("Software", permissions=["software.read"])
+@nav.route("Software", permissions="software.read")
 async def software_ui(request: Request):
     return templates.TemplateResponse(request, "software.html.jinja", context={"title": "Software"})
 
@@ -51,7 +51,7 @@ async def software_ui(request: Request):
     "/rollouts",
     dependencies=[Security(validate_user_permissions, scopes=["rollout.read"])],
 )
-@nav.route("Rollouts", permissions=["rollout.read"])
+@nav.route("Rollouts", permissions="rollout.read")
 async def rollouts_ui(request: Request):
     return templates.TemplateResponse(request, "rollouts.html.jinja", context={"title": "Rollouts"})
 

goosebit/ui/static/js/devices.js

@@ -124,20 +124,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 +190,89 @@ document.addEventListener("DOMContentLoaded", async () => {
         dataTable.ajax.reload(null, false);
     }, TABLE_UPDATE_TIME);
 
-    await updateSoftwareSelection(true);
+    await updateSoftwareSelection();
+
+    // Name update form submit
+    const nameForm = document.getElementById("device-name-form");
+    nameForm.addEventListener(
+        "submit",
+        async (event) => {
+            if (nameForm.checkValidity() === false) {
+                event.preventDefault();
+                event.stopPropagation();
+                nameForm.classList.add("was-validated");
+            } else {
+                event.preventDefault();
+                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,
+    );
 
-    // Config form submit
-    const configForm = document.getElementById("device-config-form");
-    configForm.addEventListener(
+    // Latest software form submit
+    const latestSoftwareForm = document.getElementById("device-software-latest-form");
+    latestSoftwareForm.addEventListener(
         "submit",
         async (event) => {
-            if (configForm.checkValidity() === false) {
+            if (latestSoftwareForm.checkValidity() === false) {
                 event.preventDefault();
                 event.stopPropagation();
-                configForm.classList.add("was-validated");
+                latestSoftwareForm.classList.add("was-validated");
             } else {
                 event.preventDefault();
-                await updateDeviceConfig();
-                configForm.classList.remove("was-validated");
-                configForm.reset();
+                await updateDeviceLatest();
+                latestSoftwareForm.classList.remove("was-validated");
+                latestSoftwareForm.reset();
                 const modal = bootstrap.Modal.getInstance(document.getElementById("device-config-modal"));
                 modal.hide();
             }
@@ -244,18 +302,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

@@ -136,6 +136,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 +146,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/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", 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,6 +45,20 @@ 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);
     }