feat: Disable no-unit measures in multi line combo charts

visualize-admin · Oct 18, 2023 · e4e00c0 · e4e00c0
1 parent 61c0eb1
commit e4e00c0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/app/charts/index.ts b/app/charts/index.ts
@@ -530,7 +530,7 @@ export const getInitialConfig = (
     case "comboLineSingle": {
       // It's guaranteed by getPossibleChartTypes that there are at least two units.
       const mostCommonUnit = rollups(
-        numericalMeasures,
+        numericalMeasures.filter((d) => d.unit),
         (v) => v.length,
         (d) => d.unit
       ).sort((a, b) => descending(a[1], b[1]))[0][0];
@@ -556,7 +556,7 @@ export const getInitialConfig = (
     case "comboLineDual": {
       // It's guaranteed by getPossibleChartTypes that there are at least two units.
       const [firstUnit, secondUnit] = Array.from(
-        new Set(numericalMeasures.map((d) => d.unit))
+        new Set(numericalMeasures.filter((d) => d.unit).map((d) => d.unit))
       );
 
       return {
@@ -582,7 +582,7 @@ export const getInitialConfig = (
     case "comboLineColumn": {
       // It's guaranteed by getPossibleChartTypes that there are at least two units.
       const [firstUnit, secondUnit] = Array.from(
-        new Set(numericalMeasures.map((d) => d.unit))
+        new Set(numericalMeasures.filter((d) => d.unit).map((d) => d.unit))
       );
 
       return {
@@ -1292,16 +1292,17 @@ const chartConfigsAdjusters: ChartConfigsAdjusters = {
       },
       y: {
         componentIris: ({ oldValue, newChartConfig, measures }) => {
-          const numericalMeasures = measures.filter(isNumericalMeasure);
-          const availableMeasureIris = numericalMeasures.map((d) => d.iri);
-          const measure = numericalMeasures.find(
-            (d) => d.iri === (oldValue ?? availableMeasureIris[0])
-          ) as NumericalMeasure;
+          const numericalMeasures = measures.filter(
+            (d) => isNumericalMeasure(d) && d.unit
+          );
+          const { unit } =
+            numericalMeasures.find((d) => d.iri === oldValue) ??
+            numericalMeasures[0];
 
           return produce(newChartConfig, (draft) => {
             draft.fields.y = {
               componentIris: numericalMeasures
-                .filter((d) => d.unit === measure.unit)
+                .filter((d) => d.unit === unit)
                 .map((d) => d.iri),
             };
           });
@@ -1814,12 +1815,12 @@ export const getPossibleChartTypes = ({
 
       if (temporalDimensions.length > 0) {
         const uniqueUnits = Array.from(
-          new Set(numericalMeasures.map((d) => d.unit))
+          new Set(numericalMeasures.filter((d) => d.unit).map((d) => d.unit))
         );
 
         if (uniqueUnits.length > 1) {
           possibles.push(...comboChartTypes);
-        } else {
+        } else if (uniqueUnits.length > 0) {
           possibles.push("comboLineSingle");
         }
       }

diff --git a/app/configurator/components/chart-options-selector.tsx b/app/configurator/components/chart-options-selector.tsx
@@ -616,10 +616,12 @@ const ChartComboLineSingleYField = (
       } = {}
     ) => {
       const options = getComboOptionGroups(numericalMeasures, (m) => {
-        return enableAll
+        return !m.unit
+          ? true
+          : enableAll
           ? false
           : m.unit !== unit ||
-              (y.componentIris.includes(m.iri) && m.iri !== iri);
+            (y.componentIris.includes(m.iri) && m.iri !== iri);
       });
 
       if (allowNone) {