refactor: simplify code

owncloud · Sep 2, 2022 · d099815 · d099815
1 parent 5ba5d7b
commit d099815
Showing 1 changed file with 26 additions and 27 deletions.
diff --git a/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue b/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue
@@ -119,35 +119,34 @@ export default defineComponent({
       this.createModal(modal)
     },
 
-    $_ocCollaborators_deleteShare(share) {
-      this.deleteShare({
-        client: this.$client,
-        graphClient: this.graphClient,
-        share: share,
-        path: this.highlightedFile.path,
-        reloadResource: false
-      })
-        .then(() => {
-          this.hideModal()
-          this.showMessage({
-            title: this.$gettext('Share was removed successfully')
-          })
-          // current user was removed from the share.
-          if (share.collaborator.name === this.user.id) {
-            if (isLocationSpacesActive(this.$router, 'files-spaces-projects')) {
-              return this.$router.go()
-            }
-            return this.$router.push(createLocationSpaces('files-spaces-projects'))
-          }
+    async $_ocCollaborators_deleteShare(share) {
+      try {
+        await this.deleteShare({
+          client: this.$client,
+          graphClient: this.graphClient,
+          share: share,
+          path: this.highlightedFile.path,
+          reloadResource: false
+        })
+        this.showMessage({
+          title: this.$gettext('Share was removed successfully')
         })
-        .catch((error) => {
-          console.error(error)
-          this.hideModal()
-          this.showMessage({
-            title: this.$gettext('Failed to remove share'),
-            status: 'danger'
-          })
+        // current user was removed from the share.
+        if (share.collaborator.name === this.user.id) {
+          if (isLocationSpacesActive(this.$router, 'files-spaces-projects')) {
+            return this.$router.go()
+          }
+          return this.$router.push(createLocationSpaces('files-spaces-projects'))
+        }
+      } catch (error) {
+        console.error(error)
+        this.showMessage({
+          title: this.$gettext('Failed to remove share'),
+          status: 'danger'
         })
+      } finally {
+        this.hideModal()
+      }
     }
   }
 })