Merge branch 'master' into localization2

UPDATING.md

@@ -36,7 +36,6 @@ assists people when migrating to a new version.
 
 - [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
 

superset-frontend/package.json

@@ -164,7 +164,7 @@
     "react-checkbox-tree": "^1.8.0",
     "react-color": "^2.13.8",
     "react-datetime": "^3.2.0",
-    "react-diff-viewer": "^3.1.1",
+    "react-diff-viewer-continued": "^3.2.5",
     "react-dnd": "^11.1.3",
     "react-dnd-html5-backend": "^11.1.3",
     "react-dom": "^16.13.0",
@@ -180,14 +180,14 @@
     "react-query": "^3.39.2",
     "react-redux": "^7.2.8",
     "react-resize-detector": "^7.1.2",
-    "react-reverse-portal": "^2.0.1",
+    "react-reverse-portal": "^2.1.1",
     "react-router-dom": "^5.1.2",
     "react-search-input": "^0.11.3",
     "react-select": "^3.1.0",
     "react-sortable-hoc": "^1.11.0",
     "react-split": "^2.0.9",
     "react-syntax-highlighter": "^15.4.5",
-    "react-table": "^7.6.3",
+    "react-table": "^7.8.0",
     "react-transition-group": "^2.5.3",
     "react-ultimate-pagination": "^1.2.0",
     "react-virtualized": "9.19.1",

superset-frontend/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx

@@ -317,7 +317,7 @@ const config: ControlPanelConfig = {
               description: t(
                 'Overlay one or more timeseries from a ' +
                   'relative time period. Expects relative time deltas ' +
-                  'in natural language (example:  24 hours, 7 days, ' +
+                  'in natural language (example: 24 hours, 7 days, ' +
                   '52 weeks, 365 days). Free text is supported.',
               ),
             },

superset-frontend/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx

@@ -467,7 +467,7 @@ export const timeSeriesSection: ControlPanelSectionConfig[] = [
             description: t(
               'Overlay one or more timeseries from a ' +
                 'relative time period. Expects relative time deltas ' +
-                'in natural language (example:  24 hours, 7 days, ' +
+                'in natural language (example: 24 hours, 7 days, ' +
                 '52 weeks, 365 days). Free text is supported.',
             ),
           },

superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/index.ts

@@ -49,10 +49,10 @@ export default class EchartsTimeseriesChartPlugin extends ChartPlugin<
         credits: ['https://echarts.apache.org'],
         description: hasGenericChartAxes
           ? t(
-              'Swiss army knife for visualizing data. Choose between  step, line, scatter, and bar charts. This viz type has many customization options as well.',
+              'Swiss army knife for visualizing data. Choose between step, line, scatter, and bar charts. This viz type has many customization options as well.',
             )
           : t(
-              'Swiss army knife for visualizing time series data. Choose between  step, line, scatter, and bar charts. This viz type has many customization options as well.',
+              'Swiss army knife for visualizing time series data. Choose between step, line, scatter, and bar charts. This viz type has many customization options as well.',
             ),
         exampleGallery: [{ url: example }],
         supportedAnnotationTypes: [

superset-frontend/plugins/plugin-chart-table/package.json

@@ -28,8 +28,9 @@
   "dependencies": {
     "@react-icons/all-files": "^4.1.0",
     "@types/d3-array": "^2.9.0",
-    "@types/react-table": "^7.0.29",
     "@types/enzyme": "^3.10.5",
+    "@types/react-table": "^7.0.29",
+    "classnames": "^2.3.2",
     "d3-array": "^2.4.0",
     "match-sorter": "^6.3.0",
     "memoize-one": "^5.1.1",
@@ -41,10 +42,10 @@
     "@testing-library/react": "^11.2.0"
   },
   "peerDependencies": {
-    "@types/react": "*",
-    "@types/classnames": "*",
     "@superset-ui/chart-controls": "*",
     "@superset-ui/core": "*",
+    "@types/classnames": "*",
+    "@types/react": "*",
     "react": "^16.13.1",
     "react-dom": "^16.13.1"
   }

superset-frontend/src/SqlLab/actions/sqlLab.js

@@ -128,22 +128,10 @@ export function getUpToDateQuery(rootState, queryEditor, key) {
     sqlLab: { unsavedQueryEditor },
   } = rootState;
   const id = key ?? queryEditor.id;
-  const updatedQueryEditor = {
+  return {
     ...queryEditor,
     ...(id === unsavedQueryEditor.id && unsavedQueryEditor),
   };
-
-  if (
-    'schema' in updatedQueryEditor &&
-    !updatedQueryEditor.schemaOptions?.find(
-      ({ value }) => value === updatedQueryEditor.schema,
-    )
-  ) {
-    // remove the deprecated schema option
-    delete updatedQueryEditor.schema;
-  }
-
-  return updatedQueryEditor;
 }
 
 export function resetState() {