From 0c0d2b38a672bd2fef8dad75d0bffe78e8a5b80e Mon Sep 17 00:00:00 2001
From: "JUST.in DO IT" <justin.park@airbnb.com>
Date: Tue, 18 Apr 2023 12:26:29 -0700
Subject: [PATCH 01/47] fix(sqllab): infinite running state on disconnect
 (#23669)

---
 .../src/SqlLab/actions/sqlLab.js              |   5 +
 .../src/SqlLab/components/App/index.jsx       |   3 +-
 .../QueryAutoRefresh.test.tsx                 | 127 +++++++++++++++---
 .../components/QueryAutoRefresh/index.tsx     |  46 ++++---
 .../src/SqlLab/reducers/sqlLab.js             |  15 +++
 5 files changed, 158 insertions(+), 38 deletions(-)

diff --git a/superset-frontend/src/SqlLab/actions/sqlLab.js b/superset-frontend/src/SqlLab/actions/sqlLab.js
index 260f9944f9b0..e4cc78ef0f94 100644
--- a/superset-frontend/src/SqlLab/actions/sqlLab.js
+++ b/superset-frontend/src/SqlLab/actions/sqlLab.js
@@ -80,6 +80,7 @@ export const STOP_QUERY = 'STOP_QUERY';
 export const REQUEST_QUERY_RESULTS = 'REQUEST_QUERY_RESULTS';
 export const QUERY_SUCCESS = 'QUERY_SUCCESS';
 export const QUERY_FAILED = 'QUERY_FAILED';
+export const CLEAR_INACTIVE_QUERIES = 'CLEAR_INACTIVE_QUERIES';
 export const CLEAR_QUERY_RESULTS = 'CLEAR_QUERY_RESULTS';
 export const REMOVE_DATA_PREVIEW = 'REMOVE_DATA_PREVIEW';
 export const CHANGE_DATA_PREVIEW_ID = 'CHANGE_DATA_PREVIEW_ID';
@@ -219,6 +220,10 @@ export function estimateQueryCost(queryEditor) {
   };
 }
 
+export function clearInactiveQueries() {
+  return { type: CLEAR_INACTIVE_QUERIES };
+}
+
 export function startQuery(query) {
   Object.assign(query, {
     id: query.id ? query.id : shortid.generate(),
diff --git a/superset-frontend/src/SqlLab/components/App/index.jsx b/superset-frontend/src/SqlLab/components/App/index.jsx
index 4689f8ec2191..bbd1bba9aead 100644
--- a/superset-frontend/src/SqlLab/components/App/index.jsx
+++ b/superset-frontend/src/SqlLab/components/App/index.jsx
@@ -168,7 +168,7 @@ class App extends React.PureComponent {
   }
 
   render() {
-    const { queries, actions, queriesLastUpdate } = this.props;
+    const { queries, queriesLastUpdate } = this.props;
     if (this.state.hash && this.state.hash === '#search') {
       return window.location.replace('/superset/sqllab/history/');
     }
@@ -176,7 +176,6 @@ class App extends React.PureComponent {
       <SqlLabStyles data-test="SqlLabApp" className="App SqlLab">
         <QueryAutoRefresh
           queries={queries}
-          refreshQueries={actions?.refreshQueries}
           queriesLastUpdate={queriesLastUpdate}
         />
         <TabbedSqlEditors />
diff --git a/superset-frontend/src/SqlLab/components/QueryAutoRefresh/QueryAutoRefresh.test.tsx b/superset-frontend/src/SqlLab/components/QueryAutoRefresh/QueryAutoRefresh.test.tsx
index 32bf401f2213..9b2c1feaefda 100644
--- a/superset-frontend/src/SqlLab/components/QueryAutoRefresh/QueryAutoRefresh.test.tsx
+++ b/superset-frontend/src/SqlLab/components/QueryAutoRefresh/QueryAutoRefresh.test.tsx
@@ -16,15 +16,26 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import fetchMock from 'fetch-mock';
 import React from 'react';
-import { render } from '@testing-library/react';
+import configureStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import { render, waitFor } from 'spec/helpers/testing-library';
+import {
+  CLEAR_INACTIVE_QUERIES,
+  REFRESH_QUERIES,
+} from 'src/SqlLab/actions/sqlLab';
 import QueryAutoRefresh, {
   isQueryRunning,
   shouldCheckForQueries,
+  QUERY_UPDATE_FREQ,
 } from 'src/SqlLab/components/QueryAutoRefresh';
 import { successfulQuery, runningQuery } from 'src/SqlLab/fixtures';
 import { QueryDictionary } from 'src/SqlLab/types';
 
+const middlewares = [thunk];
+const mockStore = configureStore(middlewares);
+
 // NOTE: The uses of @ts-ignore in this file is to enable testing of bad inputs to verify the
 // function / component handles bad data elegantly
 describe('QueryAutoRefresh', () => {
@@ -34,10 +45,14 @@ describe('QueryAutoRefresh', () => {
   const successfulQueries: QueryDictionary = {};
   successfulQueries[successfulQuery.id] = successfulQuery;
 
-  const refreshQueries = jest.fn();
-
   const queriesLastUpdate = Date.now();
 
+  const refreshApi = 'glob:*/api/v1/query/updated_since?*';
+
+  afterEach(() => {
+    fetchMock.reset();
+  });
+
   it('isQueryRunning returns true for valid running query', () => {
     const running = isQueryRunning(runningQuery);
     expect(running).toBe(true);
@@ -91,43 +106,119 @@ describe('QueryAutoRefresh', () => {
     ).toBe(false);
   });
 
-  it('Attempts to refresh when given pending query', () => {
+  it('Attempts to refresh when given pending query', async () => {
+    const store = mockStore();
+    fetchMock.get(refreshApi, {
+      result: [
+        {
+          id: runningQuery.id,
+          status: 'success',
+        },
+      ],
+    });
+
     render(
       <QueryAutoRefresh
         queries={runningQueries}
-        refreshQueries={refreshQueries}
         queriesLastUpdate={queriesLastUpdate}
       />,
+      { useRedux: true, store },
+    );
+    await waitFor(
+      () =>
+        expect(store.getActions()).toContainEqual(
+          expect.objectContaining({
+            type: REFRESH_QUERIES,
+          }),
+        ),
+      { timeout: QUERY_UPDATE_FREQ + 100 },
     );
-    setTimeout(() => {
-      expect(refreshQueries).toHaveBeenCalled();
-    }, 1000);
   });
 
-  it('Does not fail and attempts to refresh when given pending query and invlaid query', () => {
+  it('Attempts to clear inactive queries when updated queries are empty', async () => {
+    const store = mockStore();
+    fetchMock.get(refreshApi, {
+      result: [],
+    });
+
+    render(
+      <QueryAutoRefresh
+        queries={runningQueries}
+        queriesLastUpdate={queriesLastUpdate}
+      />,
+      { useRedux: true, store },
+    );
+    await waitFor(
+      () =>
+        expect(store.getActions()).toContainEqual(
+          expect.objectContaining({
+            type: CLEAR_INACTIVE_QUERIES,
+          }),
+        ),
+      { timeout: QUERY_UPDATE_FREQ + 100 },
+    );
+    expect(
+      store.getActions().filter(({ type }) => type === REFRESH_QUERIES),
+    ).toHaveLength(0);
+    expect(fetchMock.calls(refreshApi)).toHaveLength(1);
+  });
+
+  it('Does not fail and attempts to refresh when given pending query and invlaid query', async () => {
+    const store = mockStore();
+    fetchMock.get(refreshApi, {
+      result: [
+        {
+          id: runningQuery.id,
+          status: 'success',
+        },
+      ],
+    });
+
     render(
       <QueryAutoRefresh
         // @ts-ignore
         queries={{ ...runningQueries, g324t: null }}
-        refreshQueries={refreshQueries}
         queriesLastUpdate={queriesLastUpdate}
       />,
+      { useRedux: true, store },
+    );
+    await waitFor(
+      () =>
+        expect(store.getActions()).toContainEqual(
+          expect.objectContaining({
+            type: REFRESH_QUERIES,
+          }),
+        ),
+      { timeout: QUERY_UPDATE_FREQ + 100 },
     );
-    setTimeout(() => {
-      expect(refreshQueries).toHaveBeenCalled();
-    }, 1000);
   });
 
-  it('Does NOT Attempt to refresh when given only completed queries', () => {
+  it('Does NOT Attempt to refresh when given only completed queries', async () => {
+    const store = mockStore();
+    fetchMock.get(refreshApi, {
+      result: [
+        {
+          id: runningQuery.id,
+          status: 'success',
+        },
+      ],
+    });
     render(
       <QueryAutoRefresh
         queries={successfulQueries}
-        refreshQueries={refreshQueries}
         queriesLastUpdate={queriesLastUpdate}
       />,
+      { useRedux: true, store },
+    );
+    await waitFor(
+      () =>
+        expect(store.getActions()).toContainEqual(
+          expect.objectContaining({
+            type: CLEAR_INACTIVE_QUERIES,
+          }),
+        ),
+      { timeout: QUERY_UPDATE_FREQ + 100 },
     );
-    setTimeout(() => {
-      expect(refreshQueries).not.toHaveBeenCalled();
-    }, 1000);
+    expect(fetchMock.calls(refreshApi)).toHaveLength(0);
   });
 });
diff --git a/superset-frontend/src/SqlLab/components/QueryAutoRefresh/index.tsx b/superset-frontend/src/SqlLab/components/QueryAutoRefresh/index.tsx
index 2d01e724e247..65a6d11a1d1a 100644
--- a/superset-frontend/src/SqlLab/components/QueryAutoRefresh/index.tsx
+++ b/superset-frontend/src/SqlLab/components/QueryAutoRefresh/index.tsx
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { useState } from 'react';
+import { useRef } from 'react';
+import { useDispatch } from 'react-redux';
 import { isObject } from 'lodash';
 import rison from 'rison';
 import {
@@ -27,19 +28,18 @@ import {
 } from '@superset-ui/core';
 import { QueryDictionary } from 'src/SqlLab/types';
 import useInterval from 'src/SqlLab/utils/useInterval';
+import {
+  refreshQueries,
+  clearInactiveQueries,
+} from 'src/SqlLab/actions/sqlLab';
 
-const QUERY_UPDATE_FREQ = 2000;
+export const QUERY_UPDATE_FREQ = 2000;
 const QUERY_UPDATE_BUFFER_MS = 5000;
 const MAX_QUERY_AGE_TO_POLL = 21600000;
 const QUERY_TIMEOUT_LIMIT = 10000;
 
-interface RefreshQueriesFunc {
-  (alteredQueries: any): any;
-}
-
 export interface QueryAutoRefreshProps {
   queries: QueryDictionary;
-  refreshQueries: RefreshQueriesFunc;
   queriesLastUpdate: number;
 }
 
@@ -61,20 +61,22 @@ export const shouldCheckForQueries = (queryList: QueryDictionary): boolean => {
 
 function QueryAutoRefresh({
   queries,
-  refreshQueries,
   queriesLastUpdate,
 }: QueryAutoRefreshProps) {
   // We do not want to spam requests in the case of slow connections and potentially receive responses out of order
   // pendingRequest check ensures we only have one active http call to check for query statuses
-  const [pendingRequest, setPendingRequest] = useState(false);
+  const pendingRequestRef = useRef(false);
+  const cleanInactiveRequestRef = useRef(false);
+  const dispatch = useDispatch();
 
   const checkForRefresh = () => {
-    if (!pendingRequest && shouldCheckForQueries(queries)) {
+    const shouldRequestChecking = shouldCheckForQueries(queries);
+    if (!pendingRequestRef.current && shouldRequestChecking) {
       const params = rison.encode({
         last_updated_ms: queriesLastUpdate - QUERY_UPDATE_BUFFER_MS,
       });
 
-      setPendingRequest(true);
+      pendingRequestRef.current = true;
       SupersetClient.get({
         endpoint: `/api/v1/query/updated_since?q=${params}`,
         timeout: QUERY_TIMEOUT_LIMIT,
@@ -82,19 +84,27 @@ function QueryAutoRefresh({
         .then(({ json }) => {
           if (json) {
             const jsonPayload = json as { result?: QueryResponse[] };
-            const queries =
-              jsonPayload?.result?.reduce((acc, current) => {
-                acc[current.id] = current;
-                return acc;
-              }, {}) ?? {};
-            refreshQueries?.(queries);
+            if (jsonPayload?.result?.length) {
+              const queries =
+                jsonPayload?.result?.reduce((acc, current) => {
+                  acc[current.id] = current;
+                  return acc;
+                }, {}) ?? {};
+              dispatch(refreshQueries(queries));
+            } else {
+              dispatch(clearInactiveQueries());
+            }
           }
         })
         .catch(() => {})
         .finally(() => {
-          setPendingRequest(false);
+          pendingRequestRef.current = false;
         });
     }
+    if (!cleanInactiveRequestRef.current && !shouldRequestChecking) {
+      dispatch(clearInactiveQueries());
+      cleanInactiveRequestRef.current = true;
+    }
   };
 
   // Solves issue where direct usage of setInterval in function components
diff --git a/superset-frontend/src/SqlLab/reducers/sqlLab.js b/superset-frontend/src/SqlLab/reducers/sqlLab.js
index ff2cb340bbd0..03b239e56b69 100644
--- a/superset-frontend/src/SqlLab/reducers/sqlLab.js
+++ b/superset-frontend/src/SqlLab/reducers/sqlLab.js
@@ -742,6 +742,21 @@ export default function sqlLabReducer(state = {}, action) {
       }
       return { ...state, queries: newQueries, queriesLastUpdate };
     },
+    [actions.CLEAR_INACTIVE_QUERIES]() {
+      const { queries } = state;
+      const cleanedQueries = Object.fromEntries(
+        Object.entries(queries).filter(([, query]) => {
+          if (
+            ['running', 'pending'].includes(query.state) &&
+            query.progress === 0
+          ) {
+            return false;
+          }
+          return true;
+        }),
+      );
+      return { ...state, queries: cleanedQueries };
+    },
     [actions.SET_USER_OFFLINE]() {
       return { ...state, offline: action.offline };
     },

From d6b6d9eae654d7d57a20b9c52d9b9b956627877a Mon Sep 17 00:00:00 2001
From: "Michael S. Molina" <70410625+michael-s-molina@users.noreply.github.com>
Date: Tue, 18 Apr 2023 16:31:09 -0300
Subject: [PATCH 02/47] feat: Makes "Add to dashboard" in Save chart modal
 paginated (#23634)

---
 .../cypress/integration/dashboard/utils.ts    |   4 -
 .../cypress/integration/explore/utils.ts      |   7 +-
 .../src/explore/actions/saveModalActions.js   |  37 ---
 .../explore/actions/saveModalActions.test.js  |  68 ----
 .../src/explore/components/SaveModal.test.jsx |  24 +-
 .../src/explore/components/SaveModal.tsx      | 294 ++++++++++--------
 6 files changed, 170 insertions(+), 264 deletions(-)

diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard/utils.ts b/superset-frontend/cypress-base/cypress/integration/dashboard/utils.ts
index 0b8776b06c1a..44322e1c42ce 100644
--- a/superset-frontend/cypress-base/cypress/integration/dashboard/utils.ts
+++ b/superset-frontend/cypress-base/cypress/integration/dashboard/utils.ts
@@ -163,10 +163,6 @@ export function interceptDatasets() {
   cy.intercept('GET', `/api/v1/dashboard/*/datasets`).as('getDatasets');
 }
 
-export function interceptDashboardasync() {
-  cy.intercept('GET', `/dashboardasync/api/read*`).as('getDashboardasync');
-}
-
 export function interceptFilterState() {
   cy.intercept('POST', `/api/v1/dashboard/*/filter_state*`).as(
     'postFilterState',
diff --git a/superset-frontend/cypress-base/cypress/integration/explore/utils.ts b/superset-frontend/cypress-base/cypress/integration/explore/utils.ts
index 15e7dcba1b6f..04cf1f181998 100644
--- a/superset-frontend/cypress-base/cypress/integration/explore/utils.ts
+++ b/superset-frontend/cypress-base/cypress/integration/explore/utils.ts
@@ -17,10 +17,7 @@
  * under the License.
  */
 
-import {
-  interceptGet as interceptDashboardGet,
-  interceptDashboardasync,
-} from '../dashboard/utils';
+import { interceptGet as interceptDashboardGet } from '../dashboard/utils';
 
 export function interceptFiltering() {
   cy.intercept('GET', `/api/v1/chart/?q=*`).as('filtering');
@@ -61,12 +58,10 @@ export function setFilter(filter: string, option: string) {
 
 export function saveChartToDashboard(dashboardName: string) {
   interceptDashboardGet();
-  interceptDashboardasync();
   interceptUpdate();
   interceptExploreGet();
 
   cy.getBySel('query-save-button').click();
-  cy.wait('@getDashboardasync');
   cy.getBySelLike('chart-modal').should('be.visible');
   cy.get(
     '[data-test="save-chart-modal-select-dashboard-form"] [aria-label="Select a dashboard"]',
diff --git a/superset-frontend/src/explore/actions/saveModalActions.js b/superset-frontend/src/explore/actions/saveModalActions.js
index 1c3c3b765f78..9bd516139153 100644
--- a/superset-frontend/src/explore/actions/saveModalActions.js
+++ b/superset-frontend/src/explore/actions/saveModalActions.js
@@ -40,29 +40,6 @@ export function setSaveChartModalVisibility(isVisible) {
   return { type: SET_SAVE_CHART_MODAL_VISIBILITY, isVisible };
 }
 
-export function fetchDashboards(userId) {
-  return function fetchDashboardsThunk(dispatch) {
-    return SupersetClient.get({
-      endpoint: `/dashboardasync/api/read?_flt_0_owners=${userId}`,
-    })
-      .then(({ json }) => {
-        const choices = json.pks.map((id, index) => ({
-          value: id,
-          label: (json.result[index] || {}).dashboard_title,
-        }));
-        choices.sort((a, b) =>
-          a.label.localeCompare(b.label, {
-            sensitivity: 'base',
-            numeric: true,
-          }),
-        );
-
-        return dispatch(fetchDashboardsSucceeded(choices));
-      })
-      .catch(() => dispatch(fetchDashboardsFailed(userId)));
-  };
-}
-
 export const SAVE_SLICE_FAILED = 'SAVE_SLICE_FAILED';
 export function saveSliceFailed() {
   return { type: SAVE_SLICE_FAILED };
@@ -241,20 +218,6 @@ export const createDashboard = dashboardName => async dispatch => {
   }
 };
 
-//  Get existing dashboard from ID
-export const getDashboard = dashboardId => async dispatch => {
-  try {
-    const response = await SupersetClient.get({
-      endpoint: `/api/v1/dashboard/${dashboardId}`,
-    });
-
-    return response.json;
-  } catch (error) {
-    dispatch(saveSliceFailed());
-    throw error;
-  }
-};
-
 //  Get dashboards the slice is added to
 export const getSliceDashboards = slice => async dispatch => {
   try {
diff --git a/superset-frontend/src/explore/actions/saveModalActions.test.js b/superset-frontend/src/explore/actions/saveModalActions.test.js
index f89729f5ff98..1662ead63e5f 100644
--- a/superset-frontend/src/explore/actions/saveModalActions.test.js
+++ b/superset-frontend/src/explore/actions/saveModalActions.test.js
@@ -23,10 +23,6 @@ import { ADD_TOAST } from 'src/components/MessageToasts/actions';
 import {
   createDashboard,
   createSlice,
-  fetchDashboards,
-  FETCH_DASHBOARDS_FAILED,
-  FETCH_DASHBOARDS_SUCCEEDED,
-  getDashboard,
   getSliceDashboards,
   SAVE_SLICE_FAILED,
   SAVE_SLICE_SUCCESS,
@@ -34,37 +30,6 @@ import {
   getSlicePayload,
 } from './saveModalActions';
 
-/**
- * Tests fetchDashboards action
- */
-
-const userId = 1;
-const fetchDashboardsEndpoint = `glob:*/dashboardasync/api/read?_flt_0_owners=${1}`;
-const mockDashboardData = {
-  pks: ['id'],
-  result: [{ id: 'id', dashboard_title: 'dashboard title' }],
-};
-
-test('fetchDashboards handles success', async () => {
-  fetchMock.reset();
-  fetchMock.get(fetchDashboardsEndpoint, mockDashboardData);
-  const dispatch = sinon.spy();
-  await fetchDashboards(userId)(dispatch);
-  expect(fetchMock.calls(fetchDashboardsEndpoint)).toHaveLength(1);
-  expect(dispatch.callCount).toBe(1);
-  expect(dispatch.getCall(0).args[0].type).toBe(FETCH_DASHBOARDS_SUCCEEDED);
-});
-
-test('fetchDashboards handles failure', async () => {
-  fetchMock.reset();
-  fetchMock.get(fetchDashboardsEndpoint, { throws: 'error' });
-  const dispatch = sinon.spy();
-  await fetchDashboards(userId)(dispatch);
-  expect(fetchMock.calls(fetchDashboardsEndpoint)).toHaveLength(4); // 3 retries
-  expect(dispatch.callCount).toBe(1);
-  expect(dispatch.getCall(0).args[0].type).toBe(FETCH_DASHBOARDS_FAILED);
-});
-
 const sliceId = 10;
 const sliceName = 'New chart';
 const vizType = 'sample_viz_type';
@@ -176,7 +141,6 @@ test('createSlice handles failure', async () => {
   expect(dispatch.getCall(0).args[0].type).toBe(SAVE_SLICE_FAILED);
 });
 
-const dashboardId = 14;
 const dashboardName = 'New dashboard';
 const dashboardResponsePayload = {
   id: 14,
@@ -214,38 +178,6 @@ test('createDashboard handles failure', async () => {
   expect(dispatch.getCall(0).args[0].type).toBe(SAVE_SLICE_FAILED);
 });
 
-/**
- * Tests getDashboard action
- */
-
-const getDashboardEndpoint = `glob:*/api/v1/dashboard/${dashboardId}`;
-test('getDashboard handles success', async () => {
-  fetchMock.reset();
-  fetchMock.get(getDashboardEndpoint, dashboardResponsePayload);
-  const dispatch = sinon.spy();
-  const dashboard = await getDashboard(dashboardId)(dispatch);
-  expect(fetchMock.calls(getDashboardEndpoint)).toHaveLength(1);
-  expect(dispatch.callCount).toBe(0);
-  expect(dashboard).toEqual(dashboardResponsePayload);
-});
-
-test('getDashboard handles failure', async () => {
-  fetchMock.reset();
-  fetchMock.get(getDashboardEndpoint, { throws: sampleError });
-  const dispatch = sinon.spy();
-  let caughtError;
-  try {
-    await getDashboard(dashboardId)(dispatch);
-  } catch (error) {
-    caughtError = error;
-  }
-
-  expect(caughtError).toEqual(sampleError);
-  expect(fetchMock.calls(getDashboardEndpoint)).toHaveLength(4);
-  expect(dispatch.callCount).toBe(1);
-  expect(dispatch.getCall(0).args[0].type).toBe(SAVE_SLICE_FAILED);
-});
-
 test('updateSlice with add to new dashboard handles success', async () => {
   fetchMock.reset();
   fetchMock.put(updateSliceEndpoint, sliceResponsePayload);
diff --git a/superset-frontend/src/explore/components/SaveModal.test.jsx b/superset-frontend/src/explore/components/SaveModal.test.jsx
index 15bfc64e7588..74d1c1199c75 100644
--- a/superset-frontend/src/explore/components/SaveModal.test.jsx
+++ b/superset-frontend/src/explore/components/SaveModal.test.jsx
@@ -20,10 +20,8 @@ import React from 'react';
 import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import { bindActionCreators } from 'redux';
-import { Provider } from 'react-redux';
 
 import { shallow } from 'enzyme';
-import { styledMount as mount } from 'spec/helpers/theming';
 import { Radio } from 'src/components/Radio';
 import Button from 'src/components/Button';
 import sinon from 'sinon';
@@ -39,6 +37,7 @@ const initialState = {
   chart: {},
   saveModal: {
     dashboards: [],
+    isVisible: true,
   },
   explore: {
     datasource: {},
@@ -57,6 +56,7 @@ const initialState = {
 const initialStore = mockStore(initialState);
 
 const defaultProps = {
+  addDangerToast: jest.fn(),
   onHide: () => ({}),
   actions: bindActionCreators(saveModalActions, arg => {
     if (typeof arg === 'function') {
@@ -83,6 +83,7 @@ const queryStore = mockStore({
   chart: {},
   saveModal: {
     dashboards: [],
+    isVisible: true,
   },
   explore: {
     datasource: { name: 'test', type: 'query' },
@@ -144,8 +145,7 @@ test('renders the right footer buttons when existing dashboard selected', () =>
 test('renders the right footer buttons when new dashboard selected', () => {
   const wrapper = getWrapper();
   wrapper.setState({
-    saveToDashboardId: null,
-    newDashboardName: 'Test new dashboard',
+    dashboard: { label: 'Test new dashboard', value: 'Test new dashboard' },
   });
   const footerWrapper = shallow(wrapper.find(StyledModal).props().footer);
   const saveAndGoDash = footerWrapper
@@ -186,18 +186,6 @@ test('sets action when overwriting slice', () => {
   expect(wrapperForOverwrite.state().action).toBe('overwrite');
 });
 
-test('fetches dashboards on component mount', () => {
-  sinon.spy(defaultProps.actions, 'fetchDashboards');
-  mount(
-    <Provider store={initialStore}>
-      <SaveModal {...defaultProps} />
-    </Provider>,
-  );
-  expect(defaultProps.actions.fetchDashboards.calledOnce).toBe(true);
-
-  defaultProps.actions.fetchDashboards.restore();
-});
-
 test('updates slice name and selected dashboard', () => {
   const wrapper = getWrapper();
   const dashboardId = mockEvent.value;
@@ -205,8 +193,8 @@ test('updates slice name and selected dashboard', () => {
   wrapper.instance().onSliceNameChange(mockEvent);
   expect(wrapper.state().newSliceName).toBe(mockEvent.target.value);
 
-  wrapper.instance().onDashboardSelectChange(dashboardId);
-  expect(wrapper.state().saveToDashboardId).toBe(dashboardId);
+  wrapper.instance().onDashboardChange({ value: dashboardId });
+  expect(wrapper.state().dashboard.value).toBe(dashboardId);
 });
 
 test('removes alert', () => {
diff --git a/superset-frontend/src/explore/components/SaveModal.tsx b/superset-frontend/src/explore/components/SaveModal.tsx
index 9e63f10b6148..849baa1417b0 100644
--- a/superset-frontend/src/explore/components/SaveModal.tsx
+++ b/superset-frontend/src/explore/components/SaveModal.tsx
@@ -19,17 +19,18 @@
 /* eslint camelcase: 0 */
 import React from 'react';
 import { Dispatch } from 'redux';
-import { SelectValue } from 'antd/lib/select';
+import { isFeatureEnabled } from 'src/featureFlags';
+import rison from 'rison';
 import { connect } from 'react-redux';
 import { withRouter, RouteComponentProps } from 'react-router-dom';
 import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
 import {
   css,
   DatasourceType,
-  ensureIsArray,
   FeatureFlag,
   isDefined,
   styled,
+  SupersetClient,
   t,
 } from '@superset-ui/core';
 import { Input } from 'src/components/Input';
@@ -38,11 +39,10 @@ import Alert from 'src/components/Alert';
 import Modal from 'src/components/Modal';
 import { Radio } from 'src/components/Radio';
 import Button from 'src/components/Button';
-import { Select } from 'src/components';
+import { AsyncSelect } from 'src/components';
 import Loading from 'src/components/Loading';
 import { setSaveChartModalVisibility } from 'src/explore/actions/saveModalActions';
 import { SaveActionType } from 'src/explore/types';
-import { isFeatureEnabled } from 'src/featureFlags';
 
 // Session storage key for recent dashboard
 const SK_DASHBOARD_ID = 'save_chart_recent_dashboard';
@@ -52,7 +52,6 @@ interface SaveModalProps extends RouteComponentProps {
   actions: Record<string, any>;
   form_data?: Record<string, any>;
   userId: number;
-  dashboards: Array<any>;
   alert?: string;
   sliceName?: string;
   slice?: Record<string, any>;
@@ -63,15 +62,14 @@ interface SaveModalProps extends RouteComponentProps {
 }
 
 type SaveModalState = {
-  saveToDashboardId: number | string | null;
   newSliceName?: string;
-  newDashboardName?: string;
   datasetName: string;
   alert: string | null;
   action: SaveActionType;
   isLoading: boolean;
   saveStatus?: string | null;
   vizType?: string;
+  dashboard?: { label: string; value: string | number };
 };
 
 export const StyledModal = styled(Modal)`
@@ -89,15 +87,15 @@ class SaveModal extends React.Component<SaveModalProps, SaveModalState> {
   constructor(props: SaveModalProps) {
     super(props);
     this.state = {
-      saveToDashboardId: null,
       newSliceName: props.sliceName,
       datasetName: props.datasource?.name,
       alert: null,
       action: this.canOverwriteSlice() ? 'overwrite' : 'saveas',
       isLoading: false,
       vizType: props.form_data?.viz_type,
+      dashboard: undefined,
     };
-    this.onDashboardSelectChange = this.onDashboardSelectChange.bind(this);
+    this.onDashboardChange = this.onDashboardChange.bind(this);
     this.onSliceNameChange = this.onSliceNameChange.bind(this);
     this.changeAction = this.changeAction.bind(this);
     this.saveOrOverwrite = this.saveOrOverwrite.bind(this);
@@ -107,7 +105,8 @@ class SaveModal extends React.Component<SaveModalProps, SaveModalState> {
   }
 
   isNewDashboard(): boolean {
-    return !!(!this.state.saveToDashboardId && this.state.newDashboardName);
+    const { dashboard } = this.state;
+    return typeof dashboard?.value === 'string';
   }
 
   canOverwriteSlice(): boolean {
@@ -117,30 +116,26 @@ class SaveModal extends React.Component<SaveModalProps, SaveModalState> {
     );
   }
 
-  componentDidMount() {
-    this.props.actions.fetchDashboards(this.props.userId).then(() => {
-      if (ensureIsArray(this.props.dashboards).length === 0) {
-        return;
-      }
-      const dashboardIds = this.props.dashboards?.map(
-        dashboard => dashboard.value,
-      );
+  async componentDidMount() {
+    let { dashboardId } = this.props;
+    if (!dashboardId) {
       const lastDashboard = sessionStorage.getItem(SK_DASHBOARD_ID);
-      let recentDashboard = lastDashboard && parseInt(lastDashboard, 10);
-
-      if (this.props.dashboardId) {
-        recentDashboard = this.props.dashboardId;
-      }
-
-      if (
-        recentDashboard !== null &&
-        dashboardIds.indexOf(recentDashboard) !== -1
-      ) {
-        this.setState({
-          saveToDashboardId: recentDashboard,
-        });
+      dashboardId = lastDashboard && parseInt(lastDashboard, 10);
+    }
+    if (dashboardId) {
+      try {
+        const result = await this.loadDashboard(dashboardId);
+        if (result) {
+          this.setState({
+            dashboard: { label: result.dashboard_title, value: result.id },
+          });
+        }
+      } catch (error) {
+        this.props.actions.addDangerToast(
+          t('An error occurred while loading dashboard information.'),
+        );
       }
-    });
+    }
   }
 
   handleDatasetNameChange = (e: React.FormEvent<HTMLInputElement>) => {
@@ -152,11 +147,8 @@ class SaveModal extends React.Component<SaveModalProps, SaveModalState> {
     this.setState({ newSliceName: event.target.value });
   }
 
-  onDashboardSelectChange(selected: SelectValue) {
-    const newDashboardName = selected ? String(selected) : undefined;
-    const saveToDashboardId =
-      selected && typeof selected === 'number' ? selected : null;
-    this.setState({ saveToDashboardId, newDashboardName });
+  onDashboardChange(dashboard: { label: string; value: string | number }) {
+    this.setState({ dashboard });
   }
 
   changeAction(action: SaveActionType) {
@@ -206,19 +198,22 @@ class SaveModal extends React.Component<SaveModalProps, SaveModalState> {
       delete formData.url_params;
 
       let dashboard: DashboardGetResponse | null = null;
-      if (this.state.newDashboardName || this.state.saveToDashboardId) {
-        let saveToDashboardId = this.state.saveToDashboardId || null;
-        if (!this.state.saveToDashboardId) {
+      if (this.state.dashboard) {
+        let validId = this.state.dashboard.value;
+        if (this.isNewDashboard()) {
           const response = await this.props.actions.createDashboard(
-            this.state.newDashboardName,
+            this.state.dashboard.label,
           );
-          saveToDashboardId = response.id;
+          validId = response.id;
+        }
+
+        try {
+          dashboard = await this.loadDashboard(validId as number);
+        } catch (error) {
+          this.props.actions.saveSliceFailed();
+          return;
         }
 
-        const response = await this.props.actions.getDashboard(
-          saveToDashboardId,
-        );
-        dashboard = response.result;
         if (isDefined(dashboard) && isDefined(dashboard?.id)) {
           sliceDashboards = sliceDashboards.includes(dashboard.id)
             ? sliceDashboards
@@ -240,7 +235,7 @@ class SaveModal extends React.Component<SaveModalProps, SaveModalState> {
           dashboard
             ? {
                 title: dashboard.dashboard_title,
-                new: !this.state.saveToDashboardId,
+                new: this.isNewDashboard(),
               }
             : null,
         );
@@ -251,7 +246,7 @@ class SaveModal extends React.Component<SaveModalProps, SaveModalState> {
           dashboard
             ? {
                 title: dashboard.dashboard_title,
-                new: !this.state.saveToDashboardId,
+                new: this.isNewDashboard(),
               }
             : null,
         );
@@ -284,94 +279,131 @@ class SaveModal extends React.Component<SaveModalProps, SaveModalState> {
     }
   }
 
-  renderSaveChartModal = () => {
-    const dashboardSelectValue =
-      this.state.saveToDashboardId || this.state.newDashboardName;
+  loadDashboard = async (id: number) => {
+    const response = await SupersetClient.get({
+      endpoint: `/api/v1/dashboard/${id}`,
+    });
+    return response.json.result;
+  };
 
-    return (
-      <Form data-test="save-modal-body" layout="vertical">
-        {(this.state.alert || this.props.alert) && (
-          <Alert
-            type="warning"
-            message={this.state.alert || this.props.alert}
-            onClose={this.removeAlert}
+  loadDashboards = async (search: string, page: number, pageSize: number) => {
+    const queryParams = rison.encode({
+      columns: ['id', 'dashboard_title'],
+      filters: [
+        {
+          col: 'dashboard_title',
+          opr: 'ct',
+          value: search,
+        },
+        {
+          col: 'owners',
+          opr: 'rel_m_m',
+          value: this.props.userId,
+        },
+      ],
+      page,
+      page_size: pageSize,
+      order_column: 'dashboard_title',
+    });
+
+    const { json } = await SupersetClient.get({
+      endpoint: `/api/v1/dashboard/?q=${queryParams}`,
+    });
+    const { result, count } = json;
+    return {
+      data: result.map(
+        (dashboard: { id: number; dashboard_title: string }) => ({
+          value: dashboard.id,
+          label: dashboard.dashboard_title,
+        }),
+      ),
+      totalCount: count,
+    };
+  };
+
+  renderSaveChartModal = () => (
+    <Form data-test="save-modal-body" layout="vertical">
+      {(this.state.alert || this.props.alert) && (
+        <Alert
+          type="warning"
+          message={this.state.alert || this.props.alert}
+          onClose={this.removeAlert}
+        />
+      )}
+      <FormItem data-test="radio-group">
+        <Radio
+          id="overwrite-radio"
+          disabled={!this.canOverwriteSlice()}
+          checked={this.state.action === 'overwrite'}
+          onChange={() => this.changeAction('overwrite')}
+          data-test="save-overwrite-radio"
+        >
+          {t('Save (Overwrite)')}
+        </Radio>
+        <Radio
+          id="saveas-radio"
+          data-test="saveas-radio"
+          checked={this.state.action === 'saveas'}
+          onChange={() => this.changeAction('saveas')}
+        >
+          {t('Save as...')}
+        </Radio>
+      </FormItem>
+      <hr />
+      <FormItem label={t('Chart name')} required>
+        <Input
+          name="new_slice_name"
+          type="text"
+          placeholder="Name"
+          value={this.state.newSliceName}
+          onChange={this.onSliceNameChange}
+          data-test="new-chart-name"
+        />
+      </FormItem>
+      {this.props.datasource?.type === 'query' && (
+        <FormItem label={t('Dataset Name')} required>
+          <InfoTooltipWithTrigger
+            tooltip={t('A reusable dataset will be saved with your chart.')}
+            placement="right"
           />
-        )}
-        <FormItem data-test="radio-group">
-          <Radio
-            id="overwrite-radio"
-            disabled={!this.canOverwriteSlice()}
-            checked={this.state.action === 'overwrite'}
-            onChange={() => this.changeAction('overwrite')}
-            data-test="save-overwrite-radio"
-          >
-            {t('Save (Overwrite)')}
-          </Radio>
-          <Radio
-            id="saveas-radio"
-            data-test="saveas-radio"
-            checked={this.state.action === 'saveas'}
-            onChange={() => this.changeAction('saveas')}
-          >
-            {t('Save as...')}
-          </Radio>
-        </FormItem>
-        <hr />
-        <FormItem label={t('Chart name')} required>
           <Input
-            name="new_slice_name"
+            name="dataset_name"
             type="text"
-            placeholder="Name"
-            value={this.state.newSliceName}
-            onChange={this.onSliceNameChange}
-            data-test="new-chart-name"
+            placeholder="Dataset Name"
+            value={this.state.datasetName}
+            onChange={this.handleDatasetNameChange}
+            data-test="new-dataset-name"
           />
         </FormItem>
-        {this.props.datasource?.type === 'query' && (
-          <FormItem label={t('Dataset Name')} required>
-            <InfoTooltipWithTrigger
-              tooltip={t('A reusable dataset will be saved with your chart.')}
-              placement="right"
-            />
-            <Input
-              name="dataset_name"
-              type="text"
-              placeholder="Dataset Name"
-              value={this.state.datasetName}
-              onChange={this.handleDatasetNameChange}
-              data-test="new-dataset-name"
-            />
-          </FormItem>
-        )}
-        {!(
-          isFeatureEnabled(FeatureFlag.DASHBOARD_NATIVE_FILTERS) &&
-          this.state.vizType === 'filter_box'
-        ) && (
-          <FormItem
-            label={t('Add to dashboard')}
-            data-test="save-chart-modal-select-dashboard-form"
-          >
-            <Select
-              allowClear
-              allowNewOptions
-              ariaLabel={t('Select a dashboard')}
-              options={this.props.dashboards}
-              onChange={this.onDashboardSelectChange}
-              value={dashboardSelectValue || undefined}
-              placeholder={
-                <div>
-                  <b>{t('Select')}</b>
-                  {t(' a dashboard OR ')}
-                  <b>{t('create')}</b>
-                  {t(' a new one')}
-                </div>
-              }
-            />
-          </FormItem>
-        )}
-      </Form>
-    );
-  };
+      )}
+      {!(
+        isFeatureEnabled(FeatureFlag.DASHBOARD_NATIVE_FILTERS) &&
+        this.state.vizType === 'filter_box'
+      ) && (
+        <FormItem
+          label={t('Add to dashboard')}
+          data-test="save-chart-modal-select-dashboard-form"
+        >
+          <AsyncSelect
+            allowClear
+            allowNewOptions
+            ariaLabel={t('Select a dashboard')}
+            options={this.loadDashboards}
+            onChange={this.onDashboardChange}
+            value={this.state.dashboard}
+            placeholder={
+              <div>
+                <b>{t('Select')}</b>
+                {t(' a dashboard OR ')}
+                <b>{t('create')}</b>
+                {t(' a new one')}
+              </div>
+            }
+          />
+        </FormItem>
+      )}
+    </Form>
+  );
 
   renderFooter = () => (
     <div data-test="save-modal-footer">
@@ -383,7 +415,7 @@ class SaveModal extends React.Component<SaveModalProps, SaveModalState> {
         buttonSize="small"
         disabled={
           !this.state.newSliceName ||
-          (!this.state.saveToDashboardId && !this.state.newDashboardName) ||
+          !this.state.dashboard ||
           (this.props.datasource?.type !== DatasourceType.Table &&
             !this.state.datasetName) ||
           (isFeatureEnabled(FeatureFlag.DASHBOARD_NATIVE_FILTERS) &&

From 818a1d482bb22f2a243b874ed909a1be55e76282 Mon Sep 17 00:00:00 2001
From: Kamil Gabryjelski <kamil.gabryjelski@gmail.com>
Date: Tue, 18 Apr 2023 22:42:00 +0200
Subject: [PATCH 03/47] feat: Drill by error management (#23724)

---
 .../Chart/DrillBy/DrillByMenuItems.tsx        |  5 +-
 .../Chart/DrillBy/DrillByModal.test.tsx       | 20 ++++++--
 .../components/Chart/DrillBy/DrillByModal.tsx | 48 +++++++++++++++----
 3 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.tsx b/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.tsx
index e5b919ff6d78..b503b1eed5db 100644
--- a/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.tsx
+++ b/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.tsx
@@ -39,6 +39,7 @@ import {
 } from '@superset-ui/core';
 import Icons from 'src/components/Icons';
 import { Input } from 'src/components/Input';
+import { useToasts } from 'src/components/MessageToasts/withToasts';
 import {
   cachedSupersetGet,
   supersetGetCache,
@@ -80,12 +81,12 @@ export const DrillByMenuItems = ({
   ...rest
 }: DrillByMenuItemsProps) => {
   const theme = useTheme();
+  const { addDangerToast } = useToasts();
   const [searchInput, setSearchInput] = useState('');
   const [dataset, setDataset] = useState<Dataset>();
   const [columns, setColumns] = useState<Column[]>([]);
   const [showModal, setShowModal] = useState(false);
   const [currentColumn, setCurrentColumn] = useState();
-
   const handleSelection = useCallback(
     (event, column) => {
       onClick(event);
@@ -143,9 +144,11 @@ export const DrillByMenuItems = ({
         })
         .catch(() => {
           supersetGetCache.delete(`/api/v1/dataset/${datasetId}`);
+          addDangerToast(t('Failed to load dimensions for drill by'));
         });
     }
   }, [
+    addDangerToast,
     excludedColumns,
     formData,
     groupbyFieldName,
diff --git a/superset-frontend/src/components/Chart/DrillBy/DrillByModal.test.tsx b/superset-frontend/src/components/Chart/DrillBy/DrillByModal.test.tsx
index f0768253e0ad..66fd6a42ba63 100644
--- a/superset-frontend/src/components/Chart/DrillBy/DrillByModal.test.tsx
+++ b/superset-frontend/src/components/Chart/DrillBy/DrillByModal.test.tsx
@@ -104,7 +104,7 @@ beforeEach(() => {
     .post(CHART_DATA_ENDPOINT, { body: {} }, {})
     .post(FORM_DATA_KEY_ENDPOINT, { key: '123' });
 });
-afterEach(fetchMock.restore);
+afterEach(() => fetchMock.restore());
 
 test('should render the title', async () => {
   await renderModal();
@@ -127,10 +127,22 @@ test('should close the modal', async () => {
 });
 
 test('should render loading indicator', async () => {
-  await renderModal();
-  await waitFor(() =>
-    expect(screen.getByLabelText('Loading')).toBeInTheDocument(),
+  fetchMock.post(
+    CHART_DATA_ENDPOINT,
+    { body: {} },
+    // delay is missing in fetch-mock types
+    // @ts-ignore
+    { overwriteRoutes: true, delay: 1000 },
   );
+  await renderModal();
+  expect(screen.getByLabelText('Loading')).toBeInTheDocument();
+});
+
+test('should render alert banner when results fail to load', async () => {
+  await renderModal();
+  expect(
+    await screen.findByText('There was an error loading the chart data'),
+  ).toBeInTheDocument();
 });
 
 test('should generate Explore url', async () => {
diff --git a/superset-frontend/src/components/Chart/DrillBy/DrillByModal.tsx b/superset-frontend/src/components/Chart/DrillBy/DrillByModal.tsx
index 7f6557685487..0a05635645f1 100644
--- a/superset-frontend/src/components/Chart/DrillBy/DrillByModal.tsx
+++ b/superset-frontend/src/components/Chart/DrillBy/DrillByModal.tsx
@@ -47,6 +47,8 @@ import { noOp } from 'src/utils/common';
 import { simpleFilterToAdhoc } from 'src/utils/simpleFilterToAdhoc';
 import { useDatasetMetadataBar } from 'src/features/datasets/metadataBar/useDatasetMetadataBar';
 import { SingleQueryResultPane } from 'src/explore/components/DataTablesPane/components/SingleQueryResultPane';
+import { useToasts } from 'src/components/MessageToasts/withToasts';
+import Alert from 'src/components/Alert';
 import { Dataset, DrillByType } from '../types';
 import DrillByChart from './DrillByChart';
 import { ContextMenuItem } from '../ChartContextMenu/ChartContextMenu';
@@ -65,6 +67,7 @@ interface ModalFooterProps {
 }
 
 const ModalFooter = ({ formData, closeModal }: ModalFooterProps) => {
+  const { addDangerToast } = useToasts();
   const [url, setUrl] = useState('');
   const dashboardPageId = useContext(DashboardPageIdContext);
   const [datasource_id, datasource_type] = formData.datasource.split('__');
@@ -75,13 +78,24 @@ const ModalFooter = ({ formData, closeModal }: ModalFooterProps) => {
           `/explore/?form_data_key=${key}&dashboard_page_id=${dashboardPageId}`,
         );
       })
-      .catch(e => {
-        console.log(e);
+      .catch(() => {
+        addDangerToast(t('Failed to generate chart edit URL'));
       });
-  }, [dashboardPageId, datasource_id, datasource_type, formData]);
+  }, [
+    addDangerToast,
+    dashboardPageId,
+    datasource_id,
+    datasource_type,
+    formData,
+  ]);
   return (
     <>
-      <Button buttonStyle="secondary" buttonSize="small" onClick={noOp}>
+      <Button
+        buttonStyle="secondary"
+        buttonSize="small"
+        onClick={noOp}
+        disabled={!url}
+      >
         <Link
           css={css`
             &:hover {
@@ -126,6 +140,8 @@ export default function DrillByModal({
   onHideModal,
 }: DrillByModalProps) {
   const theme = useTheme();
+  const { addDangerToast } = useToasts();
+  const [isChartDataLoading, setIsChartDataLoading] = useState(true);
 
   const initialGroupbyColumns = useMemo(
     () =>
@@ -278,14 +294,22 @@ export default function DrillByModal({
 
   useEffect(() => {
     if (drilledFormData) {
+      setIsChartDataLoading(true);
       setChartDataResult(undefined);
       getChartDataRequest({
         formData: drilledFormData,
-      }).then(({ json }) => {
-        setChartDataResult(json.result);
-      });
+      })
+        .then(({ json }) => {
+          setChartDataResult(json.result);
+        })
+        .catch(() => {
+          addDangerToast(t('Failed to load chart data.'));
+        })
+        .finally(() => {
+          setIsChartDataLoading(false);
+        });
     }
-  }, [drilledFormData]);
+  }, [addDangerToast, drilledFormData]);
   const { metadataBar } = useDatasetMetadataBar({ dataset });
 
   return (
@@ -323,7 +347,13 @@ export default function DrillByModal({
         {metadataBar}
         {breadcrumbs}
         {displayModeToggle}
-        {!chartDataResult && <Loading />}
+        {isChartDataLoading && <Loading />}
+        {!isChartDataLoading && !chartDataResult && (
+          <Alert
+            type="error"
+            message={t('There was an error loading the chart data')}
+          />
+        )}
         {drillByDisplayMode === DrillByType.Chart && chartDataResult && (
           <DrillByChart
             formData={drilledFormData}

From 44557f5a23d5a6b8f7d6cc267f0d43337c36cd76 Mon Sep 17 00:00:00 2001
From: Jack Fragassi <jfragassi98@gmail.com>
Date: Tue, 18 Apr 2023 17:51:24 -0700
Subject: [PATCH 04/47] chore(api v1): Deprecate datasource/save and
 datasource/get endpoints (#23678)

---
 .../src/fixtures.ts                           |  2 +-
 .../superset-ui-chart-controls/src/types.ts   |  2 +-
 .../test/utils/columnChoices.test.tsx         |  2 +-
 .../test/utils/defineSavedMetrics.test.tsx    |  2 +-
 .../Datasource/ChangeDatasourceModal.test.jsx |  4 +-
 .../Datasource/ChangeDatasourceModal.tsx      |  6 +-
 .../Datasource/DatasourceModal.test.jsx       | 12 ++-
 .../components/Datasource/DatasourceModal.tsx | 98 +++++++++++++------
 superset-frontend/src/dashboard/constants.ts  |  2 +-
 .../actions/datasourcesActions.test.ts        |  4 +-
 .../DatasourceControl.test.tsx                | 23 +++--
 .../controlUtils/controlUtils.test.tsx        |  2 +-
 ...trolValuesCompatibleWithDatasource.test.ts |  2 +-
 superset-frontend/src/explore/fixtures.tsx    |  4 +-
 .../src/utils/getDatasourceUid.test.ts        |  2 +-
 superset/connectors/base/models.py            | 40 +++++---
 superset/connectors/sqla/models.py            | 14 ++-
 superset/datasets/api.py                      |  8 ++
 superset/datasets/commands/exceptions.py      | 17 ++++
 superset/datasets/commands/update.py          | 11 +++
 superset/datasets/schemas.py                  |  2 +-
 superset/views/datasource/views.py            |  3 +
 tests/integration_tests/datasets/api_tests.py | 50 +++++++++-
 23 files changed, 242 insertions(+), 70 deletions(-)

diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/fixtures.ts b/superset-frontend/packages/superset-ui-chart-controls/src/fixtures.ts
index 71c4dd31189b..1e5152b2bd90 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/fixtures.ts
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/fixtures.ts
@@ -20,7 +20,7 @@ import { DatasourceType } from '@superset-ui/core';
 import { Dataset } from './types';
 
 export const TestDataset: Dataset = {
-  column_format: {},
+  column_formats: {},
   columns: [
     {
       advanced_data_type: undefined,
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/types.ts b/superset-frontend/packages/superset-ui-chart-controls/src/types.ts
index 67582523bc31..c26f53b6a209 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/types.ts
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/types.ts
@@ -67,7 +67,7 @@ export interface Dataset {
   type: DatasourceType;
   columns: ColumnMeta[];
   metrics: Metric[];
-  column_format: Record<string, string>;
+  column_formats: Record<string, string>;
   verbose_map: Record<string, string>;
   main_dttm_col: string;
   // eg. ['["ds", true]', 'ds [asc]']
diff --git a/superset-frontend/packages/superset-ui-chart-controls/test/utils/columnChoices.test.tsx b/superset-frontend/packages/superset-ui-chart-controls/test/utils/columnChoices.test.tsx
index 59f4796a44d2..e27fa9512084 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/test/utils/columnChoices.test.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/test/utils/columnChoices.test.tsx
@@ -42,7 +42,7 @@ describe('columnChoices()', () => {
           },
         ],
         verbose_map: {},
-        column_format: { fiz: 'NUMERIC', about: 'STRING', foo: 'DATE' },
+        column_formats: { fiz: 'NUMERIC', about: 'STRING', foo: 'DATE' },
         datasource_name: 'my_datasource',
         description: 'this is my datasource',
       }),
diff --git a/superset-frontend/packages/superset-ui-chart-controls/test/utils/defineSavedMetrics.test.tsx b/superset-frontend/packages/superset-ui-chart-controls/test/utils/defineSavedMetrics.test.tsx
index 48b000ed17ff..765412d592c2 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/test/utils/defineSavedMetrics.test.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/test/utils/defineSavedMetrics.test.tsx
@@ -39,7 +39,7 @@ describe('defineSavedMetrics', () => {
       time_grain_sqla: 'P1D',
       columns: [],
       verbose_map: {},
-      column_format: {},
+      column_formats: {},
       datasource_name: 'my_datasource',
       description: 'this is my datasource',
     };
diff --git a/superset-frontend/src/components/Datasource/ChangeDatasourceModal.test.jsx b/superset-frontend/src/components/Datasource/ChangeDatasourceModal.test.jsx
index 419af6e3cf75..5dbc52c38a5e 100644
--- a/superset-frontend/src/components/Datasource/ChangeDatasourceModal.test.jsx
+++ b/superset-frontend/src/components/Datasource/ChangeDatasourceModal.test.jsx
@@ -49,7 +49,7 @@ const datasourceData = {
 
 const DATASOURCES_ENDPOINT =
   'glob:*/api/v1/dataset/?q=(order_column:changed_on_delta_humanized,order_direction:desc,page:0,page_size:25)';
-const DATASOURCE_ENDPOINT = `glob:*/datasource/get/${datasourceData.type}/${datasourceData.id}`;
+const DATASOURCE_ENDPOINT = `glob:*/api/v1/dataset/${datasourceData.id}`;
 const DATASOURCE_PAYLOAD = { new: 'data' };
 
 const INFO_ENDPOINT = 'glob:*/api/v1/dataset/_info?*';
@@ -112,6 +112,6 @@ describe('ChangeDatasourceModal', () => {
     });
     await waitForComponentToPaint(wrapper);
 
-    expect(fetchMock.calls(/datasource\/get\/table\/7/)).toHaveLength(1);
+    expect(fetchMock.calls(/api\/v1\/dataset\/7/)).toHaveLength(1);
   });
 });
diff --git a/superset-frontend/src/components/Datasource/ChangeDatasourceModal.tsx b/superset-frontend/src/components/Datasource/ChangeDatasourceModal.tsx
index b5b99e1089f4..5e837f0a2684 100644
--- a/superset-frontend/src/components/Datasource/ChangeDatasourceModal.tsx
+++ b/superset-frontend/src/components/Datasource/ChangeDatasourceModal.tsx
@@ -173,10 +173,12 @@ const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({
 
   const handleChangeConfirm = () => {
     SupersetClient.get({
-      endpoint: `/datasource/get/${confirmedDataset?.type}/${confirmedDataset?.id}/`,
+      endpoint: `/api/v1/dataset/${confirmedDataset?.id}`,
     })
       .then(({ json }) => {
-        onDatasourceSave(json);
+        // eslint-disable-next-line no-param-reassign
+        json.result.type = 'table';
+        onDatasourceSave(json.result);
         onChange(`${confirmedDataset?.id}__table`);
       })
       .catch(response => {
diff --git a/superset-frontend/src/components/Datasource/DatasourceModal.test.jsx b/superset-frontend/src/components/Datasource/DatasourceModal.test.jsx
index 12be35052151..7d378902e6e9 100644
--- a/superset-frontend/src/components/Datasource/DatasourceModal.test.jsx
+++ b/superset-frontend/src/components/Datasource/DatasourceModal.test.jsx
@@ -40,7 +40,8 @@ const datasource = mockDatasource['7__table'];
 
 const SAVE_ENDPOINT = 'glob:*/api/v1/dataset/7';
 const SAVE_PAYLOAD = { new: 'data' };
-const SAVE_DATASOURCE_ENDPOINT = 'glob:*/datasource/save/';
+const SAVE_DATASOURCE_ENDPOINT = 'glob:*/api/v1/dataset/7';
+const GET_DATASOURCE_ENDPOINT = SAVE_DATASOURCE_ENDPOINT;
 
 const mockedProps = {
   datasource,
@@ -96,7 +97,8 @@ describe('DatasourceModal', () => {
 
   it('saves on confirm', async () => {
     const callsP = fetchMock.post(SAVE_ENDPOINT, SAVE_PAYLOAD);
-    fetchMock.post(SAVE_DATASOURCE_ENDPOINT, {});
+    fetchMock.put(SAVE_DATASOURCE_ENDPOINT, {});
+    fetchMock.get(GET_DATASOURCE_ENDPOINT, {});
     act(() => {
       wrapper
         .find('button[data-test="datasource-modal-save"]')
@@ -111,7 +113,11 @@ describe('DatasourceModal', () => {
       okButton.simulate('click');
     });
     await waitForComponentToPaint(wrapper);
-    const expected = ['http://localhost/datasource/save/'];
+    // one call to PUT, then one to GET
+    const expected = [
+      'http://localhost/api/v1/dataset/7',
+      'http://localhost/api/v1/dataset/7',
+    ];
     expect(callsP._calls.map(call => call[0])).toEqual(
       expected,
     ); /* eslint no-underscore-dangle: 0 */
diff --git a/superset-frontend/src/components/Datasource/DatasourceModal.tsx b/superset-frontend/src/components/Datasource/DatasourceModal.tsx
index 90135f40f9ec..b5b698f8315b 100644
--- a/superset-frontend/src/components/Datasource/DatasourceModal.tsx
+++ b/superset-frontend/src/components/Datasource/DatasourceModal.tsx
@@ -96,39 +96,81 @@ const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({
       currentDatasource.schema;
 
     setIsSaving(true);
-    SupersetClient.post({
-      endpoint: '/datasource/save/',
-      postPayload: {
-        data: {
-          ...currentDatasource,
-          cache_timeout:
-            currentDatasource.cache_timeout === ''
-              ? null
-              : currentDatasource.cache_timeout,
-          schema,
-          metrics: currentDatasource?.metrics?.map(
-            (metric: Record<string, unknown>) => ({
-              ...metric,
+    SupersetClient.put({
+      endpoint: `/api/v1/dataset/${currentDatasource.id}`,
+      jsonPayload: {
+        table_name: currentDatasource.table_name,
+        database_id: currentDatasource.database?.id,
+        sql: currentDatasource.sql,
+        filter_select_enabled: currentDatasource.filter_select_enabled,
+        fetch_values_predicate: currentDatasource.fetch_values_predicate,
+        schema,
+        description: currentDatasource.description,
+        main_dttm_col: currentDatasource.main_dttm_col,
+        offset: currentDatasource.offset,
+        default_endpoint: currentDatasource.default_endpoint,
+        cache_timeout:
+          currentDatasource.cache_timeout === ''
+            ? null
+            : currentDatasource.cache_timeout,
+        is_sqllab_view: currentDatasource.is_sqllab_view,
+        template_params: currentDatasource.template_params,
+        extra: currentDatasource.extra,
+        is_managed_externally: currentDatasource.is_managed_externally,
+        external_url: currentDatasource.external_url,
+        metrics: currentDatasource?.metrics?.map(
+          (metric: Record<string, unknown>) => {
+            const metricBody: any = {
+              expression: metric.expression,
+              description: metric.description,
+              metric_name: metric.metric_name,
+              metric_type: metric.metric_type,
+              d3format: metric.d3format,
+              verbose_name: metric.verbose_name,
+              warning_text: metric.warning_text,
+              uuid: metric.uuid,
               extra: buildExtraJsonObject(metric),
-            }),
-          ),
-          columns: currentDatasource?.columns?.map(
-            (column: Record<string, unknown>) => ({
-              ...column,
-              extra: buildExtraJsonObject(column),
-            }),
-          ),
-          type: currentDatasource.type || currentDatasource.datasource_type,
-          owners: currentDatasource.owners.map(
-            (o: Record<string, number>) => o.value || o.id,
-          ),
-        },
+            };
+            if (!Number.isNaN(Number(metric.id))) {
+              metricBody.id = metric.id;
+            }
+            return metricBody;
+          },
+        ),
+        columns: currentDatasource?.columns?.map(
+          (column: Record<string, unknown>) => ({
+            id: column.id,
+            column_name: column.column_name,
+            type: column.type,
+            advanced_data_type: column.advanced_data_type,
+            verbose_name: column.verbose_name,
+            description: column.description,
+            expression: column.expression,
+            filterable: column.filterable,
+            groupby: column.groupby,
+            is_active: column.is_active,
+            is_dttm: column.is_dttm,
+            python_date_format: column.python_date_format,
+            uuid: column.uuid,
+            extra: buildExtraJsonObject(column),
+          }),
+        ),
+        owners: currentDatasource.owners.map(
+          (o: Record<string, number>) => o.value || o.id,
+        ),
       },
     })
-      .then(({ json }) => {
+      .then(() => {
         addSuccessToast(t('The dataset has been saved'));
+        return SupersetClient.get({
+          endpoint: `/api/v1/dataset/${currentDatasource?.id}`,
+        });
+      })
+      .then(({ json }) => {
+        // eslint-disable-next-line no-param-reassign
+        json.result.type = 'table';
         onDatasourceSave({
-          ...json,
+          ...json.result,
           owners: currentDatasource.owners,
         });
         onHide();
diff --git a/superset-frontend/src/dashboard/constants.ts b/superset-frontend/src/dashboard/constants.ts
index 97753abe45c5..aa9f4d8bd361 100644
--- a/superset-frontend/src/dashboard/constants.ts
+++ b/superset-frontend/src/dashboard/constants.ts
@@ -28,7 +28,7 @@ export const PLACEHOLDER_DATASOURCE: Datasource = {
   columns: [],
   column_types: [],
   metrics: [],
-  column_format: {},
+  column_formats: {},
   verbose_map: {},
   main_dttm_col: '',
   description: '',
diff --git a/superset-frontend/src/explore/actions/datasourcesActions.test.ts b/superset-frontend/src/explore/actions/datasourcesActions.test.ts
index 6317f1f4a6d1..996758b26232 100644
--- a/superset-frontend/src/explore/actions/datasourcesActions.test.ts
+++ b/superset-frontend/src/explore/actions/datasourcesActions.test.ts
@@ -34,7 +34,7 @@ const CURRENT_DATASOURCE = {
   type: DatasourceType.Table,
   columns: [],
   metrics: [],
-  column_format: {},
+  column_formats: {},
   verbose_map: {},
   main_dttm_col: '__timestamp',
   // eg. ['["ds", true]', 'ds [asc]']
@@ -47,7 +47,7 @@ const NEW_DATASOURCE = {
   type: DatasourceType.Table,
   columns: [],
   metrics: [],
-  column_format: {},
+  column_formats: {},
   verbose_map: {},
   main_dttm_col: '__timestamp',
   // eg. ['["ds", true]', 'ds [asc]']
diff --git a/superset-frontend/src/explore/components/controls/DatasourceControl/DatasourceControl.test.tsx b/superset-frontend/src/explore/components/controls/DatasourceControl/DatasourceControl.test.tsx
index 2c094e72afba..80cb84ac8de7 100644
--- a/superset-frontend/src/explore/components/controls/DatasourceControl/DatasourceControl.test.tsx
+++ b/superset-frontend/src/explore/components/controls/DatasourceControl/DatasourceControl.test.tsx
@@ -69,9 +69,20 @@ const createProps = (overrides: JsonObject = {}) => ({
 });
 
 async function openAndSaveChanges(datasource: any) {
-  fetchMock.post('glob:*/datasource/save/', datasource, {
-    overwriteRoutes: true,
-  });
+  fetchMock.put(
+    'glob:*/api/v1/dataset/*',
+    {},
+    {
+      overwriteRoutes: true,
+    },
+  );
+  fetchMock.get(
+    'glob:*/api/v1/dataset/*',
+    { result: datasource },
+    {
+      overwriteRoutes: true,
+    },
+  );
   userEvent.click(screen.getByTestId('datasource-menu-trigger'));
   userEvent.click(await screen.findByTestId('edit-dataset'));
   userEvent.click(await screen.findByTestId('datasource-modal-save'));
@@ -154,7 +165,7 @@ test('Should show SQL Lab for sql_lab role', async () => {
 
 test('Click on Swap dataset option', async () => {
   const props = createProps();
-  SupersetClientGet.mockImplementation(
+  SupersetClientGet.mockImplementationOnce(
     async ({ endpoint }: { endpoint: string }) => {
       if (endpoint.includes('_info')) {
         return {
@@ -182,7 +193,7 @@ test('Click on Swap dataset option', async () => {
 
 test('Click on Edit dataset', async () => {
   const props = createProps();
-  SupersetClientGet.mockImplementation(
+  SupersetClientGet.mockImplementationOnce(
     async () => ({ json: { result: [] } } as any),
   );
   render(<DatasourceControl {...props} />, {
@@ -206,7 +217,7 @@ test('Edit dataset should be disabled when user is not admin', async () => {
   // @ts-expect-error
   props.user.roles = {};
   props.datasource.owners = [];
-  SupersetClientGet.mockImplementation(
+  SupersetClientGet.mockImplementationOnce(
     async () => ({ json: { result: [] } } as any),
   );
 
diff --git a/superset-frontend/src/explore/controlUtils/controlUtils.test.tsx b/superset-frontend/src/explore/controlUtils/controlUtils.test.tsx
index 5feefc3481aa..e03aba06d11d 100644
--- a/superset-frontend/src/explore/controlUtils/controlUtils.test.tsx
+++ b/superset-frontend/src/explore/controlUtils/controlUtils.test.tsx
@@ -51,7 +51,7 @@ describe('controlUtils', () => {
       type: DatasourceType.Table,
       columns: [{ column_name: 'a' }],
       metrics: [{ metric_name: 'first' }, { metric_name: 'second' }],
-      column_format: {},
+      column_formats: {},
       verbose_map: {},
       main_dttm_col: '',
       datasource_name: '1__table',
diff --git a/superset-frontend/src/explore/controlUtils/getControlValuesCompatibleWithDatasource.test.ts b/superset-frontend/src/explore/controlUtils/getControlValuesCompatibleWithDatasource.test.ts
index ad7ccc480121..c8d34f749d3d 100644
--- a/superset-frontend/src/explore/controlUtils/getControlValuesCompatibleWithDatasource.test.ts
+++ b/superset-frontend/src/explore/controlUtils/getControlValuesCompatibleWithDatasource.test.ts
@@ -34,7 +34,7 @@ const sampleDatasource: Dataset = {
     { column_name: 'sample_column_4' },
   ],
   metrics: [{ metric_name: 'saved_metric_2' }],
-  column_format: {},
+  column_formats: {},
   verbose_map: {},
   main_dttm_col: '',
   datasource_name: 'Sample Dataset',
diff --git a/superset-frontend/src/explore/fixtures.tsx b/superset-frontend/src/explore/fixtures.tsx
index 351e6f26b126..a0f3c112ec1b 100644
--- a/superset-frontend/src/explore/fixtures.tsx
+++ b/superset-frontend/src/explore/fixtures.tsx
@@ -135,7 +135,7 @@ export const exploreInitialData: ExplorePageInitialData = {
     type: DatasourceType.Table,
     columns: [{ column_name: 'a' }],
     metrics: [{ metric_name: 'first' }, { metric_name: 'second' }],
-    column_format: {},
+    column_formats: {},
     verbose_map: {},
     main_dttm_col: '',
     datasource_name: '8__table',
@@ -153,7 +153,7 @@ export const fallbackExploreInitialData: ExplorePageInitialData = {
     type: DatasourceType.Table,
     columns: [],
     metrics: [],
-    column_format: {},
+    column_formats: {},
     verbose_map: {},
     main_dttm_col: '',
     owners: [],
diff --git a/superset-frontend/src/utils/getDatasourceUid.test.ts b/superset-frontend/src/utils/getDatasourceUid.test.ts
index 2d14fde26230..d3a629efcfed 100644
--- a/superset-frontend/src/utils/getDatasourceUid.test.ts
+++ b/superset-frontend/src/utils/getDatasourceUid.test.ts
@@ -25,7 +25,7 @@ const TEST_DATASOURCE = {
   type: DatasourceType.Table,
   columns: [],
   metrics: [],
-  column_format: {},
+  column_formats: {},
   verbose_map: {},
   main_dttm_col: '__timestamp',
   // eg. ['["ds", true]', 'ds [asc]']
diff --git a/superset/connectors/base/models.py b/superset/connectors/base/models.py
index 30cb5a403025..2cb0d54c5153 100644
--- a/superset/connectors/base/models.py
+++ b/superset/connectors/base/models.py
@@ -19,7 +19,18 @@
 import json
 from datetime import datetime
 from enum import Enum
-from typing import Any, Dict, Hashable, List, Optional, Set, Type, TYPE_CHECKING, Union
+from typing import (
+    Any,
+    Dict,
+    Hashable,
+    List,
+    Optional,
+    Set,
+    Tuple,
+    Type,
+    TYPE_CHECKING,
+    Union,
+)
 
 from flask_appbuilder.security.sqla.models import User
 from flask_babel import gettext as __
@@ -242,26 +253,33 @@ def select_star(self) -> Optional[str]:
         pass
 
     @property
-    def data(self) -> Dict[str, Any]:
-        """Data representation of the datasource sent to the frontend"""
-        order_by_choices = []
+    def order_by_choices(self) -> List[Tuple[str, str]]:
+        choices = []
         # self.column_names return sorted column_names
         for column_name in self.column_names:
             column_name = str(column_name or "")
-            order_by_choices.append(
+            choices.append(
                 (json.dumps([column_name, True]), f"{column_name} " + __("[asc]"))
             )
-            order_by_choices.append(
+            choices.append(
                 (json.dumps([column_name, False]), f"{column_name} " + __("[desc]"))
             )
+        return choices
 
-        verbose_map = {"__timestamp": "Time"}
-        verbose_map.update(
+    @property
+    def verbose_map(self) -> Dict[str, str]:
+        verb_map = {"__timestamp": "Time"}
+        verb_map.update(
             {o.metric_name: o.verbose_name or o.metric_name for o in self.metrics}
         )
-        verbose_map.update(
+        verb_map.update(
             {o.column_name: o.verbose_name or o.column_name for o in self.columns}
         )
+        return verb_map
+
+    @property
+    def data(self) -> Dict[str, Any]:
+        """Data representation of the datasource sent to the frontend"""
         return {
             # simple fields
             "id": self.id,
@@ -288,9 +306,9 @@ def data(self) -> Dict[str, Any]:
             "columns": [o.data for o in self.columns],
             "metrics": [o.data for o in self.metrics],
             # TODO deprecate, move logic to JS
-            "order_by_choices": order_by_choices,
+            "order_by_choices": self.order_by_choices,
             "owners": [owner.id for owner in self.owners],
-            "verbose_map": verbose_map,
+            "verbose_map": self.verbose_map,
             "select_star": self.select_star,
         }
 
diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py
index 6180a546e750..1a5dd0037e05 100644
--- a/superset/connectors/sqla/models.py
+++ b/superset/connectors/sqla/models.py
@@ -785,14 +785,20 @@ def health_check_message(self) -> Optional[str]:
         check = config["DATASET_HEALTH_CHECK"]
         return check(self) if check else None
 
+    @property
+    def granularity_sqla(self) -> List[Tuple[Any, Any]]:
+        return utils.choicify(self.dttm_cols)
+
+    @property
+    def time_grain_sqla(self) -> List[Tuple[Any, Any]]:
+        return [(g.duration, g.name) for g in self.database.grains() or []]
+
     @property
     def data(self) -> Dict[str, Any]:
         data_ = super().data
         if self.type == "table":
-            data_["granularity_sqla"] = utils.choicify(self.dttm_cols)
-            data_["time_grain_sqla"] = [
-                (g.duration, g.name) for g in self.database.grains() or []
-            ]
+            data_["granularity_sqla"] = self.granularity_sqla
+            data_["time_grain_sqla"] = self.time_grain_sqla
             data_["main_dttm_col"] = self.main_dttm_col
             data_["fetch_values_predicate"] = self.fetch_values_predicate
             data_["template_params"] = self.template_params
diff --git a/superset/datasets/api.py b/superset/datasets/api.py
index 48c429d32d4b..12de82c780d4 100644
--- a/superset/datasets/api.py
+++ b/superset/datasets/api.py
@@ -195,6 +195,14 @@ class DatasetRestApi(BaseSupersetModelRestApi):
         "database.backend",
         "columns.advanced_data_type",
         "is_managed_externally",
+        "uid",
+        "datasource_name",
+        "name",
+        "column_formats",
+        "granularity_sqla",
+        "time_grain_sqla",
+        "order_by_choices",
+        "verbose_map",
     ]
     add_model_schema = DatasetPostSchema()
     edit_model_schema = DatasetPutSchema()
diff --git a/superset/datasets/commands/exceptions.py b/superset/datasets/commands/exceptions.py
index 91af2fdde4e9..e06e92802f04 100644
--- a/superset/datasets/commands/exceptions.py
+++ b/superset/datasets/commands/exceptions.py
@@ -61,6 +61,23 @@ def __init__(self, table_name: str) -> None:
         )
 
 
+class DatasetEndpointUnsafeValidationError(ValidationError):
+    """
+    Marshmallow validation error for unsafe dataset default endpoint
+    """
+
+    def __init__(self) -> None:
+        super().__init__(
+            [
+                _(
+                    "The submitted URL is not considered safe,"
+                    " only use URLs with the same domain as Superset."
+                )
+            ],
+            field_name="default_endpoint",
+        )
+
+
 class DatasetColumnNotFoundValidationError(ValidationError):
     """
     Marshmallow validation error when dataset column for update does not exist
diff --git a/superset/datasets/commands/update.py b/superset/datasets/commands/update.py
index 483a98e76c3b..a2e483ba93dd 100644
--- a/superset/datasets/commands/update.py
+++ b/superset/datasets/commands/update.py
@@ -18,6 +18,7 @@
 from collections import Counter
 from typing import Any, Dict, List, Optional
 
+from flask import current_app
 from flask_appbuilder.models.sqla import Model
 from marshmallow import ValidationError
 
@@ -30,6 +31,7 @@
     DatasetColumnNotFoundValidationError,
     DatasetColumnsDuplicateValidationError,
     DatasetColumnsExistsValidationError,
+    DatasetEndpointUnsafeValidationError,
     DatasetExistsValidationError,
     DatasetForbiddenError,
     DatasetInvalidError,
@@ -41,6 +43,7 @@
 )
 from superset.datasets.dao import DatasetDAO
 from superset.exceptions import SupersetSecurityException
+from superset.utils.urls import is_safe_url
 
 logger = logging.getLogger(__name__)
 
@@ -101,6 +104,14 @@ def validate(self) -> None:
             self._properties["owners"] = owners
         except ValidationError as ex:
             exceptions.append(ex)
+        # Validate default URL safety
+        default_endpoint = self._properties.get("default_endpoint")
+        if (
+            default_endpoint
+            and not is_safe_url(default_endpoint)
+            and current_app.config["PREVENT_UNSAFE_DEFAULT_URLS_ON_DATASET"]
+        ):
+            exceptions.append(DatasetEndpointUnsafeValidationError())
 
         # Validate columns
         columns = self._properties.get("columns")
diff --git a/superset/datasets/schemas.py b/superset/datasets/schemas.py
index 103359a2c3f0..1d49bc1cfb43 100644
--- a/superset/datasets/schemas.py
+++ b/superset/datasets/schemas.py
@@ -55,7 +55,7 @@ class DatasetColumnsPutSchema(Schema):
     extra = fields.String(allow_none=True)
     filterable = fields.Boolean()
     groupby = fields.Boolean()
-    is_active = fields.Boolean()
+    is_active = fields.Boolean(allow_none=True)
     is_dttm = fields.Boolean(default=False)
     python_date_format = fields.String(
         allow_none=True, validate=[Length(1, 255), validate_python_date_format]
diff --git a/superset/views/datasource/views.py b/superset/views/datasource/views.py
index 4f158e836936..77cb47d19957 100644
--- a/superset/views/datasource/views.py
+++ b/superset/views/datasource/views.py
@@ -44,6 +44,7 @@
 from superset.views.base import (
     api,
     BaseSupersetView,
+    deprecated,
     handle_api_exception,
     json_error_response,
 )
@@ -69,6 +70,7 @@ class Datasource(BaseSupersetView):
     @has_access_api
     @api
     @handle_api_exception
+    @deprecated(new_target="/api/v1/dataset/<int:pk>")
     def save(self) -> FlaskResponse:
         data = request.form.get("data")
         if not isinstance(data, str):
@@ -133,6 +135,7 @@ def save(self) -> FlaskResponse:
     @has_access_api
     @api
     @handle_api_exception
+    @deprecated(new_target="/api/v1/dataset/<int:pk>")
     def get(self, datasource_type: str, datasource_id: int) -> FlaskResponse:
         datasource = DatasourceDAO.get_datasource(
             db.session, DatasourceType(datasource_type), datasource_id
diff --git a/tests/integration_tests/datasets/api_tests.py b/tests/integration_tests/datasets/api_tests.py
index 1762a46305b4..60a8ee58bdf8 100644
--- a/tests/integration_tests/datasets/api_tests.py
+++ b/tests/integration_tests/datasets/api_tests.py
@@ -19,7 +19,7 @@
 import unittest
 from io import BytesIO
 from typing import List, Optional
-from unittest.mock import patch
+from unittest.mock import ANY, patch
 from zipfile import is_zipfile, ZipFile
 
 import prison
@@ -347,6 +347,28 @@ def test_get_dataset_item(self):
             "sql": None,
             "table_name": "energy_usage",
             "template_params": None,
+            "uid": "2__table",
+            "datasource_name": "energy_usage",
+            "name": f"{get_example_default_schema()}.energy_usage",
+            "column_formats": {},
+            "granularity_sqla": [],
+            "time_grain_sqla": ANY,
+            "order_by_choices": [
+                ['["source", true]', "source [asc]"],
+                ['["source", false]', "source [desc]"],
+                ['["target", true]', "target [asc]"],
+                ['["target", false]', "target [desc]"],
+                ['["value", true]', "value [asc]"],
+                ['["value", false]', "value [desc]"],
+            ],
+            "verbose_map": {
+                "__timestamp": "Time",
+                "count": "COUNT(*)",
+                "source": "source",
+                "sum__value": "sum__value",
+                "target": "target",
+                "value": "value",
+            },
         }
         if response["result"]["database"]["backend"] not in ("presto", "hive"):
             assert {
@@ -1350,6 +1372,32 @@ def test_update_dataset_item_uniqueness(self):
         db.session.delete(ab_user)
         db.session.commit()
 
+    def test_update_dataset_unsafe_default_endpoint(self):
+        """
+        Dataset API: Test unsafe default endpoint
+        """
+        if backend() == "sqlite":
+            return
+
+        dataset = self.insert_default_dataset()
+        self.login(username="admin")
+        uri = f"api/v1/dataset/{dataset.id}"
+        table_data = {"default_endpoint": "http://www.google.com"}
+        rv = self.client.put(uri, json=table_data)
+        data = json.loads(rv.data.decode("utf-8"))
+        assert rv.status_code == 422
+        expected_response = {
+            "message": {
+                "default_endpoint": [
+                    "The submitted URL is not considered safe,"
+                    " only use URLs with the same domain as Superset."
+                ]
+            }
+        }
+        assert data == expected_response
+        db.session.delete(dataset)
+        db.session.commit()
+
     @patch("superset.datasets.dao.DatasetDAO.update")
     def test_update_dataset_sqlalchemy_error(self, mock_dao_update):
         """

From 306fb22021f84e7dd527c88c00be1f8e7cca0d8c Mon Sep 17 00:00:00 2001
From: Ville Brofeldt <33317356+villebro@users.noreply.github.com>
Date: Wed, 19 Apr 2023 18:49:33 +0300
Subject: [PATCH 05/47] chore(chart-data): add post processing error message to
 response (#23734)

---
 superset/common/query_context_processor.py    |  2 +-
 .../charts/data/api_tests.py                  | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/superset/common/query_context_processor.py b/superset/common/query_context_processor.py
index 019422db3924..56f07dcb64b5 100644
--- a/superset/common/query_context_processor.py
+++ b/superset/common/query_context_processor.py
@@ -237,7 +237,7 @@ def get_query_result(self, query_object: QueryObject) -> QueryResult:
             try:
                 df = query_object.exec_post_processing(df)
             except InvalidPostProcessingError as ex:
-                raise QueryObjectValidationError from ex
+                raise QueryObjectValidationError(ex.message) from ex
 
         result.df = df
         result.query = query
diff --git a/tests/integration_tests/charts/data/api_tests.py b/tests/integration_tests/charts/data/api_tests.py
index db81488c3f9d..5315bbbaed70 100644
--- a/tests/integration_tests/charts/data/api_tests.py
+++ b/tests/integration_tests/charts/data/api_tests.py
@@ -481,6 +481,33 @@ def test_chart_data_prophet(self):
         self.assertIn("sum__num__yhat_lower", row)
         self.assertEqual(result["rowcount"], 47)
 
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    def test_chart_data_invalid_post_processing(self):
+        """
+        Chart data API: Ensure incorrect post processing returns correct response
+        """
+        query_context = self.query_context_payload
+        query = query_context["queries"][0]
+        query["columns"] = ["name", "gender"]
+        query["post_processing"] = [
+            {
+                "operation": "pivot",
+                "options": {
+                    "drop_missing_columns": False,
+                    "columns": ["gender"],
+                    "index": ["name"],
+                    "aggregates": {},
+                },
+            },
+        ]
+        rv = self.post_assert_metric(CHART_DATA_URI, query_context, "data")
+        assert rv.status_code == 400
+        data = json.loads(rv.data.decode("utf-8"))
+        assert (
+            data["message"]
+            == "Error: Pivot operation must include at least one aggregate"
+        )
+
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     def test_with_query_result_type_and_non_existent_filter__filter_omitted(self):
         self.query_context_payload["queries"][0]["filters"] = [

From f80e7381967f5683714ed26b692af62fcd3ecbb9 Mon Sep 17 00:00:00 2001
From: Daniel Vaz Gaspar <danielvazgaspar@gmail.com>
Date: Thu, 20 Apr 2023 09:50:57 +0100
Subject: [PATCH 06/47] fix: get or create db with an existing invalid URL
 (#23737)

---
 superset/models/core.py                | 5 +++--
 tests/integration_tests/utils_tests.py | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/superset/models/core.py b/superset/models/core.py
index d3daad52d306..ec58170c1deb 100755
--- a/superset/models/core.py
+++ b/superset/models/core.py
@@ -47,7 +47,7 @@
 from sqlalchemy.engine import Connection, Dialect, Engine
 from sqlalchemy.engine.reflection import Inspector
 from sqlalchemy.engine.url import URL
-from sqlalchemy.exc import ArgumentError, NoSuchModuleError
+from sqlalchemy.exc import NoSuchModuleError
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import relationship
 from sqlalchemy.pool import NullPool
@@ -56,6 +56,7 @@
 
 from superset import app, db_engine_specs
 from superset.constants import LRU_CACHE_MAX_SIZE, PASSWORD_MASK
+from superset.databases.commands.exceptions import DatabaseInvalidError
 from superset.databases.utils import make_url_safe
 from superset.db_engine_specs.base import MetricType, TimeGrain
 from superset.extensions import (
@@ -888,7 +889,7 @@ def get_schema_access_for_file_upload(  # pylint: disable=invalid-name
     def sqlalchemy_uri_decrypted(self) -> str:
         try:
             conn = make_url_safe(self.sqlalchemy_uri)
-        except (ArgumentError, ValueError):
+        except DatabaseInvalidError:
             # if the URI is invalid, ignore and return a placeholder url
             # (so users see 500 less often)
             return "dialect://invalid_uri"
diff --git a/tests/integration_tests/utils_tests.py b/tests/integration_tests/utils_tests.py
index e27ad6ec3c5e..2db008fdb72e 100644
--- a/tests/integration_tests/utils_tests.py
+++ b/tests/integration_tests/utils_tests.py
@@ -763,6 +763,13 @@ def test_get_or_create_db_invalid_uri(self):
         with self.assertRaises(DatabaseInvalidError):
             get_or_create_db("test_db", "yoursql:superset.db/()")
 
+    def test_get_or_create_db_existing_invalid_uri(self):
+        database = get_or_create_db("test_db", "sqlite:///superset.db")
+        database.sqlalchemy_uri = "None"
+        db.session.commit()
+        database = get_or_create_db("test_db", "sqlite:///superset.db")
+        assert database.sqlalchemy_uri == "sqlite:///superset.db"
+
     def test_get_iterable(self):
         self.assertListEqual(get_iterable(123), [123])
         self.assertListEqual(get_iterable([123]), [123])

From b2b8c3e05b69cc19cbb8394f621c1b9095bda132 Mon Sep 17 00:00:00 2001
From: Ville Brofeldt <33317356+villebro@users.noreply.github.com>
Date: Thu, 20 Apr 2023 14:45:43 +0300
Subject: [PATCH 07/47] fix(ace-editor): use monospace fonts by default
 (#23747)

---
 .../src/SqlLab/components/AceEditorWrapper/index.tsx           | 3 ---
 superset-frontend/src/components/AsyncAceEditor/index.tsx      | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/AceEditorWrapper/index.tsx b/superset-frontend/src/SqlLab/components/AceEditorWrapper/index.tsx
index d14d532dcd81..213a8c3239f7 100644
--- a/superset-frontend/src/SqlLab/components/AceEditorWrapper/index.tsx
+++ b/superset-frontend/src/SqlLab/components/AceEditorWrapper/index.tsx
@@ -65,9 +65,6 @@ const StyledAceEditor = styled(AceEditor)`
       // double class is better than !important
       border: 1px solid ${theme.colors.grayscale.light2};
       font-feature-settings: 'liga' off, 'calt' off;
-      // Fira Code causes problem with Ace under Firefox
-      font-family: 'Menlo', 'Consolas', 'Courier New', 'Ubuntu Mono',
-        'source-code-pro', 'Lucida Console', monospace;
 
       &.ace_autocomplete {
         // Use !important because Ace Editor applies extra CSS at the last second
diff --git a/superset-frontend/src/components/AsyncAceEditor/index.tsx b/superset-frontend/src/components/AsyncAceEditor/index.tsx
index dc5a37a61460..297ff7b55222 100644
--- a/superset-frontend/src/components/AsyncAceEditor/index.tsx
+++ b/superset-frontend/src/components/AsyncAceEditor/index.tsx
@@ -84,6 +84,7 @@ export type AsyncAceEditorOptions = {
   defaultMode?: AceEditorMode;
   defaultTheme?: AceEditorTheme;
   defaultTabSize?: number;
+  fontFamily?: string;
   placeholder?: React.ComponentType<
     PlaceholderProps & Partial<IAceEditorProps>
   > | null;
@@ -98,6 +99,7 @@ export default function AsyncAceEditor(
     defaultMode,
     defaultTheme,
     defaultTabSize = 2,
+    fontFamily = 'Menlo, Consolas, Courier New, Ubuntu Mono, source-code-pro, Lucida Console, monospace',
     placeholder,
   }: AsyncAceEditorOptions = {},
 ) {
@@ -153,6 +155,7 @@ export default function AsyncAceEditor(
             theme={theme}
             tabSize={tabSize}
             defaultValue={defaultValue}
+            setOptions={{ fontFamily }}
             {...props}
           />
         );

From 60c9d68403b0bcefcc4ff7460ef4fde952d8f293 Mon Sep 17 00:00:00 2001
From: Ville Brofeldt <33317356+villebro@users.noreply.github.com>
Date: Thu, 20 Apr 2023 17:03:18 +0300
Subject: [PATCH 08/47] feat(adhoc-column): add resize option (#23748)

---
 .../ColumnSelectPopover.tsx                   |  15 +-
 .../useResizeButton.tsx                       | 139 ++++++++++++++++++
 .../AdhocFilterEditPopover/index.jsx          |   2 +-
 .../AdhocMetricEditPopover/index.jsx          |   2 +-
 superset-frontend/src/explore/constants.ts    |   2 -
 5 files changed, 152 insertions(+), 8 deletions(-)
 create mode 100644 superset-frontend/src/explore/components/controls/DndColumnSelectControl/useResizeButton.tsx

diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
index dbbc8fe94843..4806e5394a3a 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
@@ -46,9 +46,10 @@ import { EmptyStateSmall } from 'src/components/EmptyState';
 import { StyledColumnOption } from 'src/explore/components/optionRenderers';
 import {
   POPOVER_INITIAL_HEIGHT,
-  UNRESIZABLE_POPOVER_WIDTH,
+  POPOVER_INITIAL_WIDTH,
 } from 'src/explore/constants';
 import { ExplorePageState } from 'src/explore/types';
+import useResizeButton from './useResizeButton';
 
 const StyledSelect = styled(Select)`
   .metric-option {
@@ -117,6 +118,11 @@ const ColumnSelectPopover = ({
     ColumnMeta | undefined
   >(initialSimpleColumn);
 
+  const [resizeButton, width, height] = useResizeButton(
+    POPOVER_INITIAL_WIDTH,
+    POPOVER_INITIAL_HEIGHT,
+  );
+
   const sqlEditorRef = useRef(null);
 
   const [calculatedColumns, simpleColumns] = useMemo(
@@ -258,8 +264,8 @@ const ColumnSelectPopover = ({
         className="adhoc-metric-edit-tabs"
         allowOverflow
         css={css`
-          height: ${POPOVER_INITIAL_HEIGHT}px;
-          width: ${UNRESIZABLE_POPOVER_WIDTH}px;
+          height: ${height}px;
+          width: ${width}px;
         `}
       >
         <Tabs.TabPane key="saved" tab={t('Saved')}>
@@ -393,7 +399,7 @@ const ColumnSelectPopover = ({
             showLoadingForImport
             onChange={onSqlExpressionChange}
             width="100%"
-            height={`${POPOVER_INITIAL_HEIGHT - 80}px`}
+            height={`${height - 80}px`}
             showGutter={false}
             editorProps={{ $blockScrolling: true }}
             enableLiveAutocompletion
@@ -417,6 +423,7 @@ const ColumnSelectPopover = ({
         >
           {t('Save')}
         </Button>
+        {resizeButton}
       </div>
     </Form>
   );
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/useResizeButton.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/useResizeButton.tsx
new file mode 100644
index 000000000000..71d5047c6ad4
--- /dev/null
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/useResizeButton.tsx
@@ -0,0 +1,139 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React, { useCallback, useEffect, useState } from 'react';
+import throttle from 'lodash/throttle';
+import {
+  POPOVER_INITIAL_HEIGHT,
+  POPOVER_INITIAL_WIDTH,
+} from 'src/explore/constants';
+
+const RESIZE_THROTTLE_MS = 50;
+
+export default function useResizeButton(
+  minWidth: number,
+  minHeight: number,
+): [JSX.Element, number, number] {
+  const [width, setWidth] = useState(POPOVER_INITIAL_WIDTH);
+  const [height, setHeight] = useState(POPOVER_INITIAL_HEIGHT);
+  const [clientX, setClientX] = useState(0);
+  const [clientY, setClientY] = useState(0);
+  const [dragStartX, setDragStartX] = useState(0);
+  const [dragStartY, setDragStartY] = useState(0);
+  const [dragStartWidth, setDragStartWidth] = useState(width);
+  const [dragStartHeight, setDragStartHeight] = useState(height);
+  const [isDragging, setIsDragging] = useState(false);
+
+  const onMouseMove = useCallback((ev: MouseEvent): void => {
+    ev.preventDefault();
+    setClientX(ev.clientX);
+    setClientY(ev.clientY);
+  }, []);
+
+  const onMouseUp = useCallback(() => {
+    setIsDragging(false);
+  }, []);
+
+  const onDragDown = useCallback((ev: React.MouseEvent): void => {
+    setDragStartX(ev.clientX);
+    setDragStartY(ev.clientY);
+    setIsDragging(true);
+  }, []);
+
+  useEffect(() => {
+    if (isDragging) {
+      document.addEventListener('mousemove', onMouseMove);
+    } else {
+      setDragStartWidth(width);
+      setDragStartHeight(height);
+      document.removeEventListener('mousemove', onMouseMove);
+    }
+  }, [onMouseMove, isDragging]);
+
+  const handleResize = useCallback(
+    throttle(
+      ({
+        dragStartX,
+        dragStartY,
+        dragStartWidth,
+        dragStartHeight,
+        clientX,
+        clientY,
+        minWidth,
+        minHeight,
+      }: {
+        dragStartX: number;
+        dragStartY: number;
+        dragStartWidth: number;
+        dragStartHeight: number;
+        clientX: number;
+        clientY: number;
+        minWidth: number;
+        minHeight: number;
+      }): void => {
+        setWidth(Math.max(dragStartWidth + (clientX - dragStartX), minWidth));
+        setHeight(
+          Math.max(dragStartHeight + (clientY - dragStartY), minHeight),
+        );
+      },
+      RESIZE_THROTTLE_MS,
+    ),
+    [setHeight, setWidth],
+  );
+
+  useEffect(() => {
+    if (isDragging) {
+      handleResize({
+        dragStartX,
+        dragStartY,
+        dragStartWidth,
+        dragStartHeight,
+        clientX,
+        clientY,
+        minWidth,
+        minHeight,
+      });
+    }
+  }, [
+    isDragging,
+    clientX,
+    clientY,
+    dragStartWidth,
+    dragStartHeight,
+    dragStartX,
+    dragStartY,
+  ]);
+
+  useEffect(() => {
+    document.addEventListener('mouseup', onMouseUp);
+    return () => document.removeEventListener('mouseup', onMouseUp);
+  }, [onMouseUp]);
+
+  return [
+    <i
+      role="button"
+      aria-label="Resize"
+      tabIndex={0}
+      onMouseDown={onDragDown}
+      className="fa fa-expand edit-popover-resize text-muted"
+    />,
+    width,
+    height,
+  ];
+}
diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx
index 7820ceb9d4e2..34be012f5eca 100644
--- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx
+++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx
@@ -150,7 +150,7 @@ export default class AdhocFilterEditPopover extends React.Component {
         POPOVER_INITIAL_WIDTH,
       ),
       height: Math.max(
-        this.dragStartHeight + (e.clientY - this.dragStartY) * 2,
+        this.dragStartHeight + (e.clientY - this.dragStartY),
         POPOVER_INITIAL_HEIGHT,
       ),
     });
diff --git a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx
index 9ed817f28395..d796d6e8a61f 100644
--- a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx
+++ b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx
@@ -248,7 +248,7 @@ export default class AdhocMetricEditPopover extends React.PureComponent {
         POPOVER_INITIAL_WIDTH,
       ),
       height: Math.max(
-        this.dragStartHeight + (e.clientY - this.dragStartY) * 2,
+        this.dragStartHeight + (e.clientY - this.dragStartY),
         POPOVER_INITIAL_HEIGHT,
       ),
     });
diff --git a/superset-frontend/src/explore/constants.ts b/superset-frontend/src/explore/constants.ts
index 58c90cfba37a..e01dae493588 100644
--- a/superset-frontend/src/explore/constants.ts
+++ b/superset-frontend/src/explore/constants.ts
@@ -158,6 +158,4 @@ export const TIME_FILTER_MAP = {
 
 export const POPOVER_INITIAL_HEIGHT = 240;
 export const POPOVER_INITIAL_WIDTH = 320;
-export const UNRESIZABLE_POPOVER_WIDTH = 296;
-
 export const UNSAVED_CHART_ID = 0;

From 171d93cee01b3d793d739dd420654c8f379cbbae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Apr 2023 12:25:47 -0600
Subject: [PATCH 09/47] build(deps-dev): bump @typescript-eslint/parser from
 5.58.0 to 5.59.0 in /superset-websocket (#23718)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 superset-websocket/package-lock.json | 356 +++------------------------
 superset-websocket/package.json      |   2 +-
 2 files changed, 38 insertions(+), 320 deletions(-)

diff --git a/superset-websocket/package-lock.json b/superset-websocket/package-lock.json
index 7d72e39e2e49..2425fb0c3bd4 100644
--- a/superset-websocket/package-lock.json
+++ b/superset-websocket/package-lock.json
@@ -26,7 +26,7 @@
         "@types/uuid": "^9.0.1",
         "@types/ws": "^8.5.4",
         "@typescript-eslint/eslint-plugin": "^5.59.0",
-        "@typescript-eslint/parser": "^5.58.0",
+        "@typescript-eslint/parser": "^5.59.0",
         "eslint": "^8.38.0",
         "eslint-config-prettier": "^8.8.0",
         "jest": "^27.3.1",
@@ -1405,62 +1405,15 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.59.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.0.tgz",
-      "integrity": "sha512-tsoldKaMh7izN6BvkK6zRMINj4Z2d6gGhO2UsI8zGZY3XhLq1DndP3Ycjhi1JwdwPRwtLMW4EFPgpuKhbCGOvQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.59.0",
-        "@typescript-eslint/visitor-keys": "5.59.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "5.59.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.0.tgz",
-      "integrity": "sha512-yR2h1NotF23xFFYKHZs17QJnB51J/s+ud4PYU4MqdZbzeNxpgUr05+dNeCN/bb6raslHvGdd6BFCkVhpPk/ZeA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
+    "node_modules/@typescript-eslint/parser": {
       "version": "5.59.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.0.tgz",
-      "integrity": "sha512-qZ3iXxQhanchCeaExlKPV3gDQFxMUmU35xfd5eCXB6+kUw1TUAbIy2n7QIrwz9s98DQLzNWyHp61fY0da4ZcbA==",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.0.tgz",
+      "integrity": "sha512-qK9TZ70eJtjojSUMrrEwA9ZDQ4N0e/AuoOIgXuNBorXYcBDk397D2r5MIe1B3cok/oCtdNC5j+lUUpVB+Dpb+w==",
       "dev": true,
       "dependencies": {
+        "@typescript-eslint/scope-manager": "5.59.0",
         "@typescript-eslint/types": "5.59.0",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser": {
-      "version": "5.58.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.58.0.tgz",
-      "integrity": "sha512-ixaM3gRtlfrKzP8N6lRhBbjTow1t6ztfBvQNGuRM8qH1bjFFXIJ35XY+FC0RRBKn3C6cT+7VW1y8tNm7DwPHDQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/scope-manager": "5.58.0",
-        "@typescript-eslint/types": "5.58.0",
-        "@typescript-eslint/typescript-estree": "5.58.0",
+        "@typescript-eslint/typescript-estree": "5.59.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -1480,13 +1433,13 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.58.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.58.0.tgz",
-      "integrity": "sha512-b+w8ypN5CFvrXWQb9Ow9T4/6LC2MikNf1viLkYTiTbkQl46CnR69w7lajz1icW0TBsYmlpg+mRzFJ4LEJ8X9NA==",
+      "version": "5.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.0.tgz",
+      "integrity": "sha512-tsoldKaMh7izN6BvkK6zRMINj4Z2d6gGhO2UsI8zGZY3XhLq1DndP3Ycjhi1JwdwPRwtLMW4EFPgpuKhbCGOvQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.58.0",
-        "@typescript-eslint/visitor-keys": "5.58.0"
+        "@typescript-eslint/types": "5.59.0",
+        "@typescript-eslint/visitor-keys": "5.59.0"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -1523,7 +1476,7 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
+    "node_modules/@typescript-eslint/types": {
       "version": "5.59.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.0.tgz",
       "integrity": "sha512-yR2h1NotF23xFFYKHZs17QJnB51J/s+ud4PYU4MqdZbzeNxpgUr05+dNeCN/bb6raslHvGdd6BFCkVhpPk/ZeA==",
@@ -1536,7 +1489,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
+    "node_modules/@typescript-eslint/typescript-estree": {
       "version": "5.59.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.0.tgz",
       "integrity": "sha512-sUNnktjmI8DyGzPdZ8dRwW741zopGxltGs/SAPgGL/AAgDpiLsCFLcMNSpbfXfmnNeHmK9h3wGmCkGRGAoUZAg==",
@@ -1563,63 +1516,6 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.59.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.0.tgz",
-      "integrity": "sha512-qZ3iXxQhanchCeaExlKPV3gDQFxMUmU35xfd5eCXB6+kUw1TUAbIy2n7QIrwz9s98DQLzNWyHp61fY0da4ZcbA==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.59.0",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/types": {
-      "version": "5.58.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.58.0.tgz",
-      "integrity": "sha512-JYV4eITHPzVQMnHZcYJXl2ZloC7thuUHrcUmxtzvItyKPvQ50kb9QXBkgNAt90OYMqwaodQh2kHutWZl1fc+1g==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.58.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.58.0.tgz",
-      "integrity": "sha512-cRACvGTodA+UxnYM2uwA2KCwRL7VAzo45syNysqlMyNyjw0Z35Icc9ihPJZjIYuA5bXJYiJ2YGUB59BqlOZT1Q==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.58.0",
-        "@typescript-eslint/visitor-keys": "5.58.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@typescript-eslint/utils": {
       "version": "5.59.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.0.tgz",
@@ -1646,64 +1542,7 @@
         "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.59.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.0.tgz",
-      "integrity": "sha512-tsoldKaMh7izN6BvkK6zRMINj4Z2d6gGhO2UsI8zGZY3XhLq1DndP3Ycjhi1JwdwPRwtLMW4EFPgpuKhbCGOvQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.59.0",
-        "@typescript-eslint/visitor-keys": "5.59.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": {
-      "version": "5.59.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.0.tgz",
-      "integrity": "sha512-yR2h1NotF23xFFYKHZs17QJnB51J/s+ud4PYU4MqdZbzeNxpgUr05+dNeCN/bb6raslHvGdd6BFCkVhpPk/ZeA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.59.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.0.tgz",
-      "integrity": "sha512-sUNnktjmI8DyGzPdZ8dRwW741zopGxltGs/SAPgGL/AAgDpiLsCFLcMNSpbfXfmnNeHmK9h3wGmCkGRGAoUZAg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.59.0",
-        "@typescript-eslint/visitor-keys": "5.59.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": {
+    "node_modules/@typescript-eslint/visitor-keys": {
       "version": "5.59.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.0.tgz",
       "integrity": "sha512-qZ3iXxQhanchCeaExlKPV3gDQFxMUmU35xfd5eCXB6+kUw1TUAbIy2n7QIrwz9s98DQLzNWyHp61fY0da4ZcbA==",
@@ -1720,23 +1559,6 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.58.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.58.0.tgz",
-      "integrity": "sha512-/fBraTlPj0jwdyTwLyrRTxv/3lnU2H96pNTVM6z3esTWLtA5MZ9ghSMJ7Rb+TtUAdtEw9EyJzJ0EydIMKxQ9gA==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.58.0",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/abab": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
@@ -7173,56 +6995,28 @@
         "natural-compare-lite": "^1.4.0",
         "semver": "^7.3.7",
         "tsutils": "^3.21.0"
-      },
-      "dependencies": {
-        "@typescript-eslint/scope-manager": {
-          "version": "5.59.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.0.tgz",
-          "integrity": "sha512-tsoldKaMh7izN6BvkK6zRMINj4Z2d6gGhO2UsI8zGZY3XhLq1DndP3Ycjhi1JwdwPRwtLMW4EFPgpuKhbCGOvQ==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.59.0",
-            "@typescript-eslint/visitor-keys": "5.59.0"
-          }
-        },
-        "@typescript-eslint/types": {
-          "version": "5.59.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.0.tgz",
-          "integrity": "sha512-yR2h1NotF23xFFYKHZs17QJnB51J/s+ud4PYU4MqdZbzeNxpgUr05+dNeCN/bb6raslHvGdd6BFCkVhpPk/ZeA==",
-          "dev": true
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "5.59.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.0.tgz",
-          "integrity": "sha512-qZ3iXxQhanchCeaExlKPV3gDQFxMUmU35xfd5eCXB6+kUw1TUAbIy2n7QIrwz9s98DQLzNWyHp61fY0da4ZcbA==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.59.0",
-            "eslint-visitor-keys": "^3.3.0"
-          }
-        }
       }
     },
     "@typescript-eslint/parser": {
-      "version": "5.58.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.58.0.tgz",
-      "integrity": "sha512-ixaM3gRtlfrKzP8N6lRhBbjTow1t6ztfBvQNGuRM8qH1bjFFXIJ35XY+FC0RRBKn3C6cT+7VW1y8tNm7DwPHDQ==",
+      "version": "5.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.0.tgz",
+      "integrity": "sha512-qK9TZ70eJtjojSUMrrEwA9ZDQ4N0e/AuoOIgXuNBorXYcBDk397D2r5MIe1B3cok/oCtdNC5j+lUUpVB+Dpb+w==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.58.0",
-        "@typescript-eslint/types": "5.58.0",
-        "@typescript-eslint/typescript-estree": "5.58.0",
+        "@typescript-eslint/scope-manager": "5.59.0",
+        "@typescript-eslint/types": "5.59.0",
+        "@typescript-eslint/typescript-estree": "5.59.0",
         "debug": "^4.3.4"
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "5.58.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.58.0.tgz",
-      "integrity": "sha512-b+w8ypN5CFvrXWQb9Ow9T4/6LC2MikNf1viLkYTiTbkQl46CnR69w7lajz1icW0TBsYmlpg+mRzFJ4LEJ8X9NA==",
+      "version": "5.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.0.tgz",
+      "integrity": "sha512-tsoldKaMh7izN6BvkK6zRMINj4Z2d6gGhO2UsI8zGZY3XhLq1DndP3Ycjhi1JwdwPRwtLMW4EFPgpuKhbCGOvQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.58.0",
-        "@typescript-eslint/visitor-keys": "5.58.0"
+        "@typescript-eslint/types": "5.59.0",
+        "@typescript-eslint/visitor-keys": "5.59.0"
       }
     },
     "@typescript-eslint/type-utils": {
@@ -7235,55 +7029,22 @@
         "@typescript-eslint/utils": "5.59.0",
         "debug": "^4.3.4",
         "tsutils": "^3.21.0"
-      },
-      "dependencies": {
-        "@typescript-eslint/types": {
-          "version": "5.59.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.0.tgz",
-          "integrity": "sha512-yR2h1NotF23xFFYKHZs17QJnB51J/s+ud4PYU4MqdZbzeNxpgUr05+dNeCN/bb6raslHvGdd6BFCkVhpPk/ZeA==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "5.59.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.0.tgz",
-          "integrity": "sha512-sUNnktjmI8DyGzPdZ8dRwW741zopGxltGs/SAPgGL/AAgDpiLsCFLcMNSpbfXfmnNeHmK9h3wGmCkGRGAoUZAg==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.59.0",
-            "@typescript-eslint/visitor-keys": "5.59.0",
-            "debug": "^4.3.4",
-            "globby": "^11.1.0",
-            "is-glob": "^4.0.3",
-            "semver": "^7.3.7",
-            "tsutils": "^3.21.0"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "5.59.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.0.tgz",
-          "integrity": "sha512-qZ3iXxQhanchCeaExlKPV3gDQFxMUmU35xfd5eCXB6+kUw1TUAbIy2n7QIrwz9s98DQLzNWyHp61fY0da4ZcbA==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.59.0",
-            "eslint-visitor-keys": "^3.3.0"
-          }
-        }
       }
     },
     "@typescript-eslint/types": {
-      "version": "5.58.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.58.0.tgz",
-      "integrity": "sha512-JYV4eITHPzVQMnHZcYJXl2ZloC7thuUHrcUmxtzvItyKPvQ50kb9QXBkgNAt90OYMqwaodQh2kHutWZl1fc+1g==",
+      "version": "5.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.0.tgz",
+      "integrity": "sha512-yR2h1NotF23xFFYKHZs17QJnB51J/s+ud4PYU4MqdZbzeNxpgUr05+dNeCN/bb6raslHvGdd6BFCkVhpPk/ZeA==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "5.58.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.58.0.tgz",
-      "integrity": "sha512-cRACvGTodA+UxnYM2uwA2KCwRL7VAzo45syNysqlMyNyjw0Z35Icc9ihPJZjIYuA5bXJYiJ2YGUB59BqlOZT1Q==",
+      "version": "5.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.0.tgz",
+      "integrity": "sha512-sUNnktjmI8DyGzPdZ8dRwW741zopGxltGs/SAPgGL/AAgDpiLsCFLcMNSpbfXfmnNeHmK9h3wGmCkGRGAoUZAg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.58.0",
-        "@typescript-eslint/visitor-keys": "5.58.0",
+        "@typescript-eslint/types": "5.59.0",
+        "@typescript-eslint/visitor-keys": "5.59.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -7305,58 +7066,15 @@
         "@typescript-eslint/typescript-estree": "5.59.0",
         "eslint-scope": "^5.1.1",
         "semver": "^7.3.7"
-      },
-      "dependencies": {
-        "@typescript-eslint/scope-manager": {
-          "version": "5.59.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.0.tgz",
-          "integrity": "sha512-tsoldKaMh7izN6BvkK6zRMINj4Z2d6gGhO2UsI8zGZY3XhLq1DndP3Ycjhi1JwdwPRwtLMW4EFPgpuKhbCGOvQ==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.59.0",
-            "@typescript-eslint/visitor-keys": "5.59.0"
-          }
-        },
-        "@typescript-eslint/types": {
-          "version": "5.59.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.0.tgz",
-          "integrity": "sha512-yR2h1NotF23xFFYKHZs17QJnB51J/s+ud4PYU4MqdZbzeNxpgUr05+dNeCN/bb6raslHvGdd6BFCkVhpPk/ZeA==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "5.59.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.0.tgz",
-          "integrity": "sha512-sUNnktjmI8DyGzPdZ8dRwW741zopGxltGs/SAPgGL/AAgDpiLsCFLcMNSpbfXfmnNeHmK9h3wGmCkGRGAoUZAg==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.59.0",
-            "@typescript-eslint/visitor-keys": "5.59.0",
-            "debug": "^4.3.4",
-            "globby": "^11.1.0",
-            "is-glob": "^4.0.3",
-            "semver": "^7.3.7",
-            "tsutils": "^3.21.0"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "5.59.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.0.tgz",
-          "integrity": "sha512-qZ3iXxQhanchCeaExlKPV3gDQFxMUmU35xfd5eCXB6+kUw1TUAbIy2n7QIrwz9s98DQLzNWyHp61fY0da4ZcbA==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.59.0",
-            "eslint-visitor-keys": "^3.3.0"
-          }
-        }
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "5.58.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.58.0.tgz",
-      "integrity": "sha512-/fBraTlPj0jwdyTwLyrRTxv/3lnU2H96pNTVM6z3esTWLtA5MZ9ghSMJ7Rb+TtUAdtEw9EyJzJ0EydIMKxQ9gA==",
+      "version": "5.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.0.tgz",
+      "integrity": "sha512-qZ3iXxQhanchCeaExlKPV3gDQFxMUmU35xfd5eCXB6+kUw1TUAbIy2n7QIrwz9s98DQLzNWyHp61fY0da4ZcbA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.58.0",
+        "@typescript-eslint/types": "5.59.0",
         "eslint-visitor-keys": "^3.3.0"
       }
     },
diff --git a/superset-websocket/package.json b/superset-websocket/package.json
index cf764ad0b9d7..e85bd79a8a4b 100644
--- a/superset-websocket/package.json
+++ b/superset-websocket/package.json
@@ -32,7 +32,7 @@
     "@types/uuid": "^9.0.1",
     "@types/ws": "^8.5.4",
     "@typescript-eslint/eslint-plugin": "^5.59.0",
-    "@typescript-eslint/parser": "^5.58.0",
+    "@typescript-eslint/parser": "^5.59.0",
     "eslint": "^8.38.0",
     "eslint-config-prettier": "^8.8.0",
     "jest": "^27.3.1",

From c9ca17220fc18586785000954f39fcc33a552b83 Mon Sep 17 00:00:00 2001
From: Cemre Mengu <cemremengu@gmail.com>
Date: Thu, 20 Apr 2023 21:26:47 +0300
Subject: [PATCH 10/47] fix(cache): coerce schema_cache_timeout to None
 (#23157)

---
 superset/databases/api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset/databases/api.py b/superset/databases/api.py
index 233990ccd580..dac5c89ce527 100644
--- a/superset/databases/api.py
+++ b/superset/databases/api.py
@@ -554,7 +554,7 @@ def schemas(self, pk: int, **kwargs: Any) -> FlaskResponse:
         try:
             schemas = database.get_all_schema_names(
                 cache=database.schema_cache_enabled,
-                cache_timeout=database.schema_cache_timeout,
+                cache_timeout=database.schema_cache_timeout or None,
                 force=kwargs["rison"].get("force", False),
             )
             schemas = security_manager.get_schemas_accessible_by_user(database, schemas)

From 7a6fb86cbbbcc8f782827ba3e7bcb174e068296f Mon Sep 17 00:00:00 2001
From: "Michael S. Molina" <70410625+michael-s-molina@users.noreply.github.com>
Date: Thu, 20 Apr 2023 15:37:56 -0300
Subject: [PATCH 11/47] fix: Make sure the DeprecatedSelect label is always a
 string (#23758)

Co-authored-by: JUST.in DO IT <justin.park@airbnb.com>
---
 .../src/components/DeprecatedSelect/DeprecatedSelect.tsx      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/superset-frontend/src/components/DeprecatedSelect/DeprecatedSelect.tsx b/superset-frontend/src/components/DeprecatedSelect/DeprecatedSelect.tsx
index 2e2c1e9546f4..185829b23a5d 100644
--- a/superset-frontend/src/components/DeprecatedSelect/DeprecatedSelect.tsx
+++ b/superset-frontend/src/components/DeprecatedSelect/DeprecatedSelect.tsx
@@ -161,13 +161,15 @@ function styled<
       filterOption,
       ignoreAccents = false, // default is `true`, but it is slow
 
+      asText = (value: any) => String(value ?? ''),
+
       getOptionValue = option =>
         typeof option === 'string' ? option : option[valueKey],
 
       getOptionLabel = option =>
         typeof option === 'string'
           ? option
-          : option[labelKey] || option[valueKey],
+          : asText(option[labelKey]) || asText(option[valueKey]),
 
       formatOptionLabel = (
         option: OptionType,

From c441a7050d1d903a2fae18d1395a53a55bbf17c9 Mon Sep 17 00:00:00 2001
From: "Hugh A. Miles II" <hughmil3s@gmail.com>
Date: Thu, 20 Apr 2023 12:43:59 -0700
Subject: [PATCH 12/47] chore: add check constraint to restrict `Slice` models
 datasource_type != "table" (#23614)

---
 ..._12-30_7e67aecbf3f1_chart_ds_constraint.py | 79 +++++++++++++++++++
 ...7e67aecbf3f1_chart_ds_constraint__tests.py | 56 +++++++++++++
 2 files changed, 135 insertions(+)
 create mode 100644 superset/migrations/versions/2023-03-27_12-30_7e67aecbf3f1_chart_ds_constraint.py
 create mode 100644 tests/integration_tests/migrations/7e67aecbf3f1_chart_ds_constraint__tests.py

diff --git a/superset/migrations/versions/2023-03-27_12-30_7e67aecbf3f1_chart_ds_constraint.py b/superset/migrations/versions/2023-03-27_12-30_7e67aecbf3f1_chart_ds_constraint.py
new file mode 100644
index 000000000000..f7d6ca5656e8
--- /dev/null
+++ b/superset/migrations/versions/2023-03-27_12-30_7e67aecbf3f1_chart_ds_constraint.py
@@ -0,0 +1,79 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""chart-ds-constraint
+
+Revision ID: 7e67aecbf3f1
+Revises: b5ea9d343307
+Create Date: 2023-03-27 12:30:01.164594
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = "7e67aecbf3f1"
+down_revision = "07f9a902af1b"
+
+import json
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.ext.declarative import declarative_base
+
+from superset import db
+
+Base = declarative_base()
+
+
+class Slice(Base):  # type: ignore
+    __tablename__ = "slices"
+
+    id = sa.Column(sa.Integer, primary_key=True)
+    params = sa.Column(sa.String(250))
+    datasource_type = sa.Column(sa.String(200))
+
+
+def upgrade_slc(slc: Slice) -> None:
+    # clean up all charts with datasource_type not != table
+    slc.datasource_type = "table"
+    try:
+        params_dict = json.loads(slc.params)
+        ds_id, ds_type = params_dict["datasource"].split("__")
+        params_dict["datasource"] = f"{ds_id}__table"
+        slc.params = json.dumps(params_dict)
+    except Exception:
+        # skip any malformatted params
+        pass
+
+
+def upgrade():
+    bind = op.get_bind()
+    session = db.Session(bind=bind)
+
+    with op.batch_alter_table("slices") as batch_op:
+        for slc in session.query(Slice).filter(Slice.datasource_type == "query").all():
+            upgrade_slc(slc)
+            session.add(slc)
+
+        batch_op.create_check_constraint(
+            "ck_chart_datasource", "datasource_type in ('table')"
+        )
+
+    session.commit()
+    session.close()
+
+
+def downgrade():
+    op.drop_constraint("ck_chart_datasource", "slices", type_="check")
diff --git a/tests/integration_tests/migrations/7e67aecbf3f1_chart_ds_constraint__tests.py b/tests/integration_tests/migrations/7e67aecbf3f1_chart_ds_constraint__tests.py
new file mode 100644
index 000000000000..a30741c0a0a8
--- /dev/null
+++ b/tests/integration_tests/migrations/7e67aecbf3f1_chart_ds_constraint__tests.py
@@ -0,0 +1,56 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import json
+from importlib import import_module
+
+chart_ds_constraint = import_module(
+    "superset.migrations.versions." "2023-03-27_12-30_7e67aecbf3f1_chart_ds_constraint",
+)
+
+Slice = chart_ds_constraint.Slice
+upgrade_slice = chart_ds_constraint.upgrade_slc
+
+sample_params = {
+    "adhoc_filters": [],
+    "all_columns": ["country_name", "country_code", "region", "year", "SP_UWT_TFRT"],
+    "applied_time_extras": {},
+    "datasource": "35__query",
+    "groupby": [],
+    "row_limit": 1000,
+    "time_range": "No filter",
+    "viz_type": "table",
+    "granularity_sqla": "year",
+    "percent_metrics": [],
+    "dashboards": [],
+}
+
+
+def test_upgrade():
+    slc = Slice(datasource_type="query", params=json.dumps(sample_params))
+
+    upgrade_slice(slc)
+
+    params = json.loads(slc.params)
+    assert slc.datasource_type == "table"
+    assert params.get("datasource") == "35__table"
+
+
+def test_upgrade_bad_json():
+    slc = Slice(datasource_type="query", params=json.dumps(sample_params))
+
+    assert None == upgrade_slice(slc)

From 3028d4033340426f6dd2d6b4f7a709baa782b654 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Apr 2023 14:33:22 -0600
Subject: [PATCH 13/47] build(deps): bump vm2 from 3.9.15 to 3.9.17 in
 /superset-frontend (#23753)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 superset-frontend/package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
index 1e5a73b39343..2d40096fa8a8 100644
--- a/superset-frontend/package-lock.json
+++ b/superset-frontend/package-lock.json
@@ -57203,9 +57203,9 @@
       "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="
     },
     "node_modules/vm2": {
-      "version": "3.9.15",
-      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.15.tgz",
-      "integrity": "sha512-XqNqknHGw2avJo13gbIwLNZUumvrSHc9mLqoadFZTpo3KaNEJoe1I0lqTFhRXmXD7WkLyG01aaraXdXT0pa4ag==",
+      "version": "3.9.17",
+      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.17.tgz",
+      "integrity": "sha512-AqwtCnZ/ERcX+AVj9vUsphY56YANXxRuqMb7GsDtAr0m0PcQX3u0Aj3KWiXM0YAHy7i6JEeHrwOnwXbGYgRpAw==",
       "dev": true,
       "dependencies": {
         "acorn": "^8.7.0",
@@ -106734,9 +106734,9 @@
       "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="
     },
     "vm2": {
-      "version": "3.9.15",
-      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.15.tgz",
-      "integrity": "sha512-XqNqknHGw2avJo13gbIwLNZUumvrSHc9mLqoadFZTpo3KaNEJoe1I0lqTFhRXmXD7WkLyG01aaraXdXT0pa4ag==",
+      "version": "3.9.17",
+      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.17.tgz",
+      "integrity": "sha512-AqwtCnZ/ERcX+AVj9vUsphY56YANXxRuqMb7GsDtAr0m0PcQX3u0Aj3KWiXM0YAHy7i6JEeHrwOnwXbGYgRpAw==",
       "dev": true,
       "requires": {
         "acorn": "^8.7.0",

From a09162bb3716aa1549a510c475e5bf6e2b30c697 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Apr 2023 14:33:49 -0600
Subject: [PATCH 14/47] build(deps-dev): bump @types/node from 18.15.11 to
 18.15.12 in /superset-websocket (#23746)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 superset-websocket/package-lock.json | 14 +++++++-------
 superset-websocket/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/superset-websocket/package-lock.json b/superset-websocket/package-lock.json
index 2425fb0c3bd4..ff0aeeef22db 100644
--- a/superset-websocket/package-lock.json
+++ b/superset-websocket/package-lock.json
@@ -22,7 +22,7 @@
         "@types/ioredis": "^4.27.8",
         "@types/jest": "^27.0.2",
         "@types/jsonwebtoken": "^9.0.1",
-        "@types/node": "^18.15.11",
+        "@types/node": "^18.15.12",
         "@types/uuid": "^9.0.1",
         "@types/ws": "^8.5.4",
         "@typescript-eslint/eslint-plugin": "^5.59.0",
@@ -1318,9 +1318,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "18.15.11",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz",
-      "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==",
+      "version": "18.15.12",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.12.tgz",
+      "integrity": "sha512-Wha1UwsB3CYdqUm2PPzh/1gujGCNtWVUYF0mB00fJFoR4gTyWTDPjSm+zBF787Ahw8vSGgBja90MkgFwvB86Dg==",
       "dev": true
     },
     "node_modules/@types/prettier": {
@@ -6926,9 +6926,9 @@
       }
     },
     "@types/node": {
-      "version": "18.15.11",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz",
-      "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==",
+      "version": "18.15.12",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.12.tgz",
+      "integrity": "sha512-Wha1UwsB3CYdqUm2PPzh/1gujGCNtWVUYF0mB00fJFoR4gTyWTDPjSm+zBF787Ahw8vSGgBja90MkgFwvB86Dg==",
       "dev": true
     },
     "@types/prettier": {
diff --git a/superset-websocket/package.json b/superset-websocket/package.json
index e85bd79a8a4b..ec2e6f9b7c23 100644
--- a/superset-websocket/package.json
+++ b/superset-websocket/package.json
@@ -28,7 +28,7 @@
     "@types/ioredis": "^4.27.8",
     "@types/jest": "^27.0.2",
     "@types/jsonwebtoken": "^9.0.1",
-    "@types/node": "^18.15.11",
+    "@types/node": "^18.15.12",
     "@types/uuid": "^9.0.1",
     "@types/ws": "^8.5.4",
     "@typescript-eslint/eslint-plugin": "^5.59.0",

From 5bec1a65ae3bdae91ee3af8ec3d70b1647726d98 Mon Sep 17 00:00:00 2001
From: "JUST.in DO IT" <justin.park@airbnb.com>
Date: Thu, 20 Apr 2023 15:55:55 -0700
Subject: [PATCH 15/47] refactor(sqllab): Remove tableOptions from redux state
 (#23488)

---
 .../src/SqlLab/actions/sqlLab.js              |  5 --
 .../components/AceEditorWrapper/index.tsx     | 16 +++++--
 .../src/SqlLab/components/SaveQuery/index.tsx |  1 -
 .../components/SqlEditorLeftBar/index.tsx     | 11 -----
 superset-frontend/src/SqlLab/fixtures.ts      |  1 -
 .../src/SqlLab/reducers/sqlLab.js             | 12 -----
 superset-frontend/src/SqlLab/types.ts         |  1 -
 .../TableSelector/TableSelector.test.tsx      | 47 -------------------
 .../src/components/TableSelector/index.tsx    | 10 ----
 9 files changed, 12 insertions(+), 92 deletions(-)

diff --git a/superset-frontend/src/SqlLab/actions/sqlLab.js b/superset-frontend/src/SqlLab/actions/sqlLab.js
index e4cc78ef0f94..7ec2e77616a1 100644
--- a/superset-frontend/src/SqlLab/actions/sqlLab.js
+++ b/superset-frontend/src/SqlLab/actions/sqlLab.js
@@ -50,7 +50,6 @@ export const EXPAND_TABLE = 'EXPAND_TABLE';
 export const COLLAPSE_TABLE = 'COLLAPSE_TABLE';
 export const QUERY_EDITOR_SETDB = 'QUERY_EDITOR_SETDB';
 export const QUERY_EDITOR_SET_SCHEMA = 'QUERY_EDITOR_SET_SCHEMA';
-export const QUERY_EDITOR_SET_TABLE_OPTIONS = 'QUERY_EDITOR_SET_TABLE_OPTIONS';
 export const QUERY_EDITOR_SET_TITLE = 'QUERY_EDITOR_SET_TITLE';
 export const QUERY_EDITOR_SET_AUTORUN = 'QUERY_EDITOR_SET_AUTORUN';
 export const QUERY_EDITOR_SET_SQL = 'QUERY_EDITOR_SET_SQL';
@@ -957,10 +956,6 @@ export function queryEditorSetSchema(queryEditor, schema) {
   };
 }
 
-export function queryEditorSetTableOptions(queryEditor, options) {
-  return { type: QUERY_EDITOR_SET_TABLE_OPTIONS, queryEditor, options };
-}
-
 export function queryEditorSetAutorun(queryEditor, autorun) {
   return function (dispatch) {
     const sync = isFeatureEnabled(FeatureFlag.SQLLAB_BACKEND_PERSISTENCE)
diff --git a/superset-frontend/src/SqlLab/components/AceEditorWrapper/index.tsx b/superset-frontend/src/SqlLab/components/AceEditorWrapper/index.tsx
index 213a8c3239f7..b60faacbe043 100644
--- a/superset-frontend/src/SqlLab/components/AceEditorWrapper/index.tsx
+++ b/superset-frontend/src/SqlLab/components/AceEditorWrapper/index.tsx
@@ -39,7 +39,7 @@ import {
   FullSQLEditor as AceEditor,
 } from 'src/components/AsyncAceEditor';
 import useQueryEditor from 'src/SqlLab/hooks/useQueryEditor';
-import { useSchemas } from 'src/hooks/apiResources';
+import { useSchemas, useTables } from 'src/hooks/apiResources';
 
 type HotKey = {
   key: string;
@@ -96,11 +96,19 @@ const AceEditorWrapper = ({
     'dbId',
     'sql',
     'functionNames',
-    'tableOptions',
     'validationResult',
     'schema',
   ]);
-  const { data: schemaOptions } = useSchemas({ dbId: queryEditor.dbId });
+  const { data: schemaOptions } = useSchemas({
+    ...(autocomplete && { dbId: queryEditor.dbId }),
+  });
+  const { data: tableData } = useTables({
+    ...(autocomplete && {
+      dbId: queryEditor.dbId,
+      schema: queryEditor.schema,
+    }),
+  });
+
   const currentSql = queryEditor.sql ?? '';
   const functionNames = queryEditor.functionNames ?? [];
 
@@ -117,7 +125,7 @@ const AceEditorWrapper = ({
     }),
     [schemaOptions],
   );
-  const tables = queryEditor.tableOptions ?? [];
+  const tables = tableData?.options ?? [];
 
   const [sql, setSql] = useState(currentSql);
   const [words, setWords] = useState<AceCompleterKeyword[]>([]);
diff --git a/superset-frontend/src/SqlLab/components/SaveQuery/index.tsx b/superset-frontend/src/SqlLab/components/SaveQuery/index.tsx
index b513637b2738..4071b9e2d71d 100644
--- a/superset-frontend/src/SqlLab/components/SaveQuery/index.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveQuery/index.tsx
@@ -80,7 +80,6 @@ const SaveQuery = ({
     'schema',
     'selectedText',
     'sql',
-    'tableOptions',
     'templateParams',
   ]);
   const query = useMemo(
diff --git a/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx b/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx
index 0cacdb86caf0..1298722d5dd2 100644
--- a/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx
+++ b/superset-frontend/src/SqlLab/components/SqlEditorLeftBar/index.tsx
@@ -35,7 +35,6 @@ import {
   collapseTable,
   expandTable,
   queryEditorSetSchema,
-  queryEditorSetTableOptions,
   setDatabases,
   addDangerToast,
   resetState,
@@ -218,15 +217,6 @@ const SqlEditorLeftBar = ({
     [dispatch, queryEditor],
   );
 
-  const handleTablesLoad = useCallback(
-    (options: Array<any>) => {
-      if (queryEditor) {
-        dispatch(queryEditorSetTableOptions(queryEditor, options));
-      }
-    },
-    [dispatch, queryEditor],
-  );
-
   const handleDbList = useCallback(
     (result: DatabaseObject) => {
       dispatch(setDatabases(result));
@@ -256,7 +246,6 @@ const SqlEditorLeftBar = ({
         onDbChange={onDbChange}
         onSchemaChange={handleSchemaChange}
         onTableSelectChange={onTablesChange}
-        onTablesLoad={handleTablesLoad}
         schema={schema}
         tableValue={selectedTableNames}
         sqlLabMode
diff --git a/superset-frontend/src/SqlLab/fixtures.ts b/superset-frontend/src/SqlLab/fixtures.ts
index ba88a41b0acc..cfd15bedbe70 100644
--- a/superset-frontend/src/SqlLab/fixtures.ts
+++ b/superset-frontend/src/SqlLab/fixtures.ts
@@ -185,7 +185,6 @@ export const defaultQueryEditor = {
   name: 'Untitled Query 1',
   schema: 'main',
   remoteId: null,
-  tableOptions: [],
   functionNames: [],
   hideLeftBar: false,
   templateParams: '{}',
diff --git a/superset-frontend/src/SqlLab/reducers/sqlLab.js b/superset-frontend/src/SqlLab/reducers/sqlLab.js
index 03b239e56b69..eafc326aaa0d 100644
--- a/superset-frontend/src/SqlLab/reducers/sqlLab.js
+++ b/superset-frontend/src/SqlLab/reducers/sqlLab.js
@@ -587,18 +587,6 @@ export default function sqlLabReducer(state = {}, action) {
         ),
       };
     },
-    [actions.QUERY_EDITOR_SET_TABLE_OPTIONS]() {
-      return {
-        ...state,
-        ...alterUnsavedQueryEditorState(
-          state,
-          {
-            tableOptions: action.options,
-          },
-          action.queryEditor.id,
-        ),
-      };
-    },
     [actions.QUERY_EDITOR_SET_TITLE]() {
       return {
         ...state,
diff --git a/superset-frontend/src/SqlLab/types.ts b/superset-frontend/src/SqlLab/types.ts
index ab63e1c76080..e209be04be50 100644
--- a/superset-frontend/src/SqlLab/types.ts
+++ b/superset-frontend/src/SqlLab/types.ts
@@ -39,7 +39,6 @@ export interface QueryEditor {
   autorun: boolean;
   sql: string;
   remoteId: number | null;
-  tableOptions: any[];
   functionNames: string[];
   validationResult?: {
     completed: boolean;
diff --git a/superset-frontend/src/components/TableSelector/TableSelector.test.tsx b/superset-frontend/src/components/TableSelector/TableSelector.test.tsx
index 3ab045a8a945..1e6083e1b46f 100644
--- a/superset-frontend/src/components/TableSelector/TableSelector.test.tsx
+++ b/superset-frontend/src/components/TableSelector/TableSelector.test.tsx
@@ -21,7 +21,6 @@ import React from 'react';
 import { render, screen, waitFor, within } from 'spec/helpers/testing-library';
 import { queryClient } from 'src/views/QueryProvider';
 import fetchMock from 'fetch-mock';
-import { act } from 'react-dom/test-utils';
 import userEvent from '@testing-library/user-event';
 import TableSelector, { TableSelectorMultiple } from '.';
 
@@ -36,11 +35,6 @@ const createProps = (props = {}) => ({
   ...props,
 });
 
-const getSchemaMockFunction = () =>
-  ({
-    result: ['schema_a', 'schema_b'],
-  } as any);
-
 const getTableMockFunction = () =>
   ({
     count: 4,
@@ -124,47 +118,6 @@ test('renders disabled without schema', async () => {
   });
 });
 
-test('table options are notified after schema selection', async () => {
-  fetchMock.get(schemaApiRoute, getSchemaMockFunction());
-
-  const callback = jest.fn();
-  const props = createProps({
-    onTablesLoad: callback,
-    schema: undefined,
-  });
-  render(<TableSelector {...props} />, { useRedux: true });
-
-  const schemaSelect = screen.getByRole('combobox', {
-    name: 'Select schema or type to search schemas',
-  });
-  expect(schemaSelect).toBeInTheDocument();
-  expect(callback).not.toHaveBeenCalled();
-
-  userEvent.click(schemaSelect);
-
-  expect(
-    await screen.findByRole('option', { name: 'schema_a' }),
-  ).toBeInTheDocument();
-  expect(
-    await screen.findByRole('option', { name: 'schema_b' }),
-  ).toBeInTheDocument();
-
-  fetchMock.get(tablesApiRoute, getTableMockFunction());
-
-  act(() => {
-    userEvent.click(screen.getAllByText('schema_a')[1]);
-  });
-
-  await waitFor(() => {
-    expect(callback).toHaveBeenCalledWith([
-      { label: 'table_a', value: 'table_a' },
-      { label: 'table_b', value: 'table_b' },
-      { label: 'table_c', value: 'table_c' },
-      { label: 'table_d', value: 'table_d' },
-    ]);
-  });
-});
-
 test('table select retain value if not in SQL Lab mode', async () => {
   fetchMock.get(schemaApiRoute, { result: ['test_schema'] });
   fetchMock.get(tablesApiRoute, getTableMockFunction());
diff --git a/superset-frontend/src/components/TableSelector/index.tsx b/superset-frontend/src/components/TableSelector/index.tsx
index 2c51462e6d25..3886a86fd20a 100644
--- a/superset-frontend/src/components/TableSelector/index.tsx
+++ b/superset-frontend/src/components/TableSelector/index.tsx
@@ -97,7 +97,6 @@ interface TableSelectorProps {
   isDatabaseSelectEnabled?: boolean;
   onDbChange?: (db: DatabaseObject) => void;
   onSchemaChange?: (schema?: string) => void;
-  onTablesLoad?: (options: Array<any>) => void;
   readOnly?: boolean;
   schema?: string;
   onEmptyResults?: (searchText?: string) => void;
@@ -158,7 +157,6 @@ const TableSelector: FunctionComponent<TableSelectorProps> = ({
   isDatabaseSelectEnabled = true,
   onDbChange,
   onSchemaChange,
-  onTablesLoad,
   readOnly = false,
   onEmptyResults,
   schema,
@@ -199,14 +197,6 @@ const TableSelector: FunctionComponent<TableSelectorProps> = ({
     },
   });
 
-  useEffect(() => {
-    // Set the tableOptions in the queryEditor so autocomplete
-    // works on new tabs
-    if (data && isFetched) {
-      onTablesLoad?.(data.options);
-    }
-  }, [data, isFetched, onTablesLoad]);
-
   const tableOptions = useMemo<TableOption[]>(
     () =>
       data

From d0fda60c85df68ef16b28ba69d77a7e2aaf51c69 Mon Sep 17 00:00:00 2001
From: John Bodley <4567245+john-bodley@users.noreply.github.com>
Date: Fri, 21 Apr 2023 15:12:33 +1200
Subject: [PATCH 16/47] feat(native-filters): Add legacy (filter-box) to native
 filter migration script (#23269)

---
 .../miscellaneous/native-filter-migration.mdx | 103 +++++
 requirements/base.txt                         |  35 +-
 requirements/development.txt                  |   2 -
 requirements/integration.txt                  |   8 +-
 setup.py                                      |   2 +
 superset/cli/main.py                          |   5 +-
 superset/cli/native_filters.py                | 398 ++++++++++++++++++
 superset/dashboards/schemas.py                |   1 +
 .../dashboard_filter_scopes_converter.py      | 256 ++++++++++-
 9 files changed, 798 insertions(+), 12 deletions(-)
 create mode 100644 docs/docs/miscellaneous/native-filter-migration.mdx
 create mode 100644 superset/cli/native_filters.py

diff --git a/docs/docs/miscellaneous/native-filter-migration.mdx b/docs/docs/miscellaneous/native-filter-migration.mdx
new file mode 100644
index 000000000000..b231c049b237
--- /dev/null
+++ b/docs/docs/miscellaneous/native-filter-migration.mdx
@@ -0,0 +1,103 @@
+---
+title: Migrating from Legacy to Native Filters
+sidebar_position: 5
+version: 1
+---
+
+##
+
+The `superset native-filters` CLI command group—somewhat akin to an Alembic migration—
+comprises of a number of sub-commands which allows administrators to upgrade/downgrade
+existing dashboards which use the legacy filter-box charts—in combination with the
+filter scopes/filter mapping—to use the native filter dashboard component.
+
+Even though both legacy and native filters can coexist the overall user experience (UX)
+is substandard as the already convoluted filter space becomes overly complex. After
+enabling the `DASHBOARD_NATIVE_FILTERS` it is strongly advised to run the migration ASAP to
+ensure users are not exposed to the hybrid state.
+
+### Upgrading
+
+The
+
+```
+superset native-filters upgrade
+```
+
+command—which provides the option to target either specific dashboard(s) or all
+dashboards—migrates the legacy filters to native filters.
+
+Specifically, the command performs the following:
+
+- Replaces every filter-box chart within the dashboard with a markdown element which
+provides a link to the deprecated chart. This preserves the layout whilst simultaneously
+providing context to help owners review/verify said change.
+- Migrates the filter scopes/filter mappings to the native filter configuration.
+
+#### Quality Control
+
+Dashboard owners should:
+
+- Verify that the filter behavior is correct.
+- Consolidate any conflicting/redundant filters—this previously may not have been
+obvious given the embedded nature of the legacy filters and/or the non-optimal UX of the
+legacy filter mapping (scopes and immunity).
+- Rename the filters—which may not be uniquely named—to provide the necessary context
+which previously was likely provided by both the location of the filter-box and the
+corresponding filter-box title.
+
+Dashboard owners may:
+
+- Remove† the markdown elements from their dashboards and adjust the layout accordingly.
+
+† Note removing the markdown elements—which contain metadata relating to the replaced
+chart—prevents the dashboard from being fully restored and thus this operation should
+only be performed if it is evident that a downgrade is not necessary.
+
+### Downgrading
+
+Similarly the
+
+```
+superset native-filters downgrade
+```
+
+command reverses said migration, i.e., restores the dashboard to the previous state.
+
+
+### Cleanup
+
+The ability to downgrade/reverse the migration requires temporary storage of the
+dashboard metadata—relating to both positional composition and filter configuration.
+
+Once the upgrade has been verified it is recommended to run the
+
+```
+superset native-filters cleanup
+```
+
+command—which provides the option to target either specific dashboard(s) or all
+dashboards. Note this operation is irreversible.
+
+Specifically, the command performs the following:
+
+- Removes the temporary dashboard metadata.
+- Deletes the filter-box charts associated with the dashboard†.
+
+† Note the markdown elements will still remain however the link to the referenced filter-box
+chart will no longer be valid.
+
+Finally, the
+
+```
+superset native-filers cleanup --all
+```
+
+command will additionally delete all filter-box charts, irrespective of whether they
+were ever associated with a dashboard.
+
+#### Quality Control
+
+Dashboard owners should:
+
+- Remove the markdown elements from their dashboards and adjust the layout accordingly.
diff --git a/requirements/base.txt b/requirements/base.txt
index 3a5ec607fe9f..5e54e1e06d23 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -40,12 +40,15 @@ click==8.0.4
     #   apache-superset
     #   celery
     #   click-didyoumean
+    #   click-option-group
     #   click-plugins
     #   click-repl
     #   flask
     #   flask-appbuilder
 click-didyoumean==0.3.0
     # via celery
+click-option-group==0.5.5
+    # via apache-superset
 click-plugins==1.1.1
     # via celery
 click-repl==0.2.0
@@ -64,6 +67,8 @@ cryptography==39.0.1
     # via
     #   apache-superset
     #   paramiko
+deprecated==1.2.13
+    # via limits
 deprecation==2.1.0
     # via apache-superset
 dnspython==2.1.0
@@ -78,6 +83,7 @@ flask==2.1.3
     #   flask-caching
     #   flask-compress
     #   flask-jwt-extended
+    #   flask-limiter
     #   flask-login
     #   flask-migrate
     #   flask-sqlalchemy
@@ -92,6 +98,8 @@ flask-compress==1.13
     # via apache-superset
 flask-jwt-extended==4.3.1
     # via flask-appbuilder
+flask-limiter==3.3.0
+    # via flask-appbuilder
 flask-login==0.6.0
     # via
     #   apache-superset
@@ -128,6 +136,8 @@ humanize==3.11.0
     # via apache-superset
 idna==3.2
     # via email-validator
+importlib-metadata==6.0.0
+    # via flask
 isodate==0.6.0
     # via apache-superset
 itsdangerous==2.1.1
@@ -144,10 +154,14 @@ kombu==5.2.4
     # via celery
 korean-lunar-calendar==0.2.1
     # via holidays
+limits==3.2.0
+    # via flask-limiter
 mako==1.1.4
     # via alembic
 markdown==3.3.4
     # via apache-superset
+markdown-it-py==2.2.0
+    # via rich
 markupsafe==2.1.1
     # via
     #   jinja2
@@ -162,6 +176,8 @@ marshmallow-enum==1.5.1
     # via flask-appbuilder
 marshmallow-sqlalchemy==0.23.1
     # via flask-appbuilder
+mdurl==0.1.2
+    # via markdown-it-py
 msgpack==1.0.2
     # via apache-superset
 numpy==1.23.5
@@ -169,10 +185,13 @@ numpy==1.23.5
     #   apache-superset
     #   pandas
     #   pyarrow
+ordered-set==4.1.0
+    # via flask-limiter
 packaging==21.3
     # via
     #   bleach
     #   deprecation
+    #   limits
 pandas==1.5.3
     # via apache-superset
 paramiko==2.11.0
@@ -191,6 +210,8 @@ pyarrow==10.0.1
     # via apache-superset
 pycparser==2.20
     # via cffi
+pygments==2.14.0
+    # via rich
 pyjwt==2.4.0
     # via
     #   apache-superset
@@ -232,8 +253,12 @@ pyyaml==5.4.1
     #   apispec
 redis==3.5.3
     # via apache-superset
+rich==13.3.1
+    # via flask-limiter
 selenium==3.141.0
     # via apache-superset
+shortid==0.1.2
+    # via apache-superset
 simplejson==3.17.3
     # via apache-superset
 six==1.16.0
@@ -269,7 +294,11 @@ sshtunnel==0.4.0
 tabulate==0.8.9
     # via apache-superset
 typing-extensions==4.4.0
-    # via apache-superset
+    # via
+    #   apache-superset
+    #   flask-limiter
+    #   limits
+    #   rich
 urllib3==1.26.6
     # via selenium
 vine==5.0.0
@@ -286,6 +315,8 @@ werkzeug==2.1.2
     #   flask
     #   flask-jwt-extended
     #   flask-login
+wrapt==1.12.1
+    # via deprecated
 wtforms==2.3.3
     # via
     #   apache-superset
@@ -296,6 +327,8 @@ wtforms-json==0.3.3
     # via apache-superset
 xlsxwriter==3.0.7
     # via apache-superset
+zipp==3.15.0
+    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/requirements/development.txt b/requirements/development.txt
index 47fe7a17372d..aa92fcfda4d8 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -80,8 +80,6 @@ pure-sasl==0.6.2
     # via thrift-sasl
 pydruid==0.6.5
     # via apache-superset
-pygments==2.12.0
-    # via ipython
 pyhive[hive]==0.6.5
     # via apache-superset
 pyinstrument==4.0.2
diff --git a/requirements/integration.txt b/requirements/integration.txt
index 59c619a38602..c11f956c68d0 100644
--- a/requirements/integration.txt
+++ b/requirements/integration.txt
@@ -30,7 +30,7 @@ packaging==21.3
 pep517==0.11.0
     # via build
 pip-compile-multi==2.6.2
-    # via -r integration.in
+    # via -r requirements/integration.in
 pip-tools==6.8.0
     # via pip-compile-multi
 platformdirs==2.6.2
@@ -38,7 +38,7 @@ platformdirs==2.6.2
 pluggy==0.13.1
     # via tox
 pre-commit==3.2.2
-    # via -r integration.in
+    # via -r requirements/integration.in
 py==1.10.0
     # via tox
 pyparsing==3.0.6
@@ -50,11 +50,11 @@ six==1.16.0
 toml==0.10.2
     # via tox
 tomli==1.2.1
-    # via pep517
+    # via build
 toposort==1.6
     # via pip-compile-multi
 tox==3.25.1
-    # via -r integration.in
+    # via -r requirements/integration.in
 virtualenv==20.17.1
     # via
     #   pre-commit
diff --git a/setup.py b/setup.py
index c6850070a0a7..b314614b46b8 100644
--- a/setup.py
+++ b/setup.py
@@ -77,6 +77,7 @@ def get_git_sha() -> str:
         "cachelib>=0.4.1,<0.5",
         "celery>=5.2.2, <6.0.0",
         "click>=8.0.3",
+        "click-option-group",
         "colorama",
         "croniter>=0.3.28",
         "cron-descriptor",
@@ -114,6 +115,7 @@ def get_git_sha() -> str:
         "PyJWT>=2.4.0, <3.0",
         "redis",
         "selenium>=3.141.0",
+        "shortid",
         "sshtunnel>=0.4.0, <0.5",
         "simplejson>=3.15.0",
         "slack_sdk>=3.1.1, <4",
diff --git a/superset/cli/main.py b/superset/cli/main.py
index aaad7be42e86..006f8eb5c9e8 100755
--- a/superset/cli/main.py
+++ b/superset/cli/main.py
@@ -50,9 +50,12 @@ def make_shell_context() -> Dict[str, Any]:
 ):
     module = importlib.import_module(module_name)
     for attribute in module.__dict__.values():
-        if isinstance(attribute, click.core.Command):
+        if isinstance(attribute, (click.core.Command, click.core.Group)):
             superset.add_command(attribute)
 
+            if isinstance(attribute, click.core.Group):
+                break
+
 
 @superset.command()
 @with_appcontext
diff --git a/superset/cli/native_filters.py b/superset/cli/native_filters.py
new file mode 100644
index 000000000000..d6172855be50
--- /dev/null
+++ b/superset/cli/native_filters.py
@@ -0,0 +1,398 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+import json
+from copy import deepcopy
+from textwrap import dedent
+from typing import Set, Tuple
+
+import click
+from click_option_group import optgroup, RequiredMutuallyExclusiveOptionGroup
+from flask.cli import with_appcontext
+from sqlalchemy import Column, ForeignKey, Integer, String, Table, Text
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relationship
+
+from superset import db, is_feature_enabled
+
+Base = declarative_base()
+
+
+dashboard_slices = Table(
+    "dashboard_slices",
+    Base.metadata,
+    Column("id", Integer, primary_key=True),
+    Column("dashboard_id", Integer, ForeignKey("dashboards.id")),
+    Column("slice_id", Integer, ForeignKey("slices.id")),
+)
+
+
+slice_user = Table(
+    "slice_user",
+    Base.metadata,
+    Column("id", Integer, primary_key=True),
+    Column("slice_id", Integer, ForeignKey("slices.id")),
+)
+
+
+class Dashboard(Base):  # type: ignore # pylint: disable=too-few-public-methods
+    __tablename__ = "dashboards"
+
+    id = Column(Integer, primary_key=True)
+    json_metadata = Column(Text)
+    slices = relationship("Slice", secondary=dashboard_slices, backref="dashboards")
+    position_json = Column()
+
+    def __repr__(self) -> str:
+        return f"Dashboard<{self.id}>"
+
+
+class Slice(Base):  # type: ignore # pylint: disable=too-few-public-methods
+    __tablename__ = "slices"
+
+    id = Column(Integer, primary_key=True)
+    datasource_id = Column(Integer)
+    params = Column(Text)
+    slice_name = Column(String(250))
+    viz_type = Column(String(250))
+
+    def __repr__(self) -> str:
+        return f"Slice<{self.id}>"
+
+
+@click.group()
+def native_filters() -> None:
+    """
+    Perform native filter operations.
+    """
+
+
+@native_filters.command()
+@with_appcontext
+@optgroup.group(
+    "Grouped options",
+    cls=RequiredMutuallyExclusiveOptionGroup,
+)
+@optgroup.option(
+    "--all",
+    "all_",
+    default=False,
+    help="Upgrade all dashboards",
+    is_flag=True,
+)
+@optgroup.option(
+    "--id",
+    "dashboard_ids",
+    help="Upgrade the specific dashboard. Can be supplied multiple times.",
+    multiple=True,
+    type=int,
+)
+def upgrade(
+    all_: bool,  # pylint: disable=unused-argument
+    dashboard_ids: Tuple[int, ...],
+) -> None:
+    """
+    Upgrade legacy filter-box charts to native dashboard filters.
+    """
+
+    # pylint: disable=import-outside-toplevel
+    from superset.utils.dashboard_filter_scopes_converter import (
+        convert_filter_scopes_to_native_filters,
+    )
+
+    if not is_feature_enabled("DASHBOARD_NATIVE_FILTERS"):
+        click.echo("The 'DASHBOARD_NATIVE_FILTERS' feature needs to be enabled.")
+        return
+
+    # Mapping between the CHART- and MARKDOWN- IDs.
+    mapping = {}
+
+    for dashboard in (  # pylint: disable=too-many-nested-blocks
+        db.session.query(Dashboard)
+        .filter(*[Dashboard.id.in_(dashboard_ids)] if dashboard_ids else [])
+        .all()
+    ):
+        click.echo(f"Upgrading {str(dashboard)}")
+
+        try:
+            json_metadata = json.loads(dashboard.json_metadata or "{}")
+            position_json = json.loads(dashboard.position_json or "{}")
+
+            if "native_filter_migration" in json_metadata:
+                click.echo(f"{dashboard} has already been upgraded")
+                continue
+
+            # Save the native and legacy filter configurations for recovery purposes.
+            json_metadata["native_filter_migration"] = {
+                key: deepcopy(json_metadata[key])
+                for key in (
+                    "default_filters",
+                    "filter_scopes",
+                    "native_filter_configuration",
+                )
+                if key in json_metadata
+            }
+
+            filter_boxes_by_id = {
+                slc.id: slc for slc in dashboard.slices if slc.viz_type == "filter_box"
+            }
+
+            # Convert the legacy filter configurations to native filters.
+            native_filter_configuration = json_metadata.setdefault(
+                "native_filter_configuration",
+                [],
+            )
+
+            native_filter_configuration.extend(
+                convert_filter_scopes_to_native_filters(
+                    json_metadata,
+                    position_json,
+                    filter_boxes=list(filter_boxes_by_id.values()),
+                ),
+            )
+
+            # Remove the legacy filter configuration.
+            for key in ["default_filters", "filter_scopes"]:
+                json_metadata.pop(key, None)
+
+            # Replace the filter-box charts with markdown elements.
+            for key, value in list(position_json.items()):  # Immutable iteration
+                if (
+                    isinstance(value, dict)
+                    and value["type"] == "CHART"
+                    and value["meta"]["chartId"] in filter_boxes_by_id
+                ):
+                    slc = filter_boxes_by_id[value["meta"]["chartId"]]
+                    mapping[key] = key.replace("CHART-", "MARKDOWN-")
+
+                    value["id"] = mapping[key]
+                    value["type"] = "MARKDOWN"
+
+                    value["meta"]["code"] = dedent(
+                        f"""
+                        &#9888; The <a href="/superset/slice/{slc.id}/">{slc.slice_name}
+                        </a> filter-box chart has been migrated to a native filter.
+
+                        This placeholder markdown element can be safely removed after
+                        verifiying that the native filter have been correct applied,
+                        otherwise ask an admin to revert the migration.
+                        """
+                    )
+
+                    # Save the filter-box info for recovery purposes.
+                    value["meta"]["native_filter_migration"] = {
+                        key: value["meta"].pop(key)
+                        for key in (
+                            "chartId",
+                            "sliceName",
+                            "sliceNameOverride",
+                        )
+                        if key in value["meta"]
+                    }
+
+                    position_json[mapping[key]] = value
+                    del position_json[key]
+
+            # Replace the relevant CHART- references.
+            for value in position_json.values():
+                if isinstance(value, dict):
+                    for relation in ["children", "parents"]:
+                        if relation in value:
+                            for idx, key in enumerate(value[relation]):
+                                if key in mapping:
+                                    value[relation][idx] = mapping[key]
+
+            # Remove the filter-box charts from the dashboard/slice mapping
+            dashboard.slices = [
+                slc for slc in dashboard.slices if slc.viz_type != "filter_box"
+            ]
+
+            dashboard.json_metadata = json.dumps(json_metadata)
+            dashboard.position_json = json.dumps(position_json)
+        except Exception:  # pylint: disable=broad-except
+            click.echo(f"Unable to upgrade {str(dashboard)}")
+
+    db.session.commit()
+    db.session.close()
+
+
+@native_filters.command()
+@with_appcontext
+@optgroup.group(
+    "Grouped options",
+    cls=RequiredMutuallyExclusiveOptionGroup,
+)
+@optgroup.option(
+    "--all",
+    "all_",
+    default=False,
+    help="Downgrade all dashboards",
+    is_flag=True,
+)
+@optgroup.option(
+    "--id",
+    "dashboard_ids",
+    help="Downgrade the specific dashboard. Can be supplied multiple times.",
+    multiple=True,
+    type=int,
+)
+def downgrade(
+    all_: bool,  # pylint: disable=unused-argument
+    dashboard_ids: Tuple[int, ...],
+) -> None:
+    """
+    Downgrade native dashboard filters to legacy filter-box charts (where applicable).
+    """
+
+    # Mapping between the MARKDOWN- and CHART- IDs.
+    mapping = {}
+
+    for dashboard in (  # pylint: disable=too-many-nested-blocks
+        db.session.query(Dashboard)
+        .filter(*[Dashboard.id.in_(dashboard_ids)] if dashboard_ids else [])
+        .all()
+    ):
+        click.echo(f"Downgrading {str(dashboard)}")
+
+        try:
+            json_metadata = json.loads(dashboard.json_metadata or "{}")
+            position_json = json.loads(dashboard.position_json or "{}")
+
+            if "native_filter_migration" not in json_metadata:
+                click.echo(f"{str(dashboard)} has not been upgraded")
+                continue
+
+            # Restore the native and legacy filter configurations.
+            for key in (
+                "default_filters",
+                "filter_scopes",
+                "native_filter_configuration",
+            ):
+                json_metadata.pop(key, None)
+
+            json_metadata.update(json_metadata.pop("native_filter_migration"))
+
+            # Replace the relevant markdown elements with filter-box charts.
+            slice_ids = set()
+
+            for key, value in list(position_json.items()):  # Immutable iteration
+                if (
+                    isinstance(value, dict)
+                    and value["type"] == "MARKDOWN"
+                    and "native_filter_migration" in value["meta"]
+                ):
+                    value["meta"].update(value["meta"].pop("native_filter_migration"))
+                    slice_ids.add(value["meta"]["chartId"])
+                    mapping[key] = key.replace("MARKDOWN-", "CHART-")
+                    value["id"] = mapping[key]
+                    del value["meta"]["code"]
+                    value["type"] = "CHART"
+                    position_json[mapping[key]] = value
+                    del position_json[key]
+
+            # Replace the relevant CHART- references.
+            for value in position_json.values():
+                if isinstance(value, dict):
+                    for relation in ["children", "parents"]:
+                        if relation in value:
+                            for idx, key in enumerate(value[relation]):
+                                if key in mapping:
+                                    value[relation][idx] = mapping[key]
+
+            # Restore the filter-box charts to the dashboard/slice mapping.
+            for slc in db.session.query(Slice).filter(Slice.id.in_(slice_ids)).all():
+                dashboard.slices.append(slc)
+
+            dashboard.json_metadata = json.dumps(json_metadata)
+            dashboard.position_json = json.dumps(position_json)
+        except Exception:  # pylint: disable=broad-except
+            click.echo(f"Unable to downgrade {str(dashboard)}")
+
+    db.session.commit()
+    db.session.close()
+
+
+@native_filters.command()
+@with_appcontext
+@optgroup.group(
+    "Grouped options",
+    cls=RequiredMutuallyExclusiveOptionGroup,
+)
+@optgroup.option(
+    "--all",
+    "all_",
+    default=False,
+    help="Cleanup all dashboards",
+    is_flag=True,
+)
+@optgroup.option(
+    "--id",
+    "dashboard_ids",
+    help="Cleanup the specific dashboard. Can be supplied multiple times.",
+    multiple=True,
+    type=int,
+)
+def cleanup(
+    all_: bool,  # pylint: disable=unused-argument
+    dashboard_ids: Tuple[int, ...],
+) -> None:
+    """
+    Cleanup obsolete legacy filter-box charts and interim metadata.
+
+    Note this operation is irreversible.
+    """
+
+    slice_ids: Set[int] = set()
+
+    # Cleanup the dashboard which contains legacy fields used for downgrading.
+    for dashboard in (
+        db.session.query(Dashboard)
+        .filter(*[Dashboard.id.in_(dashboard_ids)] if dashboard_ids else [])
+        .all()
+    ):
+        click.echo(f"Cleaning up {str(dashboard)}")
+
+        try:
+            json_metadata = json.loads(dashboard.json_metadata or "{}")
+            position_json = json.loads(dashboard.position_json or "{}")
+
+            if "native_filter_migration" not in json_metadata:
+                click.echo(f"{str(dashboard)} has not been upgraded")
+                continue
+
+            # Remove the saved filter configurations.
+            del json_metadata["native_filter_migration"]
+            dashboard.json_metadata = json.dumps(json_metadata)
+
+            for value in position_json.values():
+                if (
+                    isinstance(value, dict)
+                    and "native_filter_migration" in value["meta"]
+                ):
+                    slice_ids.add(value["meta"]["native_filter_migration"]["chartId"])
+                    del value["meta"]["native_filter_migration"]
+
+            dashboard.json_metadata = json.dumps(json_metadata)
+            dashboard.position_json = json.dumps(position_json)
+        except Exception:  # pylint: disable=broad-except
+            click.echo(f"Unable to cleanup {str(dashboard)}")
+
+    # Delete the obsolete filter-box charts associated with the dashboards.
+    db.session.query(slice_user).filter(slice_user.c.slice_id.in_(slice_ids)).delete()
+    db.session.query(Slice).filter(Slice.id.in_(slice_ids)).delete()
+
+    db.session.commit()
+    db.session.close()
diff --git a/superset/dashboards/schemas.py b/superset/dashboards/schemas.py
index 014f5dafd53b..c1f435301cd0 100644
--- a/superset/dashboards/schemas.py
+++ b/superset/dashboards/schemas.py
@@ -134,6 +134,7 @@ class DashboardJSONMetadataSchema(Schema):
     import_time = fields.Integer()
     remote_id = fields.Integer()
     filter_bar_orientation = fields.Str(allow_none=True)
+    native_filter_migration = fields.Dict()
 
     @pre_load
     def remove_show_native_filters(  # pylint: disable=unused-argument, no-self-use
diff --git a/superset/utils/dashboard_filter_scopes_converter.py b/superset/utils/dashboard_filter_scopes_converter.py
index 2e48c114152a..3cc93c967af2 100644
--- a/superset/utils/dashboard_filter_scopes_converter.py
+++ b/superset/utils/dashboard_filter_scopes_converter.py
@@ -19,13 +19,15 @@
 from collections import defaultdict
 from typing import Any, Dict, List
 
+from shortid import ShortId
+
 from superset.models.slice import Slice
 
 logger = logging.getLogger(__name__)
 
 
 def convert_filter_scopes(
-    json_metadata: Dict[Any, Any], filters: List[Slice]
+    json_metadata: Dict[Any, Any], filter_boxes: List[Slice]
 ) -> Dict[int, Dict[str, Dict[str, Any]]]:
     filter_scopes = {}
     immuned_by_id: List[int] = json_metadata.get("filter_immune_slices") or []
@@ -51,10 +53,10 @@ def add_filter_scope(
         else:
             logging.info("slice [%i] has invalid field: %s", filter_id, filter_field)
 
-    for filter_slice in filters:
+    for filter_box in filter_boxes:
         filter_fields: Dict[str, Dict[str, Any]] = {}
-        filter_id = filter_slice.id
-        slice_params = json.loads(filter_slice.params or "{}")
+        filter_id = filter_box.id
+        slice_params = json.loads(filter_box.params or "{}")
         configs = slice_params.get("filter_configs") or []
 
         if slice_params.get("date_filter"):
@@ -88,3 +90,249 @@ def copy_filter_scopes(
                     if int(slice_id) in old_to_new_slc_id_dict
                 ]
     return new_filter_scopes
+
+
+def convert_filter_scopes_to_native_filters(  # pylint: disable=invalid-name,too-many-branches,too-many-locals,too-many-nested-blocks,too-many-statements
+    json_metadata: Dict[str, Any],
+    position_json: Dict[str, Any],
+    filter_boxes: List[Slice],
+) -> List[Dict[str, Any]]:
+    """
+    Convert the legacy filter scopes et al. to the native filter configuration.
+
+    Dashboard filter scopes are implicitly defined where an undefined scope implies
+    no immunity, i.e., they apply to all applicable charts. The `convert_filter_scopes`
+    method provides an explicit definition by extracting the underlying filter-box
+    configurations.
+
+    Hierarchical legacy filters are defined via non-exclusion of peer or children
+    filter-box charts whereas native hierarchical filters are defined via explicit
+    parental relationships, i.e., the inverse.
+
+    :param json_metata: The dashboard metadata
+    :param position_json: The dashboard layout
+    :param filter_boxes: The filter-box charts associated with the dashboard
+    :returns: The native filter configuration
+    :see: convert_filter_scopes
+    """
+
+    shortid = ShortId()
+    default_filters = json.loads(json_metadata.get("default_filters") or "{}")
+    filter_scopes = json_metadata.get("filter_scopes", {})
+    filter_box_ids = {filter_box.id for filter_box in filter_boxes}
+
+    filter_scope_by_key_and_field: Dict[str, Dict[str, Dict[str, Any]]] = defaultdict(
+        dict
+    )
+
+    filter_by_key_and_field: Dict[str, Dict[str, Dict[str, Any]]] = defaultdict(dict)
+
+    # Dense representation of filter scopes, falling back to chart level filter configs
+    # if the respective filter scope is not defined at the dashboard level.
+    for filter_box in filter_boxes:
+        key = str(filter_box.id)
+
+        filter_scope_by_key_and_field[key] = {
+            **(
+                convert_filter_scopes(
+                    json_metadata,
+                    filter_boxes=[filter_box],
+                ).get(filter_box.id, {})
+            ),
+            **(filter_scopes.get(key, {})),
+        }
+
+    # Contruct the native filters.
+    for filter_box in filter_boxes:
+        key = str(filter_box.id)
+        params = json.loads(filter_box.params or "{}")
+
+        for field, filter_scope in filter_scope_by_key_and_field[key].items():
+            default = default_filters.get(key, {}).get(field)
+
+            fltr: Dict[str, Any] = {
+                "cascadeParentIds": [],
+                "id": f"NATIVE_FILTER-{shortid.generate()}",
+                "scope": {
+                    "rootPath": filter_scope["scope"],
+                    "excluded": [
+                        id_
+                        for id_ in filter_scope["immune"]
+                        if id_ not in filter_box_ids
+                    ],
+                },
+                "type": "NATIVE_FILTER",
+            }
+
+            if field == "__time_col" and params.get("show_sqla_time_column"):
+                fltr.update(
+                    {
+                        "filterType": "filter_timecolumn",
+                        "name": "Time Column",
+                        "targets": [{"datasetId": filter_box.datasource_id}],
+                    }
+                )
+
+                if not default:
+                    default = params.get("granularity_sqla")
+
+                if default:
+                    fltr["defaultDataMask"] = {
+                        "extraFormData": {"granularity_sqla": default},
+                        "filterState": {"value": [default]},
+                    }
+            elif field == "__time_grain" and params.get("show_sqla_time_granularity"):
+                fltr.update(
+                    {
+                        "filterType": "filter_timegrain",
+                        "name": "Time Grain",
+                        "targets": [{"datasetId": filter_box.datasource_id}],
+                    }
+                )
+
+                if not default:
+                    default = params.get("time_grain_sqla")
+
+                if default:
+                    fltr["defaultDataMask"] = {
+                        "extraFormData": {"time_grain_sqla": default},
+                        "filterState": {"value": [default]},
+                    }
+            elif field == "__time_range" and params.get("date_filter"):
+                fltr.update(
+                    {
+                        "filterType": "filter_time",
+                        "name": "Time Range",
+                        "targets": [{}],
+                    }
+                )
+
+                if not default:
+                    default = params.get("time_range")
+
+                if default and default != "No filter":
+                    fltr["defaultDataMask"] = {
+                        "extraFormData": {"time_range": default},
+                        "filterState": {"value": default},
+                    }
+            else:
+                for config in params.get("filter_configs") or []:
+                    if config["column"] == field:
+                        fltr.update(
+                            {
+                                "controlValues": {
+                                    "defaultToFirstItem": False,
+                                    "enableEmptyFilter": not config.get(
+                                        "clearable",
+                                        True,
+                                    ),
+                                    "inverseSelection": False,
+                                    "multiSelect": config.get(
+                                        "multiple",
+                                        False,
+                                    ),
+                                    "searchAllOptions": config.get(
+                                        "searchAllOptions",
+                                        False,
+                                    ),
+                                },
+                                "filterType": "filter_select",
+                                "name": config.get("label") or field,
+                                "targets": [
+                                    {
+                                        "column": {"name": field},
+                                        "datasetId": filter_box.datasource_id,
+                                    },
+                                ],
+                            }
+                        )
+
+                        if "metric" in config:
+                            fltr["sortMetric"] = config["metric"]
+                            fltr["controlValues"]["sortAscending"] = config["asc"]
+
+                        if params.get("adhoc_filters"):
+                            fltr["adhoc_filters"] = params["adhoc_filters"]
+
+                        # Pre-filter available values based on time range/column.
+                        time_range = params.get("time_range")
+
+                        if time_range and time_range != "No filter":
+                            fltr.update(
+                                {
+                                    "time_range": time_range,
+                                    "granularity_sqla": params.get("granularity_sqla"),
+                                }
+                            )
+
+                        if not default:
+                            default = config.get("defaultValue")
+
+                            if default:
+                                if config["multiple"]:
+                                    default = default.split(";")
+                                else:
+                                    default = [default]
+
+                        if default:
+                            fltr["defaultDataMask"] = {
+                                "extraFormData": {
+                                    "filters": [
+                                        {
+                                            "col": field,
+                                            "op": "IN",
+                                            "val": default,
+                                        }
+                                    ],
+                                },
+                                "filterState": {"value": default},
+                            }
+
+                        break
+
+            if "filterType" in fltr:
+                filter_by_key_and_field[key][field] = fltr
+
+    # Ancestors of filter-box charts.
+    ancestors_by_id = defaultdict(set)
+
+    for filter_box in filter_boxes:
+        for value in position_json.values():
+            if (
+                isinstance(value, dict)
+                and value["type"] == "CHART"
+                and value["meta"]["chartId"] == filter_box.id
+                and value["parents"]  # Misnomer as this the the complete ancestry.
+            ):
+                ancestors_by_id[filter_box.id] = set(value["parents"])
+
+    # Wire up the hierarchical filters.
+    for this in filter_boxes:
+        for other in filter_boxes:
+            if (
+                this != other
+                and any(  # Immunity is at the chart rather than field level.
+                    this.id not in filter_scope["immune"]
+                    and set(filter_scope["scope"]) <= ancestors_by_id[this.id]
+                    for filter_scope in filter_scope_by_key_and_field[
+                        str(other.id)
+                    ].values()
+                )
+            ):
+                for child in filter_by_key_and_field[str(this.id)].values():
+                    if child["filterType"] == "filter_select":
+                        for parent in filter_by_key_and_field[str(other.id)].values():
+                            if (
+                                parent["filterType"] in {"filter_select", "filter_time"}
+                                and parent["id"] not in child["cascadeParentIds"]
+                            ):
+                                child["cascadeParentIds"].append(parent["id"])
+
+    return sorted(
+        [
+            fltr
+            for key in filter_by_key_and_field
+            for fltr in filter_by_key_and_field[key].values()
+        ],
+        key=lambda fltr: fltr["filterType"],
+    )

From a3c971cbda189074e6ecaebf27d6ae509298afb9 Mon Sep 17 00:00:00 2001
From: Evan Rusackas <evan@preset.io>
Date: Thu, 20 Apr 2023 21:47:31 -0600
Subject: [PATCH 17/47] chore(docs): copy change submitted through BugHerd
 (#23725)

---
 docs/docs/frequently-asked-questions.mdx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/docs/frequently-asked-questions.mdx b/docs/docs/frequently-asked-questions.mdx
index 779f6c8c8dc7..78fd2a0b8d8a 100644
--- a/docs/docs/frequently-asked-questions.mdx
+++ b/docs/docs/frequently-asked-questions.mdx
@@ -24,8 +24,8 @@ will do its own _GROUP BY_ and doing the work twice might slow down performance.
 Whether you use a table or a view, the important factor is whether your database is fast enough to
 serve it in an interactive fashion to provide a good user experience in Superset.
 
-However, if you are using the SQL Lab, there is no such limitation, you can write sql query to join
-multiple tables as long as your db account has access to the tables.
+However, if you are using SQL Lab, there is no such limitation. You can write SQL queries to join
+multiple tables as long as your database account has access to the tables.
 
 ### How BIG can my datasource be?
 

From 295975d16b123819ef4369a63a20845d478115cb Mon Sep 17 00:00:00 2001
From: Evan Rusackas <evan@preset.io>
Date: Thu, 20 Apr 2023 21:47:52 -0600
Subject: [PATCH 18/47] chore(actions): Fix for Chromatic action using
 actions/checkout@v3 (#23759)

---
 .github/workflows/chromatic-master.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/chromatic-master.yml b/.github/workflows/chromatic-master.yml
index 67a9dfac69d2..11e07e6c5ab3 100644
--- a/.github/workflows/chromatic-master.yml
+++ b/.github/workflows/chromatic-master.yml
@@ -53,6 +53,8 @@ jobs:
     # Job steps
     steps:
       - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0 # 👈 Required to retrieve git history
       - name: Install dependencies
         run: npm ci
         working-directory: superset-frontend

From b31efbae7c58fdf665f4910e895b4f9c1d7ebe1b Mon Sep 17 00:00:00 2001
From: Sebastian Liebscher
 <112352529+sebastianliebscher@users.noreply.github.com>
Date: Fri, 21 Apr 2023 08:11:46 +0200
Subject: [PATCH 19/47] chore: remove RemovedInMarshmallow4 warnings (#23704)

---
 superset/advanced_data_type/schemas.py        |   6 +-
 .../annotation_layers/annotations/schemas.py  |  28 +-
 superset/annotation_layers/schemas.py         |  16 +-
 superset/cachekeys/schemas.py                 |  12 +-
 superset/charts/schemas.py                    | 929 +++++++++++-------
 superset/dashboards/permalink/schemas.py      |  18 +-
 superset/dashboards/schemas.py                | 100 +-
 superset/databases/schemas.py                 | 227 +++--
 superset/datasets/schemas.py                  |  36 +-
 superset/db_engine_specs/base.py              |  23 +-
 superset/db_engine_specs/bigquery.py          |   2 +-
 superset/db_engine_specs/clickhouse.py        |  21 +-
 superset/db_engine_specs/databricks.py        |   5 +-
 superset/db_engine_specs/gsheets.py           |   6 +-
 superset/explore/form_data/schemas.py         |  20 +-
 superset/explore/permalink/schemas.py         |  14 +-
 superset/explore/schemas.py                   | 174 ++--
 superset/reports/schemas.py                   | 107 +-
 superset/sqllab/schemas.py                    |  14 +-
 superset/temporary_cache/schemas.py           |   4 +-
 superset/views/base_api.py                    |  18 +-
 superset/views/datasource/schemas.py          |   2 +-
 superset/views/log/schemas.py                 |  23 +-
 23 files changed, 1112 insertions(+), 693 deletions(-)

diff --git a/superset/advanced_data_type/schemas.py b/superset/advanced_data_type/schemas.py
index 2175541b31ac..9c7dd221a193 100644
--- a/superset/advanced_data_type/schemas.py
+++ b/superset/advanced_data_type/schemas.py
@@ -39,8 +39,10 @@ class AdvancedDataTypeSchema(Schema):
     """
 
     error_message = fields.String()
-    values = fields.List(fields.String(description="parsed value (can be any value)"))
+    values = fields.List(
+        fields.String(metadata={"description": "parsed value (can be any value)"})
+    )
     display_value = fields.String(
-        description="The string representation of the parsed values"
+        metadata={"description": "The string representation of the parsed values"}
     )
     valid_filter_operators = fields.List(fields.String())
diff --git a/superset/annotation_layers/annotations/schemas.py b/superset/annotation_layers/annotations/schemas.py
index 5e0bac56f73e..79ea66aad0b5 100644
--- a/superset/annotation_layers/annotations/schemas.py
+++ b/superset/annotation_layers/annotations/schemas.py
@@ -57,22 +57,24 @@ def validate_json(value: Union[bytes, bytearray, str]) -> None:
 
 class AnnotationPostSchema(Schema):
     short_descr = fields.String(
-        description=annotation_short_descr,
+        metadata={"description": annotation_short_descr},
         required=True,
         allow_none=False,
         validate=[Length(1, 500)],
     )
-    long_descr = fields.String(description=annotation_long_descr, allow_none=True)
+    long_descr = fields.String(
+        metadata={"description": annotation_long_descr}, allow_none=True
+    )
     start_dttm = fields.DateTime(
-        description=annotation_start_dttm,
+        metadata={"description": annotation_start_dttm},
         required=True,
         allow_none=False,
     )
     end_dttm = fields.DateTime(
-        description=annotation_end_dttm, required=True, allow_none=False
+        metadata={"description": annotation_end_dttm}, required=True, allow_none=False
     )
     json_metadata = fields.String(
-        description=annotation_json_metadata,
+        metadata={"description": annotation_json_metadata},
         validate=validate_json,
         allow_none=True,
     )
@@ -80,15 +82,21 @@ class AnnotationPostSchema(Schema):
 
 class AnnotationPutSchema(Schema):
     short_descr = fields.String(
-        description=annotation_short_descr, required=False, validate=[Length(1, 500)]
+        metadata={"description": annotation_short_descr},
+        required=False,
+        validate=[Length(1, 500)],
     )
     long_descr = fields.String(
-        description=annotation_long_descr, required=False, allow_none=True
+        metadata={"description": annotation_long_descr}, required=False, allow_none=True
+    )
+    start_dttm = fields.DateTime(
+        metadata={"description": annotation_start_dttm}, required=False
+    )
+    end_dttm = fields.DateTime(
+        metadata={"description": annotation_end_dttm}, required=False
     )
-    start_dttm = fields.DateTime(description=annotation_start_dttm, required=False)
-    end_dttm = fields.DateTime(description=annotation_end_dttm, required=False)
     json_metadata = fields.String(
-        description=annotation_json_metadata,
+        metadata={"description": annotation_json_metadata},
         validate=validate_json,
         required=False,
         allow_none=True,
diff --git a/superset/annotation_layers/schemas.py b/superset/annotation_layers/schemas.py
index 4cd7493a3298..17c3c274cd17 100644
--- a/superset/annotation_layers/schemas.py
+++ b/superset/annotation_layers/schemas.py
@@ -40,13 +40,21 @@
 
 class AnnotationLayerPostSchema(Schema):
     name = fields.String(
-        description=annotation_layer_name, required=True, validate=[Length(1, 250)]
+        metadata={"description": annotation_layer_name},
+        required=True,
+        validate=[Length(1, 250)],
+    )
+    descr = fields.String(
+        metadata={"description": annotation_layer_descr}, allow_none=True
     )
-    descr = fields.String(description=annotation_layer_descr, allow_none=True)
 
 
 class AnnotationLayerPutSchema(Schema):
     name = fields.String(
-        description=annotation_layer_name, required=False, validate=[Length(1, 250)]
+        metadata={"description": annotation_layer_name},
+        required=False,
+        validate=[Length(1, 250)],
+    )
+    descr = fields.String(
+        metadata={"description": annotation_layer_descr}, required=False
     )
-    descr = fields.String(description=annotation_layer_descr, required=False)
diff --git a/superset/cachekeys/schemas.py b/superset/cachekeys/schemas.py
index 3d913e8b5f6e..e58a45ac565b 100644
--- a/superset/cachekeys/schemas.py
+++ b/superset/cachekeys/schemas.py
@@ -27,16 +27,16 @@
 
 class Datasource(Schema):
     database_name = fields.String(
-        description="Datasource name",
+        metadata={"description": "Datasource name"},
     )
     datasource_name = fields.String(
-        description=datasource_name_description,
+        metadata={"description": datasource_name_description},
     )
     schema = fields.String(
-        description="Datasource schema",
+        metadata={"description": "Datasource schema"},
     )
     datasource_type = fields.String(
-        description=datasource_type_description,
+        metadata={"description": datasource_type_description},
         validate=validate.OneOf(choices=[ds.value for ds in DatasourceType]),
         required=True,
     )
@@ -45,9 +45,9 @@ class Datasource(Schema):
 class CacheInvalidationRequestSchema(Schema):
     datasource_uids = fields.List(
         fields.String(),
-        description=datasource_uid_description,
+        metadata={"description": datasource_uid_description},
     )
     datasources = fields.List(
         fields.Nested(Datasource),
-        description="A list of the data source and database names",
+        metadata={"description": "A list of the data source and database names"},
     )
diff --git a/superset/charts/schemas.py b/superset/charts/schemas.py
index 5c345b8ea2f0..e70dbad476e6 100644
--- a/superset/charts/schemas.py
+++ b/superset/charts/schemas.py
@@ -160,18 +160,20 @@ class ChartEntityResponseSchema(Schema):
     Schema for a chart object
     """
 
-    id = fields.Integer(description=id_description)
-    slice_name = fields.String(description=slice_name_description)
-    cache_timeout = fields.Integer(description=cache_timeout_description)
-    changed_on = fields.String(description=changed_on_description)
-    description = fields.String(description=description_description)
+    id = fields.Integer(metadata={"description": id_description})
+    slice_name = fields.String(metadata={"description": slice_name_description})
+    cache_timeout = fields.Integer(metadata={"description": cache_timeout_description})
+    changed_on = fields.String(metadata={"description": changed_on_description})
+    description = fields.String(metadata={"description": description_description})
     description_markeddown = fields.String(
-        description=description_markeddown_description
+        metadata={"description": description_markeddown_description}
+    )
+    form_data = fields.Dict(metadata={"description": form_data_description})
+    slice_url = fields.String(metadata={"description": slice_url_description})
+    certified_by = fields.String(metadata={"description": certified_by_description})
+    certification_details = fields.String(
+        metadata={"description": certification_details_description}
     )
-    form_data = fields.Dict(description=form_data_description)
-    slice_url = fields.String(description=slice_url_description)
-    certified_by = fields.String(description=certified_by_description)
-    certification_details = fields.String(description=certification_details_description)
 
 
 class ChartPostSchema(Schema):
@@ -180,44 +182,58 @@ class ChartPostSchema(Schema):
     """
 
     slice_name = fields.String(
-        description=slice_name_description, required=True, validate=Length(1, 250)
+        metadata={"description": slice_name_description},
+        required=True,
+        validate=Length(1, 250),
+    )
+    description = fields.String(
+        metadata={"description": description_description}, allow_none=True
     )
-    description = fields.String(description=description_description, allow_none=True)
     viz_type = fields.String(
-        description=viz_type_description,
+        metadata={
+            "description": viz_type_description,
+            "example": ["bar", "line_multi", "area", "table"],
+        },
         validate=Length(0, 250),
-        example=["bar", "line_multi", "area", "table"],
     )
-    owners = fields.List(fields.Integer(description=owners_description))
+    owners = fields.List(fields.Integer(metadata={"description": owners_description}))
     params = fields.String(
-        description=params_description, allow_none=True, validate=utils.validate_json
+        metadata={"description": params_description},
+        allow_none=True,
+        validate=utils.validate_json,
     )
     query_context = fields.String(
-        description=query_context_description,
+        metadata={"description": query_context_description},
         allow_none=True,
         validate=utils.validate_json,
     )
     query_context_generation = fields.Boolean(
-        description=query_context_generation_description, allow_none=True
+        metadata={"description": query_context_generation_description}, allow_none=True
     )
     cache_timeout = fields.Integer(
-        description=cache_timeout_description, allow_none=True
+        metadata={"description": cache_timeout_description}, allow_none=True
+    )
+    datasource_id = fields.Integer(
+        metadata={"description": datasource_id_description}, required=True
     )
-    datasource_id = fields.Integer(description=datasource_id_description, required=True)
     datasource_type = fields.String(
-        description=datasource_type_description,
+        metadata={"description": datasource_type_description},
         validate=validate.OneOf(choices=[ds.value for ds in DatasourceType]),
         required=True,
     )
     datasource_name = fields.String(
-        description=datasource_name_description, allow_none=True
+        metadata={"description": datasource_name_description}, allow_none=True
+    )
+    dashboards = fields.List(
+        fields.Integer(metadata={"description": dashboards_description})
+    )
+    certified_by = fields.String(
+        metadata={"description": certified_by_description}, allow_none=True
     )
-    dashboards = fields.List(fields.Integer(description=dashboards_description))
-    certified_by = fields.String(description=certified_by_description, allow_none=True)
     certification_details = fields.String(
-        description=certification_details_description, allow_none=True
+        metadata={"description": certification_details_description}, allow_none=True
     )
-    is_managed_externally = fields.Boolean(allow_none=True, default=False)
+    is_managed_externally = fields.Boolean(allow_none=True, dump_default=False)
     external_url = fields.String(allow_none=True)
 
 
@@ -227,70 +243,87 @@ class ChartPutSchema(Schema):
     """
 
     slice_name = fields.String(
-        description=slice_name_description, allow_none=True, validate=Length(0, 250)
+        metadata={"description": slice_name_description},
+        allow_none=True,
+        validate=Length(0, 250),
+    )
+    description = fields.String(
+        metadata={"description": description_description}, allow_none=True
     )
-    description = fields.String(description=description_description, allow_none=True)
     viz_type = fields.String(
-        description=viz_type_description,
+        metadata={
+            "description": viz_type_description,
+            "example": ["bar", "line_multi", "area", "table"],
+        },
         allow_none=True,
         validate=Length(0, 250),
-        example=["bar", "line_multi", "area", "table"],
     )
-    owners = fields.List(fields.Integer(description=owners_description))
-    params = fields.String(description=params_description, allow_none=True)
+    owners = fields.List(fields.Integer(metadata={"description": owners_description}))
+    params = fields.String(
+        metadata={"description": params_description}, allow_none=True
+    )
     query_context = fields.String(
-        description=query_context_description, allow_none=True
+        metadata={"description": query_context_description}, allow_none=True
     )
     query_context_generation = fields.Boolean(
-        description=query_context_generation_description, allow_none=True
+        metadata={"description": query_context_generation_description}, allow_none=True
     )
     cache_timeout = fields.Integer(
-        description=cache_timeout_description, allow_none=True
+        metadata={"description": cache_timeout_description}, allow_none=True
     )
     datasource_id = fields.Integer(
-        description=datasource_id_description, allow_none=True
+        metadata={"description": datasource_id_description}, allow_none=True
     )
     datasource_type = fields.String(
-        description=datasource_type_description,
+        metadata={"description": datasource_type_description},
         validate=validate.OneOf(choices=[ds.value for ds in DatasourceType]),
         allow_none=True,
     )
-    dashboards = fields.List(fields.Integer(description=dashboards_description))
-    certified_by = fields.String(description=certified_by_description, allow_none=True)
+    dashboards = fields.List(
+        fields.Integer(metadata={"description": dashboards_description})
+    )
+    certified_by = fields.String(
+        metadata={"description": certified_by_description}, allow_none=True
+    )
     certification_details = fields.String(
-        description=certification_details_description, allow_none=True
+        metadata={"description": certification_details_description}, allow_none=True
     )
-    is_managed_externally = fields.Boolean(allow_none=True, default=False)
+    is_managed_externally = fields.Boolean(allow_none=True, dump_default=False)
     external_url = fields.String(allow_none=True)
 
 
 class ChartGetDatasourceObjectDataResponseSchema(Schema):
-    datasource_id = fields.Integer(description="The datasource identifier")
-    datasource_type = fields.Integer(description="The datasource type")
+    datasource_id = fields.Integer(
+        metadata={"description": "The datasource identifier"}
+    )
+    datasource_type = fields.Integer(metadata={"description": "The datasource type"})
 
 
 class ChartGetDatasourceObjectResponseSchema(Schema):
-    label = fields.String(description="The name of the datasource")
+    label = fields.String(metadata={"description": "The name of the datasource"})
     value = fields.Nested(ChartGetDatasourceObjectDataResponseSchema)
 
 
 class ChartGetDatasourceResponseSchema(Schema):
-    count = fields.Integer(description="The total number of datasources")
+    count = fields.Integer(metadata={"description": "The total number of datasources"})
     result = fields.Nested(ChartGetDatasourceObjectResponseSchema)
 
 
 class ChartCacheScreenshotResponseSchema(Schema):
-    cache_key = fields.String(description="The cache key")
-    chart_url = fields.String(description="The url to render the chart")
-    image_url = fields.String(description="The url to fetch the screenshot")
+    cache_key = fields.String(metadata={"description": "The cache key"})
+    chart_url = fields.String(metadata={"description": "The url to render the chart"})
+    image_url = fields.String(
+        metadata={"description": "The url to fetch the screenshot"}
+    )
 
 
 class ChartDataColumnSchema(Schema):
     column_name = fields.String(
-        description="The name of the target column",
-        example="mycol",
+        metadata={"description": "The name of the target column", "example": "mycol"},
+    )
+    type = fields.String(
+        metadata={"description": "Type of target column", "example": "BIGINT"}
     )
-    type = fields.String(description="Type of target column", example="BIGINT")
 
 
 class ChartDataAdhocMetricSchema(Schema):
@@ -299,71 +332,86 @@ class ChartDataAdhocMetricSchema(Schema):
     """
 
     expressionType = fields.String(
-        description="Simple or SQL metric",
+        metadata={"description": "Simple or SQL metric", "example": "SQL"},
         required=True,
         validate=validate.OneOf(choices=("SIMPLE", "SQL")),
-        example="SQL",
     )
     aggregate = fields.String(
-        description="Aggregation operator. Only required for simple expression types.",
+        metadata={
+            "description": "Aggregation operator."
+            "Only required for simple expression types."
+        },
         validate=validate.OneOf(
             choices=("AVG", "COUNT", "COUNT_DISTINCT", "MAX", "MIN", "SUM")
         ),
     )
     column = fields.Nested(ChartDataColumnSchema)
     sqlExpression = fields.String(
-        description="The metric as defined by a SQL aggregate expression. "
-        "Only required for SQL expression type.",
-        example="SUM(weight * observations) / SUM(weight)",
+        metadata={
+            "description": "The metric as defined by a SQL aggregate expression. "
+            "Only required for SQL expression type.",
+            "example": "SUM(weight * observations) / SUM(weight)",
+        },
     )
     label = fields.String(
-        description="Label for the metric. Is automatically generated unless "
-        "hasCustomLabel is true, in which case label must be defined.",
-        example="Weighted observations",
+        metadata={
+            "description": "Label for the metric. Is automatically generated unless"
+            "hasCustomLabel is true, in which case label must be defined.",
+            "example": "Weighted observations",
+        },
     )
     hasCustomLabel = fields.Boolean(
-        description="When false, the label will be automatically generated based on "
-        "the aggregate expression. When true, a custom label has to be "
-        "specified.",
-        example=True,
+        metadata={
+            "description": "When false, the label will be automatically generated based "
+            "on the aggregate expression. When true, a custom label has to be specified.",
+            "example": True,
+        },
     )
     optionName = fields.String(
-        description="Unique identifier. Can be any string value, as long as all "
-        "metrics have a unique identifier. If undefined, a random name "
-        "will be generated.",
-        example="metric_aec60732-fac0-4b17-b736-93f1a5c93e30",
+        metadata={
+            "description": "Unique identifier. Can be any string value, as long as all "
+            "metrics have a unique identifier. If undefined, a random name"
+            "will be generated.",
+            "example": "metric_aec60732-fac0-4b17-b736-93f1a5c93e30",
+        },
     )
     timeGrain = fields.String(
-        description="Optional time grain for temporal filters",
-        example="PT1M",
+        metadata={
+            "description": "Optional time grain for temporal filters",
+            "example": "PT1M",
+        },
     )
     isExtra = fields.Boolean(
-        description="Indicates if the filter has been added by a filter component as "
-        "opposed to being a part of the original query."
+        metadata={
+            "description": "Indicates if the filter has been added by a filter component "
+            "as opposed to being a part of the original query."
+        }
     )
 
 
 class ChartDataAggregateConfigField(fields.Dict):
     def __init__(self) -> None:
         super().__init__(
-            description="The keys are the name of the aggregate column to be created, "
-            "and the values specify the details of how to apply the "
-            "aggregation. If an operator requires additional options, "
-            "these can be passed here to be unpacked in the operator call. The "
-            "following numpy operators are supported: average, argmin, argmax, cumsum, "
-            "cumprod, max, mean, median, nansum, nanmin, nanmax, nanmean, nanmedian, "
-            "min, percentile, prod, product, std, sum, var. Any options required by "
-            "the operator can be passed to the `options` object.\n"
-            "\n"
-            "In the example, a new column `first_quantile` is created based on values "
-            "in the column `my_col` using the `percentile` operator with "
-            "the `q=0.25` parameter.",
-            example={
-                "first_quantile": {
-                    "operator": "percentile",
-                    "column": "my_col",
-                    "options": {"q": 0.25},
-                }
+            metadata={
+                "description": "The keys are the name of the aggregate column to be "
+                "created, and the values specify the details of how to apply the "
+                "aggregation. If an operator requires additional options, "
+                "these can be passed here to be unpacked in the operator call. The "
+                "following numpy operators are supported: average, argmin, argmax, "
+                "cumsum, cumprod, max, mean, median, nansum, nanmin, nanmax, nanmean, "
+                "nanmedian, min, percentile, prod, product, std, sum, var. Any options "
+                "required by the operator can be passed to the `options` object.\n"
+                "\n"
+                "In the example, a new column `first_quantile` is created based on "
+                "values in the column `my_col` using the `percentile` operator with "
+                "the `q=0.25` parameter.",
+                "example": {
+                    "first_quantile": {
+                        "operator": "percentile",
+                        "column": "my_col",
+                        "options": {"q": 0.25},
+                    }
+                },
             },
         )
 
@@ -381,7 +429,7 @@ class ChartDataAggregateOptionsSchema(ChartDataPostProcessingOperationOptionsSch
         fields.List(
             fields.String(
                 allow_none=False,
-                description="Columns by which to group by",
+                metadata={"description": "Columns by which to group by"},
             ),
             minLength=1,
             required=True,
@@ -397,16 +445,21 @@ class ChartDataRollingOptionsSchema(ChartDataPostProcessingOperationOptionsSchem
 
     columns = (
         fields.Dict(
-            description="columns on which to perform rolling, mapping source column to "
-            "target column. For instance, `{'y': 'y'}` will replace the "
-            "column `y` with the rolling value in `y`, while `{'y': 'y2'}` "
-            "will add a column `y2` based on rolling values calculated "
-            "from `y`, leaving the original column `y` unchanged.",
-            example={"weekly_rolling_sales": "sales"},
+            metadata={
+                "description": "columns on which to perform rolling, mapping source "
+                "column to target column. For instance, `{'y': 'y'}` will replace the "
+                "column `y` with the rolling value in `y`, while `{'y': 'y2'}` will add "
+                "a column `y2` based on rolling values calculated from `y`, leaving the "
+                "original column `y` unchanged.",
+                "example": {"weekly_rolling_sales": "sales"},
+            },
         ),
     )
     rolling_type = fields.String(
-        description="Type of rolling window. Any numpy function will work.",
+        metadata={
+            "description": "Type of rolling window. Any numpy function will work.",
+            "example": "percentile",
+        },
         validate=validate.OneOf(
             choices=(
                 "average",
@@ -433,29 +486,35 @@ class ChartDataRollingOptionsSchema(ChartDataPostProcessingOperationOptionsSchem
             )
         ),
         required=True,
-        example="percentile",
     )
     window = fields.Integer(
-        description="Size of the rolling window in days.",
+        metadata={"description": "Size of the rolling window in days.", "example": 7},
         required=True,
-        example=7,
     )
     rolling_type_options = fields.Dict(
-        description="Optional options to pass to rolling method. Needed for "
-        "e.g. quantile operation.",
-        example={},
+        metadata={
+            "description": "Optional options to pass to rolling method. Needed for "
+            "e.g. quantile operation.",
+            "example": {},
+        },
     )
     center = fields.Boolean(
-        description="Should the label be at the center of the window. Default: `false`",
-        example=False,
+        metadata={
+            "description": "Should the label be at the center of the window."
+            "Default: `false`",
+            "example": False,
+        },
     )
     win_type = fields.String(
-        description="Type of window function. See "
-        "[SciPy window functions](https://docs.scipy.org/doc/scipy/reference"
-        "/signal.windows.html#module-scipy.signal.windows) "
-        "for more details. Some window functions require passing "
-        "additional parameters to `rolling_type_options`. For instance, "
-        "to use `gaussian`, the parameter `std` needs to be provided.",
+        metadata={
+            "description": "Type of window function. See "
+            "[SciPy window functions](https://docs.scipy.org/doc/scipy/reference "
+            "/signal.windows.html#module-scipy.signal.windows) "
+            "for more details. Some window functions require passing "
+            "additional parameters to `rolling_type_options`. For instance, "
+            "to use `gaussian`, the parameter `std` needs to be provided."
+            ""
+        },
         validate=validate.OneOf(
             choices=(
                 "boxcar",
@@ -477,9 +536,11 @@ class ChartDataRollingOptionsSchema(ChartDataPostProcessingOperationOptionsSchem
         ),
     )
     min_periods = fields.Integer(
-        description="The minimum amount of periods required for a row to be included "
-        "in the result set.",
-        example=7,
+        metadata={
+            "description": "The minimum amount of periods required for a row to be "
+            "included in the result set.",
+            "example": 7,
+        },
     )
 
 
@@ -490,21 +551,27 @@ class ChartDataSelectOptionsSchema(ChartDataPostProcessingOperationOptionsSchema
 
     columns = fields.List(
         fields.String(),
-        description="Columns which to select from the input data, in the desired "
-        "order. If columns are renamed, the original column name should be "
-        "referenced here.",
-        example=["country", "gender", "age"],
+        metadata={
+            "description": "Columns which to select from the input data, in the desired "
+            "order. If columns are renamed, the original column name should be "
+            "referenced here.",
+            "example": ["country", "gender", "age"],
+        },
     )
     exclude = fields.List(
         fields.String(),
-        description="Columns to exclude from selection.",
-        example=["my_temp_column"],
+        metadata={
+            "description": "Columns to exclude from selection.",
+            "example": ["my_temp_column"],
+        },
     )
     rename = fields.List(
         fields.Dict(),
-        description="columns which to rename, mapping source column to target column. "
-        "For instance, `{'y': 'y2'}` will rename the column `y` to `y2`.",
-        example=[{"age": "average_age"}],
+        metadata={
+            "description": "columns which to rename, mapping source column to target "
+            "column. For instance, `{'y': 'y2'}` will rename the column `y` to `y2`.",
+            "example": [{"age": "average_age"}],
+        },
     )
 
 
@@ -514,9 +581,11 @@ class ChartDataSortOptionsSchema(ChartDataPostProcessingOperationOptionsSchema):
     """
 
     columns = fields.Dict(
-        description="columns by by which to sort. The key specifies the column name, "
-        "value specifies if sorting in ascending order.",
-        example={"country": True, "gender": False},
+        metadata={
+            "description": "columns by by which to sort. The key specifies the column "
+            "name, value specifies if sorting in ascending order.",
+            "example": {"country": True, "gender": False},
+        },
         required=True,
     )
     aggregates = ChartDataAggregateConfigField()
@@ -528,12 +597,14 @@ class ChartDataContributionOptionsSchema(ChartDataPostProcessingOperationOptions
     """
 
     orientation = fields.String(
-        description="Should cell values be calculated across the row or column.",
+        metadata={
+            "description": "Should cell values be calculated across the row or column.",
+            "example": "row",
+        },
         required=True,
         validate=validate.OneOf(
             choices=[val.value for val in PostProcessingContributionOrientation]
         ),
-        example="row",
     )
 
 
@@ -543,9 +614,12 @@ class ChartDataProphetOptionsSchema(ChartDataPostProcessingOperationOptionsSchem
     """
 
     time_grain = fields.String(
-        description="Time grain used to specify time period increments in prediction. "
-        "Supports [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601#Durations) "
-        "durations.",
+        metadata={
+            "description": "Time grain used to specify time period increments in "
+            "prediction. Supports "
+            "[ISO 8601](https://en.wikipedia.org/wiki/ISO_8601#Durations) durations.",
+            "example": "P1D",
+        },
         validate=validate.OneOf(
             choices=[
                 i
@@ -553,17 +627,22 @@ class ChartDataProphetOptionsSchema(ChartDataPostProcessingOperationOptionsSchem
                 if i
             ]
         ),
-        example="P1D",
         required=True,
     )
     periods = fields.Integer(
-        description="Time periods (in units of `time_grain`) to predict into the future",
+        metadata={
+            "description": "Time periods (in units of `time_grain`) to predict into "
+            "the future",
+            "example": 7,
+        },
         min=0,
-        example=7,
         required=True,
     )
     confidence_interval = fields.Float(
-        description="Width of predicted confidence interval",
+        metadata={
+            "description": "Width of predicted confidence interval",
+            "example": 0.8,
+        },
         validate=[
             Range(
                 min=0,
@@ -573,29 +652,34 @@ class ChartDataProphetOptionsSchema(ChartDataPostProcessingOperationOptionsSchem
                 error=_("`confidence_interval` must be between 0 and 1 (exclusive)"),
             )
         ],
-        example=0.8,
         required=True,
     )
     yearly_seasonality = fields.Raw(
         # TODO: add correct union type once supported by Marshmallow
-        description="Should yearly seasonality be applied. "
-        "An integer value will specify Fourier order of seasonality, `None` will "
-        "automatically detect seasonality.",
-        example=False,
+        metadata={
+            "description": "Should yearly seasonality be applied. "
+            "An integer value will specify Fourier order of seasonality, `None` will "
+            "automatically detect seasonality.",
+            "example": False,
+        },
     )
     weekly_seasonality = fields.Raw(
         # TODO: add correct union type once supported by Marshmallow
-        description="Should weekly seasonality be applied. "
-        "An integer value will specify Fourier order of seasonality, `None` will "
-        "automatically detect seasonality.",
-        example=False,
+        metadata={
+            "description": "Should weekly seasonality be applied. "
+            "An integer value will specify Fourier order of seasonality, `None` will "
+            "automatically detect seasonality.",
+            "example": False,
+        },
     )
     monthly_seasonality = fields.Raw(
         # TODO: add correct union type once supported by Marshmallow
-        description="Should monthly seasonality be applied. "
-        "An integer value will specify Fourier order of seasonality, `None` will "
-        "automatically detect seasonality.",
-        example=False,
+        metadata={
+            "description": "Should monthly seasonality be applied. "
+            "An integer value will specify Fourier order of seasonality, `None` will "
+            "automatically detect seasonality.",
+            "example": False,
+        },
     )
 
 
@@ -606,36 +690,40 @@ class ChartDataBoxplotOptionsSchema(ChartDataPostProcessingOperationOptionsSchem
 
     groupby = fields.List(
         fields.String(
-            description="Columns by which to group the query.",
+            metadata={"description": "Columns by which to group the query."},
         ),
         allow_none=True,
     )
 
     metrics = fields.List(
         fields.Raw(),
-        description="Aggregate expressions. Metrics can be passed as both "
-        "references to datasource metrics (strings), or ad-hoc metrics"
-        "which are defined only within the query object. See "
-        "`ChartDataAdhocMetricSchema` for the structure of ad-hoc metrics. "
-        "When metrics is undefined or null, the query is executed without a groupby. "
-        "However, when metrics is an array (length >= 0), a groupby clause is added to "
-        "the query.",
+        metadata={
+            "description": "Aggregate expressions. Metrics can be passed as both "
+            "references to datasource metrics (strings), or ad-hoc metrics"
+            "which are defined only within the query object. See "
+            "`ChartDataAdhocMetricSchema` for the structure of ad-hoc metrics. "
+            "When metrics is undefined or null, the query is executed without a groupby. "
+            "However, when metrics is an array (length >= 0), a groupby clause is added "
+            "to the query."
+        },
         allow_none=True,
     )
 
     whisker_type = fields.String(
-        description="Whisker type. Any numpy function will work.",
+        metadata={
+            "description": "Whisker type. Any numpy function will work.",
+            "example": "tukey",
+        },
         validate=validate.OneOf(
             choices=([val.value for val in PostProcessingBoxplotWhiskerType])
         ),
         required=True,
-        example="tukey",
     )
 
     percentiles = fields.Tuple(
         (
             fields.Float(
-                description="Lower percentile",
+                metadata={"description": "Lower percentile"},
                 validate=[
                     Range(
                         min=0,
@@ -650,7 +738,7 @@ class ChartDataBoxplotOptionsSchema(ChartDataPostProcessingOperationOptionsSchem
                 ],
             ),
             fields.Float(
-                description="Upper percentile",
+                metadata={"description": "Upper percentile"},
                 validate=[
                     Range(
                         min=0,
@@ -665,8 +753,10 @@ class ChartDataBoxplotOptionsSchema(ChartDataPostProcessingOperationOptionsSchem
                 ],
             ),
         ),
-        description="Upper and lower percentiles for percentile whisker type.",
-        example=[1, 99],
+        metadata={
+            "description": "Upper and lower percentiles for percentile whisker type.",
+            "example": [1, 99],
+        },
     )
 
 
@@ -678,30 +768,38 @@ class ChartDataPivotOptionsSchema(ChartDataPostProcessingOperationOptionsSchema)
     index = (
         fields.List(
             fields.String(allow_none=False),
-            description="Columns to group by on the table index (=rows)",
+            metadata={"description": "Columns to group by on the table index (=rows)"},
             minLength=1,
             required=True,
         ),
     )
     columns = fields.List(
         fields.String(allow_none=False),
-        description="Columns to group by on the table columns",
+        metadata={"description": "Columns to group by on the table columns"},
     )
     metric_fill_value = fields.Number(
-        description="Value to replace missing values with in aggregate calculations.",
+        metadata={
+            "description": "Value to replace missing values with in "
+            "aggregate calculations."
+        },
     )
     column_fill_value = fields.String(
-        description="Value to replace missing pivot columns names with."
+        metadata={"description": "Value to replace missing pivot columns names with."}
     )
     drop_missing_columns = fields.Boolean(
-        description="Do not include columns whose entries are all missing "
-        "(default: `true`).",
+        metadata={
+            "description": "Do not include columns whose entries are all missing "
+            "(default: `true`)."
+        },
     )
     marginal_distributions = fields.Boolean(
-        description="Add totals for row/column. (default: `false`)",
+        metadata={"description": "Add totals for row/column. (default: `false`)"},
     )
     marginal_distribution_name = fields.String(
-        description="Name of marginal distribution row/column. (default: `All`)",
+        metadata={
+            "description": "Name of marginal distribution row/column. "
+            "(default: `All`)"
+        },
     )
     aggregates = ChartDataAggregateConfigField()
 
@@ -714,15 +812,15 @@ class ChartDataGeohashDecodeOptionsSchema(
     """
 
     geohash = fields.String(
-        description="Name of source column containing geohash string",
+        metadata={"description": "Name of source column containing geohash string"},
         required=True,
     )
     latitude = fields.String(
-        description="Name of target column for decoded latitude",
+        metadata={"description": "Name of target column for decoded latitude"},
         required=True,
     )
     longitude = fields.String(
-        description="Name of target column for decoded longitude",
+        metadata={"description": "Name of target column for decoded longitude"},
         required=True,
     )
 
@@ -735,15 +833,15 @@ class ChartDataGeohashEncodeOptionsSchema(
     """
 
     latitude = fields.String(
-        description="Name of source latitude column",
+        metadata={"description": "Name of source latitude column"},
         required=True,
     )
     longitude = fields.String(
-        description="Name of source longitude column",
+        metadata={"description": "Name of source longitude column"},
         required=True,
     )
     geohash = fields.String(
-        description="Name of target column for encoded geohash string",
+        metadata={"description": "Name of target column for encoded geohash string"},
         required=True,
     )
 
@@ -756,26 +854,33 @@ class ChartDataGeodeticParseOptionsSchema(
     """
 
     geodetic = fields.String(
-        description="Name of source column containing geodetic point strings",
+        metadata={
+            "description": "Name of source column containing geodetic point strings"
+        },
         required=True,
     )
     latitude = fields.String(
-        description="Name of target column for decoded latitude",
+        metadata={"description": "Name of target column for decoded latitude"},
         required=True,
     )
     longitude = fields.String(
-        description="Name of target column for decoded longitude",
+        metadata={"description": "Name of target column for decoded longitude"},
         required=True,
     )
     altitude = fields.String(
-        description="Name of target column for decoded altitude. If omitted, "
-        "altitude information in geodetic string is ignored.",
+        metadata={
+            "description": "Name of target column for decoded altitude. If omitted, "
+            "altitude information in geodetic string is ignored."
+        },
     )
 
 
 class ChartDataPostProcessingOperationSchema(Schema):
     operation = fields.String(
-        description="Post processing operation type",
+        metadata={
+            "description": "Post processing operation type",
+            "example": "aggregate",
+        },
         required=True,
         validate=validate.OneOf(
             choices=[
@@ -785,24 +890,25 @@ class ChartDataPostProcessingOperationSchema(Schema):
                 )
             ]
         ),
-        example="aggregate",
     )
     options = fields.Dict(
-        description="Options specifying how to perform the operation. Please refer "
-        "to the respective post processing operation option schemas. "
-        "For example, `ChartDataPostProcessingOperationOptions` specifies "
-        "the required options for the pivot operation.",
-        example={
-            "groupby": ["country", "gender"],
-            "aggregates": {
-                "age_q1": {
-                    "operator": "percentile",
-                    "column": "age",
-                    "options": {"q": 0.25},
-                },
-                "age_mean": {
-                    "operator": "mean",
-                    "column": "age",
+        metadata={
+            "description": "Options specifying how to perform the operation. Please "
+            "refer to the respective post processing operation option schemas. "
+            "For example, `ChartDataPostProcessingOperationOptions` specifies "
+            "the required options for the pivot operation.",
+            "example": {
+                "groupby": ["country", "gender"],
+                "aggregates": {
+                    "age_q1": {
+                        "operator": "percentile",
+                        "column": "age",
+                        "options": {"q": 0.25},
+                    },
+                    "age_mean": {
+                        "operator": "mean",
+                        "column": "age",
+                    },
                 },
             },
         },
@@ -811,63 +917,83 @@ class ChartDataPostProcessingOperationSchema(Schema):
 
 class ChartDataFilterSchema(Schema):
     col = fields.Raw(
-        description="The column to filter by. Can be either a string (physical or "
-        "saved expression) or an object (adhoc column)",
+        metadata={
+            "description": "The column to filter by. Can be either a string (physical or "
+            "saved expression) or an object (adhoc column)",
+            "example": "country",
+        },
         required=True,
-        example="country",
     )
     op = fields.String(  # pylint: disable=invalid-name
-        description="The comparison operator.",
+        metadata={"description": "The comparison operator.", "example": "IN"},
         validate=utils.OneOfCaseInsensitive(
             choices=[filter_op.value for filter_op in FilterOperator]
         ),
         required=True,
-        example="IN",
     )
     val = fields.Raw(
-        description="The value or values to compare against. Can be a string, "
-        "integer, decimal, None or list, depending on the operator.",
+        metadata={
+            "description": "The value or values to compare against. Can be a string, "
+            "integer, decimal, None or list, depending on the operator.",
+            "example": ["China", "France", "Japan"],
+        },
         allow_none=True,
-        example=["China", "France", "Japan"],
     )
     grain = fields.String(
-        description="Optional time grain for temporal filters",
-        example="PT1M",
+        metadata={
+            "description": "Optional time grain for temporal filters",
+            "example": "PT1M",
+        },
     )
     isExtra = fields.Boolean(
-        description="Indicates if the filter has been added by a filter component as "
-        "opposed to being a part of the original query."
+        metadata={
+            "description": "Indicates if the filter has been added by a filter "
+            "component as opposed to being a part of the original query."
+        }
     )
 
 
 class ChartDataExtrasSchema(Schema):
     relative_start = fields.String(
-        description="Start time for relative time deltas. "
-        'Default: `config["DEFAULT_RELATIVE_START_TIME"]`',
+        metadata={
+            "description": "Start time for relative time deltas. "
+            'Default: `config["DEFAULT_RELATIVE_START_TIME"]`'
+        },
         validate=validate.OneOf(choices=("today", "now")),
     )
     relative_end = fields.String(
-        description="End time for relative time deltas. "
-        'Default: `config["DEFAULT_RELATIVE_START_TIME"]`',
+        metadata={
+            "description": "End time for relative time deltas. "
+            'Default: `config["DEFAULT_RELATIVE_START_TIME"]`'
+        },
         validate=validate.OneOf(choices=("today", "now")),
     )
     where = fields.String(
-        description="WHERE clause to be added to queries using AND operator.",
+        metadata={
+            "description": "WHERE clause to be added to queries using AND operator."
+        },
     )
     having = fields.String(
-        description="HAVING clause to be added to aggregate queries using "
-        "AND operator.",
+        metadata={
+            "description": "HAVING clause to be added to aggregate queries using "
+            "AND operator."
+        },
     )
     having_druid = fields.List(
         fields.Nested(ChartDataFilterSchema),
-        description="HAVING filters to be added to legacy Druid datasource queries. "
-        "This field is deprecated",
-        deprecated=True,
+        metadata={
+            "description": "HAVING filters to be added to legacy Druid datasource "
+            "queries. This field is deprecated",
+            "deprecated": True,
+        },
     )
     time_grain_sqla = fields.String(
-        description="To what level of granularity should the temporal column be "
-        "aggregated. Supports "
-        "[ISO 8601](https://en.wikipedia.org/wiki/ISO_8601#Durations) durations.",
+        metadata={
+            "description": "To what level of granularity should the temporal column be "
+            "aggregated. Supports "
+            "[ISO 8601](https://en.wikipedia.org/wiki/ISO_8601#Durations) durations.",
+            "example": "P1D",
+        },
         validate=validate.OneOf(
             choices=[
                 i
@@ -875,38 +1001,42 @@ class ChartDataExtrasSchema(Schema):
                 if i
             ]
         ),
-        example="P1D",
         allow_none=True,
     )
 
 
 class AnnotationLayerSchema(Schema):
     annotationType = fields.String(
-        description="Type of annotation layer",
+        metadata={"description": "Type of annotation layer"},
         validate=validate.OneOf(choices=[ann.value for ann in AnnotationType]),
     )
     color = fields.String(
-        description="Layer color",
+        metadata={"description": "Layer color"},
         allow_none=True,
     )
     descriptionColumns = fields.List(
         fields.String(),
-        description="Columns to use as the description. If none are provided, "
-        "all will be shown.",
+        metadata={
+            "description": "Columns to use as the description. If none are provided, "
+            "all will be shown."
+        },
     )
     hideLine = fields.Boolean(
-        description="Should line be hidden. Only applies to line annotations",
+        metadata={
+            "description": "Should line be hidden. Only applies to line annotations"
+        },
         allow_none=True,
     )
     intervalEndColumn = fields.String(
-        description=(
-            "Column containing end of interval. Only applies to interval layers"
-        ),
+        metadata={
+            "description": "Column containing end of interval. "
+            "Only applies to interval layers"
+        },
         allow_none=True,
     )
-    name = fields.String(description="Name of layer", required=True)
+    name = fields.String(metadata={"description": "Name of layer"}, required=True)
     opacity = fields.String(
-        description="Opacity of layer",
+        metadata={"description": "Opacity of layer"},
         validate=validate.OneOf(
             choices=("", "opacityLow", "opacityMedium", "opacityHigh"),
         ),
@@ -915,26 +1045,30 @@ class AnnotationLayerSchema(Schema):
     )
     overrides = fields.Dict(
         keys=fields.String(
-            description="Name of property to be overridden",
+            metadata={"description": "Name of property to be overridden"},
             validate=validate.OneOf(
                 choices=("granularity", "time_grain_sqla", "time_range", "time_shift"),
             ),
         ),
         values=fields.Raw(allow_none=True),
-        description="which properties should be overridable",
+        metadata={"description": "which properties should be overridable"},
         allow_none=True,
     )
-    show = fields.Boolean(description="Should the layer be shown", required=True)
+    show = fields.Boolean(
+        metadata={"description": "Should the layer be shown"}, required=True
+    )
     showLabel = fields.Boolean(
-        description="Should the label always be shown",
+        metadata={"description": "Should the label always be shown"},
         allow_none=True,
     )
     showMarkers = fields.Boolean(
-        description="Should markers be shown. Only applies to line annotations.",
+        metadata={
+            "description": "Should markers be shown. Only applies to line annotations."
+        },
         required=True,
     )
     sourceType = fields.String(
-        description="Type of source for annotation data",
+        metadata={"description": "Type of source for annotation data"},
         validate=validate.OneOf(
             choices=(
                 "",
@@ -945,7 +1079,7 @@ class AnnotationLayerSchema(Schema):
         ),
     )
     style = fields.String(
-        description="Line style. Only applies to time-series annotations",
+        metadata={"description": "Line style. Only applies to time-series annotations"},
         validate=validate.OneOf(
             choices=(
                 "dashed",
@@ -956,15 +1090,15 @@ class AnnotationLayerSchema(Schema):
         ),
     )
     timeColumn = fields.String(
-        description="Column with event date or interval start date",
+        metadata={"description": "Column with event date or interval start date"},
         allow_none=True,
     )
     titleColumn = fields.String(
-        description="Column with title",
+        metadata={"description": "Column with title"},
         allow_none=True,
     )
     width = fields.Float(
-        description="Width of annotation line",
+        metadata={"description": "Width of annotation line"},
         validate=[
             Range(
                 min=0,
@@ -974,8 +1108,10 @@ class AnnotationLayerSchema(Schema):
         ],
     )
     value = fields.Raw(
-        description="For formula annotations, this contains the formula. "
-        "For other types, this is the primary key of the source object.",
+        metadata={
+            "description": "For formula annotations, this contains the formula. "
+            "For other types, this is the primary key of the source object."
+        },
         required=True,
     )
 
@@ -983,11 +1119,11 @@ class AnnotationLayerSchema(Schema):
 class ChartDataDatasourceSchema(Schema):
     description = "Chart datasource"
     id = fields.Integer(
-        description="Datasource id",
+        metadata={"description": "Datasource id"},
         required=True,
     )
     type = fields.String(
-        description="Datasource type",
+        metadata={"description": "Datasource type"},
         validate=validate.OneOf(choices=[ds.value for ds in DatasourceType]),
     )
 
@@ -1001,138 +1137,170 @@ class Meta:  # pylint: disable=too-few-public-methods
 
     annotation_layers = fields.List(
         fields.Nested(AnnotationLayerSchema),
-        description="Annotation layers to apply to chart",
+        metadata={"description": "Annotation layers to apply to chart"},
         allow_none=True,
     )
     applied_time_extras = fields.Dict(
-        description="A mapping of temporal extras that have been applied to the query",
+        metadata={
+            "description": "A mapping of temporal extras that have been applied to "
+            "the query",
+            "example": {"__time_range": "1 year ago : now"},
+        },
         allow_none=True,
-        example={"__time_range": "1 year ago : now"},
     )
     apply_fetch_values_predicate = fields.Boolean(
-        description="Add fetch values predicate (where clause) to query "
-        "if defined in datasource",
+        metadata={
+            "description": "Add fetch values predicate (where clause) to query "
+            "if defined in datasource"
+        },
         allow_none=True,
     )
     filters = fields.List(fields.Nested(ChartDataFilterSchema), allow_none=True)
     granularity = fields.String(
-        description="Name of temporal column used for time filtering. For legacy Druid "
-        "datasources this defines the time grain.",
+        metadata={
+            "description": "Name of temporal column used for time filtering. "
+            "For legacy Druid datasources this defines the time grain."
+        },
         allow_none=True,
     )
     granularity_sqla = fields.String(
-        description="Name of temporal column used for time filtering for SQL "
-        "datasources. This field is deprecated, use `granularity` "
-        "instead.",
+        metadata={
+            "description": "Name of temporal column used for time filtering for SQL "
+            "datasources. This field is deprecated, use `granularity` "
+            "instead.",
+            "deprecated": True,
+        },
         allow_none=True,
-        deprecated=True,
     )
     groupby = fields.List(
         fields.Raw(),
-        description="Columns by which to group the query. "
-        "This field is deprecated, use `columns` instead.",
+        metadata={
+            "description": "Columns by which to group the query. "
+            "This field is deprecated, use `columns` instead."
+        },
         allow_none=True,
     )
     metrics = fields.List(
         fields.Raw(),
-        description="Aggregate expressions. Metrics can be passed as both "
-        "references to datasource metrics (strings), or ad-hoc metrics"
-        "which are defined only within the query object. See "
-        "`ChartDataAdhocMetricSchema` for the structure of ad-hoc metrics.",
+        metadata={
+            "description": "Aggregate expressions. Metrics can be passed as both "
+            "references to datasource metrics (strings), or ad-hoc metrics"
+            "which are defined only within the query object. See "
+            "`ChartDataAdhocMetricSchema` for the structure of ad-hoc metrics."
+        },
         allow_none=True,
     )
     post_processing = fields.List(
         fields.Nested(ChartDataPostProcessingOperationSchema, allow_none=True),
         allow_none=True,
-        description="Post processing operations to be applied to the result set. "
-        "Operations are applied to the result set in sequential order.",
+        metadata={
+            "description": "Post processing operations to be applied to the result set. "
+            "Operations are applied to the result set in sequential order."
+        },
     )
     time_range = fields.String(
-        description="A time rage, either expressed as a colon separated string "
-        "`since : until` or human readable freeform. Valid formats for "
-        "`since` and `until` are: \n"
-        "- ISO 8601\n"
-        "- X days/years/hours/day/year/weeks\n"
-        "- X days/years/hours/day/year/weeks ago\n"
-        "- X days/years/hours/day/year/weeks from now\n"
-        "\n"
-        "Additionally, the following freeform can be used:\n"
-        "\n"
-        "- Last day\n"
-        "- Last week\n"
-        "- Last month\n"
-        "- Last quarter\n"
-        "- Last year\n"
-        "- No filter\n"
-        "- Last X seconds/minutes/hours/days/weeks/months/years\n"
-        "- Next X seconds/minutes/hours/days/weeks/months/years\n",
-        example="Last week",
+        metadata={
+            "description": "A time rage, either expressed as a colon separated string "
+            "`since : until` or human readable freeform. Valid formats for "
+            "`since` and `until` are: \n"
+            "- ISO 8601\n"
+            "- X days/years/hours/day/year/weeks\n"
+            "- X days/years/hours/day/year/weeks ago\n"
+            "- X days/years/hours/day/year/weeks from now\n"
+            "\n"
+            "Additionally, the following freeform can be used:\n"
+            "\n"
+            "- Last day\n"
+            "- Last week\n"
+            "- Last month\n"
+            "- Last quarter\n"
+            "- Last year\n"
+            "- No filter\n"
+            "- Last X seconds/minutes/hours/days/weeks/months/years\n"
+            "- Next X seconds/minutes/hours/days/weeks/months/years\n",
+            "example": "Last week",
+        },
         allow_none=True,
     )
     time_shift = fields.String(
-        description="A human-readable date/time string. "
-        "Please refer to [parsdatetime](https://github.com/bear/parsedatetime) "
-        "documentation for details on valid values.",
+        metadata={
+            "description": "A human-readable date/time string. "
+            "Please refer to [parsdatetime](https://github.com/bear/parsedatetime) "
+            "documentation for details on valid values."
+        },
         allow_none=True,
     )
     is_timeseries = fields.Boolean(
-        description="Is the `query_object` a timeseries.",
+        metadata={"description": "Is the `query_object` a timeseries."},
         allow_none=True,
     )
     series_columns = fields.List(
         fields.Raw(),
-        description="Columns to use when limiting series count. "
-        "All columns must be present in the `columns` property. "
-        "Requires `series_limit` and `series_limit_metric` to be set.",
+        metadata={
+            "description": "Columns to use when limiting series count. "
+            "All columns must be present in the `columns` property. "
+            "Requires `series_limit` and `series_limit_metric` to be set."
+        },
         allow_none=True,
     )
     series_limit = fields.Integer(
-        description="Maximum number of series. "
-        "Requires `series` and `series_limit_metric` to be set.",
+        metadata={
+            "description": "Maximum number of series. "
+            "Requires `series` and `series_limit_metric` to be set."
+        },
         allow_none=True,
     )
     series_limit_metric = fields.Raw(
-        description="Metric used to limit timeseries queries by. "
-        "Requires `series` and `series_limit` to be set.",
+        metadata={
+            "description": "Metric used to limit timeseries queries by. "
+            "Requires `series` and `series_limit` to be set."
+        },
         allow_none=True,
     )
     timeseries_limit = fields.Integer(
-        description="Maximum row count for timeseries queries. "
-        "This field is deprecated, use `series_limit` instead."
-        "Default: `0`",
+        metadata={
+            "description": "Maximum row count for timeseries queries. "
+            "This field is deprecated, use `series_limit` instead."
+            "Default: `0`"
+        },
         allow_none=True,
     )
     timeseries_limit_metric = fields.Raw(
-        description="Metric used to limit timeseries queries by. "
-        "This field is deprecated, use `series_limit_metric` instead.",
+        metadata={
+            "description": "Metric used to limit timeseries queries by. "
+            "This field is deprecated, use `series_limit_metric` instead."
+        },
         allow_none=True,
     )
     row_limit = fields.Integer(
-        description='Maximum row count (0=disabled). Default: `config["ROW_LIMIT"]`',
+        metadata={
+            "description": "Maximum row count (0=disabled). "
+            'Default: `config["ROW_LIMIT"]`'
+        },
         allow_none=True,
         validate=[
             Range(min=0, error=_("`row_limit` must be greater than or equal to 0"))
         ],
     )
     row_offset = fields.Integer(
-        description="Number of rows to skip. Default: `0`",
+        metadata={"description": "Number of rows to skip. Default: `0`"},
         allow_none=True,
         validate=[
             Range(min=0, error=_("`row_offset` must be greater than or equal to 0"))
         ],
     )
     order_desc = fields.Boolean(
-        description="Reverse order. Default: `false`",
+        metadata={"description": "Reverse order. Default: `false`"},
         allow_none=True,
     )
     extras = fields.Nested(
         ChartDataExtrasSchema,
-        description="Extra parameters to add to the query.",
+        metadata={"description": "Extra parameters to add to the query."},
         allow_none=True,
     )
     columns = fields.List(
         fields.Raw(),
-        description="Columns which to select in the query.",
+        metadata={"description": "Columns which to select in the query."},
         allow_none=True,
     )
     orderby = fields.List(
@@ -1147,48 +1315,63 @@ class Meta:  # pylint: disable=too-few-public-methods
                 fields.Boolean(),
             )
         ),
-        description="Expects a list of lists where the first element is the column "
-        "name which to sort by, and the second element is a boolean.",
+        metadata={
+            "description": "Expects a list of lists where the first element is the "
+            "column name which to sort by, and the second element is a boolean.",
+            "example": [("my_col_1", False), ("my_col_2", True)],
+        },
         allow_none=True,
-        example=[("my_col_1", False), ("my_col_2", True)],
     )
     where = fields.String(
-        description="WHERE clause to be added to queries using AND operator."
-        "This field is deprecated and should be passed to `extras`.",
+        metadata={
+            "description": "WHERE clause to be added to queries using AND operator."
+            "This field is deprecated and should be passed to `extras`.",
+            "deprecated": True,
+        },
         allow_none=True,
-        deprecated=True,
     )
     having = fields.String(
-        description="HAVING clause to be added to aggregate queries using "
-        "AND operator. This field is deprecated and should be passed "
-        "to `extras`.",
+        metadata={
+            "description": "HAVING clause to be added to aggregate queries using "
+            "AND operator. This field is deprecated and should be passed "
+            "to `extras`.",
+            "deprecated": True,
+        },
         allow_none=True,
-        deprecated=True,
     )
     having_filters = fields.List(
         fields.Nested(ChartDataFilterSchema),
-        description="HAVING filters to be added to legacy Druid datasource queries. "
-        "This field is deprecated and should be passed to `extras` "
-        "as `having_druid`.",
+        metadata={
+            "description": "HAVING filters to be added to legacy Druid datasource "
+            "queries. This field is deprecated and should be passed to `extras` "
+            "as `having_druid`.",
+            "deprecated": True,
+        },
         allow_none=True,
-        deprecated=True,
     )
     druid_time_origin = fields.String(
-        description="Starting point for time grain counting on legacy Druid "
-        "datasources. Used to change e.g. Monday/Sunday first-day-of-week. "
-        "This field is deprecated and should be passed to `extras` "
-        "as `druid_time_origin`.",
+        metadata={
+            "description": "Starting point for time grain counting on legacy Druid "
+            "datasources. Used to change e.g. Monday/Sunday first-day-of-week. "
+            "This field is deprecated and should be passed to `extras` "
+            "as `druid_time_origin`.",
+            "deprecated": True,
+        },
         allow_none=True,
-        deprecated=True,
     )
     url_params = fields.Dict(
-        description="Optional query parameters passed to a dashboard or Explore view",
-        keys=fields.String(description="The query parameter"),
-        values=fields.String(description="The value of the query parameter"),
+        metadata={
+            "description": "Optional query parameters passed to a dashboard or Explore "
+            " view"
+        },
+        keys=fields.String(metadata={"description": "The query parameter"}),
+        values=fields.String(
+            metadata={"description": "The value of the query parameter"}
+        ),
         allow_none=True,
     )
     is_rowcount = fields.Boolean(
-        description="Should the rowcount of the actual query be returned",
+        metadata={"description": "Should the rowcount of the actual query be returned"},
         allow_none=True,
     )
     time_offsets = fields.List(
@@ -1202,14 +1385,16 @@ class ChartDataQueryContextSchema(Schema):
     datasource = fields.Nested(ChartDataDatasourceSchema)
     queries = fields.List(fields.Nested(ChartDataQueryObjectSchema))
     custom_cache_timeout = fields.Integer(
-        description="Override the default cache timeout",
+        metadata={"description": "Override the default cache timeout"},
         required=False,
         allow_none=True,
     )
 
     force = fields.Boolean(
-        description="Should the queries be forced to load from the source. "
-        "Default: `false`",
+        metadata={
+            "description": "Should the queries be forced to load from the source. "
+            "Default: `false`"
+        },
         allow_none=True,
     )
 
@@ -1236,14 +1421,14 @@ def get_query_context_factory(self) -> QueryContextFactory:
 class AnnotationDataSchema(Schema):
     columns = fields.List(
         fields.String(),
-        description="columns available in the annotation result",
+        metadata={"description": "columns available in the annotation result"},
         required=True,
     )
     records = fields.List(
         fields.Dict(
             keys=fields.String(),
         ),
-        description="records mapping the column name to it's value",
+        metadata={"description": "records mapping the column name to it's value"},
         required=True,
     )
 
@@ -1251,44 +1436,46 @@ class AnnotationDataSchema(Schema):
 class ChartDataResponseResult(Schema):
     annotation_data = fields.List(
         fields.Dict(
-            keys=fields.String(description="Annotation layer name"),
+            keys=fields.String(metadata={"description": "Annotation layer name"}),
             values=fields.String(),
         ),
-        description="All requested annotation data",
+        metadata={"description": "All requested annotation data"},
         allow_none=True,
     )
     cache_key = fields.String(
-        description="Unique cache key for query object",
+        metadata={"description": "Unique cache key for query object"},
         required=True,
         allow_none=True,
     )
     cached_dttm = fields.String(
-        description="Cache timestamp",
+        metadata={"description": "Cache timestamp"},
         required=True,
         allow_none=True,
     )
     cache_timeout = fields.Integer(
-        description="Cache timeout in following order: custom timeout, datasource "
-        "timeout, cache default timeout, config default cache timeout.",
+        metadata={
+            "description": "Cache timeout in following order: custom timeout, datasource "
+            "timeout, cache default timeout, config default cache timeout."
+        },
         required=True,
         allow_none=True,
     )
     error = fields.String(
-        description="Error",
+        metadata={"description": "Error"},
         allow_none=True,
     )
     is_cached = fields.Boolean(
-        description="Is the result cached",
+        metadata={"description": "Is the result cached"},
         required=True,
         allow_none=None,
     )
     query = fields.String(
-        description="The executed query statement",
+        metadata={"description": "The executed query statement"},
         required=True,
         allow_none=False,
     )
     status = fields.String(
-        description="Status of the query",
+        metadata={"description": "Status of the query"},
         validate=validate.OneOf(
             choices=(
                 "stopped",
@@ -1303,71 +1490,83 @@ class ChartDataResponseResult(Schema):
         allow_none=False,
     )
     stacktrace = fields.String(
-        description="Stacktrace if there was an error",
+        metadata={"description": "Stacktrace if there was an error"},
         allow_none=True,
     )
     rowcount = fields.Integer(
-        description="Amount of rows in result set",
+        metadata={"description": "Amount of rows in result set"},
         allow_none=False,
     )
-    data = fields.List(fields.Dict(), description="A list with results")
-    colnames = fields.List(fields.String(), description="A list of column names")
+    data = fields.List(fields.Dict(), metadata={"description": "A list with results"})
+    colnames = fields.List(
+        fields.String(), metadata={"description": "A list of column names"}
+    )
     coltypes = fields.List(
-        fields.Integer(), description="A list of generic data types of each column"
+        fields.Integer(),
+        metadata={"description": "A list of generic data types of each column"},
     )
     applied_filters = fields.List(
-        fields.Dict(), description="A list with applied filters"
+        fields.Dict(), metadata={"description": "A list with applied filters"}
     )
     rejected_filters = fields.List(
-        fields.Dict(), description="A list with rejected filters"
+        fields.Dict(), metadata={"description": "A list with rejected filters"}
     )
     from_dttm = fields.Integer(
-        description="Start timestamp of time range", required=False, allow_none=True
+        metadata={"description": "Start timestamp of time range"},
+        required=False,
+        allow_none=True,
     )
     to_dttm = fields.Integer(
-        description="End timestamp of time range", required=False, allow_none=True
+        metadata={"description": "End timestamp of time range"},
+        required=False,
+        allow_none=True,
     )
 
 
 class ChartDataResponseSchema(Schema):
     result = fields.List(
         fields.Nested(ChartDataResponseResult),
-        description="A list of results for each corresponding query in the request.",
+        metadata={
+            "description": "A list of results for each corresponding query in the "
+            "request."
+        },
     )
 
 
 class ChartDataAsyncResponseSchema(Schema):
     channel_id = fields.String(
-        description="Unique session async channel ID",
+        metadata={"description": "Unique session async channel ID"},
         allow_none=False,
     )
     job_id = fields.String(
-        description="Unique async job ID",
+        metadata={"description": "Unique async job ID"},
         allow_none=False,
     )
     user_id = fields.String(
-        description="Requesting user ID",
+        metadata={"description": "Requesting user ID"},
         allow_none=True,
     )
     status = fields.String(
-        description="Status value for async job",
+        metadata={"description": "Status value for async job"},
         allow_none=False,
     )
     result_url = fields.String(
-        description="Unique result URL for fetching async query data",
+        metadata={"description": "Unique result URL for fetching async query data"},
         allow_none=False,
     )
 
 
 class ChartFavStarResponseResult(Schema):
-    id = fields.Integer(description="The Chart id")
-    value = fields.Boolean(description="The FaveStar value")
+    id = fields.Integer(metadata={"description": "The Chart id"})
+    value = fields.Boolean(metadata={"description": "The FaveStar value"})
 
 
 class GetFavStarIdsSchema(Schema):
     result = fields.List(
         fields.Nested(ChartFavStarResponseResult),
-        description="A list of results for each corresponding chart in the request",
+        metadata={
+            "description": "A list of results for each corresponding chart in the request"
+        },
     )
 
 
@@ -1383,7 +1582,7 @@ class ImportV1ChartSchema(Schema):
     uuid = fields.UUID(required=True)
     version = fields.String(required=True)
     dataset_uuid = fields.UUID(required=True)
-    is_managed_externally = fields.Boolean(allow_none=True, default=False)
+    is_managed_externally = fields.Boolean(allow_none=True, dump_default=False)
     external_url = fields.String(allow_none=True)
 
 
diff --git a/superset/dashboards/permalink/schemas.py b/superset/dashboards/permalink/schemas.py
index ce222d7ed62c..6fc7909cf0d3 100644
--- a/superset/dashboards/permalink/schemas.py
+++ b/superset/dashboards/permalink/schemas.py
@@ -21,30 +21,34 @@ class DashboardPermalinkPostSchema(Schema):
     dataMask = fields.Dict(
         required=False,
         allow_none=True,
-        description="Data mask used for native filter state",
+        metadata={"description": "Data mask used for native filter state"},
     )
     activeTabs = fields.List(
         fields.String(),
         required=False,
         allow_none=True,
-        description="Current active dashboard tabs",
+        metadata={"description": "Current active dashboard tabs"},
     )
     urlParams = fields.List(
         fields.Tuple(
             (
-                fields.String(required=True, allow_none=True, description="Key"),
-                fields.String(required=True, allow_none=True, description="Value"),
+                fields.String(
+                    required=True, allow_none=True, metadata={"description": "Key"}
+                ),
+                fields.String(
+                    required=True, allow_none=True, metadata={"description": "Value"}
+                ),
             ),
             required=False,
             allow_none=True,
-            description="URL Parameter key-value pair",
+            metadata={"description": "URL Parameter key-value pair"},
         ),
         required=False,
         allow_none=True,
-        description="URL Parameters",
+        metadata={"description": "URL Parameters"},
     )
     anchor = fields.String(
         required=False,
         allow_none=True,
-        description="Optional anchor link added to url hash",
+        metadata={"description": "Optional anchor link added to url hash"},
     )
diff --git a/superset/dashboards/schemas.py b/superset/dashboards/schemas.py
index c1f435301cd0..156a3ac1f911 100644
--- a/superset/dashboards/schemas.py
+++ b/superset/dashboards/schemas.py
@@ -129,7 +129,7 @@ class DashboardJSONMetadataSchema(Schema):
     label_colors = fields.Dict()
     shared_label_colors = fields.Dict()
     color_scheme_domain = fields.List(fields.Str())
-    cross_filters_enabled = fields.Boolean(default=True)
+    cross_filters_enabled = fields.Boolean(dump_default=True)
     # used for v0 import/export
     import_time = fields.Integer()
     remote_id = fields.Integer()
@@ -176,24 +176,28 @@ class DashboardGetResponseSchema(Schema):
     id = fields.Int()
     slug = fields.String()
     url = fields.String()
-    dashboard_title = fields.String(description=dashboard_title_description)
+    dashboard_title = fields.String(
+        metadata={"description": dashboard_title_description}
+    )
     thumbnail_url = fields.String()
     published = fields.Boolean()
-    css = fields.String(description=css_description)
-    json_metadata = fields.String(description=json_metadata_description)
-    position_json = fields.String(description=position_json_description)
-    certified_by = fields.String(description=certified_by_description)
-    certification_details = fields.String(description=certification_details_description)
+    css = fields.String(metadata={"description": css_description})
+    json_metadata = fields.String(metadata={"description": json_metadata_description})
+    position_json = fields.String(metadata={"description": position_json_description})
+    certified_by = fields.String(metadata={"description": certified_by_description})
+    certification_details = fields.String(
+        metadata={"description": certification_details_description}
+    )
     changed_by_name = fields.String()
     changed_by_url = fields.String()
     changed_by = fields.Nested(UserSchema)
     changed_on = fields.DateTime()
-    charts = fields.List(fields.String(description=charts_description))
+    charts = fields.List(fields.String(metadata={"description": charts_description}))
     owners = fields.List(fields.Nested(UserSchema))
     roles = fields.List(fields.Nested(RolesSchema))
     tags = fields.Nested(TagSchema, many=True)
     changed_on_humanized = fields.String(data_key="changed_on_delta_humanized")
-    is_managed_externally = fields.Boolean(allow_none=True, default=False)
+    is_managed_externally = fields.Boolean(allow_none=True, dump_default=False)
 
 
 class DatabaseSchema(Schema):
@@ -255,89 +259,107 @@ def post_load(self, data: Dict[str, Any], **kwargs: Any) -> Dict[str, Any]:
 
 class DashboardPostSchema(BaseDashboardSchema):
     dashboard_title = fields.String(
-        description=dashboard_title_description,
+        metadata={"description": dashboard_title_description},
         allow_none=True,
         validate=Length(0, 500),
     )
     slug = fields.String(
-        description=slug_description, allow_none=True, validate=[Length(1, 255)]
+        metadata={"description": slug_description},
+        allow_none=True,
+        validate=[Length(1, 255)],
     )
-    owners = fields.List(fields.Integer(description=owners_description))
-    roles = fields.List(fields.Integer(description=roles_description))
+    owners = fields.List(fields.Integer(metadata={"description": owners_description}))
+    roles = fields.List(fields.Integer(metadata={"description": roles_description}))
     position_json = fields.String(
-        description=position_json_description, validate=validate_json
+        metadata={"description": position_json_description}, validate=validate_json
     )
-    css = fields.String(description=css_description)
+    css = fields.String(metadata={"description": css_description})
     json_metadata = fields.String(
-        description=json_metadata_description,
+        metadata={"description": json_metadata_description},
         validate=validate_json_metadata,
     )
-    published = fields.Boolean(description=published_description)
-    certified_by = fields.String(description=certified_by_description, allow_none=True)
+    published = fields.Boolean(metadata={"description": published_description})
+    certified_by = fields.String(
+        metadata={"description": certified_by_description}, allow_none=True
+    )
     certification_details = fields.String(
-        description=certification_details_description, allow_none=True
+        metadata={"description": certification_details_description}, allow_none=True
     )
-    is_managed_externally = fields.Boolean(allow_none=True, default=False)
+    is_managed_externally = fields.Boolean(allow_none=True, dump_default=False)
     external_url = fields.String(allow_none=True)
 
 
 class DashboardCopySchema(Schema):
     dashboard_title = fields.String(
-        description=dashboard_title_description,
+        metadata={"description": dashboard_title_description},
         allow_none=True,
         validate=Length(0, 500),
     )
-    css = fields.String(description=css_description)
+    css = fields.String(metadata={"description": css_description})
     json_metadata = fields.String(
-        description=json_metadata_description,
+        metadata={"description": json_metadata_description},
         validate=validate_json_metadata,
         required=True,
     )
     duplicate_slices = fields.Boolean(
-        description="Whether or not to also copy all charts on the dashboard"
+        metadata={
+            "description": "Whether or not to also copy all charts on the dashboard"
+        }
     )
 
 
 class DashboardPutSchema(BaseDashboardSchema):
     dashboard_title = fields.String(
-        description=dashboard_title_description,
+        metadata={"description": dashboard_title_description},
         allow_none=True,
         validate=Length(0, 500),
     )
     slug = fields.String(
-        description=slug_description, allow_none=True, validate=Length(0, 255)
+        metadata={"description": slug_description},
+        allow_none=True,
+        validate=Length(0, 255),
     )
     owners = fields.List(
-        fields.Integer(description=owners_description, allow_none=True)
+        fields.Integer(metadata={"description": owners_description}, allow_none=True)
+    )
+    roles = fields.List(
+        fields.Integer(metadata={"description": roles_description}, allow_none=True)
     )
-    roles = fields.List(fields.Integer(description=roles_description, allow_none=True))
     position_json = fields.String(
-        description=position_json_description, allow_none=True, validate=validate_json
+        metadata={"description": position_json_description},
+        allow_none=True,
+        validate=validate_json,
     )
-    css = fields.String(description=css_description, allow_none=True)
+    css = fields.String(metadata={"description": css_description}, allow_none=True)
     json_metadata = fields.String(
-        description=json_metadata_description,
+        metadata={"description": json_metadata_description},
         allow_none=True,
         validate=validate_json_metadata,
     )
-    published = fields.Boolean(description=published_description, allow_none=True)
-    certified_by = fields.String(description=certified_by_description, allow_none=True)
+    published = fields.Boolean(
+        metadata={"description": published_description}, allow_none=True
+    )
+    certified_by = fields.String(
+        metadata={"description": certified_by_description}, allow_none=True
+    )
     certification_details = fields.String(
-        description=certification_details_description, allow_none=True
+        metadata={"description": certification_details_description}, allow_none=True
     )
-    is_managed_externally = fields.Boolean(allow_none=True, default=False)
+    is_managed_externally = fields.Boolean(allow_none=True, dump_default=False)
     external_url = fields.String(allow_none=True)
 
 
 class ChartFavStarResponseResult(Schema):
-    id = fields.Integer(description="The Chart id")
-    value = fields.Boolean(description="The FaveStar value")
+    id = fields.Integer(metadata={"description": "The Chart id"})
+    value = fields.Boolean(metadata={"description": "The FaveStar value"})
 
 
 class GetFavStarIdsSchema(Schema):
     result = fields.List(
         fields.Nested(ChartFavStarResponseResult),
-        description="A list of results for each corresponding chart in the request",
+        metadata={
+            "description": "A list of results for each corresponding chart in the request"
+        },
     )
 
 
@@ -350,7 +372,7 @@ class ImportV1DashboardSchema(Schema):
     position = fields.Dict()
     metadata = fields.Dict()
     version = fields.String(required=True)
-    is_managed_externally = fields.Boolean(allow_none=True, default=False)
+    is_managed_externally = fields.Boolean(allow_none=True, dump_default=False)
     external_url = fields.String(allow_none=True)
 
 
diff --git a/superset/databases/schemas.py b/superset/databases/schemas.py
index 7a1e99404ffe..e1e38667c033 100644
--- a/superset/databases/schemas.py
+++ b/superset/databases/schemas.py
@@ -243,18 +243,22 @@ class DatabaseParametersSchemaMixin:  # pylint: disable=too-few-public-methods
     When using this mixin make sure that `sqlalchemy_uri` is not required.
     """
 
-    engine = fields.String(allow_none=True, description="SQLAlchemy engine to use")
-    driver = fields.String(allow_none=True, description="SQLAlchemy driver to use")
+    engine = fields.String(
+        allow_none=True, metadata={"description": "SQLAlchemy engine to use"}
+    )
+    driver = fields.String(
+        allow_none=True, metadata={"description": "SQLAlchemy driver to use"}
+    )
     parameters = fields.Dict(
         keys=fields.String(),
         values=fields.Raw(),
-        description="DB-specific parameters for configuration",
+        metadata={"description": "DB-specific parameters for configuration"},
     )
     configuration_method = EnumField(
         ConfigurationMethod,
         by_value=True,
-        description=configuration_method_description,
-        missing=ConfigurationMethod.SQLALCHEMY_FORM,
+        metadata={"description": configuration_method_description},
+        load_default=ConfigurationMethod.SQLALCHEMY_FORM,
     )
 
     @pre_load
@@ -341,33 +345,45 @@ class Meta:  # pylint: disable=too-few-public-methods
 
     rename_encrypted_extra = pre_load(rename_encrypted_extra)
 
-    id = fields.Integer(allow_none=True, description="Database ID (for updates)")
-    engine = fields.String(required=True, description="SQLAlchemy engine to use")
-    driver = fields.String(allow_none=True, description="SQLAlchemy driver to use")
+    id = fields.Integer(
+        allow_none=True, metadata={"description": "Database ID (for updates)"}
+    )
+    engine = fields.String(
+        required=True, metadata={"description": "SQLAlchemy engine to use"}
+    )
+    driver = fields.String(
+        allow_none=True, metadata={"description": "SQLAlchemy driver to use"}
+    )
     parameters = fields.Dict(
         keys=fields.String(),
         values=fields.Raw(allow_none=True),
-        description="DB-specific parameters for configuration",
+        metadata={"description": "DB-specific parameters for configuration"},
     )
     catalog = fields.Dict(
         keys=fields.String(),
         values=fields.Raw(allow_none=True),
-        description="Gsheets specific column for managing label to sheet urls",
+        metadata={
+            "description": "Gsheets specific column for managing label to sheet urls"
+        },
     )
     database_name = fields.String(
-        description=database_name_description,
+        metadata={"description": database_name_description},
         allow_none=True,
         validate=Length(1, 250),
     )
-    impersonate_user = fields.Boolean(description=impersonate_user_description)
-    extra = fields.String(description=extra_description, validate=extra_validator)
+    impersonate_user = fields.Boolean(
+        metadata={"description": impersonate_user_description}
+    )
+    extra = fields.String(
+        metadata={"description": extra_description}, validate=extra_validator
+    )
     masked_encrypted_extra = fields.String(
-        description=encrypted_extra_description,
+        metadata={"description": encrypted_extra_description},
         validate=encrypted_extra_validator,
         allow_none=True,
     )
     server_cert = fields.String(
-        description=server_cert_description,
+        metadata={"description": server_cert_description},
         allow_none=True,
         validate=server_cert_validator,
     )
@@ -375,12 +391,14 @@ class Meta:  # pylint: disable=too-few-public-methods
         ConfigurationMethod,
         by_value=True,
         required=True,
-        description=configuration_method_description,
+        metadata={"description": configuration_method_description},
     )
 
 
 class DatabaseSSHTunnel(Schema):
-    id = fields.Integer(allow_none=True, description="SSH Tunnel ID (for updates)")
+    id = fields.Integer(
+        allow_none=True, metadata={"description": "SSH Tunnel ID (for updates)"}
+    )
     server_address = fields.String()
     server_port = fields.Integer()
     username = fields.String()
@@ -400,41 +418,51 @@ class Meta:  # pylint: disable=too-few-public-methods
     rename_encrypted_extra = pre_load(rename_encrypted_extra)
 
     database_name = fields.String(
-        description=database_name_description,
+        metadata={"description": database_name_description},
         required=True,
         validate=Length(1, 250),
     )
     cache_timeout = fields.Integer(
-        description=cache_timeout_description, allow_none=True
-    )
-    expose_in_sqllab = fields.Boolean(description=expose_in_sqllab_description)
-    allow_run_async = fields.Boolean(description=allow_run_async_description)
-    allow_file_upload = fields.Boolean(description=allow_file_upload_description)
-    allow_ctas = fields.Boolean(description=allow_ctas_description)
-    allow_cvas = fields.Boolean(description=allow_cvas_description)
-    allow_dml = fields.Boolean(description=allow_dml_description)
+        metadata={"description": cache_timeout_description}, allow_none=True
+    )
+    expose_in_sqllab = fields.Boolean(
+        metadata={"description": expose_in_sqllab_description}
+    )
+    allow_run_async = fields.Boolean(
+        metadata={"description": allow_run_async_description}
+    )
+    allow_file_upload = fields.Boolean(
+        metadata={"description": allow_file_upload_description}
+    )
+    allow_ctas = fields.Boolean(metadata={"description": allow_ctas_description})
+    allow_cvas = fields.Boolean(metadata={"description": allow_cvas_description})
+    allow_dml = fields.Boolean(metadata={"description": allow_dml_description})
     force_ctas_schema = fields.String(
-        description=force_ctas_schema_description,
+        metadata={"description": force_ctas_schema_description},
         allow_none=True,
         validate=Length(0, 250),
     )
-    impersonate_user = fields.Boolean(description=impersonate_user_description)
+    impersonate_user = fields.Boolean(
+        metadata={"description": impersonate_user_description}
+    )
     masked_encrypted_extra = fields.String(
-        description=encrypted_extra_description,
+        metadata={"description": encrypted_extra_description},
         validate=encrypted_extra_validator,
         allow_none=True,
     )
-    extra = fields.String(description=extra_description, validate=extra_validator)
+    extra = fields.String(
+        metadata={"description": extra_description}, validate=extra_validator
+    )
     server_cert = fields.String(
-        description=server_cert_description,
+        metadata={"description": server_cert_description},
         allow_none=True,
         validate=server_cert_validator,
     )
     sqlalchemy_uri = fields.String(
-        description=sqlalchemy_uri_description,
+        metadata={"description": sqlalchemy_uri_description},
         validate=[Length(1, 1024), sqlalchemy_uri_validator],
     )
-    is_managed_externally = fields.Boolean(allow_none=True, default=False)
+    is_managed_externally = fields.Boolean(allow_none=True, dump_default=False)
     external_url = fields.String(allow_none=True)
     uuid = fields.String(required=False)
     ssh_tunnel = fields.Nested(DatabaseSSHTunnel, allow_none=True)
@@ -447,41 +475,51 @@ class Meta:  # pylint: disable=too-few-public-methods
     rename_encrypted_extra = pre_load(rename_encrypted_extra)
 
     database_name = fields.String(
-        description=database_name_description,
+        metadata={"description": database_name_description},
         allow_none=True,
         validate=Length(1, 250),
     )
     cache_timeout = fields.Integer(
-        description=cache_timeout_description, allow_none=True
-    )
-    expose_in_sqllab = fields.Boolean(description=expose_in_sqllab_description)
-    allow_run_async = fields.Boolean(description=allow_run_async_description)
-    allow_file_upload = fields.Boolean(description=allow_file_upload_description)
-    allow_ctas = fields.Boolean(description=allow_ctas_description)
-    allow_cvas = fields.Boolean(description=allow_cvas_description)
-    allow_dml = fields.Boolean(description=allow_dml_description)
+        metadata={"description": cache_timeout_description}, allow_none=True
+    )
+    expose_in_sqllab = fields.Boolean(
+        metadata={"description": expose_in_sqllab_description}
+    )
+    allow_run_async = fields.Boolean(
+        metadata={"description": allow_run_async_description}
+    )
+    allow_file_upload = fields.Boolean(
+        metadata={"description": allow_file_upload_description}
+    )
+    allow_ctas = fields.Boolean(metadata={"description": allow_ctas_description})
+    allow_cvas = fields.Boolean(metadata={"description": allow_cvas_description})
+    allow_dml = fields.Boolean(metadata={"description": allow_dml_description})
     force_ctas_schema = fields.String(
-        description=force_ctas_schema_description,
+        metadata={"description": force_ctas_schema_description},
         allow_none=True,
         validate=Length(0, 250),
     )
-    impersonate_user = fields.Boolean(description=impersonate_user_description)
+    impersonate_user = fields.Boolean(
+        metadata={"description": impersonate_user_description}
+    )
     masked_encrypted_extra = fields.String(
-        description=encrypted_extra_description,
+        metadata={"description": encrypted_extra_description},
         allow_none=True,
         validate=encrypted_extra_validator,
     )
-    extra = fields.String(description=extra_description, validate=extra_validator)
+    extra = fields.String(
+        metadata={"description": extra_description}, validate=extra_validator
+    )
     server_cert = fields.String(
-        description=server_cert_description,
+        metadata={"description": server_cert_description},
         allow_none=True,
         validate=server_cert_validator,
     )
     sqlalchemy_uri = fields.String(
-        description=sqlalchemy_uri_description,
+        metadata={"description": sqlalchemy_uri_description},
         validate=[Length(0, 1024), sqlalchemy_uri_validator],
     )
-    is_managed_externally = fields.Boolean(allow_none=True, default=False)
+    is_managed_externally = fields.Boolean(allow_none=True, dump_default=False)
     external_url = fields.String(allow_none=True)
     ssh_tunnel = fields.Nested(DatabaseSSHTunnel, allow_none=True)
     uuid = fields.String(required=False)
@@ -491,24 +529,28 @@ class DatabaseTestConnectionSchema(Schema, DatabaseParametersSchemaMixin):
     rename_encrypted_extra = pre_load(rename_encrypted_extra)
 
     database_name = fields.String(
-        description=database_name_description,
+        metadata={"description": database_name_description},
         allow_none=True,
         validate=Length(1, 250),
     )
-    impersonate_user = fields.Boolean(description=impersonate_user_description)
-    extra = fields.String(description=extra_description, validate=extra_validator)
+    impersonate_user = fields.Boolean(
+        metadata={"description": impersonate_user_description}
+    )
+    extra = fields.String(
+        metadata={"description": extra_description}, validate=extra_validator
+    )
     masked_encrypted_extra = fields.String(
-        description=encrypted_extra_description,
+        metadata={"description": encrypted_extra_description},
         validate=encrypted_extra_validator,
         allow_none=True,
     )
     server_cert = fields.String(
-        description=server_cert_description,
+        metadata={"description": server_cert_description},
         allow_none=True,
         validate=server_cert_validator,
     )
     sqlalchemy_uri = fields.String(
-        description=sqlalchemy_uri_description,
+        metadata={"description": sqlalchemy_uri_description},
         validate=[Length(1, 1024), sqlalchemy_uri_validator],
     )
 
@@ -524,20 +566,27 @@ class TableMetadataOptionsResponseSchema(Schema):
 
 
 class TableMetadataColumnsResponseSchema(Schema):
-    keys = fields.List(fields.String(), description="")
-    longType = fields.String(description="The actual backend long type for the column")
-    name = fields.String(description="The column name")
-    type = fields.String(description="The column type")
+    keys = fields.List(fields.String(), metadata={"description": ""})
+    longType = fields.String(
+        metadata={"description": "The actual backend long type for the column"}
+    )
+    name = fields.String(metadata={"description": "The column name"})
+    type = fields.String(metadata={"description": "The column type"})
     duplicates_constraint = fields.String(required=False)
 
 
 class TableMetadataForeignKeysIndexesResponseSchema(Schema):
     column_names = fields.List(
         fields.String(
-            description="A list of column names that compose the foreign key or index"
+            metadata={
+                "description": "A list of column names that compose the foreign key or "
+                " index"
+            }
         )
     )
-    name = fields.String(description="The name of the foreign key or index")
+    name = fields.String(
+        metadata={"description": "The name of the foreign key or index"}
+    )
     options = fields.Nested(TableMetadataOptionsResponseSchema)
     referred_columns = fields.List(fields.String())
     referred_schema = fields.String()
@@ -547,30 +596,35 @@ class TableMetadataForeignKeysIndexesResponseSchema(Schema):
 
 class TableMetadataPrimaryKeyResponseSchema(Schema):
     column_names = fields.List(
-        fields.String(description="A list of column names that compose the primary key")
+        fields.String(
+            metadata={
+                "description": "A list of column names that compose the primary key"
+            }
+        )
     )
-    name = fields.String(description="The primary key index name")
+    name = fields.String(metadata={"description": "The primary key index name"})
     type = fields.String()
 
 
 class TableMetadataResponseSchema(Schema):
-    name = fields.String(description="The name of the table")
+    name = fields.String(metadata={"description": "The name of the table"})
     columns = fields.List(
         fields.Nested(TableMetadataColumnsResponseSchema),
-        description="A list of columns and their metadata",
+        metadata={"description": "A list of columns and their metadata"},
     )
     foreignKeys = fields.List(
         fields.Nested(TableMetadataForeignKeysIndexesResponseSchema),
-        description="A list of foreign keys and their metadata",
+        metadata={"description": "A list of foreign keys and their metadata"},
     )
     indexes = fields.List(
         fields.Nested(TableMetadataForeignKeysIndexesResponseSchema),
-        description="A list of indexes and their metadata",
+        metadata={"description": "A list of indexes and their metadata"},
     )
     primaryKey = fields.Nested(
-        TableMetadataPrimaryKeyResponseSchema, description="Primary keys metadata"
+        TableMetadataPrimaryKeyResponseSchema,
+        metadata={"description": "Primary keys metadata"},
     )
-    selectStar = fields.String(description="SQL select star")
+    selectStar = fields.String(metadata={"description": "SQL select star"})
 
 
 class TableExtraMetadataResponseSchema(Schema):
@@ -580,21 +634,27 @@ class TableExtraMetadataResponseSchema(Schema):
 
 
 class SelectStarResponseSchema(Schema):
-    result = fields.String(description="SQL select star")
+    result = fields.String(metadata={"description": "SQL select star"})
 
 
 class SchemasResponseSchema(Schema):
-    result = fields.List(fields.String(description="A database schema name"))
+    result = fields.List(
+        fields.String(metadata={"description": "A database schema name"})
+    )
 
 
 class DatabaseTablesResponse(Schema):
-    extra = fields.Dict(description="Extra data used to specify column metadata")
-    type = fields.String(description="table or view")
-    value = fields.String(description="The table or view name")
+    extra = fields.Dict(
+        metadata={"description": "Extra data used to specify column metadata"}
+    )
+    type = fields.String(metadata={"description": "table or view"})
+    value = fields.String(metadata={"description": "The table or view name"})
 
 
 class ValidateSQLRequest(Schema):
-    sql = fields.String(required=True, description="SQL statement to validate")
+    sql = fields.String(
+        required=True, metadata={"description": "SQL statement to validate"}
+    )
     schema = fields.String(required=False, allow_none=True)
     template_params = fields.Dict(required=False, allow_none=True)
 
@@ -620,16 +680,18 @@ class DatabaseRelatedDashboard(Schema):
 
 
 class DatabaseRelatedCharts(Schema):
-    count = fields.Integer(description="Chart count")
+    count = fields.Integer(metadata={"description": "Chart count"})
     result = fields.List(
-        fields.Nested(DatabaseRelatedChart), description="A list of dashboards"
+        fields.Nested(DatabaseRelatedChart),
+        metadata={"description": "A list of dashboards"},
     )
 
 
 class DatabaseRelatedDashboards(Schema):
-    count = fields.Integer(description="Dashboard count")
+    count = fields.Integer(metadata={"description": "Dashboard count"})
     result = fields.List(
-        fields.Nested(DatabaseRelatedDashboard), description="A list of dashboards"
+        fields.Nested(DatabaseRelatedDashboard),
+        metadata={"description": "A list of dashboards"},
     )
 
 
@@ -708,7 +770,7 @@ def fix_allow_csv_upload(
     extra = fields.Nested(ImportV1DatabaseExtraSchema)
     uuid = fields.UUID(required=True)
     version = fields.String(required=True)
-    is_managed_externally = fields.Boolean(allow_none=True, default=False)
+    is_managed_externally = fields.Boolean(allow_none=True, dump_default=False)
     external_url = fields.String(allow_none=True)
     ssh_tunnel = fields.Nested(DatabaseSSHTunnel, allow_none=True)
 
@@ -813,5 +875,8 @@ def encrypted_field_properties(self, field: Any, **_) -> Dict[str, Any]:  # type
 class DatabaseSchemaAccessForFileUploadResponse(Schema):
     schemas = fields.List(
         fields.String(),
-        description="The list of schemas allowed for the database to upload information",
+        metadata={
+            "description": "The list of schemas allowed for the database to upload "
+            "information"
+        },
     )
diff --git a/superset/datasets/schemas.py b/superset/datasets/schemas.py
index 1d49bc1cfb43..eaf5963fdf32 100644
--- a/superset/datasets/schemas.py
+++ b/superset/datasets/schemas.py
@@ -49,14 +49,14 @@ class DatasetColumnsPutSchema(Schema):
     column_name = fields.String(required=True, validate=Length(1, 255))
     type = fields.String(allow_none=True)
     advanced_data_type = fields.String(allow_none=True, validate=Length(1, 255))
-    verbose_name = fields.String(allow_none=True, Length=(1, 1024))
+    verbose_name = fields.String(allow_none=True, metadata={Length: (1, 1024)})
     description = fields.String(allow_none=True)
     expression = fields.String(allow_none=True)
     extra = fields.String(allow_none=True)
     filterable = fields.Boolean()
     groupby = fields.Boolean()
     is_active = fields.Boolean(allow_none=True)
-    is_dttm = fields.Boolean(default=False)
+    is_dttm = fields.Boolean(dump_default=False)
     python_date_format = fields.String(
         allow_none=True, validate=[Length(1, 255), validate_python_date_format]
     )
@@ -71,7 +71,7 @@ class DatasetMetricsPutSchema(Schema):
     metric_name = fields.String(required=True, validate=Length(1, 255))
     metric_type = fields.String(allow_none=True, validate=Length(1, 32))
     d3format = fields.String(allow_none=True, validate=Length(1, 128))
-    verbose_name = fields.String(allow_none=True, Length=(1, 1024))
+    verbose_name = fields.String(allow_none=True, metadata={Length: (1, 1024)})
     warning_text = fields.String(allow_none=True)
     uuid = fields.UUID(allow_none=True)
 
@@ -82,7 +82,7 @@ class DatasetPostSchema(Schema):
     table_name = fields.String(required=True, allow_none=False, validate=Length(1, 250))
     sql = fields.String(allow_none=True)
     owners = fields.List(fields.Integer())
-    is_managed_externally = fields.Boolean(allow_none=True, default=False)
+    is_managed_externally = fields.Boolean(allow_none=True, dump_default=False)
     external_url = fields.String(allow_none=True)
 
 
@@ -104,7 +104,7 @@ class DatasetPutSchema(Schema):
     columns = fields.List(fields.Nested(DatasetColumnsPutSchema))
     metrics = fields.List(fields.Nested(DatasetMetricsPutSchema))
     extra = fields.String(allow_none=True)
-    is_managed_externally = fields.Boolean(allow_none=True, default=False)
+    is_managed_externally = fields.Boolean(allow_none=True, dump_default=False)
     external_url = fields.String(allow_none=True)
 
 
@@ -127,16 +127,18 @@ class DatasetRelatedDashboard(Schema):
 
 
 class DatasetRelatedCharts(Schema):
-    count = fields.Integer(description="Chart count")
+    count = fields.Integer(metadata={"description": "Chart count"})
     result = fields.List(
-        fields.Nested(DatasetRelatedChart), description="A list of dashboards"
+        fields.Nested(DatasetRelatedChart),
+        metadata={"description": "A list of dashboards"},
     )
 
 
 class DatasetRelatedDashboards(Schema):
-    count = fields.Integer(description="Dashboard count")
+    count = fields.Integer(metadata={"description": "Dashboard count"})
     result = fields.List(
-        fields.Nested(DatasetRelatedDashboard), description="A list of dashboards"
+        fields.Nested(DatasetRelatedDashboard),
+        metadata={"description": "A list of dashboards"},
     )
 
 
@@ -160,8 +162,8 @@ def fix_extra(self, data: Dict[str, Any], **kwargs: Any) -> Dict[str, Any]:
     column_name = fields.String(required=True)
     extra = fields.Dict(allow_none=True)
     verbose_name = fields.String(allow_none=True)
-    is_dttm = fields.Boolean(default=False, allow_none=True)
-    is_active = fields.Boolean(default=True, allow_none=True)
+    is_dttm = fields.Boolean(dump_default=False, allow_none=True)
+    is_active = fields.Boolean(dump_default=True, allow_none=True)
     type = fields.String(allow_none=True)
     advanced_data_type = fields.String(allow_none=True)
     groupby = fields.Boolean()
@@ -224,19 +226,21 @@ def fix_extra(self, data: Dict[str, Any], **kwargs: Any) -> Dict[str, Any]:
     version = fields.String(required=True)
     database_uuid = fields.UUID(required=True)
     data = fields.URL()
-    is_managed_externally = fields.Boolean(allow_none=True, default=False)
+    is_managed_externally = fields.Boolean(allow_none=True, dump_default=False)
     external_url = fields.String(allow_none=True)
 
 
 class GetOrCreateDatasetSchema(Schema):
-    table_name = fields.String(required=True, description="Name of table")
+    table_name = fields.String(required=True, metadata={"description": "Name of table"})
     database_id = fields.Integer(
-        required=True, description="ID of database table belongs to"
+        required=True, metadata={"description": "ID of database table belongs to"}
     )
     schema = fields.String(
-        description="The schema the table belongs to", allow_none=True
+        metadata={"description": "The schema the table belongs to"}, allow_none=True
+    )
+    template_params = fields.String(
+        metadata={"description": "Template params for the table"}
     )
-    template_params = fields.String(description="Template params for the table")
 
 
 class DatasetSchema(SQLAlchemyAutoSchema):
diff --git a/superset/db_engine_specs/base.py b/superset/db_engine_specs/base.py
index 93df7c72168e..aac971dea078 100644
--- a/superset/db_engine_specs/base.py
+++ b/superset/db_engine_specs/base.py
@@ -1859,20 +1859,29 @@ def validate_database_uri(cls, sqlalchemy_uri: URL) -> None:
 # schema for adding a database by providing parameters instead of the
 # full SQLAlchemy URI
 class BasicParametersSchema(Schema):
-    username = fields.String(required=True, allow_none=True, description=__("Username"))
-    password = fields.String(allow_none=True, description=__("Password"))
-    host = fields.String(required=True, description=__("Hostname or IP address"))
+    username = fields.String(
+        required=True, allow_none=True, metadata={"description": __("Username")}
+    )
+    password = fields.String(allow_none=True, metadata={"description": __("Password")})
+    host = fields.String(
+        required=True, metadata={"description": __("Hostname or IP address")}
+    )
     port = fields.Integer(
         required=True,
-        description=__("Database port"),
+        metadata={"description": __("Database port")},
         validate=Range(min=0, max=2**16, max_inclusive=False),
     )
-    database = fields.String(required=True, description=__("Database name"))
+    database = fields.String(
+        required=True, metadata={"description": __("Database name")}
+    )
     query = fields.Dict(
-        keys=fields.Str(), values=fields.Raw(), description=__("Additional parameters")
+        keys=fields.Str(),
+        values=fields.Raw(),
+        metadata={"description": __("Additional parameters")},
     )
     encryption = fields.Boolean(
-        required=False, description=__("Use an encrypted connection to the database")
+        required=False,
+        metadata={"description": __("Use an encrypted connection to the database")},
     )
 
 
diff --git a/superset/db_engine_specs/bigquery.py b/superset/db_engine_specs/bigquery.py
index 976b2ee3167c..1f2ee51068a8 100644
--- a/superset/db_engine_specs/bigquery.py
+++ b/superset/db_engine_specs/bigquery.py
@@ -93,7 +93,7 @@
 class BigQueryParametersSchema(Schema):
     credentials_info = EncryptedString(
         required=False,
-        description="Contents of BigQuery JSON credentials.",
+        metadata={"description": "Contents of BigQuery JSON credentials."},
     )
     query = fields.Dict(required=False)
 
diff --git a/superset/db_engine_specs/clickhouse.py b/superset/db_engine_specs/clickhouse.py
index 8de1cef3bcdd..4c229ca1160f 100644
--- a/superset/db_engine_specs/clickhouse.py
+++ b/superset/db_engine_specs/clickhouse.py
@@ -198,20 +198,27 @@ def get_function_names(cls, database: Database) -> List[str]:
 
 
 class ClickHouseParametersSchema(Schema):
-    username = fields.String(allow_none=True, description=__("Username"))
-    password = fields.String(allow_none=True, description=__("Password"))
-    host = fields.String(required=True, description=__("Hostname or IP address"))
+    username = fields.String(allow_none=True, metadata={"description": __("Username")})
+    password = fields.String(allow_none=True, metadata={"description": __("Password")})
+    host = fields.String(
+        required=True, metadata={"description": __("Hostname or IP address")}
+    )
     port = fields.Integer(
         allow_none=True,
-        description=__("Database port"),
+        metadata={"description": __("Database port")},
         validate=Range(min=0, max=65535),
     )
-    database = fields.String(allow_none=True, description=__("Database name"))
+    database = fields.String(
+        allow_none=True, metadata={"description": __("Database name")}
+    )
     encryption = fields.Boolean(
-        default=True, description=__("Use an encrypted connection to the database")
+        dump_default=True,
+        metadata={"description": __("Use an encrypted connection to the database")},
     )
     query = fields.Dict(
-        keys=fields.Str(), values=fields.Raw(), description=__("Additional parameters")
+        keys=fields.Str(),
+        values=fields.Raw(),
+        metadata={"description": __("Additional parameters")},
     )
 
 
diff --git a/superset/db_engine_specs/databricks.py b/superset/db_engine_specs/databricks.py
index a3650523b2cb..d9ad65e49068 100644
--- a/superset/db_engine_specs/databricks.py
+++ b/superset/db_engine_specs/databricks.py
@@ -49,12 +49,13 @@ class DatabricksParametersSchema(Schema):
     host = fields.Str(required=True)
     port = fields.Integer(
         required=True,
-        description=__("Database port"),
+        metadata={"description": __("Database port")},
         validate=Range(min=0, max=2**16, max_inclusive=False),
     )
     database = fields.Str(required=True)
     encryption = fields.Boolean(
-        required=False, description=__("Use an encrypted connection to the database")
+        required=False,
+        metadata={"description": __("Use an encrypted connection to the database")},
     )
 
 
diff --git a/superset/db_engine_specs/gsheets.py b/superset/db_engine_specs/gsheets.py
index 17156f5a9efc..73a66c464f8e 100644
--- a/superset/db_engine_specs/gsheets.py
+++ b/superset/db_engine_specs/gsheets.py
@@ -47,8 +47,10 @@ class GSheetsParametersSchema(Schema):
     catalog = fields.Dict()
     service_account_info = EncryptedString(
         required=False,
-        description="Contents of GSheets JSON credentials.",
-        field_name="service_account_info",
+        metadata={
+            "description": "Contents of GSheets JSON credentials.",
+            "field_name": "service_account_info",
+        },
     )
 
 
diff --git a/superset/explore/form_data/schemas.py b/superset/explore/form_data/schemas.py
index 192df089e818..d4f72d45d6d1 100644
--- a/superset/explore/form_data/schemas.py
+++ b/superset/explore/form_data/schemas.py
@@ -21,31 +21,35 @@
 
 class FormDataPostSchema(Schema):
     datasource_id = fields.Integer(
-        required=True, allow_none=False, description="The datasource ID"
+        required=True, allow_none=False, metadata={"description": "The datasource ID"}
     )
     datasource_type = fields.String(
         required=True,
         allow_none=False,
-        description="The datasource type",
+        metadata={"description": "The datasource type"},
         validate=validate.OneOf(choices=[ds.value for ds in DatasourceType]),
     )
-    chart_id = fields.Integer(required=False, description="The chart ID")
+    chart_id = fields.Integer(required=False, metadata={"description": "The chart ID"})
     form_data = fields.String(
-        required=True, allow_none=False, description="Any type of JSON supported text."
+        required=True,
+        allow_none=False,
+        metadata={"description": "Any type of JSON supported text."},
     )
 
 
 class FormDataPutSchema(Schema):
     datasource_id = fields.Integer(
-        required=True, allow_none=False, description="The datasource ID"
+        required=True, allow_none=False, metadata={"description": "The datasource ID"}
     )
     datasource_type = fields.String(
         required=True,
         allow_none=False,
-        description="The datasource type",
+        metadata={"description": "The datasource type"},
         validate=validate.OneOf(choices=[ds.value for ds in DatasourceType]),
     )
-    chart_id = fields.Integer(required=False, description="The chart ID")
+    chart_id = fields.Integer(required=False, metadata={"description": "The chart ID"})
     form_data = fields.String(
-        required=True, allow_none=False, description="Any type of JSON supported text."
+        required=True,
+        allow_none=False,
+        metadata={"description": "Any type of JSON supported text."},
     )
diff --git a/superset/explore/permalink/schemas.py b/superset/explore/permalink/schemas.py
index e1f9d069b853..b56715e903ce 100644
--- a/superset/explore/permalink/schemas.py
+++ b/superset/explore/permalink/schemas.py
@@ -21,19 +21,23 @@ class ExplorePermalinkPostSchema(Schema):
     formData = fields.Dict(
         required=True,
         allow_none=False,
-        description="Chart form data",
+        metadata={"description": "Chart form data"},
     )
     urlParams = fields.List(
         fields.Tuple(
             (
-                fields.String(required=True, allow_none=True, description="Key"),
-                fields.String(required=True, allow_none=True, description="Value"),
+                fields.String(
+                    required=True, allow_none=True, metadata={"description": "Key"}
+                ),
+                fields.String(
+                    required=True, allow_none=True, metadata={"description": "Value"}
+                ),
             ),
             required=False,
             allow_none=True,
-            description="URL Parameter key-value pair",
+            metadata={"description": "URL Parameter key-value pair"},
         ),
         required=False,
         allow_none=True,
-        description="URL Parameters",
+        metadata={"description": "URL Parameters"},
     )
diff --git a/superset/explore/schemas.py b/superset/explore/schemas.py
index 457c99422a3a..f0060360cfe4 100644
--- a/superset/explore/schemas.py
+++ b/superset/explore/schemas.py
@@ -19,96 +19,146 @@
 
 class DatasetSchema(Schema):
     cache_timeout = fields.Integer(
-        description="Duration (in seconds) of the caching timeout for this dataset."
-    )
-    column_formats = fields.Dict(description="Column formats.")
-    columns = fields.List(fields.Dict(), description="Columns metadata.")
-    database = fields.Dict(description="Database associated with the dataset.")
-    datasource_name = fields.String(description="Dataset name.")
-    default_endpoint = fields.String(description="Default endpoint for the dataset.")
-    description = fields.String(description="Dataset description.")
-    edit_url = fields.String(description="The URL for editing the dataset.")
+        metadata={
+            "description": "Duration (in seconds) of the caching timeout for this "
+            "dataset."
+        }
+    )
+    column_formats = fields.Dict(metadata={"description": "Column formats."})
+    columns = fields.List(fields.Dict(), metadata={"description": "Columns metadata."})
+    database = fields.Dict(
+        metadata={"description": "Database associated with the dataset."}
+    )
+    datasource_name = fields.String(metadata={"description": "Dataset name."})
+    default_endpoint = fields.String(
+        metadata={"description": "Default endpoint for the dataset."}
+    )
+    description = fields.String(metadata={"description": "Dataset description."})
+    edit_url = fields.String(
+        metadata={"description": "The URL for editing the dataset."}
+    )
     extra = fields.Dict(
-        description="JSON string containing extra configuration elements."
+        metadata={"description": "JSON string containing extra configuration elements."}
     )
     fetch_values_predicate = fields.String(
-        description="Predicate used when fetching values from the dataset."
+        metadata={
+            "description": "Predicate used when fetching values from the dataset."
+        }
+    )
+    filter_select = fields.Bool(
+        metadata={"description": "SELECT filter applied to the dataset."}
+    )
+    filter_select_enabled = fields.Bool(
+        metadata={"description": "If the SELECT filter is enabled."}
     )
-    filter_select = fields.Bool(description="SELECT filter applied to the dataset.")
-    filter_select_enabled = fields.Bool(description="If the SELECT filter is enabled.")
     granularity_sqla = fields.List(
         fields.List(fields.Dict()),
-        description=(
-            "Name of temporal column used for time filtering for SQL datasources. "
-            "This field is deprecated, use `granularity` instead."
-        ),
-    )
-    health_check_message = fields.String(description="Health check message.")
-    id = fields.Integer(description="Dataset ID.")
-    is_sqllab_view = fields.Bool(description="If the dataset is a SQL Lab view.")
-    main_dttm_col = fields.String(description="The main temporal column.")
-    metrics = fields.List(fields.Dict(), description="Dataset metrics.")
-    name = fields.String(description="Dataset name.")
-    offset = fields.Integer(description="Dataset offset.")
+        metadata={
+            "description": (
+                "Name of temporal column used for time filtering for SQL datasources. "
+                "This field is deprecated, use `granularity` instead."
+            )
+        },
+    )
+    health_check_message = fields.String(
+        metadata={"description": "Health check message."}
+    )
+    id = fields.Integer(metadata={"description": "Dataset ID."})
+    is_sqllab_view = fields.Bool(
+        metadata={"description": "If the dataset is a SQL Lab view."}
+    )
+    main_dttm_col = fields.String(metadata={"description": "The main temporal column."})
+    metrics = fields.List(fields.Dict(), metadata={"description": "Dataset metrics."})
+    name = fields.String(metadata={"description": "Dataset name."})
+    offset = fields.Integer(metadata={"description": "Dataset offset."})
     order_by_choices = fields.List(
-        fields.List(fields.String()), description="List of order by columns."
-    )
-    owners = fields.List(fields.Integer(), description="List of owners identifiers")
-    params = fields.Dict(description="Extra params for the dataset.")
-    perm = fields.String(description="Permission expression.")
-    schema = fields.String(description="Dataset schema.")
-    select_star = fields.String(description="Select all clause.")
-    sql = fields.String(description="A SQL statement that defines the dataset.")
+        fields.List(fields.String()),
+        metadata={"description": "List of order by columns."},
+    )
+    owners = fields.List(
+        fields.Integer(), metadata={"description": "List of owners identifiers"}
+    )
+    params = fields.Dict(metadata={"description": "Extra params for the dataset."})
+    perm = fields.String(metadata={"description": "Permission expression."})
+    schema = fields.String(metadata={"description": "Dataset schema."})
+    select_star = fields.String(metadata={"description": "Select all clause."})
+    sql = fields.String(
+        metadata={"description": "A SQL statement that defines the dataset."}
+    )
     table_name = fields.String(
-        description="The name of the table associated with the dataset."
+        metadata={"description": "The name of the table associated with the dataset."}
     )
-    template_params = fields.Dict(description="Table template params.")
+    template_params = fields.Dict(metadata={"description": "Table template params."})
     time_grain_sqla = fields.List(
         fields.List(fields.String()),
-        description="List of temporal granularities supported by the dataset.",
+        metadata={
+            "description": "List of temporal granularities supported by the dataset."
+        },
+    )
+    type = fields.String(metadata={"description": "Dataset type."})
+    uid = fields.String(metadata={"description": "Dataset unique identifier."})
+    verbose_map = fields.Dict(
+        metadata={"description": "Mapping from raw name to verbose name."}
     )
-    type = fields.String(description="Dataset type.")
-    uid = fields.String(description="Dataset unique identifier.")
-    verbose_map = fields.Dict(description="Mapping from raw name to verbose name.")
 
 
 class SliceSchema(Schema):
     cache_timeout = fields.Integer(
-        description="Duration (in seconds) of the caching timeout for this chart."
+        metadata={
+            "description": "Duration (in seconds) of the caching timeout for this chart."
+        }
+    )
+    certification_details = fields.String(
+        metadata={"description": "Details of the certification."}
     )
-    certification_details = fields.String(description="Details of the certification.")
     certified_by = fields.String(
-        description="Person or group that has certified this dashboard."
+        metadata={"description": "Person or group that has certified this dashboard."}
+    )
+    changed_on = fields.String(
+        metadata={"description": "Timestamp of the last modification."}
     )
-    changed_on = fields.String(description="Timestamp of the last modification.")
     changed_on_humanized = fields.String(
-        description="Timestamp of the last modification in human readable form."
+        metadata={
+            "description": "Timestamp of the last modification in human readable form."
+        }
     )
-    datasource = fields.String(description="Datasource identifier.")
-    description = fields.String(description="Slice description.")
+    datasource = fields.String(metadata={"description": "Datasource identifier."})
+    description = fields.String(metadata={"description": "Slice description."})
     description_markeddown = fields.String(
-        description="Sanitized HTML version of the chart description."
+        metadata={"description": "Sanitized HTML version of the chart description."}
+    )
+    edit_url = fields.String(metadata={"description": "The URL for editing the slice."})
+    form_data = fields.Dict(
+        metadata={"description": "Form data associated with the slice."}
     )
-    edit_url = fields.String(description="The URL for editing the slice.")
-    form_data = fields.Dict(description="Form data associated with the slice.")
     is_managed_externally = fields.Bool(
-        description="If the chart is managed outside externally."
-    )
-    modified = fields.String(description="Last modification in human readable form.")
-    owners = fields.List(fields.Integer(), description="Owners identifiers.")
-    query_context = fields.Dict(description="The context associated with the query.")
-    slice_id = fields.Integer(description="The slice ID.")
-    slice_name = fields.String(description="The slice name.")
-    slice_url = fields.String(description="The slice URL.")
+        metadata={"description": "If the chart is managed outside externally."}
+    )
+    modified = fields.String(
+        metadata={"description": "Last modification in human readable form."}
+    )
+    owners = fields.List(
+        fields.Integer(), metadata={"description": "Owners identifiers."}
+    )
+    query_context = fields.Dict(
+        metadata={"description": "The context associated with the query."}
+    )
+    slice_id = fields.Integer(metadata={"description": "The slice ID."})
+    slice_name = fields.String(metadata={"description": "The slice name."})
+    slice_url = fields.String(metadata={"description": "The slice URL."})
 
 
 class ExploreContextSchema(Schema):
     form_data = fields.Dict(
-        description=(
-            "Form data from the Explore controls used to form the "
-            "chart's data query."
-        )
+        metadata={
+            "description": (
+                "Form data from the Explore controls used to form the "
+                "chart's data query."
+            )
+        }
     )
     dataset = fields.Nested(DatasetSchema)
     slice = fields.Nested(SliceSchema)
-    message = fields.String(description="Any message related to the processed request.")
+    message = fields.String(
+        metadata={"description": "Any message related to the processed request."}
+    )
diff --git a/superset/reports/schemas.py b/superset/reports/schemas.py
index c64593f7f961..a45ee4cc3857 100644
--- a/superset/reports/schemas.py
+++ b/superset/reports/schemas.py
@@ -100,7 +100,7 @@ def validate_crontab(value: Union[bytes, bytearray, str]) -> None:
 
 class ValidatorConfigJSONSchema(Schema):
     op = fields.String(  # pylint: disable=invalid-name
-        description=validator_config_json_op_description,
+        metadata={"description": validator_config_json_op_description},
         validate=validate.OneOf(choices=["<", "<=", ">", ">=", "==", "!="]),
     )
     threshold = fields.Float()
@@ -113,7 +113,7 @@ class ReportRecipientConfigJSONSchema(Schema):
 
 class ReportRecipientSchema(Schema):
     type = fields.String(
-        description="The recipient type, check spec for valid options",
+        metadata={"description": "The recipient type, check spec for valid options"},
         allow_none=False,
         required=True,
         validate=validate.OneOf(
@@ -125,88 +125,90 @@ class ReportRecipientSchema(Schema):
 
 class ReportSchedulePostSchema(Schema):
     type = fields.String(
-        description=type_description,
+        metadata={"description": type_description},
         allow_none=False,
         required=True,
         validate=validate.OneOf(choices=tuple(key.value for key in ReportScheduleType)),
     )
     name = fields.String(
-        description=name_description,
+        metadata={"description": name_description, "example": "Daily dashboard email"},
         allow_none=False,
         required=True,
         validate=[Length(1, 150)],
-        example="Daily dashboard email",
     )
     description = fields.String(
-        description=description_description,
+        metadata={
+            "description": description_description,
+            "example": "Daily sales dashboard to marketing",
+        },
         allow_none=True,
         required=False,
-        example="Daily sales dashboard to marketing",
     )
     context_markdown = fields.String(
-        description=context_markdown_description, allow_none=True, required=False
+        metadata={"description": context_markdown_description},
+        allow_none=True,
+        required=False,
     )
     active = fields.Boolean()
     crontab = fields.String(
-        description=crontab_description,
+        metadata={"description": crontab_description, "example": "*/5 * * * *"},
         validate=[validate_crontab, Length(1, 1000)],
-        example="*/5 * * * *",
         allow_none=False,
         required=True,
     )
     timezone = fields.String(
-        description=timezone_description,
-        default="UTC",
+        metadata={"description": timezone_description},
+        dump_default="UTC",
         validate=validate.OneOf(choices=tuple(all_timezones)),
     )
     sql = fields.String(
-        description=sql_description, example="SELECT value FROM time_series_table"
+        metadata={
+            "description": sql_description,
+            "example": "SELECT value FROM time_series_table",
+        }
     )
     chart = fields.Integer(required=False, allow_none=True)
     creation_method = EnumField(
         ReportCreationMethod,
         by_value=True,
         required=False,
-        description=creation_method_description,
+        metadata={"description": creation_method_description},
     )
     dashboard = fields.Integer(required=False, allow_none=True)
     selected_tabs = fields.List(fields.Integer(), required=False, allow_none=True)
     database = fields.Integer(required=False)
-    owners = fields.List(fields.Integer(description=owners_description))
+    owners = fields.List(fields.Integer(metadata={"description": owners_description}))
     validator_type = fields.String(
-        description=validator_type_description,
+        metadata={"description": validator_type_description},
         validate=validate.OneOf(
             choices=tuple(key.value for key in ReportScheduleValidatorType)
         ),
     )
     validator_config_json = fields.Nested(ValidatorConfigJSONSchema)
     log_retention = fields.Integer(
-        description=log_retention_description,
-        example=90,
+        metadata={"description": log_retention_description, "example": 90},
         validate=[Range(min=1, error=_("Value must be greater than 0"))],
     )
     grace_period = fields.Integer(
-        description=grace_period_description,
-        example=60 * 60 * 4,
-        default=60 * 60 * 4,
+        metadata={"description": grace_period_description, "example": 60 * 60 * 4},
+        dump_default=60 * 60 * 4,
         validate=[Range(min=1, error=_("Value must be greater than 0"))],
     )
     working_timeout = fields.Integer(
-        description=working_timeout_description,
-        example=60 * 60 * 1,
-        default=60 * 60 * 1,
+        metadata={"description": working_timeout_description, "example": 60 * 60 * 1},
+        dump_default=60 * 60 * 1,
         validate=[Range(min=1, error=_("Value must be greater than 0"))],
     )
 
     recipients = fields.List(fields.Nested(ReportRecipientSchema))
     report_format = fields.String(
-        default=ReportDataFormat.VISUALIZATION,
+        dump_default=ReportDataFormat.VISUALIZATION,
         validate=validate.OneOf(choices=tuple(key.value for key in ReportDataFormat)),
     )
     extra = fields.Dict(
-        default=None,
+        dump_default=None,
     )
-    force_screenshot = fields.Boolean(default=False)
+    force_screenshot = fields.Boolean(dump_default=False)
 
     @validates_schema
     def validate_report_references(  # pylint: disable=unused-argument,no-self-use
@@ -221,36 +223,44 @@ def validate_report_references(  # pylint: disable=unused-argument,no-self-use
 
 class ReportSchedulePutSchema(Schema):
     type = fields.String(
-        description=type_description,
+        metadata={"description": type_description},
         required=False,
         validate=validate.OneOf(choices=tuple(key.value for key in ReportScheduleType)),
     )
     name = fields.String(
-        description=name_description, required=False, validate=[Length(1, 150)]
+        metadata={"description": name_description},
+        required=False,
+        validate=[Length(1, 150)],
     )
     description = fields.String(
-        description=description_description,
+        metadata={
+            "description": description_description,
+            "example": "Daily sales dashboard to marketing",
+        },
         allow_none=True,
         required=False,
-        example="Daily sales dashboard to marketing",
     )
     context_markdown = fields.String(
-        description=context_markdown_description, allow_none=True, required=False
+        metadata={"description": context_markdown_description},
+        allow_none=True,
+        required=False,
     )
     active = fields.Boolean(required=False)
     crontab = fields.String(
-        description=crontab_description,
+        metadata={"description": crontab_description},
         validate=[validate_crontab, Length(1, 1000)],
         required=False,
     )
     timezone = fields.String(
-        description=timezone_description,
-        default="UTC",
+        metadata={"description": timezone_description},
+        dump_default="UTC",
         validate=validate.OneOf(choices=tuple(all_timezones)),
     )
     sql = fields.String(
-        description=sql_description,
-        example="SELECT value FROM time_series_table",
+        metadata={
+            "description": sql_description,
+            "example": "SELECT value FROM time_series_table",
+        },
         required=False,
         allow_none=True,
     )
@@ -259,13 +269,15 @@ class ReportSchedulePutSchema(Schema):
         ReportCreationMethod,
         by_value=True,
         allow_none=True,
-        description=creation_method_description,
+        metadata={"description": creation_method_description},
     )
     dashboard = fields.Integer(required=False, allow_none=True)
     database = fields.Integer(required=False)
-    owners = fields.List(fields.Integer(description=owners_description), required=False)
+    owners = fields.List(
+        fields.Integer(metadata={"description": owners_description}), required=False
+    )
     validator_type = fields.String(
-        description=validator_type_description,
+        metadata={"description": validator_type_description},
         validate=validate.OneOf(
             choices=tuple(key.value for key in ReportScheduleValidatorType)
         ),
@@ -274,28 +286,25 @@ class ReportSchedulePutSchema(Schema):
     )
     validator_config_json = fields.Nested(ValidatorConfigJSONSchema, required=False)
     log_retention = fields.Integer(
-        description=log_retention_description,
-        example=90,
+        metadata={"description": log_retention_description, "example": 90},
         required=False,
         validate=[Range(min=1, error=_("Value must be greater than 0"))],
     )
     grace_period = fields.Integer(
-        description=grace_period_description,
-        example=60 * 60 * 4,
+        metadata={"description": grace_period_description, "example": 60 * 60 * 4},
         required=False,
         validate=[Range(min=1, error=_("Value must be greater than 0"))],
     )
     working_timeout = fields.Integer(
-        description=working_timeout_description,
-        example=60 * 60 * 1,
+        metadata={"description": working_timeout_description, "example": 60 * 60 * 1},
         allow_none=True,
         required=False,
         validate=[Range(min=1, error=_("Value must be greater than 0"))],
     )
     recipients = fields.List(fields.Nested(ReportRecipientSchema), required=False)
     report_format = fields.String(
-        default=ReportDataFormat.VISUALIZATION,
+        dump_default=ReportDataFormat.VISUALIZATION,
         validate=validate.OneOf(choices=tuple(key.value for key in ReportDataFormat)),
     )
-    extra = fields.Dict(default=None)
-    force_screenshot = fields.Boolean(default=False)
+    extra = fields.Dict(dump_default=None)
+    force_screenshot = fields.Boolean(dump_default=False)
diff --git a/superset/sqllab/schemas.py b/superset/sqllab/schemas.py
index 134b9ea7bb79..30274d6de923 100644
--- a/superset/sqllab/schemas.py
+++ b/superset/sqllab/schemas.py
@@ -26,12 +26,18 @@
 
 
 class EstimateQueryCostSchema(Schema):
-    database_id = fields.Integer(required=True, description="The database id")
-    sql = fields.String(required=True, description="The SQL query to estimate")
+    database_id = fields.Integer(
+        required=True, metadata={"description": "The database id"}
+    )
+    sql = fields.String(
+        required=True, metadata={"description": "The SQL query to estimate"}
+    )
     template_params = fields.Dict(
-        keys=fields.String(), description="The SQL query template params"
+        keys=fields.String(), metadata={"description": "The SQL query template params"}
+    )
+    schema = fields.String(
+        allow_none=True, metadata={"description": "The database schema"}
     )
-    schema = fields.String(allow_none=True, description="The database schema")
 
 
 class ExecutePayloadSchema(Schema):
diff --git a/superset/temporary_cache/schemas.py b/superset/temporary_cache/schemas.py
index 474d88b5fcf7..024c907e915f 100644
--- a/superset/temporary_cache/schemas.py
+++ b/superset/temporary_cache/schemas.py
@@ -23,7 +23,7 @@ class TemporaryCachePostSchema(Schema):
     value = fields.String(
         required=True,
         allow_none=False,
-        description="Any type of JSON supported text.",
+        metadata={"description": "Any type of JSON supported text."},
         validate=validate_json,
     )
 
@@ -32,6 +32,6 @@ class TemporaryCachePutSchema(Schema):
     value = fields.String(
         required=True,
         allow_none=False,
-        description="Any type of JSON supported text.",
+        metadata={"description": "Any type of JSON supported text."},
         validate=validate_json,
     )
diff --git a/superset/views/base_api.py b/superset/views/base_api.py
index 0b7448b958e6..45f13e24ba9c 100644
--- a/superset/views/base_api.py
+++ b/superset/views/base_api.py
@@ -57,22 +57,28 @@
 
 
 class RelatedResultResponseSchema(Schema):
-    value = fields.Integer(description="The related item identifier")
-    text = fields.String(description="The related item string representation")
-    extra = fields.Dict(description="The extra metadata for related item")
+    value = fields.Integer(metadata={"description": "The related item identifier"})
+    text = fields.String(
+        metadata={"description": "The related item string representation"}
+    )
+    extra = fields.Dict(metadata={"description": "The extra metadata for related item"})
 
 
 class RelatedResponseSchema(Schema):
-    count = fields.Integer(description="The total number of related values")
+    count = fields.Integer(
+        metadata={"description": "The total number of related values"}
+    )
     result = fields.List(fields.Nested(RelatedResultResponseSchema))
 
 
 class DistinctResultResponseSchema(Schema):
-    text = fields.String(description="The distinct item")
+    text = fields.String(metadata={"description": "The distinct item"})
 
 
 class DistincResponseSchema(Schema):
-    count = fields.Integer(description="The total number of distinct values")
+    count = fields.Integer(
+        metadata={"description": "The total number of distinct values"}
+    )
     result = fields.List(fields.Nested(DistinctResultResponseSchema))
 
 
diff --git a/superset/views/datasource/schemas.py b/superset/views/datasource/schemas.py
index f9be7a7d4e1f..b71b3defa850 100644
--- a/superset/views/datasource/schemas.py
+++ b/superset/views/datasource/schemas.py
@@ -70,7 +70,7 @@ class SamplesPayloadSchema(Schema):
     )
     extras = fields.Nested(
         ChartDataExtrasSchema,
-        description="Extra parameters to add to the query.",
+        metadata={"description": "Extra parameters to add to the query."},
         allow_none=True,
     )
 
diff --git a/superset/views/log/schemas.py b/superset/views/log/schemas.py
index bb4569893d74..303af1e7a924 100644
--- a/superset/views/log/schemas.py
+++ b/superset/views/log/schemas.py
@@ -28,18 +28,27 @@
 
 
 class RecentActivitySchema(Schema):
-    action = fields.String(description="Action taken describing type of activity")
-    item_type = fields.String(description="Type of item, e.g. slice or dashboard")
-    item_url = fields.String(description="URL to item")
-    item_title = fields.String(description="Title of item")
-    time = fields.Float(description="Time of activity, in epoch milliseconds")
+    action = fields.String(
+        metadata={"description": "Action taken describing type of activity"}
+    )
+    item_type = fields.String(
+        metadata={"description": "Type of item, e.g. slice or dashboard"}
+    )
+    item_url = fields.String(metadata={"description": "URL to item"})
+    item_title = fields.String(metadata={"description": "Title of item"})
+    time = fields.Float(
+        metadata={"description": "Time of activity, in epoch milliseconds"}
+    )
     time_delta_humanized = fields.String(
-        description="Human-readable description of how long ago activity took place"
+        metadata={
+            "description": "Human-readable description of how long ago activity took "
+            "place."
+        }
     )
 
 
 class RecentActivityResponseSchema(Schema):
     result = fields.List(
         fields.Nested(RecentActivitySchema),
-        description="A list of recent activity objects",
+        metadata={"description": "A list of recent activity objects"},
     )

From 0b43112873f984500e7018a0e496cc9bd89bd477 Mon Sep 17 00:00:00 2001
From: Kamil Gabryjelski <kamil.gabryjelski@gmail.com>
Date: Fri, 21 Apr 2023 08:50:44 +0200
Subject: [PATCH 20/47] fix: Further drilling by different groupby fields
 (#23754)

---
 .../ChartContextMenu/ChartContextMenu.tsx     |   4 +-
 .../Chart/DrillBy/DrillByMenuItems.test.tsx   |   9 +-
 .../Chart/DrillBy/DrillByMenuItems.tsx        |  30 ++--
 .../Chart/DrillBy/DrillByModal.test.tsx       |  11 +-
 .../components/Chart/DrillBy/DrillByModal.tsx | 152 ++++++++++++------
 5 files changed, 129 insertions(+), 77 deletions(-)

diff --git a/superset-frontend/src/components/Chart/ChartContextMenu/ChartContextMenu.tsx b/superset-frontend/src/components/Chart/ChartContextMenu/ChartContextMenu.tsx
index 401c3fa99272..6ab80aad9e7e 100644
--- a/superset-frontend/src/components/Chart/ChartContextMenu/ChartContextMenu.tsx
+++ b/superset-frontend/src/components/Chart/ChartContextMenu/ChartContextMenu.tsx
@@ -234,9 +234,7 @@ const ChartContextMenu = (
     }
     menuItems.push(
       <DrillByMenuItems
-        filters={filters?.drillBy?.filters}
-        groupbyFieldName={filters?.drillBy?.groupbyFieldName}
-        adhocFilterFieldName={filters?.drillBy?.adhocFilterFieldName}
+        drillByConfig={filters?.drillBy}
         onSelection={onSelection}
         formData={formData}
         contextMenuY={clientY}
diff --git a/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.test.tsx b/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.test.tsx
index b0e3bf62b52e..7d411e050bea 100644
--- a/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.test.tsx
+++ b/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.test.tsx
@@ -61,15 +61,14 @@ const defaultFilters = [
 
 const renderMenu = ({
   formData = defaultFormData,
-  filters = defaultFilters,
+  drillByConfig = { filters: defaultFilters, groupbyFieldName: 'groupby' },
   ...rest
 }: Partial<DrillByMenuItemsProps>) =>
   render(
     <Menu>
       <DrillByMenuItems
         formData={formData ?? defaultFormData}
-        filters={filters}
-        groupbyFieldName="groupby"
+        drillByConfig={drillByConfig}
         {...rest}
       />
     </Menu>,
@@ -133,7 +132,7 @@ test('render disabled menu item for unsupported chart', async () => {
 });
 
 test('render disabled menu item for supported chart, no filters', async () => {
-  renderMenu({ filters: [] });
+  renderMenu({ drillByConfig: { filters: [], groupbyFieldName: 'groupby' } });
   await expectDrillByDisabled('Drill by is not available for this data point');
 });
 
@@ -237,6 +236,6 @@ test('When menu item is clicked, call onSelection with clicked column and drill
       column_name: 'col1',
       groupby: true,
     },
-    defaultFilters,
+    { filters: defaultFilters, groupbyFieldName: 'groupby' },
   );
 });
diff --git a/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.tsx b/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.tsx
index b503b1eed5db..17e013d29f1f 100644
--- a/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.tsx
+++ b/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.tsx
@@ -29,8 +29,8 @@ import { Menu } from 'src/components/Menu';
 import {
   BaseFormData,
   Behavior,
-  BinaryQueryObjectFilterClause,
   Column,
+  ContextMenuFilters,
   css,
   ensureIsArray,
   getChartMetadataRegistry,
@@ -55,12 +55,10 @@ const SHOW_COLUMNS_SEARCH_THRESHOLD = 10;
 const SEARCH_INPUT_HEIGHT = 48;
 
 export interface DrillByMenuItemsProps {
-  filters?: BinaryQueryObjectFilterClause[];
+  drillByConfig?: ContextMenuFilters['drillBy'];
   formData: BaseFormData & { [key: string]: any };
   contextMenuY?: number;
   submenuIndex?: number;
-  groupbyFieldName?: string;
-  adhocFilterFieldName?: string;
   onSelection?: (...args: any) => void;
   onClick?: (event: MouseEvent) => void;
   openNewModal?: boolean;
@@ -68,9 +66,7 @@ export interface DrillByMenuItemsProps {
 }
 
 export const DrillByMenuItems = ({
-  filters,
-  groupbyFieldName,
-  adhocFilterFieldName,
+  drillByConfig,
   formData,
   contextMenuY = 0,
   submenuIndex = 0,
@@ -90,13 +86,13 @@ export const DrillByMenuItems = ({
   const handleSelection = useCallback(
     (event, column) => {
       onClick(event);
-      onSelection(column, filters);
+      onSelection(column, drillByConfig);
       setCurrentColumn(column);
       if (openNewModal) {
         setShowModal(true);
       }
     },
-    [filters, onClick, onSelection, openNewModal],
+    [drillByConfig, onClick, onSelection, openNewModal],
   );
   const closeModal = useCallback(() => {
     setShowModal(false);
@@ -108,7 +104,9 @@ export const DrillByMenuItems = ({
     setSearchInput('');
   }, [columns.length]);
 
-  const hasDrillBy = ensureIsArray(filters).length && groupbyFieldName;
+  const hasDrillBy =
+    ensureIsArray(drillByConfig?.filters).length &&
+    drillByConfig?.groupbyFieldName;
 
   const handlesDimensionContextMenu = useMemo(
     () =>
@@ -131,9 +129,9 @@ export const DrillByMenuItems = ({
               .filter(column => column.groupby)
               .filter(
                 column =>
-                  !ensureIsArray(formData[groupbyFieldName]).includes(
-                    column.column_name,
-                  ) &&
+                  !ensureIsArray(
+                    formData[drillByConfig.groupbyFieldName ?? ''],
+                  ).includes(column.column_name) &&
                   column.column_name !== formData.x_axis &&
                   ensureIsArray(excludedColumns)?.every(
                     excludedCol =>
@@ -151,7 +149,7 @@ export const DrillByMenuItems = ({
     addDangerToast,
     excludedColumns,
     formData,
-    groupbyFieldName,
+    drillByConfig?.groupbyFieldName,
     handlesDimensionContextMenu,
     hasDrillBy,
   ]);
@@ -269,10 +267,8 @@ export const DrillByMenuItems = ({
       {showModal && (
         <DrillByModal
           column={currentColumn}
-          filters={filters}
+          drillByConfig={drillByConfig}
           formData={formData}
-          groupbyFieldName={groupbyFieldName}
-          adhocFilterFieldName={adhocFilterFieldName}
           onHideModal={closeModal}
           dataset={dataset!}
         />
diff --git a/superset-frontend/src/components/Chart/DrillBy/DrillByModal.test.tsx b/superset-frontend/src/components/Chart/DrillBy/DrillByModal.test.tsx
index 66fd6a42ba63..95e2f6027f21 100644
--- a/superset-frontend/src/components/Chart/DrillBy/DrillByModal.test.tsx
+++ b/superset-frontend/src/components/Chart/DrillBy/DrillByModal.test.tsx
@@ -82,6 +82,7 @@ const renderModal = async (modalProps: Partial<DrillByModalProps> = {}) => {
             formData={formData}
             onHideModal={() => setShowModal(false)}
             dataset={dataset}
+            drillByConfig={{ groupbyFieldName: 'groupby', filters: [] }}
             {...modalProps}
           />
         )}
@@ -148,7 +149,10 @@ test('should render alert banner when results fail to load', async () => {
 test('should generate Explore url', async () => {
   await renderModal({
     column: { column_name: 'name' },
-    filters: [{ col: 'gender', op: '==', val: 'boy' }],
+    drillByConfig: {
+      filters: [{ col: 'gender', op: '==', val: 'boy' }],
+      groupbyFieldName: 'groupby',
+    },
   });
   await waitFor(() => fetchMock.called(CHART_DATA_ENDPOINT));
   const expectedRequestPayload = {
@@ -208,7 +212,10 @@ test('should render radio buttons', async () => {
 test('render breadcrumbs', async () => {
   await renderModal({
     column: { column_name: 'name' },
-    filters: [{ col: 'gender', op: '==', val: 'boy' }],
+    drillByConfig: {
+      filters: [{ col: 'gender', op: '==', val: 'boy' }],
+      groupbyFieldName: 'groupby',
+    },
   });
 
   const breadcrumbItems = screen.getAllByTestId('drill-by-breadcrumb-item');
diff --git a/superset-frontend/src/components/Chart/DrillBy/DrillByModal.tsx b/superset-frontend/src/components/Chart/DrillBy/DrillByModal.tsx
index 0a05635645f1..3792a2f315cc 100644
--- a/superset-frontend/src/components/Chart/DrillBy/DrillByModal.tsx
+++ b/superset-frontend/src/components/Chart/DrillBy/DrillByModal.tsx
@@ -26,7 +26,6 @@ import React, {
 } from 'react';
 import {
   BaseFormData,
-  BinaryQueryObjectFilterClause,
   Column,
   QueryData,
   css,
@@ -34,6 +33,7 @@ import {
   isDefined,
   t,
   useTheme,
+  ContextMenuFilters,
 } from '@superset-ui/core';
 import { useSelector } from 'react-redux';
 import { Link } from 'react-router-dom';
@@ -61,6 +61,8 @@ import {
 } from './useDrillByBreadcrumbs';
 
 const DATA_SIZE = 15;
+
+const DEFAULT_ADHOC_FILTER_FIELD_NAME = 'adhoc_filters';
 interface ModalFooterProps {
   closeModal?: () => void;
   formData: BaseFormData;
@@ -123,26 +125,36 @@ const ModalFooter = ({ formData, closeModal }: ModalFooterProps) => {
 export interface DrillByModalProps {
   column?: Column;
   dataset: Dataset;
-  filters?: BinaryQueryObjectFilterClause[];
+  drillByConfig: Required<ContextMenuFilters>['drillBy'];
   formData: BaseFormData & { [key: string]: any };
-  groupbyFieldName?: string;
-  adhocFilterFieldName?: string;
   onHideModal: () => void;
 }
 
+type DrillByConfigs = (ContextMenuFilters['drillBy'] & { column?: Column })[];
+
 export default function DrillByModal({
   column,
   dataset,
-  filters,
+  drillByConfig,
   formData,
-  groupbyFieldName = 'groupby',
-  adhocFilterFieldName = 'adhoc_filters',
   onHideModal,
 }: DrillByModalProps) {
   const theme = useTheme();
   const { addDangerToast } = useToasts();
   const [isChartDataLoading, setIsChartDataLoading] = useState(true);
 
+  const [drillByConfigs, setDrillByConfigs] = useState<DrillByConfigs>([
+    { ...drillByConfig, column },
+  ]);
+
+  const {
+    column: currentColumn,
+    filters,
+    groupbyFieldName = drillByConfig.groupbyFieldName,
+    adhocFilterFieldName = drillByConfig.adhocFilterFieldName ||
+      DEFAULT_ADHOC_FILTER_FIELD_NAME,
+  } = drillByConfigs[drillByConfigs.length - 1] || {};
+
   const initialGroupbyColumns = useMemo(
     () =>
       ensureIsArray(formData[groupbyFieldName])
@@ -160,11 +172,7 @@ export default function DrillByModal({
     [formData.datasource],
   );
 
-  const [currentColumn, setCurrentColumn] = useState<Column | undefined>(
-    column,
-  );
   const [currentFormData, setCurrentFormData] = useState(formData);
-  const [currentFilters, setCurrentFilters] = useState(filters || []);
   const [usedGroupbyColumns, setUsedGroupbyColumns] = useState<Column[]>(
     [...initialGroupbyColumns, column].filter(isDefined),
   );
@@ -174,19 +182,48 @@ export default function DrillByModal({
   ]);
 
   const getNewGroupby = useCallback(
-    (groupbyCol: Column) =>
-      Array.isArray(formData[groupbyFieldName])
+    (groupbyCol: Column, fieldName = groupbyFieldName) =>
+      Array.isArray(formData[fieldName])
         ? [groupbyCol.column_name]
         : groupbyCol.column_name,
     [formData, groupbyFieldName],
   );
 
+  const getFormDataChangesFromConfigs = useCallback(
+    (configs: DrillByConfigs) =>
+      configs.reduce(
+        (acc, config) => {
+          if (config?.groupbyFieldName && config.column) {
+            acc.formData[config.groupbyFieldName] = getNewGroupby(
+              config.column,
+              config.groupbyFieldName,
+            );
+            acc.overridenGroupbyFields.add(config.groupbyFieldName);
+          }
+          const adhocFilterFieldName =
+            config?.adhocFilterFieldName || DEFAULT_ADHOC_FILTER_FIELD_NAME;
+          acc.formData[adhocFilterFieldName] = [
+            ...ensureIsArray(acc[adhocFilterFieldName]),
+            ...ensureIsArray(config.filters).map(filter =>
+              simpleFilterToAdhoc(filter),
+            ),
+          ];
+          acc.overridenAdhocFilterFields.add(adhocFilterFieldName);
+
+          return acc;
+        },
+        {
+          formData: {},
+          overridenGroupbyFields: new Set<string>(),
+          overridenAdhocFilterFields: new Set<string>(),
+        },
+      ),
+    [getNewGroupby],
+  );
+
   const onBreadcrumbClick = useCallback(
     (breadcrumb: DrillByBreadcrumb, index: number) => {
-      const newGroupbyCol =
-        index === 0 ? undefined : (breadcrumb.groupby as Column);
-      setCurrentColumn(newGroupbyCol);
-      setCurrentFilters(filters => filters.slice(0, index));
+      setDrillByConfigs(prevConfigs => prevConfigs.slice(0, index));
       setBreadcrumbsData(prevBreadcrumbs => {
         const newBreadcrumbs = prevBreadcrumbs.slice(0, index + 1);
         delete newBreadcrumbs[newBreadcrumbs.length - 1].filters;
@@ -195,52 +232,61 @@ export default function DrillByModal({
       setUsedGroupbyColumns(prevUsedGroupbyColumns =>
         prevUsedGroupbyColumns.slice(0, index),
       );
-      setCurrentFormData(prevFormData => ({
-        ...prevFormData,
-        [groupbyFieldName]: newGroupbyCol
-          ? getNewGroupby(newGroupbyCol)
-          : formData[groupbyFieldName],
-        [adhocFilterFieldName]: [
-          ...formData[adhocFilterFieldName],
-          ...prevFormData[adhocFilterFieldName].slice(
-            formData[adhocFilterFieldName].length,
-            formData[adhocFilterFieldName].length + index,
-          ),
-        ],
-      }));
+      setCurrentFormData(() => {
+        if (index === 0) {
+          return formData;
+        }
+        const { formData: overrideFormData, overridenAdhocFilterFields } =
+          getFormDataChangesFromConfigs(drillByConfigs.slice(0, index));
+
+        const newFormData = {
+          ...formData,
+          ...overrideFormData,
+        };
+        overridenAdhocFilterFields.forEach(adhocFilterField => ({
+          ...newFormData,
+          [adhocFilterField]: [
+            ...formData[adhocFilterField],
+            ...overrideFormData[adhocFilterField],
+          ],
+        }));
+        return newFormData;
+      });
     },
-    [adhocFilterFieldName, formData, getNewGroupby, groupbyFieldName],
+    [drillByConfigs, formData, getFormDataChangesFromConfigs],
   );
 
   const breadcrumbs = useDrillByBreadcrumbs(breadcrumbsData, onBreadcrumbClick);
 
   const drilledFormData = useMemo(() => {
-    let updatedFormData = { ...formData };
-    if (currentColumn) {
+    let updatedFormData = { ...currentFormData };
+    if (currentColumn && groupbyFieldName) {
       updatedFormData[groupbyFieldName] = getNewGroupby(currentColumn);
     }
 
-    const adhocFilters = currentFilters.map(filter =>
-      simpleFilterToAdhoc(filter),
-    );
-    updatedFormData = {
-      ...updatedFormData,
-      [adhocFilterFieldName]: [
-        ...ensureIsArray(formData[adhocFilterFieldName]),
-        ...adhocFilters,
-      ],
-    };
+    if (adhocFilterFieldName && Array.isArray(filters)) {
+      const adhocFilters = filters.map(filter => simpleFilterToAdhoc(filter));
+      updatedFormData = {
+        ...updatedFormData,
+        [adhocFilterFieldName]: [
+          ...ensureIsArray(formData[adhocFilterFieldName]),
+          ...adhocFilters,
+        ],
+      };
+    }
+
     updatedFormData.slice_id = 0;
     delete updatedFormData.slice_name;
     delete updatedFormData.dashboards;
     return updatedFormData;
   }, [
-    formData,
+    currentFormData,
     currentColumn,
-    currentFilters,
+    filters,
+    adhocFilterFieldName,
+    formData,
     groupbyFieldName,
     getNewGroupby,
-    adhocFilterFieldName,
   ]);
 
   useEffect(() => {
@@ -255,13 +301,19 @@ export default function DrillByModal({
   }, [currentColumn]);
 
   const onSelection = useCallback(
-    (newColumn: Column, filters: BinaryQueryObjectFilterClause[]) => {
-      setCurrentColumn(newColumn);
+    (
+      newColumn: Column,
+      drillByConfig: Required<ContextMenuFilters>['drillBy'],
+    ) => {
       setCurrentFormData(drilledFormData);
-      setCurrentFilters(prevFilters => [...prevFilters, ...filters]);
+      setDrillByConfigs(prevConfigs => [
+        ...prevConfigs,
+        { ...drillByConfig, column: newColumn },
+      ]);
       setBreadcrumbsData(prevBreadcrumbs => {
         const newBreadcrumbs = [...prevBreadcrumbs, { groupby: newColumn }];
-        newBreadcrumbs[newBreadcrumbs.length - 2].filters = filters;
+        newBreadcrumbs[newBreadcrumbs.length - 2].filters =
+          drillByConfig.filters;
         return newBreadcrumbs;
       });
     },

From 764c3c95cf3be732b50a17282d510b03beddca0b Mon Sep 17 00:00:00 2001
From: Ville Brofeldt <33317356+villebro@users.noreply.github.com>
Date: Fri, 21 Apr 2023 17:02:59 +0300
Subject: [PATCH 21/47] fix(mssql): apply top after distinct (#23751)

---
 .../cypress/integration/dataset/dataset_list.test.ts           | 2 +-
 superset/db_engine_specs/base.py                               | 3 +++
 tests/unit_tests/db_engine_specs/test_mssql.py                 | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/superset-frontend/cypress-base/cypress/integration/dataset/dataset_list.test.ts b/superset-frontend/cypress-base/cypress/integration/dataset/dataset_list.test.ts
index e78c328ec510..6bf0419cdda2 100644
--- a/superset-frontend/cypress-base/cypress/integration/dataset/dataset_list.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/dataset/dataset_list.test.ts
@@ -24,7 +24,7 @@ describe('Dataset list', () => {
     cy.visit(DATASET_LIST_PATH);
   });
 
-  it('should open Explore on dataset name click', () => {
+  xit('should open Explore on dataset name click', () => {
     cy.intercept('**/api/v1/explore/**').as('explore');
     cy.get('[data-test="listview-table"] [data-test="internal-link"]')
       .contains('birth_names')
diff --git a/superset/db_engine_specs/base.py b/superset/db_engine_specs/base.py
index aac971dea078..f1dda401afc1 100644
--- a/superset/db_engine_specs/base.py
+++ b/superset/db_engine_specs/base.py
@@ -899,6 +899,9 @@ def apply_top_to_sql(cls, sql: str, limit: int) -> str:
                 if word.upper() in cls.select_keywords
             ]
             first_select = selects[0]
+            if tokens[first_select + 1].upper() == "DISTINCT":
+                first_select += 1
+
             tokens.insert(first_select + 1, "TOP")
             tokens.insert(first_select + 2, str(final_limit))
 
diff --git a/tests/unit_tests/db_engine_specs/test_mssql.py b/tests/unit_tests/db_engine_specs/test_mssql.py
index 554ad97055f6..acd35a4ecf47 100644
--- a/tests/unit_tests/db_engine_specs/test_mssql.py
+++ b/tests/unit_tests/db_engine_specs/test_mssql.py
@@ -257,6 +257,7 @@ def test_cte_query_parsing(original: TypeEngine, expected: str) -> None:
 select TOP 100 * from currency""",
             1000,
         ),
+        ("SELECT DISTINCT x from tbl", "SELECT DISTINCT TOP 100 x from tbl", 100),
         ("SELECT 1 as cnt", "SELECT TOP 10 1 as cnt", 10),
         (
             "select TOP 1000 * from abc where id=1",

From 2f7229cae85555cb8820b33551617f0fe71e2fcb Mon Sep 17 00:00:00 2001
From: Kamil Gabryjelski <kamil.gabryjelski@gmail.com>
Date: Fri, 21 Apr 2023 17:41:31 +0200
Subject: [PATCH 22/47] fix: Drill by modal resizing (#23757)

---
 superset-frontend/src/components/Chart/DrillBy/DrillByChart.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/superset-frontend/src/components/Chart/DrillBy/DrillByChart.tsx b/superset-frontend/src/components/Chart/DrillBy/DrillByChart.tsx
index e69a201f5c33..5e3f9d3c1fe6 100644
--- a/superset-frontend/src/components/Chart/DrillBy/DrillByChart.tsx
+++ b/superset-frontend/src/components/Chart/DrillBy/DrillByChart.tsx
@@ -49,6 +49,7 @@ export default function DrillByChart({
       css={css`
         width: 100%;
         height: 100%;
+        min-height: 0;
       `}
     >
       <SuperChart

From 4d97ecec65d6a70a86bbeb8b079baf6e07090c6b Mon Sep 17 00:00:00 2001
From: Evan Rusackas <evan@preset.io>
Date: Fri, 21 Apr 2023 10:13:45 -0600
Subject: [PATCH 23/47] chore(feature flags): updating the status of a few
 flags (#23670)

---
 RESOURCES/FEATURE_FLAGS.md | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/RESOURCES/FEATURE_FLAGS.md b/RESOURCES/FEATURE_FLAGS.md
index 6e6bf16e5fc2..49fac479cb92 100644
--- a/RESOURCES/FEATURE_FLAGS.md
+++ b/RESOURCES/FEATURE_FLAGS.md
@@ -31,11 +31,10 @@ These features are considered **unfinished** and should only be used on developm
 - DASHBOARD_CACHE
 - DASHBOARD_NATIVE_FILTERS_SET
 - DISABLE_DATASET_SOURCE_EDIT
-- DRILL_TO_DETAIL
+- DRILL_BY
 - ENABLE_ADVANCED_DATA_TYPES
 - ENABLE_EXPLORE_JSON_CSRF_PROTECTION
 - ENABLE_TEMPLATE_REMOVE_FILTERS
-- HORIZONTAL_FILTER_BAR
 - KV_STORE
 - PRESTO_EXPAND_DATA
 - REMOVE_SLICE_LEVEL_LABEL_COLORS
@@ -54,10 +53,14 @@ These features are **finished** but currently being tested. They are usable, but
 - CONFIRM_DASHBOARD_DIFF
 - DASHBOARD_EDIT_CHART_IN_NEW_TAB
 - DASHBOARD_FILTERS_EXPERIMENTAL
-- DASHBOARD_NATIVE_FILTERS
+- DASHBOARD_VIRTUALIZATION
+- DRILL_TO_DETAIL
 - DYNAMIC_PLUGINS: [(docs)](https://superset.apache.org/docs/installation/running-on-kubernetes)
 - ENABLE_JAVASCRIPT_CONTROLS
+- ESTIMATE_QUERY_COST
+- GENERIC_CHART_AXES
 - GLOBAL_ASYNC_QUERIES [(docs)](https://github.com/apache/superset/blob/master/CONTRIBUTING.md#async-chart-queries)
+- HORIZONTAL_FILTER_BAR
 - RLS_IN_SQLLAB
 - SSH_TUNNELING [(docs)](https://superset.apache.org/docs/installation/setup-ssh-tunneling)
 - USE_ANALAGOUS_COLORS
@@ -65,7 +68,7 @@ These features are **finished** but currently being tested. They are usable, but
 
 ## Stable
 
-These features flags are **safe for production** and have been tested.
+These features flags are **safe for production**. They have been tested and will be supported for the foreseeable future.
 
 [//]: # "PLEASE KEEP THE LIST SORTED ALPHABETICALLY"
 
@@ -73,6 +76,8 @@ These features flags are **safe for production** and have been tested.
 - ALLOW_ADHOC_SUBQUERY
 - DASHBOARD_CROSS_FILTERS
 - DASHBOARD_RBAC [(docs)](https://superset.apache.org/docs/creating-charts-dashboards/first-dashboard#manage-access-to-dashboards)
+- DASHBOARD_NATIVE_FILTERS
+- DATAPANEL_CLOSED_BY_DEFAULT
 - DISABLE_LEGACY_DATASOURCE_EDITOR
 - DRUID_JOINS
 - EMBEDDABLE_CHARTS

From b734a0f82e3109dd80ff09cac1f1ebbf033d3d03 Mon Sep 17 00:00:00 2001
From: Kamil Gabryjelski <kamil.gabryjelski@gmail.com>
Date: Fri, 21 Apr 2023 18:46:02 +0200
Subject: [PATCH 24/47] feat: Display both queries result in Table mode for
 Mixed Chart in drill by modal (#23768)

---
 .../components/Chart/DrillBy/DrillByModal.tsx |  32 ++----
 .../Chart/DrillBy/useResultsTableView.test.ts | 108 ++++++++++++++++++
 .../Chart/DrillBy/useResultsTableView.tsx     |  73 ++++++++++++
 3 files changed, 189 insertions(+), 24 deletions(-)
 create mode 100644 superset-frontend/src/components/Chart/DrillBy/useResultsTableView.test.ts
 create mode 100644 superset-frontend/src/components/Chart/DrillBy/useResultsTableView.tsx

diff --git a/superset-frontend/src/components/Chart/DrillBy/DrillByModal.tsx b/superset-frontend/src/components/Chart/DrillBy/DrillByModal.tsx
index 3792a2f315cc..df754f66a9bb 100644
--- a/superset-frontend/src/components/Chart/DrillBy/DrillByModal.tsx
+++ b/superset-frontend/src/components/Chart/DrillBy/DrillByModal.tsx
@@ -46,7 +46,6 @@ import { postFormData } from 'src/explore/exploreUtils/formData';
 import { noOp } from 'src/utils/common';
 import { simpleFilterToAdhoc } from 'src/utils/simpleFilterToAdhoc';
 import { useDatasetMetadataBar } from 'src/features/datasets/metadataBar/useDatasetMetadataBar';
-import { SingleQueryResultPane } from 'src/explore/components/DataTablesPane/components/SingleQueryResultPane';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
 import Alert from 'src/components/Alert';
 import { Dataset, DrillByType } from '../types';
@@ -59,8 +58,7 @@ import {
   DrillByBreadcrumb,
   useDrillByBreadcrumbs,
 } from './useDrillByBreadcrumbs';
-
-const DATA_SIZE = 15;
+import { useResultsTableView } from './useResultsTableView';
 
 const DEFAULT_ADHOC_FILTER_FIELD_NAME = 'adhoc_filters';
 interface ModalFooterProps {
@@ -167,9 +165,10 @@ export default function DrillByModal({
 
   const { displayModeToggle, drillByDisplayMode } = useDisplayModeToggle();
   const [chartDataResult, setChartDataResult] = useState<QueryData[]>();
-  const [datasourceId] = useMemo(
-    () => formData.datasource.split('__'),
-    [formData.datasource],
+
+  const resultsTable = useResultsTableView(
+    chartDataResult,
+    formData.datasource,
   );
 
   const [currentFormData, setCurrentFormData] = useState(formData);
@@ -414,24 +413,9 @@ export default function DrillByModal({
             inContextMenu={inContextMenu}
           />
         )}
-        {drillByDisplayMode === DrillByType.Table && chartDataResult && (
-          <div
-            css={css`
-              .pagination-container {
-                bottom: ${-theme.gridUnit * 4}px;
-              }
-            `}
-          >
-            <SingleQueryResultPane
-              colnames={chartDataResult[0].colnames}
-              coltypes={chartDataResult[0].coltypes}
-              data={chartDataResult[0].data}
-              dataSize={DATA_SIZE}
-              datasourceId={datasourceId}
-              isVisible
-            />
-          </div>
-        )}
+        {drillByDisplayMode === DrillByType.Table &&
+          chartDataResult &&
+          resultsTable}
         {contextMenu}
       </div>
     </Modal>
diff --git a/superset-frontend/src/components/Chart/DrillBy/useResultsTableView.test.ts b/superset-frontend/src/components/Chart/DrillBy/useResultsTableView.test.ts
new file mode 100644
index 000000000000..36cc51a68431
--- /dev/null
+++ b/superset-frontend/src/components/Chart/DrillBy/useResultsTableView.test.ts
@@ -0,0 +1,108 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { renderHook } from '@testing-library/react-hooks';
+import userEvent from '@testing-library/user-event';
+import { render, screen, within, waitFor } from 'spec/helpers/testing-library';
+import { useResultsTableView } from './useResultsTableView';
+
+const MOCK_CHART_DATA_RESULT = [
+  {
+    colnames: ['name', 'sum__num'],
+    coltypes: [1, 0],
+    data: [
+      {
+        name: 'Michael',
+        sum__num: 2467063,
+      },
+      {
+        name: 'Christopher',
+        sum__num: 1725265,
+      },
+      {
+        name: 'David',
+        sum__num: 1570516,
+      },
+      {
+        name: 'James',
+        sum__num: 1506025,
+      },
+    ],
+  },
+  {
+    colnames: ['gender', 'year', 'count'],
+    coltypes: [1, 0, 0],
+    data: [
+      {
+        gender: 'boy',
+        year: 2000,
+        count: 1000,
+      },
+      {
+        gender: 'girl',
+        year: 2000,
+        count: 2000,
+      },
+    ],
+  },
+];
+
+test('Displays results table for 1 query', () => {
+  const { result } = renderHook(() =>
+    useResultsTableView(MOCK_CHART_DATA_RESULT.slice(0, 1), '1__table'),
+  );
+  render(result.current, { useRedux: true });
+  expect(screen.queryByRole('tablist')).not.toBeInTheDocument();
+  expect(screen.getByRole('table')).toBeInTheDocument();
+  expect(screen.getAllByRole('columnheader')).toHaveLength(2);
+  expect(screen.getAllByTestId('table-row')).toHaveLength(4);
+});
+
+test('Displays results for 2 queries', async () => {
+  const { result } = renderHook(() =>
+    useResultsTableView(MOCK_CHART_DATA_RESULT, '1__table'),
+  );
+  render(result.current, { useRedux: true });
+  const getActiveTabElement = () =>
+    document.querySelector('.ant-tabs-tabpane-active') as HTMLElement;
+
+  const tablistElement = screen.getByRole('tablist');
+  expect(tablistElement).toBeInTheDocument();
+  expect(within(tablistElement).getByText('Results 1')).toBeInTheDocument();
+  expect(within(tablistElement).getByText('Results 2')).toBeInTheDocument();
+
+  expect(within(getActiveTabElement()).getByRole('table')).toBeInTheDocument();
+  expect(
+    within(getActiveTabElement()).getAllByRole('columnheader'),
+  ).toHaveLength(2);
+  expect(
+    within(getActiveTabElement()).getAllByTestId('table-row'),
+  ).toHaveLength(4);
+
+  userEvent.click(screen.getByText('Results 2'));
+
+  await waitFor(() => {
+    expect(
+      within(getActiveTabElement()).getAllByRole('columnheader'),
+    ).toHaveLength(3);
+  });
+  expect(
+    within(getActiveTabElement()).getAllByTestId('table-row'),
+  ).toHaveLength(2);
+});
diff --git a/superset-frontend/src/components/Chart/DrillBy/useResultsTableView.tsx b/superset-frontend/src/components/Chart/DrillBy/useResultsTableView.tsx
new file mode 100644
index 000000000000..2778fab72c43
--- /dev/null
+++ b/superset-frontend/src/components/Chart/DrillBy/useResultsTableView.tsx
@@ -0,0 +1,73 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import React from 'react';
+import { css, styled, isDefined, QueryData, t } from '@superset-ui/core';
+import { SingleQueryResultPane } from 'src/explore/components/DataTablesPane/components/SingleQueryResultPane';
+import Tabs from 'src/components/Tabs';
+
+const DATA_SIZE = 15;
+
+const PaginationContainer = styled.div`
+  ${({ theme }) => css`
+    & .pagination-container {
+      bottom: ${-theme.gridUnit * 4}px;
+    }
+  `}
+`;
+
+export const useResultsTableView = (
+  chartDataResult: QueryData[] | undefined,
+  datasourceId: string,
+) => {
+  if (!isDefined(chartDataResult)) {
+    return <div />;
+  }
+  if (chartDataResult.length === 1) {
+    return (
+      <PaginationContainer>
+        <SingleQueryResultPane
+          colnames={chartDataResult[0].colnames}
+          coltypes={chartDataResult[0].coltypes}
+          data={chartDataResult[0].data}
+          dataSize={DATA_SIZE}
+          datasourceId={datasourceId}
+          isVisible
+        />
+      </PaginationContainer>
+    );
+  }
+  return (
+    <Tabs fullWidth={false}>
+      {chartDataResult.map((res, index) => (
+        <Tabs.TabPane tab={t('Results %s', index + 1)} key={index}>
+          <PaginationContainer>
+            <SingleQueryResultPane
+              colnames={res.colnames}
+              coltypes={res.coltypes}
+              data={res.data}
+              dataSize={DATA_SIZE}
+              datasourceId={datasourceId}
+              isVisible
+            />
+          </PaginationContainer>
+        </Tabs.TabPane>
+      ))}
+    </Tabs>
+  );
+};

From 35f36a20ffe075b97ff1eef26e1876b6c4e9619a Mon Sep 17 00:00:00 2001
From: Evan Rusackas <evan@preset.io>
Date: Fri, 21 Apr 2023 11:48:33 -0600
Subject: [PATCH 25/47] chore(e2e): skip the worst offender of flaky tests.
 (#23772)

---
 .../cypress/integration/dashboard/editmode.test.ts             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard/editmode.test.ts b/superset-frontend/cypress-base/cypress/integration/dashboard/editmode.test.ts
index d4e51046bc4d..113cf92d564f 100644
--- a/superset-frontend/cypress-base/cypress/integration/dashboard/editmode.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/dashboard/editmode.test.ts
@@ -734,7 +734,8 @@ describe('Dashboard edit', () => {
       cy.getBySel('dashboard-charts-filter-search-input').clear();
     });
 
-    it('should disable the Save button when undoing', () => {
+    // TODO fix this test! This was the #1 flaky test as of 4/21/23 according to cypress dashboard.
+    xit('should disable the Save button when undoing', () => {
       cy.get('[role="checkbox"]').click();
       dragComponent('Unicode Cloud', 'card-title', false);
       cy.getBySel('header-save-button').should('be.enabled');

From b92ace46b0cdc917d75cba35cb5e9cd48e9ab017 Mon Sep 17 00:00:00 2001
From: Piyush Khandelwal <44616979+piyush9923@users.noreply.github.com>
Date: Fri, 21 Apr 2023 22:23:34 +0400
Subject: [PATCH 26/47] fix(sqllab): Persisting tab state for saved query 
 (#23087)

---
 superset/views/sql_lab/views.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/superset/views/sql_lab/views.py b/superset/views/sql_lab/views.py
index 99b57fe195bb..e16b28830c8e 100644
--- a/superset/views/sql_lab/views.py
+++ b/superset/views/sql_lab/views.py
@@ -152,6 +152,8 @@ def post(self) -> FlaskResponse:  # pylint: disable=no-self-use
             sql=query_editor.get("sql", "SELECT ..."),
             query_limit=query_editor.get("queryLimit"),
             hide_left_bar=query_editor.get("hideLeftBar"),
+            saved_query_id=query_editor.get("remoteId"),
+            template_params=query_editor.get("templateParams"),
         )
         (
             db.session.query(TabState)

From 3193111d988e6083e25345de4e621f1c2b394817 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Apr 2023 16:40:01 -0600
Subject: [PATCH 27/47] build(deps-dev): bump @types/node from 18.15.12 to
 18.15.13 in /superset-websocket (#23765)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 superset-websocket/package-lock.json | 14 +++++++-------
 superset-websocket/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/superset-websocket/package-lock.json b/superset-websocket/package-lock.json
index ff0aeeef22db..6e45bfa3cf57 100644
--- a/superset-websocket/package-lock.json
+++ b/superset-websocket/package-lock.json
@@ -22,7 +22,7 @@
         "@types/ioredis": "^4.27.8",
         "@types/jest": "^27.0.2",
         "@types/jsonwebtoken": "^9.0.1",
-        "@types/node": "^18.15.12",
+        "@types/node": "^18.15.13",
         "@types/uuid": "^9.0.1",
         "@types/ws": "^8.5.4",
         "@typescript-eslint/eslint-plugin": "^5.59.0",
@@ -1318,9 +1318,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "18.15.12",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.12.tgz",
-      "integrity": "sha512-Wha1UwsB3CYdqUm2PPzh/1gujGCNtWVUYF0mB00fJFoR4gTyWTDPjSm+zBF787Ahw8vSGgBja90MkgFwvB86Dg==",
+      "version": "18.15.13",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.13.tgz",
+      "integrity": "sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==",
       "dev": true
     },
     "node_modules/@types/prettier": {
@@ -6926,9 +6926,9 @@
       }
     },
     "@types/node": {
-      "version": "18.15.12",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.12.tgz",
-      "integrity": "sha512-Wha1UwsB3CYdqUm2PPzh/1gujGCNtWVUYF0mB00fJFoR4gTyWTDPjSm+zBF787Ahw8vSGgBja90MkgFwvB86Dg==",
+      "version": "18.15.13",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.13.tgz",
+      "integrity": "sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==",
       "dev": true
     },
     "@types/prettier": {
diff --git a/superset-websocket/package.json b/superset-websocket/package.json
index ec2e6f9b7c23..fe3c853c6b09 100644
--- a/superset-websocket/package.json
+++ b/superset-websocket/package.json
@@ -28,7 +28,7 @@
     "@types/ioredis": "^4.27.8",
     "@types/jest": "^27.0.2",
     "@types/jsonwebtoken": "^9.0.1",
-    "@types/node": "^18.15.12",
+    "@types/node": "^18.15.13",
     "@types/uuid": "^9.0.1",
     "@types/ws": "^8.5.4",
     "@typescript-eslint/eslint-plugin": "^5.59.0",

From 4b3e507e8b22b2d25e9a79c1feb03fceaefbd464 Mon Sep 17 00:00:00 2001
From: John Bodley <4567245+john-bodley@users.noreply.github.com>
Date: Sat, 22 Apr 2023 11:48:20 +1200
Subject: [PATCH 28/47] fix(native-filters): Fix encoding of non-temporal
 default values (#23779)

---
 superset/utils/dashboard_filter_scopes_converter.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/superset/utils/dashboard_filter_scopes_converter.py b/superset/utils/dashboard_filter_scopes_converter.py
index 3cc93c967af2..c0ee64370d1c 100644
--- a/superset/utils/dashboard_filter_scopes_converter.py
+++ b/superset/utils/dashboard_filter_scopes_converter.py
@@ -268,13 +268,13 @@ def convert_filter_scopes_to_native_filters(  # pylint: disable=invalid-name,too
                         if not default:
                             default = config.get("defaultValue")
 
-                            if default:
-                                if config["multiple"]:
-                                    default = default.split(";")
-                                else:
-                                    default = [default]
+                            if default and config["multiple"]:
+                                default = default.split(";")
 
                         if default:
+                            if not isinstance(default, list):
+                                default = [default]
+
                             fltr["defaultDataMask"] = {
                                 "extraFormData": {
                                     "filters": [

From 669e1802a602f36005c130f11d46d1fa9f72dd44 Mon Sep 17 00:00:00 2001
From: "Hugh A. Miles II" <hughmil3s@gmail.com>
Date: Sat, 22 Apr 2023 18:57:20 -0400
Subject: [PATCH 29/47] fix: [chart power query] error show when user input
 column with x-axis (#23776)

---
 superset/models/sql_lab.py | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/superset/models/sql_lab.py b/superset/models/sql_lab.py
index d37ed440db86..b2f0c8c1ed2f 100644
--- a/superset/models/sql_lab.py
+++ b/superset/models/sql_lab.py
@@ -41,6 +41,7 @@
 )
 from sqlalchemy.engine.url import URL
 from sqlalchemy.orm import backref, relationship
+from sqlalchemy.sql.elements import ColumnElement, literal_column
 
 from superset import security_manager
 from superset.jinja_context import BaseTemplateProcessor, get_template_processor
@@ -52,7 +53,7 @@
 )
 from superset.sql_parse import CtasMethod, ParsedQuery, Table
 from superset.sqllab.limiting_factor import LimitingFactor
-from superset.utils.core import QueryStatus, user_label
+from superset.utils.core import get_column_name, QueryStatus, user_label
 
 if TYPE_CHECKING:
     from superset.connectors.sqla.models import TableColumn
@@ -329,6 +330,29 @@ def get_column(self, column_name: Optional[str]) -> Optional[Dict[str, Any]]:
                 return col
         return None
 
+    def adhoc_column_to_sqla(
+        self,
+        col: "AdhocColumn",  # type: ignore
+        force_type_check: bool = False,
+        template_processor: Optional[BaseTemplateProcessor] = None,
+    ) -> ColumnElement:
+        """
+        Turn an adhoc column into a sqlalchemy column.
+        :param col: Adhoc column definition
+        :param template_processor: template_processor instance
+        :returns: The metric defined as a sqlalchemy column
+        :rtype: sqlalchemy.sql.column
+        """
+        label = get_column_name(col)
+        expression = self._process_sql_expression(
+            expression=col["sqlExpression"],
+            database_id=self.database_id,
+            schema=self.schema,
+            template_processor=template_processor,
+        )
+        sqla_column = literal_column(expression)
+        return self.make_sqla_column_compatible(sqla_column, label)
+
 
 class SavedQuery(Model, AuditMixinNullable, ExtraJSONMixin, ImportExportMixin):
     """ORM model for SQL query"""

From adde66785c91880b595333a7adbf13c2fa39c22e Mon Sep 17 00:00:00 2001
From: alexclavel-ocient <111374753+alexclavel-ocient@users.noreply.github.com>
Date: Sat, 22 Apr 2023 20:49:32 -0500
Subject: [PATCH 30/47] feat: Add Ocient support (#22812)

Co-authored-by: jwilliams-ocient <60358443+jwilliams-ocient@users.noreply.github.com>
Co-authored-by: Jordan Williams <jwilliams@ocient.com>
Co-authored-by: rmasters1 <100157128+rmasters1@users.noreply.github.com>
---
 docs/docs/databases/ocient.mdx                |  37 ++
 setup.py                                      |   4 +
 superset/db_engine_specs/ocient.py            | 342 ++++++++++++++++++
 .../unit_tests/db_engine_specs/test_ocient.py | 215 +++++++++++
 4 files changed, 598 insertions(+)
 create mode 100644 docs/docs/databases/ocient.mdx
 create mode 100644 superset/db_engine_specs/ocient.py
 create mode 100644 tests/unit_tests/db_engine_specs/test_ocient.py

diff --git a/docs/docs/databases/ocient.mdx b/docs/docs/databases/ocient.mdx
new file mode 100644
index 000000000000..ce0b70b74fb8
--- /dev/null
+++ b/docs/docs/databases/ocient.mdx
@@ -0,0 +1,37 @@
+---
+title: Ocient DB
+hide_title: true
+sidebar_position: 20
+version: 1
+---
+
+## Ocient DB
+
+The recommended connector library for Ocient is [sqlalchemy-ocient](https://pypi.org/project/sqlalchemy-ocient).
+
+## Install the Ocient Driver
+
+```
+pip install sqlalchemy-ocient
+```
+
+## Connecting to Ocient
+
+The format of the Ocient DSN is:
+
+```shell
+ocient://user:password@[host][:port][/database][?param1=value1&...]
+```
+
+The DSN for connecting to an `exampledb` database hosted at `examplehost:4050` with TLS enabled is:
+```shell
+ocient://admin:abc123@examplehost:4050/exampledb?tls=on
+```
+
+**NOTE**: You must enter the `user` and `password` credentials.  `host` defaults to localhost,
+port defaults to 4050, database defaults to `system` and `tls` defaults
+to `unverified`.
+
+## User Access Control
+
+Make sure the user has privileges to access and use all required databases, schemas, tables, views, and warehouses, as the Ocient SQLAlchemy engine does not test for user or role rights by default.
diff --git a/setup.py b/setup.py
index b314614b46b8..664d320b22e5 100644
--- a/setup.py
+++ b/setup.py
@@ -164,6 +164,10 @@ def get_git_sha() -> str:
         "kylin": ["kylinpy>=2.8.1, <2.9"],
         "mssql": ["pymssql>=2.1.4, <2.2"],
         "mysql": ["mysqlclient>=2.1.0, <3"],
+        "ocient": [
+            "sqlalchemy-ocient>=1.0.0",
+            "pyocient>=1.0.15",
+        ],
         "oracle": ["cx-Oracle>8.0.0, <8.1"],
         "pinot": ["pinotdb>=0.3.3, <0.4"],
         "postgres": ["psycopg2-binary==2.9.5"],
diff --git a/superset/db_engine_specs/ocient.py b/superset/db_engine_specs/ocient.py
new file mode 100644
index 000000000000..87bd2c242234
--- /dev/null
+++ b/superset/db_engine_specs/ocient.py
@@ -0,0 +1,342 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import re
+import threading
+from typing import Any, Callable, Dict, List, NamedTuple, Optional, Pattern, Set, Tuple
+
+from flask_babel import gettext as __
+from sqlalchemy.engine.reflection import Inspector
+from sqlalchemy.orm import Session
+
+# Need to try-catch here because pyocient may not be installed
+try:
+    # Ensure pyocient inherits Superset's logging level
+    import pyocient
+
+    from superset import app
+
+    superset_log_level = app.config["LOG_LEVEL"]
+    pyocient.logger.setLevel(superset_log_level)
+except ImportError as e:
+    pass
+
+from superset.db_engine_specs.base import BaseEngineSpec
+from superset.errors import SupersetErrorType
+from superset.models.core import Database
+from superset.models.sql_lab import Query
+
+# Regular expressions to catch custom errors
+
+CONNECTION_INVALID_USERNAME_REGEX = re.compile(
+    r"The referenced user does not exist \(User '(?P<username>.*?)' not found\)"
+)
+CONNECTION_INVALID_PASSWORD_REGEX = re.compile(
+    r"The userid/password combination was not valid \(Incorrect password for user\)"
+)
+CONNECTION_INVALID_HOSTNAME_REGEX = re.compile(
+    r"Unable to connect to (?P<host>.*?):(?P<port>.*?)"
+)
+CONNECTION_UNKNOWN_DATABASE_REGEX = re.compile(
+    r"No database named '(?P<database>.*?)' exists"
+)
+CONNECTION_INVALID_PORT_ERROR = re.compile("Port out of range 0-65535")
+INVALID_CONNECTION_STRING_REGEX = re.compile(
+    r"An invalid connection string attribute was specified"
+    r" \(failed to decrypt cipher text\)"
+)
+SYNTAX_ERROR_REGEX = re.compile(
+    r"There is a syntax error in your statement \((?P<qualifier>.*?)"
+    r" input '(?P<input>.*?)' expecting (?P<expected>.*?)\)"
+)
+TABLE_DOES_NOT_EXIST_REGEX = re.compile(
+    r"The referenced table or view '(?P<table>.*?)' does not exist"
+)
+COLUMN_DOES_NOT_EXIST_REGEX = re.compile(
+    r"The reference to column '(?P<column>.*?)' is not valid"
+)
+
+
+# Custom datatype conversion functions
+
+
+def _to_hex(data: bytes) -> str:
+    """
+    Converts the bytes object into a string of hexadecimal digits.
+
+    :param data: the bytes object
+    :returns: string of hexadecimal digits representing the bytes
+    """
+    return data.hex()
+
+
+def _polygon_to_json(polygon: Any) -> str:
+    """
+    Converts the _STPolygon object into its JSON representation.
+
+    :param data: the polygon object
+    :returns: JSON representation of the polygon
+    """
+    json_value = f"{str([[p.long, p.lat] for p in polygon.exterior])}"
+    if polygon.holes:
+        for hole in polygon.holes:
+            json_value += f", {str([[p.long, p.lat] for p in hole])}"
+        json_value = f"[{json_value}]"
+    return json_value
+
+
+def _linestring_to_json(linestring: Any) -> str:
+    """
+    Converts the _STLinestring object into its JSON representation.
+
+    :param data: the linestring object
+    :returns: JSON representation of the linestring
+    """
+    return f"{str([[p.long, p.lat] for p in linestring.points])}"
+
+
+def _point_to_comma_delimited(point: Any) -> str:
+    """
+    Returns the x and y coordinates as a comma delimited string.
+
+    :param data: the point object
+    :returns: the x and y coordinates as a comma delimited string
+    """
+    return f"{point.long}, {point.lat}"
+
+
+# Sanitization function for column values
+SanitizeFunc = Callable[[Any], Any]
+
+# Represents a pair of a column index and the sanitization function
+# to apply to its values.
+PlacedSanitizeFunc = NamedTuple(
+    "PlacedSanitizeFunc",
+    [
+        ("column_index", int),
+        ("sanitize_func", SanitizeFunc),
+    ],
+)
+
+# This map contains functions used to sanitize values for column types
+# that cannot be processed natively by Superset.
+#
+# Superset serializes temporal objects using a custom serializer
+# defined in superset/utils/core.py (#json_int_dttm_ser(...)). Other
+# are serialized by the default JSON encoder.
+#
+# Need to try-catch here because pyocient may not be installed
+try:
+    from pyocient import TypeCodes
+
+    _sanitized_ocient_type_codes: Dict[int, SanitizeFunc] = {
+        TypeCodes.BINARY: _to_hex,
+        TypeCodes.ST_POINT: _point_to_comma_delimited,
+        TypeCodes.IP: str,
+        TypeCodes.IPV4: str,
+        TypeCodes.ST_LINESTRING: _linestring_to_json,
+        TypeCodes.ST_POLYGON: _polygon_to_json,
+    }
+except ImportError as e:
+    _sanitized_ocient_type_codes = {}
+
+
+def _find_columns_to_sanitize(cursor: Any) -> List[PlacedSanitizeFunc]:
+    """
+    Cleans the column value for consumption by Superset.
+
+    :param cursor: the result set cursor
+    :returns: the list of tuples consisting of the column index and sanitization function
+    """
+    return [
+        PlacedSanitizeFunc(i, _sanitized_ocient_type_codes[cursor.description[i][1]])
+        for i in range(len(cursor.description))
+        if cursor.description[i][1] in _sanitized_ocient_type_codes
+    ]
+
+
+class OcientEngineSpec(BaseEngineSpec):
+    engine = "ocient"
+    engine_name = "Ocient"
+    # limit_method = LimitMethod.WRAP_SQL
+    force_column_alias_quotes = True
+    max_column_name_length = 30
+
+    allows_cte_in_subquery = False
+    # Ocient does not support cte names starting with underscores
+    cte_alias = "cte__"
+    # Store mapping of superset Query id -> Ocient ID
+    # These are inserted into the cache when executing the query
+    # They are then removed, either upon cancellation or query completion
+    query_id_mapping: Dict[str, str] = dict()
+    query_id_mapping_lock = threading.Lock()
+
+    custom_errors: Dict[Pattern[str], Tuple[str, SupersetErrorType, Dict[str, Any]]] = {
+        CONNECTION_INVALID_USERNAME_REGEX: (
+            __('The username "%(username)s" does not exist.'),
+            SupersetErrorType.CONNECTION_INVALID_USERNAME_ERROR,
+            {},
+        ),
+        CONNECTION_INVALID_PASSWORD_REGEX: (
+            __(
+                "The user/password combination is not valid"
+                " (Incorrect password for user)."
+            ),
+            SupersetErrorType.CONNECTION_INVALID_PASSWORD_ERROR,
+            {},
+        ),
+        CONNECTION_UNKNOWN_DATABASE_REGEX: (
+            __('Could not connect to database: "%(database)s"'),
+            SupersetErrorType.CONNECTION_UNKNOWN_DATABASE_ERROR,
+            {},
+        ),
+        CONNECTION_INVALID_HOSTNAME_REGEX: (
+            __('Could not resolve hostname: "%(host)s".'),
+            SupersetErrorType.CONNECTION_INVALID_HOSTNAME_ERROR,
+            {},
+        ),
+        CONNECTION_INVALID_PORT_ERROR: (
+            __("Port out of range 0-65535"),
+            SupersetErrorType.CONNECTION_INVALID_PORT_ERROR,
+            {},
+        ),
+        INVALID_CONNECTION_STRING_REGEX: (
+            __(
+                "Invalid Connection String: Expecting String of"
+                " the form 'ocient://user:pass@host:port/database'."
+            ),
+            SupersetErrorType.GENERIC_DB_ENGINE_ERROR,
+            {},
+        ),
+        SYNTAX_ERROR_REGEX: (
+            __('Syntax Error: %(qualifier)s input "%(input)s" expecting "%(expected)s'),
+            SupersetErrorType.SYNTAX_ERROR,
+            {},
+        ),
+        TABLE_DOES_NOT_EXIST_REGEX: (
+            __('Table or View "%(table)s" does not exist.'),
+            SupersetErrorType.TABLE_DOES_NOT_EXIST_ERROR,
+            {},
+        ),
+        COLUMN_DOES_NOT_EXIST_REGEX: (
+            __('Invalid reference to column: "%(column)s"'),
+            SupersetErrorType.COLUMN_DOES_NOT_EXIST_ERROR,
+            {},
+        ),
+    }
+    _time_grain_expressions = {
+        None: "{col}",
+        "PT1S": "ROUND({col}, 'SECOND')",
+        "PT1M": "ROUND({col}, 'MINUTE')",
+        "PT1H": "ROUND({col}, 'HOUR')",
+        "P1D": "ROUND({col}, 'DAY')",
+        "P1W": "ROUND({col}, 'WEEK')",
+        "P1M": "ROUND({col}, 'MONTH')",
+        "P0.25Y": "ROUND({col}, 'QUARTER')",
+        "P1Y": "ROUND({col}, 'YEAR')",
+    }
+
+    @classmethod
+    def get_table_names(
+        cls, database: Database, inspector: Inspector, schema: Optional[str]
+    ) -> Set[str]:
+        return inspector.get_table_names(schema)
+
+    @classmethod
+    def fetch_data(
+        cls, cursor: Any, limit: Optional[int] = None
+    ) -> List[Tuple[Any, ...]]:
+        try:
+            rows: List[Tuple[Any, ...]] = super(OcientEngineSpec, cls).fetch_data(
+                cursor, limit
+            )
+        except Exception as exception:
+            with OcientEngineSpec.query_id_mapping_lock:
+                del OcientEngineSpec.query_id_mapping[
+                    getattr(cursor, "superset_query_id")
+                ]
+            raise exception
+
+        # TODO: Unsure if we need to verify that we are receiving rows:
+        if len(rows) > 0 and type(rows[0]).__name__ == "Row":
+            # Peek at the schema to determine which column values, if any,
+            # require sanitization.
+            columns_to_sanitize: List[PlacedSanitizeFunc] = _find_columns_to_sanitize(
+                cursor
+            )
+
+            if columns_to_sanitize:
+                # At least 1 column has to be sanitized.
+
+                def identity(x: Any) -> Any:
+                    return x
+
+                # Use the identity function if the column type doesn't need to be
+                # sanitized.
+                sanitization_functions: List[SanitizeFunc] = [
+                    identity for _ in range(len(cursor.description))
+                ]
+                for info in columns_to_sanitize:
+                    sanitization_functions[info.column_index] = info.sanitize_func
+
+                # pyocient returns a list of NamedTuple objects which represent a
+                # single row. We have to do this copy because that data type is
+                # NamedTuple's are immutable.
+                rows = [
+                    tuple(
+                        sanitize_func(val)
+                        for sanitize_func, val in zip(sanitization_functions, row)
+                    )
+                    for row in rows
+                ]
+        return rows
+
+    @classmethod
+    def epoch_to_dttm(cls) -> str:
+        return "DATEADD(S, {col}, '1970-01-01')"
+
+    @classmethod
+    def epoch_ms_to_dttm(cls) -> str:
+        return "DATEADD(MS, {col}, '1970-01-01')"
+
+    @classmethod
+    def get_cancel_query_id(cls, cursor: Any, query: Query) -> Optional[str]:
+        # Return a Non-None value
+        # If None is returned, Superset will not call cancel_query
+        return "DUMMY_VALUE"
+
+    @classmethod
+    def handle_cursor(cls, cursor: Any, query: Query, session: Session) -> None:
+        with OcientEngineSpec.query_id_mapping_lock:
+            OcientEngineSpec.query_id_mapping[query.id] = cursor.query_id
+
+        # Add the query id to the cursor
+        setattr(cursor, "superset_query_id", query.id)
+        return super().handle_cursor(cursor, query, session)
+
+    @classmethod
+    def cancel_query(cls, cursor: Any, query: Query, cancel_query_id: str) -> bool:
+        with OcientEngineSpec.query_id_mapping_lock:
+            if query.id in OcientEngineSpec.query_id_mapping:
+                cursor.execute(f"CANCEL {OcientEngineSpec.query_id_mapping[query.id]}")
+                # Query has been cancelled, so we can safely remove the cursor from
+                # the cache
+                del OcientEngineSpec.query_id_mapping[query.id]
+                return True
+            # If the query is not in the cache, it must have either been cancelled
+            # elsewhere or completed
+            return False
diff --git a/tests/unit_tests/db_engine_specs/test_ocient.py b/tests/unit_tests/db_engine_specs/test_ocient.py
new file mode 100644
index 000000000000..c5578fa93727
--- /dev/null
+++ b/tests/unit_tests/db_engine_specs/test_ocient.py
@@ -0,0 +1,215 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# pylint: disable=import-outside-toplevel
+
+from datetime import datetime
+from typing import Dict, List, Tuple
+
+import pytest
+
+from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
+
+# (msg,expected)
+MARSHALED_OCIENT_ERRORS: List[Tuple[str, SupersetError]] = [
+    (
+        "The referenced user does not exist (User 'mj' not found)",
+        SupersetError(
+            message='The username "mj" does not exist.',
+            error_type=SupersetErrorType.CONNECTION_INVALID_USERNAME_ERROR,
+            level=ErrorLevel.ERROR,
+            extra={
+                "engine_name": "Ocient",
+                "issue_codes": [
+                    {
+                        "code": 1012,
+                        "message": "Issue 1012 - The username provided when connecting to a database is not valid.",
+                    }
+                ],
+            },
+        ),
+    ),
+    (
+        "The userid/password combination was not valid (Incorrect password for user)",
+        SupersetError(
+            message="The user/password combination is not valid (Incorrect password for user).",
+            error_type=SupersetErrorType.CONNECTION_INVALID_PASSWORD_ERROR,
+            level=ErrorLevel.ERROR,
+            extra={
+                "engine_name": "Ocient",
+                "issue_codes": [
+                    {
+                        "code": 1013,
+                        "message": "Issue 1013 - The password provided when connecting to a database is not valid.",
+                    }
+                ],
+            },
+        ),
+    ),
+    (
+        "No database named 'bulls' exists",
+        SupersetError(
+            message='Could not connect to database: "bulls"',
+            error_type=SupersetErrorType.CONNECTION_UNKNOWN_DATABASE_ERROR,
+            level=ErrorLevel.ERROR,
+            extra={
+                "engine_name": "Ocient",
+                "issue_codes": [
+                    {
+                        "code": 1015,
+                        "message": "Issue 1015 - Either the database is spelled incorrectly or does not exist.",
+                    }
+                ],
+            },
+        ),
+    ),
+    (
+        "Unable to connect to unitedcenter.com:4050",
+        SupersetError(
+            message='Could not resolve hostname: "unitedcenter.com".',
+            error_type=SupersetErrorType.CONNECTION_INVALID_HOSTNAME_ERROR,
+            level=ErrorLevel.ERROR,
+            extra={
+                "engine_name": "Ocient",
+                "issue_codes": [
+                    {
+                        "code": 1007,
+                        "message": "Issue 1007 - The hostname provided can't be resolved.",
+                    }
+                ],
+            },
+        ),
+    ),
+    (
+        "Port out of range 0-65535",
+        SupersetError(
+            message="Port out of range 0-65535",
+            error_type=SupersetErrorType.CONNECTION_INVALID_PORT_ERROR,
+            level=ErrorLevel.ERROR,
+            extra={
+                "engine_name": "Ocient",
+                "issue_codes": [
+                    {
+                        "code": 1034,
+                        "message": "Issue 1034 - The port number is invalid.",
+                    }
+                ],
+            },
+        ),
+    ),
+    (
+        "An invalid connection string attribute was specified (failed to decrypt cipher text)",
+        SupersetError(
+            message="Invalid Connection String: Expecting String of the form 'ocient://user:pass@host:port/database'.",
+            error_type=SupersetErrorType.GENERIC_DB_ENGINE_ERROR,
+            level=ErrorLevel.ERROR,
+            extra={
+                "engine_name": "Ocient",
+                "issue_codes": [
+                    {
+                        "code": 1002,
+                        "message": "Issue 1002 - The database returned an unexpected error.",
+                    }
+                ],
+            },
+        ),
+    ),
+    (
+        "There is a syntax error in your statement (extraneous input 'foo bar baz' expecting {<EOF>, 'trace', 'using'})",
+        SupersetError(
+            message="Syntax Error: extraneous input \"foo bar baz\" expecting \"{<EOF>, 'trace', 'using'}",
+            error_type=SupersetErrorType.SYNTAX_ERROR,
+            level=ErrorLevel.ERROR,
+            extra={
+                "engine_name": "Ocient",
+                "issue_codes": [
+                    {
+                        "code": 1030,
+                        "message": "Issue 1030 - The query has a syntax error.",
+                    }
+                ],
+            },
+        ),
+    ),
+    (
+        "There is a syntax error in your statement (mismatched input 'to' expecting {<EOF>, 'trace', 'using'})",
+        SupersetError(
+            message="Syntax Error: mismatched input \"to\" expecting \"{<EOF>, 'trace', 'using'}",
+            error_type=SupersetErrorType.SYNTAX_ERROR,
+            level=ErrorLevel.ERROR,
+            extra={
+                "engine_name": "Ocient",
+                "issue_codes": [
+                    {
+                        "code": 1030,
+                        "message": "Issue 1030 - The query has a syntax error.",
+                    }
+                ],
+            },
+        ),
+    ),
+    (
+        "The referenced table or view 'goats' does not exist",
+        SupersetError(
+            message='Table or View "goats" does not exist.',
+            error_type=SupersetErrorType.TABLE_DOES_NOT_EXIST_ERROR,
+            level=ErrorLevel.ERROR,
+            extra={
+                "engine_name": "Ocient",
+                "issue_codes": [
+                    {
+                        "code": 1003,
+                        "message": "Issue 1003 - There is a syntax error in the SQL query. Perhaps there was a misspelling or a typo.",
+                    },
+                    {
+                        "code": 1005,
+                        "message": "Issue 1005 - The table was deleted or renamed in the database.",
+                    },
+                ],
+            },
+        ),
+    ),
+    (
+        "The reference to column 'goats' is not valid",
+        SupersetError(
+            message='Invalid reference to column: "goats"',
+            error_type=SupersetErrorType.COLUMN_DOES_NOT_EXIST_ERROR,
+            level=ErrorLevel.ERROR,
+            extra={
+                "engine_name": "Ocient",
+                "issue_codes": [
+                    {
+                        "code": 1003,
+                        "message": "Issue 1003 - There is a syntax error in the SQL query. Perhaps there was a misspelling or a typo.",
+                    },
+                    {
+                        "code": 1004,
+                        "message": "Issue 1004 - The column was deleted or renamed in the database.",
+                    },
+                ],
+            },
+        ),
+    ),
+]
+
+
+@pytest.mark.parametrize("msg,expected", MARSHALED_OCIENT_ERRORS)
+def test_connection_errors(msg: str, expected: SupersetError) -> None:
+    from superset.db_engine_specs.ocient import OcientEngineSpec
+
+    result = OcientEngineSpec.extract_errors(Exception(msg))
+    assert result == [expected]

From 6ae5388dcf0205e89d4abcc5cefcb644e8c7cdbd Mon Sep 17 00:00:00 2001
From: Daniel Vaz Gaspar <danielvazgaspar@gmail.com>
Date: Sun, 23 Apr 2023 15:44:21 +0100
Subject: [PATCH 31/47] fix: allow db driver distinction on enforced URI params
 (#23769)

---
 superset/db_engine_specs/base.py              | 18 +++++++-----
 superset/db_engine_specs/mysql.py             | 10 +++++--
 tests/integration_tests/model_tests.py        | 12 +++++++-
 .../unit_tests/db_engine_specs/test_mysql.py  | 28 +++++++++++++++++++
 4 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/superset/db_engine_specs/base.py b/superset/db_engine_specs/base.py
index f1dda401afc1..a21c0b41006a 100644
--- a/superset/db_engine_specs/base.py
+++ b/superset/db_engine_specs/base.py
@@ -355,10 +355,11 @@ class BaseEngineSpec:  # pylint: disable=too-many-public-methods
     # This set will give the keywords for data limit statements
     # to consider for the engines with TOP SQL parsing
     top_keywords: Set[str] = {"TOP"}
-    # A set of disallowed connection query parameters
-    disallow_uri_query_params: Set[str] = set()
+    # A set of disallowed connection query parameters by driver name
+    disallow_uri_query_params: Dict[str, Set[str]] = {}
     # A Dict of query parameters that will always be used on every connection
-    enforce_uri_query_params: Dict[str, Any] = {}
+    # by driver name
+    enforce_uri_query_params: Dict[str, Dict[str, Any]] = {}
 
     force_column_alias_quotes = False
     arraysize = 0
@@ -1099,7 +1100,10 @@ def adjust_engine_params(  # pylint: disable=unused-argument
         This is important because DB engine specs can be installed from 3rd party
         packages.
         """
-        return uri, {**connect_args, **cls.enforce_uri_query_params}
+        return uri, {
+            **connect_args,
+            **cls.enforce_uri_query_params.get(uri.get_driver_name(), {}),
+        }
 
     @classmethod
     def patch(cls) -> None:
@@ -1853,9 +1857,9 @@ def validate_database_uri(cls, sqlalchemy_uri: URL) -> None:
 
         :param sqlalchemy_uri:
         """
-        if existing_disallowed := cls.disallow_uri_query_params.intersection(
-            sqlalchemy_uri.query
-        ):
+        if existing_disallowed := cls.disallow_uri_query_params.get(
+            sqlalchemy_uri.get_driver_name(), set()
+        ).intersection(sqlalchemy_uri.query):
             raise ValueError(f"Forbidden query parameter(s): {existing_disallowed}")
 
 
diff --git a/superset/db_engine_specs/mysql.py b/superset/db_engine_specs/mysql.py
index 07d2aea36286..9c5bd0034a5b 100644
--- a/superset/db_engine_specs/mysql.py
+++ b/superset/db_engine_specs/mysql.py
@@ -175,8 +175,14 @@ class MySQLEngineSpec(BaseEngineSpec, BasicParametersMixin):
             {},
         ),
     }
-    disallow_uri_query_params = {"local_infile"}
-    enforce_uri_query_params = {"local_infile": 0}
+    disallow_uri_query_params = {
+        "mysqldb": {"local_infile"},
+        "mysqlconnector": {"allow_local_infile"},
+    }
+    enforce_uri_query_params = {
+        "mysqldb": {"local_infile": 0},
+        "mysqlconnector": {"allow_local_infile": 0},
+    }
 
     @classmethod
     def convert_dttm(
diff --git a/tests/integration_tests/model_tests.py b/tests/integration_tests/model_tests.py
index 35dbcc0a6bb3..d5684b1b6210 100644
--- a/tests/integration_tests/model_tests.py
+++ b/tests/integration_tests/model_tests.py
@@ -194,7 +194,7 @@ def test_impersonate_user_presto(self, mocked_create_engine):
     @mock.patch("superset.models.core.create_engine")
     def test_adjust_engine_params_mysql(self, mocked_create_engine):
         model = Database(
-            database_name="test_database",
+            database_name="test_database1",
             sqlalchemy_uri="mysql://user:password@localhost",
         )
         model._get_sqla_engine()
@@ -203,6 +203,16 @@ def test_adjust_engine_params_mysql(self, mocked_create_engine):
         assert str(call_args[0][0]) == "mysql://user:password@localhost"
         assert call_args[1]["connect_args"]["local_infile"] == 0
 
+        model = Database(
+            database_name="test_database2",
+            sqlalchemy_uri="mysql+mysqlconnector://user:password@localhost",
+        )
+        model._get_sqla_engine()
+        call_args = mocked_create_engine.call_args
+
+        assert str(call_args[0][0]) == "mysql+mysqlconnector://user:password@localhost"
+        assert call_args[1]["connect_args"]["allow_local_infile"] == 0
+
     @mock.patch("superset.models.core.create_engine")
     def test_impersonate_user_trino(self, mocked_create_engine):
         principal_user = security_manager.find_user(username="gamma")
diff --git a/tests/unit_tests/db_engine_specs/test_mysql.py b/tests/unit_tests/db_engine_specs/test_mysql.py
index 31e01ace5855..07ce6838fc20 100644
--- a/tests/unit_tests/db_engine_specs/test_mysql.py
+++ b/tests/unit_tests/db_engine_specs/test_mysql.py
@@ -104,8 +104,11 @@ def test_convert_dttm(
     "sqlalchemy_uri,error",
     [
         ("mysql://user:password@host/db1?local_infile=1", True),
+        ("mysql+mysqlconnector://user:password@host/db1?allow_local_infile=1", True),
         ("mysql://user:password@host/db1?local_infile=0", True),
+        ("mysql+mysqlconnector://user:password@host/db1?allow_local_infile=0", True),
         ("mysql://user:password@host/db1", False),
+        ("mysql+mysqlconnector://user:password@host/db1", False),
     ],
 )
 def test_validate_database_uri(sqlalchemy_uri: str, error: bool) -> None:
@@ -123,18 +126,43 @@ def test_validate_database_uri(sqlalchemy_uri: str, error: bool) -> None:
     "sqlalchemy_uri,connect_args,returns",
     [
         ("mysql://user:password@host/db1", {"local_infile": 1}, {"local_infile": 0}),
+        (
+            "mysql+mysqlconnector://user:password@host/db1",
+            {"allow_local_infile": 1},
+            {"allow_local_infile": 0},
+        ),
         ("mysql://user:password@host/db1", {"local_infile": -1}, {"local_infile": 0}),
+        (
+            "mysql+mysqlconnector://user:password@host/db1",
+            {"allow_local_infile": -1},
+            {"allow_local_infile": 0},
+        ),
         ("mysql://user:password@host/db1", {"local_infile": 0}, {"local_infile": 0}),
+        (
+            "mysql+mysqlconnector://user:password@host/db1",
+            {"allow_local_infile": 0},
+            {"allow_local_infile": 0},
+        ),
         (
             "mysql://user:password@host/db1",
             {"param1": "some_value"},
             {"local_infile": 0, "param1": "some_value"},
         ),
+        (
+            "mysql+mysqlconnector://user:password@host/db1",
+            {"param1": "some_value"},
+            {"allow_local_infile": 0, "param1": "some_value"},
+        ),
         (
             "mysql://user:password@host/db1",
             {"local_infile": 1, "param1": "some_value"},
             {"local_infile": 0, "param1": "some_value"},
         ),
+        (
+            "mysql+mysqlconnector://user:password@host/db1",
+            {"allow_local_infile": 1, "param1": "some_value"},
+            {"allow_local_infile": 0, "param1": "some_value"},
+        ),
     ],
 )
 def test_adjust_engine_params(

From d4c0ae34f4e23d1172d2ae3335f73873b0b37c1e Mon Sep 17 00:00:00 2001
From: Kamil Gabryjelski <kamil.gabryjelski@gmail.com>
Date: Mon, 24 Apr 2023 17:42:56 +0200
Subject: [PATCH 32/47] fix: Context menu crashing when there is no dimension
 in Echarts Series charts (#23797)

---
 .../plugin-chart-echarts/src/Timeseries/EchartsTimeseries.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/EchartsTimeseries.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/EchartsTimeseries.tsx
index 516255de0cbd..202d62756965 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/EchartsTimeseries.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/EchartsTimeseries.tsx
@@ -205,7 +205,7 @@ export default function EchartsTimeseries({
         const pointerEvent = eventParams.event.event;
         const values = [
           ...(eventParams.name ? [eventParams.name] : []),
-          ...labelMap[seriesName],
+          ...(labelMap[seriesName] ?? []),
         ];
         if (data && xAxis.type === AxisType.time) {
           drillToDetailFilters.push({

From c536d92ade3b60e7cac75f85bcc2d6bad7e8c884 Mon Sep 17 00:00:00 2001
From: "Michael S. Molina" <70410625+michael-s-molina@users.noreply.github.com>
Date: Mon, 24 Apr 2023 13:04:47 -0300
Subject: [PATCH 33/47] fix: Docker ephemeral env (#23786)

---
 .github/workflows/docker-ephemeral-env.yml | 124 ++++++++++-----------
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/.github/workflows/docker-ephemeral-env.yml b/.github/workflows/docker-ephemeral-env.yml
index 544c1c8b1f42..e3ca7473d2aa 100644
--- a/.github/workflows/docker-ephemeral-env.yml
+++ b/.github/workflows/docker-ephemeral-env.yml
@@ -1,4 +1,4 @@
-name: Push ephmereral env image
+name: Push ephemeral env image
 
 on:
   workflow_run:
@@ -17,14 +17,14 @@ jobs:
         id: check
         shell: bash
         run: |
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          if [ -n "${{ (secrets.AWS_ACCESS_KEY_ID != '' &&
-                        secrets.AWS_ACCESS_KEY_ID != '' &&
-                        secrets.AWS_SECRET_ACCESS_KEY != '' &&
-                        secrets.AWS_SECRET_ACCESS_KEY != '') || '' }}" ]; then
-            echo "has-secrets=1" >> "$GITHUB_OUTPUT"
-          fi
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            if [ -n "${{ (secrets.AWS_ACCESS_KEY_ID != '' &&
+              secrets.AWS_ACCESS_KEY_ID != '' &&
+              secrets.AWS_SECRET_ACCESS_KEY != '' &&
+              secrets.AWS_SECRET_ACCESS_KEY != '') || '' }}" ]; then
+              echo "has-secrets=1" >> "$GITHUB_OUTPUT"
+            fi
 
   docker_ephemeral_env:
     needs: config
@@ -33,66 +33,66 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: 'Download artifact'
-      uses: actions/github-script@v3.1.0
-      with:
-        script: |
-          const artifacts = await github.actions.listWorkflowRunArtifacts({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              run_id: ${{ github.event.workflow_run.id }},
-          });
+      - name: "Download artifact"
+        uses: actions/github-script@v3.1.0
+        with:
+          script: |
+            const artifacts = await github.actions.listWorkflowRunArtifacts({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                run_id: ${{ github.event.workflow_run.id }},
+            });
 
-          core.info('*** artifacts')
-          core.info(JSON.stringify(artifacts))
+            core.info('*** artifacts')
+            core.info(JSON.stringify(artifacts))
 
-          const matchArtifact = artifacts.data.artifacts.filter((artifact) => {
-            return artifact.name == "build"
-          })[0];
-          if(!matchArtifact) return core.setFailed("Build artifacts not found")
+            const matchArtifact = artifacts.data.artifacts.filter((artifact) => {
+              return artifact.name == "build"
+            })[0];
+            if(!matchArtifact) return core.setFailed("Build artifacts not found")
 
-          const download = await github.actions.downloadArtifact({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              artifact_id: matchArtifact.id,
-              archive_format: 'zip',
-          });
-          var fs = require('fs');
-          fs.writeFileSync('${{github.workspace}}/build.zip', Buffer.from(download.data));
+            const download = await github.actions.downloadArtifact({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                artifact_id: matchArtifact.id,
+                archive_format: 'zip',
+            });
+            var fs = require('fs');
+            fs.writeFileSync('${{github.workspace}}/build.zip', Buffer.from(download.data));
 
-    - run: unzip build.zip
+      - run: unzip build.zip
 
-    - name: Display downloaded files (debug)
-      run: ls -la
+      - name: Display downloaded files (debug)
+        run: ls -la
 
-    - name: Get SHA
-      id: get-sha
-      run: echo "::set-output name=sha::$(cat ./SHA)"
+      - name: Get SHA
+        id: get-sha
+        run: echo "::set-output name=sha::$(cat ./SHA)"
 
-    - name: Get PR
-      id: get-pr
-      run: echo "::set-output name=num::$(cat ./PR-NUM)"
+      - name: Get PR
+        id: get-pr
+        run: echo "::set-output name=num::$(cat ./PR-NUM)"
 
-    - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1
-      with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: us-west-2
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: us-west-2
 
-    - name: Login to Amazon ECR
-      id: login-ecr
-      uses: aws-actions/amazon-ecr-login@v1
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1
 
-    - name: Load, tag and push image to ECR
-      id: push-image
-      env:
-        ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
-        ECR_REPOSITORY: superset-ci
-        SHA: ${{ steps.get-sha.outputs.sha }}
-        IMAGE_TAG: pr-${{ steps.get-pr.outputs.num }}
-      run: |
-        docker load < $SHA.tar.gz
-        docker tag $SHA $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
-        docker tag $SHA $ECR_REGISTRY/$ECR_REPOSITORY:$SHA
-        docker push -a $ECR_REGISTRY/$ECR_REPOSITORY
+      - name: Load, tag and push image to ECR
+        id: push-image
+        env:
+          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+          ECR_REPOSITORY: superset-ci
+          SHA: ${{ steps.get-sha.outputs.sha }}
+          IMAGE_TAG: pr-${{ steps.get-pr.outputs.num }}
+        run: |
+          docker load < $SHA.tar.gz
+          docker tag $SHA $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+          docker tag $SHA $ECR_REGISTRY/$ECR_REPOSITORY:$SHA
+          docker push -a $ECR_REGISTRY/$ECR_REPOSITORY

From f7810b602025512166266c55c38587aa87b26d64 Mon Sep 17 00:00:00 2001
From: "Michael S. Molina" <70410625+michael-s-molina@users.noreply.github.com>
Date: Mon, 24 Apr 2023 13:10:58 -0300
Subject: [PATCH 34/47] feat(revert): Re-introduces the RLS page (#23777)

---
 UPDATING.md                                   |   1 +
 .../rls/RowLevelSecurityModal.test.tsx        | 295 +++++++++++
 .../features/rls/RowLevelSecurityModal.tsx    | 479 ++++++++++++++++++
 .../src/features/rls/constants.ts             |  31 ++
 superset-frontend/src/features/rls/types.ts   |  51 ++
 .../RowLevelSecurityList.test.tsx             | 259 ++++++++++
 .../src/pages/RowLevelSecurityList/index.tsx  | 350 +++++++++++++
 superset-frontend/src/views/routes.tsx        |  11 +
 superset/config.py                            |  14 +-
 superset/connectors/sqla/views.py             | 117 +----
 superset/dao/base.py                          |  11 +
 superset/initialization/__init__.py           |  22 +-
 superset/row_level_security/api.py            | 349 +++++++++++++
 .../row_level_security/commands/__init__.py   |  16 +
 .../commands/bulk_delete.py                   |  52 ++
 .../row_level_security/commands/create.py     |  57 +++
 .../row_level_security/commands/exceptions.py |  29 ++
 .../row_level_security/commands/update.py     |  63 +++
 superset/row_level_security/dao.py            |  23 +
 superset/row_level_security/schemas.py        | 154 ++++++
 .../templates/superset/models/rls/list.html   |  96 ----
 .../security/row_level_security_tests.py      | 419 +++++++++++++--
 22 files changed, 2642 insertions(+), 257 deletions(-)
 create mode 100644 superset-frontend/src/features/rls/RowLevelSecurityModal.test.tsx
 create mode 100644 superset-frontend/src/features/rls/RowLevelSecurityModal.tsx
 create mode 100644 superset-frontend/src/features/rls/constants.ts
 create mode 100644 superset-frontend/src/features/rls/types.ts
 create mode 100644 superset-frontend/src/pages/RowLevelSecurityList/RowLevelSecurityList.test.tsx
 create mode 100644 superset-frontend/src/pages/RowLevelSecurityList/index.tsx
 create mode 100644 superset/row_level_security/api.py
 create mode 100644 superset/row_level_security/commands/__init__.py
 create mode 100644 superset/row_level_security/commands/bulk_delete.py
 create mode 100644 superset/row_level_security/commands/create.py
 create mode 100644 superset/row_level_security/commands/exceptions.py
 create mode 100644 superset/row_level_security/commands/update.py
 create mode 100644 superset/row_level_security/dao.py
 create mode 100644 superset/row_level_security/schemas.py
 delete mode 100644 superset/templates/superset/models/rls/list.html

diff --git a/UPDATING.md b/UPDATING.md
index 9afd8d353fd1..12e69b3738a5 100644
--- a/UPDATING.md
+++ b/UPDATING.md
@@ -53,6 +53,7 @@ assists people when migrating to a new version.
 - [22798](https://github.com/apache/superset/pull/22798): To make the welcome page more relevant in production environments, the last tab on the welcome page has been changed from to feature all charts/dashboards the user has access to (previously only examples were shown). To keep current behavior unchanged, add the following to your `superset_config.py`: `WELCOME_PAGE_LAST_TAB = "examples"`
 - [22328](https://github.com/apache/superset/pull/22328): For deployments that have enabled the "THUMBNAILS" feature flag, the function that calculates dashboard digests has been updated to consider additional properties to more accurately identify changes in the dashboard metadata. This change will invalidate all currently cached dashboard thumbnails.
 - [21765](https://github.com/apache/superset/pull/21765): For deployments that have enabled the "ALERT_REPORTS" feature flag, Gamma users will no longer have read and write access to Alerts & Reports by default. To give Gamma users the ability to schedule reports from the Dashboard and Explore view like before, create an additional role with "can read on ReportSchedule" and "can write on ReportSchedule" permissions. To further give Gamma users access to the "Alerts & Reports" menu and CRUD view, add "menu access on Manage" and "menu access on Alerts & Report" permissions to the role.
+- [22325](https://github.com/apache/superset/pull/22325): "RLS_FORM_QUERY_REL_FIELDS" is replaced by "RLS_BASE_RELATED_FIELD_FILTERS" feature flag. Its value format stays same.
 
 ### Potential Downtime
 
diff --git a/superset-frontend/src/features/rls/RowLevelSecurityModal.test.tsx b/superset-frontend/src/features/rls/RowLevelSecurityModal.test.tsx
new file mode 100644
index 000000000000..6253c42c8275
--- /dev/null
+++ b/superset-frontend/src/features/rls/RowLevelSecurityModal.test.tsx
@@ -0,0 +1,295 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import React from 'react';
+import fetchMock from 'fetch-mock';
+import { render, screen, waitFor, within } from 'spec/helpers/testing-library';
+import { act } from 'react-dom/test-utils';
+import userEvent from '@testing-library/user-event';
+import RowLevelSecurityModal, {
+  RowLevelSecurityModalProps,
+} from './RowLevelSecurityModal';
+import { FilterType } from './types';
+
+const getRuleEndpoint = 'glob:*/api/v1/rowlevelsecurity/1';
+const getRelatedRolesEndpoint =
+  'glob:*/api/v1/rowlevelsecurity/related/roles?q*';
+const getRelatedTablesEndpoint =
+  'glob:*/api/v1/rowlevelsecurity/related/tables?q*';
+const postRuleEndpoint = 'glob:*/api/v1/rowlevelsecurity/*';
+const putRuleEndpoint = 'glob:*/api/v1/rowlevelsecurity/1';
+
+const mockGetRuleResult = {
+  description_columns: {},
+  id: 1,
+  label_columns: {
+    clause: 'Clause',
+    description: 'Description',
+    filter_type: 'Filter Type',
+    group_key: 'Group Key',
+    name: 'Name',
+    'roles.id': 'Roles Id',
+    'roles.name': 'Roles Name',
+    'tables.id': 'Tables Id',
+    'tables.table_name': 'Tables Table Name',
+  },
+  result: {
+    clause: 'gender="girl"',
+    description: 'test rls rule with RTL',
+    filter_type: 'Base',
+    group_key: 'g1',
+    id: 1,
+    name: 'rls 1',
+    roles: [
+      {
+        id: 1,
+        name: 'Admin',
+      },
+    ],
+    tables: [
+      {
+        id: 2,
+        table_name: 'birth_names',
+      },
+    ],
+  },
+  show_columns: [
+    'name',
+    'description',
+    'filter_type',
+    'tables.id',
+    'tables.table_name',
+    'roles.id',
+    'roles.name',
+    'group_key',
+    'clause',
+  ],
+  show_title: 'Show Row Level Security Filter',
+};
+
+const mockGetRolesResult = {
+  count: 3,
+  result: [
+    {
+      extra: {},
+      text: 'Admin',
+      value: 1,
+    },
+    {
+      extra: {},
+      text: 'Public',
+      value: 2,
+    },
+    {
+      extra: {},
+      text: 'Alpha',
+      value: 3,
+    },
+  ],
+};
+
+const mockGetTablesResult = {
+  count: 3,
+  result: [
+    {
+      extra: {},
+      text: 'wb_health_population',
+      value: 1,
+    },
+    {
+      extra: {},
+      text: 'birth_names',
+      value: 2,
+    },
+    {
+      extra: {},
+      text: 'long_lat',
+      value: 3,
+    },
+  ],
+};
+
+fetchMock.get(getRuleEndpoint, mockGetRuleResult);
+fetchMock.get(getRelatedRolesEndpoint, mockGetRolesResult);
+fetchMock.get(getRelatedTablesEndpoint, mockGetTablesResult);
+fetchMock.post(postRuleEndpoint, {});
+fetchMock.put(putRuleEndpoint, {});
+
+global.URL.createObjectURL = jest.fn();
+
+const NOOP = () => {};
+
+const addNewRuleDefaultProps: RowLevelSecurityModalProps = {
+  addDangerToast: NOOP,
+  addSuccessToast: NOOP,
+  show: true,
+  rule: null,
+  onHide: NOOP,
+};
+
+describe('Rule modal', () => {
+  async function renderAndWait(props: RowLevelSecurityModalProps) {
+    const mounted = act(async () => {
+      render(<RowLevelSecurityModal {...props} />, { useRedux: true });
+    });
+    return mounted;
+  }
+
+  it('Sets correct title for adding new rule', async () => {
+    await renderAndWait(addNewRuleDefaultProps);
+    const title = screen.getByText('Add Rule');
+    expect(title).toBeInTheDocument();
+    expect(fetchMock.calls(getRuleEndpoint)).toHaveLength(0);
+    expect(fetchMock.calls(getRelatedTablesEndpoint)).toHaveLength(0);
+    expect(fetchMock.calls(getRelatedRolesEndpoint)).toHaveLength(0);
+  });
+
+  it('Sets correct title for editing existing rule', async () => {
+    await renderAndWait({
+      ...addNewRuleDefaultProps,
+      rule: {
+        id: 1,
+        name: 'test rule',
+        filter_type: FilterType.BASE,
+        tables: [{ key: 1, id: 1, value: 'birth_names' }],
+        roles: [],
+      },
+    });
+    const title = screen.getByText('Edit Rule');
+    expect(title).toBeInTheDocument();
+    expect(fetchMock.calls(getRuleEndpoint)).toHaveLength(1);
+    expect(fetchMock.calls(getRelatedTablesEndpoint)).toHaveLength(0);
+    expect(fetchMock.calls(getRelatedRolesEndpoint)).toHaveLength(0);
+  });
+
+  it('Fills correct values when editing rule', async () => {
+    await renderAndWait({
+      ...addNewRuleDefaultProps,
+      rule: {
+        id: 1,
+        name: 'rls 1',
+        filter_type: FilterType.BASE,
+      },
+    });
+
+    const name = await screen.findByTestId('rule-name-test');
+    expect(name).toHaveDisplayValue('rls 1');
+    userEvent.type(name, 'rls 2');
+    expect(name).toHaveDisplayValue('rls 2');
+
+    const filterType = await screen.findByText('Base');
+    expect(filterType).toBeInTheDocument();
+
+    const roles = await screen.findByText('Admin');
+    expect(roles).toBeInTheDocument();
+
+    const tables = await screen.findByText('birth_names');
+    expect(tables).toBeInTheDocument();
+
+    const groupKey = await screen.findByTestId('group-key-test');
+    expect(groupKey).toHaveValue('g1');
+    userEvent.clear(groupKey);
+    userEvent.type(groupKey, 'g2');
+    expect(groupKey).toHaveValue('g2');
+
+    const clause = await screen.findByTestId('clause-test');
+    expect(clause).toHaveValue('gender="girl"');
+    userEvent.clear(clause);
+    userEvent.type(clause, 'gender="boy"');
+    expect(clause).toHaveValue('gender="boy"');
+
+    const description = await screen.findByTestId('description-test');
+    expect(description).toHaveValue('test rls rule with RTL');
+    userEvent.clear(description);
+    userEvent.type(description, 'test description');
+    expect(description).toHaveValue('test description');
+  });
+
+  it('Does not allow to create rule without name, tables and clause', async () => {
+    await renderAndWait(addNewRuleDefaultProps);
+
+    const addButton = screen.getByRole('button', { name: /add/i });
+    expect(addButton).toBeDisabled();
+
+    const nameTextBox = screen.getByTestId('rule-name-test');
+    userEvent.type(nameTextBox, 'name');
+
+    expect(addButton).toBeDisabled();
+
+    const getSelect = () => screen.getByRole('combobox', { name: 'Tables' });
+    const getElementByClassName = (className: string) =>
+      document.querySelector(className)! as HTMLElement;
+
+    const findSelectOption = (text: string) =>
+      waitFor(() =>
+        within(getElementByClassName('.rc-virtual-list')).getByText(text),
+      );
+    const open = () => waitFor(() => userEvent.click(getSelect()));
+    await open();
+    userEvent.click(await findSelectOption('birth_names'));
+    expect(addButton).toBeDisabled();
+
+    const clause = await screen.findByTestId('clause-test');
+    userEvent.type(clause, 'gender="girl"');
+
+    expect(addButton).toBeEnabled();
+  });
+
+  it('Creates a new rule', async () => {
+    await renderAndWait(addNewRuleDefaultProps);
+
+    const addButton = screen.getByRole('button', { name: /add/i });
+
+    const nameTextBox = screen.getByTestId('rule-name-test');
+    userEvent.type(nameTextBox, 'name');
+
+    const getSelect = () => screen.getByRole('combobox', { name: 'Tables' });
+    const getElementByClassName = (className: string) =>
+      document.querySelector(className)! as HTMLElement;
+
+    const findSelectOption = (text: string) =>
+      waitFor(() =>
+        within(getElementByClassName('.rc-virtual-list')).getByText(text),
+      );
+    const open = () => waitFor(() => userEvent.click(getSelect()));
+    await open();
+    userEvent.click(await findSelectOption('birth_names'));
+
+    const clause = await screen.findByTestId('clause-test');
+    userEvent.type(clause, 'gender="girl"');
+
+    await waitFor(() => userEvent.click(addButton));
+
+    expect(fetchMock.calls(postRuleEndpoint)).toHaveLength(1);
+  });
+
+  it('Updates existing rule', async () => {
+    await renderAndWait({
+      ...addNewRuleDefaultProps,
+      rule: {
+        id: 1,
+        name: 'rls 1',
+        filter_type: FilterType.BASE,
+      },
+    });
+
+    const addButton = screen.getByRole('button', { name: /save/i });
+    await waitFor(() => userEvent.click(addButton));
+    expect(fetchMock.calls(putRuleEndpoint)).toHaveLength(4);
+  });
+});
diff --git a/superset-frontend/src/features/rls/RowLevelSecurityModal.tsx b/superset-frontend/src/features/rls/RowLevelSecurityModal.tsx
new file mode 100644
index 000000000000..1fc0b597dd31
--- /dev/null
+++ b/superset-frontend/src/features/rls/RowLevelSecurityModal.tsx
@@ -0,0 +1,479 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import {
+  css,
+  styled,
+  SupersetClient,
+  SupersetTheme,
+  t,
+} from '@superset-ui/core';
+import Modal from 'src/components/Modal';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import Icons from 'src/components/Icons';
+import Select from 'src/components/Select/Select';
+import AsyncSelect from 'src/components/Select/AsyncSelect';
+import rison from 'rison';
+import { LabeledErrorBoundInput } from 'src/components/Form';
+import { noBottomMargin } from 'src/components/ReportModal/styles';
+import InfoTooltip from 'src/components/InfoTooltip';
+import { useSingleViewResource } from 'src/views/CRUD/hooks';
+import { FilterOptions } from './constants';
+import { FilterType, RLSObject, RoleObject, TableObject } from './types';
+
+const StyledModal = styled(Modal)`
+  max-width: 1200px;
+  width: 100%;
+  .ant-modal-body {
+    overflow: initial;
+  }
+`;
+const StyledIcon = (theme: SupersetTheme) => css`
+  margin: auto ${theme.gridUnit * 2}px auto 0;
+  color: ${theme.colors.grayscale.base};
+`;
+
+const StyledSectionContainer = styled.div`
+  display: flex;
+  flex-direction: column;
+  padding: ${({ theme }) =>
+    `${theme.gridUnit * 3}px ${theme.gridUnit * 4}px ${theme.gridUnit * 2}px`};
+
+  label {
+    font-size: ${({ theme }) => theme.typography.sizes.s}px;
+    color: ${({ theme }) => theme.colors.grayscale.light1};
+  }
+`;
+
+const StyledInputContainer = styled.div`
+  display: flex;
+  flex-direction: column;
+  margin: ${({ theme }) => theme.gridUnit}px;
+
+  margin-bottom: ${({ theme }) => theme.gridUnit * 4}px;
+
+  .input-container {
+    display: flex;
+    align-items: center;
+
+    > div {
+      width: 100%;
+    }
+
+    label {
+      display: flex;
+      margin-right: ${({ theme }) => theme.gridUnit * 2}px;
+    }
+  }
+
+  input,
+  textarea {
+    flex: 1 1 auto;
+  }
+
+  textarea {
+    height: 100px;
+    resize: none;
+  }
+
+  .required {
+    margin-left: ${({ theme }) => theme.gridUnit / 2}px;
+    color: ${({ theme }) => theme.colors.error.base};
+  }
+`;
+
+export interface RowLevelSecurityModalProps {
+  rule: RLSObject | null;
+  addSuccessToast: (msg: string) => void;
+  addDangerToast: (msg: string) => void;
+  onAdd?: (alert?: any) => void;
+  onHide: () => void;
+  show: boolean;
+}
+
+const DEAFULT_RULE = {
+  name: '',
+  filter_type: FilterType.REGULAR,
+  tables: [],
+  roles: [],
+  clause: '',
+  group_key: '',
+  description: '',
+};
+
+function RowLevelSecurityModal(props: RowLevelSecurityModalProps) {
+  const { rule, addDangerToast, addSuccessToast, onHide, show } = props;
+
+  const [currentRule, setCurrentRule] = useState<RLSObject>({
+    ...DEAFULT_RULE,
+  });
+  const [disableSave, setDisableSave] = useState<boolean>(true);
+
+  const isEditMode = rule !== null;
+
+  // * hooks *
+  const {
+    state: { loading, resource, error: fetchError },
+    fetchResource,
+    createResource,
+    updateResource,
+    clearError,
+  } = useSingleViewResource<RLSObject>(
+    `rowlevelsecurity`,
+    t('rowlevelsecurity'),
+    addDangerToast,
+  );
+
+  // initialize
+  useEffect(() => {
+    if (!isEditMode) {
+      setCurrentRule({ ...DEAFULT_RULE });
+    } else if (rule?.id !== null && !loading && !fetchError) {
+      fetchResource(rule.id as number);
+    }
+  }, [rule]);
+
+  useEffect(() => {
+    if (resource) {
+      setCurrentRule({ ...resource, id: rule?.id });
+      const selectedTableAndRoles = getSelectedData();
+      updateRuleState('tables', selectedTableAndRoles?.tables || []);
+      updateRuleState('roles', selectedTableAndRoles?.roles || []);
+    }
+  }, [resource]);
+
+  // find selected tables and roles
+  const getSelectedData = useCallback(() => {
+    if (!resource) {
+      return null;
+    }
+    const tables: TableObject[] = [];
+    const roles: RoleObject[] = [];
+
+    resource.tables?.forEach(selectedTable => {
+      tables.push({
+        key: selectedTable.id,
+        label: selectedTable.schema
+          ? `${selectedTable.schema}.${selectedTable.table_name}`
+          : selectedTable.table_name,
+        value: selectedTable.id,
+      });
+    });
+
+    resource.roles?.forEach(selectedRole => {
+      roles.push({
+        key: selectedRole.id,
+        label: selectedRole.name,
+        value: selectedRole.id,
+      });
+    });
+
+    return { tables, roles };
+  }, [resource?.tables, resource?.roles]);
+
+  // validate
+  const currentRuleSafe = currentRule || {};
+  useEffect(() => {
+    validate();
+  }, [currentRuleSafe.name, currentRuleSafe.clause, currentRuleSafe?.tables]);
+
+  // * event handlers *
+  type SelectValue = {
+    value: string;
+    label: string;
+  };
+
+  const updateRuleState = (name: string, value: any) => {
+    setCurrentRule(currentRuleData => ({
+      ...currentRuleData,
+      [name]: value,
+    }));
+  };
+
+  const onTextChange = (target: HTMLInputElement | HTMLTextAreaElement) => {
+    updateRuleState(target.name, target.value);
+  };
+
+  const onFilterChange = (type: string) => {
+    updateRuleState('filter_type', type);
+  };
+
+  const onTablesChange = (tables: Array<SelectValue>) => {
+    updateRuleState('tables', tables || []);
+  };
+
+  const onRolesChange = (roles: Array<SelectValue>) => {
+    updateRuleState('roles', roles || []);
+  };
+
+  const hide = () => {
+    clearError();
+    setCurrentRule({ ...DEAFULT_RULE });
+    onHide();
+  };
+
+  const onSave = () => {
+    const tables: number[] = [];
+    const roles: number[] = [];
+
+    currentRule.tables?.forEach(table => tables.push(table.key));
+    currentRule.roles?.forEach(role => roles.push(role.key));
+
+    const data: any = { ...currentRule, tables, roles };
+
+    if (isEditMode && currentRule.id) {
+      const updateId = currentRule.id;
+      delete data.id;
+      updateResource(updateId, data).then(response => {
+        if (!response) {
+          return;
+        }
+        addSuccessToast(`Rule updated`);
+        hide();
+      });
+    } else if (currentRule) {
+      createResource(data).then(response => {
+        if (!response) return;
+        addSuccessToast(t('Rule added'));
+        hide();
+      });
+    }
+  };
+
+  // * data loaders *
+  const loadTableOptions = useMemo(
+    () =>
+      (input = '', page: number, pageSize: number) => {
+        const query = rison.encode({
+          filter: input,
+          page,
+          page_size: pageSize,
+        });
+        return SupersetClient.get({
+          endpoint: `/api/v1/rowlevelsecurity/related/tables?q=${query}`,
+        }).then(response => {
+          const list = response.json.result.map(
+            (item: { value: number; text: string }) => ({
+              label: item.text,
+              value: item.value,
+            }),
+          );
+          return { data: list, totalCount: response.json.count };
+        });
+      },
+    [],
+  );
+
+  const loadRoleOptions = useMemo(
+    () =>
+      (input = '', page: number, pageSize: number) => {
+        const query = rison.encode({
+          filter: input,
+          page,
+          page_size: pageSize,
+        });
+        return SupersetClient.get({
+          endpoint: `/api/v1/rowlevelsecurity/related/roles?q=${query}`,
+        }).then(response => {
+          const list = response.json.result.map(
+            (item: { value: number; text: string }) => ({
+              label: item.text,
+              value: item.value,
+            }),
+          );
+          return { data: list, totalCount: response.json.count };
+        });
+      },
+    [],
+  );
+
+  // * state validators *
+  const validate = () => {
+    if (
+      currentRule?.name &&
+      currentRule?.clause &&
+      currentRule.tables?.length
+    ) {
+      setDisableSave(false);
+    } else {
+      setDisableSave(true);
+    }
+  };
+
+  return (
+    <StyledModal
+      className="no-content-padding"
+      responsive
+      show={show}
+      onHide={hide}
+      primaryButtonName={isEditMode ? t('Save') : t('Add')}
+      disablePrimaryButton={disableSave}
+      onHandledPrimaryAction={onSave}
+      width="30%"
+      maxWidth="1450px"
+      title={
+        <h4 data-test="rls-modal-title">
+          {isEditMode ? (
+            <Icons.EditAlt css={StyledIcon} />
+          ) : (
+            <Icons.PlusLarge css={StyledIcon} />
+          )}
+          {isEditMode ? t('Edit Rule') : t('Add Rule')}
+        </h4>
+      }
+    >
+      <StyledSectionContainer>
+        <div className="main-section">
+          <StyledInputContainer>
+            <LabeledErrorBoundInput
+              id="name"
+              name="name"
+              className="labeled-input"
+              value={currentRule ? currentRule.name : ''}
+              required
+              validationMethods={{
+                onChange: ({ target }: { target: HTMLInputElement }) =>
+                  onTextChange(target),
+              }}
+              css={noBottomMargin}
+              label={t('Rule Name')}
+              data-test="rule-name-test"
+            />
+          </StyledInputContainer>
+
+          <StyledInputContainer>
+            <div className="control-label">
+              {t('Filter Type')}{' '}
+              <InfoTooltip
+                tooltip={t(
+                  'Regular filters add where clauses to queries if a user belongs to a role referenced in the filter, base filters apply filters to all queries except the roles defined in the filter, and can be used to define what users can see if no RLS filters within a filter group apply to them.',
+                )}
+              />
+            </div>
+            <div className="input-container">
+              <Select
+                name="filter_type"
+                ariaLabel={t('Filter Type')}
+                placeholder={t('Filter Type')}
+                onChange={onFilterChange}
+                value={currentRule?.filter_type}
+                options={FilterOptions}
+                data-test="rule-filter-type-test"
+              />
+            </div>
+          </StyledInputContainer>
+
+          <StyledInputContainer>
+            <div className="control-label">
+              {t('Tables')} <span className="required">*</span>
+              <InfoTooltip
+                tooltip={t(
+                  'These are the tables this filter will be applied to.',
+                )}
+              />
+            </div>
+            <div className="input-container">
+              <AsyncSelect
+                ariaLabel={t('Tables')}
+                mode="multiple"
+                onChange={onTablesChange}
+                value={(currentRule?.tables as SelectValue[]) || []}
+                options={loadTableOptions}
+              />
+            </div>
+          </StyledInputContainer>
+
+          <StyledInputContainer>
+            <div className="control-label">
+              {t('Roles')}{' '}
+              <InfoTooltip
+                tooltip={t(
+                  'For regular filters, these are the roles this filter will be applied to. For base filters, these are the roles that the filter DOES NOT apply to, e.g. Admin if admin should see all data.',
+                )}
+              />
+            </div>
+            <div className="input-container">
+              <AsyncSelect
+                ariaLabel={t('Roles')}
+                mode="multiple"
+                onChange={onRolesChange}
+                value={(currentRule?.roles as SelectValue[]) || []}
+                options={loadRoleOptions}
+              />
+            </div>
+          </StyledInputContainer>
+          <StyledInputContainer>
+            <LabeledErrorBoundInput
+              id="group_key"
+              name="group_key"
+              value={currentRule ? currentRule.group_key : ''}
+              validationMethods={{
+                onChange: ({ target }: { target: HTMLInputElement }) =>
+                  onTextChange(target),
+              }}
+              css={noBottomMargin}
+              label={t('Group Key')}
+              hasTooltip
+              tooltipText={t(
+                `Filters with the same group key will be ORed together within the group, while different filter groups will be ANDed together. Undefined group keys are treated as unique groups, i.e. are not grouped together. For example, if a table has three filters, of which two are for departments Finance and Marketing (group key = 'department'), and one refers to the region Europe (group key = 'region'), the filter clause would apply the filter (department = 'Finance' OR department = 'Marketing') AND (region = 'Europe').`,
+              )}
+              data-test="group-key-test"
+            />
+          </StyledInputContainer>
+
+          <StyledInputContainer>
+            <div className="control-label">
+              <LabeledErrorBoundInput
+                id="clause"
+                name="clause"
+                value={currentRule ? currentRule.clause : ''}
+                required
+                validationMethods={{
+                  onChange: ({ target }: { target: HTMLInputElement }) =>
+                    onTextChange(target),
+                }}
+                css={noBottomMargin}
+                label={t('Clause')}
+                hasTooltip
+                tooltipText={t(
+                  'This is the condition that will be added to the WHERE clause. For example, to only return rows for a particular client, you might define a regular filter with the clause `client_id = 9`. To display no rows unless a user belongs to a RLS filter role, a base filter can be created with the clause `1 = 0` (always false).',
+                )}
+                data-test="clause-test"
+              />
+            </div>
+          </StyledInputContainer>
+
+          <StyledInputContainer>
+            <div className="control-label">{t('Description')}</div>
+            <div className="input-container">
+              <textarea
+                name="description"
+                value={currentRule ? currentRule.description : ''}
+                onChange={event => onTextChange(event.target)}
+                data-test="description-test"
+              />
+            </div>
+          </StyledInputContainer>
+        </div>
+      </StyledSectionContainer>
+    </StyledModal>
+  );
+}
+
+export default RowLevelSecurityModal;
diff --git a/superset-frontend/src/features/rls/constants.ts b/superset-frontend/src/features/rls/constants.ts
new file mode 100644
index 000000000000..ceb0982c5f22
--- /dev/null
+++ b/superset-frontend/src/features/rls/constants.ts
@@ -0,0 +1,31 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { t } from '@superset-ui/core';
+
+export const FilterOptions = [
+  {
+    label: t('Regular'),
+    value: 'Regular',
+  },
+  {
+    label: t('Base'),
+    value: 'Base',
+  },
+];
diff --git a/superset-frontend/src/features/rls/types.ts b/superset-frontend/src/features/rls/types.ts
new file mode 100644
index 000000000000..ae0166c8e1e5
--- /dev/null
+++ b/superset-frontend/src/features/rls/types.ts
@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export enum FilterType {
+  REGULAR = 'Regular',
+  BASE = 'Base',
+}
+
+export type RLSObject = {
+  id?: number;
+  name: string;
+  filter_type: FilterType;
+  tables?: TableObject[];
+  roles?: RoleObject[];
+  group_key?: string;
+  clause?: string;
+  description?: string;
+};
+
+export type TableObject = {
+  key: any;
+  id?: number;
+  label?: string;
+  value?: number | string;
+  schema?: string;
+  table_name?: string;
+};
+
+export type RoleObject = {
+  key: any;
+  id?: number;
+  label?: string;
+  value?: number | string;
+  name?: string;
+};
diff --git a/superset-frontend/src/pages/RowLevelSecurityList/RowLevelSecurityList.test.tsx b/superset-frontend/src/pages/RowLevelSecurityList/RowLevelSecurityList.test.tsx
new file mode 100644
index 000000000000..44b9c86bf501
--- /dev/null
+++ b/superset-frontend/src/pages/RowLevelSecurityList/RowLevelSecurityList.test.tsx
@@ -0,0 +1,259 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import React from 'react';
+import fetchMock from 'fetch-mock';
+import { render, screen, within } from 'spec/helpers/testing-library';
+import { act } from 'react-dom/test-utils';
+import { MemoryRouter } from 'react-router-dom';
+import { QueryParamProvider } from 'use-query-params';
+import { styledMount as mount } from 'spec/helpers/theming';
+import { Provider } from 'react-redux';
+import configureStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint';
+import ListView from 'src/components/ListView/ListView';
+import userEvent from '@testing-library/user-event';
+import RowLevelSecurityList from '.';
+
+const ruleListEndpoint = 'glob:*/api/v1/rowlevelsecurity/?*';
+const ruleInfoEndpoint = 'glob:*/api/v1/rowlevelsecurity/_info*';
+
+const mockRules = [
+  {
+    changed_on_delta_humanized: '1 days ago',
+    clause: '1=1',
+    description: 'some description',
+    filter_type: 'Regular',
+    group_key: 'group-1',
+    id: 1,
+    name: 'rule 1',
+    roles: [
+      {
+        id: 3,
+        name: 'Alpha',
+      },
+      {
+        id: 5,
+        name: 'granter',
+      },
+    ],
+    tables: [
+      {
+        id: 6,
+        table_name: 'flights',
+      },
+      {
+        id: 13,
+        table_name: 'messages',
+      },
+    ],
+  },
+  {
+    changed_on_delta_humanized: '2 days ago',
+    clause: '2=2',
+    description: 'some description 2',
+    filter_type: 'Base',
+    group_key: 'group-1',
+    id: 2,
+    name: 'rule 2',
+    roles: [
+      {
+        id: 3,
+        name: 'Alpha',
+      },
+      {
+        id: 5,
+        name: 'granter',
+      },
+    ],
+    tables: [
+      {
+        id: 6,
+        table_name: 'flights',
+      },
+      {
+        id: 13,
+        table_name: 'messages',
+      },
+    ],
+  },
+];
+fetchMock.get(ruleListEndpoint, { result: mockRules, count: 2 });
+fetchMock.get(ruleInfoEndpoint, { permissions: ['can_read', 'can_write'] });
+global.URL.createObjectURL = jest.fn();
+
+const mockUser = {
+  userId: 1,
+};
+
+const mockedProps = {};
+
+const mockStore = configureStore([thunk]);
+const store = mockStore({});
+
+describe('RulesList Enzyme', () => {
+  let wrapper: any;
+
+  beforeAll(async () => {
+    fetchMock.resetHistory();
+    wrapper = mount(
+      <MemoryRouter>
+        <Provider store={store}>
+          <RowLevelSecurityList {...mockedProps} user={mockUser} />
+        </Provider>
+      </MemoryRouter>,
+    );
+
+    await waitForComponentToPaint(wrapper);
+  });
+
+  it('renders', () => {
+    expect(wrapper.find(RowLevelSecurityList)).toExist();
+  });
+  it('renders a ListView', () => {
+    expect(wrapper.find(ListView)).toExist();
+  });
+  it('fetched data', () => {
+    // wrapper.update();
+    const apiCalls = fetchMock.calls(/rowlevelsecurity\/\?q/);
+    expect(apiCalls).toHaveLength(1);
+    expect(apiCalls[0][0]).toMatchInlineSnapshot(
+      `"http://localhost/api/v1/rowlevelsecurity/?q=(order_column:changed_on_delta_humanized,order_direction:desc,page:0,page_size:25)"`,
+    );
+  });
+});
+
+describe('RuleList RTL', () => {
+  async function renderAndWait() {
+    const mounted = act(async () => {
+      const mockedProps = {};
+      render(
+        <MemoryRouter>
+          <QueryParamProvider>
+            <RowLevelSecurityList {...mockedProps} user={mockUser} />
+          </QueryParamProvider>
+        </MemoryRouter>,
+        { useRedux: true },
+      );
+    });
+    return mounted;
+  }
+
+  it('renders add rule button on empty state', async () => {
+    fetchMock.get(
+      ruleListEndpoint,
+      { result: [], count: 0 },
+      { overwriteRoutes: true },
+    );
+    await renderAndWait();
+
+    const emptyAddRuleButton = await screen.findByTestId('add-rule-empty');
+    expect(emptyAddRuleButton).toBeInTheDocument();
+    fetchMock.get(
+      ruleListEndpoint,
+      { result: mockRules, count: 2 },
+      { overwriteRoutes: true },
+    );
+  });
+
+  it('renders a "Rule" button to add a rule in bulk action', async () => {
+    await renderAndWait();
+
+    const addRuleButton = await screen.findByTestId('add-rule');
+    const emptyAddRuleButton = screen.queryByTestId('add-rule-empty');
+    expect(addRuleButton).toBeInTheDocument();
+    expect(emptyAddRuleButton).not.toBeInTheDocument();
+  });
+
+  it('renders filter options', async () => {
+    await renderAndWait();
+
+    const searchFilters = screen.queryAllByTestId('filters-search');
+    expect(searchFilters).toHaveLength(2);
+
+    const typeFilter = await screen.findByTestId('filters-select');
+    expect(typeFilter).toBeInTheDocument();
+  });
+
+  it('renders correct list columns', async () => {
+    await renderAndWait();
+
+    const table = screen.getByRole('table');
+    expect(table).toBeInTheDocument();
+
+    const nameColumn = await within(table).findByText('Name');
+    const fitlerTypeColumn = await within(table).findByText('Filter Type');
+    const groupKeyColumn = await within(table).findByText('Group Key');
+    const clauseColumn = await within(table).findByText('Clause');
+    const modifiedColumn = await within(table).findByText('Modified');
+    const actionsColumn = await within(table).findByText('Actions');
+
+    expect(nameColumn).toBeInTheDocument();
+    expect(fitlerTypeColumn).toBeInTheDocument();
+    expect(groupKeyColumn).toBeInTheDocument();
+    expect(clauseColumn).toBeInTheDocument();
+    expect(modifiedColumn).toBeInTheDocument();
+    expect(actionsColumn).toBeInTheDocument();
+  });
+
+  it('renders correct action buttons with write permission', async () => {
+    await renderAndWait();
+
+    const deleteActionIcon = screen.queryAllByTestId('rls-list-trash-icon');
+    expect(deleteActionIcon).toHaveLength(2);
+
+    const editActionIcon = screen.queryAllByTestId('edit-alt');
+    expect(editActionIcon).toHaveLength(2);
+  });
+
+  it('should not renders correct action buttons without write permission', async () => {
+    fetchMock.get(
+      ruleInfoEndpoint,
+      { permissions: ['can_read'] },
+      { overwriteRoutes: true },
+    );
+
+    await renderAndWait();
+
+    const deleteActionIcon = screen.queryByTestId('rls-list-trash-icon');
+    expect(deleteActionIcon).not.toBeInTheDocument();
+
+    const editActionIcon = screen.queryByTestId('edit-alt');
+    expect(editActionIcon).not.toBeInTheDocument();
+
+    fetchMock.get(
+      ruleInfoEndpoint,
+      { permissions: ['can_read', 'can_write'] },
+      { overwriteRoutes: true },
+    );
+  });
+
+  it('renders popover on new clicking rule button', async () => {
+    await renderAndWait();
+
+    const modal = screen.queryByTestId('rls-modal-title');
+    expect(modal).not.toBeInTheDocument();
+
+    const addRuleButton = await screen.findByTestId('add-rule');
+    userEvent.click(addRuleButton);
+
+    const modalAfterClick = screen.queryByTestId('rls-modal-title');
+    expect(modalAfterClick).toBeInTheDocument();
+  });
+});
diff --git a/superset-frontend/src/pages/RowLevelSecurityList/index.tsx b/superset-frontend/src/pages/RowLevelSecurityList/index.tsx
new file mode 100644
index 000000000000..e07f7e0e4ba1
--- /dev/null
+++ b/superset-frontend/src/pages/RowLevelSecurityList/index.tsx
@@ -0,0 +1,350 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { t, styled, SupersetClient } from '@superset-ui/core';
+import React, { useMemo, useState } from 'react';
+import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
+import Icons from 'src/components/Icons';
+import ListView, {
+  FetchDataConfig,
+  FilterOperator,
+  ListViewProps,
+  Filters,
+} from 'src/components/ListView';
+import withToasts from 'src/components/MessageToasts/withToasts';
+import { Tooltip } from 'src/components/Tooltip';
+import SubMenu, { SubMenuProps } from 'src/features/home/SubMenu';
+import rison from 'rison';
+import { useListViewResource } from 'src/views/CRUD/hooks';
+import RowLevelSecurityModal from 'src/features/rls/RowLevelSecurityModal';
+import { RLSObject } from 'src/features/rls/types';
+import { createErrorHandler } from 'src/views/CRUD/utils';
+
+const Actions = styled.div`
+  color: ${({ theme }) => theme.colors.grayscale.base};
+`;
+
+interface RLSProps {
+  addDangerToast: (msg: string) => void;
+  addSuccessToast: (msg: string) => void;
+  user: {
+    userId?: string | number;
+    firstName: string;
+    lastName: string;
+  };
+}
+
+function RowLevelSecurityList(props: RLSProps) {
+  const { addDangerToast, addSuccessToast, user } = props;
+  const [ruleModalOpen, setRuleModalOpen] = useState<boolean>(false);
+  const [currentRule, setCurrentRule] = useState(null);
+
+  const {
+    state: {
+      loading,
+      resourceCount: rulesCount,
+      resourceCollection: rules,
+      bulkSelectEnabled,
+    },
+    hasPerm,
+    fetchData,
+    refreshData,
+    toggleBulkSelect,
+  } = useListViewResource<RLSObject>(
+    'rowlevelsecurity',
+    t('Row Level Security'),
+    addDangerToast,
+    true,
+    undefined,
+    undefined,
+    true,
+  );
+
+  function handleRuleEdit(rule: null) {
+    setCurrentRule(rule);
+    setRuleModalOpen(true);
+  }
+
+  function handleRuleDelete(
+    { id, name }: RLSObject,
+    refreshData: (arg0?: FetchDataConfig | null) => void,
+    addSuccessToast: (arg0: string) => void,
+    addDangerToast: (arg0: string) => void,
+  ) {
+    return SupersetClient.delete({
+      endpoint: `/api/v1/rowlevelsecurity/${id}`,
+    }).then(
+      () => {
+        refreshData();
+        addSuccessToast(t('Deleted %s', name));
+      },
+      createErrorHandler(errMsg =>
+        addDangerToast(t('There was an issue deleting %s: %s', name, errMsg)),
+      ),
+    );
+  }
+  function handleBulkRulesDelete(rulesToDelete: RLSObject[]) {
+    const ids = rulesToDelete.map(({ id }) => id);
+    return SupersetClient.delete({
+      endpoint: `/api/v1/rowlevelsecurity/?q=${rison.encode(ids)}`,
+    }).then(
+      () => {
+        refreshData();
+        addSuccessToast(t(`Deleted`));
+      },
+      createErrorHandler(errMsg =>
+        addDangerToast(t('There was an issue deleting rules: %s', errMsg)),
+      ),
+    );
+  }
+
+  function handleRuleModalHide() {
+    setCurrentRule(null);
+    setRuleModalOpen(false);
+    refreshData();
+  }
+
+  const canWrite = hasPerm('can_write');
+  const canEdit = hasPerm('can_write');
+  const canExport = hasPerm('can_export');
+
+  const columns = useMemo(
+    () => [
+      {
+        accessor: 'name',
+        Header: t('Name'),
+      },
+      {
+        accessor: 'filter_type',
+        Header: t('Filter Type'),
+        size: 'xl',
+      },
+      {
+        accessor: 'group_key',
+        Header: t('Group Key'),
+        size: 'xl',
+      },
+      {
+        accessor: 'clause',
+        Header: t('Clause'),
+      },
+      {
+        Cell: ({
+          row: {
+            original: { changed_on_delta_humanized: changedOn },
+          },
+        }: any) => <span className="no-wrap">{changedOn}</span>,
+        Header: t('Modified'),
+        accessor: 'changed_on_delta_humanized',
+        size: 'xl',
+      },
+      {
+        Cell: ({ row: { original } }: any) => {
+          const handleDelete = () =>
+            handleRuleDelete(
+              original,
+              refreshData,
+              addSuccessToast,
+              addDangerToast,
+            );
+          const handleEdit = () => handleRuleEdit(original);
+          return (
+            <Actions className="actions">
+              {canWrite && (
+                <ConfirmStatusChange
+                  title={t('Please confirm')}
+                  description={
+                    <>
+                      {t('Are you sure you want to delete')}{' '}
+                      <b>{original.name}</b>
+                    </>
+                  }
+                  onConfirm={handleDelete}
+                >
+                  {confirmDelete => (
+                    <Tooltip
+                      id="delete-action-tooltip"
+                      title={t('Delete')}
+                      placement="bottom"
+                    >
+                      <span
+                        role="button"
+                        tabIndex={0}
+                        className="action-button"
+                        onClick={confirmDelete}
+                      >
+                        <Icons.Trash data-test="rls-list-trash-icon" />
+                      </span>
+                    </Tooltip>
+                  )}
+                </ConfirmStatusChange>
+              )}
+              {canEdit && (
+                <Tooltip
+                  id="edit-action-tooltip"
+                  title={t('Edit')}
+                  placement="bottom"
+                >
+                  <span
+                    role="button"
+                    tabIndex={0}
+                    className="action-button"
+                    onClick={handleEdit}
+                  >
+                    <Icons.EditAlt data-test="edit-alt" />
+                  </span>
+                </Tooltip>
+              )}
+            </Actions>
+          );
+        },
+        Header: t('Actions'),
+        id: 'actions',
+        hidden: !canEdit && !canWrite && !canExport,
+        disableSortBy: true,
+      },
+    ],
+    [
+      user.userId,
+      canEdit,
+      canWrite,
+      canExport,
+      hasPerm,
+      refreshData,
+      addDangerToast,
+      addSuccessToast,
+    ],
+  );
+
+  const emptyState = {
+    title: t('No Rules yet'),
+    image: 'filter-results.svg',
+    buttonAction: () => handleRuleEdit(null),
+    buttonText: canEdit ? (
+      <>
+        <i className="fa fa-plus" data-test="add-rule-empty" /> {'Rule'}{' '}
+      </>
+    ) : null,
+  };
+
+  const filters: Filters = useMemo(
+    () => [
+      {
+        Header: t('Name'),
+        key: 'search',
+        id: 'name',
+        input: 'search',
+        operator: FilterOperator.startsWith,
+      },
+      {
+        Header: t('Filter Type'),
+        key: 'filter_type',
+        id: 'filter_type',
+        input: 'select',
+        operator: FilterOperator.equals,
+        unfilteredLabel: t('Any'),
+        selects: [
+          { label: t('Regular'), value: 'Regular' },
+          { label: t('Base'), value: 'Base' },
+        ],
+      },
+      {
+        Header: t('Group Key'),
+        key: 'search',
+        id: 'group_key',
+        input: 'search',
+        operator: FilterOperator.startsWith,
+      },
+    ],
+    [user],
+  );
+
+  const initialSort = [{ id: 'changed_on_delta_humanized', desc: true }];
+  const PAGE_SIZE = 25;
+
+  const subMenuButtons: SubMenuProps['buttons'] = [];
+
+  if (canWrite) {
+    subMenuButtons.push({
+      name: (
+        <>
+          <i className="fa fa-plus" data-test="add-rule" /> {t('Rule')}
+        </>
+      ),
+      buttonStyle: 'primary',
+      onClick: () => handleRuleEdit(null),
+    });
+    subMenuButtons.push({
+      name: t('Bulk select'),
+      buttonStyle: 'secondary',
+      'data-test': 'bulk-select',
+      onClick: toggleBulkSelect,
+    });
+  }
+
+  return (
+    <>
+      <SubMenu name={t('Row Level Security')} buttons={subMenuButtons} />
+      <ConfirmStatusChange
+        title={t('Please confirm')}
+        description={t('Are you sure you want to delete the selected rules?')}
+        onConfirm={handleBulkRulesDelete}
+      >
+        {confirmDelete => {
+          const bulkActions: ListViewProps['bulkActions'] = [];
+          if (canWrite) {
+            bulkActions.push({
+              key: 'delete',
+              name: t('Delete'),
+              type: 'danger',
+              onSelect: confirmDelete,
+            });
+          }
+          return (
+            <>
+              <RowLevelSecurityModal
+                rule={currentRule}
+                addDangerToast={addDangerToast}
+                onHide={handleRuleModalHide}
+                addSuccessToast={addSuccessToast}
+                show={ruleModalOpen}
+              />
+              <ListView<RLSObject>
+                className="rls-list-view"
+                bulkActions={bulkActions}
+                bulkSelectEnabled={bulkSelectEnabled}
+                disableBulkSelect={toggleBulkSelect}
+                columns={columns}
+                count={rulesCount}
+                data={rules}
+                emptyState={emptyState}
+                fetchData={fetchData}
+                filters={filters}
+                initialSort={initialSort}
+                loading={loading}
+                pageSize={PAGE_SIZE}
+              />
+            </>
+          );
+        }}
+      </ConfirmStatusChange>
+    </>
+  );
+}
+
+export default withToasts(RowLevelSecurityList);
diff --git a/superset-frontend/src/views/routes.tsx b/superset-frontend/src/views/routes.tsx
index 1aaefaa538f1..23a25a5d855b 100644
--- a/superset-frontend/src/views/routes.tsx
+++ b/superset-frontend/src/views/routes.tsx
@@ -112,6 +112,13 @@ const Tags = lazy(
   () => import(/* webpackChunkName: "Tags" */ 'src/pages/Tags'),
 );
 
+const RowLevelSecurityList = lazy(
+  () =>
+    import(
+      /* webpackChunkName: "RowLevelSecurityList" */ 'src/pages/RowLevelSecurityList'
+    ),
+);
+
 type Routes = {
   path: string;
   Component: React.ComponentType;
@@ -206,6 +213,10 @@ export const routes: Routes = [
     path: '/dataset/:datasetId',
     Component: DatasetCreation,
   },
+  {
+    path: '/rowlevelsecurity/list',
+    Component: RowLevelSecurityList,
+  },
 ];
 
 if (isFeatureEnabled(FeatureFlag.TAGGING_SYSTEM)) {
diff --git a/superset/config.py b/superset/config.py
index 8baf177ba5f6..70271381866e 100644
--- a/superset/config.py
+++ b/superset/config.py
@@ -53,6 +53,7 @@
 from celery.schedules import crontab
 from dateutil import tz
 from flask import Blueprint
+from flask_appbuilder.models.filters import BaseFilter
 from flask_appbuilder.security.manager import AUTH_DB
 from pandas._libs.parsers import STR_NA_VALUES  # pylint: disable=no-name-in-module
 from sqlalchemy.orm.query import Query
@@ -1363,15 +1364,16 @@ def EMAIL_HEADER_MUTATOR(  # pylint: disable=invalid-name,unused-argument
 }
 
 # It is possible to customize which tables and roles are featured in the RLS
-# dropdown. When set, this dict is assigned to `add_form_query_rel_fields` and
-# `edit_form_query_rel_fields` on `RowLevelSecurityFiltersModelView`. Example:
+# dropdown. When set, this dict is assigned to `filter_rel_fields`
+# on `RLSRestApi`. Example:
 #
 # from flask_appbuilder.models.sqla import filters
-# RLS_FORM_QUERY_REL_FIELDS = {
-#     "roles": [["name", filters.FilterStartsWith, "RlsRole"]]
-#     "tables": [["table_name", filters.FilterContains, "rls"]]
+
+# RLS_BASE_RELATED_FIELD_FILTERS = {
+#     "tables": [["table_name", filters.FilterStartsWith, "birth"]],
+#     "roles": [["name", filters.FilterContains, "Admin"]]
 # }
-RLS_FORM_QUERY_REL_FIELDS: Optional[Dict[str, List[List[Any]]]] = None
+RLS_BASE_RELATED_FIELD_FILTERS: Dict[str, BaseFilter] = {}
 
 #
 # Flask session cookie options
diff --git a/superset/connectors/sqla/views.py b/superset/connectors/sqla/views.py
index 86cb08bb8690..dff6356114c8 100644
--- a/superset/connectors/sqla/views.py
+++ b/superset/connectors/sqla/views.py
@@ -17,10 +17,9 @@
 """Views used by the SqlAlchemy connector"""
 import logging
 import re
-from typing import Any, cast
 
-from flask import current_app, flash, Markup, redirect
-from flask_appbuilder import CompactCRUDMixin, expose
+from flask import flash, Markup, redirect
+from flask_appbuilder import CompactCRUDMixin, expose, permission_name
 from flask_appbuilder.fieldwidgets import Select2Widget
 from flask_appbuilder.models.sqla.interface import SQLAInterface
 from flask_appbuilder.security.decorators import has_access
@@ -28,17 +27,17 @@
 from wtforms.ext.sqlalchemy.fields import QuerySelectField
 from wtforms.validators import DataRequired, Regexp
 
-from superset import app, db
+from superset import db
 from superset.connectors.base.views import DatasourceModelView
 from superset.connectors.sqla import models
 from superset.constants import MODEL_VIEW_RW_METHOD_PERMISSION_MAP, RouteMethod
 from superset.superset_typing import FlaskResponse
 from superset.utils import core as utils
 from superset.views.base import (
+    BaseSupersetView,
     DatasourceFilter,
     DeleteMixin,
     ListWidgetWithCheckboxes,
-    SupersetListWidget,
     SupersetModelView,
     YamlExportMixin,
 )
@@ -270,107 +269,15 @@ class SqlMetricInlineView(  # pylint: disable=too-many-ancestors
     edit_form_extra_fields = add_form_extra_fields
 
 
-class RowLevelSecurityListWidget(
-    SupersetListWidget
-):  # pylint: disable=too-few-public-methods
-    template = "superset/models/rls/list.html"
+class RowLevelSecurityView(BaseSupersetView):
+    route_base = "/rowlevelsecurity"
+    class_permission_name = "RowLevelSecurity"
 
-    def __init__(self, **kwargs: Any):
-        kwargs["appbuilder"] = current_app.appbuilder
-        super().__init__(**kwargs)
-
-
-class RowLevelSecurityFiltersModelView(  # pylint: disable=too-many-ancestors
-    SupersetModelView, DeleteMixin
-):
-    datamodel = SQLAInterface(models.RowLevelSecurityFilter)
-
-    list_widget = cast(SupersetListWidget, RowLevelSecurityListWidget)
-
-    list_title = _("Row level security filter")
-    show_title = _("Show Row level security filter")
-    add_title = _("Add Row level security filter")
-    edit_title = _("Edit Row level security filter")
-
-    list_columns = [
-        "name",
-        "filter_type",
-        "tables",
-        "roles",
-        "clause",
-        "creator",
-        "modified",
-    ]
-    order_columns = ["name", "filter_type", "clause", "modified"]
-    edit_columns = [
-        "name",
-        "description",
-        "filter_type",
-        "tables",
-        "roles",
-        "group_key",
-        "clause",
-    ]
-    show_columns = edit_columns
-    search_columns = (
-        "name",
-        "description",
-        "filter_type",
-        "tables",
-        "roles",
-        "group_key",
-        "clause",
-    )
-    add_columns = edit_columns
-    base_order = ("changed_on", "desc")
-    description_columns = {
-        "name": _("Choose a unique name"),
-        "description": _("Optionally add a detailed description"),
-        "filter_type": _(
-            "Regular filters add where clauses to queries if a user belongs to a "
-            "role referenced in the filter. Base filters apply filters to all queries "
-            "except the roles defined in the filter, and can be used to define what "
-            "users can see if no RLS filters within a filter group apply to them."
-        ),
-        "tables": _("These are the tables this filter will be applied to."),
-        "roles": _(
-            "For regular filters, these are the roles this filter will be "
-            "applied to. For base filters, these are the roles that the "
-            "filter DOES NOT apply to, e.g. Admin if admin should see all "
-            "data."
-        ),
-        "group_key": _(
-            "Filters with the same group key will be ORed together within the group, "
-            "while different filter groups will be ANDed together. Undefined group "
-            "keys are treated as unique groups, i.e. are not grouped together. "
-            "For example, if a table has three filters, of which two are for "
-            "departments Finance and Marketing (group key = 'department'), and one "
-            "refers to the region Europe (group key = 'region'), the filter clause "
-            "would apply the filter (department = 'Finance' OR department = "
-            "'Marketing') AND (region = 'Europe')."
-        ),
-        "clause": _(
-            "This is the condition that will be added to the WHERE clause. "
-            "For example, to only return rows for a particular client, "
-            "you might define a regular filter with the clause `client_id = 9`. To "
-            "display no rows unless a user belongs to a RLS filter role, a base "
-            "filter can be created with the clause `1 = 0` (always false)."
-        ),
-    }
-    label_columns = {
-        "name": _("Name"),
-        "description": _("Description"),
-        "tables": _("Tables"),
-        "roles": _("Roles"),
-        "clause": _("Clause"),
-        "creator": _("Creator"),
-        "modified": _("Modified"),
-    }
-    validators_columns = {"tables": [SelectDataRequired()]}
-
-    if app.config["RLS_FORM_QUERY_REL_FIELDS"]:
-        add_form_query_rel_fields = app.config["RLS_FORM_QUERY_REL_FIELDS"]
-        edit_form_query_rel_fields = add_form_query_rel_fields
+    @expose("/list/")
+    @has_access
+    @permission_name("read")
+    def list(self) -> FlaskResponse:
+        return super().render_app_template()
 
 
 class TableModelView(  # pylint: disable=too-many-ancestors
diff --git a/superset/dao/base.py b/superset/dao/base.py
index 0cffb0f33459..d3675a0e17c9 100644
--- a/superset/dao/base.py
+++ b/superset/dao/base.py
@@ -194,3 +194,14 @@ def delete(cls, model: Model, commit: bool = True) -> Model:
             db.session.rollback()
             raise DAODeleteFailedError(exception=ex) from ex
         return model
+
+    @classmethod
+    def bulk_delete(cls, models: List[Model], commit: bool = True) -> None:
+        try:
+            for model in models:
+                cls.delete(model, False)
+            if commit:
+                db.session.commit()
+        except SQLAlchemyError as ex:
+            db.session.rollback()
+            raise DAODeleteFailedError(exception=ex) from ex
diff --git a/superset/initialization/__init__.py b/superset/initialization/__init__.py
index b911461e9c86..dd1c37f78253 100644
--- a/superset/initialization/__init__.py
+++ b/superset/initialization/__init__.py
@@ -125,7 +125,7 @@ def init_views(self) -> None:
         from superset.charts.api import ChartRestApi
         from superset.charts.data.api import ChartDataRestApi
         from superset.connectors.sqla.views import (
-            RowLevelSecurityFiltersModelView,
+            RowLevelSecurityView,
             SqlMetricInlineView,
             TableColumnInlineView,
             TableModelView,
@@ -150,6 +150,7 @@ def init_views(self) -> None:
         from superset.queries.saved_queries.api import SavedQueryRestApi
         from superset.reports.api import ReportScheduleRestApi
         from superset.reports.logs.api import ReportExecutionLogRestApi
+        from superset.row_level_security.api import RLSRestApi
         from superset.security.api import SecurityRestApi
         from superset.sqllab.api import SqlLabRestApi
         from superset.tags.api import TagRestApi
@@ -222,6 +223,7 @@ def init_views(self) -> None:
         appbuilder.add_api(QueryRestApi)
         appbuilder.add_api(ReportScheduleRestApi)
         appbuilder.add_api(ReportExecutionLogRestApi)
+        appbuilder.add_api(RLSRestApi)
         appbuilder.add_api(SavedQueryRestApi)
         appbuilder.add_api(TagRestApi)
         appbuilder.add_api(SqlLabRestApi)
@@ -289,14 +291,6 @@ def init_views(self) -> None:
             category_label=__("Manage"),
             category_icon="",
         )
-        appbuilder.add_view(
-            RowLevelSecurityFiltersModelView,
-            "Row Level Security",
-            label=__("Row Level Security"),
-            category="Security",
-            category_label=__("Security"),
-            icon="fa-lock",
-        )
 
         #
         # Setup views with no menu
@@ -435,6 +429,16 @@ def init_views(self) -> None:
             menu_cond=lambda: bool(self.config["ENABLE_ACCESS_REQUEST"]),
         )
 
+        appbuilder.add_view(
+            RowLevelSecurityView,
+            "Row Level Security",
+            href="/rowlevelsecurity/list/",
+            label=__("Row Level Security"),
+            category="Security",
+            category_label=__("Security"),
+            icon="fa-lock",
+        )
+
     def init_app_in_ctx(self) -> None:
         """
         Runs init logic in the context of the app
diff --git a/superset/row_level_security/api.py b/superset/row_level_security/api.py
new file mode 100644
index 000000000000..76a04d93abc2
--- /dev/null
+++ b/superset/row_level_security/api.py
@@ -0,0 +1,349 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import logging
+from typing import Any
+
+from flask import request, Response
+from flask_appbuilder.api import expose, protect, rison, safe
+from flask_appbuilder.models.sqla.interface import SQLAInterface
+from flask_babel import ngettext
+from marshmallow import ValidationError
+
+from superset import app
+from superset.commands.exceptions import (
+    DatasourceNotFoundValidationError,
+    RolesNotFoundValidationError,
+)
+from superset.connectors.sqla.models import RowLevelSecurityFilter
+from superset.constants import MODEL_API_RW_METHOD_PERMISSION_MAP, RouteMethod
+from superset.dao.exceptions import DAOCreateFailedError, DAOUpdateFailedError
+from superset.extensions import event_logger
+from superset.row_level_security.commands.bulk_delete import BulkDeleteRLSRuleCommand
+from superset.row_level_security.commands.create import CreateRLSRuleCommand
+from superset.row_level_security.commands.exceptions import RLSRuleNotFoundError
+from superset.row_level_security.commands.update import UpdateRLSRuleCommand
+from superset.row_level_security.schemas import (
+    get_delete_ids_schema,
+    RLSListSchema,
+    RLSPostSchema,
+    RLSPutSchema,
+    RLSShowSchema,
+)
+from superset.views.base_api import (
+    BaseSupersetModelRestApi,
+    requires_json,
+    statsd_metrics,
+)
+
+logger = logging.getLogger(__name__)
+
+
+class RLSRestApi(BaseSupersetModelRestApi):
+    datamodel = SQLAInterface(RowLevelSecurityFilter)
+    include_route_methods = RouteMethod.REST_MODEL_VIEW_CRUD_SET | {
+        RouteMethod.RELATED,
+        "bulk_delete",
+    }
+    resource_name = "rowlevelsecurity"
+    class_permission_name = "Row Level Security"
+    openapi_spec_tag = "Row Level Security"
+    method_permission_name = MODEL_API_RW_METHOD_PERMISSION_MAP
+    allow_browser_login = True
+
+    list_columns = [
+        "id",
+        "name",
+        "filter_type",
+        "tables.id",
+        "tables.table_name",
+        "roles.id",
+        "roles.name",
+        "clause",
+        "changed_on_delta_humanized",
+        "group_key",
+    ]
+    order_columns = [
+        "name",
+        "filter_type",
+        "clause",
+        "changed_on_delta_humanized",
+        "group_key",
+    ]
+    add_columns = [
+        "name",
+        "description",
+        "filter_type",
+        "tables",
+        "roles",
+        "group_key",
+        "clause",
+    ]
+    show_columns = [
+        "name",
+        "description",
+        "filter_type",
+        "tables.id",
+        "tables.schema",
+        "tables.table_name",
+        "roles.id",
+        "roles.name",
+        "group_key",
+        "clause",
+    ]
+    search_columns = (
+        "name",
+        "description",
+        "filter_type",
+        "tables",
+        "roles",
+        "group_key",
+        "clause",
+    )
+    edit_columns = add_columns
+
+    show_model_schema = RLSShowSchema()
+    list_model_schema = RLSListSchema()
+    add_model_schema = RLSPostSchema()
+    edit_model_schema = RLSPutSchema()
+
+    allowed_rel_fields = {"tables", "roles"}
+    base_related_field_filters = app.config["RLS_BASE_RELATED_FIELD_FILTERS"]
+
+    @expose("/", methods=["POST"])
+    @protect()
+    @safe
+    @statsd_metrics
+    @requires_json
+    @event_logger.log_this_with_context(
+        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.post",
+        log_to_statsd=False,
+    )
+    def post(self) -> Response:
+        """Creates a new RLS rule
+        ---
+        post:
+          description: >-
+            Create a new RLS Rule
+          requestBody:
+            description: RLS schema
+            required: true
+            content:
+              application/json:
+                schema:
+                  $ref: '#/components/schemas/{{self.__class__.__name__}}.post'
+          responses:
+            201:
+              description: RLS Rule added
+              content:
+                application/json:
+                  schema:
+                    type: object
+                    properties:
+                      id:
+                        type: number
+                      result:
+                        $ref: '#/components/schemas/{{self.__class__.__name__}}.post'
+            400:
+              $ref: '#/components/responses/400'
+            401:
+              $ref: '#/components/responses/401'
+            404:
+              $ref: '#/components/responses/404'
+            422:
+              $ref: '#/components/responses/422'
+            500:
+              $ref: '#/components/responses/500'
+        """
+        try:
+            item = self.add_model_schema.load(request.json)
+        except ValidationError as error:
+            return self.response_400(message=error.messages)
+
+        try:
+            new_model = CreateRLSRuleCommand(item).run()
+            return self.response(201, id=new_model.id, result=item)
+        except RolesNotFoundValidationError as ex:
+            logger.error(
+                "Role not found while creating RLS rule %s: %s",
+                self.__class__.__name__,
+                str(ex),
+                exc_info=True,
+            )
+            return self.response_422(message=str(ex))
+        except DatasourceNotFoundValidationError as ex:
+            logger.error(
+                "Table not found while creating RLS rule %s: %s",
+                self.__class__.__name__,
+                str(ex),
+                exc_info=True,
+            )
+            return self.response_422(message=str(ex))
+        except DAOCreateFailedError as ex:
+            logger.error(
+                "Error creating RLS rule %s: %s",
+                self.__class__.__name__,
+                str(ex),
+                exc_info=True,
+            )
+            return self.response_422(message=str(ex))
+
+    @expose("/<int:pk>", methods=["PUT"])
+    @protect()
+    @safe
+    @statsd_metrics
+    @requires_json
+    @event_logger.log_this_with_context(
+        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.put",
+        log_to_statsd=False,
+    )
+    def put(self, pk: int) -> Response:
+        """Updates an RLS Rule
+        ---
+        put:
+          description: >-
+            Updates an RLS Rule
+          parameters:
+          - in: path
+            schema:
+              type: integer
+            name: pk
+            description: The Rule pk
+          requestBody:
+            description: RLS schema
+            required: true
+            content:
+              application/json:
+                schema:
+                  $ref: '#/components/schemas/{{self.__class__.__name__}}.put'
+          responses:
+            200:
+              description: Rule changed
+              content:
+                application/json:
+                  schema:
+                    type: object
+                    properties:
+                      id:
+                        type: number
+                      result:
+                        $ref: '#/components/schemas/{{self.__class__.__name__}}.put'
+            400:
+              $ref: '#/components/responses/400'
+            401:
+              $ref: '#/components/responses/401'
+            403:
+              $ref: '#/components/responses/403'
+            404:
+              $ref: '#/components/responses/404'
+            422:
+              $ref: '#/components/responses/422'
+            500:
+              $ref: '#/components/responses/500'
+        """
+
+        try:
+            item = self.edit_model_schema.load(request.json)
+        except ValidationError as error:
+            return self.response_400(message=error.messages)
+
+        try:
+            new_model = UpdateRLSRuleCommand(pk, item).run()
+            return self.response(201, id=new_model.id, result=item)
+        except RolesNotFoundValidationError as ex:
+            logger.error(
+                "Role not found while updating RLS rule %s: %s",
+                self.__class__.__name__,
+                str(ex),
+                exc_info=True,
+            )
+            return self.response_422(message=str(ex))
+        except DatasourceNotFoundValidationError as ex:
+            logger.error(
+                "Table not found while updating RLS rule %s: %s",
+                self.__class__.__name__,
+                str(ex),
+                exc_info=True,
+            )
+            return self.response_422(message=str(ex))
+        except DAOUpdateFailedError as ex:
+            logger.error(
+                "Error updating RLS rule %s: %s",
+                self.__class__.__name__,
+                str(ex),
+                exc_info=True,
+            )
+            return self.response_422(message=str(ex))
+        except RLSRuleNotFoundError as ex:
+            return self.response_404()
+
+    @expose("/", methods=["DELETE"])
+    @protect()
+    @safe
+    @statsd_metrics
+    @rison(get_delete_ids_schema)
+    @event_logger.log_this_with_context(
+        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.bulk_delete",
+        log_to_statsd=False,
+    )
+    def bulk_delete(self, **kwargs: Any) -> Response:
+        """Delete bulk RLS rules
+        ---
+        delete:
+          description: >-
+            Deletes multiple RLS rules in a bulk operation.
+          parameters:
+          - in: query
+            name: q
+            content:
+              application/json:
+                schema:
+                  $ref: '#/components/schemas/get_delete_ids_schema'
+          responses:
+            200:
+              description: RLS Rule bulk delete
+              content:
+                application/json:
+                  schema:
+                    type: object
+                    properties:
+                      message:
+                        type: string
+            401:
+              $ref: '#/components/responses/401'
+            403:
+              $ref: '#/components/responses/403'
+            404:
+              $ref: '#/components/responses/404'
+            422:
+              $ref: '#/components/responses/422'
+            500:
+              $ref: '#/components/responses/500'
+        """
+        item_ids = kwargs["rison"]
+        try:
+            BulkDeleteRLSRuleCommand(item_ids).run()
+            return self.response(
+                200,
+                message=ngettext(
+                    "Deleted %(num)d rules",
+                    "Deleted %(num)d rules",
+                    num=len(item_ids),
+                ),
+            )
+        except RLSRuleNotFoundError:
+            return self.response_404()
diff --git a/superset/row_level_security/commands/__init__.py b/superset/row_level_security/commands/__init__.py
new file mode 100644
index 000000000000..13a83393a912
--- /dev/null
+++ b/superset/row_level_security/commands/__init__.py
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
diff --git a/superset/row_level_security/commands/bulk_delete.py b/superset/row_level_security/commands/bulk_delete.py
new file mode 100644
index 000000000000..a6d4625a91f2
--- /dev/null
+++ b/superset/row_level_security/commands/bulk_delete.py
@@ -0,0 +1,52 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import logging
+from typing import List
+
+from superset.commands.base import BaseCommand
+from superset.dao.exceptions import DAODeleteFailedError
+from superset.reports.models import ReportSchedule
+from superset.row_level_security.commands.exceptions import (
+    RLSRuleNotFoundError,
+    RuleBulkDeleteFailedError,
+)
+from superset.row_level_security.dao import RLSDAO
+
+logger = logging.getLogger(__name__)
+
+
+class BulkDeleteRLSRuleCommand(BaseCommand):
+    def __init__(self, model_ids: List[int]):
+        self._model_ids = model_ids
+        self._models: List[ReportSchedule] = []
+
+    def run(self) -> None:
+        self.validate()
+        try:
+            RLSDAO.bulk_delete(self._models)
+
+            return None
+        except DAODeleteFailedError as ex:
+            logger.exception(ex.exception)
+            raise RuleBulkDeleteFailedError() from ex
+
+    def validate(self) -> None:
+        # Validate/populate model exists
+        self._models = RLSDAO.find_by_ids(self._model_ids)
+        if not self._models or len(self._models) != len(self._model_ids):
+            raise RLSRuleNotFoundError()
diff --git a/superset/row_level_security/commands/create.py b/superset/row_level_security/commands/create.py
new file mode 100644
index 000000000000..2c1d4f7b6afc
--- /dev/null
+++ b/superset/row_level_security/commands/create.py
@@ -0,0 +1,57 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
+import logging
+from typing import Any, Dict
+
+from superset.commands.base import BaseCommand
+from superset.commands.exceptions import DatasourceNotFoundValidationError
+from superset.commands.utils import populate_roles
+from superset.connectors.sqla.models import SqlaTable
+from superset.dao.exceptions import DAOCreateFailedError
+from superset.extensions import appbuilder, db, security_manager
+from superset.row_level_security.dao import RLSDAO
+
+logger = logging.getLogger(__name__)
+
+
+class CreateRLSRuleCommand(BaseCommand):
+    def __init__(self, data: Dict[str, Any]):
+        self._properties = data.copy()
+        self._tables = self._properties.get("tables", [])
+        self._roles = self._properties.get("roles", [])
+
+    def run(self) -> Any:
+        self.validate()
+        try:
+            rule = RLSDAO.create(self._properties)
+        except DAOCreateFailedError as ex:
+            logger.exception(ex.exception)
+            raise DAOCreateFailedError
+
+        return rule
+
+    def validate(self) -> None:
+        roles = populate_roles(self._roles)
+        tables = (
+            db.session.query(SqlaTable).filter(SqlaTable.id.in_(self._tables)).all()
+        )
+        if len(tables) != len(self._tables):
+            raise DatasourceNotFoundValidationError()
+        self._properties["roles"] = roles
+        self._properties["tables"] = tables
diff --git a/superset/row_level_security/commands/exceptions.py b/superset/row_level_security/commands/exceptions.py
new file mode 100644
index 000000000000..40f8e4af81af
--- /dev/null
+++ b/superset/row_level_security/commands/exceptions.py
@@ -0,0 +1,29 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+from flask_babel import lazy_gettext as _
+
+from superset.commands.exceptions import CommandException, DeleteFailedError
+
+
+class RLSRuleNotFoundError(CommandException):
+    status = 404
+    message = _("RLS Rule not found.")
+
+
+class RuleBulkDeleteFailedError(DeleteFailedError):
+    message = _("RLS Rule could not be deleted.")
diff --git a/superset/row_level_security/commands/update.py b/superset/row_level_security/commands/update.py
new file mode 100644
index 000000000000..08964601b3d9
--- /dev/null
+++ b/superset/row_level_security/commands/update.py
@@ -0,0 +1,63 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
+import logging
+from typing import Any, Dict, Optional
+
+from superset.commands.base import BaseCommand
+from superset.commands.exceptions import DatasourceNotFoundValidationError
+from superset.commands.utils import populate_roles
+from superset.connectors.sqla.models import RowLevelSecurityFilter, SqlaTable
+from superset.dao.exceptions import DAOUpdateFailedError
+from superset.extensions import appbuilder, db, security_manager
+from superset.row_level_security.commands.exceptions import RLSRuleNotFoundError
+from superset.row_level_security.dao import RLSDAO
+
+logger = logging.getLogger(__name__)
+
+
+class UpdateRLSRuleCommand(BaseCommand):
+    def __init__(self, model_id: int, data: Dict[str, Any]):
+        self._model_id = model_id
+        self._properties = data.copy()
+        self._tables = self._properties.get("tables", [])
+        self._roles = self._properties.get("roles", [])
+        self._model: Optional[RowLevelSecurityFilter] = None
+
+    def run(self) -> Any:
+        self.validate()
+        try:
+            rule = RLSDAO.update(self._model, self._properties)
+        except DAOUpdateFailedError as ex:
+            logger.exception(ex.exception)
+            raise DAOUpdateFailedError
+
+        return rule
+
+    def validate(self) -> None:
+        self._model = RLSDAO.find_by_id(int(self._model_id))
+        if not self._model:
+            raise RLSRuleNotFoundError()
+        roles = populate_roles(self._roles)
+        tables = (
+            db.session.query(SqlaTable).filter(SqlaTable.id.in_(self._tables)).all()
+        )
+        if len(tables) != len(self._tables):
+            raise DatasourceNotFoundValidationError()
+        self._properties["roles"] = roles
+        self._properties["tables"] = tables
diff --git a/superset/row_level_security/dao.py b/superset/row_level_security/dao.py
new file mode 100644
index 000000000000..1226e4d5498a
--- /dev/null
+++ b/superset/row_level_security/dao.py
@@ -0,0 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+from superset.connectors.sqla.models import RowLevelSecurityFilter
+from superset.dao.base import BaseDAO
+
+
+class RLSDAO(BaseDAO):
+    model_cls = RowLevelSecurityFilter
diff --git a/superset/row_level_security/schemas.py b/superset/row_level_security/schemas.py
new file mode 100644
index 000000000000..63f9c8d6bc05
--- /dev/null
+++ b/superset/row_level_security/schemas.py
@@ -0,0 +1,154 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
+from marshmallow import fields, Schema
+from marshmallow.validate import Length, OneOf
+
+from superset.connectors.sqla.models import RowLevelSecurityFilter
+from superset.utils.core import RowLevelSecurityFilterType
+
+id_description = "Unique if of rls filter"
+name_description = "Name of rls filter"
+description_description = "Detailed description"
+filter_type_description = "Regular filters add where clauses to queries if a user belongs to a role referenced in the filter, base filters apply filters to all queries except the roles defined in the filter, and can be used to define what users can see if no RLS filters within a filter group apply to them."
+tables_description = "These are the tables this filter will be applied to."
+roles_description = "For regular filters, these are the roles this filter will be applied to. For base filters, these are the roles that the filter DOES NOT apply to, e.g. Admin if admin should see all data."
+group_key_description = "Filters with the same group key will be ORed together within the group, while different filter groups will be ANDed together. Undefined group keys are treated as unique groups, i.e. are not grouped together. For example, if a table has three filters, of which two are for departments Finance and Marketing (group key = 'department'), and one refers to the region Europe (group key = 'region'), the filter clause would apply the filter (department = 'Finance' OR department = 'Marketing') AND (region = 'Europe')."
+clause_description = "This is the condition that will be added to the WHERE clause. For example, to only return rows for a particular client, you might define a regular filter with the clause `client_id = 9`. To display no rows unless a user belongs to a RLS filter role, a base filter can be created with the clause `1 = 0` (always false)."
+
+get_delete_ids_schema = {"type": "array", "items": {"type": "integer"}}
+
+
+class RolesSchema(Schema):
+    name = fields.String()
+    id = fields.Integer()
+
+
+class TablesSchema(Schema):
+    schema = fields.String()
+    table_name = fields.String()
+    id = fields.Integer()
+
+
+class RLSListSchema(Schema):
+    id = fields.Integer(description=id_description)
+    name = fields.String(description=name_description)
+    filter_type = fields.String(
+        description=filter_type_description,
+        validate=OneOf(
+            [filter_type.value for filter_type in RowLevelSecurityFilterType]
+        ),
+    )
+    roles = fields.List(fields.Nested(RolesSchema))
+    tables = fields.List(fields.Nested(TablesSchema))
+    clause = fields.String(description=clause_description)
+    changed_on_delta_humanized = fields.Function(
+        RowLevelSecurityFilter.created_on_delta_humanized
+    )
+    group_key = fields.String(description=group_key_description)
+    description = fields.String(description=description_description)
+
+
+class RLSShowSchema(Schema):
+    id = fields.Integer(description=id_description)
+    name = fields.String(description=name_description)
+    filter_type = fields.String(
+        description=filter_type_description,
+        validate=OneOf(
+            [filter_type.value for filter_type in RowLevelSecurityFilterType]
+        ),
+    )
+    roles = fields.List(fields.Nested(RolesSchema))
+    tables = fields.List(fields.Nested(TablesSchema))
+    clause = fields.String(description=clause_description)
+    group_key = fields.String(description=group_key_description)
+    description = fields.String(description=description_description)
+
+
+class RLSPostSchema(Schema):
+    name = fields.String(
+        description=name_description,
+        required=True,
+        allow_none=False,
+        validate=Length(1, 255),
+    )
+    description = fields.String(
+        description=description_description, required=False, allow_none=True
+    )
+    filter_type = fields.String(
+        description=filter_type_description,
+        required=True,
+        allow_none=False,
+        validate=OneOf(
+            [filter_type.value for filter_type in RowLevelSecurityFilterType]
+        ),
+    )
+    tables = fields.List(
+        fields.Integer(),
+        description=tables_description,
+        required=True,
+        allow_none=False,
+        validate=Length(1),
+    )
+    roles = fields.List(
+        fields.Integer(), description=roles_description, required=True, allow_none=False
+    )
+    group_key = fields.String(
+        description=group_key_description, required=False, allow_none=True
+    )
+    clause = fields.String(
+        description=clause_description, required=True, allow_none=False
+    )
+
+
+class RLSPutSchema(Schema):
+    name = fields.String(
+        description=name_description,
+        required=False,
+        allow_none=False,
+        validate=Length(1, 255),
+    )
+    description = fields.String(
+        description=description_description, required=False, allow_none=True
+    )
+    filter_type = fields.String(
+        description=filter_type_description,
+        required=False,
+        allow_none=False,
+        validate=OneOf(
+            [filter_type.value for filter_type in RowLevelSecurityFilterType]
+        ),
+    )
+    tables = fields.List(
+        fields.Integer(),
+        description=tables_description,
+        required=False,
+        allow_none=False,
+    )
+    roles = fields.List(
+        fields.Integer(),
+        description=roles_description,
+        required=False,
+        allow_none=False,
+    )
+    group_key = fields.String(
+        description=group_key_description, required=False, allow_none=True
+    )
+    clause = fields.String(
+        description=clause_description, required=False, allow_none=False
+    )
diff --git a/superset/templates/superset/models/rls/list.html b/superset/templates/superset/models/rls/list.html
deleted file mode 100644
index 905ee6d305b1..000000000000
--- a/superset/templates/superset/models/rls/list.html
+++ /dev/null
@@ -1,96 +0,0 @@
-{#
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-#}
-{% extends 'appbuilder/general/widgets/base_list.html' %}
-{% import 'appbuilder/general/lib.html' as lib %}
-
-    {% block begin_content scoped %}
-        <div class="table-responsive">
-        <table class="table table-hover">
-    {% endblock %}
-
-    {% block begin_loop_header scoped %}
-        <thead>
-        <tr>
-        {% if actions %}
-        <th class="action_checkboxes">
-            <input id="check_all" class="action_check_all" name="check_all" type="checkbox">
-        </th>
-        {% endif %}
-
-        {% if can_show or can_edit or can_delete %}
-            <th class="col-md-1 col-lg-1 col-sm-1" ></th>
-        {% endif %}
-
-        {% for item in include_columns %}
-            {% if item in order_columns %}
-                {% set res = item | get_link_order(modelview_name) %}
-                    {% if res == 2 %}
-                    <th><a href={{ item | link_order(modelview_name) }}>{{label_columns.get(item)}}
-                    <i class="fa fa-chevron-up pull-right"></i></a></th>
-                {% elif res == 1 %}
-                    <th><a href={{ item | link_order(modelview_name) }}>{{label_columns.get(item)}}
-                    <i class="fa fa-chevron-down pull-right"></i></a></th>
-                {% else %}
-                    <th><a href={{ item | link_order(modelview_name) }}>{{label_columns.get(item)}}
-                    <i class="fa fa-arrows-v pull-right"></i></a></th>
-                {% endif %}
-            {% else %}
-                <th>{{label_columns.get(item)}}</th>
-            {% endif %}
-        {% endfor %}
-        </tr>
-        </thead>
-    {% endblock %}
-
-    {% block begin_loop_values %}
-        {% for item in value_columns %}
-            {% set pk = pks[loop.index-1] %}
-            <tr>
-                {% if actions %}
-                <td>
-                    <input id="{{pk}}" class="action_check" name="rowid" value="{{pk}}" type="checkbox">
-                </td>
-                {% endif %}
-                {% if can_show or can_edit or can_delete %}
-                    <td><center>
-                    {{ lib.btn_crud(can_show, can_edit, can_delete, pk, modelview_name, filters) }}
-                    </center></td>
-                {% endif %}
-                {% for value in include_columns %}
-                    <td>
-                    {% if value == "roles" and item["filter_type"] == "Base" and not item[value] %}
-                      All
-                    {% elif value == "roles" and item["filter_type"] == 'Base' %}
-                      Not {{ item[value] }}
-                    {% elif value == "roles" and item["filter_type"] == 'Regular' and not item[value] %}
-                      None
-                    {% elif value == "group_key" and item[value] == None %}
-                    {% else %}
-                      {{ item[value] }}
-                    {% endif %}
-                    </td>
-                {% endfor %}
-            </tr>
-        {% endfor %}
-    {% endblock %}
-
-    {% block end_content scoped %}
-        </table>
-        </div>
-    {% endblock %}
diff --git a/tests/integration_tests/security/row_level_security_tests.py b/tests/integration_tests/security/row_level_security_tests.py
index bcf21d149cf3..a0cd91b4372c 100644
--- a/tests/integration_tests/security/row_level_security_tests.py
+++ b/tests/integration_tests/security/row_level_security_tests.py
@@ -21,13 +21,18 @@
 
 import pytest
 from flask import g
+import json
+import prison
 
-from superset import db, security_manager
+from superset import db, security_manager, app
 from superset.connectors.sqla.models import RowLevelSecurityFilter, SqlaTable
 from superset.security.guest_token import (
     GuestTokenResourceType,
     GuestUser,
 )
+from flask_babel import lazy_gettext as _
+from flask_appbuilder.models.sqla import filters
+from ..conftest import with_config
 from ..base_tests import SupersetTestCase
 from tests.integration_tests.fixtures.birth_names_dashboard import (
     load_birth_names_dashboard_with_slices,
@@ -38,6 +43,7 @@
     load_energy_table_data,
 )
 from tests.integration_tests.fixtures.unicode_dashboard import (
+    UNICODE_TBL_NAME,
     load_unicode_dashboard_with_slice,
     load_unicode_data,
 )
@@ -173,19 +179,18 @@ def test_model_view_rls_add_success(self):
         self.login(username="admin")
         test_dataset = self._get_test_dataset()
         rv = self.client.post(
-            "/rowlevelsecurityfiltersmodelview/add",
-            data=dict(
-                name="rls1",
-                description="Some description",
-                filter_type="Regular",
-                tables=[test_dataset.id],
-                roles=[security_manager.find_role("Alpha").id],
-                group_key="group_key_1",
-                clause="client_id=1",
-            ),
-            follow_redirects=True,
+            "/api/v1/rowlevelsecurity/",
+            json={
+                "name": "rls1",
+                "description": "Some description",
+                "filter_type": "Regular",
+                "tables": [test_dataset.id],
+                "roles": [security_manager.find_role("Alpha").id],
+                "group_key": "group_key_1",
+                "clause": "client_id=1",
+            },
         )
-        self.assertEqual(rv.status_code, 200)
+        self.assertEqual(rv.status_code, 201)
         rls1 = (
             db.session.query(RowLevelSecurityFilter).filter_by(name="rls1")
         ).one_or_none()
@@ -200,41 +205,39 @@ def test_model_view_rls_add_name_unique(self):
         self.login(username="admin")
         test_dataset = self._get_test_dataset()
         rv = self.client.post(
-            "/rowlevelsecurityfiltersmodelview/add",
-            data=dict(
-                name="rls_entry1",
-                description="Some description",
-                filter_type="Regular",
-                tables=[test_dataset.id],
-                roles=[security_manager.find_role("Alpha").id],
-                group_key="group_key_1",
-                clause="client_id=1",
-            ),
-            follow_redirects=True,
+            "/api/v1/rowlevelsecurity/",
+            json={
+                "name": "rls_entry1",
+                "description": "Some description",
+                "filter_type": "Regular",
+                "tables": [test_dataset.id],
+                "roles": [security_manager.find_role("Alpha").id],
+                "group_key": "group_key_1",
+                "clause": "client_id=1",
+            },
         )
-        self.assertEqual(rv.status_code, 200)
-        data = rv.data.decode("utf-8")
-        assert "Already exists." in data
+        self.assertEqual(rv.status_code, 422)
+        data = json.loads(rv.data.decode("utf-8"))
+        assert "Create failed" in data["message"]
 
     @pytest.mark.usefixtures("create_dataset")
     def test_model_view_rls_add_tables_required(self):
         self.login(username="admin")
         rv = self.client.post(
-            "/rowlevelsecurityfiltersmodelview/add",
-            data=dict(
-                name="rls1",
-                description="Some description",
-                filter_type="Regular",
-                tables=[],
-                roles=[security_manager.find_role("Alpha").id],
-                group_key="group_key_1",
-                clause="client_id=1",
-            ),
-            follow_redirects=True,
+            "/api/v1/rowlevelsecurity/",
+            json={
+                "name": "rls1",
+                "description": "Some description",
+                "filter_type": "Regular",
+                "tables": [],
+                "roles": [security_manager.find_role("Alpha").id],
+                "group_key": "group_key_1",
+                "clause": "client_id=1",
+            },
         )
-        self.assertEqual(rv.status_code, 200)
-        data = rv.data.decode("utf-8")
-        assert "This field is required." in data
+        self.assertEqual(rv.status_code, 400)
+        data = json.loads(rv.data.decode("utf-8"))
+        assert data["message"] == {"tables": ["Shorter than minimum length 1."]}
 
     @pytest.mark.usefixtures("load_energy_table_with_slice")
     def test_rls_filter_alters_energy_query(self):
@@ -303,6 +306,340 @@ def test_rls_filter_doesnt_alter_admin_birth_names_query(self):
         assert not self.BASE_FILTER_REGEX.search(sql)
 
 
+class TestRowLevelSecurityCreateAPI(SupersetTestCase):
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    def test_invalid_role_failure(self):
+        self.login("Admin")
+        payload = {
+            "name": "rls 1",
+            "clause": "1=1",
+            "filter_type": "Base",
+            "tables": [1],
+            "roles": [999999],
+        }
+        rv = self.client.post("/api/v1/rowlevelsecurity/", json=payload)
+        status_code, data = rv.status_code, json.loads(rv.data.decode("utf-8"))
+        self.assertEqual(status_code, 422)
+        self.assertEqual(data["message"], "[l'Some roles do not exist']")
+
+    def test_invalid_table_failure(self):
+        self.login("Admin")
+        payload = {
+            "name": "rls 1",
+            "clause": "1=1",
+            "filter_type": "Base",
+            "tables": [999999],
+            "roles": [1],
+        }
+        rv = self.client.post("/api/v1/rowlevelsecurity/", json=payload)
+        status_code, data = rv.status_code, json.loads(rv.data.decode("utf-8"))
+        self.assertEqual(status_code, 422)
+        self.assertEqual(data["message"], "[l'Datasource does not exist']")
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    def test_post_success(self):
+        table = db.session.query(SqlaTable).first()
+        self.login("Admin")
+        payload = {
+            "name": "rls 1",
+            "clause": "1=1",
+            "filter_type": "Base",
+            "tables": [table.id],
+            "roles": [1],
+        }
+        rv = self.client.post("/api/v1/rowlevelsecurity/", json=payload)
+        status_code, data = rv.status_code, json.loads(rv.data.decode("utf-8"))
+
+        self.assertEqual(status_code, 201)
+
+        rls = (
+            db.session.query(RowLevelSecurityFilter)
+            .filter(RowLevelSecurityFilter.id == data["id"])
+            .one_or_none()
+        )
+
+        assert rls
+        self.assertEqual(rls.name, "rls 1")
+        self.assertEqual(rls.clause, "1=1")
+        self.assertEqual(rls.filter_type, "Base")
+        self.assertEqual(rls.tables[0].id, table.id)
+        self.assertEqual(rls.roles[0].id, 1)
+
+        db.session.delete(rls)
+        db.session.commit()
+
+
+class TestRowLevelSecurityUpdateAPI(SupersetTestCase):
+    def test_invalid_id_failure(self):
+        self.login("Admin")
+        payload = {
+            "name": "rls 1",
+            "clause": "1=1",
+            "filter_type": "Base",
+            "tables": [1],
+            "roles": [1],
+        }
+        rv = self.client.put("/api/v1/rowlevelsecurity/99999999", json=payload)
+        status_code, data = rv.status_code, json.loads(rv.data.decode("utf-8"))
+        self.assertEqual(status_code, 404)
+        self.assertEqual(data["message"], "Not found")
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    def test_invalid_role_failure(self):
+        table = db.session.query(SqlaTable).first()
+
+        rls = RowLevelSecurityFilter(
+            name="rls test invalid role",
+            clause="1=1",
+            filter_type="Regular",
+            tables=[table],
+        )
+        db.session.add(rls)
+        db.session.commit()
+
+        self.login("Admin")
+        payload = {
+            "roles": [999999],
+        }
+        rv = self.client.put(f"/api/v1/rowlevelsecurity/{rls.id}", json=payload)
+        status_code, data = rv.status_code, json.loads(rv.data.decode("utf-8"))
+        self.assertEqual(status_code, 422)
+        self.assertEqual(data["message"], "[l'Some roles do not exist']")
+
+        db.session.delete(rls)
+        db.session.commit()
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    def test_invalid_table_failure(self):
+        table = db.session.query(SqlaTable).first()
+
+        rls = RowLevelSecurityFilter(
+            name="rls test invalid role",
+            clause="1=1",
+            filter_type="Regular",
+            tables=[table],
+        )
+        db.session.add(rls)
+        db.session.commit()
+
+        self.login("Admin")
+        payload = {
+            "name": "rls 1",
+            "clause": "1=1",
+            "filter_type": "Base",
+            "tables": [999999],
+            "roles": [1],
+        }
+        rv = self.client.put(f"/api/v1/rowlevelsecurity/{rls.id}", json=payload)
+        status_code, data = rv.status_code, json.loads(rv.data.decode("utf-8"))
+        self.assertEqual(status_code, 422)
+        self.assertEqual(data["message"], "[l'Datasource does not exist']")
+
+        db.session.delete(rls)
+        db.session.commit()
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    @pytest.mark.usefixtures("load_energy_table_with_slice")
+    def test_put_success(self):
+        tables = db.session.query(SqlaTable).limit(2).all()
+        roles = db.session.query(security_manager.role_model).limit(2).all()
+
+        rls = RowLevelSecurityFilter(
+            name="rls 1",
+            clause="1=1",
+            filter_type="Regular",
+            tables=[tables[0]],
+            roles=[roles[0]],
+        )
+        db.session.add(rls)
+        db.session.commit()
+
+        self.login("Admin")
+        payload = {
+            "name": "rls put success",
+            "clause": "2=2",
+            "filter_type": "Base",
+            "tables": [tables[1].id],
+            "roles": [roles[1].id],
+        }
+        rv = self.client.put(f"/api/v1/rowlevelsecurity/{rls.id}", json=payload)
+        status_code, data = rv.status_code, json.loads(rv.data.decode("utf-8"))
+
+        self.assertEqual(status_code, 201)
+
+        rls = (
+            db.session.query(RowLevelSecurityFilter)
+            .filter(RowLevelSecurityFilter.id == rls.id)
+            .one_or_none()
+        )
+
+        self.assertEqual(rls.name, "rls put success")
+        self.assertEqual(rls.clause, "2=2")
+        self.assertEqual(rls.filter_type, "Base")
+        self.assertEqual(rls.tables[0].id, tables[1].id)
+        self.assertEqual(rls.roles[0].id, roles[1].id)
+
+        db.session.delete(rls)
+        db.session.commit()
+
+
+class TestRowLevelSecurityBulkDeleteAPI(SupersetTestCase):
+    def test_invalid_id_failure(self):
+        self.login("Admin")
+
+        ids_to_delete = prison.dumps([10000, 10001, 100002])
+        rv = self.client.delete(f"/api/v1/rowlevelsecurity/?q={ids_to_delete}")
+        status_code, data = rv.status_code, json.loads(rv.data.decode("utf-8"))
+
+        self.assertEqual(status_code, 404)
+        self.assertEqual(data["message"], "Not found")
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    @pytest.mark.usefixtures("load_energy_table_with_slice")
+    def test_bulk_delete_success(self):
+        tables = db.session.query(SqlaTable).limit(2).all()
+        roles = db.session.query(security_manager.role_model).limit(2).all()
+
+        rls_1 = RowLevelSecurityFilter(
+            name="rls 1",
+            clause="1=1",
+            filter_type="Regular",
+            tables=[tables[0]],
+            roles=[roles[0]],
+        )
+        rls_2 = RowLevelSecurityFilter(
+            name="rls 2",
+            clause="2=2",
+            filter_type="Base",
+            tables=[tables[1]],
+            roles=[roles[1]],
+        )
+        db.session.add_all([rls_1, rls_2])
+        db.session.commit()
+
+        self.login("Admin")
+
+        ids_to_delete = prison.dumps([rls_1.id, rls_2.id])
+        rv = self.client.delete(f"/api/v1/rowlevelsecurity/?q={ids_to_delete}")
+        status_code, data = rv.status_code, json.loads(rv.data.decode("utf-8"))
+
+        self.assertEqual(status_code, 200)
+        self.assertEqual(data["message"], "Deleted 2 rules")
+
+
+class TestRowLevelSecurityWithRelatedAPI(SupersetTestCase):
+    @pytest.mark.usefixtures("load_birth_names_data")
+    @pytest.mark.usefixtures("load_energy_table_data")
+    def test_rls_tables_related_api(self):
+        self.login("Admin")
+
+        params = prison.dumps({"page": 0, "page_size": 100})
+
+        rv = self.client.get(f"/api/v1/rowlevelsecurity/related/tables?q={params}")
+        self.assertEqual(rv.status_code, 200)
+        data = json.loads(rv.data.decode("utf-8"))
+        result = data["result"]
+
+        db_tables = db.session.query(SqlaTable).all()
+
+        db_table_names = set([t.name for t in db_tables])
+        received_tables = set([table["text"] for table in result])
+
+        assert data["count"] == len(db_tables)
+        assert len(result) == len(db_tables)
+        assert db_table_names == received_tables
+
+    def test_rls_roles_related_api(self):
+        self.login("Admin")
+        params = prison.dumps({"page": 0, "page_size": 100})
+
+        rv = self.client.get(f"/api/v1/rowlevelsecurity/related/roles?q={params}")
+        self.assertEqual(rv.status_code, 200)
+        data = json.loads(rv.data.decode("utf-8"))
+        result = data["result"]
+
+        db_role_names = set([r.name for r in security_manager.get_all_roles()])
+        received_roles = set([role["text"] for role in result])
+
+        assert data["count"] == len(db_role_names)
+        assert len(result) == len(db_role_names)
+        assert db_role_names == received_roles
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    @pytest.mark.usefixtures("load_energy_table_with_slice")
+    @mock.patch(
+        "superset.row_level_security.api.RLSRestApi.base_related_field_filters",
+        {"tables": [["table_name", filters.FilterStartsWith, "birth"]]},
+    )
+    def test_table_related_filter(self):
+        self.login("Admin")
+
+        params = prison.dumps({"page": 0, "page_size": 10})
+
+        rv = self.client.get(f"/api/v1/rowlevelsecurity/related/tables?q={params}")
+        self.assertEqual(rv.status_code, 200)
+        data = json.loads(rv.data.decode("utf-8"))
+        result = data["result"]
+        received_tables = set([table["text"].split(".")[-1] for table in result])
+
+        assert data["count"] == 1
+        assert len(result) == 1
+        assert {"birth_names"} == received_tables
+
+    @mock.patch(
+        "superset.row_level_security.api.RLSRestApi.base_related_field_filters",
+        {"roles": [["name", filters.FilterEqual, "Admin"]]},
+    )
+    def test_role_related_filter(self):
+        self.login("Admin")
+
+        params = prison.dumps({"page": 0, "page_size": 10})
+
+        rv = self.client.get(f"/api/v1/rowlevelsecurity/related/roles?q={params}")
+        self.assertEqual(rv.status_code, 200)
+        data = json.loads(rv.data.decode("utf-8"))
+        result = data["result"]
+        received_roles = set([role["text"] for role in result])
+
+        assert data["count"] == 1
+        assert len(result) == 1
+        assert {"Admin"} == received_roles
+
+    @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+    @pytest.mark.usefixtures("load_energy_table_with_slice")
+    @mock.patch(
+        "superset.row_level_security.api.RLSRestApi.base_related_field_filters",
+        {
+            "tables": [["table_name", filters.FilterStartsWith, "birth"]],
+            "roles": [["name", filters.FilterEqual, "Admin"]],
+        },
+    )
+    def test_table_and_role_related_filter(self):
+        self.login("Admin")
+
+        params = prison.dumps({"page": 0, "page_size": 10})
+
+        rv = self.client.get(f"/api/v1/rowlevelsecurity/related/tables?q={params}")
+        self.assertEqual(rv.status_code, 200)
+        data = json.loads(rv.data.decode("utf-8"))
+        result = data["result"]
+        received_tables = set([table["text"].split(".")[-1] for table in result])
+
+        assert data["count"] == 1
+        assert len(result) == 1
+        assert {"birth_names"} == received_tables
+
+        rv = self.client.get(f"/api/v1/rowlevelsecurity/related/roles?q={params}")
+        self.assertEqual(rv.status_code, 200)
+        data = json.loads(rv.data.decode("utf-8"))
+        result = data["result"]
+        received_roles = set([role["text"] for role in result])
+
+        assert data["count"] == 1
+        assert len(result) == 1
+        assert {"Admin"} == received_roles
+
+
 RLS_ALICE_REGEX = re.compile(r"name = 'Alice'")
 RLS_GENDER_REGEX = re.compile(r"AND \(gender = 'girl'\)")
 

From 90e2b839a32e21328bc75189ecf0910e9566e3c3 Mon Sep 17 00:00:00 2001
From: "Michael S. Molina" <70410625+michael-s-molina@users.noreply.github.com>
Date: Mon, 24 Apr 2023 13:54:31 -0300
Subject: [PATCH 35/47] chore: Deprecates FilterBox (#23784)

---
 RESOURCES/FEATURE_FLAGS.md                                  | 2 +-
 .../src/features/alerts/AlertReportModal.test.tsx           | 2 +-
 .../src/visualizations/FilterBox/FilterBox.jsx              | 3 +++
 .../src/visualizations/FilterBox/FilterBoxChartPlugin.js    | 6 +++++-
 superset/viz.py                                             | 2 ++
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/RESOURCES/FEATURE_FLAGS.md b/RESOURCES/FEATURE_FLAGS.md
index 49fac479cb92..29d84b0d9e3a 100644
--- a/RESOURCES/FEATURE_FLAGS.md
+++ b/RESOURCES/FEATURE_FLAGS.md
@@ -76,7 +76,6 @@ These features flags are **safe for production**. They have been tested and will
 - ALLOW_ADHOC_SUBQUERY
 - DASHBOARD_CROSS_FILTERS
 - DASHBOARD_RBAC [(docs)](https://superset.apache.org/docs/creating-charts-dashboards/first-dashboard#manage-access-to-dashboards)
-- DASHBOARD_NATIVE_FILTERS
 - DATAPANEL_CLOSED_BY_DEFAULT
 - DISABLE_LEGACY_DATASOURCE_EDITOR
 - DRUID_JOINS
@@ -98,4 +97,5 @@ These features flags currently default to True and **will be removed in a future
 
 [//]: # "PLEASE KEEP THE LIST SORTED ALPHABETICALLY"
 
+- DASHBOARD_NATIVE_FILTERS
 - GENERIC_CHART_AXES
diff --git a/superset-frontend/src/features/alerts/AlertReportModal.test.tsx b/superset-frontend/src/features/alerts/AlertReportModal.test.tsx
index 163b8e801ec3..fd0457aa9fc3 100644
--- a/superset-frontend/src/features/alerts/AlertReportModal.test.tsx
+++ b/superset-frontend/src/features/alerts/AlertReportModal.test.tsx
@@ -64,7 +64,7 @@ test('renders the appropriate dropdown in Message Content section', async () =>
 
   expect(await screen.findByRole('radio', { name: /chart/i })).toBeChecked();
   expect(
-    screen.getByRole('radio', {
+    await screen.findByRole('radio', {
       name: /dashboard/i,
     }),
   ).not.toBeChecked();
diff --git a/superset-frontend/src/visualizations/FilterBox/FilterBox.jsx b/superset-frontend/src/visualizations/FilterBox/FilterBox.jsx
index b90d82289e67..f7e816bcaf20 100644
--- a/superset-frontend/src/visualizations/FilterBox/FilterBox.jsx
+++ b/superset-frontend/src/visualizations/FilterBox/FilterBox.jsx
@@ -122,6 +122,9 @@ const StyledFilterContainer = styled.div`
   `}
 `;
 
+/**
+ * @deprecated in version 3.0.
+ */
 class FilterBox extends React.PureComponent {
   constructor(props) {
     super(props);
diff --git a/superset-frontend/src/visualizations/FilterBox/FilterBoxChartPlugin.js b/superset-frontend/src/visualizations/FilterBox/FilterBoxChartPlugin.js
index 137a2b191af2..fbd3846e467c 100644
--- a/superset-frontend/src/visualizations/FilterBox/FilterBoxChartPlugin.js
+++ b/superset-frontend/src/visualizations/FilterBox/FilterBoxChartPlugin.js
@@ -25,7 +25,7 @@ import controlPanel from './controlPanel';
 
 const metadata = new ChartMetadata({
   category: t('Tools'),
-  name: t('Filter box'),
+  name: t('Filter box (deprecated)'),
   description:
     t(`Chart component that lets you add a custom filter UI in your dashboard. When added to dashboard, a filter box lets users specify specific values or ranges to filter charts by. The charts that each filter box is applied to can be fine tuned as well in the dashboard view.
 
@@ -33,8 +33,12 @@ const metadata = new ChartMetadata({
   exampleGallery: [{ url: example1 }, { url: example2 }],
   thumbnail,
   useLegacyApi: true,
+  tags: [t('Legacy'), t('Deprecated')],
 });
 
+/**
+ * @deprecated in version 3.0.
+ */
 export default class FilterBoxChartPlugin extends ChartPlugin {
   constructor() {
     super({
diff --git a/superset/viz.py b/superset/viz.py
index cbfb38f90bd2..050e8bcc26bf 100644
--- a/superset/viz.py
+++ b/superset/viz.py
@@ -50,6 +50,7 @@
 import polyline
 import simplejson as json
 from dateutil import relativedelta as rdelta
+from deprecation import deprecated
 from flask import request
 from flask_babel import gettext as __, lazy_gettext as _
 from geopy.point import Point
@@ -2134,6 +2135,7 @@ def get_data(self, df: pd.DataFrame) -> VizData:
         return data
 
 
+@deprecated(deprecated_in="3.0")
 class FilterBoxViz(BaseViz):
 
     """A multi filter, multi-choice filter box to make dashboards interactive"""

From 039740cdd45570b8846b04eba8e8a46933d18537 Mon Sep 17 00:00:00 2001
From: Kamil Gabryjelski <kamil.gabryjelski@gmail.com>
Date: Mon, 24 Apr 2023 19:10:46 +0200
Subject: [PATCH 36/47] chore: Add DRILL_BY to FEATURE_FLAGS.md (#23798)

---
 RESOURCES/FEATURE_FLAGS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RESOURCES/FEATURE_FLAGS.md b/RESOURCES/FEATURE_FLAGS.md
index 29d84b0d9e3a..60f58a5feac1 100644
--- a/RESOURCES/FEATURE_FLAGS.md
+++ b/RESOURCES/FEATURE_FLAGS.md
@@ -54,6 +54,7 @@ These features are **finished** but currently being tested. They are usable, but
 - DASHBOARD_EDIT_CHART_IN_NEW_TAB
 - DASHBOARD_FILTERS_EXPERIMENTAL
 - DASHBOARD_VIRTUALIZATION
+- DRILL_BY
 - DRILL_TO_DETAIL
 - DYNAMIC_PLUGINS: [(docs)](https://superset.apache.org/docs/installation/running-on-kubernetes)
 - ENABLE_JAVASCRIPT_CONTROLS

From be5c1b0696fb43181cb1f00eeabc9df9ea7b4f38 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Apr 2023 12:16:07 -0600
Subject: [PATCH 37/47] build(deps-dev): bump prettier from 2.8.7 to 2.8.8 in
 /superset-websocket (#23789)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 superset-websocket/package-lock.json | 14 +++++++-------
 superset-websocket/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/superset-websocket/package-lock.json b/superset-websocket/package-lock.json
index 6e45bfa3cf57..ddf6b55211ac 100644
--- a/superset-websocket/package-lock.json
+++ b/superset-websocket/package-lock.json
@@ -30,7 +30,7 @@
         "eslint": "^8.38.0",
         "eslint-config-prettier": "^8.8.0",
         "jest": "^27.3.1",
-        "prettier": "^2.8.7",
+        "prettier": "^2.8.8",
         "ts-jest": "^27.0.7",
         "ts-node": "^10.9.1",
         "typescript": "^4.9.5"
@@ -4783,9 +4783,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "2.8.7",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.7.tgz",
-      "integrity": "sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==",
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
       "dev": true,
       "bin": {
         "prettier": "bin-prettier.js"
@@ -9563,9 +9563,9 @@
       "dev": true
     },
     "prettier": {
-      "version": "2.8.7",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.7.tgz",
-      "integrity": "sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==",
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
       "dev": true
     },
     "pretty-format": {
diff --git a/superset-websocket/package.json b/superset-websocket/package.json
index fe3c853c6b09..f4bd91f52725 100644
--- a/superset-websocket/package.json
+++ b/superset-websocket/package.json
@@ -36,7 +36,7 @@
     "eslint": "^8.38.0",
     "eslint-config-prettier": "^8.8.0",
     "jest": "^27.3.1",
-    "prettier": "^2.8.7",
+    "prettier": "^2.8.8",
     "ts-jest": "^27.0.7",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.5"

From a9d0d70977d61953cda4aa117943fdac87e91e54 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Apr 2023 12:16:21 -0600
Subject: [PATCH 38/47] build(deps-dev): bump eslint from 8.38.0 to 8.39.0 in
 /superset-websocket (#23790)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 superset-websocket/package-lock.json | 49 +++++++++++++++-------------
 superset-websocket/package.json      |  2 +-
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/superset-websocket/package-lock.json b/superset-websocket/package-lock.json
index ddf6b55211ac..7eae9b58bd16 100644
--- a/superset-websocket/package-lock.json
+++ b/superset-websocket/package-lock.json
@@ -27,7 +27,7 @@
         "@types/ws": "^8.5.4",
         "@typescript-eslint/eslint-plugin": "^5.59.0",
         "@typescript-eslint/parser": "^5.59.0",
-        "eslint": "^8.38.0",
+        "eslint": "^8.39.0",
         "eslint-config-prettier": "^8.8.0",
         "jest": "^27.3.1",
         "prettier": "^2.8.8",
@@ -746,9 +746,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.38.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.38.0.tgz",
-      "integrity": "sha512-IoD2MfUnOV58ghIHCiil01PcohxjbYR/qCxsoC+xNgUwh1EY8jOOrYmu3d3a71+tJJ23uscEV4X2HJWMsPJu4g==",
+      "version": "8.39.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.39.0.tgz",
+      "integrity": "sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -2410,15 +2410,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.38.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.38.0.tgz",
-      "integrity": "sha512-pIdsD2jwlUGf/U38Jv97t8lq6HpaU/G9NKbYmpWpZGw3LdTNhZLbJePqxOXGB5+JEKfOPU/XLxYxFh03nr1KTg==",
+      "version": "8.39.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.39.0.tgz",
+      "integrity": "sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.4.0",
         "@eslint/eslintrc": "^2.0.2",
-        "@eslint/js": "8.38.0",
+        "@eslint/js": "8.39.0",
         "@humanwhocodes/config-array": "^0.11.8",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -2428,7 +2428,7 @@
         "debug": "^4.3.2",
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
+        "eslint-scope": "^7.2.0",
         "eslint-visitor-keys": "^3.4.0",
         "espree": "^9.5.1",
         "esquery": "^1.4.2",
@@ -2522,9 +2522,9 @@
       }
     },
     "node_modules/eslint/node_modules/eslint-scope": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
+      "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
       "dev": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
@@ -2532,6 +2532,9 @@
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/eslint/node_modules/estraverse": {
@@ -6446,9 +6449,9 @@
       }
     },
     "@eslint/js": {
-      "version": "8.38.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.38.0.tgz",
-      "integrity": "sha512-IoD2MfUnOV58ghIHCiil01PcohxjbYR/qCxsoC+xNgUwh1EY8jOOrYmu3d3a71+tJJ23uscEV4X2HJWMsPJu4g==",
+      "version": "8.39.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.39.0.tgz",
+      "integrity": "sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==",
       "dev": true
     },
     "@humanwhocodes/config-array": {
@@ -7753,15 +7756,15 @@
       }
     },
     "eslint": {
-      "version": "8.38.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.38.0.tgz",
-      "integrity": "sha512-pIdsD2jwlUGf/U38Jv97t8lq6HpaU/G9NKbYmpWpZGw3LdTNhZLbJePqxOXGB5+JEKfOPU/XLxYxFh03nr1KTg==",
+      "version": "8.39.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.39.0.tgz",
+      "integrity": "sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.4.0",
         "@eslint/eslintrc": "^2.0.2",
-        "@eslint/js": "8.38.0",
+        "@eslint/js": "8.39.0",
         "@humanwhocodes/config-array": "^0.11.8",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -7771,7 +7774,7 @@
         "debug": "^4.3.2",
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
+        "eslint-scope": "^7.2.0",
         "eslint-visitor-keys": "^3.4.0",
         "espree": "^9.5.1",
         "esquery": "^1.4.2",
@@ -7813,9 +7816,9 @@
           "dev": true
         },
         "eslint-scope": {
-          "version": "7.1.1",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-          "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
+          "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
           "dev": true,
           "requires": {
             "esrecurse": "^4.3.0",
diff --git a/superset-websocket/package.json b/superset-websocket/package.json
index f4bd91f52725..622d2110e4de 100644
--- a/superset-websocket/package.json
+++ b/superset-websocket/package.json
@@ -33,7 +33,7 @@
     "@types/ws": "^8.5.4",
     "@typescript-eslint/eslint-plugin": "^5.59.0",
     "@typescript-eslint/parser": "^5.59.0",
-    "eslint": "^8.38.0",
+    "eslint": "^8.39.0",
     "eslint-config-prettier": "^8.8.0",
     "jest": "^27.3.1",
     "prettier": "^2.8.8",

From baec9ddba7f6e8bfb4a3f414a19cbf2197f0013e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Apr 2023 12:16:37 -0600
Subject: [PATCH 39/47] build(deps-dev): bump @types/node from 18.15.13 to
 18.16.0 in /superset-websocket (#23791)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 superset-websocket/package-lock.json | 14 +++++++-------
 superset-websocket/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/superset-websocket/package-lock.json b/superset-websocket/package-lock.json
index 7eae9b58bd16..fa343ffcee41 100644
--- a/superset-websocket/package-lock.json
+++ b/superset-websocket/package-lock.json
@@ -22,7 +22,7 @@
         "@types/ioredis": "^4.27.8",
         "@types/jest": "^27.0.2",
         "@types/jsonwebtoken": "^9.0.1",
-        "@types/node": "^18.15.13",
+        "@types/node": "^18.16.0",
         "@types/uuid": "^9.0.1",
         "@types/ws": "^8.5.4",
         "@typescript-eslint/eslint-plugin": "^5.59.0",
@@ -1318,9 +1318,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "18.15.13",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.13.tgz",
-      "integrity": "sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==",
+      "version": "18.16.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.0.tgz",
+      "integrity": "sha512-BsAaKhB+7X+H4GnSjGhJG9Qi8Tw+inU9nJDwmD5CgOmBLEI6ArdhikpLX7DjbjDRDTbqZzU2LSQNZg8WGPiSZQ==",
       "dev": true
     },
     "node_modules/@types/prettier": {
@@ -6929,9 +6929,9 @@
       }
     },
     "@types/node": {
-      "version": "18.15.13",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.13.tgz",
-      "integrity": "sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==",
+      "version": "18.16.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.0.tgz",
+      "integrity": "sha512-BsAaKhB+7X+H4GnSjGhJG9Qi8Tw+inU9nJDwmD5CgOmBLEI6ArdhikpLX7DjbjDRDTbqZzU2LSQNZg8WGPiSZQ==",
       "dev": true
     },
     "@types/prettier": {
diff --git a/superset-websocket/package.json b/superset-websocket/package.json
index 622d2110e4de..83a53da2623e 100644
--- a/superset-websocket/package.json
+++ b/superset-websocket/package.json
@@ -28,7 +28,7 @@
     "@types/ioredis": "^4.27.8",
     "@types/jest": "^27.0.2",
     "@types/jsonwebtoken": "^9.0.1",
-    "@types/node": "^18.15.13",
+    "@types/node": "^18.16.0",
     "@types/uuid": "^9.0.1",
     "@types/ws": "^8.5.4",
     "@typescript-eslint/eslint-plugin": "^5.59.0",

From 4873c0990ade4649d03aa2907fa3d5d5a62c07d7 Mon Sep 17 00:00:00 2001
From: Diego Medina <diegomedina24@gmail.com>
Date: Mon, 24 Apr 2023 15:17:51 -0300
Subject: [PATCH 40/47] chore: Add tests to SQL lab button components (#22916)

---
 .../EstimateQueryCostButton.test.tsx          | 47 ++++++++-
 .../ExploreCtasResultsButton.test.tsx         | 95 +++++++++++++++++++
 .../ExploreCtasResultsButton/index.tsx        |  2 +-
 .../ExploreResultsButton.test.jsx             | 67 -------------
 .../ExploreResultsButton.test.tsx             | 51 ++++++++++
 .../components/ExploreResultsButton/index.tsx |  2 +-
 6 files changed, 194 insertions(+), 70 deletions(-)
 create mode 100644 superset-frontend/src/SqlLab/components/ExploreCtasResultsButton/ExploreCtasResultsButton.test.tsx
 delete mode 100644 superset-frontend/src/SqlLab/components/ExploreResultsButton/ExploreResultsButton.test.jsx
 create mode 100644 superset-frontend/src/SqlLab/components/ExploreResultsButton/ExploreResultsButton.test.tsx

diff --git a/superset-frontend/src/SqlLab/components/EstimateQueryCostButton/EstimateQueryCostButton.test.tsx b/superset-frontend/src/SqlLab/components/EstimateQueryCostButton/EstimateQueryCostButton.test.tsx
index 5b2cae174166..38dbbf65a05b 100644
--- a/superset-frontend/src/SqlLab/components/EstimateQueryCostButton/EstimateQueryCostButton.test.tsx
+++ b/superset-frontend/src/SqlLab/components/EstimateQueryCostButton/EstimateQueryCostButton.test.tsx
@@ -19,7 +19,7 @@
 import React from 'react';
 import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
-import { render } from 'spec/helpers/testing-library';
+import { fireEvent, render } from 'spec/helpers/testing-library';
 import { Store } from 'redux';
 import {
   initialState,
@@ -90,4 +90,49 @@ describe('EstimateQueryCostButton', () => {
 
     expect(queryByText('Estimate selected query cost')).toBeTruthy();
   });
+
+  it('renders estimation error result', async () => {
+    const { queryByText, getByText } = setup(
+      {},
+      mockStore({
+        ...initialState,
+        sqlLab: {
+          ...initialState.sqlLab,
+          queryCostEstimates: {
+            [defaultQueryEditor.id]: {
+              error: 'Estimate error',
+            },
+          },
+        },
+      }),
+    );
+
+    expect(queryByText('Estimate cost')).toBeTruthy();
+    fireEvent.click(getByText('Estimate cost'));
+
+    expect(queryByText('Estimate error')).toBeTruthy();
+  });
+
+  it('renders estimation success result', async () => {
+    const { queryByText, getByText } = setup(
+      {},
+      mockStore({
+        ...initialState,
+        sqlLab: {
+          ...initialState.sqlLab,
+          queryCostEstimates: {
+            [defaultQueryEditor.id]: {
+              completed: true,
+              cost: [{ 'Total cost': '1.2' }],
+            },
+          },
+        },
+      }),
+    );
+
+    expect(queryByText('Estimate cost')).toBeTruthy();
+    fireEvent.click(getByText('Estimate cost'));
+
+    expect(queryByText('Total cost')).toBeTruthy();
+  });
 });
diff --git a/superset-frontend/src/SqlLab/components/ExploreCtasResultsButton/ExploreCtasResultsButton.test.tsx b/superset-frontend/src/SqlLab/components/ExploreCtasResultsButton/ExploreCtasResultsButton.test.tsx
new file mode 100644
index 000000000000..1f3382505bd0
--- /dev/null
+++ b/superset-frontend/src/SqlLab/components/ExploreCtasResultsButton/ExploreCtasResultsButton.test.tsx
@@ -0,0 +1,95 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import React from 'react';
+import configureStore from 'redux-mock-store';
+import fetchMock from 'fetch-mock';
+import thunk from 'redux-thunk';
+import { fireEvent, render, waitFor } from 'spec/helpers/testing-library';
+import { Store } from 'redux';
+import { SupersetClientClass } from '@superset-ui/core';
+import { initialState } from 'src/SqlLab/fixtures';
+
+import ExploreCtasResultsButton, {
+  ExploreCtasResultsButtonProps,
+} from 'src/SqlLab/components/ExploreCtasResultsButton';
+
+const middlewares = [thunk];
+const mockStore = configureStore(middlewares);
+
+const getOrCreateTableEndpoint = `glob:*/superset/get_or_create_table/`;
+
+const setup = (props: Partial<ExploreCtasResultsButtonProps>, store?: Store) =>
+  render(
+    <ExploreCtasResultsButton
+      table="test"
+      schema="test_schema"
+      dbId={12346}
+      {...props}
+    />,
+    {
+      useRedux: true,
+      ...(store && { store }),
+    },
+  );
+
+describe('ExploreCtasResultsButton', () => {
+  const postFormSpy = jest.spyOn(SupersetClientClass.prototype, 'postForm');
+  postFormSpy.mockImplementation(jest.fn());
+
+  it('renders', async () => {
+    const { queryByText } = setup({}, mockStore(initialState));
+
+    expect(queryByText('Explore')).toBeTruthy();
+  });
+
+  it('visualize results', async () => {
+    const { getByText } = setup({}, mockStore(initialState));
+
+    postFormSpy.mockClear();
+    fetchMock.reset();
+    fetchMock.post(getOrCreateTableEndpoint, { table_id: 1234 });
+
+    fireEvent.click(getByText('Explore'));
+
+    await waitFor(() => {
+      expect(postFormSpy).toHaveBeenCalledTimes(1);
+      expect(postFormSpy).toHaveBeenCalledWith('http://localhost/explore/', {
+        form_data:
+          '{"datasource":"1234__table","metrics":["count"],"groupby":[],"viz_type":"table","since":"100 years ago","all_columns":[],"row_limit":1000}',
+      });
+    });
+  });
+
+  it('visualize results fails', async () => {
+    const { getByText } = setup({}, mockStore(initialState));
+
+    postFormSpy.mockClear();
+    fetchMock.reset();
+    fetchMock.post(getOrCreateTableEndpoint, {
+      status: 500,
+      body: { message: 'Unexpected all to v1 API' },
+    });
+
+    fireEvent.click(getByText('Explore'));
+
+    await waitFor(() => {
+      expect(postFormSpy).toHaveBeenCalledTimes(0);
+    });
+  });
+});
diff --git a/superset-frontend/src/SqlLab/components/ExploreCtasResultsButton/index.tsx b/superset-frontend/src/SqlLab/components/ExploreCtasResultsButton/index.tsx
index a4c71139c0d3..ef3f8462ee54 100644
--- a/superset-frontend/src/SqlLab/components/ExploreCtasResultsButton/index.tsx
+++ b/superset-frontend/src/SqlLab/components/ExploreCtasResultsButton/index.tsx
@@ -29,7 +29,7 @@ import Button from 'src/components/Button';
 import { exploreChart } from 'src/explore/exploreUtils';
 import { SqlLabRootState } from 'src/SqlLab/types';
 
-interface ExploreCtasResultsButtonProps {
+export interface ExploreCtasResultsButtonProps {
   table: string;
   schema?: string | null;
   dbId: number;
diff --git a/superset-frontend/src/SqlLab/components/ExploreResultsButton/ExploreResultsButton.test.jsx b/superset-frontend/src/SqlLab/components/ExploreResultsButton/ExploreResultsButton.test.jsx
deleted file mode 100644
index e9f1740517e0..000000000000
--- a/superset-frontend/src/SqlLab/components/ExploreResultsButton/ExploreResultsButton.test.jsx
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import React from 'react';
-import configureStore from 'redux-mock-store';
-import thunk from 'redux-thunk';
-import { shallow } from 'enzyme';
-import sqlLabReducer from 'src/SqlLab/reducers/index';
-import ExploreResultsButton from 'src/SqlLab/components/ExploreResultsButton';
-import Button from 'src/components/Button';
-import { supersetTheme, ThemeProvider } from '@superset-ui/core';
-
-describe('ExploreResultsButton', () => {
-  const middlewares = [thunk];
-  const mockStore = configureStore(middlewares);
-  const database = {
-    allows_subquery: true,
-  };
-  const initialState = {
-    sqlLab: {
-      ...sqlLabReducer(undefined, {}),
-    },
-    common: {
-      conf: { SUPERSET_WEBSERVER_TIMEOUT: 45 },
-    },
-  };
-  const store = mockStore(initialState);
-  const mockedProps = {
-    database,
-    onClick() {},
-  };
-
-  const getExploreResultsButtonWrapper = (props = mockedProps) =>
-    shallow(
-      <ThemeProvider theme={supersetTheme}>
-        <ExploreResultsButton store={store} {...props} />
-      </ThemeProvider>,
-    )
-      .dive()
-      .dive();
-
-  it('renders with props', () => {
-    expect(
-      React.isValidElement(<ExploreResultsButton {...mockedProps} />),
-    ).toBe(true);
-  });
-
-  it('renders a Button', () => {
-    const wrapper = getExploreResultsButtonWrapper();
-    expect(wrapper.find(Button)).toExist();
-  });
-});
diff --git a/superset-frontend/src/SqlLab/components/ExploreResultsButton/ExploreResultsButton.test.tsx b/superset-frontend/src/SqlLab/components/ExploreResultsButton/ExploreResultsButton.test.tsx
new file mode 100644
index 000000000000..5126299feabd
--- /dev/null
+++ b/superset-frontend/src/SqlLab/components/ExploreResultsButton/ExploreResultsButton.test.tsx
@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import React from 'react';
+import { render, screen } from 'spec/helpers/testing-library';
+
+import ExploreResultsButton, {
+  ExploreResultsButtonProps,
+} from 'src/SqlLab/components/ExploreResultsButton';
+import { OnClickHandler } from 'src/components/Button';
+
+const setup = (
+  onClickFn: OnClickHandler,
+  props: Partial<ExploreResultsButtonProps> = {},
+) =>
+  render(<ExploreResultsButton onClick={onClickFn} {...props} />, {
+    useRedux: true,
+  });
+
+describe('ExploreResultsButton', () => {
+  it('renders', async () => {
+    const { queryByText } = setup(jest.fn(), {
+      database: { allows_subquery: true },
+    });
+
+    expect(queryByText('Create Chart')).toBeTruthy();
+    expect(screen.getByRole('button', { name: 'Create Chart' })).toBeEnabled();
+  });
+
+  it('renders disabled if subquery not allowed', async () => {
+    const { queryByText } = setup(jest.fn());
+
+    expect(queryByText('Create Chart')).toBeTruthy();
+    expect(screen.getByRole('button', { name: 'Create Chart' })).toBeDisabled();
+  });
+});
diff --git a/superset-frontend/src/SqlLab/components/ExploreResultsButton/index.tsx b/superset-frontend/src/SqlLab/components/ExploreResultsButton/index.tsx
index b3ee748218e6..454f3a26b0f4 100644
--- a/superset-frontend/src/SqlLab/components/ExploreResultsButton/index.tsx
+++ b/superset-frontend/src/SqlLab/components/ExploreResultsButton/index.tsx
@@ -21,7 +21,7 @@ import { t } from '@superset-ui/core';
 import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
 import Button, { OnClickHandler } from 'src/components/Button';
 
-interface ExploreResultsButtonProps {
+export interface ExploreResultsButtonProps {
   database?: {
     allows_subquery?: boolean;
   };

From 71106cfd9791300fa3217bd46884381dde7e7b23 Mon Sep 17 00:00:00 2001
From: Elizabeth Thompson <eschutho@gmail.com>
Date: Mon, 24 Apr 2023 12:53:53 -0700
Subject: [PATCH 41/47] feat: create dtype option for csv upload (#23716)

---
 superset/db_engine_specs/redshift.py          | 40 ++++++++++++
 .../form_view/csv_to_database_view/edit.html  |  4 ++
 superset/views/database/forms.py              | 10 +++
 superset/views/database/views.py              |  3 +
 tests/integration_tests/csv_upload_tests.py   | 44 ++++++++++++-
 .../db_engine_specs/redshift_tests.py         | 61 +++++++++++++++++++
 6 files changed, 160 insertions(+), 2 deletions(-)

diff --git a/superset/db_engine_specs/redshift.py b/superset/db_engine_specs/redshift.py
index 7e2717d77610..27b749e418cf 100644
--- a/superset/db_engine_specs/redshift.py
+++ b/superset/db_engine_specs/redshift.py
@@ -18,12 +18,16 @@
 import re
 from typing import Any, Dict, Optional, Pattern, Tuple
 
+import pandas as pd
 from flask_babel import gettext as __
+from sqlalchemy.types import NVARCHAR
 
 from superset.db_engine_specs.base import BasicParametersMixin
 from superset.db_engine_specs.postgres import PostgresBaseEngineSpec
 from superset.errors import SupersetErrorType
+from superset.models.core import Database
 from superset.models.sql_lab import Query
+from superset.sql_parse import Table
 
 logger = logging.getLogger()
 
@@ -96,6 +100,42 @@ class RedshiftEngineSpec(PostgresBaseEngineSpec, BasicParametersMixin):
         ),
     }
 
+    @classmethod
+    def df_to_sql(
+        cls,
+        database: Database,
+        table: Table,
+        df: pd.DataFrame,
+        to_sql_kwargs: Dict[str, Any],
+    ) -> None:
+        """
+        Upload data from a Pandas DataFrame to a database.
+
+        For regular engines this calls the `pandas.DataFrame.to_sql` method.
+        Overrides the base class to allow for pandas string types to be
+        used as nvarchar(max) columns, as redshift does not support
+        text data types.
+
+        Note this method does not create metadata for the table.
+
+        :param database: The database to upload the data to
+        :param table: The table to upload the data to
+        :param df: The dataframe with data to be uploaded
+        :param to_sql_kwargs: The kwargs to be passed to pandas.DataFrame.to_sql` method
+        """
+        to_sql_kwargs = to_sql_kwargs or {}
+        to_sql_kwargs["dtype"] = {
+            # uses the max size for redshift nvarchar(65335)
+            # the default object and string types create a varchar(256)
+            col_name: NVARCHAR(length=65535)
+            for col_name, type in zip(df.columns, df.dtypes)
+            if isinstance(type, pd.StringDtype)
+        }
+
+        super().df_to_sql(
+            df=df, database=database, table=table, to_sql_kwargs=to_sql_kwargs
+        )
+
     @staticmethod
     def _mutate_label(label: str) -> str:
         """
diff --git a/superset/templates/superset/form_view/csv_to_database_view/edit.html b/superset/templates/superset/form_view/csv_to_database_view/edit.html
index b09f9bd3838b..a0ae43792e39 100644
--- a/superset/templates/superset/form_view/csv_to_database_view/edit.html
+++ b/superset/templates/superset/form_view/csv_to_database_view/edit.html
@@ -104,6 +104,10 @@
         {{ lib.render_field(form.overwrite_duplicate, begin_sep_label, end_sep_label, begin_sep_field,
         end_sep_field) }}
       </tr>
+      <tr>
+        {{ lib.render_field(form.dtype, begin_sep_label, end_sep_label, begin_sep_field,
+        end_sep_field) }}
+      </tr>
     {% endcall %}
     {% call csv_macros.render_collapsable_form_group("accordion3", "Rows") %}
       <tr>
diff --git a/superset/views/database/forms.py b/superset/views/database/forms.py
index 91ab38dc2fe5..99b64e38ab45 100644
--- a/superset/views/database/forms.py
+++ b/superset/views/database/forms.py
@@ -140,6 +140,16 @@ class CsvToDatabaseForm(UploadToDatabaseForm):
         get_pk=lambda a: a.id,
         get_label=lambda a: a.database_name,
     )
+    dtype = StringField(
+        _("Column Data Types"),
+        description=_(
+            "A dictionary with column names and their data types"
+            " if you need to change the defaults."
+            ' Example: {"user_id":"integer"}'
+        ),
+        validators=[Optional()],
+        widget=BS3TextFieldWidget(),
+    )
     schema = StringField(
         _("Schema"),
         description=_("Select a schema if the database supports this"),
diff --git a/superset/views/database/views.py b/superset/views/database/views.py
index 037128ee1659..a9137e59edfe 100644
--- a/superset/views/database/views.py
+++ b/superset/views/database/views.py
@@ -15,6 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import io
+import json
 import os
 import tempfile
 import zipfile
@@ -189,6 +190,7 @@ def form_post(self, form: CsvToDatabaseForm) -> Response:
             delimiter_input = form.otherInput.data
 
         try:
+            kwargs = {"dtype": json.loads(form.dtype.data)} if form.dtype.data else {}
             df = pd.concat(
                 pd.read_csv(
                     chunksize=1000,
@@ -208,6 +210,7 @@ def form_post(self, form: CsvToDatabaseForm) -> Response:
                     skip_blank_lines=form.skip_blank_lines.data,
                     skipinitialspace=form.skip_initial_space.data,
                     skiprows=form.skiprows.data,
+                    **kwargs,
                 )
             )
 
diff --git a/tests/integration_tests/csv_upload_tests.py b/tests/integration_tests/csv_upload_tests.py
index d3b55f7bfed6..97b83bb8fc9e 100644
--- a/tests/integration_tests/csv_upload_tests.py
+++ b/tests/integration_tests/csv_upload_tests.py
@@ -20,7 +20,7 @@
 import logging
 import os
 import shutil
-from typing import Dict, Optional
+from typing import Dict, Optional, Union
 
 from unittest import mock
 
@@ -129,7 +129,12 @@ def get_upload_db():
     return db.session.query(Database).filter_by(database_name=CSV_UPLOAD_DATABASE).one()
 
 
-def upload_csv(filename: str, table_name: str, extra: Optional[Dict[str, str]] = None):
+def upload_csv(
+    filename: str,
+    table_name: str,
+    extra: Optional[Dict[str, str]] = None,
+    dtype: Union[str, None] = None,
+):
     csv_upload_db_id = get_upload_db().id
     schema = utils.get_example_default_schema()
     form_data = {
@@ -145,6 +150,8 @@ def upload_csv(filename: str, table_name: str, extra: Optional[Dict[str, str]] =
         form_data["schema"] = schema
     if extra:
         form_data.update(extra)
+    if dtype:
+        form_data["dtype"] = dtype
     return get_resp(test_client, "/csvtodatabaseview/form", data=form_data)
 
 
@@ -386,6 +393,39 @@ def test_import_csv(mock_event_logger):
         data = engine.execute(f"SELECT * from {CSV_UPLOAD_TABLE}").fetchall()
         assert data == [("john", 1, "x"), ("paul", 2, None)]
 
+    # cleanup
+    with get_upload_db().get_sqla_engine_with_context() as engine:
+        engine.execute(f"DROP TABLE {full_table_name}")
+
+    # with dtype
+    upload_csv(
+        CSV_FILENAME1,
+        CSV_UPLOAD_TABLE,
+        dtype='{"a": "string", "b": "float64"}',
+    )
+
+    # you can change the type to something compatible, like an object to string
+    # or an int to a float
+    # file upload should work as normal
+    with test_db.get_sqla_engine_with_context() as engine:
+        data = engine.execute(f"SELECT * from {CSV_UPLOAD_TABLE}").fetchall()
+        assert data == [("john", 1), ("paul", 2)]
+
+    # cleanup
+    with get_upload_db().get_sqla_engine_with_context() as engine:
+        engine.execute(f"DROP TABLE {full_table_name}")
+
+    # with dtype - wrong type
+    resp = upload_csv(
+        CSV_FILENAME1,
+        CSV_UPLOAD_TABLE,
+        dtype='{"a": "int"}',
+    )
+
+    # you cannot pass an incompatible dtype
+    fail_msg = f"Unable to upload CSV file {escaped_double_quotes(CSV_FILENAME1)} to table {escaped_double_quotes(CSV_UPLOAD_TABLE)}"
+    assert fail_msg in resp
+
 
 @pytest.mark.usefixtures("setup_csv_upload_with_context")
 @pytest.mark.usefixtures("create_excel_files")
diff --git a/tests/integration_tests/db_engine_specs/redshift_tests.py b/tests/integration_tests/db_engine_specs/redshift_tests.py
index cdfe8d16cb71..2d46c73fca7f 100644
--- a/tests/integration_tests/db_engine_specs/redshift_tests.py
+++ b/tests/integration_tests/db_engine_specs/redshift_tests.py
@@ -14,11 +14,18 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+import unittest.mock as mock
 from textwrap import dedent
 
+import numpy as np
+import pandas as pd
+from sqlalchemy.types import NVARCHAR
+
 from superset.db_engine_specs.redshift import RedshiftEngineSpec
 from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
+from superset.sql_parse import Table
 from tests.integration_tests.db_engine_specs.base_tests import TestDbEngineSpec
+from tests.integration_tests.test_app import app
 
 
 class TestRedshiftDbEngineSpec(TestDbEngineSpec):
@@ -183,3 +190,57 @@ def test_extract_errors(self):
                 },
             )
         ]
+
+    def test_df_to_sql_no_dtype(self):
+        mock_database = mock.MagicMock()
+        mock_database.get_df.return_value.empty = False
+        table_name = "foobar"
+        data = [
+            ("foo", "bar", pd.NA, None),
+            ("foo", "bar", pd.NA, True),
+            ("foo", "bar", pd.NA, None),
+        ]
+        numpy_dtype = [
+            ("id", "object"),
+            ("value", "object"),
+            ("num", "object"),
+            ("bool", "object"),
+        ]
+        column_names = ["id", "value", "num", "bool"]
+
+        test_array = np.array(data, dtype=numpy_dtype)
+
+        df = pd.DataFrame(test_array, columns=column_names)
+        df.to_sql = mock.MagicMock()
+
+        with app.app_context():
+            RedshiftEngineSpec.df_to_sql(
+                mock_database, Table(table=table_name), df, to_sql_kwargs={}
+            )
+
+        assert df.to_sql.call_args[1]["dtype"] == {}
+
+    def test_df_to_sql_with_string_dtype(self):
+        mock_database = mock.MagicMock()
+        mock_database.get_df.return_value.empty = False
+        table_name = "foobar"
+        data = [
+            ("foo", "bar", pd.NA, None),
+            ("foo", "bar", pd.NA, True),
+            ("foo", "bar", pd.NA, None),
+        ]
+        column_names = ["id", "value", "num", "bool"]
+
+        df = pd.DataFrame(data, columns=column_names)
+        df = df.astype(dtype={"value": "string"})
+        df.to_sql = mock.MagicMock()
+
+        with app.app_context():
+            RedshiftEngineSpec.df_to_sql(
+                mock_database, Table(table=table_name), df, to_sql_kwargs={}
+            )
+
+        # varchar string length should be 65535
+        dtype = df.to_sql.call_args[1]["dtype"]
+        assert isinstance(dtype["value"], NVARCHAR)
+        assert dtype["value"].length == 65535

From 742c2cd8fb13090a858f4f35088b4113c009a6b5 Mon Sep 17 00:00:00 2001
From: Stepan <66589759+Always-prog@users.noreply.github.com>
Date: Mon, 24 Apr 2023 22:56:30 +0300
Subject: [PATCH 42/47] fix(datasource): saving new calculated columns (#23783)

---
 superset-frontend/src/components/Datasource/DatasourceModal.tsx | 2 +-
 superset/datasets/schemas.py                                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/superset-frontend/src/components/Datasource/DatasourceModal.tsx b/superset-frontend/src/components/Datasource/DatasourceModal.tsx
index b5b698f8315b..5e985ca374b4 100644
--- a/superset-frontend/src/components/Datasource/DatasourceModal.tsx
+++ b/superset-frontend/src/components/Datasource/DatasourceModal.tsx
@@ -139,7 +139,7 @@ const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({
         ),
         columns: currentDatasource?.columns?.map(
           (column: Record<string, unknown>) => ({
-            id: column.id,
+            id: typeof column.id === 'number' ? column.id : undefined,
             column_name: column.column_name,
             type: column.type,
             advanced_data_type: column.advanced_data_type,
diff --git a/superset/datasets/schemas.py b/superset/datasets/schemas.py
index eaf5963fdf32..41759c2e84ab 100644
--- a/superset/datasets/schemas.py
+++ b/superset/datasets/schemas.py
@@ -45,7 +45,7 @@ def validate_python_date_format(value: str) -> None:
 
 
 class DatasetColumnsPutSchema(Schema):
-    id = fields.Integer()
+    id = fields.Integer(required=False)
     column_name = fields.String(required=True, validate=Length(1, 255))
     type = fields.String(allow_none=True)
     advanced_data_type = fields.String(allow_none=True, validate=Length(1, 255))

From 7e4be7d1eab0265d0098b05d33eb2003671dddca Mon Sep 17 00:00:00 2001
From: "JUST.in DO IT" <justin.park@airbnb.com>
Date: Tue, 25 Apr 2023 05:58:28 -0700
Subject: [PATCH 43/47] fix(sqllab): test failed due to legacy api url (#23805)

---
 .../ExploreCtasResultsButton.test.tsx                      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ExploreCtasResultsButton/ExploreCtasResultsButton.test.tsx b/superset-frontend/src/SqlLab/components/ExploreCtasResultsButton/ExploreCtasResultsButton.test.tsx
index 1f3382505bd0..e107c5109d49 100644
--- a/superset-frontend/src/SqlLab/components/ExploreCtasResultsButton/ExploreCtasResultsButton.test.tsx
+++ b/superset-frontend/src/SqlLab/components/ExploreCtasResultsButton/ExploreCtasResultsButton.test.tsx
@@ -32,7 +32,7 @@ import ExploreCtasResultsButton, {
 const middlewares = [thunk];
 const mockStore = configureStore(middlewares);
 
-const getOrCreateTableEndpoint = `glob:*/superset/get_or_create_table/`;
+const getOrCreateTableEndpoint = `glob:*/api/v1/dataset/get_or_create/`;
 
 const setup = (props: Partial<ExploreCtasResultsButtonProps>, store?: Store) =>
   render(
@@ -63,7 +63,7 @@ describe('ExploreCtasResultsButton', () => {
 
     postFormSpy.mockClear();
     fetchMock.reset();
-    fetchMock.post(getOrCreateTableEndpoint, { table_id: 1234 });
+    fetchMock.post(getOrCreateTableEndpoint, { result: { table_id: 1234 } });
 
     fireEvent.click(getByText('Explore'));
 
@@ -82,8 +82,7 @@ describe('ExploreCtasResultsButton', () => {
     postFormSpy.mockClear();
     fetchMock.reset();
     fetchMock.post(getOrCreateTableEndpoint, {
-      status: 500,
-      body: { message: 'Unexpected all to v1 API' },
+      throws: new Error('Unexpected all to v1 API'),
     });
 
     fireEvent.click(getByText('Explore'));

From 60c2e7013debfd0798077a747b1d27a6f8170246 Mon Sep 17 00:00:00 2001
From: Nicolas Charpentier <nicolas.charpentier079@gmail.com>
Date: Tue, 25 Apr 2023 11:18:27 -0400
Subject: [PATCH 44/47] docs: cleanup references to
 `apache-superset/superset-ui` (#23796)

---
 CONTRIBUTING.md                                            | 2 +-
 docs/docs/miscellaneous/country-map-tools.mdx              | 2 +-
 superset-embedded-sdk/package.json                         | 3 ++-
 superset-frontend/package.json                             | 3 ++-
 superset-frontend/packages/generator-superset/package.json | 3 ++-
 .../packages/superset-ui-chart-controls/package.json       | 7 ++++---
 superset-frontend/packages/superset-ui-core/package.json   | 7 ++++---
 .../packages/superset-ui-core/src/number-format/README.md  | 2 +-
 .../packages/superset-ui-core/src/time-format/README.md    | 2 +-
 superset-frontend/packages/superset-ui-demo/package.json   | 7 ++++---
 .../packages/superset-ui-switchboard/package.json          | 3 ++-
 .../plugins/legacy-plugin-chart-calendar/package.json      | 7 ++++---
 .../plugins/legacy-plugin-chart-chord/package.json         | 7 ++++---
 .../plugins/legacy-plugin-chart-country-map/package.json   | 7 ++++---
 .../plugins/legacy-plugin-chart-event-flow/package.json    | 7 ++++---
 .../plugins/legacy-plugin-chart-heatmap/package.json       | 7 ++++---
 .../plugins/legacy-plugin-chart-histogram/package.json     | 7 ++++---
 .../plugins/legacy-plugin-chart-horizon/package.json       | 7 ++++---
 .../plugins/legacy-plugin-chart-map-box/package.json       | 3 ++-
 .../plugins/legacy-plugin-chart-paired-t-test/package.json | 7 ++++---
 .../legacy-plugin-chart-parallel-coordinates/package.json  | 7 ++++---
 .../plugins/legacy-plugin-chart-partition/package.json     | 7 ++++---
 .../plugins/legacy-plugin-chart-pivot-table/package.json   | 7 ++++---
 .../plugins/legacy-plugin-chart-rose/package.json          | 7 ++++---
 .../plugins/legacy-plugin-chart-sankey-loop/package.json   | 7 ++++---
 .../plugins/legacy-plugin-chart-sankey/package.json        | 7 ++++---
 .../plugins/legacy-plugin-chart-sunburst/package.json      | 7 ++++---
 .../plugins/legacy-plugin-chart-treemap/package.json       | 7 ++++---
 .../plugins/legacy-plugin-chart-world-map/package.json     | 7 ++++---
 .../plugins/legacy-preset-chart-deckgl/package.json        | 3 ++-
 .../plugins/legacy-preset-chart-nvd3/package.json          | 7 ++++---
 .../plugins/plugin-chart-echarts/package.json              | 7 ++++---
 .../plugins/plugin-chart-handlebars/package.json           | 7 ++++---
 .../plugins/plugin-chart-pivot-table/package.json          | 7 ++++---
 superset-frontend/plugins/plugin-chart-table/package.json  | 7 ++++---
 .../plugins/plugin-chart-word-cloud/package.json           | 7 ++++---
 superset-frontend/plugins/preset-chart-xy/package.json     | 7 ++++---
 37 files changed, 124 insertions(+), 91 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1c13006aa5bb..e5187c0a438e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -647,7 +647,7 @@ FEATURE_FLAGS = {
 }
 ```
 
-If you want to use the same flag in the client code, also add it to the FeatureFlag TypeScript enum in [@superset-ui/core](https://github.com/apache-superset/superset-ui/blob/master/packages/superset-ui-core/src/utils/featureFlags.ts). For example,
+If you want to use the same flag in the client code, also add it to the FeatureFlag TypeScript enum in [@superset-ui/core](https://github.com/apache/superset/blob/master/superset-frontend/packages/superset-ui-core/src/utils/featureFlags.ts). For example,
 
 ```typescript
 export enum FeatureFlag {
diff --git a/docs/docs/miscellaneous/country-map-tools.mdx b/docs/docs/miscellaneous/country-map-tools.mdx
index 20d1dbe22c4f..89ce110e3739 100644
--- a/docs/docs/miscellaneous/country-map-tools.mdx
+++ b/docs/docs/miscellaneous/country-map-tools.mdx
@@ -53,7 +53,7 @@ The Country Maps visualization already ships with the maps for the following cou
 ## Adding a New Country
 
 To add a new country to the list, you'd have to edit files in
-[@superset-ui/legacy-plugin-chart-country-map](https://github.com/apache-superset/superset-ui/tree/master/plugins/legacy-plugin-chart-country-map).
+[@superset-ui/legacy-plugin-chart-country-map](https://github.com/apache/superset/tree/master/superset-frontend/plugins/legacy-plugin-chart-country-map).
 
 1. Generate a new GeoJSON file for your country following the guide in [this Jupyter notebook](https://github.com/apache/superset/blob/master/superset-frontend/plugins/legacy-plugin-chart-country-map/scripts/Country%20Map%20GeoJSON%20Generator.ipynb).
 2. Edit the countries list in [legacy-plugin-chart-country-map/src/countries.ts](https://github.com/apache/superset/blob/master/superset-frontend/plugins/legacy-plugin-chart-country-map/src/countries.ts).
diff --git a/superset-embedded-sdk/package.json b/superset-embedded-sdk/package.json
index 4ee8510a051a..1cab7f2c0276 100644
--- a/superset-embedded-sdk/package.json
+++ b/superset-embedded-sdk/package.json
@@ -51,7 +51,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache/superset.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-embedded-sdk"
   },
   "homepage": "https://github.com/apache/superset#readme",
   "bugs": {
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
index f9dce7757d51..0fba94ee7b5c 100644
--- a/superset-frontend/package.json
+++ b/superset-frontend/package.json
@@ -20,7 +20,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache/superset.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend"
   },
   "license": "Apache-2.0",
   "author": {
diff --git a/superset-frontend/packages/generator-superset/package.json b/superset-frontend/packages/generator-superset/package.json
index 36a622f3f939..161ca22b1af0 100644
--- a/superset-frontend/packages/generator-superset/package.json
+++ b/superset-frontend/packages/generator-superset/package.json
@@ -14,7 +14,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache/superset.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/packages/generator-superset"
   },
   "license": "Apache-2.0",
   "author": "Superset",
diff --git a/superset-frontend/packages/superset-ui-chart-controls/package.json b/superset-frontend/packages/superset-ui-chart-controls/package.json
index a370aa56c902..6c3f892b0952 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/package.json
+++ b/superset-frontend/packages/superset-ui-chart-controls/package.json
@@ -5,13 +5,14 @@
   "keywords": [
     "superset"
   ],
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/packages/superset-ui-chart-controls#readme",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/packages/superset-ui-chart-controls"
   },
   "license": "Apache-2.0",
   "author": "Superset",
diff --git a/superset-frontend/packages/superset-ui-core/package.json b/superset-frontend/packages/superset-ui-core/package.json
index 1d2a28910e35..59894f716948 100644
--- a/superset-frontend/packages/superset-ui-core/package.json
+++ b/superset-frontend/packages/superset-ui-core/package.json
@@ -5,13 +5,14 @@
   "keywords": [
     "superset"
   ],
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/packages/superset-ui-core#readme",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/packages/superset-ui-core"
   },
   "license": "Apache-2.0",
   "author": "Superset",
diff --git a/superset-frontend/packages/superset-ui-core/src/number-format/README.md b/superset-frontend/packages/superset-ui-core/src/number-format/README.md
index e3e5099243b5..49ba401c3d90 100644
--- a/superset-frontend/packages/superset-ui-core/src/number-format/README.md
+++ b/superset-frontend/packages/superset-ui-core/src/number-format/README.md
@@ -55,7 +55,7 @@ console.log(formatNumber('my_format', 1000));
 ```
 
 It also define constants for common d3 formats. See the full list of formats in
-[NumberFormats.js](https://github.com/apache-superset/superset-ui/blob/master/packages/superset-ui-number-format/src/NumberFormats.js).
+[NumberFormats.js](https://github.com/apache/superset/blob/master/superset-frontend/packages/superset-ui-core/src/number-format/NumberFormats.ts).
 
 ```js
 import { NumberFormats } from '@superset-ui-number-format';
diff --git a/superset-frontend/packages/superset-ui-core/src/time-format/README.md b/superset-frontend/packages/superset-ui-core/src/time-format/README.md
index 21341bdc1c69..9b0982ec5173 100644
--- a/superset-frontend/packages/superset-ui-core/src/time-format/README.md
+++ b/superset-frontend/packages/superset-ui-core/src/time-format/README.md
@@ -52,7 +52,7 @@ console.log(formatTime('my_format', new Date(2018)));
 ```
 
 It also define constants for common d3 time formats. See
-[TimeFormats.js](https://github.com/apache-superset/superset-ui/blob/master/packages/superset-ui-time-format/src/TimeFormats.js).
+[TimeFormats.js](https://github.com/apache/superset/blob/master/superset-frontend/packages/superset-ui-core/src/time-format/TimeFormats.ts).
 
 ```js
 import { TimeFormats } from '@superset-ui/core';
diff --git a/superset-frontend/packages/superset-ui-demo/package.json b/superset-frontend/packages/superset-ui-demo/package.json
index a2ff398662dc..b560f8701a7d 100644
--- a/superset-frontend/packages/superset-ui-demo/package.json
+++ b/superset-frontend/packages/superset-ui-demo/package.json
@@ -14,7 +14,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/packages/superset-ui-demo"
   },
   "keywords": [
     "storybook",
@@ -26,9 +27,9 @@
   ],
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/packages/superset-ui-demo#readme",
   "dependencies": {
     "@data-ui/event-flow": "^0.0.84",
     "@emotion/cache": "^11.4.0",
diff --git a/superset-frontend/packages/superset-ui-switchboard/package.json b/superset-frontend/packages/superset-ui-switchboard/package.json
index 1e49d7eb9cde..5fae91b95386 100644
--- a/superset-frontend/packages/superset-ui-switchboard/package.json
+++ b/superset-frontend/packages/superset-ui-switchboard/package.json
@@ -11,7 +11,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache/superset.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/packages/superset-ui-switchboard"
   },
   "keywords": [
     "switchboard",
diff --git a/superset-frontend/plugins/legacy-plugin-chart-calendar/package.json b/superset-frontend/plugins/legacy-plugin-chart-calendar/package.json
index cb11164183d7..85e29c820c1d 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-calendar/package.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-calendar/package.json
@@ -5,13 +5,14 @@
   "keywords": [
     "superset"
   ],
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/legacy-plugin-chart-calendar#readme",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/plugins/legacy-plugin-chart-calendar"
   },
   "license": "Apache-2.0",
   "author": "Superset",
diff --git a/superset-frontend/plugins/legacy-plugin-chart-chord/package.json b/superset-frontend/plugins/legacy-plugin-chart-chord/package.json
index 02a7525c3a2b..ac664f53f644 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-chord/package.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-chord/package.json
@@ -13,7 +13,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/plugins/legacy-plugin-chart-chord"
   },
   "keywords": [
     "superset"
@@ -21,9 +22,9 @@
   "author": "Superset",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/legacy-plugin-chart-chord#readme",
   "publishConfig": {
     "access": "public"
   },
diff --git a/superset-frontend/plugins/legacy-plugin-chart-country-map/package.json b/superset-frontend/plugins/legacy-plugin-chart-country-map/package.json
index 1b4ee339e835..b699cfb40f9d 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-country-map/package.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-country-map/package.json
@@ -10,7 +10,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/plugins/legacy-plugin-chart-country-map"
   },
   "keywords": [
     "superset"
@@ -18,9 +19,9 @@
   "author": "Superset",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/legacy-plugin-chart-country-map#readme",
   "publishConfig": {
     "access": "public"
   },
diff --git a/superset-frontend/plugins/legacy-plugin-chart-event-flow/package.json b/superset-frontend/plugins/legacy-plugin-chart-event-flow/package.json
index 6a7da3fa14ec..85b0dc0552c2 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-event-flow/package.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-event-flow/package.json
@@ -13,7 +13,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/plugins/legacy-plugin-chart-event-flow"
   },
   "keywords": [
     "superset"
@@ -21,9 +22,9 @@
   "author": "Superset",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/legacy-plugin-chart-event-flow#readme",
   "publishConfig": {
     "access": "public"
   },
diff --git a/superset-frontend/plugins/legacy-plugin-chart-heatmap/package.json b/superset-frontend/plugins/legacy-plugin-chart-heatmap/package.json
index 692a9dc10770..bb53b0a7e94d 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-heatmap/package.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-heatmap/package.json
@@ -5,13 +5,14 @@
   "keywords": [
     "superset"
   ],
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/legacy-plugin-chart-heatmap#readme",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/plugins/legacy-plugin-chart-heatmap"
   },
   "license": "Apache-2.0",
   "author": "Superset",
diff --git a/superset-frontend/plugins/legacy-plugin-chart-histogram/package.json b/superset-frontend/plugins/legacy-plugin-chart-histogram/package.json
index 041106d57f76..5aa8a045da6f 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-histogram/package.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-histogram/package.json
@@ -13,7 +13,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/packages/legacy-plugin-chart-histogram"
   },
   "keywords": [
     "superset"
@@ -21,9 +22,9 @@
   "author": "Superset",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/legacy-plugin-chart-histogram#readme",
   "publishConfig": {
     "access": "public"
   },
diff --git a/superset-frontend/plugins/legacy-plugin-chart-horizon/package.json b/superset-frontend/plugins/legacy-plugin-chart-horizon/package.json
index e0c2344761a5..2b8c90b3c297 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-horizon/package.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-horizon/package.json
@@ -5,13 +5,14 @@
   "keywords": [
     "superset"
   ],
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/legacy-plugin-chart-horizon#readme",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/packages/legacy-plugin-chart-horizon"
   },
   "license": "Apache-2.0",
   "author": "Superset",
diff --git a/superset-frontend/plugins/legacy-plugin-chart-map-box/package.json b/superset-frontend/plugins/legacy-plugin-chart-map-box/package.json
index 5d739bfabd4a..78c9340d09a4 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-map-box/package.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-map-box/package.json
@@ -11,7 +11,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache/superset.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/plugins/legacy-plugin-chart-map-box"
   },
   "license": "Apache-2.0",
   "author": "Superset",
diff --git a/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/package.json b/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/package.json
index de3791bbe3a4..eb10c297a4ce 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/package.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-paired-t-test/package.json
@@ -5,13 +5,14 @@
   "keywords": [
     "superset"
   ],
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/legacy-plugin-chart-paired-t-test#readme",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/plugins/legacy-plugin-chart-paired-t-test"
   },
   "license": "Apache-2.0",
   "author": "Superset",
diff --git a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/package.json b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/package.json
index 4d0922830a2b..12fc4501da8c 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/package.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/package.json
@@ -13,7 +13,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates"
   },
   "keywords": [
     "superset"
@@ -21,9 +22,9 @@
   "author": "Superset",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates#readme",
   "publishConfig": {
     "access": "public"
   },
diff --git a/superset-frontend/plugins/legacy-plugin-chart-partition/package.json b/superset-frontend/plugins/legacy-plugin-chart-partition/package.json
index 2384214fd9fe..c849a27a204c 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-partition/package.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-partition/package.json
@@ -5,13 +5,14 @@
   "keywords": [
     "superset"
   ],
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/legacy-plugin-chart-partition#readme",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/packages/legacy-plugin-chart-partition"
   },
   "license": "Apache-2.0",
   "author": "Superset",
diff --git a/superset-frontend/plugins/legacy-plugin-chart-pivot-table/package.json b/superset-frontend/plugins/legacy-plugin-chart-pivot-table/package.json
index 7266253be00f..04bfeb32afed 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-pivot-table/package.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-pivot-table/package.json
@@ -13,7 +13,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/plugins/legacy-plugin-chart-pivot-table"
   },
   "keywords": [
     "superset"
@@ -21,9 +22,9 @@
   "author": "Superset",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/legacy-plugin-chart-pivot-table#readme",
   "publishConfig": {
     "access": "public"
   },
diff --git a/superset-frontend/plugins/legacy-plugin-chart-rose/package.json b/superset-frontend/plugins/legacy-plugin-chart-rose/package.json
index 20deaa3bdb4d..00072b5d835f 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-rose/package.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-rose/package.json
@@ -5,13 +5,14 @@
   "keywords": [
     "superset"
   ],
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/legacy-plugin-chart-rose#readme",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/plugins/legacy-plugin-chart-rose"
   },
   "license": "Apache-2.0",
   "author": "Superset",
diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/package.json b/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/package.json
index 247e408b772f..fee661d1fbbb 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/package.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-sankey-loop/package.json
@@ -5,13 +5,14 @@
   "keywords": [
     "superset"
   ],
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/legacy-plugin-chart-sankey-loop#readme",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/plugins/legacy-plugin-chart-sankey-loop"
   },
   "license": "Apache-2.0",
   "author": "Superset",
diff --git a/superset-frontend/plugins/legacy-plugin-chart-sankey/package.json b/superset-frontend/plugins/legacy-plugin-chart-sankey/package.json
index 527c54c368e7..d08f8b08cc0f 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-sankey/package.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-sankey/package.json
@@ -13,7 +13,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/packages/legacy-plugin-chart-sankey"
   },
   "keywords": [
     "superset"
@@ -21,9 +22,9 @@
   "author": "Superset",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/legacy-plugin-chart-sankey#readme",
   "publishConfig": {
     "access": "public"
   },
diff --git a/superset-frontend/plugins/legacy-plugin-chart-sunburst/package.json b/superset-frontend/plugins/legacy-plugin-chart-sunburst/package.json
index cdba4664f47e..ca73e8e4af7d 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-sunburst/package.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-sunburst/package.json
@@ -5,13 +5,14 @@
   "keywords": [
     "superset"
   ],
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/legacy-plugin-chart-sunburst#readme",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/plugins/legacy-plugin-chart-sunburst"
   },
   "license": "Apache-2.0",
   "author": "Superset",
diff --git a/superset-frontend/plugins/legacy-plugin-chart-treemap/package.json b/superset-frontend/plugins/legacy-plugin-chart-treemap/package.json
index 96d582d7859c..022e8bddb45e 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-treemap/package.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-treemap/package.json
@@ -5,13 +5,14 @@
   "keywords": [
     "superset"
   ],
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/legacy-plugin-chart-treemap#readme",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/plugins/legacy-plugin-chart-treemap"
   },
   "license": "Apache-2.0",
   "author": "Superset",
diff --git a/superset-frontend/plugins/legacy-plugin-chart-world-map/package.json b/superset-frontend/plugins/legacy-plugin-chart-world-map/package.json
index be770aa11cab..047d1547116b 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-world-map/package.json
+++ b/superset-frontend/plugins/legacy-plugin-chart-world-map/package.json
@@ -13,7 +13,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/plugins/legacy-plugin-chart-world-map"
   },
   "keywords": [
     "superset"
@@ -21,9 +22,9 @@
   "author": "Superset",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/legacy-plugin-chart-world-map#readme",
   "publishConfig": {
     "access": "public"
   },
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/package.json b/superset-frontend/plugins/legacy-preset-chart-deckgl/package.json
index 83a4a977324f..ed437ec23a36 100644
--- a/superset-frontend/plugins/legacy-preset-chart-deckgl/package.json
+++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/package.json
@@ -11,7 +11,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache/superset.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/packages/legacy-preset-chart-deckgl"
   },
   "license": "Apache-2.0",
   "author": "Superset",
diff --git a/superset-frontend/plugins/legacy-preset-chart-nvd3/package.json b/superset-frontend/plugins/legacy-preset-chart-nvd3/package.json
index 07e3152cf0f4..dca88bb83e14 100644
--- a/superset-frontend/plugins/legacy-preset-chart-nvd3/package.json
+++ b/superset-frontend/plugins/legacy-preset-chart-nvd3/package.json
@@ -13,7 +13,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/packages/legacy-preset-chart-nvd3"
   },
   "keywords": [
     "superset"
@@ -21,9 +22,9 @@
   "author": "Superset",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/legacy-preset-chart-nvd3#readme",
   "publishConfig": {
     "access": "public"
   },
diff --git a/superset-frontend/plugins/plugin-chart-echarts/package.json b/superset-frontend/plugins/plugin-chart-echarts/package.json
index 3326bad60ddc..f57e702a900f 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/package.json
+++ b/superset-frontend/plugins/plugin-chart-echarts/package.json
@@ -11,7 +11,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/plugins/plugin-chart-echarts"
   },
   "keywords": [
     "superset"
@@ -19,9 +20,9 @@
   "author": "Superset",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/plugin-chart-echarts#readme",
   "publishConfig": {
     "access": "public"
   },
diff --git a/superset-frontend/plugins/plugin-chart-handlebars/package.json b/superset-frontend/plugins/plugin-chart-handlebars/package.json
index 0a14440b5bd7..8fcb8ab599fb 100644
--- a/superset-frontend/plugins/plugin-chart-handlebars/package.json
+++ b/superset-frontend/plugins/plugin-chart-handlebars/package.json
@@ -11,7 +11,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/plugins/plugin-chart-handlebars"
   },
   "keywords": [
     "superset"
@@ -19,9 +20,9 @@
   "author": "Superset",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/plugin-chart-handlebars#readme",
   "publishConfig": {
     "access": "public"
   },
diff --git a/superset-frontend/plugins/plugin-chart-pivot-table/package.json b/superset-frontend/plugins/plugin-chart-pivot-table/package.json
index 9f803467bd4b..4537c88b3979 100644
--- a/superset-frontend/plugins/plugin-chart-pivot-table/package.json
+++ b/superset-frontend/plugins/plugin-chart-pivot-table/package.json
@@ -11,7 +11,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/plugins/plugin-chart-pivot-table"
   },
   "keywords": [
     "superset"
@@ -19,9 +20,9 @@
   "author": "Superset",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/plugin-chart-pivot-table#readme",
   "publishConfig": {
     "access": "public"
   },
diff --git a/superset-frontend/plugins/plugin-chart-table/package.json b/superset-frontend/plugins/plugin-chart-table/package.json
index 738c143e9d3e..ac3b1756606f 100644
--- a/superset-frontend/plugins/plugin-chart-table/package.json
+++ b/superset-frontend/plugins/plugin-chart-table/package.json
@@ -11,7 +11,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/plugins/plugin-chart-table"
   },
   "keywords": [
     "superset"
@@ -19,9 +20,9 @@
   "author": "Superset",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/plugin-chart-table#readme",
   "publishConfig": {
     "access": "public"
   },
diff --git a/superset-frontend/plugins/plugin-chart-word-cloud/package.json b/superset-frontend/plugins/plugin-chart-word-cloud/package.json
index cdf87a66a424..5d13d2dc6601 100644
--- a/superset-frontend/plugins/plugin-chart-word-cloud/package.json
+++ b/superset-frontend/plugins/plugin-chart-word-cloud/package.json
@@ -13,7 +13,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/plugins/plugin-chart-word-cloud"
   },
   "keywords": [
     "superset"
@@ -21,9 +22,9 @@
   "author": "Superset",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/plugin-chart-word-cloud#readme",
   "publishConfig": {
     "access": "public"
   },
diff --git a/superset-frontend/plugins/preset-chart-xy/package.json b/superset-frontend/plugins/preset-chart-xy/package.json
index 575cf33d72ed..92eecf898700 100644
--- a/superset-frontend/plugins/preset-chart-xy/package.json
+++ b/superset-frontend/plugins/preset-chart-xy/package.json
@@ -14,7 +14,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apache-superset/superset-ui.git"
+    "url": "https://github.com/apache/superset.git",
+    "directory": "superset-frontend/packages/preset-chart-xy"
   },
   "keywords": [
     "superset"
@@ -22,9 +23,9 @@
   "author": "Superset",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/apache-superset/superset-ui/issues"
+    "url": "https://github.com/apache/superset/issues"
   },
-  "homepage": "https://github.com/apache-superset/superset-ui#readme",
+  "homepage": "https://github.com/apache/superset/tree/master/superset-frontend/plugins/preset-chart-xy#readme",
   "publishConfig": {
     "access": "public"
   },

From ae0068692acba40ce06c93ae4d5dc49615c60aa3 Mon Sep 17 00:00:00 2001
From: Jack Fragassi <jfragassi98@gmail.com>
Date: Tue, 25 Apr 2023 10:01:54 -0700
Subject: [PATCH 45/47] fix(rls api): Add missing init file (#23817)

---
 superset/row_level_security/__init__.py        | 16 ++++++++++++++++
 superset/row_level_security/commands/create.py |  4 ++--
 superset/row_level_security/commands/update.py |  4 ++--
 superset/row_level_security/schemas.py         |  4 ++++
 4 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 superset/row_level_security/__init__.py

diff --git a/superset/row_level_security/__init__.py b/superset/row_level_security/__init__.py
new file mode 100644
index 000000000000..13a83393a912
--- /dev/null
+++ b/superset/row_level_security/__init__.py
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
diff --git a/superset/row_level_security/commands/create.py b/superset/row_level_security/commands/create.py
index 2c1d4f7b6afc..0c348e10c02c 100644
--- a/superset/row_level_security/commands/create.py
+++ b/superset/row_level_security/commands/create.py
@@ -24,7 +24,7 @@
 from superset.commands.utils import populate_roles
 from superset.connectors.sqla.models import SqlaTable
 from superset.dao.exceptions import DAOCreateFailedError
-from superset.extensions import appbuilder, db, security_manager
+from superset.extensions import db
 from superset.row_level_security.dao import RLSDAO
 
 logger = logging.getLogger(__name__)
@@ -42,7 +42,7 @@ def run(self) -> Any:
             rule = RLSDAO.create(self._properties)
         except DAOCreateFailedError as ex:
             logger.exception(ex.exception)
-            raise DAOCreateFailedError
+            raise ex
 
         return rule
 
diff --git a/superset/row_level_security/commands/update.py b/superset/row_level_security/commands/update.py
index 08964601b3d9..8c276ee2c4e2 100644
--- a/superset/row_level_security/commands/update.py
+++ b/superset/row_level_security/commands/update.py
@@ -24,7 +24,7 @@
 from superset.commands.utils import populate_roles
 from superset.connectors.sqla.models import RowLevelSecurityFilter, SqlaTable
 from superset.dao.exceptions import DAOUpdateFailedError
-from superset.extensions import appbuilder, db, security_manager
+from superset.extensions import db
 from superset.row_level_security.commands.exceptions import RLSRuleNotFoundError
 from superset.row_level_security.dao import RLSDAO
 
@@ -45,7 +45,7 @@ def run(self) -> Any:
             rule = RLSDAO.update(self._model, self._properties)
         except DAOUpdateFailedError as ex:
             logger.exception(ex.exception)
-            raise DAOUpdateFailedError
+            raise ex
 
         return rule
 
diff --git a/superset/row_level_security/schemas.py b/superset/row_level_security/schemas.py
index 63f9c8d6bc05..718294f6444f 100644
--- a/superset/row_level_security/schemas.py
+++ b/superset/row_level_security/schemas.py
@@ -25,10 +25,14 @@
 id_description = "Unique if of rls filter"
 name_description = "Name of rls filter"
 description_description = "Detailed description"
+# pylint: disable=line-too-long
 filter_type_description = "Regular filters add where clauses to queries if a user belongs to a role referenced in the filter, base filters apply filters to all queries except the roles defined in the filter, and can be used to define what users can see if no RLS filters within a filter group apply to them."
 tables_description = "These are the tables this filter will be applied to."
+# pylint: disable=line-too-long
 roles_description = "For regular filters, these are the roles this filter will be applied to. For base filters, these are the roles that the filter DOES NOT apply to, e.g. Admin if admin should see all data."
+# pylint: disable=line-too-long
 group_key_description = "Filters with the same group key will be ORed together within the group, while different filter groups will be ANDed together. Undefined group keys are treated as unique groups, i.e. are not grouped together. For example, if a table has three filters, of which two are for departments Finance and Marketing (group key = 'department'), and one refers to the region Europe (group key = 'region'), the filter clause would apply the filter (department = 'Finance' OR department = 'Marketing') AND (region = 'Europe')."
+# pylint: disable=line-too-long
 clause_description = "This is the condition that will be added to the WHERE clause. For example, to only return rows for a particular client, you might define a regular filter with the clause `client_id = 9`. To display no rows unless a user belongs to a RLS filter role, a base filter can be created with the clause `1 = 0` (always false)."
 
 get_delete_ids_schema = {"type": "array", "items": {"type": "integer"}}

From 6d559559cca073de9e92cd2cf7845d5a858d1345 Mon Sep 17 00:00:00 2001
From: "Michael S. Molina" <70410625+michael-s-molina@users.noreply.github.com>
Date: Tue, 25 Apr 2023 15:43:24 -0300
Subject: [PATCH 46/47] fix: Clean up docker-ephemeral-env secrets command
 (#23819)

---
 .github/workflows/docker-ephemeral-env.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/docker-ephemeral-env.yml b/.github/workflows/docker-ephemeral-env.yml
index e3ca7473d2aa..5159a8b77998 100644
--- a/.github/workflows/docker-ephemeral-env.yml
+++ b/.github/workflows/docker-ephemeral-env.yml
@@ -17,14 +17,12 @@ jobs:
         id: check
         shell: bash
         run: |
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-            if [ -n "${{ (secrets.AWS_ACCESS_KEY_ID != '' &&
-              secrets.AWS_ACCESS_KEY_ID != '' &&
-              secrets.AWS_SECRET_ACCESS_KEY != '' &&
-              secrets.AWS_SECRET_ACCESS_KEY != '') || '' }}" ]; then
-              echo "has-secrets=1" >> "$GITHUB_OUTPUT"
-            fi
+          if [ -n "${{ (secrets.AWS_ACCESS_KEY_ID != '' &&
+            secrets.AWS_ACCESS_KEY_ID != '' &&
+            secrets.AWS_SECRET_ACCESS_KEY != '' &&
+            secrets.AWS_SECRET_ACCESS_KEY != '') || '' }}" ]; then
+            echo "has-secrets=1" >> "$GITHUB_OUTPUT"
+          fi
 
   docker_ephemeral_env:
     needs: config

From e8121b1cd267993ef1962d34cf881b98d3af816b Mon Sep 17 00:00:00 2001
From: Satoko <64562059+satokonak@users.noreply.github.com>
Date: Tue, 25 Apr 2023 13:46:05 -0700
Subject: [PATCH 47/47] docs: Add Superset Overview Video to README (#23820)

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index ce805862878c..0cadd1eadb80 100644
--- a/README.md
+++ b/README.md
@@ -63,6 +63,12 @@ Superset provides:
 
 ## Screenshots & Gifs
 
+**Video Overview**
+
+https://user-images.githubusercontent.com/64562059/234390129-321d4f35-cb4b-45e8-89d9-20ae292f34fc.mp4
+
+<br/>
+
 **Large Gallery of Visualizations**
 
 <kbd><img title="Gallery" src="superset-frontend/src/assets/images/screenshots/gallery.jpg"/></kbd><br/>