feat: drop missing columns control (apache#20586)

charan1314 · Jul 19, 2022 · 4a36dd9 · 4a36dd9
1 parent 2b03020
commit 4a36dd9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/operators/pivotOperator.ts b/superset-frontend/packages/superset-ui-chart-controls/src/operators/pivotOperator.ts
@@ -44,7 +44,7 @@ export const pivotOperator: PostProcessingFactory<PostProcessingPivot> = (
         aggregates: Object.fromEntries(
           metricLabels.map(metric => [metric, { operator: 'mean' }]),
         ),
-        drop_missing_columns: false,
+        drop_missing_columns: !!formData?.drop_missing_columns,
       },
     };
   }

diff --git a/...et-frontend/packages/superset-ui-chart-controls/src/operators/timeComparePivotOperator.ts b/...et-frontend/packages/superset-ui-chart-controls/src/operators/timeComparePivotOperator.ts
@@ -46,7 +46,7 @@ export const timeComparePivotOperator: PostProcessingFactory<PostProcessingPivot
         options: {
           index,
           columns: ensureIsArray(queryObject.columns).map(getColumnLabel),
-          drop_missing_columns: false,
+          drop_missing_columns: !!formData?.drop_missing_columns,
           aggregates,
         },
       };

diff --git a/...rset-frontend/packages/superset-ui-chart-controls/src/sections/echartsTimeSeriesQuery.tsx b/...rset-frontend/packages/superset-ui-chart-controls/src/sections/echartsTimeSeriesQuery.tsx
@@ -55,5 +55,6 @@ export const echartsTimeSeriesQuery: ControlPanelSectionConfig = {
     ['order_desc'],
     ['row_limit'],
     ['truncate_metric'],
+    ['drop_missing_columns'],
   ],
 };
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.tsx
@@ -542,6 +542,13 @@ const truncate_metric: SharedControlConfig<'CheckboxControl'> = {
   description: t('Whether to truncate metrics'),
 };
 
+const drop_missing_columns: SharedControlConfig<'CheckboxControl'> = {
+  type: 'CheckboxControl',
+  label: t('Drop Missing Columns'),
+  default: false,
+  description: t('Drop a column if all values are null'),
+};
+
 const x_axis: SharedControlConfig<'SelectControl', ColumnMeta> = {
   ...groupByControl,
   ...xAxisControlConfig,
@@ -587,6 +594,7 @@ const sharedControls = {
   legacy_order_by: enableExploreDnd ? dnd_sort_by : sort_by,
   truncate_metric,
   x_axis: enableExploreDnd ? dnd_x_axis : x_axis,
+  drop_missing_columns,
 };
 
 export { sharedControls, dndEntity, dndColumnsControl };