remove unnecessary syntax range checks and types

Author: 289Adam289

src/CONST.ts

@@ -6216,7 +6216,6 @@ const CONST = {
             LOWER_THAN: 'lt',
             LOWER_THAN_OR_EQUAL_TO: 'lte',
         },
-        SYNTAX_RANGE_NAME: 'syntax',
         SYNTAX_ROOT_KEYS: {
             TYPE: 'type',
             STATUS: 'status',

src/components/Search/SearchRouter/buildSubstitutionsMap.ts

@@ -33,8 +33,7 @@ function buildSubstitutionsMap(
 ): SubstitutionMap {
     const parsedQuery = parse(query) as {ranges: SearchAutocompleteQueryRange[]};
 
-    const searchAutocompleteQueryRanges = parsedQuery.ranges.filter((range) => range.key !== CONST.SEARCH.SYNTAX_RANGE_NAME);
-
+    const searchAutocompleteQueryRanges = parsedQuery.ranges;
     if (searchAutocompleteQueryRanges.length === 0) {
         return {};
     }

src/components/Search/SearchRouter/getQueryWithSubstitutions.ts

@@ -1,11 +1,10 @@
-import type {SearchAutocompleteQueryRange, SearchAutocompleteQueryRangeKey} from '@components/Search/types';
+import type {SearchAutocompleteQueryRange, SearchFilterKey} from '@components/Search/types';
 import {parse} from '@libs/SearchParser/autocompleteParser';
 import {sanitizeSearchValue} from '@libs/SearchQueryUtils';
-import CONST from '@src/CONST';
 
 type SubstitutionMap = Record<string, string>;
 
-const getSubstitutionMapKey = (filterKey: SearchAutocompleteQueryRangeKey, value: string) => `${filterKey}:${value}`;
+const getSubstitutionMapKey = (filterKey: SearchFilterKey, value: string) => `${filterKey}:${value}`;
 
 /**
  * Given a plaintext query and a SubstitutionMap object, this function will return a transformed query where:
@@ -22,7 +21,7 @@ const getSubstitutionMapKey = (filterKey: SearchAutocompleteQueryRangeKey, value
 function getQueryWithSubstitutions(changedQuery: string, substitutions: SubstitutionMap) {
     const parsed = parse(changedQuery) as {ranges: SearchAutocompleteQueryRange[]};
 
-    const searchAutocompleteQueryRanges = parsed.ranges.filter((range) => range.key !== CONST.SEARCH.SYNTAX_RANGE_NAME);
+    const searchAutocompleteQueryRanges = parsed.ranges;
 
     if (searchAutocompleteQueryRanges.length === 0) {
         return changedQuery;

src/components/Search/SearchRouter/getUpdatedSubstitutionsMap.ts

@@ -1,9 +1,8 @@
-import type {SearchAutocompleteQueryRange, SearchAutocompleteQueryRangeKey} from '@components/Search/types';
+import type {SearchAutocompleteQueryRange, SearchFilterKey} from '@components/Search/types';
 import {parse} from '@libs/SearchParser/autocompleteParser';
-import CONST from '@src/CONST';
 import type {SubstitutionMap} from './getQueryWithSubstitutions';
 
-const getSubstitutionsKey = (filterKey: SearchAutocompleteQueryRangeKey, value: string) => `${filterKey}:${value}`;
+const getSubstitutionsKey = (filterKey: SearchFilterKey, value: string) => `${filterKey}:${value}`;
 
 /**
  * Given a plaintext query and a SubstitutionMap object,
@@ -19,7 +18,7 @@ const getSubstitutionsKey = (filterKey: SearchAutocompleteQueryRangeKey, value:
 function getUpdatedSubstitutionsMap(query: string, substitutions: SubstitutionMap): SubstitutionMap {
     const parsedQuery = parse(query) as {ranges: SearchAutocompleteQueryRange[]};
 
-    const searchAutocompleteQueryRanges = parsedQuery.ranges.filter((range) => range.key !== CONST.SEARCH.SYNTAX_RANGE_NAME);
+    const searchAutocompleteQueryRanges = parsedQuery.ranges;
 
     if (searchAutocompleteQueryRanges.length === 0) {
         return {};

src/components/Search/types.ts

@@ -98,8 +98,6 @@ type SearchFilterKey =
     | typeof CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS
     | typeof CONST.SEARCH.SYNTAX_ROOT_KEYS.POLICY_ID;
 
-type SearchAutocompleteQueryRangeKey = SearchFilterKey | typeof CONST.SEARCH.SYNTAX_RANGE_NAME;
-
 type UserFriendlyKey = ValueOf<typeof CONST.SEARCH.SEARCH_USER_FRIENDLY_KEYS>;
 
 type QueryFilters = Array<{
@@ -132,7 +130,7 @@ type SearchAutocompleteResult = {
 };
 
 type SearchAutocompleteQueryRange = {
-    key: SearchAutocompleteQueryRangeKey;
+    key: SearchFilterKey;
     length: number;
     start: number;
     value: string;
@@ -161,5 +159,4 @@ export type {
     SearchAutocompleteResult,
     PaymentData,
     SearchAutocompleteQueryRange,
-    SearchAutocompleteQueryRangeKey,
 };

src/libs/SearchAutocompleteUtils.ts

@@ -173,7 +173,7 @@ function filterOutRangesWithCorrectValue(
         case CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG:
             return tagList.get().includes(range.value);
         default:
-            return true;
+            return false;
     }
 }
 
@@ -200,10 +200,6 @@ function parseForLiveMarkdown(
         .map((range) => {
             let type = 'mention-user';
 
-            if (range.key === CONST.SEARCH.SYNTAX_RANGE_NAME) {
-                type = CONST.SEARCH.SYNTAX_RANGE_NAME;
-            }
-
             if ((range.key === CONST.SEARCH.SYNTAX_FILTER_KEYS.TO || CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM) && (userLogins.get().includes(range.value) || range.value === userDisplayName)) {
                 type = 'mention-here';
             }