Merge pull request #1281 from visualize-admin/feat/common-joinby-dimension

refactor: Common joinBy dimension

Author: bprusinowski

app/browse/datatable.tsx

@@ -267,6 +267,7 @@ export const DataSetTable = ({
         cubeFilters: chartConfig.cubes.map((cube) => ({
           iri: cube.iri,
           componentIris,
+          joinBy: cube.joinBy,
         })),
       },
     });

app/browser/dataset-preview.tsx

@@ -92,7 +92,7 @@ export const DataSetPreview = ({
 }) => {
   const footnotesClasses = useFootnotesStyles({ useMarginTop: false });
   const locale = useLocale();
-  const filters = [{ iri: dataSetIri }];
+  const cubeFilters = [{ iri: dataSetIri }];
   const [
     { data: previewData, fetching: fetchingPreview, error: previewError },
   ] = useDataCubePreviewQuery({
@@ -114,7 +114,7 @@ export const DataSetPreview = ({
       sourceType: dataSource.type,
       sourceUrl: dataSource.url,
       locale,
-      cubeFilters: filters,
+      cubeFilters,
     },
   });
   const classes = useStyles({
@@ -197,7 +197,7 @@ export const DataSetPreview = ({
               <DataDownloadMenu
                 dataSource={dataSource}
                 title={dataCubeByIri.title}
-                filters={filters}
+                filters={cubeFilters}
               />
               {dataCubeByIri.observations.sparqlEditorUrl && (
                 <RunSparqlQuery

app/charts/area/chart-area.tsx

@@ -55,6 +55,7 @@ export const ChartAreasVisualization = ({
       cubeFilters: chartConfig.cubes.map((cube) => ({
         iri: cube.iri,
         componentIris,
+        joinBy: cube.joinBy,
       })),
     },
   });

app/charts/column/chart-column.tsx

@@ -69,6 +69,7 @@ export const ChartColumnsVisualization = ({
       cubeFilters: chartConfig.cubes.map((cube) => ({
         iri: cube.iri,
         componentIris,
+        joinBy: cube.joinBy,
       })),
     },
   });

app/charts/column/columns-state.tsx

@@ -235,6 +235,8 @@ const useColumnsState = (
       return `${getYError(d)}${yErrorMeasure?.unit ?? ""}`;
     };
 
+    const y = getY(d);
+
     return {
       xAnchor,
       yAnchor,
@@ -246,7 +248,7 @@ const useColumnsState = (
       xValue: xTimeUnit ? timeFormatUnit(xLabel, xTimeUnit) : xLabel,
       datum: {
         label: undefined,
-        value: `${yValueFormatter(getY(d))}`,
+        value: y !== null && isNaN(y) ? "-" : `${yValueFormatter(getY(d))}`,
         error: getError(d),
         color: "",
       },

app/charts/column/columns.tsx

@@ -96,7 +96,8 @@ export const Columns = () => {
     return chartData.map((d) => {
       const key = getRenderingKey(d);
       const xScaled = xScale(getX(d)) as number;
-      const y = getY(d) ?? NaN;
+      const yRaw = getY(d);
+      const y = yRaw === null || isNaN(yRaw) ? 0 : yRaw;
       const yScaled = yScale(y);
       const yRender = yScale(Math.max(y, 0));
       const height = Math.abs(yScaled - y0);

app/charts/combo/chart-combo-line-column.tsx

@@ -51,6 +51,7 @@ export const ChartComboLineColumnVisualization = (
       cubeFilters: chartConfig.cubes.map((cube) => ({
         iri: cube.iri,
         componentIris,
+        joinBy: cube.joinBy,
       })),
     },
   });

app/charts/combo/chart-combo-line-dual.tsx

@@ -51,6 +51,7 @@ export const ChartComboLineDualVisualization = (
       cubeFilters: chartConfig.cubes.map((cube) => ({
         iri: cube.iri,
         componentIris,
+        joinBy: cube.joinBy,
       })),
     },
   });

app/charts/combo/chart-combo-line-single.tsx

@@ -56,6 +56,7 @@ export const ChartComboLineSingleVisualization = (
       cubeFilters: chartConfig.cubes.map((cube) => ({
         iri: cube.iri,
         componentIris,
+        joinBy: cube.joinBy,
       })),
     },
   });

app/charts/index.ts

@@ -137,7 +137,7 @@ export const chartTypesOrder: { [k in ChartType]: number } = {
  * @param dimensions
  * @param preferredType
  */
-export const findPreferredDimension = (
+const findPreferredDimension = (
   dimensions: Component[],
   preferredType?: DimensionType
 ) => {
@@ -1885,9 +1885,11 @@ const adjustSegmentSorting = ({
 export const getPossibleChartTypes = ({
   dimensions,
   measures,
+  allowedChartTypes,
 }: {
   dimensions: Dimension[];
   measures: Measure[];
+  allowedChartTypes?: ChartType[];
 }): ChartType[] => {
   const numericalMeasures = measures.filter(isNumericalMeasure);
   const ordinalMeasures = measures.filter(isOrdinalMeasure);
@@ -1945,7 +1947,11 @@ export const getPossibleChartTypes = ({
   }
 
   return chartTypes
-    .filter((d) => possibles.includes(d))
+    .filter(
+      (d) =>
+        possibles.includes(d) &&
+        (!allowedChartTypes || allowedChartTypes.includes(d))
+    )
     .sort((a, b) => chartTypesOrder[a] - chartTypesOrder[b]);
 };