errorLog: Handle multiple errors (graph) (#9474)

owncloud · Jul 25, 2023 · fbbf062 · fbbf062
1 parent 00acecc
commit fbbf062
Show file tree

Hide file tree

Showing 12 changed files with 392 additions and 187 deletions.
diff --git a/packages/web-app-admin-settings/src/composables/actions/groups/useGroupActionsDelete.ts b/packages/web-app-admin-settings/src/composables/actions/groups/useGroupActionsDelete.ts
@@ -1,6 +1,6 @@
 import { computed } from 'vue'
 import { Store } from 'vuex'
-import { eventBus } from 'web-pkg'
+import { eventBus, useLoadingService } from 'web-pkg'
 import { useClientService, useStore } from 'web-pkg/src/composables'
 import { GroupAction, GroupActionOptions } from 'web-pkg/src/composables/actions'
 import { useGettext } from 'vue3-gettext'
@@ -9,12 +9,15 @@ export const useGroupActionsDelete = ({ store }: { store?: Store<any> }) => {
   store = store || useStore()
   const { $gettext, $ngettext } = useGettext()
   const clientService = useClientService()
+  const loadingService = useLoadingService()
 
   const deleteGroups = async (groups) => {
     const graphClient = clientService.graphAuthenticated
     const promises = groups.map((group) => graphClient.groups.deleteGroup(group.id))
 
-    const results = await Promise.allSettled(promises)
+    const results = await loadingService.addTask(() => {
+      return Promise.allSettled(promises)
+    })
 
     const succeeded = results.filter((r) => r.status === 'fulfilled')
     if (succeeded.length) {
@@ -45,7 +48,10 @@ export const useGroupActionsDelete = ({ store }: { store?: Store<any> }) => {
               { groupCount: failed.length.toString() },
               true
             )
-      store.dispatch('showErrorMessage', { title })
+      store.dispatch('showErrorMessage', {
+        title,
+        errors: (failed as PromiseRejectedResult[]).map((f) => f.reason)
+      })
     }
 
     store.dispatch('hideModal')

diff --git a/packages/web-app-admin-settings/src/composables/actions/users/useUserActionsDelete.ts b/packages/web-app-admin-settings/src/composables/actions/users/useUserActionsDelete.ts
@@ -1,6 +1,6 @@
 import { computed, unref } from 'vue'
 import { Store } from 'vuex'
-import { eventBus, useCapabilityDeleteUsersDisabled } from 'web-pkg'
+import { eventBus, useCapabilityDeleteUsersDisabled, useLoadingService } from 'web-pkg'
 import { useClientService, useStore } from 'web-pkg/src/composables'
 import { UserAction, UserActionOptions } from 'web-pkg/src/composables/actions'
 import { useGettext } from 'vue3-gettext'
@@ -9,11 +9,14 @@ export const useUserActionsDelete = ({ store }: { store?: Store<any> }) => {
   store = store || useStore()
   const { $gettext, $ngettext } = useGettext()
   const clientService = useClientService()
+  const loadingService = useLoadingService()
 
   const deleteUsers = async (users) => {
     const graphClient = clientService.graphAuthenticated
     const promises = users.map((user) => graphClient.users.deleteUser(user.id))
-    const results = await Promise.allSettled(promises)
+    const results = await loadingService.addTask(() => {
+      return Promise.allSettled(promises)
+    })
 
     const succeeded = results.filter((r) => r.status === 'fulfilled')
     if (succeeded.length) {
@@ -44,7 +47,10 @@ export const useUserActionsDelete = ({ store }: { store?: Store<any> }) => {
               { userCount: failed.length.toString() },
               true
             )
-      store.dispatch('showErrorMessage', { title })
+      store.dispatch('showErrorMessage', {
+        title,
+        errors: (failed as PromiseRejectedResult[]).map((f) => f.reason)
+      })
     }
 
     store.dispatch('hideModal')

diff --git a/packages/web-app-admin-settings/src/views/Users.vue b/packages/web-app-admin-settings/src/views/Users.vue
@@ -363,7 +363,9 @@ export default defineComponent({
       sideBarLoading.value = true
       // Load additional user data
       const requests = unref(selectedUsers).map((user) => loadAdditionalUserDataTask.perform(user))
-      const results = await Promise.allSettled<Array<unknown>>(requests)
+      const results = await loadingService.addTask(() => {
+        return 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)
@@ -500,70 +502,163 @@ export default defineComponent({
     }
 
     const addUsersToGroups = async ({ users: affectedUsers, groups: groupsToAdd }) => {
-      try {
-        const client = clientService.graphAuthenticated
-        const usersToFetch = []
-        const addUsersToGroupsRequests = []
-        groupsToAdd.reduce((acc, group) => {
-          for (const user of affectedUsers) {
-            if (!user.memberOf.find((userGroup) => userGroup.id === group.id)) {
-              acc.push(client.groups.addMember(group.id, user.id, configurationManager.serverUrl))
-              if (!usersToFetch.includes(user.id)) {
-                usersToFetch.push(user.id)
-              }
+      const client = clientService.graphAuthenticated
+      const usersToFetch = []
+      const promises = groupsToAdd.reduce((acc, group) => {
+        for (const user of affectedUsers) {
+          if (!user.memberOf.find((userGroup) => userGroup.id === group.id)) {
+            acc.push(client.groups.addMember(group.id, user.id, configurationManager.serverUrl))
+            if (!usersToFetch.includes(user.id)) {
+              usersToFetch.push(user.id)
             }
           }
-          return acc
-        }, addUsersToGroupsRequests)
-        const usersResponse = await loadingService.addTask(async () => {
-          await Promise.all(addUsersToGroupsRequests)
-          return Promise.all(usersToFetch.map((userId) => client.users.getUser(userId)))
+        }
+        return acc
+      }, [])
+      if (!promises.length) {
+        const title = $ngettext(
+          'Group assignment already added',
+          'Group assignments already added',
+          affectedUsers.length * groupsToAdd.length
+        )
+        store.dispatch('showMessage', { title })
+        addToGroupsModalIsOpen.value = false
+        return
+      }
+
+      const results = await loadingService.addTask(() => {
+        return Promise.allSettled(promises)
+      })
+
+      const succeeded = results.filter((r) => r.status === 'fulfilled')
+      if (succeeded.length) {
+        const title =
+          succeeded.length === 1 && groupsToAdd.length === 1 && affectedUsers.length === 1
+            ? $gettext('Group assignment "%{group}" was added successfully', {
+                group: groupsToAdd[0].displayName
+              })
+            : $ngettext(
+                '%{groupAssignmentCount} group assignment was added successfully',
+                '%{groupAssignmentCount} group assignments were added successfully',
+                succeeded.length,
+                { groupAssignmentCount: succeeded.length.toString() },
+                true
+              )
+        store.dispatch('showMessage', { title })
+      }
+
+      const failed = results.filter((r) => r.status === 'rejected')
+      if (failed.length) {
+        failed.forEach(console.error)
+
+        const title =
+          failed.length === 1 && groupsToAdd.length === 1 && affectedUsers.length === 1
+            ? $gettext('Failed to add group assignment "%{group}"', {
+                group: groupsToAdd[0].displayName
+              })
+            : $ngettext(
+                'Failed to add %{groupAssignmentCount} group assignment',
+                'Failed to add %{groupAssignmentCount} group assignments',
+                failed.length,
+                { groupAssignmentCount: failed.length.toString() },
+                true
+              )
+        store.dispatch('showErrorMessage', {
+          title,
+          errors: (failed as PromiseRejectedResult[]).map((f) => f.reason)
         })
+      }
+
+      addToGroupsModalIsOpen.value = false
+
+      try {
+        const usersResponse = await Promise.all(
+          usersToFetch.map((userId) => client.users.getUser(userId))
+        )
         updateLocalUsers(usersResponse.map((r) => r.data))
-        await store.dispatch('showMessage', {
-          title: $gettext('Users were added to groups successfully')
-        })
-        addToGroupsModalIsOpen.value = false
       } catch (e) {
         console.error(e)
-        await store.dispatch('showErrorMessage', {
-          title: $gettext('Failed add users to group'),
-          error: e
-        })
       }
     }
 
     const removeUsersFromGroups = async ({ users: affectedUsers, groups: groupsToRemove }) => {
-      try {
-        const client = clientService.graphAuthenticated
-        const usersToFetch = []
-        const removeUsersToGroupsRequests = []
-        groupsToRemove.reduce((acc, group) => {
-          for (const user of affectedUsers) {
-            if (user.memberOf.find((userGroup) => userGroup.id === group.id)) {
-              acc.push(client.groups.deleteMember(group.id, user.id))
-              if (!usersToFetch.includes(user.id)) {
-                usersToFetch.push(user.id)
-              }
+      const client = clientService.graphAuthenticated
+      const usersToFetch = []
+      const promises = groupsToRemove.reduce((acc, group) => {
+        for (const user of affectedUsers) {
+          if (user.memberOf.find((userGroup) => userGroup.id === group.id)) {
+            acc.push(client.groups.deleteMember(group.id, user.id))
+            if (!usersToFetch.includes(user.id)) {
+              usersToFetch.push(user.id)
             }
           }
-          return acc
-        }, removeUsersToGroupsRequests)
-        const usersResponse = await loadingService.addTask(async () => {
-          await Promise.all(removeUsersToGroupsRequests)
-          return Promise.all(usersToFetch.map((userId) => client.users.getUser(userId)))
+        }
+        return acc
+      }, [])
+
+      if (!promises.length) {
+        const title = $ngettext(
+          'Group assignment already removed',
+          'Group assignments already removed',
+          affectedUsers.length * groupsToRemove.length
+        )
+        store.dispatch('showMessage', { title })
+        removeFromGroupsModalIsOpen.value = false
+        return
+      }
+
+      const results = await loadingService.addTask(() => {
+        return Promise.allSettled(promises)
+      })
+
+      const succeeded = results.filter((r) => r.status === 'fulfilled')
+      if (succeeded.length) {
+        const title =
+          succeeded.length === 1 && groupsToRemove.length === 1 && affectedUsers.length === 1
+            ? $gettext('Group assignment "%{group}" was deleted successfully', {
+                group: groupsToRemove[0].displayName
+              })
+            : $ngettext(
+                '%{groupAssignmentCount} group assignment was deleted successfully',
+                '%{groupAssignmentCount} group assignments were deleted successfully',
+                succeeded.length,
+                { groupAssignmentCount: succeeded.length.toString() },
+                true
+              )
+        store.dispatch('showMessage', { title })
+      }
+
+      const failed = results.filter((r) => r.status === 'rejected')
+      if (failed.length) {
+        failed.forEach(console.error)
+
+        const title =
+          failed.length === 1 && groupsToRemove.length === 1 && affectedUsers.length === 1
+            ? $gettext('Failed to delete group assignment "%{group}"', {
+                group: groupsToRemove[0].displayName
+              })
+            : $ngettext(
+                'Failed to delete %{groupAssignmentCount} group assignment',
+                'Failed to delete %{groupAssignmentCount} group assignments',
+                failed.length,
+                { groupAssignmentCount: failed.length.toString() },
+                true
+              )
+        store.dispatch('showErrorMessage', {
+          title,
+          errors: (failed as PromiseRejectedResult[]).map((f) => f.reason)
         })
+      }
+
+      removeFromGroupsModalIsOpen.value = false
+
+      try {
+        const usersResponse = await Promise.all(
+          usersToFetch.map((userId) => client.users.getUser(userId))
+        )
         updateLocalUsers(usersResponse.map((r) => r.data))
-        await store.dispatch('showMessage', {
-          title: $gettext('Users were removed from groups successfully')
-        })
-        removeFromGroupsModalIsOpen.value = false
       } catch (e) {
         console.error(e)
-        await store.dispatch('showErrorMessage', {
-          title: $gettext('Failed remove users from group'),
-          error: e
-        })
       }
     }
 
@@ -574,25 +669,63 @@ export default defineComponent({
       users: User[]
       value: boolean
     }) => {
+      affectedUsers = affectedUsers.filter(({ id }) => store.getters.user.uuid !== id)
+      const client = clientService.graphAuthenticated
+      const promises = affectedUsers.map((u) =>
+        client.users.editUser(u.id, { accountEnabled: value })
+      )
+      const results = await loadingService.addTask(() => {
+        return Promise.allSettled(promises)
+      })
+
+      const succeeded = results.filter((r) => r.status === 'fulfilled') as any
+      if (succeeded.length) {
+        const title =
+          succeeded.length === 1 && affectedUsers.length === 1
+            ? $gettext('Login for user "%{user}" was edited successfully', {
+                user: affectedUsers[0].displayName
+              })
+            : $ngettext(
+                '%{userCount} user login was edited successfully',
+                '%{userCount} users logins edited successfully',
+                succeeded.length,
+                { userCount: succeeded.length.toString() },
+                true
+              )
+        store.dispatch('showMessage', { title })
+      }
+
+      const failed = results.filter((r) => r.status === 'rejected')
+      if (failed.length) {
+        failed.forEach(console.error)
+
+        const title =
+          failed.length === 1 && affectedUsers.length === 1
+            ? $gettext('Failed edit login for user "%{user}"', {
+                user: affectedUsers[0].displayName
+              })
+            : $ngettext(
+                'Failed to edit %{userCount} user login',
+                'Failed to edit %{userCount} user logins',
+                failed.length,
+                { userCount: failed.length.toString() },
+                true
+              )
+        store.dispatch('showErrorMessage', {
+          title,
+          errors: (failed as PromiseRejectedResult[]).map((f) => f.reason)
+        })
+      }
+
+      editLoginModalIsOpen.value = false
+
       try {
-        affectedUsers = affectedUsers.filter(({ id }) => store.getters.user.uuid !== id)
-        const client = clientService.graphAuthenticated
-        const promises = affectedUsers.map((u) =>
-          client.users.editUser(u.id, { accountEnabled: value })
-        )
         const usersResponse = await loadingService.addTask(async () => {
-          await Promise.all(promises)
-          return Promise.all(affectedUsers.map((u) => client.users.getUser(u.id)))
+          return Promise.all(succeeded.map(({ value }) => client.users.getUser(value.data.id)))
         })
         updateLocalUsers(usersResponse.map((r) => r.data))
-        await store.dispatch('showMessage', { title: $gettext('Login was edited successfully') })
-        editLoginModalIsOpen.value = false
       } catch (e) {
         console.error(e)
-        return store.dispatch('showErrorMessage', {
-          title: $gettext('Failed to edit login'),
-          error: e
-        })
       }
     }
 

diff --git a/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts b/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts
@@ -77,13 +77,15 @@ const getClientService = () => {
   clientService.graphAuthenticated.users.getUser.mockResolvedValue(
     mock<AxiosResponse>({ data: getDefaultUser() })
   )
+  clientService.graphAuthenticated.users.editUser.mockResolvedValue(
+    mock<AxiosResponse>({ data: getDefaultUser() })
+  )
   clientService.graphAuthenticated.groups.listGroups.mockResolvedValue(
     mock<AxiosResponse>({ data: { value: [] } })
   )
   clientService.graphAuthenticated.applications.listApplications.mockResolvedValue(
     mock<AxiosResponse>({ data: { value: getDefaultApplications() } })
   )
-
   return clientService
 }
 

diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsAcceptShare.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsAcceptShare.ts
@@ -74,7 +74,8 @@ export const useFileActionsAcceptShare = ({ store }: { store?: Store<any> } = {}
         'Failed to accept the selected share.',
         'Failed to accept selected shares.',
         resources.length
-      )
+      ),
+      errors
     })
   }
-Original file line number
+Diff line change
@@ Expand Up @@
             'Failed to accept the selected share.',
             'Failed to accept selected shares.',
             resources.length
-          )
+          ),
+          errors
         })
       }
@@ Expand Down @@