This is an automated email from the ASF dual-hosted git repository.

enzomartellucci pushed a commit to branch enxdev/refactor-antd5-icons
in repository https://gitbox.apache.org/repos/asf/superset.git

commit a89e89dab57ed2b0616e1ce3c2ac878322dc425a
Merge: 55f7a62b47 fc844d3dfd
Author: Enzo Martellucci <[email protected]>
AuthorDate: Wed Mar 5 17:01:04 2025 +0100

    Merge branch master into enxdev/refactor-antd5-icons

 .github/dependabot.yml                             |  16 +-
 RESOURCES/FEATURE_FLAGS.md                         |   1 -
 RESOURCES/INTHEWILD.md                             |  16 +-
 UPDATING.md                                        |   1 +
 docker-compose.yml                                 |   2 +-
 docs/docs/configuration/alerts-reports.mdx         |   5 +-
 docs/docs/configuration/async-queries-celery.mdx   |   8 +-
 docs/docs/configuration/cache.mdx                  |   2 +-
 docs/docs/configuration/configuring-superset.mdx   |  13 +-
 docs/docs/configuration/databases.mdx              | 147 ++--
 .../importing-exporting-datasources.mdx            |  22 +-
 docs/docs/configuration/networking-settings.mdx    |   9 +-
 docs/docs/configuration/sql-templating.mdx         |  19 +-
 docs/docs/configuration/timezones.mdx              |   4 +-
 docs/docs/contributing/development.mdx             |  23 +-
 docs/docs/contributing/resources.mdx               |   2 +-
 docs/docs/faq.mdx                                  |  18 +-
 docs/docs/installation/architecture.mdx            |   4 +
 docs/docs/installation/docker-builds.mdx           |   3 +-
 docs/docs/installation/kubernetes.mdx              |   1 +
 docs/docs/quickstart.mdx                           |   4 +-
 docs/docs/security/security.mdx                    |  11 +-
 .../creating-your-first-dashboard.mdx              |   6 +-
 docs/docs/using-superset/exploring-data.mdx        |   2 +-
 docs/package.json                                  |  10 +-
 docs/yarn.lock                                     | 172 ++--
 pyproject.toml                                     |   2 +-
 requirements/base.txt                              |   2 +-
 requirements/development.txt                       |   2 +-
 superset-frontend/package-lock.json                | 932 ++++++++++++++++++++-
 superset-frontend/package.json                     |   6 +-
 .../packages/superset-ui-core/package.json         |   4 +-
 .../superset-ui-core/src/utils/featureFlags.ts     |   1 -
 .../legacy-preset-chart-deckgl/package.json        |   2 +-
 .../src/Timeseries/transformers.ts                 |  11 +-
 .../plugins/plugin-chart-handlebars/package.json   |   2 +-
 .../plugins/plugin-chart-pivot-table/package.json  |   2 +-
 .../src/plugin/controlPanel.tsx                    |   2 +-
 .../plugin-chart-table/src/controlPanel.tsx        |   2 +-
 superset-frontend/src/dashboard/actions/hydrate.js |   5 +-
 .../DashboardBuilder/DashboardBuilder.tsx          |   7 +-
 .../FilterBarSettings/FilterBarSettings.test.tsx   |  31 +-
 .../FilterBar/FilterBarSettings/index.tsx          |  20 +-
 .../FilterBar/FilterControls/FilterControls.tsx    |   7 +-
 .../DatabaseConnectionForm/EncryptedField.tsx      |  66 +-
 .../OAuth2ClientField.test.tsx                     |  11 +-
 .../DatabaseConnectionForm/OAuth2ClientField.tsx   |  41 +-
 .../DatabaseConnectionForm/TableCatalog.tsx        |   9 +-
 .../DatabaseConnectionForm/constants.ts            |   6 +-
 .../src/features/databases/DatabaseModal/styles.ts |  25 +-
 superset-frontend/src/features/databases/types.ts  |   2 +-
 superset-frontend/src/utils/getBootstrapData.ts    |  15 +-
 superset-websocket/package-lock.json               | 659 ++++++++++++++-
 superset-websocket/package.json                    |   4 +-
 superset/commands/chart/importers/v1/utils.py      |   7 +-
 superset/commands/dashboard/importers/v1/utils.py  |   7 +-
 superset/commands/database/validate.py             |   2 +-
 superset/commands/dataset/importers/v1/utils.py    |   8 +
 superset/config.py                                 |   1 -
 superset/databases/api.py                          |   2 +-
 superset/db_engine_specs/gsheets.py                |  42 +-
 superset/models/core.py                            |  11 +-
 superset/security/guest_token.py                   |   3 +-
 superset/security/manager.py                       |  32 +-
 superset/sqllab/sql_json_executer.py               |   1 -
 superset/views/utils.py                            |   4 +-
 tests/integration_tests/charts/commands_tests.py   |   6 +-
 tests/integration_tests/databases/api_tests.py     |  42 +
 tests/integration_tests/fixtures/users.py          |  80 ++
 tests/integration_tests/security_tests.py          |  53 +-
 tests/integration_tests/superset_test_config.py    |   1 -
 .../charts/commands/importers/v1/import_test.py    |  51 +-
 .../unit_tests/commands/databases/validate_test.py |   1 +
 .../commands/importers/v1/import_test.py           |  53 +-
 tests/unit_tests/databases/api_test.py             |  85 ++
 .../datasets/commands/importers/v1/import_test.py  |  52 ++
 tests/unit_tests/db_engine_specs/test_gsheets.py   |  33 +-
 .../unit_tests/migrations/shared/catalogs_test.py  |  29 +-
 78 files changed, 2486 insertions(+), 519 deletions(-)

diff --cc 
superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/FilterBarSettings.test.tsx
index eae54b114d,66fdb812b2..1c0edd62d8
--- 
a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/FilterBarSettings.test.tsx
+++ 
b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/FilterBarSettings.test.tsx
@@@ -76,13 -75,9 +75,9 @@@ beforeEach(() => 
    fetchMock.restore();
  });
  
- test('Dropdown trigger renders with FF HORIZONTAL_FILTER_BAR on', async () => 
{
-   // @ts-ignore
-   global.featureFlags = {
-     [FeatureFlag.HorizontalFilterBar]: true,
-   };
+ test('Dropdown trigger renders', async () => {
    await setup();
 -  expect(screen.getByLabelText('gear')).toBeVisible();
 +  expect(screen.getByLabelText('SettingOutlined')).toBeVisible();
  });
  
  test('Dropdown trigger renders with dashboard edit permissions', async () => {
@@@ -141,15 -118,8 +128,11 @@@ test('Can enable/disable cross-filterin
  });
  
  test('Popover opens with "Vertical" selected', async () => {
-   // @ts-ignore
-   global.featureFlags = {
-     [FeatureFlag.HorizontalFilterBar]: true,
-   };
    await setup();
 -  userEvent.click(screen.getByLabelText('gear'));
 +  const settingsButton = screen.getByRole('button', {
 +    name: 'SettingOutlined',
 +  });
 +  userEvent.click(settingsButton);
    userEvent.hover(screen.getByText('Orientation of filter bar'));
    expect(await screen.findByText('Vertical (Left)')).toBeInTheDocument();
    expect(screen.getByText('Horizontal (Top)')).toBeInTheDocument();
@@@ -159,15 -129,8 +142,11 @@@
  });
  
  test('Popover opens with "Horizontal" selected', async () => {
-   // @ts-ignore
-   global.featureFlags = {
-     [FeatureFlag.HorizontalFilterBar]: true,
-   };
    await setup({ filterBarOrientation: FilterBarOrientation.Horizontal });
 -  userEvent.click(screen.getByLabelText('gear'));
 +  const settingsButton = screen.getByRole('button', {
 +    name: 'SettingOutlined',
 +  });
 +  userEvent.click(settingsButton);
    userEvent.hover(screen.getByText('Orientation of filter bar'));
    expect(await screen.findByText('Vertical (Left)')).toBeInTheDocument();
    expect(screen.getByText('Horizontal (Top)')).toBeInTheDocument();
diff --cc 
superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/index.tsx
index 19e85c95a0,c5ff4d59cd..cb18e6dfed
--- 
a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/index.tsx
+++ 
b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBarSettings/index.tsx
@@@ -19,14 -19,7 +19,7 @@@
  
  import { useCallback, useMemo, useState } from 'react';
  import { useDispatch, useSelector } from 'react-redux';
- import {
-   FeatureFlag,
-   isFeatureEnabled,
-   styled,
-   t,
-   css,
-   useTheme,
- } from '@superset-ui/core';
 -import { styled, t, useTheme } from '@superset-ui/core';
++import { styled, t, useTheme, css } from '@superset-ui/core';
  import { MenuProps } from 'src/components/Menu';
  import { FilterBarOrientation, RootState } from 'src/dashboard/types';
  import {

Reply via email to