Fix y1 axis parse

tbidne · Dec 17, 2024 · 3ea3752 · 3ea3752
1 parent aecf4f6
commit 3ea3752
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 8 deletions.
diff --git a/backend/data/input/example/chart-requests.toml b/backend/data/input/example/chart-requests.toml
@@ -7,6 +7,7 @@ y-axis = 'distance'
 title = 'Marathons'
 filters = ['label marathon']
 y-axis = 'duration'
+y1-axis = 'pace'
 
 # Takes runs w/ label 'official' but __not__ marathon.
 [[charts]]

diff --git a/backend/src/Pacer/Chart/Data/ChartRequest.hs b/backend/src/Pacer/Chart/Data/ChartRequest.hs
@@ -147,7 +147,7 @@ instance DecodeTOML ChartRequest where
     filters <- Utils.getFieldOptArrayOf "filters"
     title <- TOML.getFieldWith tomlDecoder "title"
     yAxis <- TOML.getFieldWith tomlDecoder "y-axis"
-    yAxis1 <- TOML.getFieldOptWith tomlDecoder "y-axis1"
+    yAxis1 <- TOML.getFieldOptWith tomlDecoder "y1-axis"
     pure
       $ MkChartRequest
         { filters,

diff --git a/backend/test/functional/data/testDuplicateDateError_chart-requests.toml b/backend/test/functional/data/testDuplicateDateError_chart-requests.toml
@@ -5,7 +5,7 @@ y-axis = 'distance'
 [[charts]]
 title = 'Runs by duration'
 y-axis = 'duration'
-y-axis1 = 'distance'
+y1-axis = 'distance'
 
 [[charts]]
 title = 'Runs by pace'

diff --git a/backend/test/functional/data/testFilterEmptyError_chart-requests.toml b/backend/test/functional/data/testFilterEmptyError_chart-requests.toml
@@ -5,7 +5,7 @@ y-axis = 'distance'
 [[charts]]
 title = 'Chart 2'
 y-axis = 'duration'
-y-axis1 = 'distance'
+y1-axis = 'distance'
 filters = ['label label1']
 
 [[charts]]

diff --git a/backend/test/functional/data/testFilter_chart-requests.toml b/backend/test/functional/data/testFilter_chart-requests.toml
@@ -5,7 +5,7 @@ y-axis = 'distance'
 [[charts]]
 title = 'Chart 2'
 y-axis = 'duration'
-y-axis1 = 'distance'
+y1-axis = 'distance'
 filters = ['label label1']
 
 [[charts]]

diff --git a/backend/test/functional/data/testSimple_chart-requests.toml b/backend/test/functional/data/testSimple_chart-requests.toml
@@ -5,7 +5,7 @@ y-axis = 'distance'
 [[charts]]
 title = 'Runs by duration'
 y-axis = 'duration'
-y-axis1 = 'distance'
+y1-axis = 'distance'
 
 [[charts]]
 title = 'Runs by pace'

diff --git a/backend/test/functional/goldens/testExampleChart.golden b/backend/test/functional/goldens/testExampleChart.golden
@@ -33,6 +33,13 @@
           12000,
           18900
         ]
+      },
+      "y1": {
+        "label": "/km",
+        "values": [
+          284.3938855314611,
+          447.9203697120512
+        ]
       }
     },
     "title": "Marathons"

diff --git a/backend/test/unit/goldens/testParseExampleChartRequestsToml.golden b/backend/test/unit/goldens/testParseExampleChartRequestsToml.golden
@@ -13,7 +13,7 @@ MkChartRequests
                 ]
             , title = "Marathons"
             , yAxis = YAxisDuration
-            , yAxis1 = Nothing
+            , yAxis1 = Just YAxisPace
             }
         , MkChartRequest
             { filters =

diff --git a/web/src/build_charts.ts b/web/src/build_charts.ts
@@ -11,11 +11,30 @@ function mkDataSet(x: { values: number[]; label: string }) {
   };
 }
 
-for (var i = 0; i <= charts.length; i++) {
+/**
+ * We widen charts to charts_typed since if charts.json does not have any
+ * charts with a y1 axis, ts will infer the y1 prop does not exist,
+ * hence the y1 access will fail.
+*/
+const charts_typed = charts as {
+  data: {
+    x: string[];
+    y: {
+      label: string; values: number[];
+    };
+    y1: {
+      label: string; values: number[];
+    };
+  };
+  title: string;
+}[];
+
+
+for (var i = 0; i <= charts_typed.length; i++) {
   const elemId = `chart${i}`;
   appendCanvasId(elemId);
 
-  const chart = charts[i];
+  const chart = charts_typed[i];
   const title = chart.title;
 
   let opts: ChartOptions<"line"> = null;