Merge branch 'master' into hiding-hidden-controls-for-real

.asf.yaml

@@ -66,12 +66,12 @@ github:
           - cypress-matrix (3, chrome)
           - docker-build
           - frontend-build
-          - pre-commit (3.7)
-          - python-lint (3.7)
-          - test-mysql (3.7)
-          - test-postgres (3.7)
+          - pre-commit (3.8)
+          - python-lint (3.8)
+          - test-mysql (3.8)
           - test-postgres (3.8)
-          - test-sqlite (3.7)
+          - test-postgres (3.9)
+          - test-sqlite (3.8)
 
       required_pull_request_reviews:
         dismiss_stale_reviews: false

.gitattributes

@@ -0,0 +1 @@
+docker/**/*.sh text eol=lf

.github/CODEOWNERS

@@ -3,6 +3,9 @@
 /superset/migrations/ @apache/superset-committers
 
 # Notify Preset team when ephemeral env settings are changed
-.github/workflows/ecs-task-definition.json @robdiciuccio @craig-rueda @willbarrett @rusackas @eschutho @dpgaspar @nytai @mistercrunch
-.github/workflows/docker-ephemeral-env.yml @robdiciuccio @craig-rueda @willbarrett @rusackas @eschutho @dpgaspar @nytai @mistercrunch
-.github/workflows/ephemeral*.yml @robdiciuccio @craig-rueda @willbarrett @rusackas @eschutho @dpgaspar @nytai @mistercrunch
+.github/workflows/ecs-task-definition.json @robdiciuccio @craig-rueda @rusackas @eschutho @dpgaspar @nytai @mistercrunch
+.github/workflows/docker-ephemeral-env.yml @robdiciuccio @craig-rueda @rusackas @eschutho @dpgaspar @nytai @mistercrunch
+.github/workflows/ephemeral*.yml @robdiciuccio @craig-rueda @rusackas @eschutho @dpgaspar @nytai @mistercrunch
+
+# Notify some committers of changes in the Select component
+/superset-frontend/src/components/Select/ @michael-s-molina @geido

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,6 +7,13 @@ labels: "#bug"
 
 A clear and concise description of what the bug is.
 
+#### How to reproduce the bug
+
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
 ### Expected results
 
 what you expected to happen.
@@ -19,20 +26,16 @@ what actually happens.
 
 If applicable, add screenshots to help explain your problem.
 
-#### How to reproduce the bug
-
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
 
 ### Environment
 
 (please complete the following information):
 
+- browser type and version:
 - superset version: `superset version`
 - python version: `python --version`
 - node.js version: `node -v`
+- any feature flags active:
 
 ### Checklist
 

.github/ISSUE_TEMPLATE/sip.md

@@ -6,9 +6,9 @@ labels: "#SIP"
 ---
 
 *Please make sure you are familiar with the SIP process documented*
-(here)[https://github.com/apache/superset/issues/5602]
+(here)[https://github.com/apache/superset/issues/5602]. The SIP number should be the next number after the latest SIP listed [here](https://github.com/apache/superset/issues?q=is%3Aissue+label%3Asip).
 
-## [SIP] Proposal for XXX
+## [SIP-\<number>] Proposal for <title>
 
 ### Motivation
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,3 +1,9 @@
+<!---
+Please write the PR title following the conventions at https://www.conventionalcommits.org/en/v1.0.0/
+Example:
+fix(dashboard): load charts correctly
+-->
+
 ### SUMMARY
 <!--- Describe the change below, including rationale and design decisions -->
 
@@ -11,6 +17,7 @@
 <!--- Check any relevant boxes with "x" -->
 <!--- HINT: Include "Fixes #nnn" if you are fixing an existing issue -->
 - [ ] Has associated issue:
+- [ ] Required feature flags:
 - [ ] Changes UI
 - [ ] Includes DB Migration (follow approval process in [SIP-59](https://github.com/apache/superset/issues/13351))
   - [ ] Migration is atomic, supports rollback & is backwards-compatible

.github/workflows/bashlib.sh

@@ -55,7 +55,6 @@ npm-install() {
   cd "$GITHUB_WORKSPACE/superset-frontend"
 
   # cache-restore npm
-
   say "::group::Install npm packages"
   echo "npm: $(npm --version)"
   echo "node: $(node --version)"
@@ -69,7 +68,7 @@ build-assets() {
   cd "$GITHUB_WORKSPACE/superset-frontend"
 
   say "::group::Build static assets"
-  npm run build -- --no-progress
+  npm run build
   say "::endgroup::"
 }
 
@@ -81,7 +80,7 @@ build-instrumented-assets() {
   if [[ -f "$ASSETS_MANIFEST" ]]; then
     echo 'Skip frontend build because instrumented static assets already exist.'
   else
-    npm run build-instrumented -- --no-progress
+    npm run build-instrumented
     cache-save instrumented-assets
   fi
   say "::endgroup::"
@@ -192,7 +191,7 @@ cypress-run-all() {
   say "::endgroup::"
 
   # Rerun SQL Lab tests with backend persist enabled
-  export SUPERSET_CONFIG=tests.superset_test_config_sqllab_backend_persist
+  export SUPERSET_CONFIG=tests.integration_tests.superset_test_config_sqllab_backend_persist
 
   # Restart Flask with new configs
   kill $flaskProcessId

.github/workflows/superset-e2e.yml

@@ -25,7 +25,7 @@ jobs:
     env:
       FLASK_ENV: development
       ENABLE_REACT_CRUD_VIEWS: true
-      SUPERSET_CONFIG: tests.superset_test_config
+      SUPERSET_CONFIG: tests.integration_tests.superset_test_config
       SUPERSET__SQLALCHEMY_DATABASE_URI: postgresql+psycopg2://superset:superset@127.0.0.1:15432/superset
       PYTHONPATH: ${{ github.workspace }}
       REDIS_PORT: 16379
@@ -67,13 +67,12 @@ jobs:
         if: steps.check.outcome == 'failure'
         uses: actions/setup-python@v2
         with:
-          python-version: "3.7"
+          python-version: "3.8"
       - name: OS dependencies
         if: steps.check.outcome == 'failure'
         uses: ./.github/actions/cached-dependencies
         with:
-          run: |
-            apt-get-install
+          run: apt-get-install
       - name: Install python dependencies
         if: steps.check.outcome == 'failure'
         uses: ./.github/actions/cached-dependencies
@@ -85,32 +84,31 @@ jobs:
         if: steps.check.outcome == 'failure'
         uses: ./.github/actions/cached-dependencies
         with:
-          run: |
-            setup-postgres
+          run: setup-postgres
       - name: Import test data
         if: steps.check.outcome == 'failure'
         uses: ./.github/actions/cached-dependencies
         with:
-          run: |
-            testdata
+          run: testdata
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version:  '16'
       - name: Install npm dependencies
         if: steps.check.outcome == 'failure'
         uses: ./.github/actions/cached-dependencies
         with:
-          run: |
-            npm-install
+          run: npm-install
       - name: Build javascript packages
         if: steps.check.outcome == 'failure'
         uses: ./.github/actions/cached-dependencies
         with:
-          run: |
-            build-instrumented-assets
+          run: build-instrumented-assets
       - name: Install cypress
         if: steps.check.outcome == 'failure'
         uses: ./.github/actions/cached-dependencies
         with:
-          run: |
-            cypress-install
+          run: cypress-install
       - name: Run Cypress
         if: steps.check.outcome == 'failure'
         uses: ./.github/actions/cached-dependencies

.github/workflows/superset-frontend.yml

@@ -18,13 +18,20 @@ jobs:
         with:
           persist-credentials: false
           submodules: recursive
+      - name: Check npm lock file version
+        run: ./scripts/ci_check_npm_lock_version.sh ./superset-frontend/package-lock.json
       - name: Check if frontend changes are present
         id: check
         env:
           GITHUB_REPO: ${{ github.repository }}
           PR_NUMBER: ${{ github.event.pull_request.number }}
         continue-on-error: true
         run: ./scripts/ci_check_no_file_changes.sh frontend
+      - name: Setup Node.js
+        if: steps.check.outcome == 'failure'
+        uses: actions/setup-node@v2
+        with:
+          node-version: "16"
       - name: Install dependencies
         if: steps.check.outcome == 'failure'
         uses: ./.github/actions/cached-dependencies

.github/workflows/superset-helm-lint.yml

@@ -22,7 +22,7 @@ jobs:
 
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: 3.8
 
       - name: Set up chart-testing
         uses: ./.github/actions/chart-testing-action