frontend: update network priority changing UI

bluerobotics · Feb 6, 2025 · 7709020 · 7709020
1 parent 441b958
commit 7709020
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/core/frontend/src/components/app/NetworkInterfacePriorityMenu.vue b/core/frontend/src/components/app/NetworkInterfacePriorityMenu.vue
@@ -140,16 +140,20 @@ export default Vue.extend({
       await Promise.all(interfaces.map((iface) => this.checkInterfaceInternet(host, iface)))
     },
     async setHighestInterface(): Promise<void> {
-      this.is_loading = true
-      const interface_priority = this.interfaces.map((inter) => ({ name: inter.name }))
+      const interface_priorities = this.interfaces.map((inter) => ({ name: inter.name, priority: 0 }))
+      interface_priorities.forEach((inter, index) => {
+        inter.priority = index * 1000
+      })
+      this.interfaces = []
       await back_axios({
         method: 'post',
         url: `${ethernet.API_URL}/set_interfaces_priority`,
         timeout: 10000,
-        data: interface_priority,
+        data: interface_priorities,
       })
         .catch((error) => {
-          const message = `Could not increase the priority for interface '${interface_priority}', ${error}.`
+          const message = `Could not set network interface priorities: ${interface_priorities}, error: ${error}`
+          console.log(interface_priorities)
           notifier.pushError('INCREASE_NETWORK_INTERFACE_METRIC_FAIL', message)
         })
         .then(() => {
@@ -161,7 +165,6 @@ export default Vue.extend({
           this.close()
         })
       await this.fetchAvailableInterfaces()
-      this.is_loading = false
     },
     async fetchAvailableInterfaces(): Promise<void> {
       await back_axios({
@@ -173,9 +176,9 @@ export default Vue.extend({
         .then((response) => {
           const interfaces = response.data as EthernetInterface[]
           interfaces.sort((a, b) => {
-            if (!a.info) return -1
-            if (!b.info) return 1
-            return a.info.priority - b.info.priority
+            const priorityA = a.priority ?? Number.MAX_SAFE_INTEGER
+            const priorityB = b.priority ?? Number.MAX_SAFE_INTEGER
+            return priorityA - priorityB
           })
           this.interfaces = interfaces
         })

diff --git a/core/frontend/src/types/ethernet.ts b/core/frontend/src/types/ethernet.ts
@@ -19,4 +19,5 @@ export interface EthernetInterface {
     name: string,
     addresses: InterfaceAddress[],
     info?: InterfaceInfo,
+    priority?: number,
 }