fix: hide filter if no callback is provided

datavisyn · Nov 15, 2023 · 059860c · 059860c
1 parent 35bab5e
commit 059860c
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 54 deletions.
diff --git a/src/vis/EagerVis.tsx b/src/vis/EagerVis.tsx
@@ -130,7 +130,7 @@ export function EagerVis({
   colors = null,
   shapes = DEFAULT_SHAPES,
   selectionCallback = () => null,
-  filterCallback = () => null,
+  filterCallback,
   setExternalConfig = () => null,
   closeCallback = () => null,
   showCloseButton = false,
@@ -209,33 +209,33 @@ export function EagerVis({
     externalConfig
       ? { consistent: null, current: externalConfig }
       : columns.filter((c) => c.type === EColumnTypes.NUMERICAL).length > 1
-      ? {
-          consistent: null,
-          current: {
-            type: ESupportedPlotlyVis.SCATTER,
-            numColumnsSelected: [],
-            color: null,
-            numColorScaleType: ENumericalColorScaleType.SEQUENTIAL,
-            shape: null,
-            dragMode: EScatterSelectSettings.RECTANGLE,
-            alphaSliderVal: 0.5,
-          } as BaseVisConfig,
-        }
-      : {
-          consistent: null,
-          current: {
-            type: ESupportedPlotlyVis.BAR,
-            multiples: null,
-            group: null,
-            direction: EBarDirection.HORIZONTAL,
-            display: EBarDisplayType.ABSOLUTE,
-            groupType: EBarGroupingType.STACK,
-            numColumnsSelected: [],
-            catColumnSelected: null,
-            aggregateColumn: null,
-            aggregateType: EAggregateTypes.COUNT,
-          } as BaseVisConfig,
-        },
+        ? {
+            consistent: null,
+            current: {
+              type: ESupportedPlotlyVis.SCATTER,
+              numColumnsSelected: [],
+              color: null,
+              numColorScaleType: ENumericalColorScaleType.SEQUENTIAL,
+              shape: null,
+              dragMode: EScatterSelectSettings.RECTANGLE,
+              alphaSliderVal: 0.5,
+            } as BaseVisConfig,
+          }
+        : {
+            consistent: null,
+            current: {
+              type: ESupportedPlotlyVis.BAR,
+              multiples: null,
+              group: null,
+              direction: EBarDirection.HORIZONTAL,
+              display: EBarDisplayType.ABSOLUTE,
+              groupType: EBarGroupingType.STACK,
+              numColumnsSelected: [],
+              catColumnSelected: null,
+              aggregateColumn: null,
+              aggregateType: EAggregateTypes.COUNT,
+            } as BaseVisConfig,
+          },
   );
 
   const setExternalConfigRef = useSyncedRef(setExternalConfig);

diff --git a/src/vis/VisSidebar.tsx b/src/vis/VisSidebar.tsx
@@ -4,7 +4,7 @@ import { ICommonVisSideBarProps } from './interfaces';
 
 export function VisSidebar({
   columns,
-  filterCallback = () => null,
+  filterCallback,
   optionsConfig,
   config = null,
   setConfig = null,

diff --git a/src/vis/bar/BarVisSidebar.tsx b/src/vis/bar/BarVisSidebar.tsx
@@ -10,30 +10,12 @@ import { GroupSelect } from './GroupSelect';
 import { EBarDirection, EBarDisplayType, EBarGroupingType, IBarConfig } from './interfaces';
 
 const defaultConfig = {
-  group: {
-    enable: true,
-    customComponent: null,
-  },
-  multiples: {
-    enable: true,
-    customComponent: null,
-  },
-  direction: {
-    enable: true,
-    customComponent: null,
-  },
-  filter: {
-    enable: true,
-    customComponent: null,
-  },
-  groupType: {
-    enable: true,
-    customComponent: null,
-  },
-  display: {
-    enable: true,
-    customComponent: null,
-  },
+  direction: { enable: true, customComponent: null },
+  display: { enable: true, customComponent: null },
+  filter: { enable: true, customComponent: null },
+  group: { enable: true, customComponent: null },
+  groupType: { enable: true, customComponent: null },
+  multiples: { enable: true, customComponent: null },
 };
 
 export function BarVisSidebar({
@@ -114,7 +96,13 @@ export function BarVisSidebar({
             <BarDirectionButtons callback={(direction: EBarDirection) => setConfig({ ...config, direction })} currentSelected={config.direction} />
           )
         : null}
-      {mergedOptionsConfig.filter.enable ? mergedOptionsConfig.filter.customComponent || <FilterButtons callback={filterCallback} /> : null}
+      {mergedOptionsConfig.filter.enable ? (
+        mergedOptionsConfig.filter.customComponent ? (
+          mergedOptionsConfig.filter.customComponent
+        ) : filterCallback ? (
+          <FilterButtons callback={filterCallback} />
+        ) : null
+      ) : null}
     </>
   );
 }