Maybe fix lint

PhotonVision · Aug 31, 2023 · 3423520 · 3423520
1 parent 5fea1af
commit 3423520
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 134 deletions.
diff --git a/photon-client/src/components/settings/NetworkingCard.vue b/photon-client/src/components/settings/NetworkingCard.vue
@@ -54,9 +54,9 @@ const saveGeneralSettings = () => {
         if (error.status === 504 || changingStaticIp) {
           useStateStore().showSnackbarMessage({
             color: "error",
-            message: `Connection lost! Try the new static IP at ${
-              useSettingsStore().network.staticIp
-            }:5800 or ${useSettingsStore().network.hostname}:5800?`
+            message: `Connection lost! Try the new static IP at ${useSettingsStore().network.staticIp}:5800 or ${
+              useSettingsStore().network.hostname
+            }:5800?`
           });
         } else {
           useStateStore().showSnackbarMessage({
@@ -67,8 +67,7 @@ const saveGeneralSettings = () => {
       } else if (error.request) {
         useStateStore().showSnackbarMessage({
           color: "error",
-          message:
-            "Error while trying to process the request! The backend didn't respond."
+          message: "Error while trying to process the request! The backend didn't respond."
         });
       } else {
         useStateStore().showSnackbarMessage({
@@ -80,25 +79,27 @@ const saveGeneralSettings = () => {
 };
 
 const currentNetworkInterfaceIndex = computed<number>({
-  get: () => useSettingsStore()
-      .networkInterfaceNames
-      .indexOf(useSettingsStore().network.networkManagerIface || ""),
-  set: v => useSettingsStore().network.networkManagerIface = useSettingsStore().networkInterfaceNames[v]
+  get: () => useSettingsStore().networkInterfaceNames.indexOf(useSettingsStore().network.networkManagerIface || ""),
+  set: (v) => (useSettingsStore().network.networkManagerIface = useSettingsStore().networkInterfaceNames[v])
 });
 </script>
 
 <template>
-  <v-card
-    dark
-    class="mb-3 pr-6 pb-3"
-  >
+  <v-card dark class="mb-3 pr-6 pb-3" style="background-color: #006492">
     <v-card-title>Networking</v-card-title>
+    <div class="ml-5">
+      <v-form ref="form" v-model="settingsValid">
+        <cv-input
           v-model="useSettingsStore().network.ntServerAddress"
           label="Team Number/NetworkTables Server Address"
           tooltip="Enter the Team Number or the IP address of the NetworkTables Server"
           :label-cols="4"
           :disabled="useSettingsStore().network.runNTServer"
-          :rules="[(v) => isValidNetworkTablesIP(v) || 'The NetworkTables Server Address must be a valid Team Number, IP address, or Hostname']"
+          :rules="[
+            (v) =>
+              isValidNetworkTablesIP(v) ||
+              'The NetworkTables Server Address must be a valid Team Number, IP address, or Hostname'
+          ]"
         />
         <v-banner
           v-show="
@@ -132,7 +133,7 @@ const currentNetworkInterfaceIndex = computed<number>({
         <cv-input
           v-model="useSettingsStore().network.hostname"
           label="Hostname"
-          :input-cols="12-4"
+          :input-cols="12 - 4"
           :rules="[(v) => isValidHostname(v) || 'Invalid hostname']"
           :disabled="!(useSettingsStore().network.shouldManage && useSettingsStore().network.canManage)"
         />
@@ -150,12 +151,16 @@ const currentNetworkInterfaceIndex = computed<number>({
           v-model="currentNetworkInterfaceIndex"
           label="NetworkManager interface"
           :disabled="!(useSettingsStore().network.shouldManage && useSettingsStore().network.canManage)"
-          :select-cols="12-4"
+          :select-cols="12 - 4"
           tooltip="Name of the interface PhotonVision should manage the IP address of"
           :items="useSettingsStore().networkInterfaceNames"
         />
         <v-banner
-          v-show="!useSettingsStore().networkInterfaceNames.length && useSettingsStore().network.shouldManage && useSettingsStore().network.canManage"
+          v-show="
+            !useSettingsStore().networkInterfaceNames.length &&
+            useSettingsStore().network.shouldManage &&
+            useSettingsStore().network.canManage
+          "
           rounded
           color="red"
           text-color="white"
@@ -177,8 +182,7 @@ const currentNetworkInterfaceIndex = computed<number>({
           text-color="white"
           icon="mdi-information-outline"
         >
-          This mode is intended for debugging; it should be off for proper
-          usage. PhotonLib will NOT work!
+          This mode is intended for debugging; it should be off for proper usage. PhotonLib will NOT work!
         </v-banner>
       </v-form>
       <v-btn

diff --git a/photon-client/src/stores/settings/GeneralSettingsStore.ts b/photon-client/src/stores/settings/GeneralSettingsStore.ts
@@ -1,10 +1,10 @@
 import { defineStore } from "pinia";
 import type {
-    GeneralSettings,
-    LightingSettings,
-    MetricData,
-    NetworkSettings, 
-    ConfigurableNetworkSettings
+  GeneralSettings,
+  LightingSettings,
+  MetricData,
+  NetworkSettings,
+  ConfigurableNetworkSettings
 } from "@/types/SettingTypes";
 import { NetworkConnectionType } from "@/types/SettingTypes";
 import { useStateStore } from "@/stores/StateStore";
@@ -19,107 +19,50 @@ interface GeneralSettingsStore {
 }
 
 export const useSettingsStore = defineStore("settings", {
-    state: (): GeneralSettingsStore => ({
-        general: {
-            version: undefined,
-            gpuAcceleration: undefined,
-            hardwareModel: undefined,
-            hardwarePlatform: undefined
-        },
-        network: {
-            ntServerAddress: "",
-            shouldManage: true,
-            canManage: true,
-            connectionType: NetworkConnectionType.DHCP,
-            staticIp: "",
-            hostname: "photonvision",
-            runNTServer: false,
-            networkInterfaceNames: [{
-                connName: "Example Wired Connection",
-                devName: "eth0"
-            }]
-        },
-        lighting: {
-            supported: true,
-            brightness: 0
-        },
-        metrics: {
-            cpuTemp: undefined,
-            cpuUtil: undefined,
-            cpuMem: undefined,
-            gpuMem: undefined,
-            ramUtil: undefined,
-            gpuMemUtil: undefined,
-            cpuThr: undefined,
-            cpuUptime: undefined,
-            diskUtilPct: undefined
-        }
-    }),
-    getters: {
-        gpuAccelerationEnabled(): boolean {
-            return this.general.gpuAcceleration !== undefined;
-        },
-        networkInterfaceNames(): string[] {
-            return this.network.networkInterfaceNames.map(i => i.connName);
-        }
+  state: (): GeneralSettingsStore => ({
+    general: {
+      version: undefined,
+      gpuAcceleration: undefined,
+      hardwareModel: undefined,
+      hardwarePlatform: undefined
     },
-    actions: {
-        requestMetricsUpdate() {
-            return axios.post("/utils/publishMetrics");
-        },
-        updateMetricsFromWebsocket(data: Required<MetricData>) {
-            this.metrics = {
-                cpuTemp: data.cpuTemp || undefined,
-                cpuUtil: data.cpuUtil || undefined,
-                cpuMem: data.cpuMem || undefined,
-                gpuMem: data.gpuMem || undefined,
-                ramUtil: data.ramUtil || undefined,
-                gpuMemUtil: data.gpuMemUtil || undefined,
-                cpuThr: data.cpuThr || undefined,
-                cpuUptime: data.cpuUptime || undefined,
-                diskUtilPct: data.diskUtilPct || undefined
-            };
-        },
-        updateGeneralSettingsFromWebsocket(data: WebsocketSettingsUpdate) {
-            this.general = {
-                version: data.general.version || undefined,
-                hardwareModel: data.general.hardwareModel || undefined,
-                hardwarePlatform: data.general.hardwarePlatform || undefined,
-                gpuAcceleration: data.general.gpuAcceleration || undefined
-            };
-            this.lighting = data.lighting;
-            this.network = data.networkSettings;
-        },
-        saveGeneralSettings() {
-            const payload: Required<ConfigurableNetworkSettings> = {
-                connectionType: this.network.connectionType,
-                hostname: this.network.hostname,
-                networkManagerIface: this.network.networkManagerIface || "",
-                ntServerAddress: this.network.ntServerAddress,
-                runNTServer: this.network.runNTServer,
-                setDHCPcommand: this.network.setDHCPcommand || "",
-                setStaticCommand: this.network.setStaticCommand || "",
-                shouldManage: this.network.shouldManage,
-                staticIp: this.network.staticIp
-            };
-            return axios.post("/settings/general", payload);
-        },
-        /**
-         * Modify the brightness of the LEDs.
-         *
-         * @param brightness brightness to set [0, 100]
-         */
-        changeLEDBrightness(brightness: number) {
-            const payload = {
-                enabledLEDPercentage: brightness
-            };
-            useStateStore().websocket?.send(payload, true);
+    network: {
+      ntServerAddress: "",
+      shouldManage: true,
+      canManage: true,
+      connectionType: NetworkConnectionType.DHCP,
+      staticIp: "",
+      hostname: "photonvision",
+      runNTServer: false,
+      networkInterfaceNames: [
+        {
+          connName: "Example Wired Connection",
+          devName: "eth0"
         }
+      ]
+    },
+    lighting: {
+      supported: true,
+      brightness: 0
+    },
+    metrics: {
+      cpuTemp: undefined,
+      cpuUtil: undefined,
+      cpuMem: undefined,
+      gpuMem: undefined,
+      ramUtil: undefined,
+      gpuMemUtil: undefined,
+      cpuThr: undefined,
+      cpuUptime: undefined,
+      diskUtilPct: undefined
     }
   }),
   getters: {
     gpuAccelerationEnabled(): boolean {
       return this.general.gpuAcceleration !== undefined;
+    },
+    networkInterfaceNames(): string[] {
+      return this.network.networkInterfaceNames.map((i) => i.connName);
     }
   },
   actions: {
@@ -150,12 +93,11 @@ export const useSettingsStore = defineStore("settings", {
       this.network = data.networkSettings;
     },
     saveGeneralSettings() {
-      const payload: Required<NetworkSettings> = {
+      const payload: Required<ConfigurableNetworkSettings> = {
         connectionType: this.network.connectionType,
         hostname: this.network.hostname,
         networkManagerIface: this.network.networkManagerIface || "",
         ntServerAddress: this.network.ntServerAddress,
-        physicalInterface: this.network.physicalInterface || "",
         runNTServer: this.network.runNTServer,
         setDHCPcommand: this.network.setDHCPcommand || "",
         setStaticCommand: this.network.setStaticCommand || "",

diff --git a/photon-client/src/types/SettingTypes.ts b/photon-client/src/types/SettingTypes.ts
@@ -25,25 +25,25 @@ export enum NetworkConnectionType {
 }
 
 export interface NetworkInterfaceType {
-    connName: string,
-    devName: string
+  connName: string;
+  devName: string;
 }
 
 export interface NetworkSettings {
-    ntServerAddress: string
-    connectionType: NetworkConnectionType,
-    staticIp: string,
-    hostname: string,
-    runNTServer: boolean
-    shouldManage: boolean,
-    canManage: boolean,
-    networkManagerIface?: string,
-    setStaticCommand?: string,
-    setDHCPcommand?: string,
-    networkInterfaceNames: NetworkInterfaceType[]
+  ntServerAddress: string;
+  connectionType: NetworkConnectionType;
+  staticIp: string;
+  hostname: string;
+  runNTServer: boolean;
+  shouldManage: boolean;
+  canManage: boolean;
+  networkManagerIface?: string;
+  setStaticCommand?: string;
+  setDHCPcommand?: string;
+  networkInterfaceNames: NetworkInterfaceType[];
 }
 
-export type ConfigurableNetworkSettings = Omit<NetworkSettings, "canManage" | "networkInterfaceNames">
+export type ConfigurableNetworkSettings = Omit<NetworkSettings, "canManage" | "networkInterfaceNames">;
 
 export interface LightingSettings {
   supported: boolean;