Skip to content

Update list.vue #331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jajaramillo24 merged 1 commit into from
May 29, 2026
Merged

Update list.vue #331

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 24 additions & 10 deletions resources/assets/js/pages/users/list.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,7 @@ const apiUserFields = [
const fetchHandler = {
handler (val, oldVal) {
if (val !== oldVal) {
this.currentPage = 1
this.fetchUsers()
this.queueUsersFetch()
}
},
deep: true
Expand All @@ -242,15 +241,17 @@ export default {
locationOptions: null,
searchDebounce: null,
localSearchFilter: '',
pendingSearchFetch: false,
pendingUsersFetch: false,
pendingUsersFetchResetPage: false,
usersFetchRequest: 0,
countries: require('country-list')()
}
},
watch: {
currentPage: {
handler (val, oldVal) {
if (val !== oldVal) {
this.fetchUsers()
this.queueCurrentPageFetch()
}
},
deep: true
Expand Down Expand Up @@ -287,7 +288,7 @@ export default {
handler (val, oldVal) {
if (!this.apiUsers) {
this.setLocalStorage()
this.fetchUsers()
this.queueUsersFetch()
}
},
deep: true
Expand Down Expand Up @@ -359,21 +360,29 @@ export default {
return
}
this.searchFilter = search
this.queueUsersFetch()
},
queueUsersFetch (resetPage = true) {
if (this.fetchingUsers) {
this.pendingSearchFetch = true
this.pendingUsersFetch = true
this.pendingUsersFetchResetPage = this.pendingUsersFetchResetPage || resetPage
return
}
if (this.currentPage !== 1) {
if (resetPage && this.currentPage !== 1) {
this.currentPage = 1
} else {
this.fetchUsers()
}
},
queueCurrentPageFetch () {
this.queueUsersFetch(false)
},
async fetchUsers () {
const search = this.searchFilter ? this.searchFilter.trim() : ''
if (search.length > 0 && search.length < 3) {
return
}
const requestId = ++this.usersFetchRequest
this.fetchingUsers = true
if (this.rolesEmpty) {
await this.fetchRoles()
Expand Down Expand Up @@ -410,10 +419,15 @@ export default {
this.$noty.error(this.$t('error_alert_text'))
}

if (requestId !== this.usersFetchRequest) {
return
}
this.fetchingUsers = false
if (this.pendingSearchFetch) {
this.pendingSearchFetch = false
this.queueSearchFetch()
if (this.pendingUsersFetch) {
const resetPage = this.pendingUsersFetchResetPage
this.pendingUsersFetch = false
this.pendingUsersFetchResetPage = false
this.queueUsersFetch(resetPage)
}
},
async fetchRoles () {
Expand Down
Loading