fix legend order (#45446)

frontend/src/metabase/static-viz/components/ComboChart/ComboChart.stories.tsx

@@ -836,6 +836,13 @@ StackedChartCustomYAxisRange.args = {
   renderingContext,
 };
 
+export const SeriesOrderSettingsDoNotMatchSeriesCount = Template.bind({});
+SeriesOrderSettingsDoNotMatchSeriesCount.args = {
+  rawSeries: data.seriesOrderSettingsDoNotMatchSeriesCount as any,
+  dashcardSettings: {},
+  renderingContext,
+};
+
 export const Default = Template.bind({});
 Default.args = {
   rawSeries: data.messedUpAxis as any,

frontend/src/metabase/static-viz/components/ComboChart/settings.ts

@@ -28,6 +28,7 @@ import {
   getSeriesOrderVisibilitySettings,
   getYAxisAutoRangeDefault,
   getYAxisUnpinFromZeroDefault,
+  getSeriesOrderDimensionSetting,
   isStackingValueValid,
   isXAxisScaleValid,
   isYAxisUnpinFromZeroValid,
@@ -193,12 +194,14 @@ export const computeStaticComboChartSettings = (
     getDefaultDataLabelsFormatting(),
   );
 
-  fillWithDefaultValue(
+  settings["graph.series_order"] = getSeriesOrderVisibilitySettings(
     settings,
-    "graph.series_order",
-    getSeriesOrderVisibilitySettings(settings, seriesVizSettingsKeys),
+    seriesVizSettingsKeys,
   );
 
+  settings["graph.series_order_dimension"] =
+    getSeriesOrderDimensionSetting(settings);
+
   fillWithDefaultValue(
     settings,
     "graph.y_axis.title_text",
@@ -298,7 +301,7 @@ export const computeStaticComboChartSettings = (
   fillWithDefaultValue(
     settings,
     "legend.is_reversed",
-    getDefaultLegendIsReversed(mainDataset),
+    getDefaultLegendIsReversed(settings),
   );
 
   // For scatter plot

frontend/src/metabase/static-viz/components/ComboChart/stories-data/index.ts

@@ -92,6 +92,7 @@ import numberOfInsightsError39608 from "./number-of-insights-error-39608.json";
 import numericXAxisIncludesZero37082 from "./numeric-x-axis-includes-zero-37082.json";
 import powYScaleCustomYAxisRange from "./pow-y-scale-custom-y-axis-range.json";
 import safariNonIanaTimezoneRepro44128 from "./safari-non-iana-timezone-repro-44128.json";
+import seriesOrderSettingsDoNotMatchSeriesCount from "./series-order-settings-do-not-match-series-count.json";
 import stackedChartCustomYAxisRange from "./stacked-chart-custom-y-axis-range.json";
 import ticksNativeWeekWithGapLongRange from "./ticks-native-week-with-gap-long-range.json";
 import ticksNativeWeekWithGapShortRange from "./ticks-native-week-with-gap-short-range.json";
@@ -230,4 +231,5 @@ export const data = {
   safariNonIanaTimezoneRepro44128,
   combinedWithInvalidSettings,
   stackedChartCustomYAxisRange,
+  seriesOrderSettingsDoNotMatchSeriesCount,
 };