fix types

Expensify · Jul 11, 2024 · 52012c7 · 52012c7
1 parent 5d21b27
commit 52012c7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/components/Search/types.ts b/src/components/Search/types.ts
@@ -37,10 +37,10 @@ type QueryFilter = {
     value: string | number;
 };
 
-type AllFieldKeys = keyof typeof CONST.SEARCH.SYNTAX_FILTER_KEYS | keyof typeof CONST.SEARCH.SYNTAX_ROOT_KEYS;
+type AllFieldKeys = ValueOf<typeof CONST.SEARCH.SYNTAX_FILTER_KEYS> | ValueOf<typeof CONST.SEARCH.SYNTAX_ROOT_KEYS>;
 
 type QueryFilters = {
     [K in AllFieldKeys]: QueryFilter | QueryFilter[];
 };
 
-export type {SelectedTransactionInfo, SelectedTransactions, SearchColumnType, SortOrder, SearchContext, ASTNode, QueryFilters, AllFieldKeys};
+export type {SelectedTransactionInfo, SelectedTransactions, SearchColumnType, SortOrder, SearchContext, ASTNode, QueryFilter, QueryFilters, AllFieldKeys};
diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
@@ -1,5 +1,5 @@
 import type {ValueOf} from 'type-fest';
-import type {ASTNode, QueryFilters, SearchColumnType, SortOrder, AllFieldKeys} from '@components/Search/types';
+import type {ASTNode, QueryFilter, QueryFilters, SearchColumnType, SortOrder, AllFieldKeys} from '@components/Search/types';
 import ReportListItem from '@components/SelectionList/Search/ReportListItem';
 import TransactionListItem from '@components/SelectionList/Search/TransactionListItem';
 import type {ListItem, ReportListItemType, TransactionListItemType} from '@components/SelectionList/types';
@@ -345,7 +345,6 @@ function getFilters(query: string, fields: Array<Partial<AllFieldKeys>>) {
 
     const filters = {} as QueryFilters;
 
-    // Include root properties if they are specified fields
     fields.forEach(field => {
         const rootFieldKey = field as ValueOf<typeof CONST.SEARCH.SYNTAX_ROOT_KEYS>;
         if (jsonQuery[rootFieldKey] === undefined) {
@@ -363,11 +362,11 @@ function getFilters(query: string, fields: Array<Partial<AllFieldKeys>>) {
             return;
         }
 
-        if (node.left && typeof node.left === 'object') {
+        if (typeof node?.left === 'object') {
             traverse(node.left);
         }
 
-        if (node.right && typeof node.right === 'object') {
+        if (typeof node?.right === 'object') {
             traverse(node.right);
         }
 
@@ -380,9 +379,10 @@ function getFilters(query: string, fields: Array<Partial<AllFieldKeys>>) {
             filters[nodeKey] = [];
         }
 
-        filters[nodeKey].push({
+        const filterArray = filters[nodeKey] as QueryFilter[];
+        filterArray.push({
             operator: node.operator,
-            value: node.right,
+            value: node.right as string | number,
         });
     }