From f81304846251b82a128013ce0800a2cc1b71e744 Mon Sep 17 00:00:00 2001
From: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com>
Date: Sun, 18 Jun 2023 00:05:46 -0400
Subject: [PATCH] [PhotonClient] Fix misc bugs and dataflow errors (#861)

Fixes leftover bugs from #767 and #856

- Because new URLs aren't based on hash URL schemas, all the routes need to be updated to final paths instead of relative ones that were previously caught by the hash URL
- Fixed misc Vue warnings pointed out by @mcm001
---
 photon-client/src/App.vue                            | 10 +++++-----
 .../components/pipeline/CameraAndPipelineSelect.vue  | 12 ++++++------
 photon-client/src/views/CamerasView.vue              |  5 +----
 photon-client/src/views/PipelineView.vue             |  2 +-
 .../src/views/SettingsViews/DeviceControl.vue        |  2 +-
 photon-client/src/views/SettingsViews/Lighting.vue   |  2 +-
 6 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/photon-client/src/App.vue b/photon-client/src/App.vue
index 6e0ecd001..164253f09 100644
--- a/photon-client/src/App.vue
+++ b/photon-client/src/App.vue
@@ -32,7 +32,7 @@
 
         <v-list-item
           link
-          to="dashboard"
+          to="/dashboard"
           @click="rollbackPipelineIndex()"
         >
           <v-list-item-icon>
@@ -45,7 +45,7 @@
         <v-list-item
           ref="camerasTabOpener"
           link
-          to="cameras"
+          to="/cameras"
           @click="switchToDriverMode()"
         >
           <v-list-item-icon>
@@ -57,7 +57,7 @@
         </v-list-item>
         <v-list-item
           link
-          to="settings"
+          to="/settings"
           @click="switchToSettingsTab()"
         >
           <v-list-item-icon>
@@ -69,7 +69,7 @@
         </v-list-item>
         <v-list-item
           link
-          to="docs"
+          to="/docs"
         >
           <v-list-item-icon>
             <v-icon>mdi-bookshelf</v-icon>
@@ -197,7 +197,7 @@
         <v-card-text>
           PhotonVision cannot connect to the NetworkTables Server. Please visit the
           <router-link
-            to="settings"
+            to="/settings"
             class="accent--text"
             @click="switchToSettingsTab"
           >
diff --git a/photon-client/src/components/pipeline/CameraAndPipelineSelect.vue b/photon-client/src/components/pipeline/CameraAndPipelineSelect.vue
index d0271a1a0..7fd3a1ccd 100644
--- a/photon-client/src/components/pipeline/CameraAndPipelineSelect.vue
+++ b/photon-client/src/components/pipeline/CameraAndPipelineSelect.vue
@@ -144,7 +144,7 @@
         </v-menu>
       </v-col>
       <v-col
-        v-if="currentPipelineType >= 0"
+        v-if="_currentPipelineType >= 0"
         cols="10"
         md="11"
         lg="10"
@@ -152,7 +152,7 @@
         class="pa-0"
       >
         <CVselect
-          v-model="currentPipelineType"
+          v-model="_currentPipelineType"
           name="Type"
           tooltip="Changes the pipeline type, which changes the type of processing that will happen on input frames"
           :list="['Reflective Tape', 'Colored Shape', 'AprilTag']"
@@ -321,7 +321,7 @@ export default {
                 this.$store.commit('currentPipelineIndex', value - (this.$store.getters.isDriverMode ? 1 : 0));
             }
         },
-        currentPipelineType: {
+        _currentPipelineType: {
             get() {
                 return this.$store.getters.currentPipelineSettings.pipelineType - 2;
             },
@@ -333,11 +333,11 @@ export default {
     methods: {
         showTypeDialog(idx) {
             // Only show the dialog if it's a new type
-            this.showPipeTypeDialog = idx !== this.currentPipelineType;
+            this.showPipeTypeDialog = idx !== this._currentPipelineType;
             this.proposedPipelineType = idx;
         },
         changePipeType(actuallyChange) {
-            const newIdx = actuallyChange ? this.proposedPipelineType : this.currentPipelineType
+            const newIdx = actuallyChange ? this.proposedPipelineType : this._currentPipelineType
             this.handleInputWithIndex('pipelineType', newIdx);
             this.showPipeTypeDialog = false;
         },
@@ -387,7 +387,7 @@ export default {
                 if (this.isPipelineNameEdit) {
                     this.handleInputWithIndex("changePipelineName", this.newPipelineName);
                 } else {
-                    this.handleInputWithIndex("addNewPipeline", [this.newPipelineName, this.currentPipelineType]); // 0 for reflective, 1 for colored shape
+                    this.handleInputWithIndex("addNewPipeline", [this.newPipelineName, this._currentPipelineType]); // 0 for reflective, 1 for colored shape
                 }
                 this.discardPipelineNameChange();
             }
diff --git a/photon-client/src/views/CamerasView.vue b/photon-client/src/views/CamerasView.vue
index de5293a5a..c695cdb07 100644
--- a/photon-client/src/views/CamerasView.vue
+++ b/photon-client/src/views/CamerasView.vue
@@ -323,7 +323,7 @@
       >
         <template>
           <CVimage
-            :id="cameras-cal"
+            :id="'cameras-cal'"
             :idx="1"
             :disconnected="!$store.state.backendConnected"
             scale="100"
@@ -479,13 +479,10 @@ export default {
           get() {
             return this.unfilteredStreamDivisors.filter(item => {
               const res = this.stringResolutionList[this.selectedFilteredResIndex].split(" X ").map(it => parseInt(it));
-              console.log(res);
-              console.log(item);
               // Realistically, we need more than 320x240, but lower than this is
               // basically unusable. For now, don't allow decimations that take us
               // below that
               const ret = ((res[0] / item) >= 300 && (res[1] / item) >= 220) || (item === 1);
-              console.log(ret);
               return ret;
             })
           }
diff --git a/photon-client/src/views/PipelineView.vue b/photon-client/src/views/PipelineView.vue
index 90c60f7e5..848f3ef20 100644
--- a/photon-client/src/views/PipelineView.vue
+++ b/photon-client/src/views/PipelineView.vue
@@ -236,7 +236,7 @@
         <v-card-text>
           Because the current resolution {{ this.$store.getters.currentVideoFormat.width }} x {{ this.$store.getters.currentVideoFormat.height }} is not yet calibrated, 3D mode cannot be enabled. Please
           <a
-            href="/#/cameras"
+            href="/cameras"
             class="white--text"
             @click="$emit('switch-to-cameras')"
           > visit the Cameras tab</a> to calibrate this resolution. For now, SolvePNP will do nothing.
diff --git a/photon-client/src/views/SettingsViews/DeviceControl.vue b/photon-client/src/views/SettingsViews/DeviceControl.vue
index c0e20e081..ef6c772ee 100644
--- a/photon-client/src/views/SettingsViews/DeviceControl.vue
+++ b/photon-client/src/views/SettingsViews/DeviceControl.vue
@@ -159,7 +159,7 @@
 <script>
 export default {
   // eslint-disable-next-line
-  name: "Device Control",
+  name: "DeviceControl",
   data() {
     return {
       snack: false,
diff --git a/photon-client/src/views/SettingsViews/Lighting.vue b/photon-client/src/views/SettingsViews/Lighting.vue
index 07ba2a68a..355127e65 100644
--- a/photon-client/src/views/SettingsViews/Lighting.vue
+++ b/photon-client/src/views/SettingsViews/Lighting.vue
@@ -17,7 +17,7 @@
 
     export default {
         // eslint-disable-next-line
-        name: 'LED Control',
+        name: 'LEDControl',
         components: {
             CVslider,
         },