fix: Can add a new chart when cube is joined

Author: ptbrowne

app/charts/index.ts

@@ -338,7 +338,7 @@ export const META: Meta = {
 
 type GetInitialConfigOptions = {
   key?: string;
-  iris: { iri: string; publishIri: string }[];
+  iris: { iri: string; publishIri: string; joinBy?: string[] }[];
   chartType: ChartType;
   dimensions: Dimension[];
   measures: Measure[];
@@ -364,10 +364,11 @@ export const getInitialConfig = (
       // Technically, we should scope filters per cube; but as we only set initial
       // filters for area charts, and we can only have multi-cubes for combo charts,
       // we can ignore the filters scoping for now.
-      cubes: iris.map(({ iri, publishIri }) => ({
+      cubes: iris.map(({ iri, publishIri, joinBy }) => ({
         iri,
         publishIri,
         filters: filters ?? {},
+        joinBy,
       })),
       activeField: undefined,
     };

app/configurator/config-form.tsx

@@ -2,8 +2,8 @@ import { SelectChangeEvent, SelectProps } from "@mui/material";
 import get from "lodash/get";
 import React, {
   ChangeEvent,
-  createContext,
   InputHTMLAttributes,
+  createContext,
   useCallback,
   useContext,
   useMemo,
@@ -20,8 +20,8 @@ import {
   isComboChartConfig,
 } from "@/config-types";
 import {
-  getChartOptionField,
   GetConfiguratorStateAction,
+  getChartOptionField,
   getFilterValue,
   isConfiguring,
   isLayouting,
@@ -33,8 +33,8 @@ import {
   Dimension,
   DimensionValue,
   HierarchyValue,
-  isMeasure,
   Measure,
+  isMeasure,
 } from "@/domain/data";
 import { useLocale } from "@/locales/use-locale";
 import { bfs } from "@/utils/bfs";
@@ -386,13 +386,17 @@ export const getNewChartConfig = ({
   dimensions: Dimension[];
   measures: Measure[];
 }) => {
-  const cube = isConfiguring(state)
-    ? getChartConfig(state, state.activeChartKey).cubes[0]
-    : chartConfig.cubes[0];
+  const cubes = isConfiguring(state)
+    ? getChartConfig(state, state.activeChartKey).cubes
+    : chartConfig.cubes;
 
   return getInitialConfig({
     chartType,
-    iris: [{ iri: cube.iri, publishIri: cube.publishIri }],
+    iris: cubes.map((cube) => ({
+      iri: cube.iri,
+      publishIri: cube.publishIri,
+      joinBy: cube.joinBy,
+    })),
     dimensions,
     measures,
   });