Fix additional user data loading (#8555)

owncloud · Mar 7, 2023 · 574bba1 · 574bba1
1 parent e6f7f31
commit 574bba1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/changelog/unreleased/enhancement-admin-change-spaces-quota-batch-action b/changelog/unreleased/enhancement-admin-change-spaces-quota-batch-action
@@ -5,4 +5,5 @@ We've added the batch edit quota functionality to the admin panel for users pers
 https://github.com/owncloud/web/pull/8387
 https://github.com/owncloud/web/pull/8430
 https://github.com/owncloud/web/pull/8438
+https://github.com/owncloud/web/pull/8555
 https://github.com/owncloud/web/issues/8417
diff --git a/packages/web-app-admin-settings/src/components/Users/UsersList.vue b/packages/web-app-admin-settings/src/components/Users/UsersList.vue
@@ -149,23 +149,31 @@ export default defineComponent({
     }
 
     const showDetails = (user) => {
-      selectUser(user)
+      if (!isUserSelected(user)) {
+        selectUser(user)
+      }
       eventBus.publish(SideBarEventTopics.open)
     }
 
     const showEditPanel = (user) => {
-      selectUser(user)
+      if (!isUserSelected(user)) {
+        selectUser(user)
+      }
       eventBus.publish(SideBarEventTopics.openWithPanel, 'EditPanel')
     }
 
     const showGroupAssigmentPanel = (user) => {
-      selectUser(user)
+      if (!isUserSelected(user)) {
+        selectUser(user)
+      }
       eventBus.publish(SideBarEventTopics.openWithPanel, 'GroupAssignmentsPanel')
     }
 
     const rowClicked = (data) => {
       const user = data[0]
-      selectUser(user)
+      if (!isUserSelected(user)) {
+        selectUser(user)
+      }
     }
     const showContextMenuOnBtnClick = (data, user) => {
       const { dropdown, event } = data

diff --git a/packages/web-app-admin-settings/src/views/Users.vue b/packages/web-app-admin-settings/src/views/Users.vue
@@ -284,14 +284,6 @@ export default defineComponent({
         console.debug('Failed to load additional user data', failedRequests)
       }
 
-      if (unref(selectedUsers).length === 1) {
-        loadedUser.value = unref(selectedUsers)[0]
-        sideBarLoading.value = false
-        return
-      }
-
-      loadedUser.value = null
-      sideBarLoading.value = false
       selectedPersonalDrives.value.splice(0, unref(selectedPersonalDrives).length)
       unref(selectedUsers).forEach((user) => {
         const drive = toRaw(user.drive)
@@ -305,6 +297,9 @@ export default defineComponent({
         } as SpaceResource
         selectedPersonalDrives.value.push(spaceResource)
       })
+
+      loadedUser.value = unref(selectedUsers).length === 1 ? unref(selectedUsers)[0] : null
+      sideBarLoading.value = false
     })
 
     const calculateListHeaderPosition = () => {