Skip to content

[explore] remove 'SQL Clauses' section when using Druid #2449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mistercrunch merged 1 commit into from
Mar 22, 2017
Merged

[explore] remove 'SQL Clauses' section when using Druid #2449

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 14 additions & 19 deletions superset/assets/javascripts/explorev2/stores/visTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const commonControlPanelSections = {
export const sections = {
druidTimeSeries: {
label: 'Time',
description: 'Time related form attributes',
Expand Down Expand Up @@ -123,7 +123,7 @@ const visTypes = {
label: 'Time Series - Line Chart',
requiresTime: true,
controlPanelSections: [
commonControlPanelSections.NVD3TimeSeries[0],
sections.NVD3TimeSeries[0],
{
label: 'Chart Options',
controlSetRows: [
Expand All @@ -136,7 +136,7 @@ const visTypes = {
['x_axis_label', 'y_axis_label'],
],
},
commonControlPanelSections.NVD3TimeSeries[1],
sections.NVD3TimeSeries[1],
],
},

Expand Down Expand Up @@ -180,7 +180,7 @@ const visTypes = {
label: 'Time Series - Bar Chart',
requiresTime: true,
controlPanelSections: [
commonControlPanelSections.NVD3TimeSeries[0],
sections.NVD3TimeSeries[0],
{
label: 'Chart Options',
controlSetRows: [
Expand All @@ -194,24 +194,24 @@ const visTypes = {
['reduce_x_ticks', 'show_controls'],
],
},
commonControlPanelSections.NVD3TimeSeries[1],
sections.NVD3TimeSeries[1],
],
},

compare: {
label: 'Time Series - Percent Change',
requiresTime: true,
controlPanelSections: [
commonControlPanelSections.NVD3TimeSeries[0],
commonControlPanelSections.NVD3TimeSeries[1],
sections.NVD3TimeSeries[0],
sections.NVD3TimeSeries[1],
],
},

area: {
label: 'Time Series - Stacked',
requiresTime: true,
controlPanelSections: [
commonControlPanelSections.NVD3TimeSeries[0],
sections.NVD3TimeSeries[0],
{
label: 'Chart Options',
controlSetRows: [
Expand All @@ -223,7 +223,7 @@ const visTypes = {
['line_interpolation', 'stacked_style'],
],
},
commonControlPanelSections.NVD3TimeSeries[1],
sections.NVD3TimeSeries[1],
],
},

Expand Down Expand Up @@ -676,7 +676,7 @@ const visTypes = {
horizon: {
label: 'Horizon',
controlPanelSections: [
commonControlPanelSections.NVD3TimeSeries[0],
sections.NVD3TimeSeries[0],
{
label: 'Chart Options',
controlSetRows: [
Expand Down Expand Up @@ -761,16 +761,11 @@ export default visTypes;

export function sectionsToRender(vizType, datasourceType) {
const viz = visTypes[vizType];
const timeSection = datasourceType === 'table' ?
commonControlPanelSections.sqlaTimeSeries : commonControlPanelSections.druidTimeSeries;
const { datasourceAndVizType, sqlClause, filters } = commonControlPanelSections;
const filtersToRender =
datasourceType === 'table' ? filters[0] : filters;
return [].concat(
datasourceAndVizType,
timeSection,
sections.datasourceAndVizType,
datasourceType === 'table' ? sections.sqlaTimeSeries : sections.druidTimeSeries,
viz.controlPanelSections,
sqlClause,
filtersToRender
datasourceType === 'table' ? sections.sqlClause : [],
datasourceType === 'table' ? sections.filters[0] : sections.filters
);
}