Merge pull request #870 from mediacloud/feature-845-improve-query-search

add query improvement
mediacloud · Nov 26, 2024 · ed1322c · ed1322c
2 parents 6b72e69 + fb8c1b1
commit ed1322c
Showing 1 changed file with 10 additions and 9 deletions.
diff --git 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,
         },
@@ -269,4 +270,4 @@ export const {
   setInitialSearchTime,
 } = querySlice.actions;
 
-export default querySlice.reducer;
+export default querySlice.reducer;