fix: update filter adapters for numbers and datetime

twentyhq · Jun 20, 2024 · c922e6c · c922e6c
1 parent fe126f8
commit c922e6c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/.../src/modules/object-record/record-filter/utils/turnObjectDropdownFilterIntoQueryFilter.ts b/.../src/modules/object-record/record-filter/utils/turnObjectDropdownFilterIntoQueryFilter.ts
@@ -147,10 +147,7 @@ const applyEmptyFilters = (
       break;
     case 'DATE_TIME':
       emptyRecordFilter = {
-        or: [
-          { [correspondingField.name]: { eq: '' } as DateFilter },
-          { [correspondingField.name]: { is: 'NULL' } as DateFilter },
-        ],
+        [correspondingField.name]: { is: 'NULL' } as DateFilter,
       };
       break;
     case 'RELATION':

diff --git a/...rver/src/engine/api/graphql/workspace-query-runner/factories/query-runner-args.factory.ts b/...rver/src/engine/api/graphql/workspace-query-runner/factories/query-runner-args.factory.ts
@@ -199,14 +199,20 @@ export class QueryRunnerArgsFactory {
     if (!fieldMetadata) {
       return value;
     }
+
     switch (fieldMetadata.type) {
-      case 'NUMBER':
-        return Object.fromEntries(
-          Object.entries(value).map(([filterKey, filterValue]) => [
-            filterKey,
-            Number(filterValue),
-          ]),
-        );
+      case 'NUMBER': {
+        if (value?.is === 'NULL') {
+          return value;
+        } else {
+          return Object.fromEntries(
+            Object.entries(value).map(([filterKey, filterValue]) => [
+              filterKey,
+              Number(filterValue),
+            ]),
+          );
+        }
+      }
       default:
         return value;
     }