[full-ci] Batch actions for accepting and declining shares

changelog/unreleased/enhancement-share-batch-actions

@@ -0,0 +1,9 @@
+Enhancement: Batch actions for accepting and declining shares
+
+We've added batch actions for accepting and declining multiple selected incoming shares at once.
+
+https://github.com/owncloud/web/issues/5204
+https://github.com/owncloud/web/pull/5374
+https://github.com/owncloud/web/issues/2513
+https://github.com/owncloud/web/issues/3101
+https://github.com/owncloud/web/issues/5435

packages/web-app-files/src/App.vue

@@ -17,7 +17,7 @@
       ref="filesSidebar"
       tabindex="-1"
       class="uk-width-1-1 uk-width-1-2@m uk-width-1-3@xl"
-      @reset="setHighlightedFile(null)"
+      @reset="$_destroySideBar_hideDetails"
       @beforeDestroy="focusSideBar"
       @mounted="focusSideBar"
       @fileChanged="focusSideBar"
@@ -27,6 +27,7 @@
 <script>
 import Mixins from './mixins'
 import MixinRoutes from './mixins/routes'
+import MixinDestroySideBar from './mixins/sidebar/destroySideBar'
 import { mapActions, mapGetters, mapMutations } from 'vuex'
 import AppBar from './components/AppBar/AppBar.vue'
 import ProgressBar from './components/Upload/ProgressBar.vue'
@@ -38,7 +39,7 @@ export default {
     ProgressBar,
     SideBar
   },
-  mixins: [Mixins, MixinRoutes],
+  mixins: [Mixins, MixinRoutes, MixinDestroySideBar],
   data() {
     return {
       createFolder: false,
@@ -63,7 +64,7 @@ export default {
   },
   watch: {
     $route() {
-      this.setHighlightedFile(null)
+      this.$_destroySideBar_hideDetails()
       this.resetFileSelection()
     }
   },
@@ -78,7 +79,7 @@ export default {
   },
 
   methods: {
-    ...mapActions('Files', ['dragOver', 'setHighlightedFile', 'resetFileSelection']),
+    ...mapActions('Files', ['dragOver', 'resetFileSelection']),
     ...mapActions(['showMessage']),
     ...mapMutations('Files', ['SET_APP_SIDEBAR_EXPANDED_ACCORDION']),
     ...mapMutations(['SET_SIDEBAR_FOOTER_CONTENT_COMPONENT']),
@@ -87,10 +88,6 @@ export default {
       console.info('trace', arguments)
     },
 
-    openSideBar(file, sideBarName) {
-      this.setHighlightedFile(file)
-      this.SET_APP_SIDEBAR_EXPANDED_ACCORDION(sideBarName)
-    },
     focusSideBar(component, event) {
       this.focus({
         from: document.activeElement,

packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue

@@ -3,6 +3,7 @@
     <template v-if="isTrashbinRoute">
       <oc-button
         v-if="selectedFiles.length > 0"
+        id="restore-selected-btn"
         key="restore-btn"
         variation="primary"
         class="oc-mr-s"
@@ -56,18 +57,43 @@
           <translate>Delete</translate>
         </oc-button>
       </div>
+      <div v-if="canAccept">
+        <oc-button
+          id="accept-selected-shares-btn"
+          key="accept-shares-btn"
+          variation="primary"
+          @click="acceptShares()"
+        >
+          <oc-icon name="check" />
+          <translate>Accept</translate>
+        </oc-button>
+      </div>
+      <div v-if="canDecline">
+        <oc-button
+          id="decline-selected-shares-btn"
+          key="decline-shares-btn"
+          variation="primary"
+          @click="declineShares()"
+        >
+          <oc-icon name="not_interested" />
+          <translate>Decline</translate>
+        </oc-button>
+      </div>
     </oc-grid>
   </div>
 </template>
 
 <script>
-import { mapGetters, mapActions } from 'vuex'
+import { mapGetters, mapActions, mapMutations } from 'vuex'
 
 import MixinRoutes from '../../../mixins/routes'
 import MixinDeleteResources from '../../../mixins/deleteResources'
 import { cloneStateObject } from '../../../helpers/store'
 import { canBeMoved } from '../../../helpers/permissions'
 import { checkRoute } from '../../../helpers/route'
+import { shareStatus } from '../../../helpers/shareStatus'
+import { triggerShareAction } from '../../../helpers/share/triggerShareAction'
+import PQueue from 'p-queue'
 
 export default {
   mixins: [MixinRoutes, MixinDeleteResources],
@@ -110,13 +136,42 @@ export default {
     },
 
     canDelete() {
+      if (this.isSharedWithMeRoute) {
+        return false
+      }
+
       if (this.isPublicFilesRoute) {
         return this.currentFolder.canBeDeleted()
       }
 
       return true
     },
 
+    canAccept() {
+      if (!this.isSharedWithMeRoute) {
+        return false
+      }
+      let canAccept = true
+      this.selectedFiles.forEach(file => {
+        if (file.status === shareStatus.accepted) {
+          canAccept = false
+        }
+      })
+
+      return canAccept
+    },
+
+    canDecline() {
+      if (!this.isSharedWithMeRoute) {
+        return false
+      }
+      let canDecline = true
+      this.selectedFiles.forEach(file => {
+        if (file.status === shareStatus.declined) canDecline = false
+      })
+      return canDecline
+    },
+
     displayBulkActions() {
       return this.$route.meta.hasBulkActions && this.selectedFiles.length > 0
     },
@@ -129,6 +184,7 @@ export default {
   methods: {
     ...mapActions('Files', ['removeFilesFromTrashbin', 'resetFileSelection', 'setHighlightedFile']),
     ...mapActions(['showMessage']),
+    ...mapMutations('Files', ['SELECT_RESOURCES', 'UPDATE_RESOURCE']),
 
     restoreFiles(resources = this.selectedFiles) {
       for (const resource of resources) {
@@ -189,6 +245,68 @@ export default {
           })
         }
       })
+    },
+
+    acceptShares() {
+      this.triggerShareActions(shareStatus.accepted)
+    },
+
+    declineShares() {
+      this.triggerShareActions(shareStatus.declined)
+    },
+
+    async triggerShareActions(newShareStatus) {
+      const errors = []
+      const triggerPromises = []
+      const triggerQueue = new PQueue({ concurrency: 4 })
+      this.selectedFiles.forEach(resource => {
+        triggerPromises.push(
+          triggerQueue.add(async () => {
+            try {
+              const share = await triggerShareAction(
+                resource,
+                newShareStatus,
+                !this.isOcis,
+                this.$client
+              )
+              if (share) {
+                this.UPDATE_RESOURCE(share)
+              }
+            } catch (error) {
+              errors.push(error)
+            }
+          })
+        )
+      })
+      await Promise.all(triggerPromises)
+
+      if (errors.length === 0) {
+        this.SELECT_RESOURCES([])
+        return
+      }
+
+      console.log(errors)
+      if (newShareStatus === shareStatus.accepted) {
+        this.showMessage({
+          title: this.$ngettext(
+            'Error while accepting the selected share.',
+            'Error while accepting selected shares.',
+            this.selectedFiles.length
+          ),
+          status: 'danger'
+        })
+        return
+      }
+      if (newShareStatus === shareStatus.declined) {
+        this.showMessage({
+          title: this.$ngettext(
+            'Error while declining the selected share.',
+            'Error while declining selected shares.',
+            this.selectedFiles.length
+          ),
+          status: 'danger'
+        })
+      }
     }
   }
 }

packages/web-app-files/src/helpers/resources.js

@@ -30,7 +30,7 @@ function _getFileExtension(name) {
 export function buildResource(resource) {
   const isFolder = resource.type === 'dir'
   const extension = _getFileExtension(resource.name)
-  return {
+  const result = {
     id: resource.fileInfo['{http://owncloud.org/ns}fileid'],
     fileId: resource.fileInfo['{http://owncloud.org/ns}fileid'],
     icon: isFolder ? 'folder' : getFileIcon(extension),
@@ -83,6 +83,7 @@ export function buildResource(resource) {
       return this.permissions.indexOf('S') >= 0
     }
   }
+  return result
 }
 
 export function attachIndicators(resource, sharesTree) {

packages/web-app-files/src/helpers/share/triggerShareAction.js

@@ -0,0 +1,43 @@
+import { buildSharedResource } from '../resources'
+import { shareStatus } from '../shareStatus'
+
+export async function triggerShareAction(resource, status, allowReSharing, $client) {
+  const method = _getRequestMethod(status)
+  if (!method) {
+    throw new Error('invalid new share status')
+  }
+
+  // exec share action
+  let response = await $client.requests.ocs({
+    service: 'apps/files_sharing',
+    action: `api/v1/shares/pending/${resource.share.id}`,
+    method
+  })
+
+  // exit on failure
+  if (response.status !== 200) {
+    throw new Error(response.statusText)
+  }
+
+  // get updated share from response and transform & return it
+  if (parseInt(response.headers.get('content-length')) > 0) {
+    response = await response.json()
+    if (response.ocs.data.length > 0) {
+      const share = response.ocs.data[0]
+      return buildSharedResource(share, true, allowReSharing)
+    }
+  }
+
+  return null
+}
+
+function _getRequestMethod(status) {
+  switch (status) {
+    case shareStatus.accepted:
+      return 'POST'
+    case shareStatus.declined:
+      return 'DELETE'
+    default:
+      return null
+  }
+}

packages/web-app-files/src/mixins/actions/acceptShare.js

@@ -0,0 +1,51 @@
+import { triggerShareAction } from '../../helpers/share/triggerShareAction'
+
+import { checkRoute } from '../../helpers/route'
+import MixinRoutes from '../routes'
+import { shareStatus } from '../../helpers/shareStatus'
+import { mapGetters, mapMutations } from 'vuex'
+
+export default {
+  mixins: [MixinRoutes],
+  computed: {
+    ...mapGetters(['isOcis']),
+    $_acceptShare_items() {
+      return [
+        {
+          icon: 'check',
+          handler: this.$_acceptShare_trigger,
+          label: () => this.$gettext('Accept share'),
+          isEnabled: ({ resource }) => {
+            if (!checkRoute(['files-shared-with-me'], this.$route.name)) {
+              return false
+            }
+
+            return [shareStatus.pending, shareStatus.declined].includes(resource.status)
+          },
+          componentType: 'oc-button',
+          class: 'oc-files-actions-sidebar-accept-share-trigger'
+        }
+      ]
+    }
+  },
+  methods: {
+    ...mapMutations('Files', ['UPDATE_RESOURCE']),
+    async $_acceptShare_trigger(resource) {
+      try {
+        const share = await triggerShareAction(
+          resource,
+          shareStatus.accepted,
+          !this.isOcis,
+          this.$client
+        )
+        this.UPDATE_RESOURCE(share)
+      } catch (error) {
+        console.log(error)
+        this.showMessage({
+          title: this.$gettext('Error while accepting the selected share.'),
+          status: 'danger'
+        })
+      }
+    }
+  }
+}