From 43eefcf1c5f90d9820d849a46d3d36ac90a08e27 Mon Sep 17 00:00:00 2001
From: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com>
Date: Tue, 26 Sep 2023 08:02:18 -0400
Subject: [PATCH] Correctly stringify numbers in textboxes (#921)

* fix an issue where the fov isnt reset on error

* Fix issue with incorrectly reading fov on update

* Properly handle NPE in case of error

* Fix issue with vuetify comps not converting strings to numbers

* Formatting fixes
---
 .../src/components/cameras/CameraSettingsCard.vue | 15 +++++++++------
 .../src/components/common/cv-range-slider.vue     |  7 ++++++-
 photon-client/src/components/common/cv-slider.vue |  2 +-
 .../org/photonvision/server/RequestHandler.java   |  4 ++--
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/photon-client/src/components/cameras/CameraSettingsCard.vue b/photon-client/src/components/cameras/CameraSettingsCard.vue
index 7edcf954f8..cc40394b77 100644
--- a/photon-client/src/components/cameras/CameraSettingsCard.vue
+++ b/photon-client/src/components/cameras/CameraSettingsCard.vue
@@ -3,20 +3,22 @@ import CvSelect from "@/components/common/cv-select.vue";
 import CvNumberInput from "@/components/common/cv-number-input.vue";
 import { useCameraSettingsStore } from "@/stores/settings/CameraSettingsStore";
 import { useStateStore } from "@/stores/StateStore";
-import { ref } from "vue";
+import { ref, watchEffect } from "vue";
 
-const currentFov = ref(useCameraSettingsStore().currentCameraSettings.fov.value);
+const currentFov = ref();
 
 const saveCameraSettings = () => {
   useCameraSettingsStore()
-    .updateCameraSettings({ fov: currentFov.value }, true)
+    .updateCameraSettings({ fov: currentFov.value }, false)
     .then((response) => {
+      useCameraSettingsStore().currentCameraSettings.fov.value = currentFov.value;
       useStateStore().showSnackbarMessage({
         color: "success",
         message: response.data.text || response.data
       });
     })
     .catch((error) => {
+      currentFov.value = useCameraSettingsStore().currentCameraSettings.fov.value;
       if (error.response) {
         useStateStore().showSnackbarMessage({
           color: "error",
@@ -33,11 +35,12 @@ const saveCameraSettings = () => {
           message: "An error occurred while trying to process the request."
         });
       }
-    })
-    .finally(() => {
-      useCameraSettingsStore().currentCameraSettings.fov.value = currentFov.value;
     });
 };
+
+watchEffect(() => {
+  currentFov.value = useCameraSettingsStore().currentCameraSettings.fov.value;
+});
 </script>
 
 <template>
diff --git a/photon-client/src/components/common/cv-range-slider.vue b/photon-client/src/components/common/cv-range-slider.vue
index 5222295aa9..9367993264 100644
--- a/photon-client/src/components/common/cv-range-slider.vue
+++ b/photon-client/src/components/common/cv-range-slider.vue
@@ -32,7 +32,12 @@ const localValue = computed<[number, number]>({
   get: (): [number, number] => {
     return Object.values(props.value) as [number, number];
   },
-  set: (v) => emit("input", v)
+  set: (v) => {
+    for (let i = 0; i < v.length; i++) {
+      v[i] = parseFloat(v[i] as unknown as string);
+    }
+    emit("input", v);
+  }
 });
 
 const changeFromSlot = (v: number, i: number) => {
diff --git a/photon-client/src/components/common/cv-slider.vue b/photon-client/src/components/common/cv-slider.vue
index 48bf0cd1b4..74138793ca 100644
--- a/photon-client/src/components/common/cv-slider.vue
+++ b/photon-client/src/components/common/cv-slider.vue
@@ -27,7 +27,7 @@ const emit = defineEmits<{
 
 const localValue = computed({
   get: () => props.value,
-  set: (v) => emit("input", v)
+  set: (v) => emit("input", parseFloat(v as unknown as string))
 });
 </script>
 
diff --git a/photon-server/src/main/java/org/photonvision/server/RequestHandler.java b/photon-server/src/main/java/org/photonvision/server/RequestHandler.java
index 14bebe2887..798fa2241d 100644
--- a/photon-server/src/main/java/org/photonvision/server/RequestHandler.java
+++ b/photon-server/src/main/java/org/photonvision/server/RequestHandler.java
@@ -323,7 +323,7 @@ public static void onCameraSettingsRequest(Context ctx) {
             var data = kObjectMapper.readTree(ctx.body());
 
             int index = data.get("index").asInt();
-            double fov = kObjectMapper.readTree(data.get("settings").asText()).get("fov").asDouble();
+            double fov = data.get("settings").get("fov").asDouble();
 
             var module = VisionModuleManager.getInstance().getModule(index);
             module.setFov(fov);
@@ -333,7 +333,7 @@ public static void onCameraSettingsRequest(Context ctx) {
             ctx.status(200);
             ctx.result("Successfully saved camera settings");
             logger.info("Successfully saved camera settings");
-        } catch (JsonProcessingException e) {
+        } catch (JsonProcessingException | NullPointerException e) {
             ctx.status(400);
             ctx.result("The provided camera settings were malformed");
             logger.error("The provided camera settings were malformed", e);