From 6c35d88fc9e5f5a57f62a44a235e2b1de29e5fa7 Mon Sep 17 00:00:00 2001
From: Zining <ziningxie10@gmail.com>
Date: Fri, 22 Nov 2024 12:26:07 -0500
Subject: [PATCH 1/2] fix feature-845-add-query-improvement

---
 .../src/features/search/query/querySlice.js     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/mcweb/frontend/src/features/search/query/querySlice.js b/mcweb/frontend/src/features/search/query/querySlice.js
index 83f818311..2e657119a 100644
--- a/mcweb/frontend/src/features/search/query/querySlice.js
+++ b/mcweb/frontend/src/features/search/query/querySlice.js
@@ -145,23 +145,24 @@ const querySlice = createSlice({
     },
     addQuery: (state, { payload }) => {
       const freezeState = state;
+      const lastQuery = freezeState[freezeState.length - 1] || {};
       freezeState.push(
         {
           queryString: '',
           queryList: [[], [], []],
           negatedQueryList: [[], [], []],
-          platform: payload.platform,
-          startDate,
-          endDate: dayjs(latestAllowedEndDate(DEFAULT_PROVIDER)).format('MM/DD/YYYY'),
-          collections: [],
-          previewCollections: [],
-          sources: [],
-          previewSources: [],
+          platform: payload.platform || lastQuery.platform || DEFAULT_PROVIDER,
+          startDate: lastQuery.startDate || startDate,
+          endDate: lastQuery.endDate || dayjs(latestAllowedEndDate(DEFAULT_PROVIDER)).format('MM/DD/YYYY'),
+          collections: [...(lastQuery.collections || [])],
+          previewCollections: [...(lastQuery.previewCollections || [])],
+          sources: [...(lastQuery.sources || [])],
+          previewSources: [...(lastQuery.previewSources || [])],
           lastSearchTime: dayjs().unix(),
           isFromDateValid: true,
           isToDateValid: true,
           anyAll: 'any',
-          advanced: payload.advanced,
+          advanced: payload.advanced || false,
           name: 'Query',
           edited: false,
         },

From d814792e2af101dd4e818905106700c9ba1d1f5d Mon Sep 17 00:00:00 2001
From: Zining <ziningxie10@gmail.com>
Date: Fri, 22 Nov 2024 12:28:22 -0500
Subject: [PATCH 2/2] Fix: Update query behavior to preserve dates and media
 when adding a new query

---
 dump.rdb | Bin 0 -> 8748 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 dump.rdb

diff --git a/dump.rdb b/dump.rdb
new file mode 100644
index 0000000000000000000000000000000000000000..700b6cefb4f027221ac8f4d7e6e045bd47e28403
GIT binary patch
literal 8748
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

literal 0
HcmV?d00001