From 992b3d0ba6fdd13a16a3825b4fe2eba601435e69 Mon Sep 17 00:00:00 2001
From: Brandon Presley <brandon@presley.nz>
Date: Sun, 30 Oct 2022 15:14:57 +1300
Subject: [PATCH] Fix unit sometimes exporting as the string 'null'

---
 DrawerMenu.tsx | 17 +++++++++++++----
 SetList.tsx    |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/DrawerMenu.tsx b/DrawerMenu.tsx
index 7cf021c..d615de5 100644
--- a/DrawerMenu.tsx
+++ b/DrawerMenu.tsx
@@ -8,6 +8,7 @@ import {DrawerParamList} from './drawer-param-list';
 import {useSnackbar} from './MassiveSnack';
 import {Plan} from './plan';
 import {addPlans, deletePlans, getAllPlans} from './plan.service';
+import Set from './set';
 import {addSets, deleteSets, getAllSets} from './set.service';
 import {write} from './write';
 
@@ -25,9 +26,15 @@ export default function DrawerMenu({name}: {name: keyof DrawerParamList}) {
     const sets = await getAllSets();
     const data = [setFields]
       .concat(
-        sets.map(
-          set =>
-            `${set.id},${set.name},${set.reps},${set.weight},${set.created},${set.unit},${set.hidden},${set.sets},${set.minutes},${set.seconds}`,
+        sets.map(set =>
+          setFields
+            .split(',')
+            .map(fieldString => {
+              const field = fieldString as keyof Set;
+              if (field === 'unit') return set[field] || 'kg';
+              return set[field];
+            })
+            .join(','),
         ),
       )
       .join('\n');
@@ -61,7 +68,7 @@ export default function DrawerMenu({name}: {name: keyof DrawerParamList}) {
       .slice(1)
       .filter(line => line)
       .map(set => {
-        const [
+        let [
           ,
           setName,
           reps,
@@ -73,6 +80,8 @@ export default function DrawerMenu({name}: {name: keyof DrawerParamList}) {
           minutes,
           seconds,
         ] = set.split(',');
+        unit = unit || 'kg';
+        hidden = hidden || '0';
         return `('${setName}',${reps},${weight},'${created}','${unit}',${hidden},${
           sets ?? 3
         },${minutes ?? 3},${seconds ?? 30})`;
diff --git a/SetList.tsx b/SetList.tsx
index 2c18b1e..f8179fa 100644
--- a/SetList.tsx
+++ b/SetList.tsx
@@ -31,7 +31,7 @@ export default function SetList() {
       limit,
       offset: 0,
     });
-    console.log(`${SetList.name}.refresh:`, {first: newSets[0]});
+    console.log(`${SetList.name}.refresh:`, {newSets});
     if (newSets.length === 0) return setSets([]);
     setSets(newSets);
     setOffset(0);