Merge branch 'embedded' into embed-token

casual-precision · Dec 11, 2021 · d76bbf2 · d76bbf2
2 parents 45d016e + d2e088c
commit d76bbf2
Show file tree

Hide file tree

Showing 216 changed files with 154,064 additions and 77,290 deletions.
diff --git a/.github/workflows/superset-translations.yml b/.github/workflows/superset-translations.yml
@@ -54,7 +54,4 @@ jobs:
             pip-upgrade
             pip install -r requirements/base.txt
       - name: Test babel extraction
-        run: |
-          flask fab babel-extract --target superset/translations \
-            --output superset/translations/messages.pot \
-            --config superset/translations/babel.cfg -k _,__,t,tn,tct
+        run: ./scripts/babel_update.sh
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1039,22 +1039,15 @@ LANGUAGES = {
 }
 ```
 
-### Extracting new strings for translation
-
-```bash
-pybabel extract -F superset/translations/babel.cfg -o superset/translations/messages.pot -k _ -k __ -k t -k tn -k tct .
-```
-
-This will update the template file `superset/translations/messages.pot` with current application strings. Do not forget to update
-this file with the appropriate license information.
-
 ### Updating language files
 
 ```bash
- pybabel update -i superset/translations/messages.pot -d superset/translations --ignore-obsolete
+./scripts/babel_update.sh
 ```
 
-This will update language files with the new extracted strings.
+This script will
+1. update the template file `superset/translations/messages.pot` with current application strings.
+2. update language files with the new extracted strings.
 
 You can then translate the strings gathered in files located under
 `superset/translation`, where there's one per language. You can use [Poedit](https://poedit.net/features)

diff --git a/Dockerfile b/Dockerfile
@@ -106,7 +106,9 @@ RUN cd /app \
         && chown -R superset:superset * \
         && pip install -e .
 
-COPY ./docker/docker-entrypoint.sh /usr/bin/
+COPY ./docker/run-server.sh /usr/bin/
+
+RUN chmod a+x /usr/bin/run-server.sh
 
 WORKDIR /app
 
@@ -116,7 +118,7 @@ HEALTHCHECK CMD curl -f "http://localhost:$SUPERSET_PORT/health"
 
 EXPOSE ${SUPERSET_PORT}
 
-ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]
+CMD /usr/bin/run-server.sh
 
 ######################################################################
 # Dev image...

diff --git a/UPDATING.md b/UPDATING.md
@@ -43,6 +43,7 @@ assists people when migrating to a new version.
 
 ### Other
 
+- [17589](https://github.com/apache/incubator-superset/pull/17589): It is now possible to limit access to users' recent activity data by setting the `ENABLE_BROAD_ACTIVITY_ACCESS` config flag to false, or customizing the `raise_for_user_activity_access` method in the security manager.
 - [16809](https://github.com/apache/incubator-superset/pull/16809): When building the superset frontend assets manually, you should now use Node 16 (previously Node 14 was required/recommended). Node 14 will most likely still work for at least some time, but is no longer actively tested for on CI.
 - [17536](https://github.com/apache/superset/pull/17536): introduced a key-value endpoint to store dashboard filter state. This endpoint is backed by Flask-Caching and the default configuration assumes that the values will be stored in the file system. If you are already using another cache backend like Redis or Memchached, you'll probably want to change this setting in `superset_config.py`. The key is `FILTER_STATE_CACHE_CONFIG` and the available settings can be found in Flask-Caching [docs](https://flask-caching.readthedocs.io/en/latest/).
 

diff --git a/docker/docker-bootstrap.sh b/docker/docker-bootstrap.sh
@@ -47,5 +47,5 @@ elif [[ "${1}" == "app" ]]; then
   flask run -p 8088 --with-threads --reload --debugger --host=0.0.0.0
 elif [[ "${1}" == "app-gunicorn" ]]; then
   echo "Starting web app..."
-  /app/docker/docker-entrypoint.sh
+  /usr/bin/run-server.sh
 fi
diff --git a/docker/docker-ci.sh b/docker/docker-ci.sh
@@ -20,16 +20,7 @@
 # TODO: copy config overrides from ENV vars
 
 # TODO: run celery in detached state
-
+export SERVER_THREADS_AMOUNT=8
 # start up the web server
-gunicorn \
-    --bind  "0.0.0.0:${SUPERSET_PORT}" \
-    --access-logfile '-' \
-    --error-logfile '-' \
-    --workers 1 \
-    --worker-class gthread \
-    --threads 8 \
-    --timeout 60 \
-    --limit-request-line 0 \
-    --limit-request-field_size 0 \
-    "${FLASK_APP}"
+
+/usr/bin/run-server.sh
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
diff --git a/docker/run-server.sh b/docker/run-server.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+#
+# 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.
+#
+HYPHEN_SYMBOL='-'
+
+gunicorn \
+    --bind "${SUPERSET_BIND_ADDRESS:-0.0.0.0}:${SUPERSET_PORT:-8088}" \
+    --access-logfile "${ACCESS_LOG_FILE:-$HYPHEN_SYMBOL}" \
+    --error-logfile "${ERROR_LOG_FILE:-$HYPHEN_SYMBOL}" \
+    --workers ${SERVER_WORKER_AMOUNT:-1} \
+    --worker-class ${SERVER_WORKER_CLASS:-gthread} \
+    --threads ${SERVER_THREADS_AMOUNT:-20} \
+    --timeout ${GUNICORN_TIMEOUT:-60} \
+    --limit-request-line ${SERVER_LIMIT_REQUEST_LINE:-0} \
+    --limit-request-field_size ${SERVER_LIMIT_REQUEST_FIELD_SIZE:-0} \
+    "${FLASK_APP}"
diff --git a/helm/superset/Chart.yaml b/helm/superset/Chart.yaml
@@ -22,7 +22,7 @@ maintainers:
   - name: craig-rueda
     email: craig@craigrueda.com
     url: https://github.com/craig-rueda
-version: 0.4.0
+version: 0.5.0
 dependencies:
 - name: postgresql
   version: 10.2.0

diff --git a/helm/superset/values.yaml b/helm/superset/values.yaml
@@ -208,7 +208,7 @@ supersetNode:
   command:
     - "/bin/sh"
     - "-c"
-    - ". {{ .Values.configMountPath }}/superset_bootstrap.sh; /usr/bin/docker-entrypoint.sh"
+    - ". {{ .Values.configMountPath }}/superset_bootstrap.sh; /usr/bin/run-server.sh"
   connections:
     redis_host: '{{ template "superset.fullname" . }}-redis-headless'
     redis_port: "6379"

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -77,7 +77,7 @@ flask==1.1.4
     #   flask-openid
     #   flask-sqlalchemy
     #   flask-wtf
-flask-appbuilder==3.4.0
+flask-appbuilder==3.4.1rc2
     # via apache-superset
 flask-babel==1.0.0
     # via flask-appbuilder

diff --git a/scripts/babel_extract.sh → scripts/babel_update.sh b/scripts/babel_extract.sh → scripts/babel_update.sh
@@ -46,6 +46,12 @@ pybabel extract \
   --copyright-holder=Superset \
   --project=Superset \
   -k _ -k __ -k t -k tn -k tct .
-cat $LICENSE_TMP $ROOT_DIR/superset/translations/messages.pot > messages.pot.tmp \
-  && mv messages.pot.tmp $ROOT_DIR/superset/translations/messages.pot \
-  && cd $CURRENT_DIR
+cat $LICENSE_TMP superset/translations/messages.pot > messages.pot.tmp \
+  && mv messages.pot.tmp superset/translations/messages.pot
+
+pybabel update \
+  -i superset/translations/messages.pot \
+  -d superset/translations \
+  --ignore-obsolete
+
+cd $CURRENT_DIR
diff --git a/setup.py b/setup.py
@@ -75,7 +75,7 @@ def get_git_sha() -> str:
         "cryptography>=3.3.2",
         "deprecation>=2.1.0, <2.2.0",
         "flask>=1.1.0, <2.0.0",
-        "flask-appbuilder>=3.4.0, <4.0.0",
+        "flask-appbuilder>=3.4.1rc2, <4.0.0",
         "flask-caching>=1.10.0",
         "flask-compress",
         "flask-talisman",
@@ -109,7 +109,8 @@ def get_git_sha() -> str:
         "sqlalchemy-utils>=0.37.8, <0.38",
         "sqlparse==0.3.0",  # PINNED! see https://github.com/andialbrecht/sqlparse/issues/562
         "tabulate==0.8.9",
-        "typing-extensions>=3.10, <4",  # needed to support Literal (3.8) and TypeGuard (3.10)
+        # needed to support Literal (3.8) and TypeGuard (3.10)
+        "typing-extensions>=3.10, <4",
         "wtforms-json",
     ],
     extras_require={

diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard/edit_properties.test.ts b/superset-frontend/cypress-base/cypress/integration/dashboard/edit_properties.test.ts
@@ -97,17 +97,13 @@ describe('Dashboard edit action', () => {
       .get('[data-test="dashboard-title-input"]')
       .type(`{selectall}{backspace}${dashboardTitle}`);
 
-    cy.wait('@dashboardGet').then(() => {
-      selectColorScheme('d3Category20b');
-    });
-
     // save edit changes
     cy.get('.ant-modal-footer')
-      .contains('Save')
+      .contains('Apply')
       .click()
       .then(() => {
         // assert that modal edit window has closed
-        cy.get('.ant-modal-body').should('not.exist');
+        cy.get('.ant-modal-body').should('not.be.visible');
 
         // assert title has been updated
         cy.get('.editable-title input').should('have.value', dashboardTitle);

diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard/save.test.js b/superset-frontend/cypress-base/cypress/integration/dashboard/save.test.js
@@ -71,28 +71,26 @@ describe('Dashboard save action', () => {
     cy.get('[aria-label="edit-alt"]').click({ timeout: 5000 });
     cy.get('[data-test="dashboard-delete-component-button"]')
       .last()
-      .trigger('moustenter')
+      .trigger('mouseenter')
       .click();
 
-    cy.get('[data-test="grid-container"]')
-      .find('.box_plot')
-      .should('not.exist');
+    cy.get('[data-test="grid-container"]').find('.treemap').should('not.exist');
 
-    cy.intercept('POST', '/superset/save_dash/**/').as('saveRequest');
+    cy.intercept('PUT', '/api/v1/dashboard/**').as('putDashboardRequest');
     cy.get('[data-test="dashboard-header"]')
       .find('[data-test="header-save-button"]')
       .contains('Save')
       .click();
 
     // go back to view mode
-    cy.wait('@saveRequest');
+    cy.wait('@putDashboardRequest');
     cy.get('[data-test="dashboard-header"]')
       .find('[aria-label="edit-alt"]')
       .click();
 
-    // deleted boxplot should still not exist
+    // deleted treemap should still not exist
     cy.get('[data-test="grid-container"]')
-      .find('.box_plot', { timeout: 20000 })
+      .find('.treemap', { timeout: 20000 })
       .should('not.exist');
   });
 

diff --git a/superset-frontend/jest.config.js b/superset-frontend/jest.config.js
@@ -30,7 +30,7 @@ module.exports = {
     '^src/(.*)$': '<rootDir>/src/$1',
     '^spec/(.*)$': '<rootDir>/spec/$1',
     // mapping to souce code instead of lib or esm module
-    '@superset-ui/(((?!(legacy-preset-chart-deckgl|core/src)).)*)$':
+    '@superset-ui/(((?!(core/src)).)*)$':
       '<rootDir>/node_modules/@superset-ui/$1/src',
     '@superset-ui/core/src/(.*)$':
       '<rootDir>/node_modules/@superset-ui/core/src/$1',