From 8b9a198d0be7b844eb983dc4f950336a91dfc630 Mon Sep 17 00:00:00 2001
From: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com>
Date: Wed, 11 Oct 2023 18:31:50 -0400
Subject: [PATCH] [photon-client] Fix imports and simplify process of updated
 pipeline settings in store (#946)

* Update CameraSettingsStore.ts

* Fix imports
---
 photon-client/src/assets/images/loading.svg                | 3 ++-
 photon-client/src/assets/images/logoLarge.svg              | 4 +++-
 photon-client/src/assets/images/logoSmall.svg              | 4 +++-
 photon-client/src/components/app/photon-3d-visualizer.vue  | 4 ++--
 photon-client/src/components/app/photon-log-view.vue       | 2 +-
 .../src/components/cameras/CameraCalibrationCard.vue       | 2 +-
 photon-client/src/stores/settings/CameraSettingsStore.ts   | 7 ++-----
 photon-client/src/stores/settings/GeneralSettingsStore.ts  | 4 ++--
 photon-client/src/types/WebsocketDataTypes.ts              | 3 +--
 9 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/photon-client/src/assets/images/loading.svg b/photon-client/src/assets/images/loading.svg
index 7edbc87ee4..a471c1d0f7 100644
--- a/photon-client/src/assets/images/loading.svg
+++ b/photon-client/src/assets/images/loading.svg
@@ -1,4 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin: auto; background: rgb(255, 216, 68); display: block;" width="600px" height="412px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
+<svg xmlns="http://www.w3.org/2000/svg" style="margin: auto; background: rgb(255, 216, 68); display: block;"
+     width="600px" height="412px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
 <circle cx="75" cy="50" fill="#89b99a" r="5">
   <animate attributeName="r" values="2;2;4;2;2" times="0;0.1;0.2;0.3;1" dur="1s" repeatCount="indefinite" begin="-0.9166666666666666s"></animate>
   <animate attributeName="fill" values="#89b99a;#89b99a;#43a7ce;#89b99a;#89b99a" repeatCount="indefinite" times="0;0.1;0.2;0.3;1" dur="1s" begin="-0.9166666666666666s"></animate>
diff --git a/photon-client/src/assets/images/logoLarge.svg b/photon-client/src/assets/images/logoLarge.svg
index b682db7603..d6c2247bf0 100644
--- a/photon-client/src/assets/images/logoLarge.svg
+++ b/photon-client/src/assets/images/logoLarge.svg
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 1920 680" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+<svg width="100%" height="100%" viewBox="0 0 1920 680" version="1.1" xmlns="http://www.w3.org/2000/svg"
+     xml:space="preserve"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
     <g transform="matrix(1,0,0,1,-1986,-1146)">
         <g id="PhotonVision-Header-noBG" transform="matrix(1,0,0,0.62963,-0.666667,1146)">
             <rect x="1986.67" y="0" width="1920" height="1080" style="fill:none;"/>
diff --git a/photon-client/src/assets/images/logoSmall.svg b/photon-client/src/assets/images/logoSmall.svg
index 88643de263..f528a70023 100644
--- a/photon-client/src/assets/images/logoSmall.svg
+++ b/photon-client/src/assets/images/logoSmall.svg
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 508 507" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+<svg width="100%" height="100%" viewBox="0 0 508 507" version="1.1" xmlns="http://www.w3.org/2000/svg"
+     xml:space="preserve"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
     <g transform="matrix(1,0,0,1,-1279,0)">
         <g id="PhotonVision-Icon-BG" transform="matrix(0.264062,0,0,0.469444,1279.5,0)">
             <rect x="0" y="0" width="1920" height="1080" style="fill:none;"/>
diff --git a/photon-client/src/components/app/photon-3d-visualizer.vue b/photon-client/src/components/app/photon-3d-visualizer.vue
index e723eecd2c..caa3070ccb 100644
--- a/photon-client/src/components/app/photon-3d-visualizer.vue
+++ b/photon-client/src/components/app/photon-3d-visualizer.vue
@@ -4,18 +4,18 @@ import { onBeforeUnmount, onMounted, watchEffect } from "vue";
 import {
   ArrowHelper,
   BoxGeometry,
+  Color,
   ConeGeometry,
   Mesh,
   MeshNormalMaterial,
+  type Object3D,
   PerspectiveCamera,
   Quaternion,
   Scene,
   Vector3,
-  Color,
   WebGLRenderer
 } from "three";
 import { TrackballControls } from "three/examples/jsm/controls/TrackballControls";
-import { type Object3D } from "three";
 
 const props = defineProps<{
   targets: PhotonTarget[];
diff --git a/photon-client/src/components/app/photon-log-view.vue b/photon-client/src/components/app/photon-log-view.vue
index 88ec22e1ae..e5442bc28c 100644
--- a/photon-client/src/components/app/photon-log-view.vue
+++ b/photon-client/src/components/app/photon-log-view.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, ref, inject } from "vue";
+import { computed, inject, ref } from "vue";
 import { LogLevel, type LogMessage } from "@/types/SettingTypes";
 import { useStateStore } from "@/stores/StateStore";
 
diff --git a/photon-client/src/components/cameras/CameraCalibrationCard.vue b/photon-client/src/components/cameras/CameraCalibrationCard.vue
index 17700db2d4..fb12224656 100644
--- a/photon-client/src/components/cameras/CameraCalibrationCard.vue
+++ b/photon-client/src/components/cameras/CameraCalibrationCard.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, ref } from "vue";
 import { useCameraSettingsStore } from "@/stores/settings/CameraSettingsStore";
-import { CalibrationBoardTypes, type VideoFormat, type Resolution } from "@/types/SettingTypes";
+import { CalibrationBoardTypes, type Resolution, type VideoFormat } from "@/types/SettingTypes";
 import JsPDF from "jspdf";
 import { font as PromptRegular } from "@/assets/fonts/PromptRegular";
 import MonoLogo from "@/assets/images/logoMono.png";
diff --git a/photon-client/src/stores/settings/CameraSettingsStore.ts b/photon-client/src/stores/settings/CameraSettingsStore.ts
index a86a09f409..673862771e 100644
--- a/photon-client/src/stores/settings/CameraSettingsStore.ts
+++ b/photon-client/src/stores/settings/CameraSettingsStore.ts
@@ -11,8 +11,7 @@ import { PlaceholderCameraSettings } from "@/types/SettingTypes";
 import { useStateStore } from "@/stores/StateStore";
 import type { WebsocketCameraSettingsUpdate } from "@/types/WebsocketDataTypes";
 import { WebsocketPipelineType } from "@/types/WebsocketDataTypes";
-import type { ActiveConfigurablePipelineSettings, ActivePipelineSettings } from "@/types/PipelineTypes";
-import type { PipelineType } from "@/types/PipelineTypes";
+import type { ActiveConfigurablePipelineSettings, ActivePipelineSettings, PipelineType } from "@/types/PipelineTypes";
 import axios from "axios";
 
 interface CameraSettingsStore {
@@ -174,9 +173,7 @@ export const useCameraSettingsStore = defineStore("cameraSettings", {
       settings: Partial<ActivePipelineSettings>,
       cameraIndex: number = useStateStore().currentCameraIndex
     ) {
-      Object.entries(settings).forEach(([k, v]) => {
-        this.cameras[cameraIndex].pipelineSettings[k] = v;
-      });
+      Object.assign(this.cameras[cameraIndex].pipelineSettings, settings);
     },
     /**
      * Change the nickname of the currently selected pipeline of the provided camera.
diff --git a/photon-client/src/stores/settings/GeneralSettingsStore.ts b/photon-client/src/stores/settings/GeneralSettingsStore.ts
index 6824102feb..2e5cd3b89b 100644
--- 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 {
+  ConfigurableNetworkSettings,
   GeneralSettings,
   LightingSettings,
   MetricData,
-  NetworkSettings,
-  ConfigurableNetworkSettings
+  NetworkSettings
 } from "@/types/SettingTypes";
 import { NetworkConnectionType } from "@/types/SettingTypes";
 import { useStateStore } from "@/stores/StateStore";
diff --git a/photon-client/src/types/WebsocketDataTypes.ts b/photon-client/src/types/WebsocketDataTypes.ts
index 1add7a8c64..0a31efb769 100644
--- a/photon-client/src/types/WebsocketDataTypes.ts
+++ b/photon-client/src/types/WebsocketDataTypes.ts
@@ -1,6 +1,5 @@
-import type { GeneralSettings, LightingSettings, MetricData, NetworkSettings } from "@/types/SettingTypes";
+import type { GeneralSettings, LightingSettings, LogLevel, MetricData, NetworkSettings } from "@/types/SettingTypes";
 import type { ActivePipelineSettings } from "@/types/PipelineTypes";
-import type { LogLevel } from "@/types/SettingTypes";
 
 export interface WebsocketLogMessage {
   logMessage: {