Merge branch 'master' into feat-color-consistency

apache · Mar 2, 2022 · ba02558 · ba02558
2 parents 13ae5f8 + bd63a1b
commit ba02558
Show file tree

Hide file tree

Showing 157 changed files with 4,703 additions and 792 deletions.
diff --git a/UPDATING.md b/UPDATING.md
@@ -38,9 +38,12 @@ assists people when migrating to a new version.
   (init, load_examples and etc) require setting the FLASK_APP environment variable
   (which is set by default when .flaskenv is loaded)
 - [17360](https://github.com/apache/superset/pull/17360): changes the column type from `VARCHAR(32)` to `TEXT` in table `table_columns`, potentially requiring a table lock on MySQL dbs or taking some time to complete on large deployments.
+- [17543](https://github.com/apache/superset/pull/17543): introduces new models from SIP-68. The database migration migrates the old models (`SqlaTable`, `TableColumn`, `SqlMetric`) to the new models (`Column`, `Table`, `Dataset`), and the PR introduces logic to keep the old models in sync with the new ones until they are fully removed. The migration might take considerable time depending on the number of datasets.
 
 ### Deprecations
 
+- [18960](https://github.com/apache/superset/pull/18960): Persisting URL params in chart metadata is no longer supported. To set a default value for URL params in Jinja code, use the optional second argument: `url_param("my-param", "my-default-value")`.
+
 ### 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.

diff --git a/docs/docs/databases/yugabyte.mdx b/docs/docs/databases/yugabyte.mdx
@@ -1,13 +1,13 @@
 ---
-title: Postgres
+title: Yugabyte
 hide_title: true
 sidebar_position: 38
 version: 1
 ---
 
-## YugabyteDB
+## Yugabyte
 
-[YugabyteDB](https://www.yugabyte.com/) is a distributed SQL database built on top of PostgreSQL.
+[Yugabyte](https://www.yugabyte.com/) is a distributed SQL database built on top of PostgreSQL.
 
 Note that, if you're using docker-compose, the
 Postgres connector library [psycopg2](https://www.psycopg.org/docs/)

diff --git a/docs/docs/installation/sql-templating.mdx b/docs/docs/installation/sql-templating.mdx
@@ -119,7 +119,7 @@ In this section, we'll walkthrough the pre-defined Jinja macros in Superset.
 
 The `{{ current_username() }}` macro returns the username of the currently logged in user.
 
-If you have caching enabled in your Superset configuration, then by defaul the the `username` value will be used
+If you have caching enabled in your Superset configuration, then by default the the `username` value will be used
 by Superset when calculating the cache key. A cache key is a unique identifer that determines if there's a
 cache hit in the future and Superset can retrieve cached data.
 
@@ -132,7 +132,7 @@ cache key by adding the following parameter to your Jinja code:
 
 **Current User ID**
 
-The `{{ current_user_id()}}` macro returns the user_id of the currently logged in user.
+The `{{ current_user_id() }}` macro returns the user_id of the currently logged in user.
 
 If you have caching enabled in your Superset configuration, then by defaul the the `user_id` value will be used
 by Superset when calculating the cache key. A cache key is a unique identifer that determines if there's a
@@ -197,8 +197,8 @@ You can retrieve the value for a specific filter as a list using `{{ filter_valu
 
 This is useful if:
 
-- you want to use a filter component to filter a query where the name of filter component column doesn't match the one in the select statement
-- you want to have the ability for filter inside the main query for performance purposes
+- You want to use a filter component to filter a query where the name of filter component column doesn't match the one in the select statement
+- You want to have the ability for filter inside the main query for performance purposes
 
 Here's a concrete example:
 
@@ -218,9 +218,9 @@ returns the operator specified in the Explore UI.
 
 This is useful if:
 
-- you want to handle more than the IN operator in your SQL clause
-- you want to handle generating custom SQL conditions for a filter
-- you want to have the ability to filter inside the main query for speed purposes
+- You want to handle more than the IN operator in your SQL clause
+- You want to handle generating custom SQL conditions for a filter
+- You want to have the ability to filter inside the main query for speed purposes
 
 Here's a concrete example:
 

diff --git a/docs/src/resources/data.js b/docs/src/resources/data.js
@@ -139,7 +139,7 @@ export const Databases = [
     imgName: 'teradata.png'
   },
   {
-    title: 'YugabyteDB',
+    title: 'Yugabyte',
     href: "www.yugabyte.com",
     imgName: 'yugabyte.png'
   }

diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard/nativeFilters.test.ts b/superset-frontend/cypress-base/cypress/integration/dashboard/nativeFilters.test.ts
@@ -22,7 +22,11 @@ import {
   nativeFilters,
   exploreView,
 } from 'cypress/support/directories';
-import { testItems } from './dashboard.helper';
+import {
+  testItems,
+  WORLD_HEALTH_CHARTS,
+  waitForChartLoad,
+} from './dashboard.helper';
 import { DASHBOARD_LIST } from '../dashboard_list/dashboard_list.helper';
 import { CHART_LIST } from '../chart_list/chart_list.helper';
 import { FORM_DATA_DEFAULTS } from '../explore/visualizations/shared.helper';
@@ -501,6 +505,155 @@ describe('Nativefilters Sanity test', () => {
       .contains('Month')
       .should('be.visible');
   });
+  it('User can create a time column filter', () => {
+    cy.get(nativeFilters.filterFromDashboardView.expand).click({ force: true });
+    cy.get(nativeFilters.filterFromDashboardView.createFilterButton)
+      .should('be.visible')
+      .click();
+    cy.get(nativeFilters.filtersPanel.filterTypeInput)
+      .find(nativeFilters.filtersPanel.filterTypeItem)
+      .click({ force: true });
+    cy.get('[label="Time column"]').click({ force: true });
+    cy.get(nativeFilters.modal.container)
+      .find(nativeFilters.filtersPanel.filterName)
+      .click({ force: true })
+      .clear()
+      .type('time column');
+    cy.get(nativeFilters.modal.container)
+      .find(nativeFilters.filtersPanel.datasetName)
+      .click()
+      .type('wb_health_population');
+    cy.get(nativeFilters.silentLoading).should('not.exist');
+    cy.get('[label="wb_health_population"]').click();
+
+    cy.get(nativeFilters.modal.footer)
+      .contains('Save')
+      .should('be.visible')
+      .click();
+    cy.intercept(`/api/v1/chart/data?form_data=**`).as('chart');
+    cy.get(nativeFilters.modal.container).should('not.exist');
+    // assert that native filter is created
+    cy.get(nativeFilters.filterFromDashboardView.filterName)
+      .should('be.visible')
+      .contains('time column');
+    cy.get(nativeFilters.filterFromDashboardView.filterValueInput)
+      .should('be.visible', { timeout: 10000 })
+      .click()
+      .type('year{enter}');
+    cy.get(nativeFilters.applyFilter).click({ force: true });
+    cy.wait('@chart');
+    cy.get(nativeFilters.filterFromDashboardView.filterContent)
+      .contains('year')
+      .should('be.visible');
+  });
+  it('User can create parent filters using "Filter is hierarchical"', () => {
+    cy.get(nativeFilters.filterFromDashboardView.expand).click({ force: true });
+    // Create region filter
+    cy.get(nativeFilters.filterFromDashboardView.createFilterButton)
+      .should('be.visible')
+      .click();
+    cy.get(nativeFilters.filtersPanel.filterTypeInput)
+      .find(nativeFilters.filtersPanel.filterTypeItem)
+      .click({ force: true });
+    cy.get('[label="Value"]').click();
+    cy.get(nativeFilters.modal.container)
+      .find(nativeFilters.filtersPanel.datasetName)
+      .click({ force: true })
+      .within(() =>
+        cy
+          .get('input')
+          .type('wb_health_population{enter}', { delay: 50, force: true }),
+      );
+    cy.get(nativeFilters.modal.container)
+      .find(nativeFilters.filtersPanel.filterName)
+      .click({ force: true })
+      .clear()
+      .type('region', { scrollBehavior: false, force: true });
+    cy.wait(3000);
+    cy.get(nativeFilters.silentLoading).should('not.exist');
+    cy.get(nativeFilters.filtersPanel.filterInfoInput)
+      .last()
+      .should('be.visible')
+      .click({ force: true });
+    cy.get(nativeFilters.filtersPanel.filterInfoInput).last().type('region');
+    cy.get(nativeFilters.filtersPanel.inputDropdown)
+      .last()
+      .should('be.visible', { timeout: 20000 })
+      .click({ force: true });
+    // Create country filter
+    cy.get(nativeFilters.addFilterButton.button)
+      .first()
+      .click({ force: true })
+      .then(() => {
+        cy.get(nativeFilters.addFilterButton.dropdownItem)
+          .contains('Filter')
+          .click({ force: true });
+      });
+    cy.get(nativeFilters.filtersPanel.filterTypeInput)
+      .find(nativeFilters.filtersPanel.filterTypeItem)
+      .last()
+      .click({ force: true });
+    cy.get('[label="Value"]').last().click({ force: true });
+    cy.get(nativeFilters.modal.container)
+      .find(nativeFilters.filtersPanel.datasetName)
+      .last()
+      .click({ scrollBehavior: false })
+      .within(() =>
+        cy
+          .get('input')
+          .clear({ force: true })
+          .type('wb_health_population{enter}', {
+            delay: 50,
+            force: true,
+            scrollBehavior: false,
+          }),
+      );
+    cy.get(nativeFilters.filtersPanel.filterInfoInput)
+      .last()
+      .should('be.visible')
+      .click({ force: true });
+    cy.get(nativeFilters.filtersPanel.inputDropdown)
+      .should('be.visible', { timeout: 20000 })
+      .last()
+      .click();
+    cy.get(nativeFilters.modal.container)
+      .find(nativeFilters.filtersPanel.filterName)
+      .last()
+      .click({ force: true })
+      .type('country', { scrollBehavior: false, force: true });
+    cy.get(nativeFilters.silentLoading).should('not.exist');
+    cy.get(nativeFilters.filtersPanel.filterInfoInput)
+      .last()
+      .click({ force: true });
+    cy.get(nativeFilters.filtersPanel.filterInfoInput)
+      .last()
+      .type('country_name', { delay: 50, scrollBehavior: false, force: true });
+    cy.get(nativeFilters.filtersPanel.inputDropdown)
+      .last()
+      .should('be.visible', { timeout: 20000 })
+      .click({ force: true });
+    // Setup parent filter
+    cy.get(nativeFilters.filterConfigurationSections.displayedSection).within(
+      () => {
+        cy.contains('Filter is hierarchical').should('be.visible').click();
+        cy.wait(1000);
+        cy.get(nativeFilters.filterConfigurationSections.parentFilterInput)
+          .click()
+          .type('region{enter}', { delay: 30 });
+      },
+    );
+    cy.get(nativeFilters.modal.footer)
+      .contains('Save')
+      .should('be.visible')
+      .click();
+    WORLD_HEALTH_CHARTS.forEach(waitForChartLoad);
+    // assert that native filter is created
+    cy.get(nativeFilters.filterFromDashboardView.filterName)
+      .should('be.visible')
+      .contains('region');
+    cy.get(nativeFilters.filterIcon).click();
+    cy.contains('Select parent filters (2)').should('be.visible');
+  });
 });
 
 xdescribe('Nativefilters', () => {

diff --git a/superset-frontend/cypress-base/cypress/support/directories.ts b/superset-frontend/cypress-base/cypress/support/directories.ts
@@ -327,6 +327,10 @@ export const nativeFilters = {
     addFilter: dataTestLocator('add-filter-button'),
     defaultValueCheck: '.ant-checkbox-checked',
   },
+  addFilterButton: {
+    button: `.ant-modal-content [data-test="new-dropdown-icon"]`,
+    dropdownItem: '.ant-dropdown-menu-item',
+  },
   filtersPanel: {
     filterName: dataTestLocator('filters-config-modal__name-input'),
     datasetName: dataTestLocator('filters-config-modal__datasource-input'),
@@ -350,6 +354,7 @@ export const nativeFilters = {
   removeFilter: '[aria-label="remove"]',
   silentLoading: '.loading inline-centered css-101mkpk',
   filterConfigurationSections: {
+    displayedSection: 'div[style="height: 100%; overflow-y: auto;"]',
     collapseExpandButton: '.ant-collapse-arrow',
     checkedCheckbox: '.ant-checkbox-wrapper-checked',
     infoTooltip: '[aria-label="Show info tooltip"]',