Skip to content

fix(settings): Show loading spinner while searching accounts #60504

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

Open
nfebe wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −5
Open

fix(settings): Show loading spinner while searching accounts #60504

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
7 changes: 2 additions & 5 deletions apps/settings/src/components/UserList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
<NcEmptyContent
v-if="filteredUsers.length === 0"
class="empty"
:name="isInitialLoad && loading.users ? null : t('settings', 'No accounts')">
:name="loading.users ? null : t('settings', 'No accounts')">
<template #icon>
<NcLoadingIcon
v-if="isInitialLoad && loading.users"
v-if="loading.users"
:name="t('settings', 'Loading accounts …')"
:size="64" />
<NcIconSvgWrapper v-else :path="mdiAccountGroupOutline" :size="64" />
Expand Down Expand Up @@ -145,7 +145,6 @@ export default {

newUser: { ...newUser },
editingUser: null,
isInitialLoad: true,
}
},

Expand Down Expand Up @@ -241,7 +240,6 @@ export default {

// watch url change and group select
async selectedGroup(val) {
this.isInitialLoad = true
// if selected is the disabled group but it's empty
await this.redirectIfDisabled()
this.$store.commit('resetUsers')
Expand Down Expand Up @@ -312,7 +310,6 @@ export default {
showError('Failed to load accounts')
}
this.loading.users = false
this.isInitialLoad = false
},

closeDialog() {
Expand Down
Loading