Merge branch 'master' of github.com:koszti/superset into cancel-db-qu…

…ery-on-stop

RELEASING/README.md

@@ -199,6 +199,7 @@ Now let's ship this RC into svn's dev folder
 cd ~/svn/superset_dev/
 svn add ${SUPERSET_VERSION_RC}
 svn commit -m "Release ${SUPERSET_VERSION_RC}"
+svn update
 ```
 
 ### Build and test from SVN source tarball
@@ -272,6 +273,7 @@ cd ~/svn/superset/
 for f in ${SUPERSET_VERSION}/*; do mv "$f" "${f/${SUPERSET_VERSION_RC}/${SUPERSET_VERSION}}"; done
 svn add ${SUPERSET_VERSION}
 svn commit -m "Release ${SUPERSET_VERSION}"
+svn update
 ```
 
 Then tag the final release:

docs/src/pages/docs/Connecting to Databases/dremio.mdx

@@ -14,7 +14,7 @@ The recommended connector library for Dremio is
 The expected connection string for ODBC (Default port is 31010) is formatted as follows:
 
 ```
-dremio://{username}:{password}@{host}:{port}/dremio
+dremio://{username}:{password}@{host}:{port}/{database_name}/dremio?SSL=1
 ```
 The expected connection string for Arrow Flight (Dremio 4.9.1+. Default port is 32010) is formatted as follows:
 

helm/superset/Chart.yaml

@@ -22,7 +22,7 @@ maintainers:
   - name: craig-rueda
     email: [email protected]
     url: https://github.com/craig-rueda
-version: 0.3.2
+version: 0.3.4
 dependencies:
 - name: postgresql
   version: 10.2.0

helm/superset/templates/deployment-worker.yaml

@@ -80,9 +80,9 @@ spec:
             - secretRef:
                 name: {{ tpl .Values.envFromSecret . | quote }}
             {{- range .Values.envFromSecrets }}
-          - secretRef:
-              name: {{ tpl . $ | quote }}
-          {{- end }}
+            - secretRef:
+                name: {{ tpl . $ | quote }}
+            {{- end }}
           volumeMounts:
             - name: superset-config
               mountPath: {{ .Values.configMountPath | quote }}

helm/superset/templates/deployment.yaml

@@ -83,9 +83,9 @@ spec:
             - secretRef:
                 name: {{ tpl .Values.envFromSecret . | quote }}
             {{- range .Values.envFromSecrets }}
-          - secretRef:
-              name: {{ tpl . $ | quote }}
-          {{- end }}
+            - secretRef:
+                name: {{ tpl . $ | quote }}
+            {{- end }}
           volumeMounts:
             - name: superset-config
               mountPath: {{ .Values.configMountPath | quote }}

helm/superset/templates/ingress.yaml

@@ -16,7 +16,6 @@
 #
 {{ if .Values.ingress.enabled -}}
 {{- $fullName := include "superset.fullname" . -}}
-{{- $ingressPath := .Values.ingress.path -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -46,8 +45,8 @@ spec:
     - host: {{ . }}
       http:
         paths:
-          - path: {{ .Values.ingress.path }}
-            pathType: {{ .Values.ingress.pathType }}
+          - path: {{ $.Values.ingress.path }}
+            pathType: {{ $.Values.ingress.pathType }}
             backend:
               service:
                 name: {{ $fullName }}

requirements/base.txt

@@ -62,6 +62,8 @@ decorator==4.4.2
     # via retry
 defusedxml==0.6.0
     # via python3-openid
+deprecation==2.1.0
+    # via apache-superset
 dnspython==2.0.0
     # via email-validator
 email-validator==1.1.1

setup.py

@@ -74,6 +74,7 @@ def get_git_sha():
         "croniter>=0.3.28",
         "cron-descriptor",
         "cryptography>=3.3.2",
+        "deprecation>=2.1.0, <2.2.0",
         "flask>=1.1.0, <2.0.0",
         "flask-appbuilder>=3.3.0, <4.0.0",
         "flask-caching>=1.10.0",
@@ -84,6 +85,7 @@ def get_git_sha():
         "geopy",
         "graphlib-backport",
         "gunicorn>=20.0.2, <20.1",
+        "holidays==0.10.3",  # PINNED! https://github.com/dr-prodigy/python-holidays/issues/406
         "humanize",
         "itsdangerous>=1.0.0, <2.0.0",
         "isodate",
@@ -94,6 +96,7 @@ def get_git_sha():
         "pathlib2",
         "pgsanity",
         "polyline",
+        "pyparsing>=2.4.7, <3.0.0",
         "python-dateutil",
         "python-dotenv",
         "python-geohash",

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

@@ -63,7 +63,7 @@ describe('Dashboard top-level controls', () => {
     // should allow force refresh
     WORLD_HEALTH_CHARTS.forEach(waitForChartLoad);
     getChartAliasesBySpec(WORLD_HEALTH_CHARTS).then(aliases => {
-      cy.get('[data-test="more-horiz"]').click();
+      cy.get('[aria-label="more-horiz"]').click();
       cy.get('[data-test="refresh-dashboard-menu-item"]').should(
         'not.have.class',
         'ant-dropdown-menu-item-disabled',
@@ -92,7 +92,7 @@ describe('Dashboard top-level controls', () => {
         });
       });
     });
-    cy.get('[data-test="more-horiz"]').click();
+    cy.get('[aria-label="more-horiz"]').click();
     cy.get('[data-test="refresh-dashboard-menu-item"]').and(
       'not.have.class',
       'ant-dropdown-menu-item-disabled',

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

@@ -38,7 +38,7 @@ describe('Dashboard filter', () => {
       cy.get('.Select__placeholder:first').click();
 
       // should show the filter indicator
-      cy.get('svg[data-test="filter"]:visible').should(nodes => {
+      cy.get('span[aria-label="filter"]:visible').should(nodes => {
         expect(nodes.length).to.least(9);
       });
 
@@ -50,7 +50,7 @@ describe('Dashboard filter', () => {
       cy.get('.Select__menu').first().contains('South Asia').click();
 
       // should still have all filter indicators
-      cy.get('svg[data-test="filter"]:visible').should(nodes => {
+      cy.get('span[aria-label="filter"]:visible').should(nodes => {
         expect(nodes.length).to.least(9);
       });
 

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

@@ -35,7 +35,7 @@ describe('Dashboard edit markdown', () => {
 
     // lazy load - need to open dropdown for the scripts to load
     cy.get('[data-test="dashboard-header"]')
-      .find('[data-test="more-horiz"]')
+      .find('[aria-label="more-horiz"]')
       .click();
     cy.get('script').then(nodes => {
       // load 5 new script chunks for css editor

superset-frontend/cypress-base/cypress/integration/dashboard/save.test.js

@@ -42,7 +42,7 @@ describe('Dashboard save action', () => {
           'copyRequest',
         );
 
-        cy.get('[data-test="more-horiz"]').trigger('click', { force: true });
+        cy.get('[aria-label="more-horiz"]').trigger('click', { force: true });
         cy.get('[data-test="save-as-menu-item"]').trigger('click', {
           force: true,
         });

superset-frontend/src/components/ListViewCard/index.tsx

@@ -137,7 +137,7 @@ interface LinkProps {
 }
 
 const AnchorLink: React.FC<LinkProps> = ({ to, children }) => (
-  <a href={to}>{children}</a>
+  <a {...(to ? { href: to } : {})}>{children}</a>
 );
 
 interface CardProps {

superset-frontend/src/components/PopoverSection/index.tsx

@@ -19,7 +19,7 @@
 import React, { MouseEventHandler, ReactNode } from 'react';
 import { useTheme } from '@superset-ui/core';
 import { Tooltip } from 'src/components/Tooltip';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 
 export interface PopoverSectionProps {
   title: string;
@@ -57,19 +57,17 @@ export default function PopoverSection({
         <strong data-test="popover-title">{title}</strong>
         {info && (
           <Tooltip title={info} css={{ marginLeft: theme.gridUnit }}>
-            <Icon
+            <Icons.InfoSolidSmall
               role="img"
-              name="info-solid"
               width={14}
               height={14}
-              color={theme.colors.grayscale.light1}
+              iconColor={theme.colors.grayscale.light1}
             />
           </Tooltip>
         )}
-        <Icon
+        <Icons.Check
           role="img"
-          name="check"
-          color={
+          iconColor={
             isSelected ? theme.colors.primary.base : theme.colors.grayscale.base
           }
         />

superset-frontend/src/components/SearchInput/SearchInput.test.jsx

@@ -17,7 +17,8 @@
  * under the License.
  */
 import React from 'react';
-import { shallow } from 'enzyme';
+import { mount } from 'enzyme';
+import { ThemeProvider, supersetTheme } from '@superset-ui/core';
 
 import SearchInput from 'src/components/SearchInput';
 
@@ -31,7 +32,11 @@ describe('SearchInput', () => {
 
   const factory = overrideProps => {
     const props = { ...defaultProps, ...(overrideProps || {}) };
-    return shallow(<SearchInput {...props} />);
+    return mount(
+      <ThemeProvider theme={supersetTheme}>
+        <SearchInput {...props} />
+      </ThemeProvider>,
+    );
   };
 
   let wrapper;
@@ -53,6 +58,7 @@ describe('SearchInput', () => {
   const typeSearchInput = value => {
     wrapper
       .find('[data-test="search-input"]')
+      .first()
       .props()
       .onChange({ currentTarget: { value } });
   };
@@ -62,6 +68,7 @@ describe('SearchInput', () => {
 
     wrapper
       .find('[data-test="search-input"]')
+      .first()
       .props()
       .onKeyDown({ key: 'Enter' });
 
@@ -72,14 +79,14 @@ describe('SearchInput', () => {
   it('submits on search icon click', () => {
     typeSearchInput('bar');
 
-    wrapper.find('[data-test="search-submit"]').props().onClick();
+    wrapper.find('[data-test="search-submit"]').first().props().onClick();
 
     expect(defaultProps.onSubmit).toHaveBeenCalled();
   });
 
   it('clears on clear icon click', () => {
     const wrapper2 = factory({ value: 'fizz' });
-    wrapper2.find('[data-test="search-clear"]').props().onClick();
+    wrapper2.find('[data-test="search-clear"]').first().props().onClick();
 
     expect(defaultProps.onClear).toHaveBeenCalled();
   });

superset-frontend/src/components/SearchInput/index.tsx

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { styled } from '@superset-ui/core';
+import { styled, useTheme } from '@superset-ui/core';
 import React from 'react';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
 
 export interface SearchInputProps {
   onSubmit: () => void;
@@ -53,13 +53,13 @@ const commonStyles = `
   display: block;
   cursor: pointer;
 `;
-const SearchIcon = styled(Icon)`
+const SearchIcon = styled(Icons.Search)`
   ${commonStyles};
   top: 4px;
   left: 2px;
 `;
 
-const ClearIcon = styled(Icon)`
+const ClearIcon = styled(Icons.CancelX)`
   ${commonStyles};
   right: 0px;
   top: 4px;
@@ -73,12 +73,13 @@ export default function SearchInput({
   name,
   value,
 }: SearchInputProps) {
+  const theme = useTheme();
   return (
     <SearchInputWrapper>
       <SearchIcon
+        iconColor={theme.colors.grayscale.base}
         data-test="search-submit"
         role="button"
-        name="search"
         onClick={() => onSubmit()}
       />
       <StyledInput
@@ -98,7 +99,7 @@ export default function SearchInput({
         <ClearIcon
           data-test="search-clear"
           role="button"
-          name="cancel-x"
+          iconColor={theme.colors.grayscale.base}
           onClick={() => onClear()}
         />
       )}