This is an automated email from the ASF dual-hosted git repository. maximebeauchemin pushed a commit to branch template_less in repository https://gitbox.apache.org/repos/asf/superset.git
commit cde1da62850b372090c9a8a7fce89ba51405385a Merge: 3665ebcb4b 6e1d1ad18b Author: Maxime Beauchemin <[email protected]> AuthorDate: Fri Mar 28 17:24:20 2025 -0700 Merge branch 'master' into template_less .../plugins/plugin-chart-table/src/buildQuery.ts | 5 - .../plugin-chart-table/test/buildQuery.test.ts | 9 -- superset-frontend/spec/helpers/shim.tsx | 2 +- .../SqlLab/components/QueryLimitSelect/index.tsx | 2 +- .../src/SqlLab/components/QueryTable/index.tsx | 2 +- .../src/SqlLab/components/ResultSet/index.tsx | 2 +- .../components/RunQueryActionButton/index.tsx | 2 +- .../components/SaveDatasetActionButton/index.tsx | 2 +- .../SqlLab/components/ShareSqlLabQuery/index.tsx | 2 +- .../src/SqlLab/components/ShowSQL/index.tsx | 2 +- .../src/SqlLab/components/SouthPane/index.tsx | 2 +- .../src/SqlLab/components/SqlEditor/index.tsx | 2 +- .../SqlLab/components/SqlEditorLeftBar/index.tsx | 2 +- .../SqlLab/components/SqlEditorTabHeader/index.tsx | 2 +- .../SqlLab/components/TabbedSqlEditors/index.tsx | 2 +- .../src/SqlLab/components/TableElement/index.tsx | 7 +- .../src/SqlLab/components/TablePreview/index.tsx | 2 +- ...er-chart-tile.svg => big_number_chart_tile.svg} | Bin .../icons/{checkbox-half.svg => checkbox_half.svg} | Bin .../icons/{checkbox-off.svg => checkbox_off.svg} | Bin .../icons/{checkbox-on.svg => checkbox_on.svg} | Bin .../src/components/AlteredSliceTag/index.tsx | 2 +- .../src/components/CertifiedBadge/index.tsx | 2 +- .../components/Chart/DisabledMenuItemTooltip.tsx | 2 +- .../components/Chart/DrillBy/DrillByMenuItems.tsx | 2 +- .../Chart/DrillDetail/DrillDetailTableControls.tsx | 2 +- .../CopyToClipboard/CopyToClipboard.stories.tsx | 2 +- .../src/components/Datasource/CollectionTable.tsx | 2 +- .../src/components/Datasource/DatasourceEditor.jsx | 2 +- .../src/components/Datasource/DatasourceModal.tsx | 2 +- .../src/components/Dropdown/index.tsx | 2 +- .../DropdownContainer/DropdownContainer.test.tsx | 2 +- .../src/components/DropdownContainer/index.tsx | 2 +- .../ErrorMessage/BasicErrorAlert.test.tsx | 2 +- .../components/ErrorMessage/BasicErrorAlert.tsx | 2 +- .../ErrorMessage/DatabaseErrorMessage.test.tsx | 2 +- .../DatasetNotFoundErrorMessage.test.tsx | 2 +- .../src/components/ErrorMessage/ErrorAlert.tsx | 2 +- .../ErrorMessageWithStackTrace.test.tsx | 8 ++ .../FrontendNetworkErrorMessage.test.tsx | 2 +- .../src/components/ErrorMessage/IssueCode.tsx | 2 +- .../ErrorMessage/ParameterErrorMessage.test.tsx | 2 +- .../ErrorMessage/TimeoutErrorMessage.test.tsx | 2 +- .../src/components/FaveStar/index.tsx | 2 +- .../src/components/Form/LabeledErrorBoundInput.tsx | 2 +- .../src/components/GridTable/Header.test.tsx | 8 +- .../src/components/GridTable/Header.tsx | 2 +- .../src/components/GridTable/HeaderMenu.test.tsx | 11 -- .../src/components/GridTable/HeaderMenu.tsx | 2 +- .../src/components/IconButton/index.tsx | 2 +- .../components/IconTooltip/IconTooltip.stories.tsx | 2 +- .../src/components/Icons/AntdEnhanced.tsx | 38 ++++--- .../components/Icons/{Icon.tsx => AsyncIcon.tsx} | 4 +- .../src/components/Icons/Icons.stories.tsx | 8 +- superset-frontend/src/components/Icons/index.tsx | 89 +++++++++------- .../src/components/IndeterminateCheckbox/index.tsx | 2 +- .../src/components/InfoTooltip/index.tsx | 2 +- .../components/Label/reusable/DatasetTypeLabel.tsx | 2 +- .../components/Label/reusable/PublishedLabel.tsx | 2 +- .../src/components/LastUpdated/index.tsx | 2 +- .../src/components/ListView/ActionsBar.tsx | 4 +- .../src/components/ListView/Filters/Search.tsx | 2 +- .../src/components/ListView/ListView.tsx | 2 +- .../ListViewCard/ListViewCard.stories.tsx | 2 +- .../src/components/MessageToasts/Toast.tsx | 2 +- .../src/components/MetadataBar/ContentConfig.tsx | 2 +- .../src/components/PageHeaderWithActions/index.tsx | 5 +- .../src/components/Popover/Popover.test.tsx | 2 +- .../src/components/PopoverDropdown/index.tsx | 2 +- .../src/components/PopoverSection/index.tsx | 2 +- .../src/components/Radio/Radio.stories.tsx | 15 +-- .../src/components/RefreshLabel/index.tsx | 2 +- .../src/components/Select/AsyncSelect.tsx | 2 +- superset-frontend/src/components/Select/styles.tsx | 2 +- superset-frontend/src/components/Select/utils.tsx | 2 +- .../header-renderers/HeaderWithRadioGroup.tsx | 2 +- .../src/components/TableCollection/index.tsx | 2 +- .../src/components/TableSelector/index.tsx | 2 +- superset-frontend/src/components/Tabs/Tabs.tsx | 2 +- superset-frontend/src/components/Tags/Tag.tsx | 2 +- superset-frontend/src/components/Timer/index.tsx | 2 +- .../src/components/Tooltip/Tooltip.test.tsx | 2 +- .../components/WarningIconWithTooltip/index.tsx | 2 +- .../DashboardBuilder/DashboardBuilder.tsx | 2 +- .../src/dashboard/components/DashboardGrid.jsx | 2 +- .../dashboard/components/DeleteComponentButton.tsx | 2 +- .../FiltersBadge/FilterIndicator/index.tsx | 2 +- .../dashboard/components/FiltersBadge/index.tsx | 2 +- .../src/dashboard/components/Header/index.jsx | 2 +- .../src/dashboard/components/SliceAdder.tsx | 2 +- .../src/dashboard/components/SliceHeader/index.tsx | 2 +- .../components/SliceHeaderControls/index.tsx | 2 +- .../components/URLShortLinkButton/index.tsx | 2 +- .../src/dashboard/components/dnd/DragHandle.tsx | 2 +- .../filterscope/renderFilterScopeTreeNodes.jsx | 2 +- .../dashboard/components/gridComponents/Column.jsx | 2 +- .../dashboard/components/gridComponents/Row.jsx | 2 +- .../dashboard/components/gridComponents/Tabs.jsx | 2 +- .../components/menu/BackgroundStyleDropdown.tsx | 4 - .../FilterBar/CrossFilters/CrossFilterTitle.tsx | 2 +- .../ScopingModal/ChartsScopingListPanel.tsx | 2 +- .../CrossFilters/ScopingModal/ScopingTreePanel.tsx | 2 +- .../FilterBar/FilterBarSettings/index.tsx | 2 +- .../FilterBar/FilterControls/FilterControls.tsx | 2 +- .../FilterBar/FilterControls/FilterDivider.tsx | 2 +- .../nativeFilters/FilterBar/Header/index.tsx | 2 +- .../nativeFilters/FilterBar/Vertical.tsx | 2 +- .../nativeFilters/FilterCard/DependenciesRow.tsx | 2 +- .../nativeFilters/FilterCard/NameRow.tsx | 2 +- .../FiltersConfigModal/DraggableFilter.tsx | 2 +- .../FiltersConfigModal/FilterTitleContainer.tsx | 2 +- .../FiltersConfigModal/FilterTitlePane.tsx | 2 +- .../FiltersConfigForm/DependencyList.tsx | 2 +- .../FiltersConfigForm/FilterScope/ScopingTree.tsx | 2 +- .../FiltersConfigForm/FiltersConfigForm.tsx | 2 +- .../FiltersConfigModal/FiltersConfigModal.tsx | 2 +- .../src/explore/components/ControlHeader.tsx | 2 +- .../explore/components/ControlPanelsContainer.tsx | 2 +- .../explore/components/DataTableControl/index.tsx | 2 +- .../components/DataTablesPane/DataTablesPane.tsx | 2 +- .../DatasourcePanelDragOption/index.tsx | 2 +- .../DatasourcePanel/DatasourcePanelItem.tsx | 2 +- .../components/ExploreChartHeader/index.jsx | 2 +- .../components/ExploreViewContainer/index.jsx | 2 +- .../components/ExportToCSVDropdown/index.tsx | 2 +- .../explore/components/PropertiesModal/index.tsx | 2 +- .../explore/components/RunQueryButton/index.tsx | 2 +- .../controls/AnnotationLayerControl/index.tsx | 2 +- .../controls/CollectionControl/index.jsx | 2 +- .../controls/ColorSchemeControl/index.tsx | 2 +- .../controls/ColumnConfigControl/constants.tsx | 2 +- .../ConditionalFormattingControl.tsx | 2 +- .../controls/DatasourceControl/index.jsx | 2 +- .../controls/DateFilterControl/DateFilterLabel.tsx | 2 +- .../DateFilterControl/components/DateLabel.tsx | 2 +- .../DndColumnSelectPopoverTitle.jsx | 2 +- .../DndColumnSelectControl/DndSelectLabel.tsx | 2 +- .../controls/DndColumnSelectControl/Option.tsx | 2 +- .../FilterControl/AdhocFilterControl/index.jsx | 2 +- .../FixedOrMetricControl.test.tsx | 2 +- .../controls/LayerConfigsControl/FlatLayerTree.tsx | 2 +- .../controls/LayerConfigsControl/LayerTreeItem.tsx | 2 +- .../MetricControl/AdhocMetricEditPopoverTitle.tsx | 2 +- .../controls/MetricControl/MetricsControl.jsx | 2 +- .../components/controls/OptionControls/index.tsx | 2 +- .../controls/VizTypeControl/FastVizSwitcher.tsx | 2 +- .../VizTypeControl/VizTypeControl.test.tsx | 2 +- .../controls/VizTypeControl/VizTypeGallery.tsx | 2 +- .../controls/VizTypeControl/constants.tsx | 2 +- .../DashboardsSubMenu.tsx | 2 +- .../useExploreAdditionalActionsMenu/index.jsx | 2 +- .../src/features/alerts/AlertReportModal.tsx | 2 +- .../features/alerts/components/AlertStatusIcon.tsx | 2 +- .../alerts/components/NotificationMethod.tsx | 2 +- .../features/alerts/components/RecipientIcon.tsx | 2 +- .../alerts/components/ValidatedPanelHeader.tsx | 2 +- .../annotationLayers/AnnotationLayerModal.tsx | 2 +- .../src/features/annotations/AnnotationModal.tsx | 2 +- .../src/features/charts/ChartCard.tsx | 2 +- .../src/features/cssTemplates/CssTemplateModal.tsx | 2 +- .../src/features/dashboards/DashboardCard.tsx | 2 +- .../DatabaseConnectionForm/EncryptedField.tsx | 2 +- .../DatabaseConnectionForm/TableCatalog.tsx | 2 +- .../databases/DatabaseModal/SSHTunnelForm.tsx | 2 +- .../src/features/databases/DatabaseModal/index.tsx | 2 +- .../features/databases/UploadDataModel/index.tsx | 2 +- .../AddDataset/DatasetPanel/DatasetPanel.test.tsx | 2 +- .../AddDataset/DatasetPanel/DatasetPanel.tsx | 2 +- .../AddDataset/EditDataset/UsageTab/index.tsx | 2 +- .../features/datasets/AddDataset/Header/index.tsx | 2 +- .../src/features/home/ActivityTable.tsx | 2 +- superset-frontend/src/features/home/ChartTable.tsx | 2 +- .../src/features/home/DashboardTable.tsx | 2 +- .../src/features/home/LanguagePicker.tsx | 2 +- superset-frontend/src/features/home/Menu.tsx | 2 +- superset-frontend/src/features/home/RightMenu.tsx | 2 +- .../src/features/home/SavedQueries.tsx | 2 +- superset-frontend/src/features/home/SubMenu.tsx | 2 +- .../src/features/queries/SyntaxHighlighterCopy.tsx | 2 +- .../ReportModal/HeaderReportDropdown/index.tsx | 2 +- .../src/features/reports/ReportModal/index.tsx | 2 +- .../src/features/rls/RowLevelSecurityModal.tsx | 2 +- superset-frontend/src/features/tags/TagCard.tsx | 2 +- .../src/pages/AlertReportList/index.tsx | 2 +- .../src/pages/AnnotationLayerList/index.tsx | 2 +- .../src/pages/AnnotationList/index.tsx | 2 +- .../src/pages/ChartCreation/index.tsx | 2 +- superset-frontend/src/pages/ChartList/index.tsx | 2 +- .../src/pages/CssTemplateList/index.tsx | 2 +- .../src/pages/DashboardList/index.tsx | 2 +- superset-frontend/src/pages/DatabaseList/index.tsx | 2 +- superset-frontend/src/pages/DatasetList/index.tsx | 2 +- .../src/pages/QueryHistoryList/index.tsx | 2 +- .../src/pages/RowLevelSecurityList/index.tsx | 2 +- .../src/pages/SavedQueryList/index.tsx | 2 +- superset-frontend/src/pages/Tags/index.tsx | 2 +- superset/async_events/cache_backend.py | 5 + tests/integration_tests/charts/api_tests.py | 58 ----------- tests/integration_tests/charts/data/api_tests.py | 112 +++++++++++++++------ 199 files changed, 367 insertions(+), 379 deletions(-) diff --cc superset-frontend/src/components/Dropdown/index.tsx index 6b23b4be0c,99079e87ad..95a60eab45 --- a/superset-frontend/src/components/Dropdown/index.tsx +++ b/superset-frontend/src/components/Dropdown/index.tsx @@@ -29,11 -29,11 +29,11 @@@ import DropdownProps as AntdDropdownProps, } from 'antd-v5'; import { styled } from '@superset-ui/core'; - import Icons from 'src/components/Icons'; + import { Icons } from 'src/components/Icons'; const MenuDots = styled.div` - width: ${({ theme }) => theme.gridUnit * 0.75}px; - height: ${({ theme }) => theme.gridUnit * 0.75}px; + width: ${({ theme }) => theme.sizeUnit * 0.75}px; + height: ${({ theme }) => theme.sizeUnit * 0.75}px; border-radius: 50%; background-color: ${({ theme }) => theme.colors.grayscale.light1}; diff --cc superset-frontend/src/components/ErrorMessage/BasicErrorAlert.tsx index 1129683b75,1bad6a8a52..6f915442b0 --- a/superset-frontend/src/components/ErrorMessage/BasicErrorAlert.tsx +++ b/superset-frontend/src/components/ErrorMessage/BasicErrorAlert.tsx @@@ -16,9 -16,21 +16,9 @@@ * specific language governing permissions and limitations * under the License. */ -import { ErrorLevel, styled, useTheme } from '@superset-ui/core'; +import { ErrorLevel, styled, themeObject, useTheme } from '@superset-ui/core'; - import Icons from 'src/components/Icons'; + import { Icons } from 'src/components/Icons'; -const StyledContainer = styled.div<{ level: ErrorLevel }>` - display: flex; - flex-direction: row; - background-color: ${({ level, theme }) => theme.colors[level].light2}; - border-radius: ${({ theme }) => theme.borderRadius}px; - border: 1px solid ${({ level, theme }) => theme.colors[level].base}; - color: ${({ level, theme }) => theme.colors[level].dark2}; - padding: ${({ theme }) => theme.gridUnit * 2}px; - margin-bottom: ${({ theme }) => theme.gridUnit}px; - width: 100%; -`; - const StyledContent = styled.div` display: flex; flex-direction: column; diff --cc superset-frontend/src/components/Tooltip/Tooltip.test.tsx index c58816b961,8b2d418894..264684261f --- a/superset-frontend/src/components/Tooltip/Tooltip.test.tsx +++ b/superset-frontend/src/components/Tooltip/Tooltip.test.tsx @@@ -17,8 -17,9 +17,8 @@@ * under the License. */ import { render, screen, userEvent } from 'spec/helpers/testing-library'; -import { supersetTheme } from '@superset-ui/core'; import Button from 'src/components/Button'; - import Icons from 'src/components/Icons'; + import { Icons } from 'src/components/Icons'; import { Tooltip } from '.'; test('starts hidden with default props', () => { diff --cc superset-frontend/src/features/home/SubMenu.tsx index 223f0d0045,7945e76da9..5aeaa02f21 --- a/superset-frontend/src/features/home/SubMenu.tsx +++ b/superset-frontend/src/features/home/SubMenu.tsx @@@ -26,21 -26,19 +26,21 @@@ import { debounce } from 'lodash' import { Row } from 'src/components'; import { Menu, MenuMode, MainNav } from 'src/components/Menu'; import Button, { OnClickHandler } from 'src/components/Button'; - import Icons from 'src/components/Icons'; + import { Icons } from 'src/components/Icons'; import { MenuObjectProps } from 'src/types/bootstrapTypes'; -const StyledHeader = styled.div` - margin-bottom: ${({ theme }) => theme.gridUnit * 4}px; +const StyledHeader = styled.div<{ backgroundColor?: string }>` + background-color: ${({ theme, backgroundColor }) => + backgroundColor || theme.colorBgContainer}; + margin-bottom: ${({ theme }) => theme.sizeUnit * 4}px; .header { - font-weight: ${({ theme }) => theme.typography.weights.bold}; - margin-right: ${({ theme }) => theme.gridUnit * 3}px; + font-weight: ${({ theme }) => theme.fontWeightStrong}; + margin-right: ${({ theme }) => theme.sizeUnit * 3}px; text-align: left; font-size: 18px; - padding: ${({ theme }) => theme.gridUnit * 3}px; + padding: ${({ theme }) => theme.sizeUnit * 3}px; display: inline-block; - line-height: ${({ theme }) => theme.gridUnit * 9}px; + litne-height: ${({ theme }) => theme.sizeUnit * 9}px; } .nav-right { display: flex;
