Merge branch 'master' into ci/push-draft-releases

apache · Jan 14, 2021 · c358ea9 · c358ea9
2 parents 320e8ea + eec7856
commit c358ea9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 93 deletions.
diff --git a/superset-frontend/cypress-base/cypress/integration/chart_list/list_view.test.ts b/superset-frontend/cypress-base/cypress/integration/chart_list/list_view.test.ts
@@ -39,7 +39,7 @@ describe('chart list view', () => {
     cy.get('[data-test="table-row"]').should('have.length', 25);
   });
 
-  it('should sort correctly', () => {
+  xit('should sort correctly', () => {
     cy.get('[data-test="sort-header"]').eq(2).click();
     cy.get('[data-test="sort-header"]').eq(2).click();
     cy.get('[data-test="table-row"]')

diff --git a/superset-frontend/webpack.config.js b/superset-frontend/webpack.config.js
@@ -274,8 +274,12 @@ const config = {
     modules: [APP_DIR, 'node_modules'],
     alias: {
       'react-dom': '@hot-loader/react-dom',
-      // force using absolute import path of the @superset-ui/core and @superset-ui/chart-controls
-      // so that we can `npm link` viz plugins without linking these two base packages
+      // Force using absolute import path of some packages in the root node_modules,
+      // as they can be dependencies of other packages via `npm link`.
+      // Both `@emotion/core` and `@superset-ui/core` remember some globals within
+      // module after imported, which will not be available everywhere if two
+      // different copies of the same module are imported in different places.
+      '@emotion/core': path.resolve(APP_DIR, './node_modules/@emotion/core'),
       '@superset-ui/core': path.resolve(
         APP_DIR,
         './node_modules/@superset-ui/core',

diff --git a/superset/views/chart/mixin.py b/superset/views/chart/mixin.py
@@ -17,8 +17,8 @@
 from flask import Markup
 from flask_babel import lazy_gettext as _
 
+from superset.dashboards.filters import DashboardFilter
 from superset.views.chart.filters import SliceFilter
-from superset.views.dashboard.filters import DashboardFilter
 
 
 class SliceMixin:  # pylint: disable=too-few-public-methods

diff --git a/superset/views/dashboard/filters.py b/superset/views/dashboard/filters.py
diff --git a/superset/views/dashboard/mixin.py b/superset/views/dashboard/mixin.py
@@ -16,8 +16,8 @@
 # under the License.
 from flask_babel import lazy_gettext as _
 
+from ...dashboards.filters import DashboardFilter
 from ..base import check_ownership
-from .filters import DashboardFilter
 
 
 class DashboardMixin:  # pylint: disable=too-few-public-methods