-
+ {o.object.name &&
}
+ {o.object[formData.line_column] && (
+
+ )}
{formData.metric && (
)}
@@ -103,8 +106,9 @@ export function getLayer(formData, payload, onAddFilter, setTooltip, selected, o
return baseColor;
};
+
const tooltipContentGenerator =
- fd.line_column && fd.metric && ['geohash', 'zipcode'].includes(fd.line_type)
+ fd.line_column && fd.metric && ['json', 'geohash', 'zipcode'].includes(fd.line_type)
? setTooltipContent(fd)
: undefined;
@@ -132,17 +136,17 @@ const propTypes = {
setControlValue: PropTypes.func.isRequired,
viewport: PropTypes.object.isRequired,
onAddFilter: PropTypes.func,
- setTooltip: PropTypes.func,
width: PropTypes.number.isRequired,
height: PropTypes.number.isRequired,
};
const defaultProps = {
onAddFilter() {},
- setTooltip() {},
};
class DeckGLPolygon extends React.Component {
+ containerRef = React.createRef();
+
constructor(props) {
super(props);
@@ -245,7 +249,7 @@ class DeckGLPolygon extends React.Component {
this.props.formData,
this.props.payload,
this.props.onAddFilter,
- this.props.setTooltip,
+ this.setTooltip,
this.state.selected,
this.onSelect,
filters,
@@ -254,6 +258,12 @@ class DeckGLPolygon extends React.Component {
return [layer];
}
+ setTooltip = tooltip => {
+ if (this.containerRef.current) {
+ this.containerRef.current.setTooltip(tooltip);
+ }
+ };
+
render() {
const { payload, formData, setControlValue } = this.props;
const { start, end, getStep, values, disabled, viewport } = this.state;
@@ -267,6 +277,7 @@ class DeckGLPolygon extends React.Component {
return (
),
storyName: 'Basic',
- storyPath: 'legacy-|preset-chart-deckgl|ArcChartPlugin',
+ storyPath: 'legacy-preset-chart-deckgl|ArcChartPlugin',
},
];
diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Grid/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Grid/Stories.tsx
index 3ed2c1bcb2..864377c381 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Grid/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Grid/Stories.tsx
@@ -47,6 +47,6 @@ export default [
/>
),
storyName: 'Basic',
- storyPath: 'legacy-|preset-chart-deckgl|GridChartPlugin',
+ storyPath: 'legacy-preset-chart-deckgl|GridChartPlugin',
},
];
diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Hex/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Hex/Stories.tsx
index 9d135bfb8b..f7563a9da4 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Hex/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Hex/Stories.tsx
@@ -48,6 +48,6 @@ export default [
/>
),
storyName: 'Basic',
- storyPath: 'legacy-|preset-chart-deckgl|HexChartPlugin',
+ storyPath: 'legacy-preset-chart-deckgl|HexChartPlugin',
},
];
diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Path/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Path/Stories.tsx
index e3ce68b208..1c1556a844 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Path/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Path/Stories.tsx
@@ -56,6 +56,6 @@ export default [
/>
),
storyName: 'Basic',
- storyPath: 'legacy-|preset-chart-deckgl|PathChartPlugin',
+ storyPath: 'legacy-preset-chart-deckgl|PathChartPlugin',
},
];
diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Polygon/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Polygon/Stories.tsx
index 66c3a2bb5c..64d648f4be 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Polygon/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Polygon/Stories.tsx
@@ -26,7 +26,7 @@ export default [
line_column: 'contour',
line_type: 'json',
adhoc_filters: [],
- metric: 'count',
+ metric: 'population',
point_radius_fixed: { type: 'fix', value: 1000 },
row_limit: 10000,
reverse_long_lat: false,
@@ -71,7 +71,7 @@ export default [
/>
),
storyName: 'Basic',
- storyPath: 'legacy-|preset-chart-deckgl|PolygonChartPlugin',
+ storyPath: 'legacy-preset-chart-deckgl|PolygonChartPlugin',
},
{
renderStory: () => (
@@ -119,6 +119,6 @@ export default [
/>
),
storyName: 'Single Polygon in geojson format',
- storyPath: 'legacy-|preset-chart-deckgl|PolygonChartPlugin',
+ storyPath: 'legacy-preset-chart-deckgl|PolygonChartPlugin',
},
];
diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Polygon/geojsonPayload.js b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Polygon/geojsonPayload.js
index 765abed3ac..d9006e8976 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Polygon/geojsonPayload.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Polygon/geojsonPayload.js
@@ -82,7 +82,8 @@ export default {
data: {
features: [
{
- count: 1,
+ count: 10,
+ name: 'Test',
polygon: {
type: 'Feature',
properties: {},
diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Scatter/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Scatter/Stories.tsx
index 54a529b2b6..9383035844 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Scatter/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Scatter/Stories.tsx
@@ -55,6 +55,6 @@ export default [
/>
),
storyName: 'Basic',
- storyPath: 'legacy-|preset-chart-deckgl|ScatterChartPlugin',
+ storyPath: 'legacy-preset-chart-deckgl|ScatterChartPlugin',
},
];
diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Screengrid/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Screengrid/Stories.tsx
index ff57a64e8d..d9a2458173 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Screengrid/Stories.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Screengrid/Stories.tsx
@@ -46,6 +46,6 @@ export default [
/>
),
storyName: 'Basic',
- storyPath: 'legacy-|preset-chart-deckgl|ScreengridChartPlugin',
+ storyPath: 'legacy-preset-chart-deckgl|ScreengridChartPlugin',
},
];
diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/yarn.lock b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/yarn.lock
index 8467a798b3..80583a3bbf 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/yarn.lock
+++ b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/yarn.lock
@@ -6831,6 +6831,11 @@ cssesc@^3.0.0:
resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
+cssfilter@0.0.10:
+ version "0.0.10"
+ resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae"
+ integrity sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4=
+
csso@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/csso/-/csso-4.0.2.tgz#e5f81ab3a56b8eefb7f0092ce7279329f454de3d"
@@ -17859,6 +17864,14 @@ xmlhttprequest@1:
resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc"
integrity sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=
+xss@^1.0.6:
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.6.tgz#eaf11e9fc476e3ae289944a1009efddd8a124b51"
+ integrity sha512-6Q9TPBeNyoTRxgZFk5Ggaepk/4vUOYdOsIUYvLehcsIZTFjaavbVnsuAkLA5lIFuug5hw8zxcB9tm01gsjph2A==
+ dependencies:
+ commander "^2.9.0"
+ cssfilter "0.0.10"
+
xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
version "4.0.2"
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"