Merge branch 'master' into fix_import_examples

apache · Aug 26, 2021 · 773ca06 · 773ca06
2 parents 45ff724 + ac1d779
commit 773ca06
Show file tree

Hide file tree

Showing 61 changed files with 385 additions and 245 deletions.
diff --git a/.pylintrc b/.pylintrc
@@ -86,6 +86,9 @@ disable=
     missing-docstring,
     too-many-lines,
     duplicate-code,
+    unspecified-encoding,
+    # re-enable once this no longer raises false positives
+    too-many-instance-attributes
 
 [REPORTS]
 

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -106,7 +106,7 @@ This statement thanks the following, on which it draws for content and inspirati
 
 # Slack Community Guidelines
 
-If you decide to join the [Community Slack](https://join.slack.com/t/apache-superset/shared_invite/zt-l5f5e0av-fyYu8tlfdqbMdz_sPLwUqQ), please adhere to the following rules:
+If you decide to join the [Community Slack](https://join.slack.com/t/apache-superset/shared_invite/zt-uxbh5g36-AISUtHbzOXcu0BIj7kgUaw), please adhere to the following rules:
 
 **1. Treat everyone in the community with respect.**
 

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ under the License.
 [![PyPI version](https://badge.fury.io/py/apache-superset.svg)](https://badge.fury.io/py/apache-superset)
 [![Coverage Status](https://codecov.io/github/apache/superset/coverage.svg?branch=master)](https://codecov.io/github/apache/superset)
 [![PyPI](https://img.shields.io/pypi/pyversions/apache-superset.svg?maxAge=2592000)](https://pypi.python.org/pypi/apache-superset)
-[![Get on Slack](https://img.shields.io/badge/slack-join-orange.svg)](https://join.slack.com/t/apache-superset/shared_invite/zt-l5f5e0av-fyYu8tlfdqbMdz_sPLwUqQ)
+[![Get on Slack](https://img.shields.io/badge/slack-join-orange.svg)](https://join.slack.com/t/apache-superset/shared_invite/zt-uxbh5g36-AISUtHbzOXcu0BIj7kgUaw)
 [![Documentation](https://img.shields.io/badge/docs-apache.org-blue.svg)](https://superset.apache.org)
 [![Dependencies Status](https://david-dm.org/apache/superset/status.svg?path=superset-frontend)](https://david-dm.org/apache/superset?path=superset-frontend)
 
@@ -136,7 +136,7 @@ Want to add support for your datastore or data engine? Read more [here](https://
 ## Get Involved
 
 - Ask and answer questions on [StackOverflow](https://stackoverflow.com/questions/tagged/apache-superset) using the **apache-superset** tag
-- [Join our community's Slack](https://join.slack.com/t/apache-superset/shared_invite/zt-l5f5e0av-fyYu8tlfdqbMdz_sPLwUqQ)
+- [Join our community's Slack](https://join.slack.com/t/apache-superset/shared_invite/zt-uxbh5g36-AISUtHbzOXcu0BIj7kgUaw)
   and please read our [Slack Community Guidelines](https://github.com/apache/superset/blob/master/CODE_OF_CONDUCT.md#slack-community-guidelines)
 - [Join our dev@superset.apache.org Mailing list](https://lists.apache.org/list.html?dev@superset.apache.org)
 

diff --git a/docs/src/pages/community.tsx b/docs/src/pages/community.tsx
@@ -26,7 +26,7 @@ import { pmc } from '../resources/data';
 
 const links = [
   [
-    'https://join.slack.com/t/apache-superset/shared_invite/zt-l5f5e0av-fyYu8tlfdqbMdz_sPLwUqQ',
+    'https://join.slack.com/t/apache-superset/shared_invite/zt-uxbh5g36-AISUtHbzOXcu0BIj7kgUaw',
     'Slack',
     'interact with other Superset users and community members',
   ],

diff --git a/docs/src/pages/docs/Connecting to Databases/index.mdx b/docs/src/pages/docs/Connecting to Databases/index.mdx
@@ -69,5 +69,5 @@ exists, please file an issue on the
 supporting it.
 
 [StackOverflow](https://stackoverflow.com/questions/tagged/apache-superset+superset) and the
-[Superset community Slack](https://join.slack.com/t/apache-superset/shared_invite/zt-l5f5e0av-fyYu8tlfdqbMdz_sPLwUqQ)
+[Superset community Slack](https://join.slack.com/t/apache-superset/shared_invite/zt-uxbh5g36-AISUtHbzOXcu0BIj7kgUaw)
 are great places to get help with connecting to databases in Superset.
diff --git a/docs/src/pages/docs/contributing-page.mdx b/docs/src/pages/docs/contributing-page.mdx
@@ -11,7 +11,7 @@ The core contributors (or committers) to Superset communicate primarily in the f
 which you can join):
 
 - [Mailing list](https://lists.apache.org/list.html?dev@superset.apache.org)
-- [Apache Superset Slack community](https://join.slack.com/t/apache-superset/shared_invite/zt-l5f5e0av-fyYu8tlfdqbMdz_sPLwUqQ)
+- [Apache Superset Slack community](https://join.slack.com/t/apache-superset/shared_invite/zt-uxbh5g36-AISUtHbzOXcu0BIj7kgUaw)
 - [Github issues and PR's](https://github.com/apache/superset/issues)
 
 If you're interested in contributing, we recommend reading the Community Contribution Guide

diff --git a/requirements/testing.in b/requirements/testing.in
@@ -28,7 +28,7 @@ openpyxl
 parameterized
 pyfakefs
 pyhive[presto]>=0.6.3
-pylint==2.6.0
+pylint==2.10.2
 pytest
 pytest-cov
 statsd

diff --git a/requirements/testing.txt b/requirements/testing.txt
@@ -1,4 +1,4 @@
-# SHA1:5bfcfb5d0ab31dd532ce58caa2aab91d6807b123
+# SHA1:59e47200215ca4695f09e03a773e1a6f310f78da
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -11,7 +11,7 @@
     # via -r requirements/base.in
 appnope==0.1.2
     # via ipython
-astroid==2.6.6
+astroid==2.7.2
     # via pylint
 backcall==0.2.0
     # via ipython
@@ -71,7 +71,7 @@ pyhive[hive,presto]==0.6.4
     # via
     #   -r requirements/development.in
     #   -r requirements/testing.in
-pylint==2.9.6
+pylint==2.10.2
     # via -r requirements/testing.in
 pytest==6.2.4
     # via

diff --git a/superset-frontend/spec/javascripts/explore/components/SaveModal_spec.jsx b/superset-frontend/spec/javascripts/explore/components/SaveModal_spec.jsx
@@ -42,14 +42,16 @@ describe('SaveModal', () => {
       dashboards: [],
     },
     explore: {
-      can_overwrite: true,
-      user_id: '1',
       datasource: {},
       slice: {
         slice_id: 1,
         slice_name: 'title',
+        owners: [1],
       },
       alert: null,
+      user: {
+        userId: 1,
+      },
     },
   };
   const store = mockStore(initialState);
@@ -104,7 +106,7 @@ describe('SaveModal', () => {
 
   it('disable overwrite option for non-owner', () => {
     const wrapperForNonOwner = getWrapper();
-    wrapperForNonOwner.setProps({ can_overwrite: false });
+    wrapperForNonOwner.setProps({ userId: 2 });
     const overwriteRadio = wrapperForNonOwner.find('#overwrite-radio');
     expect(overwriteRadio).toHaveLength(1);
     expect(overwriteRadio.prop('disabled')).toBe(true);

diff --git a/superset-frontend/src/components/Select/Select.tsx b/superset-frontend/src/components/Select/Select.tsx
@@ -47,7 +47,6 @@ type PickedSelectProps = Pick<
   AntdSelectAllProps,
   | 'allowClear'
   | 'autoFocus'
-  | 'value'
   | 'disabled'
   | 'filterOption'
   | 'notFoundContent'

diff --git a/superset-frontend/src/dashboard/types.ts b/superset-frontend/src/dashboard/types.ts
@@ -57,12 +57,15 @@ export type DashboardLayoutState = { present: DashboardLayout };
 export type DashboardState = {
   preselectNativeFilters?: JsonObject;
   editMode: boolean;
+  isPublished: boolean;
   directPathToChild: string[];
   activeTabs: ActiveTabs;
   fullSizeChartId: number | null;
   isRefreshing: boolean;
+  hasUnsavedChanges: boolean;
 };
 export type DashboardInfo = {
+  id: number;
   common: {
     flash_messages: string[];
     conf: JsonObject;

diff --git a/superset-frontend/src/explore/components/Control.tsx b/superset-frontend/src/explore/components/Control.tsx
@@ -18,6 +18,7 @@
  */
 import React, { ReactNode, useCallback, useState } from 'react';
 import { ControlType } from '@superset-ui/chart-controls';
+import { ControlComponentProps as BaseControlComponentProps } from '@superset-ui/chart-controls/lib/shared-controls/components/types';
 import { JsonValue, QueryFormData } from '@superset-ui/core';
 import ErrorBoundary from 'src/components/ErrorBoundary';
 import { ExploreActions } from 'src/explore/actions/exploreActions';
@@ -43,6 +44,13 @@ export type ControlProps = {
   renderTrigger?: boolean;
 };
 
+/**
+ *
+ */
+export type ControlComponentProps<
+  ValueType extends JsonValue = JsonValue
+> = Omit<ControlProps, 'value'> & BaseControlComponentProps<ValueType>;
+
 export default function Control(props: ControlProps) {
   const {
     actions: { setControlValue },

diff --git a/superset-frontend/src/explore/components/ControlHeader.jsx b/superset-frontend/src/explore/components/ControlHeader.jsx
@@ -26,8 +26,8 @@ import Icons from 'src/components/Icons';
 
 const propTypes = {
   name: PropTypes.string,
-  label: PropTypes.string,
-  description: PropTypes.string,
+  label: PropTypes.node,
+  description: PropTypes.node,
   validationErrors: PropTypes.array,
   renderTrigger: PropTypes.bool,
   rightNode: PropTypes.node,

diff --git a/superset-frontend/src/explore/components/DataTablesPane/index.tsx b/superset-frontend/src/explore/components/DataTablesPane/index.tsx
@@ -224,7 +224,7 @@ export const DataTablesPane = ({
   }, [queryFormData.adhoc_filters, queryFormData.datasource]);
 
   useEffect(() => {
-    if (queriesResponse) {
+    if (queriesResponse && chartStatus === 'success') {
       const { colnames } = queriesResponse[0];
       setColumnNames([...colnames]);
     }

diff --git a/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanel.test.tsx b/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanel.test.tsx
@@ -45,7 +45,7 @@ const datasource = {
   datasource_name: 'table1',
   description: 'desc',
 };
-const props = {
+const props: DatasourcePanelProps = {
   datasource,
   controls: {
     datasource: {
@@ -57,12 +57,7 @@ const props = {
     },
   },
   actions: {
-    setControlValue: () => ({
-      type: 'type',
-      controlName: 'control',
-      value: 'val',
-      validationErrors: [],
-    }),
+    setControlValue: jest.fn(),
   },
 };
 

diff --git a/superset-frontend/src/explore/components/DatasourcePanel/index.tsx b/superset-frontend/src/explore/components/DatasourcePanel/index.tsx
@@ -16,13 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, {
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { ControlConfig, DatasourceMeta } from '@superset-ui/chart-controls';
 import { debounce } from 'lodash';
 import { matchSorter, rankings } from 'match-sorter';
@@ -193,60 +187,61 @@ export default function DataSourcePanel({
   const DEFAULT_MAX_COLUMNS_LENGTH = 50;
   const DEFAULT_MAX_METRICS_LENGTH = 50;
 
-  const search = useCallback(
-    debounce((value: string) => {
-      if (value === '') {
-        setList({ columns, metrics });
-        return;
-      }
-      setList({
-        columns: matchSorter(columns, value, {
-          keys: [
-            {
-              key: 'verbose_name',
-              threshold: rankings.CONTAINS,
-            },
-            {
-              key: 'column_name',
-              threshold: rankings.CONTAINS,
-            },
-            {
-              key: item =>
-                [item.description, item.expression].map(
-                  x => x?.replace(/[_\n\s]+/g, ' ') || '',
-                ),
-              threshold: rankings.CONTAINS,
-              maxRanking: rankings.CONTAINS,
-            },
-          ],
-          keepDiacritics: true,
-        }),
-        metrics: matchSorter(metrics, value, {
-          keys: [
-            {
-              key: 'verbose_name',
-              threshold: rankings.CONTAINS,
-            },
-            {
-              key: 'metric_name',
-              threshold: rankings.CONTAINS,
-            },
-            {
-              key: item =>
-                [item.description, item.expression].map(
-                  x => x?.replace(/[_\n\s]+/g, ' ') || '',
-                ),
-              threshold: rankings.CONTAINS,
-              maxRanking: rankings.CONTAINS,
-            },
-          ],
-          keepDiacritics: true,
-          baseSort: (a, b) =>
-            Number(b.item.is_certified) - Number(a.item.is_certified) ||
-            String(a.rankedValue).localeCompare(b.rankedValue),
-        }),
-      });
-    }, FAST_DEBOUNCE),
+  const search = useMemo(
+    () =>
+      debounce((value: string) => {
+        if (value === '') {
+          setList({ columns, metrics });
+          return;
+        }
+        setList({
+          columns: matchSorter(columns, value, {
+            keys: [
+              {
+                key: 'verbose_name',
+                threshold: rankings.CONTAINS,
+              },
+              {
+                key: 'column_name',
+                threshold: rankings.CONTAINS,
+              },
+              {
+                key: item =>
+                  [item.description, item.expression].map(
+                    x => x?.replace(/[_\n\s]+/g, ' ') || '',
+                  ),
+                threshold: rankings.CONTAINS,
+                maxRanking: rankings.CONTAINS,
+              },
+            ],
+            keepDiacritics: true,
+          }),
+          metrics: matchSorter(metrics, value, {
+            keys: [
+              {
+                key: 'verbose_name',
+                threshold: rankings.CONTAINS,
+              },
+              {
+                key: 'metric_name',
+                threshold: rankings.CONTAINS,
+              },
+              {
+                key: item =>
+                  [item.description, item.expression].map(
+                    x => x?.replace(/[_\n\s]+/g, ' ') || '',
+                  ),
+                threshold: rankings.CONTAINS,
+                maxRanking: rankings.CONTAINS,
+              },
+            ],
+            keepDiacritics: true,
+            baseSort: (a, b) =>
+              Number(b.item.is_certified) - Number(a.item.is_certified) ||
+              String(a.rankedValue).localeCompare(b.rankedValue),
+          }),
+        });
+      }, FAST_DEBOUNCE),
     [columns, metrics],
   );
 

diff --git a/superset-frontend/src/explore/components/ExploreViewContainer.jsx b/superset-frontend/src/explore/components/ExploreViewContainer.jsx
@@ -620,7 +620,6 @@ function mapStateToProps(state) {
     timeout: explore.common.conf.SUPERSET_WEBSERVER_TIMEOUT,
     ownState: dataMask[form_data.slice_id ?? 0]?.ownState, // 0 - unsaved chart
     impressionId,
-    userId: explore.user_id,
     user: explore.user,
     reports,
   };

diff --git a/superset-frontend/src/explore/components/PropertiesModal/index.tsx b/superset-frontend/src/explore/components/PropertiesModal/index.tsx
@@ -175,7 +175,7 @@ export default function PropertiesModal({
             buttonStyle="primary"
             // @ts-ignore
             onClick={onSubmit}
-            disabled={!owners || submitting || !name}
+            disabled={submitting || !name}
             cta
           >
             {t('Save')}