[charts] Chart specific time controls

apache · Dec 3, 2019 · 1a9d6a8 · 1a9d6a8
1 parent 871af05
commit 1a9d6a8
Show file tree

Hide file tree

Showing 11 changed files with 82 additions and 2 deletions.
diff --git a/superset/assets/src/explore/controlPanels/Area.js b/superset/assets/src/explore/controlPanels/Area.js
@@ -63,4 +63,12 @@ export default {
       renderTrigger: false,
     },
   },
+  sectionOverrides: {
+    druidTimeSeries: {
+      controlSetRows: [['granularity', 'druid_time_origin'], ['time_range']],
+    },
+    sqlaTimeSeries: {
+      controlSetRows: [['granularity_sqla', 'time_grain_sqla'], ['time_range']],
+    },
+  },
 };
diff --git a/superset/assets/src/explore/controlPanels/Bar.js b/superset/assets/src/explore/controlPanels/Bar.js
@@ -62,4 +62,12 @@ export default {
       default: 'smart_date',
     },
   },
+  sectionOverrides: {
+    druidTimeSeries: {
+      controlSetRows: [['granularity', 'druid_time_origin'], ['time_range']],
+    },
+    sqlaTimeSeries: {
+      controlSetRows: [['granularity_sqla', 'time_grain_sqla'], ['time_range']],
+    },
+  },
 };
diff --git a/superset/assets/src/explore/controlPanels/BigNumber.js b/superset/assets/src/explore/controlPanels/BigNumber.js
@@ -52,4 +52,12 @@ export default {
       label: t('Big Number Font Size'),
     },
   },
+  sectionOverrides: {
+    druidTimeSeries: {
+      controlSetRows: [['granularity', 'druid_time_origin'], ['time_range']],
+    },
+    sqlaTimeSeries: {
+      controlSetRows: [['granularity_sqla', 'time_grain_sqla'], ['time_range']],
+    },
+  },
 };
diff --git a/superset/assets/src/explore/controlPanels/Compare.js b/superset/assets/src/explore/controlPanels/Compare.js
@@ -56,4 +56,12 @@ export default {
       default: 'smart_date',
     },
   },
+  sectionOverrides: {
+    druidTimeSeries: {
+      controlSetRows: [['granularity', 'druid_time_origin'], ['time_range']],
+    },
+    sqlaTimeSeries: {
+      controlSetRows: [['granularity_sqla', 'time_grain_sqla'], ['time_range']],
+    },
+  },
 };
diff --git a/superset/assets/src/explore/controlPanels/Iframe.js b/superset/assets/src/explore/controlPanels/Iframe.js
@@ -25,4 +25,12 @@ export default {
       controlSetRows: [['url']],
     },
   ],
+  sectionOverrides: {
+    druidTimeSeries: {
+      controlSetRows: [],
+    },
+    sqlaTimeSeries: {
+      controlSetRows: [],
+    },
+  },
 };
diff --git a/superset/assets/src/explore/controlPanels/Line.js b/superset/assets/src/explore/controlPanels/Line.js
@@ -64,4 +64,12 @@ export default {
       default: 50000,
     },
   },
+  sectionOverrides: {
+    druidTimeSeries: {
+      controlSetRows: [['granularity', 'druid_time_origin'], ['time_range']],
+    },
+    sqlaTimeSeries: {
+      controlSetRows: [['granularity_sqla', 'time_grain_sqla'], ['time_range']],
+    },
+  },
 };
diff --git a/superset/assets/src/explore/controlPanels/Markup.js b/superset/assets/src/explore/controlPanels/Markup.js
@@ -26,4 +26,12 @@ export default {
       controlSetRows: [['markup_type'], ['code']],
     },
   ],
+  sectionOverrides: {
+    druidTimeSeries: {
+      controlSetRows: [],
+    },
+    sqlaTimeSeries: {
+      controlSetRows: [],
+    },
+  },
 };
diff --git a/superset/assets/src/explore/controlPanels/Separator.js b/superset/assets/src/explore/controlPanels/Separator.js
@@ -35,4 +35,12 @@ export default {
         '---------------',
     },
   },
+  sectionOverrides: {
+    druidTimeSeries: {
+      controlSetRows: [],
+    },
+    sqlaTimeSeries: {
+      controlSetRows: [],
+    },
+  },
 };
diff --git a/superset/assets/src/explore/controlPanels/TimePivot.js b/superset/assets/src/explore/controlPanels/TimePivot.js
@@ -62,4 +62,12 @@ export default {
       clearable: false,
     },
   },
+  sectionOverrides: {
+    druidTimeSeries: {
+      controlSetRows: [['granularity', 'druid_time_origin'], ['time_range']],
+    },
+    sqlaTimeSeries: {
+      controlSetRows: [['granularity_sqla', 'time_grain_sqla'], ['time_range']],
+    },
+  },
 };
diff --git a/superset/assets/src/explore/controlPanels/TimeTable.js b/superset/assets/src/explore/controlPanels/TimeTable.js
@@ -44,4 +44,12 @@ export default {
       ),
     },
   },
+  sectionOverrides: {
+    druidTimeSeries: {
+      controlSetRows: [['granularity', 'druid_time_origin'], ['time_range']],
+    },
+    sqlaTimeSeries: {
+      controlSetRows: [['granularity_sqla', 'time_grain_sqla'], ['time_range']],
+    },
+  },
 };
diff --git a/superset/assets/src/explore/controlPanels/sections.jsx b/superset/assets/src/explore/controlPanels/sections.jsx
@@ -23,7 +23,7 @@ export const druidTimeSeries = {
   label: t('Time'),
   expanded: true,
   description: t('Time related form attributes'),
-  controlSetRows: [['granularity', 'druid_time_origin'], ['time_range']],
+  controlSetRows: [['time_range']],
 };
 
 export const datasourceAndVizType = {
@@ -45,7 +45,7 @@ export const sqlaTimeSeries = {
   label: t('Time'),
   description: t('Time related form attributes'),
   expanded: true,
-  controlSetRows: [['granularity_sqla', 'time_grain_sqla'], ['time_range']],
+  controlSetRows: [['granularity_sqla'], ['time_range']],
 };
 
 export const filters = {