williaster commented on a change in pull request #5718: [SIP-5] Refactor and
repair partition
URL:
https://github.com/apache/incubator-superset/pull/5718#discussion_r213812059
##########
File path: superset/assets/src/visualizations/partition.js
##########
@@ -33,36 +28,87 @@ function init(root) {
return flat;
}
+// Declare PropTypes for recursive data structures
+// https://github.com/facebook/react/issues/5676
+const lazyFunction = f => (() => f().apply(this, arguments));
+ const leafType = PropTypes.shape({
+ name: PropTypes.string,
+ val: PropTypes.number.isRequired,
+});
+ const parentShape = {
+ name: PropTypes.string,
+ val: PropTypes.number.isRequired,
+ children: PropTypes.arrayOf(PropTypes.oneOfType([
+ PropTypes.shape(lazyFunction(() => parentShape)),
+ leafType,
+ ])),
+};
+ const nodeType = PropTypes.oneOfType([
+ PropTypes.shape(parentShape),
+ leafType,
+]);
+
+const propTypes = {
+ data: PropTypes.arrayOf(nodeType), // array of rootNode
+ width: PropTypes.number,
+ height: PropTypes.number,
+ colorScheme: PropTypes.string,
+ dateTimeFormat: PropTypes.string,
+ equalDateSize: PropTypes.bool,
+ groupBy: PropTypes.arrayOf(PropTypes.string),
+ logScale: PropTypes.bool,
+ metrics: PropTypes.arrayOf(PropTypes.oneOfType([
+ PropTypes.string,
+ PropTypes.object,
+ ])),
+ numberFormat: PropTypes.string,
+ partitionLimit: PropTypes.number,
+ partitionThreshold: PropTypes.number,
+ richTooltip: PropTypes.bool,
+ timeSeriesOption: PropTypes.string,
+ verboseMap: PropTypes.object,
+};
+
// This vis is based on
// http://mbostock.github.io/d3/talk/20111018/partition.html
-function partitionVis(slice, payload) {
- const data = payload.data;
- const fd = slice.formData;
- const div = d3.select(slice.selector);
- const metrics = fd.metrics || [];
+function Icicle(element, props) {
+ PropTypes.checkPropTypes(propTypes, props, 'prop', 'Icicle');
+
+ const {
+ width,
+ height,
+ data,
+ colorScheme,
+ dateTimeFormat,
+ equalDateSize,
+ groupBy,
+ logScale = false,
+ metrics = [],
+ numberFormat,
+ partitionLimit,
+ partitionThreshold,
+ richTooltip,
+ timeSeriesOption = 'not_time',
+ verboseMap,
+ } = props;
+
+ const div = d3.select(element);
// Chart options
- const logScale = fd.log_scale || false;
- const chartType = fd.time_series_option || 'not_time';
+ const chartType = timeSeriesOption;
const hasTime = ['adv_anal', 'time_series'].indexOf(chartType) >= 0;
- const format = d3.format(fd.number_format);
- const timeFormat = d3TimeFormatPreset(fd.date_time_format);
+ const format = d3.format(numberFormat);
+ const timeFormat = d3TimeFormatPreset(dateTimeFormat);
div.selectAll('*').remove();
- d3.selectAll('.nvtooltip').remove();
- const tooltip = d3
- .select('body')
+ const tooltip = div
.append('div')
- .attr('class', 'nvtooltip')
Review comment:
👏
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
