You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@superset.apache.org by GitBox <gi...@apache.org> on 2018/07/17 20:20:21 UTC
[GitHub] williaster closed pull request #5411: allow 7 tabs,
remove 'slice_' prefix in logs
williaster closed pull request #5411: allow 7 tabs, remove 'slice_' prefix in logs
URL: https://github.com/apache/incubator-superset/pull/5411
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/superset/assets/src/chart/Chart.jsx b/superset/assets/src/chart/Chart.jsx
index fa6d9e6364..ecedd413d5 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 821b410cab..22de6b8285 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 01c0e600d6..1bf6e3e1b3 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 52f9c47076..254f1d60e4 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,
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org