Merge pull request #28702 from nextcloud/fix/stable21-user-list-infin…

…ite-loading [stable21] Fix user list infinite loading state in user settings
nextcloud · Sep 7, 2021 · 0862cf7 · 0862cf7
2 parents 9ee93ed + 988b390
commit 0862cf7
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 14 deletions.
diff --git a/apps/settings/js/vue-settings-apps-users-management.js b/apps/settings/js/vue-settings-apps-users-management.js
diff --git a/apps/settings/js/vue-settings-apps-users-management.js.map b/apps/settings/js/vue-settings-apps-users-management.js.map
diff --git a/apps/settings/js/vue-settings-users.js b/apps/settings/js/vue-settings-users.js
diff --git a/apps/settings/js/vue-settings-users.js.map b/apps/settings/js/vue-settings-users.js.map
diff --git a/apps/settings/src/components/UserList.vue b/apps/settings/src/components/UserList.vue
@@ -471,8 +471,13 @@ export default {
 				group: this.selectedGroup !== 'disabled' ? this.selectedGroup : '',
 				search: this.searchQuery,
 			})
-				.then((response) => {
-					response ? $state.loaded() : $state.complete()
+				.then((usersCount) => {
+					if (usersCount > 0) {
+						$state.loaded()
+					}
+					if (usersCount < this.usersLimit) {
+						$state.complete()
+					}
 				})
 		},
 

diff --git a/apps/settings/src/store/users.js b/apps/settings/src/store/users.js
@@ -218,11 +218,11 @@ const actions = {
 				cancelToken: searchRequestCancelSource.token,
 			})
 				.then((response) => {
-					if (Object.keys(response.data.ocs.data.users).length > 0) {
+					const usersCount = Object.keys(response.data.ocs.data.users).length
+					if (usersCount > 0) {
 						context.commit('appendUsers', response.data.ocs.data.users)
-						return Object.keys(response.data.ocs.data.users).length >= limit
 					}
-					return false
+					return usersCount
 				})
 				.catch((error) => {
 					if (!axios.isCancel(error)) {
@@ -235,11 +235,11 @@ const actions = {
 			cancelToken: searchRequestCancelSource.token,
 		})
 			.then((response) => {
-				if (Object.keys(response.data.ocs.data.users).length > 0) {
+				const usersCount = Object.keys(response.data.ocs.data.users).length
+				if (usersCount > 0) {
 					context.commit('appendUsers', response.data.ocs.data.users)
-					return Object.keys(response.data.ocs.data.users).length >= limit
 				}
-				return false
+				return usersCount
 			})
 			.catch((error) => {
 				if (!axios.isCancel(error)) {