Skip to content

Commit d1840bc

Browse files
committed
Added advanced searching toggle functionality to backend/frontend
1 parent 6c044b5 commit d1840bc

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

packages/glimpse-ui/components/admin/AdminPaginatedTable.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ export default {
209209
this.showAdvancedSearchDialog = true
210210
},
211211
searchInput () {
212-
this.$emit('searchInput', this.trueSearchCtx)
212+
this.$emit('searchInput', this.trueSearchCtx, this.advancedSearch)
213213
this.changePage(1)
214214
},
215215
changePage (page) {

packages/glimpse-ui/components/admin/PeopleList.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ export default {
121121
changeItemCount (count) {
122122
this.$store.dispatch('admin/people/setItemsPerPageCount', { itemsPerPage: count })
123123
},
124-
searchInput (input) {
125-
input = input.trim()
126-
this.$store.dispatch('admin/people/search', { value: input })
124+
searchInput (searchVal, isAdvanced) {
125+
searchVal = searchVal.trim()
126+
this.$store.dispatch('admin/people/search', { value: searchVal, isAdvanced })
127127
this.changePage(1)
128128
},
129129
editPerson (person) {

packages/glimpse-ui/store/admin/people.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ export const actions = {
8989
*/
9090
search: function (ctx, payload) {
9191
ctx.commit('SET_SEARCH_STRING', { searchString: payload.value })
92+
ctx.commit('SET_ADVANCED_SEARCH', { advancedSearch: payload.isAdvanced })
9293
ctx.commit('CLEAR_CACHED')
9394
ctx.dispatch('getPeopleCount')
9495
},
@@ -114,8 +115,8 @@ export const actions = {
114115
ctx.commit('SET_LOADING_STATE', { loading: true })
115116
const options = {
116117
query: gql`
117-
query GetPeople($cursor: Int!, $count: Int!, $search: String) {
118-
people(prevPersonIndex: $cursor, pageSize: $count, searchCtx: $search) {
118+
query GetPeople($cursor: Int!, $count: Int!, $search: String, $adv: Boolean) {
119+
people(prevPersonIndex: $cursor, pageSize: $count, searchCtx: $search, advancedSearch: $adv) {
119120
id
120121
firstName
121122
preferredName
@@ -126,7 +127,8 @@ export const actions = {
126127
variables: {
127128
cursor: ((ctx.state.currentPage - 1) * ctx.state.itemsPerPage) - 1,
128129
count: ctx.state.itemsPerPage,
129-
search: ctx.state.searchString
130+
search: ctx.state.searchString,
131+
adv: ctx.state.advancedSearch
130132
}
131133
}
132134
if (payload && payload.noCache) {
@@ -152,11 +154,12 @@ export const actions = {
152154

153155
const query = this.app.apolloProvider.defaultClient.query({
154156
fetchPolicy: 'no-cache',
155-
query: gql`query PeopleCount($search: String!) {
156-
peopleCount(searchCtx: $search)
157+
query: gql`query PeopleCount($search: String!, $adv: Boolean) {
158+
peopleCount(searchCtx: $search, advancedSearch: $adv)
157159
}`,
158160
variables: {
159-
search: ctx.state.searchString
161+
search: ctx.state.searchString,
162+
adv: ctx.state.advancedSearch
160163
}
161164
})
162165
const res = await query

0 commit comments

Comments
 (0)