From 866161922b324df1c8bb5b13c8e55b56ad6befd9 Mon Sep 17 00:00:00 2001
From: Kamil Gabryjelski <kamil.gabryjelski@gmail.com>
Date: Mon, 13 May 2024 16:03:17 +0200
Subject: [PATCH 1/2] fix: Color scheme control crashing when dashboardId
 present

---
 .../components/controls/ColorSchemeControl/index.tsx   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/superset-frontend/src/explore/components/controls/ColorSchemeControl/index.tsx b/superset-frontend/src/explore/components/controls/ColorSchemeControl/index.tsx
index 105cd1e45d34e..49f9b9a37c2f0 100644
--- a/superset-frontend/src/explore/components/controls/ColorSchemeControl/index.tsx
+++ b/superset-frontend/src/explore/components/controls/ColorSchemeControl/index.tsx
@@ -125,13 +125,9 @@ const ColorSchemeControl = ({
   const options = useMemo(() => {
     if (dashboardId) {
       return [
-        {
-          value: 'dashboard',
-          label: t('dashboard'),
-          customLabel: (
-            <Tooltip title={DASHBOARD_ALERT}>{t('Dashboard scheme')}</Tooltip>
-          ),
-        },
+        <Option value="dashboard" label={t('dashboard')} key="dashboard">
+          <Tooltip title={DASHBOARD_ALERT}>{t('Dashboard scheme')}</Tooltip>
+        </Option>,
       ];
     }
     const schemesObject = isFunction(schemes) ? schemes() : schemes;

From d85f3027d5945ea4612994b44517b584e2bd7ef9 Mon Sep 17 00:00:00 2001
From: Kamil Gabryjelski <kamil.gabryjelski@gmail.com>
Date: Mon, 13 May 2024 16:13:03 +0200
Subject: [PATCH 2/2] Add unit test

---
 .../ColorSchemeControl/ColorSchemeControl.test.tsx        | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/superset-frontend/src/explore/components/controls/ColorSchemeControl/ColorSchemeControl.test.tsx b/superset-frontend/src/explore/components/controls/ColorSchemeControl/ColorSchemeControl.test.tsx
index 1f2b5c722cb40..8273b1ca922a9 100644
--- a/superset-frontend/src/explore/components/controls/ColorSchemeControl/ColorSchemeControl.test.tsx
+++ b/superset-frontend/src/explore/components/controls/ColorSchemeControl/ColorSchemeControl.test.tsx
@@ -127,3 +127,11 @@ test('displays color scheme options', async () => {
     expect(screen.getByText('Other color palettes')).toBeInTheDocument();
   });
 });
+
+test('Renders control with dashboard id', () => {
+  setup({ dashboardId: 1 });
+  expect(screen.getByText('Dashboard scheme')).toBeInTheDocument();
+  expect(
+    screen.getByLabelText('Select color scheme', { selector: 'input' }),
+  ).toBeDisabled();
+});