Merge branch 'master' of https://github.com/apache/superset into chor…

…e/certified_dashboards_charts

.github/dependabot.yml

@@ -21,3 +21,9 @@ updates:
     schedule:
       interval: "daily"
     open-pull-requests-limit: 0
+
+  - package-ecosystem: "npm"
+    directory: "/docs/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 0

.pre-commit-config.yaml

@@ -33,6 +33,7 @@ repos:
     hooks:
       - id: check-docstring-first
       - id: check-added-large-files
+        exclude: \.(geojson)$
       - id: check-yaml
         exclude: ^helm/superset/templates/
       - id: debug-statements
@@ -45,7 +46,7 @@ repos:
       - id: black
         language_version: python3
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.2.1 # Use the sha or tag you want to point at
+    rev: v2.4.1 # Use the sha or tag you want to point at
     hooks:
       - id: prettier
         files: 'superset-frontend'

.rat-excludes

@@ -48,3 +48,16 @@ vendor/*
 # github configuration
 .github/*
 .*mdx
+
+# skip license check in superset-ui
+tmp/*
+lib/*
+esm/*
+tsconfig.tsbuildinfo
+.*ipynb
+.*yml
+.*iml
+.esprintrc
+.prettierignore
+superset-frontend/packages/generator-superset
+superset-frontend/temporary_superset_ui

Dockerfile

@@ -92,6 +92,7 @@ RUN mkdir -p ${PYTHONPATH} \
             default-libmysqlclient-dev \
             libsasl2-modules-gssapi-mit \
             libpq-dev \
+            libecpg-dev \
         && rm -rf /var/lib/apt/lists/*
 
 COPY --from=superset-py /usr/local/lib/python3.8/site-packages/ /usr/local/lib/python3.8/site-packages/

superset-frontend/.eslintrc.js

@@ -16,6 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
+const packageConfig = require('./package');
+
+const importCoreModules = [];
+Object.entries(packageConfig.dependencies).forEach(([pkg]) => {
+  if (/@superset-ui/.test(pkg)) {
+    importCoreModules.push(pkg);
+  }
+});
 module.exports = {
   extends: [
     'airbnb',
@@ -33,7 +42,15 @@ module.exports = {
     browser: true,
   },
   settings: {
-    'import/resolver': 'webpack',
+    'import/resolver': {
+      webpack: {},
+      node: {
+        extensions: ['.js', '.jsx', '.ts', '.tsx', '.json'],
+      },
+    },
+    // Allow only core/src and core/test, avoid import modules from lib
+    'import/internal-regex': /^@superset-ui\/core\/(src|test)\/.*/,
+    'import/core-modules': importCoreModules,
     react: {
       version: 'detect',
     },
@@ -76,11 +93,11 @@ module.exports = {
         '@typescript-eslint/no-empty-function': 0,
         '@typescript-eslint/no-explicit-any': 0,
         '@typescript-eslint/no-use-before-define': 1, // disabled temporarily
+        '@typescript-eslint/no-non-null-assertion': 0, // disabled temporarily
         '@typescript-eslint/explicit-function-return-type': 0,
         '@typescript-eslint/explicit-module-boundary-types': 0, // re-enable up for discussion
         camelcase: 0,
         'class-methods-use-this': 0,
-        curly: 1,
         'func-names': 0,
         'guard-for-in': 0,
         'import/no-cycle': 0, // re-enable up for discussion, might require some major refactors
@@ -170,11 +187,11 @@ module.exports = {
     },
     {
       files: [
-        'src/**/*.test.ts',
-        'src/**/*.test.tsx',
-        'src/**/*.test.js',
-        'src/**/*.test.jsx',
-        'src/**/fixtures.*',
+        '*.test.ts',
+        '*.test.tsx',
+        '*.test.js',
+        '*.test.jsx',
+        'fixtures.*',
       ],
       plugins: ['jest', 'jest-dom', 'no-only-tests', 'testing-library'],
       env: {
@@ -195,9 +212,28 @@ module.exports = {
           'error',
           { devDependencies: true },
         ],
-        'jest/consistent-test-it': 'error',
         'no-only-tests/no-only-tests': 'error',
+        'max-classes-per-file': 0,
         '@typescript-eslint/no-non-null-assertion': 0,
+        // TODO: disabled temporarily, re-enable after monorepo
+        'jest/consistent-test-it': 'error',
+        'jest/expect-expect': 0,
+        'jest/no-test-prefixes': 0,
+        'jest/valid-expect-in-promise': 0,
+        'jest/valid-expect': 0,
+        'jest/valid-title': 0,
+        'jest-dom/prefer-to-have-attribute': 0,
+        'jest-dom/prefer-to-have-text-content': 0,
+        'jest-dom/prefer-to-have-style': 0,
+      },
+    },
+    {
+      files: './packages/generator-superset/**/*.test.*',
+      env: {
+        node: true,
+      },
+      rules: {
+        'jest/expect-expect': 0,
       },
     },
   ],
@@ -210,7 +246,7 @@ module.exports = {
       },
     ],
     'class-methods-use-this': 0,
-    curly: 1,
+    curly: 2,
     'func-names': 0,
     'guard-for-in': 0,
     'import/extensions': [

superset-frontend/babel.config.js

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-const packageConfig = require('./package.json');
+const packageConfig = require('./package');
 
 module.exports = {
   sourceMaps: true,

superset-frontend/cypress-base/cypress/integration/dashboard/nativeFilters.test.ts

@@ -93,9 +93,7 @@ describe('Nativefilters Sanity test', () => {
     cy.get(nativeFilters.modal.container).should('be.visible');
   });
   it('User can add a new native filter', () => {
-    cy.get(nativeFilters.filterFromDashboardView.expand)
-      .should('be.visible')
-      .click();
+    cy.get(nativeFilters.filterFromDashboardView.expand).click({ force: true });
     cy.get(nativeFilters.createFilterButton).should('be.visible').click();
     cy.get(nativeFilters.modal.container)
       .find(nativeFilters.filtersPanel.filterName)
@@ -208,7 +206,7 @@ describe('Nativefilters Sanity test', () => {
     cy.get(nativeFilters.modal.container)
       .find(nativeFilters.filtersPanel.datasetName)
       .click()
-      .type("World Bank's Data{enter}");
+      .type('wb_health_population{enter}');
 
     cy.get('.loading inline-centered css-101mkpk').should('not.exist');
     // hack for unclickable country_name
@@ -288,6 +286,50 @@ describe('Nativefilters Sanity test', () => {
       'By default, each filter loads at most 1000 choices at the initial page load. Check this box if you have more than 1000 filter values and want to enable dynamically searching that loads filter values as users type (may add stress to your database).',
     );
   });
+  it("User can check 'Filter has default value'", () => {
+    cy.get(nativeFilters.filterFromDashboardView.expand).click({ force: true });
+    cy.get(nativeFilters.createFilterButton)
+      .should('be.visible')
+      .click({ force: true });
+    cy.get(nativeFilters.modal.container).should('be.visible');
+
+    cy.get(nativeFilters.modal.container)
+      .find(nativeFilters.filtersPanel.datasetName)
+      .click()
+      .type('wb_health_population{enter}');
+    cy.get(nativeFilters.modal.container)
+      .find(nativeFilters.filtersPanel.filterName)
+      .click()
+      .type('country_name');
+    // hack for unclickable datetime
+    cy.wait(5000);
+    cy.get(nativeFilters.filtersPanel.filterInfoInput)
+      .last()
+      .click({ force: true });
+    cy.get(nativeFilters.filtersPanel.filterInfoInput)
+      .last()
+      .type('country_name');
+    cy.get(nativeFilters.filtersPanel.inputDropdown)
+      .should('be.visible', { timeout: 20000 })
+      .last()
+      .click();
+    cy.contains('Filter has default value').click();
+    cy.contains('Default value is required');
+    cy.get(nativeFilters.modal.defaultValueCheck).should('be.visible');
+    cy.get(nativeFilters.filtersPanel.columnEmptyInput)
+      .last()
+      .type('United States{enter}');
+    cy.get(nativeFilters.modal.footer)
+      .find(nativeFilters.modal.saveButton)
+      .should('be.visible')
+      .click({ force: true });
+    cy.get(nativeFilters.filterFromDashboardView.filterContent).contains(
+      'United States',
+    );
+    cy.get('.line').within(() => {
+      cy.contains('United States').should('be.visible');
+    });
+  });
 });
 
 xdescribe('Nativefilters', () => {

superset-frontend/cypress-base/cypress/support/directories.ts

@@ -325,6 +325,7 @@ export const nativeFilters = {
       removeTab: '[aria-label="trash"]',
     },
     addFilter: dataTestLocator('add-filter-button'),
+    defaultValueCheck: '.ant-checkbox-checked',
   },
   filtersPanel: {
     filterName: dataTestLocator('filters-config-modal__name-input'),
@@ -339,6 +340,7 @@ export const nativeFilters = {
     expand: dataTestLocator('filter-bar__expand-button'),
     collapse: dataTestLocator('filter-bar__collapse-button'),
     filterName: dataTestLocator('filter-control-name'),
+    filterContent: '.ant-select-selection-item-content',
   },
   createFilterButton: dataTestLocator('filter-bar__create-filter'),
   removeFilter: '[aria-label="remove"]',

superset-frontend/cypress-base/cypress/utils/parsePostForm.ts

@@ -22,7 +22,7 @@
 export default function parsePostForm(requestBody: ArrayBuffer) {
   type ParsedFields = Record<string, string[] | string>;
   if (requestBody.constructor.name !== 'ArrayBuffer') {
-    return (requestBody as unknown) as ParsedFields;
+    return requestBody as unknown as ParsedFields;
   }
   const lines = new TextDecoder('utf-8').decode(requestBody).split('\n');
   const fields: ParsedFields = {};