Merge branch 'master' into feat/use-official-ch-driver

apache · Nov 14, 2022 · 40ac9f4 · 40ac9f4
2 parents e3ba239 + c3f1873
commit 40ac9f4
Show file tree

Hide file tree

Showing 141 changed files with 5,151 additions and 2,178 deletions.
diff --git a/.github/workflows/docker_build_push.sh b/.github/workflows/docker_build_push.sh
@@ -56,6 +56,19 @@ docker build --target lean \
   --label "build_actor=${GITHUB_ACTOR}" \
   .
 
+#
+# Build the "websocket" image
+#
+docker build \
+  -t "${REPO_NAME}-websocket:${SHA}" \
+  -t "${REPO_NAME}-websocket:${REFSPEC}" \
+  -t "${REPO_NAME}-websocket:${LATEST_TAG}" \
+  --label "sha=${SHA}" \
+  --label "built_at=$(date)" \
+  --label "target=lean" \
+  --label "build_actor=${GITHUB_ACTOR}" \
+  superset-websocket
+
 #
 # Build the dev image
 #

diff --git a/RESOURCES/FEATURE_FLAGS.md b/RESOURCES/FEATURE_FLAGS.md
@@ -51,6 +51,7 @@ These features are **finished** but currently being tested. They are usable, but
 - ALERT_REPORTS: [(docs)](https://superset.apache.org/docs/installation/alerts-reports)
 - ALLOW_FULL_CSV_EXPORT
 - CACHE_IMPERSONATION
+- CONFIRM_DASHBOARD_DIFF
 - DASHBOARD_EDIT_CHART_IN_NEW_TAB
 - DASHBOARD_FILTERS_EXPERIMENTAL
 - DASHBOARD_NATIVE_FILTERS

diff --git a/UPDATING.md b/UPDATING.md
@@ -24,12 +24,14 @@ assists people when migrating to a new version.
 
 ## Next
 
-- [21895](https://github.com/apache/superset/pull/21895): Markdown components had their security increased by adhering to the same sanitization process enforced by Github. This means that some HTML elements found in markdowns are not allowed anymore due to the security risks they impose. If you're deploying Superset in a trusted environment and wish to use some of the blocked elements, then you can use the HTML_SANITIZATION_SCHEMA_EXTENSIONS configuration to extend the default sanitization schema. There's also the option to disable HTML sanitization using the HTML_SANITIZATION configuration but we do not recommend this approach because of the security risks. Given the provided configurations, we don't view the improved sanitization as a breaking change but as a security patch.
+- [22022](https://github.com/apache/superset/pull/22022): HTTP API endpoints `/superset/approve` and `/superset/request_access` have been deprecated and their HTTP methods were changed from GET to POST
+- [21895](https://github.com/apache/superset/pull/21895): Markdown components had their security increased by adhering to the same sanitization process enforced by GitHub. This means that some HTML elements found in markdowns are not allowed anymore due to the security risks they impose. If you're deploying Superset in a trusted environment and wish to use some of the blocked elements, then you can use the HTML_SANITIZATION_SCHEMA_EXTENSIONS configuration to extend the default sanitization schema. There's also the option to disable HTML sanitization using the HTML_SANITIZATION configuration but we do not recommend this approach because of the security risks. Given the provided configurations, we don't view the improved sanitization as a breaking change but as a security patch.
 - [20606](https://github.com/apache/superset/pull/20606): When user clicks on chart title or "Edit chart" button in Dashboard page, Explore opens in the same tab. Clicking while holding cmd/ctrl opens Explore in a new tab. To bring back the old behaviour (always opening Explore in a new tab), flip feature flag `DASHBOARD_EDIT_CHART_IN_NEW_TAB` to `True`.
-- [20799](https://github.com/apache/superset/pull/20799): Presto and Trino engine will now display tracking URL for running queries in SQL Lab. If for some reason you don't want to show the tracking URL (for example, when your data warehouse hasn't enable access for to Presto or Trino UI), update `TRACKING_URL_TRANSFORMER` in `config.py` to return `None`.
+- [20799](https://github.com/apache/superset/pull/20799): Presto and Trino engine will now display tracking URL for running queries in SQL Lab. If for some reason you don't want to show the tracking URL (for example, when your data warehouse hasn't enabled access for to Presto or Trino UI), update `TRACKING_URL_TRANSFORMER` in `config.py` to return `None`.
 - [21002](https://github.com/apache/superset/pull/21002): Support Python 3.10 and bump pandas 1.4 and pyarrow 6.
-- [21163](https://github.com/apache/superset/pull/21163): When `GENERIC_CHART_AXES` feature flags set to `True`, the Time Grain control will move below the X-Axis control.
+- [21163](https://github.com/apache/superset/pull/21163): The time grain will be decoupled from the time filter column and the time grain control will move below the X-Axis control when `GENERIC_CHART_AXES` feature flags set to `True`. The time grain will be applied on the time column in the column-like controls(x axis, dimensions) instead of the time column in the time section.
 - [21284](https://github.com/apache/superset/pull/21284): The non-functional `MAX_TABLE_NAMES` config key has been removed.
+- [21794](https://github.com/apache/superset/pull/21794): Deprecates the undocumented `PRESTO_SPLIT_VIEWS_FROM_TABLES` feature flag. Now for Presto, like other engines, only physical tables are treated as tables.
 
 ### Breaking Changes
 

diff --git a/helm/superset/Chart.yaml b/helm/superset/Chart.yaml
@@ -29,7 +29,7 @@ maintainers:
   - name: craig-rueda
     email: craig@craigrueda.com
     url: https://github.com/craig-rueda
-version: 0.7.6
+version: 0.7.7
 dependencies:
   - name: postgresql
     version: 11.1.22

diff --git a/helm/superset/README.md b/helm/superset/README.md
@@ -19,7 +19,7 @@
 
 # superset
 
-![Version: 0.7.6](https://img.shields.io/badge/Version-0.7.6-informational?style=flat-square)
+![Version: 0.7.7](https://img.shields.io/badge/Version-0.7.7-informational?style=flat-square)
 
 Apache Superset is a modern, enterprise-ready business intelligence web application
 

diff --git a/helm/superset/templates/configmap-superset.yaml b/helm/superset/templates/configmap-superset.yaml
@@ -24,6 +24,7 @@ metadata:
     chart: {{ template "superset.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+  namespace: {{ .Release.Namespace }}
 data:
 {{- range $path, $config := .Values.extraConfigs }}
   {{ $path }}: |

diff --git a/helm/superset/templates/deployment-beat.yaml b/helm/superset/templates/deployment-beat.yaml
@@ -28,6 +28,7 @@ metadata:
   annotations:
     {{- toYaml .Values.supersetCeleryBeat.deploymentAnnotations | nindent 4 }}
 {{- end }}
+  namespace: {{ .Release.Namespace }}
 spec:
   # This must be a singleton
   replicas: 1

diff --git a/helm/superset/templates/deployment-flower.yaml b/helm/superset/templates/deployment-flower.yaml
@@ -28,6 +28,7 @@ metadata:
   annotations:
     {{- toYaml .Values.supersetCeleryFlower.deploymentAnnotations | nindent 4 }}
   {{- end }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.supersetCeleryFlower.replicaCount }}
   selector:

diff --git a/helm/superset/templates/deployment-worker.yaml b/helm/superset/templates/deployment-worker.yaml
@@ -27,6 +27,7 @@ metadata:
   annotations:
     {{- toYaml .Values.supersetWorker.deploymentAnnotations | nindent 4 }}
 {{- end }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.supersetWorker.replicaCount }}
   selector:

diff --git a/helm/superset/templates/deployment-ws.yaml b/helm/superset/templates/deployment-ws.yaml
@@ -28,6 +28,7 @@ metadata:
   annotations:
     {{- toYaml .Values.supersetWebsockets.deploymentAnnotations | nindent 4 }}
 {{- end }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.supersetWebsockets.replicaCount }}
   selector:

diff --git a/helm/superset/templates/deployment.yaml b/helm/superset/templates/deployment.yaml
@@ -27,6 +27,7 @@ metadata:
   annotations:
     {{- toYaml .Values.supersetNode.deploymentAnnotations | nindent 4 }}
 {{- end }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.supersetNode.replicaCount }}
   {{- if .Values.supersetNode.strategy }}

diff --git a/helm/superset/templates/ingress.yaml b/helm/superset/templates/ingress.yaml
@@ -29,6 +29,7 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
+  namespace: {{ .Release.Namespace }}
 spec:
 {{- if .Values.ingress.ingressClassName }}
   ingressClassName: {{ .Values.ingress.ingressClassName }}

diff --git a/helm/superset/templates/init-job.yaml b/helm/superset/templates/init-job.yaml
@@ -22,6 +22,7 @@ metadata:
   annotations:
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-delete-policy": "before-hook-creation"
+  namespace: {{ .Release.Namespace }}
 spec:
   template:
     metadata:

diff --git a/helm/superset/templates/secret-env.yaml b/helm/superset/templates/secret-env.yaml
@@ -23,6 +23,7 @@ metadata:
     chart: {{ template "superset.chart" . }}
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+  namespace: {{ .Release.Namespace }}
 type: Opaque
 stringData:
     REDIS_HOST: {{ tpl .Values.supersetNode.connections.redis_host . | quote }}

diff --git a/helm/superset/templates/secret-superset-config.yaml b/helm/superset/templates/secret-superset-config.yaml
@@ -23,6 +23,7 @@ metadata:
     chart: {{ template "superset.chart" . }}
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+  namespace: {{ .Release.Namespace }}
 type: Opaque
 stringData:
   superset_config.py: |

diff --git a/helm/superset/templates/secret-ws.yaml b/helm/superset/templates/secret-ws.yaml
@@ -24,6 +24,7 @@ metadata:
     chart: {{ template "superset.chart" . }}
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+  namespace: {{ .Release.Namespace }}
 type: Opaque
 stringData:
     config.json: |

diff --git a/helm/superset/templates/service-account.yaml b/helm/superset/templates/service-account.yaml
@@ -31,4 +31,5 @@ metadata:
   {{- if .Values.serviceAccount.annotations }}
   annotations: {{- toYaml .Values.serviceAccount.annotations | nindent 4 }}
   {{- end }}
+  namespace: {{ .Release.Namespace }}
 {{- end -}}
diff --git a/helm/superset/templates/service.yaml b/helm/superset/templates/service.yaml
@@ -27,6 +27,7 @@ metadata:
   annotations:
 {{- toYaml . | nindent 4 }}
 {{- end }}
+  namespace: {{ .Release.Namespace }}
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -55,6 +56,7 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
+  namespace: {{ .Release.Namespace }}
 spec:
   type: {{ .Values.supersetCeleryFlower.service.type }}
   ports:
@@ -84,6 +86,7 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
+  namespace: {{ .Release.Namespace }}
 spec:
   type: {{ .Values.supersetWebsockets.service.type }}
   ports:

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -76,7 +76,7 @@ flask==2.0.3
     #   flask-migrate
     #   flask-sqlalchemy
     #   flask-wtf
-flask-appbuilder==4.1.4
+flask-appbuilder==4.1.6
     # via apache-superset
 flask-babel==1.0.0
     # via flask-appbuilder
@@ -108,8 +108,6 @@ geopy==2.2.0
     # via apache-superset
 graphlib-backport==1.0.3
     # via apache-superset
-greenlet==1.1.2
-    # via sqlalchemy
 gunicorn==20.1.0
     # via apache-superset
 hashids==1.3.1

diff --git a/requirements/development.txt b/requirements/development.txt
@@ -78,7 +78,7 @@ pure-eval==0.2.2
     # via stack-data
 pure-sasl==0.6.2
     # via thrift-sasl
-pydruid==0.6.2
+pydruid==0.6.5
     # via apache-superset
 pygments==2.12.0
     # via ipython

diff --git a/requirements/docker.txt b/requirements/docker.txt
@@ -12,6 +12,8 @@
     #   -r requirements/docker.in
 gevent==21.8.0
     # via -r requirements/docker.in
+greenlet==1.1.3.post0
+    # via gevent
 psycopg2-binary==2.9.1
     # via apache-superset
 zope-event==4.5.0

diff --git a/requirements/testing.txt b/requirements/testing.txt
@@ -130,7 +130,7 @@ rsa==4.7.2
     # via google-auth
 statsd==3.3.0
     # via -r requirements/testing.in
-trino==0.315.0
+trino==0.319.0
     # via apache-superset
 typing-inspect==0.7.1
     # via libcst

diff --git a/setup.py b/setup.py
@@ -83,7 +83,7 @@ def get_git_sha() -> str:
         "cryptography>=3.3.2",
         "deprecation>=2.1.0, <2.2.0",
         "flask>=2.0.0, <3.0.0",
-        "flask-appbuilder>=4.1.4, <5.0.0",
+        "flask-appbuilder>=4.1.6, <5.0.0",
         "flask-caching>=1.10.0",
         "flask-compress",
         "flask-talisman",
@@ -141,7 +141,7 @@ def get_git_sha() -> str:
         "db2": ["ibm-db-sa>=0.3.5, <0.4"],
         "dremio": ["sqlalchemy-dremio>=1.1.5, <1.3"],
         "drill": ["sqlalchemy-drill==0.1.dev"],
-        "druid": ["pydruid>=0.6.1,<0.7"],
+        "druid": ["pydruid>=0.6.5,<0.7"],
         "solr": ["sqlalchemy-solr >= 0.2.0"],
         "elasticsearch": ["elasticsearch-dbapi>=0.2.9, <0.3.0"],
         "exasol": ["sqlalchemy-exasol >= 2.4.0, <3.0"],
@@ -160,7 +160,7 @@ def get_git_sha() -> str:
         "pinot": ["pinotdb>=0.3.3, <0.4"],
         "postgres": ["psycopg2-binary==2.9.1"],
         "presto": ["pyhive[presto]>=0.6.5"],
-        "trino": ["trino>=0.313.0"],
+        "trino": ["trino>=0.319.0"],
         "prophet": ["prophet>=1.0.1, <1.1", "pystan<3.0"],
         "redshift": ["sqlalchemy-redshift>=0.8.1, < 0.9"],
         "rockset": ["rockset>=0.8.10, <0.9"],

diff --git a/superset-frontend/.storybook/main.js b/superset-frontend/.storybook/main.js
@@ -24,7 +24,8 @@ module.exports = {
     builder: 'webpack5',
   },
   stories: [
-    '../src/@(components|common|filters|explore)/**/*.stories.@(tsx|jsx|mdx)',
+    '../src/@(components|common|filters|explore|views)/**/*.stories.@(tsx|jsx)',
+    '../src/@(components|common|filters|explore|views)/**/*.*.@(mdx)',
   ],
   addons: [
     '@storybook/addon-essentials',

diff --git a/superset-frontend/.storybook/preview.jsx b/superset-frontend/.storybook/preview.jsx
@@ -68,7 +68,15 @@ addParameters({
         ['Controls', 'Display', 'Feedback', 'Input', '*'],
         ['Overview', 'Examples', '*'],
         'Design System',
-        ['Foundations', 'Components', 'Patterns', '*'],
+        [
+          'Introduction',
+          'Foundations',
+          'Components',
+          ['Overview', 'Examples', '*'],
+          'Patterns',
+          '*',
+        ],
+        ['Overview', 'Examples', '*'],
         '*',
       ],
     },

diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard/drilltodetail.test.ts b/superset-frontend/cypress-base/cypress/integration/dashboard/drilltodetail.test.ts
@@ -409,14 +409,14 @@ describe('Drill to detail modal', () => {
 
         cy.get("[data-test-viz-type='world_map'] svg").then($canvas => {
           cy.wrap($canvas).scrollIntoView().rightclick(70, 150);
-          openModalFromChartContext('Drill to detail by United States');
-          cy.getBySel('filter-val').should('contain', 'United States');
+          openModalFromChartContext('Drill to detail by USA');
+          cy.getBySel('filter-val').should('contain', 'USA');
           closeModal();
         });
         cy.get("[data-test-viz-type='world_map'] svg").then($canvas => {
           cy.wrap($canvas).scrollIntoView().rightclick(200, 140);
-          openModalFromChartContext('Drill to detail by Slovakia');
-          cy.getBySel('filter-val').should('contain', 'Slovakia');
+          openModalFromChartContext('Drill to detail by SVK');
+          cy.getBySel('filter-val').should('contain', 'SVK');
         });
       });
     });