fix support for several categoris with same name

CartoDB · Sep 27, 2023 · 3cc633e · 3cc633e
1 parent 6c0d814
commit 3cc633e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/packages/react-ui/src/widgets/TimeSeriesWidgetUI/TimeSeriesWidgetUI.js b/packages/react-ui/src/widgets/TimeSeriesWidgetUI/TimeSeriesWidgetUI.js
@@ -180,9 +180,16 @@ function TimeSeriesWidgetUIContent({
         }))
       : [{ data: [], color: theme.palette.secondary.main }];
 
-    for (const { name, value, category } of data) {
-      const categoryIndex = categories && category ? categories.indexOf(category) : 0;
-      if (categoryIndex === -1) continue;
+    for (const { name, value, category, categoryIndex: _categoryIndex } of data) {
+      const categoryIndex =
+        _categoryIndex ?? (categories && category ? categories.indexOf(category) : 0);
+      if (
+        categoryIndex === -1 ||
+        categoryIndex >= categories.length ||
+        !Number.isFinite(categoryIndex)
+      ) {
+        continue;
+      }
 
       series[categoryIndex].data.push([name, value]);
     }
@@ -197,7 +204,7 @@ function TimeSeriesWidgetUIContent({
 
     // If timeWindow is activated
     if (timeWindow.length) {
-      const [start, end] = timeWindow.map(time => new Date(time));
+      const [start, end] = timeWindow.map((time) => new Date(time));
       return formatTimeRange({ start, end, stepSize });
     }
 

diff --git a/packages/react-widgets/src/models/TimeSeriesModel.js b/packages/react-widgets/src/models/TimeSeriesModel.js
@@ -18,15 +18,15 @@ async function getMultipleSeries(props) {
     getCategoryForAggregationOperation({ operation, operationColumn, series })
   );
   const rowsByCategory = await Promise.all(
-    series.map(async (serie, index) => ({
+    series.map(async (serie, categoryIndex) => ({
       data: (await getTimeSeries({ ...propsNoSeries, ...serie })).rows,
-      category: categories[index]
+      categoryIndex
     }))
   );
   const rows = [];
-  for (const { data, category } of rowsByCategory) {
+  for (const { data, categoryIndex } of rowsByCategory) {
     for (const { name, value } of data) {
-      rows.push({ name, value, category });
+      rows.push({ name, value, categoryIndex });
     }
   }
   return {