From 80fd4e774bb51f3aec476f6da5ae2a8f65bb8340 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Wed, 23 Oct 2024 10:50:28 +0200
Subject: [PATCH 1/3] add recentSearchHash

---
 src/components/Search/types.ts |  2 ++
 src/libs/SearchQueryUtils.ts   | 17 +++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/components/Search/types.ts b/src/components/Search/types.ts
index 4f96090be9d0..43ebbed24943 100644
--- a/src/components/Search/types.ts
+++ b/src/components/Search/types.ts
@@ -76,6 +76,8 @@ type SearchQueryAST = {
 type SearchQueryJSON = {
     inputQuery: SearchQueryString;
     hash: number;
+    /** Hash used for putting queries in recent searches list. It ignores sortOrder and sortBy, because we want to treat queries differing only in sort params as the same query */
+    recentSearchHash: number;
     flatFilters: QueryFilters;
 } & SearchQueryAST;
 
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 32c2eff72007..7c7395ef1a9b 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -208,15 +208,13 @@ function findIDFromDisplayValue(filterName: ValueOf<typeof CONST.SEARCH.SYNTAX_F
  * Computes and returns a numerical hash for a given queryJSON.
  * Sorts the query keys and values to ensure that hashes stay consistent.
  */
-function getQueryHash(query: SearchQueryJSON): number {
+function getQueryHashes(query: SearchQueryJSON): {primaryHash: number; recentSearchHash: number} {
     let orderedQuery = '';
     if (query.policyID) {
         orderedQuery += `${CONST.SEARCH.SYNTAX_ROOT_KEYS.POLICY_ID}:${query.policyID} `;
     }
     orderedQuery += `${CONST.SEARCH.SYNTAX_ROOT_KEYS.TYPE}:${query.type}`;
     orderedQuery += ` ${CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS}:${query.status}`;
-    orderedQuery += ` ${CONST.SEARCH.SYNTAX_ROOT_KEYS.SORT_BY}:${query.sortBy}`;
-    orderedQuery += ` ${CONST.SEARCH.SYNTAX_ROOT_KEYS.SORT_ORDER}:${query.sortOrder}`;
 
     Object.keys(query.flatFilters)
         .sort()
@@ -228,10 +226,15 @@ function getQueryHash(query: SearchQueryJSON): number {
                 }
                 return -1;
             });
-            orderedQuery += ` ${buildFilterValuesString(key, sortedFilterValues ?? [])}`;
+            orderedQuery += `${buildFilterValuesString(key, sortedFilterValues ?? [])}`;
         });
+    const recentSearchHash = UserUtils.hashText(orderedQuery, 2 ** 32);
+
+    orderedQuery += ` ${CONST.SEARCH.SYNTAX_ROOT_KEYS.SORT_BY}:${query.sortBy}`;
+    orderedQuery += ` ${CONST.SEARCH.SYNTAX_ROOT_KEYS.SORT_ORDER}:${query.sortOrder}`;
+    const primaryHash = UserUtils.hashText(orderedQuery, 2 ** 32);
 
-    return UserUtils.hashText(orderedQuery, 2 ** 32);
+    return {primaryHash, recentSearchHash};
 }
 
 /**
@@ -248,7 +251,9 @@ function buildSearchQueryJSON(query: SearchQueryString) {
         // Add the full input and hash to the results
         result.inputQuery = query;
         result.flatFilters = flatFilters;
-        result.hash = getQueryHash(result);
+        const {primaryHash, recentSearchHash} = getQueryHashes(result);
+        result.hash = primaryHash;
+        result.recentSearchHash = recentSearchHash;
 
         return result;
     } catch (e) {

From 855c16ec601766dd9af556360f2d5ec13061342f Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Mon, 28 Oct 2024 09:34:32 +0100
Subject: [PATCH 2/3] don't include policyID in recent hash

---
 src/libs/SearchQueryUtils.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 7c7395ef1a9b..437e7dc26fad 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -210,9 +210,6 @@ function findIDFromDisplayValue(filterName: ValueOf<typeof CONST.SEARCH.SYNTAX_F
  */
 function getQueryHashes(query: SearchQueryJSON): {primaryHash: number; recentSearchHash: number} {
     let orderedQuery = '';
-    if (query.policyID) {
-        orderedQuery += `${CONST.SEARCH.SYNTAX_ROOT_KEYS.POLICY_ID}:${query.policyID} `;
-    }
     orderedQuery += `${CONST.SEARCH.SYNTAX_ROOT_KEYS.TYPE}:${query.type}`;
     orderedQuery += ` ${CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS}:${query.status}`;
 
@@ -232,6 +229,9 @@ function getQueryHashes(query: SearchQueryJSON): {primaryHash: number; recentSea
 
     orderedQuery += ` ${CONST.SEARCH.SYNTAX_ROOT_KEYS.SORT_BY}:${query.sortBy}`;
     orderedQuery += ` ${CONST.SEARCH.SYNTAX_ROOT_KEYS.SORT_ORDER}:${query.sortOrder}`;
+    if (query.policyID) {
+        orderedQuery += ` ${CONST.SEARCH.SYNTAX_ROOT_KEYS.POLICY_ID}:${query.policyID} `;
+    }
     const primaryHash = UserUtils.hashText(orderedQuery, 2 ** 32);
 
     return {primaryHash, recentSearchHash};

From 4adb83cad90a40cd85293979ee2322625016d046 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Tue, 5 Nov 2024 10:37:13 +0100
Subject: [PATCH 3/3] fix PR comments

---
 src/libs/SearchQueryUtils.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index cdea8923b488..d7a1bee2771f 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -220,8 +220,6 @@ function getQueryHashes(query: SearchQueryJSON): {primaryHash: number; recentSea
     let orderedQuery = '';
     orderedQuery += `${CONST.SEARCH.SYNTAX_ROOT_KEYS.TYPE}:${query.type}`;
     orderedQuery += ` ${CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS}:${query.status}`;
-    orderedQuery += ` ${CONST.SEARCH.SYNTAX_ROOT_KEYS.SORT_BY}:${query.sortBy}`;
-    orderedQuery += ` ${CONST.SEARCH.SYNTAX_ROOT_KEYS.SORT_ORDER}:${query.sortOrder}`;
 
     query.flatFilters.forEach((filter) => {
         filter.filters.sort((a, b) => localeCompare(a.value.toString(), b.value.toString()));