Merge pull request #152 from husqvarnagroup/mm/ui-improvements

UI improvements. default column ordering and remove custom state loading
UpstreamDataInc · Oct 3, 2024 · b097993 · b097993
2 parents b45e626 + fa3a5cc
commit b097993
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 33 deletions.
diff --git a/goosebit/ui/static/js/devices.js b/goosebit/ui/static/js/devices.js
@@ -6,20 +6,11 @@ document.addEventListener("DOMContentLoaded", async () => {
         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: {
@@ -52,7 +43,7 @@ document.addEventListener("DOMContentLoaded", async () => {
                     return data;
                 },
             },
-            { data: "uuid", searchable: true, orderable: true },
+            { data: "uuid", name: "uuid", searchable: true, orderable: true },
             { data: "name", searchable: true, orderable: true },
             { data: "hw_model" },
             { data: "hw_revision" },

diff --git a/goosebit/ui/static/js/rollouts.js b/goosebit/ui/static/js/rollouts.js
@@ -6,20 +6,14 @@ 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: {
@@ -38,7 +32,12 @@ document.addEventListener("DOMContentLoaded", async () => {
         ],
         columns: [
             { data: "id", visible: false },
-            { data: "created_at", orderable: true, render: (data) => new Date(data).toLocaleString() },
+            {
+                data: "created_at",
+                name: "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" },

diff --git a/goosebit/ui/static/js/software.js b/goosebit/ui/static/js/software.js
@@ -172,20 +172,14 @@ document.addEventListener("DOMContentLoaded", () => {
         paging: true,
         processing: false,
         serverSide: true,
-        order: [2, "desc"],
+        order: {
+            name: "version",
+            dir: "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",
             contentType: "application/json",
@@ -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) => {