fix(filters): filter by null [skip ci] (#1459)

lightdash · Feb 28, 2022 · 64b4a51 · 64b4a51
1 parent d357c4f
commit 64b4a51
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts
@@ -481,7 +481,7 @@ export const getFilterRuleWithDefaultValue = <T extends FilterRule>(
     }
     return {
         ...filterRule,
-        values: value !== undefined ? [value] : [],
+        values: value !== undefined && value !== null ? [value] : [],
         settings: undefined,
         ...filterRuleDefaults,
     };
@@ -498,7 +498,8 @@ export const createFilterRuleFromField = (
             target: {
                 fieldId: fieldId(field),
             },
-            operator: FilterOperator.EQUALS,
+            operator:
+                value === null ? FilterOperator.NULL : FilterOperator.EQUALS,
         },
         value,
     );

diff --git a/packages/frontend/src/components/ResultsTable/CellContextMenu.tsx b/packages/frontend/src/components/ResultsTable/CellContextMenu.tsx
@@ -22,7 +22,13 @@ export const CellContextMenu: React.FC<CellContextMenuProps> = ({
                         <MenuItem
                             text={`Filter by "${cell.value}"`}
                             onClick={() => {
-                                addFilter(field, cell.value, true);
+                                addFilter(
+                                    field,
+                                    cell.value === undefined
+                                        ? null
+                                        : cell.value,
+                                    true,
+                                );
                             }}
                         />
                     </Menu>