UploadDevicesTypeFieldsMatcherOne

KaplanOpenSource · Nov 19, 2024 · 12609af · 12609af
1 parent 33e56f3
commit 12609af
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 26 deletions.
diff --git a/client/src/IO/UploadDevices/UploadDevicesButton.jsx b/client/src/IO/UploadDevices/UploadDevicesButton.jsx
@@ -43,7 +43,9 @@ export const UploadDevicesButton = ({
                 accept=".json,.geojson,.csv,.zip"
                 tooltip={'Upload devices as geojson, csv, zip of csvs'}
                 onChange={handleChangeFile}
-                onClickCapture={() => setCurrTrial({ experimentName: experiment.name, trialTypeName: trialType.name, trialName: trial.name })}
+                onClickCapture={() => {
+                    setCurrTrial({ experimentName: experiment.name, trialTypeName: trialType.name, trialName: trial.name })
+                }}
                 disabled={working}
             >
                 {working

diff --git a/client/src/IO/UploadDevices/UploadDevicesTypeFieldsMatcher.jsx b/client/src/IO/UploadDevices/UploadDevicesTypeFieldsMatcher.jsx
@@ -7,6 +7,31 @@ function uniq(list) {
     return list.reduce((acc, d) => acc.includes(d) ? acc : acc.concat(d), []);
 }
 
+const UploadDevicesTypeFieldsMatcherOne = ({ oneMatch, setOneMatch, attrName, attrOptions }) => {
+    const locationUnassigned = oneMatch === FIELD_UNASSIGNED && LOCATION_FIELDS.includes(attrName);
+    return (
+        <Grid container direction='row'>
+            <Grid item xs={3} alignSelf={'center'}>
+                <Typography>{attrName}</Typography>
+            </Grid>
+            <Grid item xs={4}>
+                <SelectProperty
+                    styleFormControl={{ width: '100%' }}
+                    label={attrName}
+                    data={oneMatch}
+                    setData={v => setOneMatch(v)}
+                    options={attrOptions}
+                />
+            </Grid>
+            <Grid item xs={2} alignSelf={'center'} sx={{ margin: 1, color: 'red' }}>
+                {!locationUnassigned ? null :
+                    <Typography>Assign location fields</Typography>
+                }
+            </Grid>
+        </Grid>
+    )
+}
+
 export const UploadDevicesTypeFieldsMatcher = ({ devicesDetails, deviceType, attrMatch, setAttrMatch }) => {
     const fieldNamesOnDetails = uniq(devicesDetails.flatMap(x => {
         return Object.keys(x.attributes).filter(f => !IGNORE_FIELDS.includes(f));
@@ -28,31 +53,14 @@ export const UploadDevicesTypeFieldsMatcher = ({ devicesDetails, deviceType, att
 
     return (
         <Stack direction='column' spacing={1} sx={{ margin: 1 }}>
-            {attributeTypeNames.map((attrName, i) => {
-                const oneMatch = attrMatch[attrName] || FIELD_UNASSIGNED;
-                const locationUnassigned = oneMatch === FIELD_UNASSIGNED && LOCATION_FIELDS.includes(attrName);
-                return (
-                    <Grid container direction='row' key={i}>
-                        <Grid item xs={3} alignSelf={'center'}>
-                            <Typography key={'a' + i}>{attrName}</Typography>
-                        </Grid>
-                        <Grid item xs={4}>
-                            <SelectProperty
-                                styleFormControl={{ width: '100%' }}
-                                label={attrName}
-                                data={attrMatch[attrName] || FIELD_UNASSIGNED}
-                                setData={v => setAttrMatch({ ...attrMatch, [attrName]: v })}
-                                options={attrOptions}
-                            />
-                        </Grid>
-                        <Grid item xs={2} alignSelf={'center'} sx={{ margin: 1, color: 'red' }}>
-                            {!locationUnassigned ? null :
-                                <Typography>Assign location fields</Typography>
-                            }
-                        </Grid>
-                    </Grid>
-                )
-            })}
+            {attributeTypeNames.map((attrName, i) => (
+                <UploadDevicesTypeFieldsMatcherOne key={i}
+                    attrName={attrName}
+                    oneMatch={attrMatch[attrName] || FIELD_UNASSIGNED}
+                    setOneMatch={v => setAttrMatch({ ...attrMatch, [attrName]: v })}
+                    attrOptions={attrOptions}
+                />
+            ))}
         </Stack>
     )
 }