From f9494128bc0956f71a2733a2468e357703c6b3c8 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Tue, 25 Mar 2025 19:15:22 -0700 Subject: [PATCH] fix some tests --- .../plugins/plugin-chart-echarts/src/components/Echart.tsx | 1 - .../plugins/plugin-chart-echarts/src/utils/series.ts | 2 +- .../plugins/plugin-chart-echarts/test/utils/series.test.ts | 5 +++-- superset-frontend/src/components/Tooltip/index.tsx | 1 - superset-frontend/src/features/home/SavedQueries.tsx | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/components/Echart.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/components/Echart.tsx index 3074350ea83..167801fc331 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/components/Echart.tsx +++ b/superset-frontend/plugins/plugin-chart-echarts/src/components/Echart.tsx @@ -122,7 +122,6 @@ const getTheme = (options: any) => { }, tooltip: { backgroundColor: token.colorBgContainer, - borderColor: token.colorSplit, textStyle: { color: token.colorText }, }, axisPointer: { diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts b/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts index e268c9b7692..ea9c63c7f25 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts @@ -441,7 +441,7 @@ export function getLegendProps( fontFamily: theme.fontFamily, fontSize: theme.fontSizeSM, color: theme.colorText, - borderColor: theme.colorBgBase, + borderColor: theme.colorBorder, }, }; const MIN_LEGEND_WIDTH = 0; diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts index 37e8c00cded..323f576fd09 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts @@ -53,11 +53,12 @@ import { NULL_STRING } from '../../src/constants'; const expectedThemeProps = { selector: ['all', 'inverse'], + selected: undefined, selectorLabel: { fontFamily: theme.fontFamily, fontSize: theme.fontSizeSM, - color: theme.colors.grayscale.base, - borderColor: theme.colors.grayscale.base, + color: theme.colorText, + borderColor: theme.colorBorder, }, }; diff --git a/superset-frontend/src/components/Tooltip/index.tsx b/superset-frontend/src/components/Tooltip/index.tsx index 97f7961e75d..a5a8d83ee72 100644 --- a/superset-frontend/src/components/Tooltip/index.tsx +++ b/superset-frontend/src/components/Tooltip/index.tsx @@ -17,7 +17,6 @@ * under the License. */ // eslint-disable-next-line no-restricted-imports -import { supersetTheme } from '@superset-ui/core'; // TODO: DO not import theme directly import { Tooltip as AntdTooltip } from 'antd-v5'; import type { TooltipProps } from 'antd-v5'; diff --git a/superset-frontend/src/features/home/SavedQueries.tsx b/superset-frontend/src/features/home/SavedQueries.tsx index ee1f7363abc..fccb88c3ad1 100644 --- a/superset-frontend/src/features/home/SavedQueries.tsx +++ b/superset-frontend/src/features/home/SavedQueries.tsx @@ -115,7 +115,7 @@ const QueryContainer = styled.div` } `; -const SavedQueries = ({ +export const SavedQueries = ({ user, addDangerToast, addSuccessToast,