From 60b68612ab36fd63c92fe302fb78c866d70751ca Mon Sep 17 00:00:00 2001
From: Pedro <ptsmonteiro@gmail.com>
Date: Sat, 18 Nov 2023 14:27:19 +0100
Subject: [PATCH] Fix things. Simplify field value change handling.

---
 gui/src/components/main_startup_check.vue  | 13 +++++----
 gui/src/components/settings_hamlib.vue     | 31 +++++++++++-----------
 gui/src/components/settings_rigcontrol.vue |  9 +++----
 gui/src/components/settings_station.vue    |  9 +++----
 gui/src/js/settingsHandler.ts              |  9 +------
 gui/src/store/settingsStore.js             |  3 ---
 6 files changed, 30 insertions(+), 44 deletions(-)

diff --git a/gui/src/components/main_startup_check.vue b/gui/src/components/main_startup_check.vue
index cf16fcbe..a198d163 100644
--- a/gui/src/components/main_startup_check.vue
+++ b/gui/src/components/main_startup_check.vue
@@ -8,8 +8,7 @@ import { setActivePinia } from "pinia";
 import pinia from "../store/index";
 setActivePinia(pinia);
 
-import { settingsStore as settings } from "../store/settingsStore.js";
-import { handleFieldValueChange } from "../js/settingsHandler";
+import { settingsStore as settings, onChange } from "../store/settingsStore.js";
 
 import { useAudioStore } from "../store/audioStore.js";
 const audio = useAudioStore(pinia);
@@ -43,7 +42,7 @@ function getNetworkState() {
 }
 
 function getRigControlStuff() {
-  switch (settings.remote.RADIO.radiocontrol) {
+  switch (settings.remote.RADIO.control) {
     case "disabled":
       return true;
     case "rigctld":
@@ -210,7 +209,7 @@ function testHamlib() {
                       aria-label=".form-select-sm"
                       data-section="AUDIO"
                       data-setting="input_device"
-                      @change="handleFieldValueChange"
+                      @change="onChange"
                       v-model="settings.remote.AUDIO.input_device"
                       v-html="audio.getInputDevices()"
                     ></select>
@@ -268,7 +267,7 @@ function testHamlib() {
                       id="rigcontrol_radiocontrol"
                       data-section="RADIO"
                       data-setting="control"
-                      @change="handleFieldValueChange"
+                      @change="onChange"
                       v-model="settings.remote.RADIO.control"
                     >
                       <option selected value="disabled">
@@ -365,7 +364,7 @@ function testHamlib() {
                         data-section="TCI"
                         data-setting="ip"
                         v-model="settings.remote.TCI.ip"
-                        @change="handleFieldValueChange"
+                        @change="onChange"
                       />
                     </div>
 
@@ -380,7 +379,7 @@ function testHamlib() {
                         data-section="TCI"
                         data-setting="port"
                         v-model="settings.remote.TCI.port"
-                        @change="handleFieldValueChange"
+                        @change="onChange"
                       />
                     </div>
                   </div>
diff --git a/gui/src/components/settings_hamlib.vue b/gui/src/components/settings_hamlib.vue
index a7b35f1f..3806eae9 100644
--- a/gui/src/components/settings_hamlib.vue
+++ b/gui/src/components/settings_hamlib.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
-import { settingsStore as settings } from "../store/settingsStore.js";
-import { handleFieldValueChange } from "../js/settingsHandler";
+import { settingsStore as settings, onChange } from "../store/settingsStore.js";
 </script>
 
 <template>
@@ -13,7 +12,7 @@ import { handleFieldValueChange } from "../js/settingsHandler";
       placeholder="rigctld IP"
       id="hamlib_rigctld_ip"
       aria-label="Device IP"
-      @change="handleFieldValueChange"
+      @change="onChange"
       data-section="RIGCTLD"
       data-setting="rip"
       v-model="settings.remote.RIGCTLD.ip"
@@ -28,7 +27,7 @@ import { handleFieldValueChange } from "../js/settingsHandler";
       placeholder="rigctld port"
       id="hamlib_rigctld_port"
       aria-label="Device Port"
-      @change="handleFieldValueChange"
+      @change="onChange"
       data-section="RIGCTLD"
       data-setting="port"
       v-model="settings.remote.RIGCTLD.port"
@@ -42,10 +41,10 @@ import { handleFieldValueChange } from "../js/settingsHandler";
       class="form-select form-select-sm"
       aria-label=".form-select-sm"
       id="hamlib_deviceid"
-      @change="handleFieldValueChange"
+      @change="onChange"
       data-section="RADIO"
       data-setting="model_id"
-      v-model="settings.remote.RADIO.model_id"
+      v-model.number="settings.remote.RADIO.model_id"
     >
       <option selected value="-- ignore --">-- ignore --</option>
       <option value="2028">Kenwood TS480</option>
@@ -321,7 +320,7 @@ import { handleFieldValueChange } from "../js/settingsHandler";
       aria-label=".form-select-sm"
       id="hamlib_deviceport"
       style="width: 7rem"
-      @change="handleFieldValueChange"
+      @change="onChange"
       data-section="RIGCTLD"
       data-setting="port"
       v-model="settings.remote.RIGCTLD.port"
@@ -335,7 +334,7 @@ import { handleFieldValueChange } from "../js/settingsHandler";
       class="form-select form-select-sm"
       aria-label=".form-select-sm"
       id="hamlib_serialspeed"
-      @change="handleFieldValueChange"
+      @change="onChange"
       data-section="RADIO"
       data-setting="serial_speed"
       v-model="settings.remote.RADIO.serial_speed"
@@ -360,7 +359,7 @@ import { handleFieldValueChange } from "../js/settingsHandler";
       class="form-select form-select-sm"
       aria-label=".form-select-sm"
       id="hamlib_data_bits"
-      @change="handleFieldValueChange"
+      @change="onChange"
       data-section="RADIO"
       data-setting="data_bits"
       v-model="settings.remote.RADIO.data_bits"
@@ -377,7 +376,7 @@ import { handleFieldValueChange } from "../js/settingsHandler";
       class="form-select form-select-sm"
       aria-label=".form-select-sm"
       id="hamlib_stop_bits"
-      @change="handleFieldValueChange"
+      @change="onChange"
       data-section="RADIO"
       data-setting="stop_bits"
       v-model="settings.remote.RADIO.stop_bits"
@@ -394,7 +393,7 @@ import { handleFieldValueChange } from "../js/settingsHandler";
       class="form-select form-select-sm"
       aria-label=".form-select-sm"
       id="hamlib_handshake"
-      @change="handleFieldValueChange"
+      @change="onChange"
       data-section="RADIO"
       data-setting="serial_handshake"
       v-model="settings.remote.RADIO.serial_handshake"
@@ -410,7 +409,7 @@ import { handleFieldValueChange } from "../js/settingsHandler";
       class="form-select form-select-sm"
       aria-label=".form-select-sm"
       id="hamlib_ptt_port"
-      @change="handleFieldValueChange"
+      @change="onChange"
       data-section="RADIO"
       data-setting="ptt_port"
       v-model="settings.remote.RADIO.ptt_port"
@@ -426,7 +425,7 @@ import { handleFieldValueChange } from "../js/settingsHandler";
       aria-label=".form-select-sm"
       id="hamlib_pttprotocol"
       style="width: 0.5rem"
-      @change="handleFieldValueChange"
+      @change="onChange"
       data-section="RADIO"
       data-setting="ptt_type"
       v-model="settings.remote.RADIO.ptt_type"
@@ -449,7 +448,7 @@ import { handleFieldValueChange } from "../js/settingsHandler";
       aria-label=".form-select-sm"
       id="hamlib_dcd"
       style="width: 0.5rem"
-      @change="handleFieldValueChange"
+      @change="onChange"
       data-section="RADIO"
       data-setting="serial_dcd"
       v-model="settings.remote.RADIO.serial_dcd"
@@ -471,7 +470,7 @@ import { handleFieldValueChange } from "../js/settingsHandler";
       aria-label=".form-select-sm"
       id="hamlib_dtrstate"
       style="width: 0.5rem"
-      @change="handleFieldValueChange"
+      @change="onChange"
       data-section="RADIO"
       data-setting="serial_dtr"
       v-model="settings.remote.RADIO.serial_dtr"
@@ -511,7 +510,7 @@ import { handleFieldValueChange } from "../js/settingsHandler";
       id="hamlib_rigctld_custom_args"
       aria-label="Custom arguments"
       aria-describedby="basic-addon1"
-      @change="handleFieldValueChange"
+      @change="onChange"
       data-section="RIGCTLD"
       data-setting="arguments"
       v-model="settings.remote.RIGCTLD.arguments"
diff --git a/gui/src/components/settings_rigcontrol.vue b/gui/src/components/settings_rigcontrol.vue
index 2cbedeec..d0ca077c 100644
--- a/gui/src/components/settings_rigcontrol.vue
+++ b/gui/src/components/settings_rigcontrol.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
-import { settingsStore as settings } from "../store/settingsStore.js";
-import { handleFieldValueChange } from "../js/settingsHandler";
+import { settingsStore as settings, onChange } from "../store/settingsStore.js";
 </script>
 
 <template>
@@ -11,7 +10,7 @@ import { handleFieldValueChange } from "../js/settingsHandler";
       class="form-select form-select-sm"
       aria-label=".form-select-sm"
       id="rigcontrol_radiocontrol"
-      @change="handleFieldValueChange"
+      @change="onChange"
       data-section="RADIO"
       data-setting="control"
       v-model="settings.remote.RADIO.control"
@@ -34,7 +33,7 @@ import { handleFieldValueChange } from "../js/settingsHandler";
       placeholder="TCI IP"
       id="rigcontrol_tci_ip"
       aria-label="Device IP"
-      @change="handleFieldValueChange"
+      @change="onChange"
       data-section="TCI"
       data-setting="tci_ip"
       v-model="settings.remote.TCI.tci_ip"
@@ -49,7 +48,7 @@ import { handleFieldValueChange } from "../js/settingsHandler";
       placeholder="TCI port"
       id="rigcontrol_tci_port"
       aria-label="Device Port"
-      @change="handleFieldValueChange"
+      @change="onChange"
       data-section="TCI"
       data-setting="tci_port"
       v-model="settings.remote.TCI.tci_port"
diff --git a/gui/src/components/settings_station.vue b/gui/src/components/settings_station.vue
index b12baae2..d40aa2d1 100644
--- a/gui/src/components/settings_station.vue
+++ b/gui/src/components/settings_station.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
-import { settingsStore as settings } from "../store/settingsStore.js";
-import { handleFieldValueChange } from "../js/settingsHandler.js";
+import { settingsStore as settings, onChange } from "../store/settingsStore.js";
 </script>
 <template>
   <!-- station callsign -->
@@ -15,7 +14,7 @@ import { handleFieldValueChange } from "../js/settingsHandler.js";
       id="myCall"
       aria-label="Station Callsign"
       aria-describedby="basic-addon1"
-      @change="handleFieldValueChange"
+      @change="onChange"
       data-section="STATION"
       data-setting="mycall"
       v-model="settings.remote.STATION.mycall"
@@ -28,7 +27,7 @@ import { handleFieldValueChange } from "../js/settingsHandler.js";
     <select
       class="form-select form-select-sm w-50"
       id="myCallSSID"
-      @change="handleFieldValueChange"
+      @change="onChange"
       data-section="STATION"
       data-setting="myssid"
       v-model.number="settings.remote.STATION.myssid"
@@ -63,7 +62,7 @@ import { handleFieldValueChange } from "../js/settingsHandler.js";
       maxlength="6"
       aria-label="Station Grid Locator"
       aria-describedby="basic-addon1"
-      @change="handleFieldValueChange"
+      @change="onChange"
       data-section="STATION"
       data-setting="mygrid"
       v-model="settings.remote.STATION.mygrid"
diff --git a/gui/src/js/settingsHandler.ts b/gui/src/js/settingsHandler.ts
index 4dd1de5f..7a569d24 100644
--- a/gui/src/js/settingsHandler.ts
+++ b/gui/src/js/settingsHandler.ts
@@ -141,11 +141,4 @@ export function processModemConfig(data) {
       }
     }
   }
-}
-
-export function handleFieldValueChange(event) {
-  const element = event.target;
-  const newValue = element.value;
-  settings.remote[element.dataset.section][element.dataset.setting] = newValue;
-  onChange();
-}
+}
\ No newline at end of file
diff --git a/gui/src/store/settingsStore.js b/gui/src/store/settingsStore.js
index 5c0ab8a7..4aa0bc87 100644
--- a/gui/src/store/settingsStore.js
+++ b/gui/src/store/settingsStore.js
@@ -29,9 +29,6 @@ export const settingsStore = reactive({
       tuning_range_fmin: 0,
       tx_delay: 0,
     },
-    NETWORK: {
-      modemport: 0,
-    },
     RADIO: {
       control: "disabled",
       model_id: 0,