fix(wip): Staging for fixing Query to Chart path

.github/workflows/caches.js

@@ -25,6 +25,8 @@ const assetsConfig = {
   path: [`${workspaceDirectory}/superset/static/assets`],
   hashFiles: [
     `${workspaceDirectory}/superset-frontend/src/**/*`,
+    `${workspaceDirectory}/superset-frontend/packages/**/*`,
+    `${workspaceDirectory}/superset-frontend/plugins/**/*`,
     `${workspaceDirectory}/superset-frontend/*.js`,
     `${workspaceDirectory}/superset-frontend/*.json`,
   ],

.github/workflows/license-check.yml

@@ -0,0 +1,51 @@
+name: License Check
+
+on:
+  push:
+    branches-ignore:
+      - "dependabot/**"
+  pull_request:
+
+jobs:
+  license_check:
+    name: License Check
+    runs-on: ubuntu-20.04
+    steps:
+      - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
+        uses: actions/checkout@v2
+        with:
+          persist-credentials: false
+          submodules: recursive
+      - name: Setup Java
+        uses: actions/setup-java@v1
+        with:
+          java-version: 8
+      - name: Generate fossa report
+        env:
+          FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }}
+        run: |
+          set -eo pipefail
+          if [[ "${{github.event_name}}" != "pull_request" ]]; then
+            ./scripts/fossa.sh
+            exit 0
+          fi
+
+          URL="https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/files"
+          FILES=$(curl -s -X GET -G $URL | jq -r '.[] | .filename')
+
+          cat<<EOF
+          CHANGED FILES:
+          $FILES
+
+          EOF
+
+          if [[ "${FILES}" =~ (.*package*\.json|requirements\/[a-z_-]+\.txt|setup\.py) ]]; then
+            echo "Detected dependency changes... running fossa check"
+
+            ./scripts/fossa.sh
+          else
+            echo "No dependency changes... skiping fossa check"
+          fi
+        shell: bash
+      - name: Run license check
+        run: ./scripts/check_license.sh

.github/workflows/misc.yml → .github/workflows/prefer-typescript.yml

@@ -1,4 +1,4 @@
-name: Miscellaneous
+name: Prefer Typescript
 
 on:
   push:
@@ -7,49 +7,6 @@ on:
   pull_request:
 
 jobs:
-  license_check:
-    name: License Check
-    runs-on: ubuntu-20.04
-    steps:
-      - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
-        uses: actions/checkout@v2
-        with:
-          persist-credentials: false
-          submodules: recursive
-      - name: Setup Java
-        uses: actions/setup-java@v1
-        with:
-          java-version: 8
-      - name: Generate fossa report
-        env:
-          FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }}
-        run: |
-          set -eo pipefail
-          if [[ "${{github.event_name}}" != "pull_request" ]]; then
-            ./scripts/fossa.sh
-            exit 0
-          fi
-
-          URL="https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/files"
-          FILES=$(curl -s -X GET -G $URL | jq -r '.[] | .filename')
-
-          cat<<EOF
-          CHANGED FILES:
-          $FILES
-
-          EOF
-
-          if [[ "${FILES}" =~ (.*package*\.json|requirements\/[a-z_-]+\.txt|setup\.py) ]]; then
-            echo "Detected dependency changes... running fossa check"
-
-            ./scripts/fossa.sh
-          else
-            echo "No dependency changes... skiping fossa check"
-          fi
-        shell: bash
-      - name: Run license check
-        run: ./scripts/check_license.sh
-
   prefer_typescript:
     if: github.ref == 'ref/heads/master' && github.event_name == 'pull_request'
     name: Prefer Typescript

Dockerfile

@@ -18,7 +18,7 @@
 ######################################################################
 # PY stage that simply does a pip install on our requirements
 ######################################################################
-ARG PY_VER=3.8.12
+ARG PY_VER=3.8.13
 FROM python:${PY_VER} AS superset-py
 
 RUN mkdir /app \
@@ -71,7 +71,7 @@ RUN cd /app/superset-frontend \
 ######################################################################
 # Final lean image...
 ######################################################################
-ARG PY_VER=3.8.12
+ARG PY_VER=3.8.13
 FROM python:${PY_VER} AS lean
 
 ENV LANG=C.UTF-8 \

docs/docs/installation/alerts-reports.mdx

@@ -391,94 +391,91 @@ You can optionally allow your users to schedule queries directly in SQL Lab. Thi
 extra metadata to saved queries, which are then picked up by an external scheduled (like
 [Apache Airflow](https://airflow.apache.org/)).
 
-To allow scheduled queries, add the following to your configuration file:
+To allow scheduled queries, add the following to `SCHEDULED_QUERIES` in your configuration file:
 
 ```python
-FEATURE_FLAGS = {
-    # Configuration for scheduling queries from SQL Lab. This information is
-    # collected when the user clicks "Schedule query", and saved into the `extra`
-    # field of saved queries.
+SCHEDULED_QUERIES = {
+    # This information is collected when the user clicks "Schedule query",
+    # and saved into the `extra` field of saved queries.
     # See: https://github.com/mozilla-services/react-jsonschema-form
-    'SCHEDULED_QUERIES': {
-        'JSONSCHEMA': {
-            'title': 'Schedule',
-            'description': (
-                'In order to schedule a query, you need to specify when it '
-                'should start running, when it should stop running, and how '
-                'often it should run. You can also optionally specify '
-                'dependencies that should be met before the query is '
-                'executed. Please read the documentation for best practices '
-                'and more information on how to specify dependencies.'
-            ),
-            'type': 'object',
-            'properties': {
-                'output_table': {
-                    'type': 'string',
-                    'title': 'Output table name',
-                },
-                'start_date': {
-                    'type': 'string',
-                    'title': 'Start date',
-                    # date-time is parsed using the chrono library, see
-                    # https://www.npmjs.com/package/chrono-node#usage
-                    'format': 'date-time',
-                    'default': 'tomorrow at 9am',
-                },
-                'end_date': {
-                    'type': 'string',
-                    'title': 'End date',
-                    # date-time is parsed using the chrono library, see
-                    # https://www.npmjs.com/package/chrono-node#usage
-                    'format': 'date-time',
-                    'default': '9am in 30 days',
-                },
-                'schedule_interval': {
-                    'type': 'string',
-                    'title': 'Schedule interval',
-                },
-                'dependencies': {
-                    'type': 'array',
-                    'title': 'Dependencies',
-                    'items': {
-                        'type': 'string',
-                    },
-                },
+    'JSONSCHEMA': {
+        'title': 'Schedule',
+        'description': (
+            'In order to schedule a query, you need to specify when it '
+            'should start running, when it should stop running, and how '
+            'often it should run. You can also optionally specify '
+            'dependencies that should be met before the query is '
+            'executed. Please read the documentation for best practices '
+            'and more information on how to specify dependencies.'
+        ),
+        'type': 'object',
+        'properties': {
+            'output_table': {
+                'type': 'string',
+                'title': 'Output table name',
+            },
+            'start_date': {
+                'type': 'string',
+                'title': 'Start date',
+                # date-time is parsed using the chrono library, see
+                # https://www.npmjs.com/package/chrono-node#usage
+                'format': 'date-time',
+                'default': 'tomorrow at 9am',
+            },
+            'end_date': {
+                'type': 'string',
+                'title': 'End date',
+                # date-time is parsed using the chrono library, see
+                # https://www.npmjs.com/package/chrono-node#usage
+                'format': 'date-time',
+                'default': '9am in 30 days',
             },
-        },
-        'UISCHEMA': {
             'schedule_interval': {
-                'ui:placeholder': '@daily, @weekly, etc.',
+                'type': 'string',
+                'title': 'Schedule interval',
             },
             'dependencies': {
-                'ui:help': (
-                    'Check the documentation for the correct format when '
-                    'defining dependencies.'
-                ),
+                'type': 'array',
+                'title': 'Dependencies',
+                'items': {
+                    'type': 'string',
+                },
             },
         },
-        'VALIDATION': [
-            # ensure that start_date <= end_date
-            {
-                'name': 'less_equal',
-                'arguments': ['start_date', 'end_date'],
-                'message': 'End date cannot be before start date',
-                # this is where the error message is shown
-                'container': 'end_date',
-            },
-        ],
-        # link to the scheduler; this example links to an Airflow pipeline
-        # that uses the query id and the output table as its name
-        'linkback': (
-            'https://airflow.example.com/admin/airflow/tree?'
-            'dag_id=query_${id}_${extra_json.schedule_info.output_table}'
-        ),
     },
+    'UISCHEMA': {
+        'schedule_interval': {
+            'ui:placeholder': '@daily, @weekly, etc.',
+        },
+        'dependencies': {
+            'ui:help': (
+                'Check the documentation for the correct format when '
+                'defining dependencies.'
+            ),
+        },
+    },
+    'VALIDATION': [
+        # ensure that start_date <= end_date
+        {
+            'name': 'less_equal',
+            'arguments': ['start_date', 'end_date'],
+            'message': 'End date cannot be before start date',
+            # this is where the error message is shown
+            'container': 'end_date',
+        },
+    ],
+    # link to the scheduler; this example links to an Airflow pipeline
+    # that uses the query id and the output table as its name
+    'linkback': (
+        'https://airflow.example.com/admin/airflow/tree?'
+        'dag_id=query_${id}_${extra_json.schedule_info.output_table}'
+    ),
 }
 ```
 
-This feature flag is based on
+This configuration is based on
 [react-jsonschema-form](https://github.com/mozilla-services/react-jsonschema-form) and will add a
-button called “Schedule Query” to SQL Lab. When the button is clicked, a modal will show up where
+menu item called “Schedule” to SQL Lab. When the menu item is clicked, a modal will show up where
 the user can add the metadata required for scheduling the query.
 
 This information can then be retrieved from the endpoint `/savedqueryviewapi/api/read` and used to

superset-frontend/cypress-base/cypress/integration/explore/chart.test.js

@@ -41,7 +41,7 @@ describe('No Results', () => {
       ],
     };
 
-    cy.visitChartByParams(JSON.stringify(formData));
+    cy.visitChartByParams(formData);
     cy.wait('@getJson').its('response.statusCode').should('eq', 200);
     cy.get('div.chart-container').contains(
       'No results were returned for this query',

superset-frontend/cypress-base/cypress/integration/explore/control.test.ts

@@ -127,10 +127,16 @@ describe('Test datatable', () => {
     cy.get('[data-test="row-count-label"]').contains('26 rows');
     cy.get('.ant-empty-description').should('not.exist');
   });
-  it.skip('Datapane loads view samples', () => {
-    cy.contains('Samples').click();
-    cy.get('[data-test="row-count-label"]').contains('1k rows');
-    cy.get('.ant-empty-description').should('not.exist');
+  it('Datapane loads view samples', () => {
+    cy.intercept('/api/v1/dataset/*/samples?force=false').as('Samples');
+    cy.contains('Samples')
+      .click()
+      .then(() => {
+        cy.wait('@Samples');
+        cy.get('.ant-tabs-tab-active').contains('Samples');
+        cy.get('[data-test="row-count-label"]').contains('1k rows');
+        cy.get('.ant-empty-description').should('not.exist');
+      });
   });
 });
 
@@ -148,7 +154,7 @@ describe('Time range filter', () => {
       metrics: [NUM_METRIC],
     };
 
-    cy.visitChartByParams(JSON.stringify(formData));
+    cy.visitChartByParams(formData);
     cy.verifySliceSuccess({ waitAlias: '@chartData' });
 
     cy.get('[data-test=time-range-trigger]')
@@ -172,7 +178,7 @@ describe('Time range filter', () => {
       time_range: 'Last year',
     };
 
-    cy.visitChartByParams(JSON.stringify(formData));
+    cy.visitChartByParams(formData);
     cy.verifySliceSuccess({ waitAlias: '@chartData' });
 
     cy.get('[data-test=time-range-trigger]')
@@ -192,7 +198,7 @@ describe('Time range filter', () => {
       time_range: 'previous calendar month',
     };
 
-    cy.visitChartByParams(JSON.stringify(formData));
+    cy.visitChartByParams(formData);
     cy.verifySliceSuccess({ waitAlias: '@chartData' });
 
     cy.get('[data-test=time-range-trigger]')
@@ -212,7 +218,7 @@ describe('Time range filter', () => {
       time_range: 'DATEADD(DATETIME("today"), -7, day) : today',
     };
 
-    cy.visitChartByParams(JSON.stringify(formData));
+    cy.visitChartByParams(formData);
     cy.verifySliceSuccess({ waitAlias: '@chartData' });
 
     cy.get('[data-test=time-range-trigger]')
@@ -235,7 +241,7 @@ describe('Time range filter', () => {
       time_range: 'No filter',
     };
 
-    cy.visitChartByParams(JSON.stringify(formData));
+    cy.visitChartByParams(formData);
     cy.verifySliceSuccess({ waitAlias: '@chartData' });
 
     cy.get('[data-test=time-range-trigger]')

superset-frontend/cypress-base/cypress/integration/explore/explore.applitools.test.ts

@@ -31,7 +31,7 @@ describe('explore view', () => {
   it('should load Explore', () => {
     const LINE_CHART_DEFAULTS = { ...FORM_DATA_DEFAULTS, viz_type: 'line' };
     const formData = { ...LINE_CHART_DEFAULTS, metrics: [NUM_METRIC] };
-    cy.visitChartByParams(JSON.stringify(formData));
+    cy.visitChartByParams(formData);
     cy.verifySliceSuccess({ waitAlias: '@getJson', chartSelector: 'svg' });
     cy.eyesOpen({
       testName: 'Explore page',

superset-frontend/cypress-base/cypress/integration/explore/filter_box.test.js

@@ -22,7 +22,7 @@ describe('Edit FilterBox Chart', () => {
   const VIZ_DEFAULTS = { ...FORM_DATA_DEFAULTS, viz_type: 'filter_box' };
 
   function verify(formData) {
-    cy.visitChartByParams(JSON.stringify(formData));
+    cy.visitChartByParams(formData);
     cy.verifySliceSuccess({ waitAlias: '@getJson' });
   }