superset-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccwilli...@apache.org
Subject [incubator-superset] branch master updated: allow 7 tabs, remove 'slice_' prefix in logs (#5411)
Date Tue, 17 Jul 2018 20:20:22 GMT
This is an automated email from the ASF dual-hosted git repository.

ccwilliams pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git


The following commit(s) were added to refs/heads/master by this push:
     new 7670e0c  allow 7 tabs, remove 'slice_' prefix in logs (#5411)
7670e0c is described below

commit 7670e0c56515d2429f827be8b593dd4321196513
Author: Chris Williams <williaster@users.noreply.github.com>
AuthorDate: Tue Jul 17 13:20:19 2018 -0700

    allow 7 tabs, remove 'slice_' prefix in logs (#5411)
---
 superset/assets/src/chart/Chart.jsx                              | 2 +-
 superset/assets/src/chart/chartAction.js                         | 4 ++--
 superset/assets/src/dashboard/components/gridComponents/Tabs.jsx | 2 +-
 superset/assets/src/dashboard/deprecated/chart/chartAction.js    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/superset/assets/src/chart/Chart.jsx b/superset/assets/src/chart/Chart.jsx
index fa6d9e6..ecedd41 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 821b410..22de6b8 100644
--- 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
index 01c0e60..1bf6e3e 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,
diff --git a/superset/assets/src/dashboard/deprecated/chart/chartAction.js b/superset/assets/src/dashboard/deprecated/chart/chartAction.js
index 52f9c47..254f1d6 100644
--- 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,


Mime
View raw message