#8387 Spaces/User admin list edit quota batch actions - Followup (#8438)

owncloud · Feb 15, 2023 · fe151df · fe151df
1 parent b9a3e39
commit fe151df
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 40 deletions.
diff --git a/changelog/unreleased/enhancement-admin-change-spaces-quota-batch-action b/changelog/unreleased/enhancement-admin-change-spaces-quota-batch-action
@@ -4,4 +4,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/issues/8417
diff --git a/packages/web-app-admin-settings/src/components/Spaces/SideBar/ActionsPanel.vue b/packages/web-app-admin-settings/src/components/Spaces/SideBar/ActionsPanel.vue
@@ -3,7 +3,7 @@
     <quota-modal
       v-if="quotaModalIsOpen"
       :cancel="closeQuotaModal"
-      :spaces="[resources[0]]"
+      :spaces="resources"
       @space-quota-updated="spaceQuotaUpdated"
     />
     <oc-list id="oc-spaces-actions-sidebar" class-name="oc-mt-s">

diff --git a/packages/web-app-admin-settings/src/views/Spaces.vue b/packages/web-app-admin-settings/src/views/Spaces.vue
@@ -135,7 +135,7 @@ export default defineComponent({
     const { sideBarOpen, sideBarActivePanel } = useSideBar()
 
     const loadResourcesEventToken = ref(null)
-    const updateQuotaForSpaceEventToken = ref(null)
+    let updateQuotaForSpaceEventToken
     const template = ref(null)
     const listHeaderPosition = ref(0)
     const selectedSpaces = ref([])
@@ -265,7 +265,7 @@ export default defineComponent({
       window.addEventListener('resize', calculateListHeaderPosition)
       resizeObserver.observe(unref(appBarActionsRef))
 
-      updateQuotaForSpaceEventToken.value = eventBus.subscribe(
+      updateQuotaForSpaceEventToken = eventBus.subscribe(
         'app.admin-settings.spaces.space.quota.updated',
         ({ spaceId, quota }) => {
           const space = unref(spaces).find((s) => s.id === spaceId)
@@ -280,7 +280,7 @@ export default defineComponent({
       eventBus.unsubscribe('app.admin-settings.list.load', unref(loadResourcesEventToken))
       eventBus.unsubscribe(
         'app.admin-settings.spaces.space.quota.updated',
-        unref(updateQuotaForSpaceEventToken)
+        updateQuotaForSpaceEventToken
       )
       resizeObserver.unobserve(unref(appBarActionsRef))
     })

diff --git a/packages/web-app-admin-settings/src/views/Users.vue b/packages/web-app-admin-settings/src/views/Users.vue
@@ -219,11 +219,12 @@ export default defineComponent({
     watch(selectedUserIds, async () => {
       sideBarLoading.value = true
       // Load additional user data
-      const requests = []
-      unref(selectedUsers).forEach((user) => {
-        requests.push(loadAdditionalUserDataTask.perform(user))
-      })
-      await Promise.all(requests)
+      const requests = unref(selectedUsers).map((user) => loadAdditionalUserDataTask.perform(user))
+      const results = await Promise.allSettled<Array<unknown>>(requests)
+      const failedRequests = results.filter((result) => result.status === 'rejected')
+      if (failedRequests.length > 0) {
+        console.debug('Failed to load additional user data', failedRequests)
+      }
 
       if (unref(selectedUsers).length === 1) {
         loadedUser.value = unref(selectedUsers)[0]

diff --git a/packages/web-app-files/src/components/Spaces/SpaceContextActions.vue b/packages/web-app-files/src/components/Spaces/SpaceContextActions.vue
@@ -4,7 +4,7 @@
     <quota-modal
       v-if="quotaModalIsOpen"
       :cancel="closeQuotaModal"
-      :spaces="quotaModalSelectedSpace"
+      :spaces="quotaModalSelectedSpaces"
     />
     <readme-content-modal
       v-if="readmeContentModalIsOpen"
@@ -74,7 +74,7 @@ export default defineComponent({
   },
 
   computed: {
-    quotaModalSelectedSpace() {
+    quotaModalSelectedSpaces() {
       return [this.$data.$_editQuota_selectedSpace]
     },
     quotaModalIsOpen() {

diff --git a/packages/web-pkg/src/components/Spaces/QuotaModal.vue b/packages/web-pkg/src/components/Spaces/QuotaModal.vue
@@ -69,7 +69,7 @@ export default defineComponent({
     }
   },
   mounted() {
-    this.selectedOption = this.spaces[0].spaceQuota.total || 0
+    this.selectedOption = this.spaces[0]?.spaceQuota?.total || 0
   },
   methods: {
     ...mapActions(['showMessage']),

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml