Merge branch 'master' into revert-16318-villebro/sqla-time-grain

apache · Oct 28, 2021 · 132c05b · 132c05b
2 parents 2b54029 + 37909aa
commit 132c05b
Show file tree

Hide file tree

Showing 30 changed files with 787 additions and 499 deletions.
diff --git a/helm/superset/Chart.yaml b/helm/superset/Chart.yaml
@@ -22,7 +22,7 @@ maintainers:
   - name: craig-rueda
     email: craig@craigrueda.com
     url: https://github.com/craig-rueda
-version: 0.3.11
+version: 0.3.12
 dependencies:
 - name: postgresql
   version: 10.2.0

diff --git a/helm/superset/templates/ingress.yaml b/helm/superset/templates/ingress.yaml
@@ -30,6 +30,9 @@ metadata:
 {{ toYaml . | indent 4 }}
 {{- end }}
 spec:
+{{- if .Values.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+{{- end }}
 {{- if .Values.ingress.tls }}
   tls:
   {{- range .Values.ingress.tls }}

diff --git a/helm/superset/values.yaml b/helm/superset/values.yaml
@@ -165,8 +165,8 @@ service:
 
 ingress:
   enabled: false
+  # ingressClassName: nginx
   annotations: {}
-    # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
     ## Extend timeout to allow long running queries.
     # nginx.ingress.kubernetes.io/proxy-connect-timeout: "300"

diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
@@ -68,35 +68,35 @@
     "@emotion/cache": "^11.4.0",
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",
-    "@superset-ui/chart-controls": "^0.18.15",
+    "@superset-ui/chart-controls": "^0.18.16",
     "@superset-ui/core": "^0.18.15",
-    "@superset-ui/legacy-plugin-chart-calendar": "^0.18.15",
-    "@superset-ui/legacy-plugin-chart-chord": "^0.18.15",
-    "@superset-ui/legacy-plugin-chart-country-map": "^0.18.15",
-    "@superset-ui/legacy-plugin-chart-event-flow": "^0.18.15",
-    "@superset-ui/legacy-plugin-chart-force-directed": "^0.18.15",
-    "@superset-ui/legacy-plugin-chart-heatmap": "^0.18.15",
-    "@superset-ui/legacy-plugin-chart-histogram": "^0.18.15",
-    "@superset-ui/legacy-plugin-chart-horizon": "^0.18.15",
-    "@superset-ui/legacy-plugin-chart-map-box": "^0.18.15",
-    "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.18.15",
-    "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.18.15",
-    "@superset-ui/legacy-plugin-chart-partition": "^0.18.15",
-    "@superset-ui/legacy-plugin-chart-pivot-table": "^0.18.15",
-    "@superset-ui/legacy-plugin-chart-rose": "^0.18.15",
-    "@superset-ui/legacy-plugin-chart-sankey": "^0.18.15",
-    "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.18.15",
-    "@superset-ui/legacy-plugin-chart-sunburst": "^0.18.15",
-    "@superset-ui/legacy-plugin-chart-treemap": "^0.18.15",
-    "@superset-ui/legacy-plugin-chart-world-map": "^0.18.15",
-    "@superset-ui/legacy-preset-chart-big-number": "^0.18.15",
-    "@superset-ui/legacy-preset-chart-deckgl": "^0.4.12",
-    "@superset-ui/legacy-preset-chart-nvd3": "^0.18.15",
-    "@superset-ui/plugin-chart-echarts": "^0.18.15",
-    "@superset-ui/plugin-chart-pivot-table": "^0.18.15",
-    "@superset-ui/plugin-chart-table": "^0.18.15",
-    "@superset-ui/plugin-chart-word-cloud": "^0.18.15",
-    "@superset-ui/preset-chart-xy": "^0.18.15",
+    "@superset-ui/legacy-plugin-chart-calendar": "^0.18.16",
+    "@superset-ui/legacy-plugin-chart-chord": "^0.18.16",
+    "@superset-ui/legacy-plugin-chart-country-map": "^0.18.16",
+    "@superset-ui/legacy-plugin-chart-event-flow": "^0.18.16",
+    "@superset-ui/legacy-plugin-chart-force-directed": "^0.18.16",
+    "@superset-ui/legacy-plugin-chart-heatmap": "^0.18.16",
+    "@superset-ui/legacy-plugin-chart-histogram": "^0.18.16",
+    "@superset-ui/legacy-plugin-chart-horizon": "^0.18.16",
+    "@superset-ui/legacy-plugin-chart-map-box": "^0.18.16",
+    "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.18.16",
+    "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.18.16",
+    "@superset-ui/legacy-plugin-chart-partition": "^0.18.16",
+    "@superset-ui/legacy-plugin-chart-pivot-table": "^0.18.16",
+    "@superset-ui/legacy-plugin-chart-rose": "^0.18.16",
+    "@superset-ui/legacy-plugin-chart-sankey": "^0.18.16",
+    "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.18.16",
+    "@superset-ui/legacy-plugin-chart-sunburst": "^0.18.16",
+    "@superset-ui/legacy-plugin-chart-treemap": "^0.18.16",
+    "@superset-ui/legacy-plugin-chart-world-map": "^0.18.16",
+    "@superset-ui/legacy-preset-chart-big-number": "^0.18.16",
+    "@superset-ui/legacy-preset-chart-deckgl": "^0.4.13",
+    "@superset-ui/legacy-preset-chart-nvd3": "^0.18.16",
+    "@superset-ui/plugin-chart-echarts": "^0.18.16",
+    "@superset-ui/plugin-chart-pivot-table": "^0.18.16",
+    "@superset-ui/plugin-chart-table": "^0.18.16",
+    "@superset-ui/plugin-chart-word-cloud": "^0.18.16",
+    "@superset-ui/preset-chart-xy": "^0.18.16",
     "@vx/responsive": "^0.0.195",
     "abortcontroller-polyfill": "^1.1.9",
     "antd": "^4.9.4",

diff --git a/superset-frontend/spec/fixtures/mockNativeFilters.ts b/superset-frontend/spec/fixtures/mockNativeFilters.ts
@@ -52,6 +52,7 @@ export const nativeFilters: NativeFiltersState = {
         inverseSelection: false,
       },
       type: NativeFilterType.NATIVE_FILTER,
+      description: '',
     },
     'NATIVE_FILTER-x9QPw0so1': {
       id: 'NATIVE_FILTER-x9QPw0so1',
@@ -81,6 +82,7 @@ export const nativeFilters: NativeFiltersState = {
         inverseSelection: false,
       },
       type: NativeFilterType.NATIVE_FILTER,
+      description: '2 letter code',
     },
   },
 };

diff --git a/superset-frontend/spec/javascripts/dashboard/fixtures/mockNativeFilters.ts b/superset-frontend/spec/javascripts/dashboard/fixtures/mockNativeFilters.ts
@@ -68,6 +68,7 @@ export const nativeFiltersInfo: NativeFiltersState = {
         isRequired: false,
       },
       type: NativeFilterType.NATIVE_FILTER,
+      description: 'test description',
     },
   },
 };
diff --git a/superset-frontend/src/components/Datasource/DatasourceEditor.jsx b/superset-frontend/src/components/Datasource/DatasourceEditor.jsx
@@ -25,7 +25,7 @@ import Card from 'src/components/Card';
 import Alert from 'src/components/Alert';
 import Badge from 'src/components/Badge';
 import shortid from 'shortid';
-import { styled, SupersetClient, t, supersetTheme } from '@superset-ui/core';
+import { styled, SupersetClient, t, withTheme } from '@superset-ui/core';
 import { Select } from 'src/components';
 import { FormLabel } from 'src/components/Form';
 import Button from 'src/components/Button';
@@ -97,7 +97,7 @@ const StyledBadge = styled(Badge)`
 `;
 
 const EditLockContainer = styled.div`
-  font-size: ${supersetTheme.typography.sizes.s}px;
+  font-size: ${({ theme }) => theme.typography.sizes.s}px;
   display: flex;
   align-items: center;
   a {
@@ -828,7 +828,7 @@ class DatasourceEditor extends React.PureComponent {
     );
   }
 
-  renderSourceFieldset() {
+  renderSourceFieldset(theme) {
     const { datasource } = this.state;
     return (
       <div>
@@ -989,13 +989,9 @@ class DatasourceEditor extends React.PureComponent {
           <EditLockContainer>
             <span role="button" tabIndex={0} onClick={this.onChangeEditMode}>
               {this.state.isEditMode ? (
-                <Icons.LockUnlocked
-                  iconColor={supersetTheme.colors.grayscale.base}
-                />
+                <Icons.LockUnlocked iconColor={theme.colors.grayscale.base} />
               ) : (
-                <Icons.LockLocked
-                  iconColor={supersetTheme.colors.grayscale.base}
-                />
+                <Icons.LockLocked iconColor={theme.colors.grayscale.base} />
               )}
             </span>
             {!this.state.isEditMode && (
@@ -1166,6 +1162,8 @@ class DatasourceEditor extends React.PureComponent {
     const { datasource, activeTabKey } = this.state;
     const { metrics } = datasource;
     const sortedMetrics = metrics?.length ? this.sortMetrics(metrics) : [];
+    const { theme } = this.props;
+
     return (
       <DatasourceContainer>
         {this.renderErrors()}
@@ -1190,7 +1188,7 @@ class DatasourceEditor extends React.PureComponent {
           defaultActiveKey={activeTabKey}
         >
           <Tabs.TabPane key={0} tab={t('Source')}>
-            {this.renderSourceFieldset()}
+            {this.renderSourceFieldset(theme)}
           </Tabs.TabPane>
           <Tabs.TabPane
             tab={
@@ -1283,4 +1281,6 @@ class DatasourceEditor extends React.PureComponent {
 DatasourceEditor.defaultProps = defaultProps;
 DatasourceEditor.propTypes = propTypes;
 
-export default withToasts(DatasourceEditor);
+const DataSourceComponent = withTheme(DatasourceEditor);
+
+export default withToasts(DataSourceComponent);