[GitHub] mistercrunch closed pull request #4767: Improve controls layout for Table visualization

[GitBox <gi...@apache.org>]

mistercrunch closed pull request #4767: Improve controls layout for Table visualization
URL: https://github.com/apache/incubator-superset/pull/4767
 
 
   

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/javascripts/explore/stores/controls.jsx b/superset/assets/javascripts/explore/stores/controls.jsx
index 72baf1ff35..6523004788 100644
--- a/superset/assets/javascripts/explore/stores/controls.jsx
+++ b/superset/assets/javascripts/explore/stores/controls.jsx
@@ -1105,6 +1105,7 @@ export const controls = {
     freeForm: true,
     label: t('Table Timestamp Format'),
     default: '%Y-%m-%d %H:%M:%S',
+    renderTrigger: true,
     validators: [v.nonEmpty],
     clearable: false,
     choices: D3_TIME_FORMAT_OPTIONS,
@@ -1123,6 +1124,7 @@ export const controls = {
   page_length: {
     type: 'SelectControl',
     freeForm: true,
+    renderTrigger: true,
     label: t('Page Length'),
     default: 0,
     choices: formatSelectOptions([0, 10, 25, 40, 50, 75, 100, 150, 200]),
@@ -1351,6 +1353,7 @@ export const controls = {
   table_filter: {
     type: 'CheckboxControl',
     label: t('Table Filter'),
+    renderTrigger: true,
     default: false,
     description: t('Whether to apply filter when table cell is clicked'),
   },
diff --git a/superset/assets/javascripts/explore/stores/visTypes.js b/superset/assets/javascripts/explore/stores/visTypes.js
index d848f40e10..b63dc05de6 100644
--- a/superset/assets/javascripts/explore/stores/visTypes.js
+++ b/superset/assets/javascripts/explore/stores/visTypes.js
@@ -748,12 +748,13 @@ export const visTypes = {
       {
         label: t('GROUP BY'),
         description: t('Use this section if you want a query that aggregates'),
+        expanded: true,
         controlSetRows: [
           ['groupby'],
           ['metrics'],
           ['percent_metrics'],
-          ['include_time'],
-          ['timeseries_limit_metric', 'order_desc'],
+          ['timeseries_limit_metric', 'row_limit'],
+          ['include_time', 'order_desc'],
         ],
       },
       {
@@ -762,13 +763,15 @@ export const visTypes = {
         controlSetRows: [
           ['all_columns'],
           ['order_by_cols'],
+          ['row_limit', null],
         ],
       },
       {
         label: t('Options'),
+        expanded: true,
         controlSetRows: [
           ['table_timestamp_format'],
-          ['row_limit', 'page_length'],
+          ['page_length', null],
           ['include_search', 'table_filter'],
           ['align_pn', 'color_pn'],
         ],


 

----------------------------------------------------------------
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