Add default emitFilter for BoxPlot. Check emit filter before handle c…

…rossFilter
apache-superset · Mar 19, 2021 · f1630df · f1630df
1 parent 3839f9a
commit f1630df
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/plugins/plugin-chart-echarts/src/BoxPlot/EchartsBoxPlot.tsx b/plugins/plugin-chart-echarts/src/BoxPlot/EchartsBoxPlot.tsx
@@ -29,9 +29,14 @@ export default function EchartsBoxPlot({
   labelMap,
   groupby,
   selectedValues,
+  formData,
 }: BoxPlotChartTransformedProps) {
   const handleChange = useCallback(
     (values: string[]) => {
+      if (!formData.emitFilter) {
+        return;
+      }
+
       const groupbyValues = values.map(value => labelMap[value]);
 
       setDataMask({
@@ -57,12 +62,12 @@ export default function EchartsBoxPlot({
             },
           },
           currentState: {
-            value: groupbyValues ?? null,
+            value: groupbyValues.length ? groupbyValues : null,
           },
         },
         ownFilters: {
           currentState: {
-            selectedValues: values,
+            selectedValues: values.length ? values : null,
           },
         },
       });

diff --git a/plugins/plugin-chart-echarts/src/BoxPlot/controlPanel.ts b/plugins/plugin-chart-echarts/src/BoxPlot/controlPanel.ts
@@ -24,6 +24,9 @@ import {
   formatSelectOptions,
   sections,
 } from '@superset-ui/chart-controls';
+import { DEFAULT_FORM_DATA } from '../Pie/types';
+
+const { emitFilter } = DEFAULT_FORM_DATA;
 
 export default {
   controlPanelSections: [
@@ -69,7 +72,7 @@ export default {
                 config: {
                   type: 'CheckboxControl',
                   label: t('Enable emitting filters'),
-                  default: false,
+                  default: emitFilter,
                   renderTrigger: true,
                   description: t('Enable emmiting filters.'),
                 },

diff --git a/plugins/plugin-chart-echarts/src/BoxPlot/types.ts b/plugins/plugin-chart-echarts/src/BoxPlot/types.ts
@@ -30,6 +30,7 @@ export type BoxPlotQueryFormData = QueryFormData & {
   numberFormat?: string;
   whiskerOptions?: BoxPlotFormDataWhiskerOptions;
   xTickLayout?: BoxPlotFormXTickLayout;
+  emitFilter: boolean;
 };
 
 export type BoxPlotFormDataWhiskerOptions =
@@ -40,6 +41,11 @@ export type BoxPlotFormDataWhiskerOptions =
 
 export type BoxPlotFormXTickLayout = '45°' | '90°' | 'auto' | 'flat' | 'staggered';
 
+// @ts-ignore
+export const DEFAULT_FORM_DATA: BoxPlotQueryFormData = {
+  emitFilter: false,
+};
+
 export interface EchartsBoxPlotChartProps extends ChartProps {
   formData: BoxPlotQueryFormData;
   queriesData: ChartDataResponseResult[];

diff --git a/plugins/plugin-chart-echarts/src/Pie/EchartsPie.tsx b/plugins/plugin-chart-echarts/src/Pie/EchartsPie.tsx
@@ -29,9 +29,14 @@ export default function EchartsPie({
   labelMap,
   groupby,
   selectedValues,
+  formData,
 }: PieChartTransformedProps) {
   const handleChange = useCallback(
     (values: string[]) => {
+      if (!formData.emitFilter) {
+        return;
+      }
+
       const groupbyValues = values.map(value => labelMap[value]);
 
       setDataMask({
@@ -57,12 +62,12 @@ export default function EchartsPie({
             },
           },
           currentState: {
-            value: groupbyValues ?? null,
+            value: groupbyValues.length ? groupbyValues : null,
           },
         },
         ownFilters: {
           currentState: {
-            selectedValues: values,
+            selectedValues: values.length ? values : null,
           },
         },
       });