allow 7 tabs, remove 'slice_' prefix in logs (apache#5411)

graceguo-supercat · Jul 17, 2018 · 7670e0c · 7670e0c
1 parent 7b4e6c7
commit 7670e0c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -146,7 +146,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,
@@ -160,7 +160,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
@@ -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,

diff --git a/superset/assets/src/dashboard/deprecated/chart/chartAction.js b/superset/assets/src/dashboard/deprecated/chart/chartAction.js
@@ -139,7 +139,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,
@@ -153,7 +153,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,