From 0a211e21b79902dbff334b94a8f029ef6384e694 Mon Sep 17 00:00:00 2001 From: Chris Williams Date: Tue, 17 Jul 2018 13:20:19 -0700 Subject: [PATCH] allow 7 tabs, remove 'slice_' prefix in logs (#5411) --- superset/assets/src/chart/Chart.jsx | 2 +- superset/assets/src/chart/chartAction.js | 4 ++-- .../assets/src/dashboard/components/gridComponents/Tabs.jsx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/superset/assets/src/chart/Chart.jsx b/superset/assets/src/chart/Chart.jsx index a2828f1b1d43c..cb862c1f087ca 100644 --- a/superset/assets/src/chart/Chart.jsx +++ b/superset/assets/src/chart/Chart.jsx @@ -190,7 +190,7 @@ class Chart extends React.PureComponent { this.props.actions.chartRenderingSucceeded(chartId); } Logger.append(LOG_ACTIONS_RENDER_CHART, { - slice_id: 'slice_' + chartId, + slice_id: chartId, viz_type: vizType, start_offset: renderStart, duration: Logger.getTimestamp() - renderStart, diff --git a/superset/assets/src/chart/chartAction.js b/superset/assets/src/chart/chartAction.js index e05c3062dd671..9a5a40da82233 100644 --- a/superset/assets/src/chart/chartAction.js +++ b/superset/assets/src/chart/chartAction.js @@ -142,7 +142,7 @@ export function runQuery(formData, force = false, timeout = 60, key) { .then(() => queryRequest) .then((queryResponse) => { Logger.append(LOG_ACTIONS_LOAD_CHART, { - slice_id: 'slice_' + key, + slice_id: key, is_cached: queryResponse.is_cached, force_refresh: force, row_count: queryResponse.rowcount, @@ -156,7 +156,7 @@ export function runQuery(formData, force = false, timeout = 60, key) { }) .catch((err) => { Logger.append(LOG_ACTIONS_LOAD_CHART, { - slice_id: 'slice_' + key, + slice_id: key, has_err: true, datasource: formData.datasource, start_offset: logStart, diff --git a/superset/assets/src/dashboard/components/gridComponents/Tabs.jsx b/superset/assets/src/dashboard/components/gridComponents/Tabs.jsx index 01c0e600d6082..1bf6e3e1b3183 100644 --- a/superset/assets/src/dashboard/components/gridComponents/Tabs.jsx +++ b/superset/assets/src/dashboard/components/gridComponents/Tabs.jsx @@ -13,7 +13,7 @@ import { RENDER_TAB, RENDER_TAB_CONTENT } from './Tab'; import { TAB_TYPE } from '../../util/componentTypes'; const NEW_TAB_INDEX = -1; -const MAX_TAB_COUNT = 5; +const MAX_TAB_COUNT = 7; const propTypes = { id: PropTypes.string.isRequired,