fix #136 - keep pagination when searching new index

cars10 · Jul 10, 2023 · 0d44271 · 0d44271
1 parent 490745c
commit 0d44271
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/composables/components/indices/IndexRow.ts b/src/composables/components/indices/IndexRow.ts
@@ -4,7 +4,7 @@ import { useElasticsearchAdapter } from '../../CallElasticsearch'
 import { QMenu } from 'quasar'
 import { useRouter } from 'vue-router'
 import { useSearchStore } from '../../../store/search'
-import { DEFAULT_PAGINATION, DEFAULT_SEARCH_QUERY } from '../../../consts'
+import { DEFAULT_PAGINATION, DEFAULT_SEARCH_QUERY, DEFAULT_SEARCH_QUERY_OBJ } from '../../../consts'
 import ElasticsearchIndex from '../../../models/ElasticsearchIndex.ts'
 import { handleError } from '../../../helpers/error.ts'
 
@@ -65,7 +65,14 @@ export const useIndexRow = (props: IndexRowProps, emit: any) => {
     searchStore.indices = index
     searchStore.searchQueryCollapsed = false
     searchStore.searchQuery = DEFAULT_SEARCH_QUERY
+
+    const rowsPerPage = searchStore.pagination.rowsPerPage
     searchStore.pagination = DEFAULT_PAGINATION
+    if (rowsPerPage && rowsPerPage > 0 && rowsPerPage <= 10000) {
+      searchStore.searchQuery = JSON.stringify(Object.assign({}, DEFAULT_SEARCH_QUERY_OBJ, { size: rowsPerPage }))
+      searchStore.pagination.rowsPerPage = rowsPerPage
+    }
+
     router.push({ name: 'search' })
   }
 

diff --git a/src/consts.ts b/src/consts.ts
@@ -20,7 +20,8 @@ export const buildDefaultRequest = () => ({
   body: ''
 })
 
-export const DEFAULT_SEARCH_QUERY = '{"query": {"query_string": {"query": "*"}},"size": 10,"from": 0,"sort": []}'
+export const DEFAULT_SEARCH_QUERY_OBJ = { query: { query_string: { query: '*' } }, size: 10, from: 0, sort: [] }
+export const DEFAULT_SEARCH_QUERY = JSON.stringify(DEFAULT_SEARCH_QUERY_OBJ)
 export const DEFAULT_SEARCH_RESULT_COLUMNS = ['_index', '_type', '_id', '_score']
 export const DEFAULT_SORTABLE_COLUMNS = ['_index', '_type', '_id', '_score']
 export const DEFAULT_PAGINATION = {