fix type guard

apache · Sep 14, 2021 · 7e6e93a · 7e6e93a
1 parent 76e4a7c
commit 7e6e93a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/superset-frontend/src/explore/components/DatasourcePanel/types.ts b/superset-frontend/src/explore/components/DatasourcePanel/types.ts
@@ -32,6 +32,6 @@ export function isDatasourcePanelDndItem(
   return item?.value && item?.type;
 }
 
-export function isDndItemValue(item: any): item is DndItemValue {
-  return item?.value && item?.type;
+export function isSavedMetric(item: any): item is Metric {
+  return item?.metric_name;
 }
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.tsx
@@ -45,7 +45,7 @@ import AdhocMetric from 'src/explore/components/controls/MetricControl/AdhocMetr
 import {
   DatasourcePanelDndItem,
   DndItemValue,
-  isDndItemValue,
+  isSavedMetric,
 } from 'src/explore/components/DatasourcePanel/types';
 import { DndItemType } from 'src/explore/components/DndItemType';
 import { ControlComponentProps } from 'src/explore/components/Control';
@@ -351,7 +351,7 @@ export const DndFilterSelect = (props: DndFilterSelectProps) => {
   }, [togglePopover]);
 
   const adhocFilter = useMemo(() => {
-    if (isDndItemValue(droppedItem) && droppedItem?.metric_name) {
+    if (isSavedMetric(droppedItem)) {
       return new AdhocFilter({
         expressionType: EXPRESSION_TYPES.SQL,
         clause: CLAUSES.HAVING,