upload multiple devices

KaplanOpenSource · Nov 12, 2024 · 07b9351 · 07b9351
1 parent 6f0f558
commit 07b9351
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/client/src/IO/UploadDevices/UploadDevicesButton.jsx b/client/src/IO/UploadDevices/UploadDevicesButton.jsx
@@ -17,11 +17,12 @@ export const UploadDevicesButton = ({ data, experiment, setData }) => {
                 throw "empty file";
             }
 
-            setDevicesToUpload([]);
+            const alldevs = [];
             for (const file of files) {
                 const devices = await obtainDevicesFromFile(file);
-                setDevicesToUpload(prev => [...prev, ...devices])
+                alldevs.push(...devices);
             }
+            setDevicesToUpload(alldevs);
         } catch (error) {
             setErrors([error?.message || error]);
         }

diff --git a/client/src/IO/UploadDevices/UploadDevicesFieldsDialog.jsx b/client/src/IO/UploadDevices/UploadDevicesFieldsDialog.jsx
@@ -3,7 +3,7 @@ import { groupBy } from "lodash";
 import { UploadDevicesTypeFieldsMatcher } from "./UploadDevicesTypeFieldsMatcher";
 import { useState } from "react";
 import { changeDeviceOnTrial } from "./changeDeviceOnTrial";
-import { FIELD_UNASSIGNED, LOCATION_FIELDS } from "./uploadDefs";
+import { FIELD_TYPE, FIELD_UNASSIGNED, LOCATION_FIELDS } from "./uploadDefs";
 
 export const UploadDevicesFieldsDialog = ({ devicesToUpload, setDevicesToUpload, data, setData, experiment }) => {
 
@@ -18,7 +18,7 @@ export const UploadDevicesFieldsDialog = ({ devicesToUpload, setDevicesToUpload,
         setDevicesToUpload(_ => []);
     };
 
-    const devicesByType = Object.values(groupBy(devicesToUpload, x => x[1]));
+    const devicesByType = Object.values(groupBy(devicesToUpload, x => x[FIELD_TYPE]));
 
     let disabled = false;
     for (const a of Object.values(attrMatch)) {
@@ -29,6 +29,9 @@ export const UploadDevicesFieldsDialog = ({ devicesToUpload, setDevicesToUpload,
         }
     }
 
+    console.log(devicesToUpload)
+    console.log(devicesByType)
+
     return (
         <Dialog
             open={true}

diff --git a/client/src/IO/UploadDevices/obtainDevicesFromFile.ts b/client/src/IO/UploadDevices/obtainDevicesFromFile.ts
@@ -59,14 +59,16 @@ export const obtainDevicesFromFile = async (file: File): Promise<DevicesFromFile
     }
 
     if (ext === 'zip') {
-        const devices = [];
+        const devices: DevicesFromFile[] = [];
+
         const zip = await JSZip().loadAsync(file);
         for (const z of Object.values(zip.files)) {
             const zext = z?.name?.split('.')?.pop()?.toLowerCase() || '';
 
             if (zext === 'csv' || zext?.endsWith('json')) {
                 const text = await z.async('text');
-                return obtainDeviceFromText(zext, text) || [];
+                const currdevs = obtainDeviceFromText(zext, text) || [];
+                devices.push(...currdevs);
             }
         }