Merge branch 'master' of https://github.com/apache/superset into geid…

…o/fix/color-consistency-race-conditions
apache · Nov 7, 2024 · 6421f4b · 6421f4b
2 parents 0ab8dbe + de8282c
commit 6421f4b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
@@ -153,6 +153,7 @@
     "json-bigint": "^1.0.0",
     "json-stringify-pretty-compact": "^2.0.0",
     "lodash": "^4.17.21",
+    "luxon": "^3.5.0",
     "mapbox-gl": "^2.10.0",
     "markdown-to-jsx": "^7.4.7",
     "match-sorter": "^6.3.4",

diff --git a/superset-frontend/src/dashboard/actions/dashboardState.js b/superset-frontend/src/dashboard/actions/dashboardState.js
@@ -704,7 +704,7 @@ export const updateDashboardLabelsColor = () => async (dispatch, getState) => {
   const defaultScheme = categoricalSchemes.defaultKey;
   const fallbackScheme = defaultScheme?.toString() || 'supersetColors';
   const colorSchemeDomain = metadata?.color_scheme_domain || [];
-  const sharedLabels = metadata?.shared_label_colors;
+  const sharedLabels = metadata?.shared_label_colors || [];
   let requiresUpdate = false;
 
   try {