Merge branch 'master' into core-java-cleanup

PhotonVision · Oct 11, 2023 · db5249e · db5249e
2 parents 46d6258 + b37948c
commit db5249e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/photon-client/src/components/cameras/CameraCalibrationCard.vue b/photon-client/src/components/cameras/CameraCalibrationCard.vue
@@ -150,7 +150,10 @@ const importCalibrationFromCalibDB = ref();
 const openCalibUploadPrompt = () => {
   importCalibrationFromCalibDB.value.click();
 };
-const readImportedCalibration = ({ files }: { files: FileList }) => {
+const readImportedCalibration = (payload: Event) => {
+  if (payload.target == null || !payload.target?.files) return;
+  const files: FileList = payload.target.files as FileList;
+
   files[0].text().then((text) => {
     useCameraSettingsStore()
       .importCalibDB({ payload: text, filename: files[0].name })

diff --git a/photon-client/src/components/settings/DeviceControlCard.vue b/photon-client/src/components/settings/DeviceControlCard.vue
@@ -63,14 +63,17 @@ const offlineUpdate = ref();
 const openOfflineUpdatePrompt = () => {
   offlineUpdate.value.click();
 };
-const handleOfflineUpdate = ({ files }: { files: FileList }) => {
+const handleOfflineUpdate = (payload: Event) => {
   useStateStore().showSnackbarMessage({
     message: "New Software Upload in Progress...",
     color: "secondary",
     timeout: -1
   });
 
   const formData = new FormData();
+
+  if (payload.target == null || !payload.target?.files) return;
+  const files: FileList = payload.target.files as FileList;
   formData.append("jarData", files[0]);
 
   axios