Merge branch 'apache:master' into master

.github/workflows/superset-websocket.yml

@@ -18,7 +18,7 @@ jobs:
           persist-credentials: false
       - name: Install dependencies
         working-directory: ./superset-websocket
-        run: npm install
+        run: npm ci
       - name: lint
         working-directory: ./superset-websocket
         run: npm run lint

docs/yarn.lock

@@ -6036,9 +6036,9 @@ fast-glob@^3.2.7, fast-glob@^3.2.9:
     micromatch "^4.0.4"
 
 fast-json-patch@^3.0.0-1:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.1.0.tgz"
-  integrity sha512-IhpytlsVTRndz0hU5t0/MGzS/etxLlfrpG5V5M9mVbuj9TrJLWaMfsox9REM5rkuGX0T+5qjpe8XA1o0gZ42nA==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/fast-json-patch/-/fast-json-patch-3.1.1.tgz#85064ea1b1ebf97a3f7ad01e23f9337e72c66947"
+  integrity sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ==
 
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
@@ -7379,9 +7379,9 @@ json2mq@^0.2.0:
     string-convert "^0.2.0"
 
 json5@^2.1.2, json5@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
-  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz#64471c5bdcc564c18f7c1d4df2e2297f2457c5ab"
+  integrity sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ==
 
 jsonfile@^6.0.1:
   version "6.1.0"

requirements/base.txt

@@ -19,6 +19,8 @@ babel==2.9.1
     # via flask-babel
 backoff==1.11.1
     # via apache-superset
+bcrypt==4.0.1
+    # via paramiko
 billiard==3.6.4.0
     # via celery
 bleach==3.3.1
@@ -57,7 +59,9 @@ cron-descriptor==1.2.24
 croniter==1.0.15
     # via apache-superset
 cryptography==3.4.7
-    # via apache-superset
+    # via
+    #   apache-superset
+    #   paramiko
 deprecation==2.1.0
     # via apache-superset
 dnspython==2.1.0
@@ -167,6 +171,8 @@ packaging==21.3
     #   deprecation
 pandas==1.5.2
     # via apache-superset
+paramiko==2.11.0
+    # via sshtunnel
 parsedatetime==2.6
     # via apache-superset
 pgsanity==0.2.9
@@ -188,6 +194,8 @@ pyjwt==2.4.0
     #   flask-jwt-extended
 pymeeus==0.5.11
     # via convertdate
+pynacl==1.5.0
+    # via paramiko
 pyparsing==3.0.6
     # via
     #   apache-superset
@@ -231,6 +239,7 @@ six==1.16.0
     #   flask-talisman
     #   isodate
     #   jsonschema
+    #   paramiko
     #   polyline
     #   prison
     #   pyrsistent
@@ -252,6 +261,8 @@ sqlalchemy-utils==0.38.3
     #   flask-appbuilder
 sqlparse==0.4.3
     # via apache-superset
+sshtunnel==0.4.0
+    # via apache-superset
 tabulate==0.8.9
     # via apache-superset
 typing-extensions==4.4.0

requirements/integration.txt

@@ -65,7 +65,7 @@ virtualenv==20.7.2
     # via
     #   pre-commit
     #   tox
-wheel==0.37.0
+wheel==0.38.1
     # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:

scripts/babel_update.sh

@@ -45,7 +45,7 @@ pybabel extract \
   --sort-output \
   --copyright-holder=Superset \
   --project=Superset \
-  -k _ -k __ -k t -k tn -k tct .
+  -k _ -k __ -k t -k tn:1,2 -k tct .
 cat $LICENSE_TMP superset/translations/messages.pot > messages.pot.tmp \
   && mv messages.pot.tmp superset/translations/messages.pot
 

setup.py

@@ -113,6 +113,7 @@ def get_git_sha() -> str:
         "PyJWT>=2.4.0, <3.0",
         "redis",
         "selenium>=3.141.0",
+        "sshtunnel>=0.4.0, <0.5",
         "simplejson>=3.15.0",
         "slack_sdk>=3.1.1, <4",
         "sqlalchemy>=1.4, <2",

superset-frontend/package.json

@@ -140,7 +140,7 @@
     "global-box": "^1.2.0",
     "html-webpack-plugin": "^5.3.2",
     "immer": "^9.0.6",
-    "interweave": "^11.2.0",
+    "interweave": "^13.0.0",
     "jquery": "^3.5.1",
     "js-levenshtein": "^1.1.6",
     "js-yaml-loader": "^1.2.2",
@@ -160,7 +160,7 @@
     "query-string": "^6.13.7",
     "re-resizable": "^6.6.1",
     "react": "^16.13.1",
-    "react-ace": "^9.4.4",
+    "react-ace": "^10.1.0",
     "react-checkbox-tree": "^1.5.1",
     "react-color": "^2.13.8",
     "react-datetime": "^3.0.4",

superset-frontend/packages/superset-ui-chart-controls/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/chart-controls",
-  "version": "0.18.25",
+  "version": "0.18.26",
   "description": "Superset UI control-utils",
   "keywords": [
     "superset"
@@ -43,7 +43,7 @@
     "brace": "^0.11.1",
     "memoize-one": "^5.1.1",
     "react": "^16.13.1",
-    "react-ace": "^9.4.4",
+    "react-ace": "^10.1.0",
     "react-dom": "^16.13.1"
   },
   "publishConfig": {

superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/sharedControls.tsx

@@ -184,14 +184,17 @@ const granularity: SharedControlConfig<'SelectControl'> = {
 const time_grain_sqla: SharedControlConfig<'SelectControl'> = {
   type: 'SelectControl',
   label: TIME_FILTER_LABELS.time_grain_sqla,
+  placeholder: t('None'),
   initialValue: (control: ControlState, state: ControlPanelState) => {
     if (!isDefined(state)) {
       // If a chart is in a Dashboard, the ControlPanelState is empty.
       return control.value;
     }
-    // If a chart is a new one that isn't saved, the 'time_grain_sqla' isn't in the form_data.
-    return 'time_grain_sqla' in (state?.form_data ?? {})
-      ? state.form_data?.time_grain_sqla
+    // If a chart is a new one that isn't saved, metadata is null. In this
+    // case we want to default P1D. If the chart has been saved, we want
+    // to use whichever value was chosen, either nothing or valid a time grain.
+    return state?.metadata || 'time_grain_sqla' in (state?.form_data ?? {})
+      ? state?.form_data?.time_grain_sqla
       : 'P1D';
   },
   description: t(
@@ -264,6 +267,7 @@ const limit: SharedControlConfig<'SelectControl'> = {
   type: 'SelectControl',
   freeForm: true,
   label: t('Series limit'),
+  placeholder: t('None'),
   validators: [legacyValidateInteger],
   choices: formatSelectOptions(SERIES_LIMITS),
   clearable: true,
@@ -279,6 +283,7 @@ const series_limit: SharedControlConfig<'SelectControl'> = {
   type: 'SelectControl',
   freeForm: true,
   label: t('Series limit'),
+  placeholder: t('None'),
   validators: [legacyValidateInteger],
   choices: formatSelectOptions(SERIES_LIMITS),
   description: t(

superset-frontend/packages/superset-ui-chart-controls/src/types.ts

@@ -88,6 +88,7 @@ export interface ControlPanelState {
   datasource: Dataset | QueryResponse | null;
   controls: ControlStateMapping;
   common: JsonObject;
+  metadata?: JsonObject | null;
 }
 
 /**

superset-frontend/plugins/legacy-plugin-chart-calendar/src/index.js

@@ -18,6 +18,7 @@
  */
 import { t, ChartMetadata, ChartPlugin } from '@superset-ui/core';
 import transformProps from './transformProps';
+import example from './images/example.jpg';
 import controlPanel from './controlPanel';
 import thumbnail from './images/thumbnail.png';
 
@@ -27,6 +28,7 @@ const metadata = new ChartMetadata({
   description: t(
     "Visualizes how a metric has changed over a time using a color scale and a calendar view. Gray values are used to indicate missing values and the linear color scheme is used to encode the magnitude of each day's value.",
   ),
+  exampleGallery: [{ url: example }],
   name: t('Calendar Heatmap'),
   tags: [
     t('Business'),

superset-frontend/plugins/legacy-plugin-chart-country-map/src/index.js

@@ -18,6 +18,8 @@
  */
 import { t, ChartMetadata, ChartPlugin } from '@superset-ui/core';
 import transformProps from './transformProps';
+import exampleUsa from './images/exampleUsa.jpg';
+import exampleGermany from './images/exampleGermany.jpg';
 import thumbnail from './images/thumbnail.png';
 import controlPanel from './controlPanel';
 
@@ -27,6 +29,7 @@ const metadata = new ChartMetadata({
   description: t(
     "Visualizes how a single metric varies across a country's principal subdivisions (states, provinces, etc) on a chloropleth map. Each subdivision's value is elevated when you hover over the corresponding geographic boundary.",
   ),
+  exampleGallery: [{ url: exampleUsa }, { url: exampleGermany }],
   name: t('Country Map'),
   tags: [
     t('2D'),

superset-frontend/plugins/legacy-preset-chart-nvd3/src/Bubble/index.js

@@ -18,6 +18,7 @@
  */
 import { t, ChartMetadata, ChartPlugin } from '@superset-ui/core';
 import transformProps from '../transformProps';
+import example from './images/example.jpg';
 import thumbnail from './images/thumbnail.png';
 import controlPanel from './controlPanel';
 
@@ -27,6 +28,7 @@ const metadata = new ChartMetadata({
   description: t(
     'Visualizes a metric across three dimensions of data in a single chart (X axis, Y axis, and bubble size). Bubbles from the same group can be showcased using bubble color.',
   ),
+  exampleGallery: [{ url: example }],
   name: t('Bubble Chart'),
   tags: [
     t('Multi-Dimensions'),