From 2ccf41f6746ede2374bcf43c7b994e5d2dc59f2b Mon Sep 17 00:00:00 2001
From: DJ2LS <dj2ls@proton.me>
Date: Fri, 5 Jan 2024 23:20:21 +0100
Subject: [PATCH] fixing some typescript errors

---
 gui/src/components/main_my_station.vue  |  6 +++---
 gui/src/components/main_rig_control.vue | 26 ++++++++++++-------------
 gui/src/components/settings_modem.vue   | 15 +-------------
 gui/src/js/chatHandler.ts               |  2 +-
 gui/src/js/settingsHandler.ts           | 17 +++++++---------
 5 files changed, 25 insertions(+), 41 deletions(-)

diff --git a/gui/src/components/main_my_station.vue b/gui/src/components/main_my_station.vue
index 2d7bfa53..e48a23b7 100644
--- a/gui/src/components/main_my_station.vue
+++ b/gui/src/components/main_my_station.vue
@@ -59,14 +59,14 @@ function saveSettings() {
               maxlength="8"
               aria-label="Input group"
               aria-describedby="btnGroupAddon"
-              v-model="settings.mycall"
+              v-model="settings.remote.STATION.mycall"
               @input="saveSettings"
             />
             <select
               class="form-select form-select-sm"
               aria-label=".form-select-sm"
               id="myCallSSID"
-              v-model="settings.myssid"
+              v-model="settings.remote.STATION.myssid"
               @change="saveSettings"
             >
               <option selected value="0">0</option>
@@ -109,7 +109,7 @@ function saveSettings() {
               maxlength="6"
               aria-label="Input group"
               aria-describedby="btnGroupAddon"
-              v-model="settings.mygrid"
+              v-model="settings.remote.STATION.mygrid"
               @input="saveSettings"
             />
           </div>
diff --git a/gui/src/components/main_rig_control.vue b/gui/src/components/main_rig_control.vue
index d9594bf5..fa25f8e2 100644
--- a/gui/src/components/main_rig_control.vue
+++ b/gui/src/components/main_rig_control.vue
@@ -16,7 +16,7 @@ function startStopRigctld() {
   switch (state.rigctld_started) {
     case "stopped":
 
-      settings.hamlib_deviceport = (<HTMLInputElement>document.getElementById("hamlib_deviceport")).value;
+      settings.remote.RADIO.serial_port = (<HTMLInputElement>document.getElementById("hamlib_deviceport")).value;
 
       startRigctld();
 
@@ -34,17 +34,17 @@ function selectRadioControl() {
 // @ts-expect-error
   switch (event.target.id) {
     case "list-rig-control-none-list":
-      settings.radiocontrol = "disabled";
+      settings.remote.RADIO.control = "disabled";
       break;
     case "list-rig-control-rigctld-list":
-      settings.radiocontrol = "rigctld";
+      settings.remote.RADIO.control = "rigctld";
       break;
     case "list-rig-control-tci-list":
-      settings.radiocontrol = "tci";
+      settings.remote.RADIO.control = "tci";
       break;
     default:
       console.log("default=!==");
-      settings.radiocontrol = "disabled";
+      settings.remote.RADIO.control = "disabled";
   }
   saveSettingsToFile();
 }
@@ -84,7 +84,7 @@ alert("not yet implemented")
                 href="#list-rig-control-none"
                 role="tab"
                 aria-controls="list-rig-control-none"
-                v-bind:class="{ active: settings.radiocontrol === 'disabled' }"
+                v-bind:class="{ active: settings.remote.RADIO.control === 'disabled' }"
                 @click="selectRadioControl()"
                 >None</a
               >
@@ -95,7 +95,7 @@ alert("not yet implemented")
                 href="#list-rig-control-rigctld"
                 role="tab"
                 aria-controls="list-rig-control-rigctld"
-                v-bind:class="{ active: settings.radiocontrol === 'rigctld' }"
+                v-bind:class="{ active: settings.remote.RADIO.control === 'rigctld' }"
                 @click="selectRadioControl()"
                 >Rigctld</a
               >
@@ -106,7 +106,7 @@ alert("not yet implemented")
                 href="#list-rig-control-tci"
                 role="tab"
                 aria-controls="list-rig-control-tci"
-                v-bind:class="{ active: settings.radiocontrol === 'tci' }"
+                v-bind:class="{ active: settings.remote.RADIO.control === 'tci' }"
                 @click="selectRadioControl()"
                 >TCI</a
               >
@@ -131,7 +131,7 @@ alert("not yet implemented")
       <div class="tab-content" id="rig-control-nav-tabContent">
         <div
           class="tab-pane fade"
-          v-bind:class="{ 'show active': settings.radiocontrol === 'disabled' }"
+          v-bind:class="{ 'show active': settings.remote.RADIO.control === 'disabled' }"
           id="list-rig-control-none"
           role="tabpanel"
           aria-labelledby="list-rig-control-none-list"
@@ -145,7 +145,7 @@ alert("not yet implemented")
         <div
           class="tab-pane fade"
           id="list-rig-control-rigctld"
-          v-bind:class="{ 'show active': settings.radiocontrol === 'rigctld' }"
+          v-bind:class="{ 'show active': settings.remote.RADIO.control === 'rigctld' }"
           role="tabpanel"
           aria-labelledby="list-rig-control-rigctld-list"
         >
@@ -200,7 +200,7 @@ alert("not yet implemented")
         <div
           class="tab-pane fade"
           id="list-rig-control-tci"
-          v-bind:class="{ 'show active': settings.radiocontrol === 'tci' }"
+          v-bind:class="{ 'show active': settings.remote.RADIO.control === 'tci' }"
           role="tabpanel"
           aria-labelledby="list-rig-control-tci-list"
         >
@@ -214,7 +214,7 @@ alert("not yet implemented")
                 placeholder="tci IP"
                 id="tci_ip"
                 aria-label="Device IP"
-                v-model="settings.tci_ip"
+                v-model="settings.remote.TCI.tci_ip"
               />
             </div>
 
@@ -226,7 +226,7 @@ alert("not yet implemented")
                 placeholder="tci port"
                 id="tci_port"
                 aria-label="Device Port"
-                v-model="settings.tci_port"
+                v-model="settings.remote.TCI.tci_port"
               />
             </div>
           </div>
diff --git a/gui/src/components/settings_modem.vue b/gui/src/components/settings_modem.vue
index 9d675588..744a3ddb 100644
--- a/gui/src/components/settings_modem.vue
+++ b/gui/src/components/settings_modem.vue
@@ -176,20 +176,7 @@ import { audioInputOptions, audioOutputOptions } from "../js/deviceFormHelper";
       <option value="3600">60 mins</option>
     </select>
   </div>
-  <div class="input-group input-group-sm mb-1">
-    <label class="input-group-text w-50">Enable waterfall data</label>
-    <label class="input-group-text w-50">
-      <div class="form-check form-switch form-check-inline">
-        <input
-          class="form-check-input"
-          type="checkbox"
-          id="fftSwitch"
-          v-model="settings.local.enable_fft"
-        />
-        <label class="form-check-label" for="fftSwitch">Waterfall</label>
-      </div>
-    </label>
-  </div>
+
   <div class="input-group input-group-sm mb-1">
     <label class="input-group-text w-50">Enable 250Hz bandwidth mode</label>
     <label class="input-group-text w-50">
diff --git a/gui/src/js/chatHandler.ts b/gui/src/js/chatHandler.ts
index 0ed44e75..258673b4 100644
--- a/gui/src/js/chatHandler.ts
+++ b/gui/src/js/chatHandler.ts
@@ -896,7 +896,7 @@ export function newMessageReceived(message, protocol) {
     uuid: message[3],
     duration: 0,
     nacks: 0,
-    speed_list: [],
+    speed_list: "[]",
     _attachments: {
       [message[6]]: {
         content_type: message[7],
diff --git a/gui/src/js/settingsHandler.ts b/gui/src/js/settingsHandler.ts
index 2b2a99b7..533cb9cd 100644
--- a/gui/src/js/settingsHandler.ts
+++ b/gui/src/js/settingsHandler.ts
@@ -8,9 +8,6 @@ setActivePinia(pinia);
 
 import { settingsStore as settings, onChange } from "../store/settingsStore.js";
 
-import { useAudioStore } from "../store/audioStore.js";
-const audioStore = useAudioStore(pinia);
-
 import { useStateStore } from "../store/stateStore";
 const stateStore = useStateStore(pinia);
 
@@ -89,11 +86,11 @@ export function loadSettings() {
     }
     try {
       if (key == "wftheme") {
-        setColormap(config[key]);
+        setColormap();
       }
       if (key == "mycall") {
-        settings.mycall = config[key].split("-")[0];
-        settings.myssid = config[key].split("-")[1];
+        settings.remote.STATION.mycall = config[key].split("-")[0];
+        settings.remote.STATION.myssid = config[key].split("-")[1];
       } else {
         settings[key] = config[key];
       }
@@ -127,11 +124,11 @@ export function processModemConfig(data) {
             let mycall = data[category][setting];
             if (mycall.includes("-")) {
               const splittedCallsign = mycall.split("-");
-              settings.mycall = splittedCallsign[0]; // The part before the hyphen
-              settings.myssid = parseInt(splittedCallsign[1], 10); // The part after the hyphen, converted to a number
+              settings.remote.STATION.mycall = splittedCallsign[0]; // The part before the hyphen
+              settings.remote.STATION.myssid = parseInt(splittedCallsign[1], 10); // The part after the hyphen, converted to a number
             } else {
-              settings.mycall = mycall; // Use the original mycall if no SSID is present
-              settings.myssid = 0; // Default SSID if not provided
+              settings.remote.STATION.mycall = mycall; // Use the original mycall if no SSID is present
+              settings.remote.STATION.myssid = 0; // Default SSID if not provided
             }
           } else {
             settings[variableName] = data[category][setting];