From 2bfbe61bfbc0dab06c606af6b1d8e51b252cbd91 Mon Sep 17 00:00:00 2001
From: elizavetaRa <svillyfly@mail.ru>
Date: Tue, 8 Jun 2021 16:22:18 +0200
Subject: [PATCH 01/22] batch actions for Accept and Decline in Shared with me

---
 .../src/components/BatchActions.vue           | 114 +++++++++++++++++-
 1 file changed, 112 insertions(+), 2 deletions(-)

diff --git a/packages/web-app-files/src/components/BatchActions.vue b/packages/web-app-files/src/components/BatchActions.vue
index 308d855e905..8344dbfc9fd 100644
--- a/packages/web-app-files/src/components/BatchActions.vue
+++ b/packages/web-app-files/src/components/BatchActions.vue
@@ -56,18 +56,32 @@
           <translate>Delete</translate>
         </oc-button>
       </div>
+      <div v-if="canAccept">
+        <oc-button id="accept-shares-btn" key="accept-shares-btn" @click="acceptShares()">
+          <oc-icon name="add" />
+          <translate>Accept</translate>
+        </oc-button>
+      </div>
+      <div v-if="canDecline">
+        <oc-button id="decline-shares-btn" key="decline-shares-btn" @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 { buildSharedResource } from '../helpers/resources'
 
 export default {
   mixins: [MixinRoutes, MixinDeleteResources],
@@ -110,13 +124,41 @@ export default {
     },
 
     canDelete() {
-      if (this.isPublicFilesRoute) {
+      if (this.isPublicFilesRoute && !checkRoute(['files-shared-with-me'], this.$route.name)) {
         return this.currentFolder.canBeDeleted()
       }
+      if (checkRoute(['files-shared-with-me'], this.$route.name)) {
+        return false
+      }
 
       return true
     },
 
+    canAccept() {
+      if (!checkRoute(['files-shared-with-me'], this.$route.name)) {
+        return false
+      }
+      let canAccept = true
+      this.selectedFiles.forEach(file => {
+        if (file.status === shareStatus.accepted) {
+          canAccept = false
+        }
+      })
+
+      return canAccept
+    },
+
+    canDecline() {
+      if (!checkRoute(['files-shared-with-me'], this.$route.name)) {
+        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 +171,12 @@ export default {
   methods: {
     ...mapActions('Files', ['removeFilesFromTrashbin', 'resetFileSelection', 'setHighlightedFile']),
     ...mapActions(['showMessage']),
+    ...mapMutations('Files', [
+      'LOAD_FILES',
+      'SELECT_RESOURCES',
+      'CLEAR_CURRENT_FILES_LIST',
+      'UPDATE_RESOURCE'
+    ]),
 
     restoreFiles(resources = this.selectedFiles) {
       for (const resource of resources) {
@@ -189,6 +237,68 @@ export default {
           })
         }
       })
+    },
+
+    acceptShares() {
+      this.selectedFiles.forEach(resource => {
+        this.triggerShareAction(resource, 'POST')
+      })
+    },
+
+    declineShares() {
+      this.selectedFiles.forEach(resource => {
+        this.triggerShareAction(resource, 'DELETE')
+      })
+    },
+
+    async triggerShareAction(resource, type) {
+      try {
+        // exec share action
+        let response = await this.$client.requests.ocs({
+          service: 'apps/files_sharing',
+          action: `api/v1/shares/pending/${resource.share.id}`,
+          method: type
+        })
+        // exit on failure
+        if (response.status !== 200) {
+          throw new Error(response.statusText)
+        }
+        // get updated share from response or re-fetch it
+        let share = null
+        // oc10
+        if (parseInt(response.headers.get('content-length')) > 0) {
+          response = await response.json()
+          if (response.ocs.data.length > 0) {
+            share = response.ocs.data[0]
+          }
+        } else {
+          // ocis
+          const { shareInfo } = await this.$client.shares.getShare(resource.share.id)
+          share = shareInfo
+        }
+        // update share in store
+        if (share) {
+          const sharedResource = await buildSharedResource(
+            share,
+            true,
+            !this.isOcis,
+            this.configuration.server,
+            this.getToken
+          )
+          this.UPDATE_RESOURCE(sharedResource)
+          this.SELECT_RESOURCES([])
+        }
+      } catch (error) {
+        // this.loadResources()
+        this.showMessage({
+          title: this.$gettext('Error while changing share state'),
+          desc: error.message,
+          status: 'danger',
+          autoClose: {
+            enabled: true
+          }
+        })
+      }
     }
   }
 }

From f13eab50c83c261bde522a3a34c563af9f51048f Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Thu, 24 Jun 2021 15:35:38 +0200
Subject: [PATCH 02/22] Move share action trigger into helper and create file
 action mixins

---
 .../src/components/BatchActions.vue           | 98 +++++++++----------
 .../src/helpers/share/triggerShareAction.js   | 50 ++++++++++
 .../src/mixins/actions/acceptShare.js         | 52 ++++++++++
 .../src/mixins/actions/declineShare.js        | 52 ++++++++++
 .../src/mixins/actions/delete.js              |  7 +-
 .../web-app-files/src/mixins/fileActions.js   | 18 +++-
 .../web-app-files/src/views/SharedWithMe.vue  | 87 ++++++----------
 7 files changed, 252 insertions(+), 112 deletions(-)
 create mode 100644 packages/web-app-files/src/helpers/share/triggerShareAction.js
 create mode 100644 packages/web-app-files/src/mixins/actions/acceptShare.js
 create mode 100644 packages/web-app-files/src/mixins/actions/declineShare.js

diff --git a/packages/web-app-files/src/components/BatchActions.vue b/packages/web-app-files/src/components/BatchActions.vue
index 8344dbfc9fd..5da5d0dce11 100644
--- a/packages/web-app-files/src/components/BatchActions.vue
+++ b/packages/web-app-files/src/components/BatchActions.vue
@@ -58,7 +58,7 @@
       </div>
       <div v-if="canAccept">
         <oc-button id="accept-shares-btn" key="accept-shares-btn" @click="acceptShares()">
-          <oc-icon name="add" />
+          <oc-icon name="check" />
           <translate>Accept</translate>
         </oc-button>
       </div>
@@ -81,7 +81,7 @@ import { cloneStateObject } from '../helpers/store'
 import { canBeMoved } from '../helpers/permissions'
 import { checkRoute } from '../helpers/route'
 import { shareStatus } from '../helpers/shareStatus'
-import { buildSharedResource } from '../helpers/resources'
+import { triggerShareAction } from '../helpers/share/triggerShareAction'
 
 export default {
   mixins: [MixinRoutes, MixinDeleteResources],
@@ -124,13 +124,14 @@ export default {
     },
 
     canDelete() {
-      if (this.isPublicFilesRoute && !checkRoute(['files-shared-with-me'], this.$route.name)) {
-        return this.currentFolder.canBeDeleted()
-      }
       if (checkRoute(['files-shared-with-me'], this.$route.name)) {
         return false
       }
 
+      if (this.isPublicFilesRoute) {
+        return this.currentFolder.canBeDeleted()
+      }
+
       return true
     },
 
@@ -240,63 +241,58 @@ export default {
     },
 
     acceptShares() {
-      this.selectedFiles.forEach(resource => {
-        this.triggerShareAction(resource, 'POST')
-      })
+      this.triggerShareActions(shareStatus.accepted)
     },
 
     declineShares() {
-      this.selectedFiles.forEach(resource => {
-        this.triggerShareAction(resource, 'DELETE')
-      })
+      this.triggerShareActions(shareStatus.declined)
     },
 
-    async triggerShareAction(resource, type) {
-      try {
-        // exec share action
-        let response = await this.$client.requests.ocs({
-          service: 'apps/files_sharing',
-          action: `api/v1/shares/pending/${resource.share.id}`,
-          method: type
-        })
-        // exit on failure
-        if (response.status !== 200) {
-          throw new Error(response.statusText)
-        }
-        // get updated share from response or re-fetch it
-        let share = null
-        // oc10
-        if (parseInt(response.headers.get('content-length')) > 0) {
-          response = await response.json()
-          if (response.ocs.data.length > 0) {
-            share = response.ocs.data[0]
-          }
-        } else {
-          // ocis
-          const { shareInfo } = await this.$client.shares.getShare(resource.share.id)
-          share = shareInfo
-        }
-        // update share in store
-        if (share) {
-          const sharedResource = await buildSharedResource(
-            share,
-            true,
+    triggerShareActions(newShareStatus) {
+      const errors = []
+      this.selectedFiles.forEach(async resource => {
+        try {
+          const share = await triggerShareAction(
+            resource,
+            newShareStatus,
             !this.isOcis,
+            this.$client,
             this.configuration.server,
             this.getToken
           )
-          this.UPDATE_RESOURCE(sharedResource)
-          this.SELECT_RESOURCES([])
+          if (share) {
+            this.UPDATE_RESOURCE(share)
+          }
+        } catch (error) {
+          errors.push(error)
         }
-      } catch (error) {
-        // this.loadResources()
+      })
+
+      if (errors.length === 0) {
+        this.SELECT_RESOURCES([])
+        return
+      }
+
+      console.log(errors)
+      if (newShareStatus === shareStatus.accepted) {
         this.showMessage({
-          title: this.$gettext('Error while changing share state'),
-          desc: error.message,
-          status: 'danger',
-          autoClose: {
-            enabled: true
-          }
+          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'
         })
       }
     }
diff --git a/packages/web-app-files/src/helpers/share/triggerShareAction.js b/packages/web-app-files/src/helpers/share/triggerShareAction.js
new file mode 100644
index 00000000000..53eb736627b
--- /dev/null
+++ b/packages/web-app-files/src/helpers/share/triggerShareAction.js
@@ -0,0 +1,50 @@
+import { buildSharedResource } from '../resources'
+import { shareStatus } from '../shareStatus'
+
+export async function triggerShareAction(
+  resource,
+  status,
+  allowReSharing,
+  $client,
+  serverUrl,
+  userToken
+) {
+  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, serverUrl, userToken)
+    }
+  }
+
+  return null
+}
+
+function _getRequestMethod(status) {
+  switch (status) {
+    case shareStatus.accepted:
+      return 'POST'
+    case shareStatus.declined:
+      return 'DELETE'
+    default:
+      return null
+  }
+}
diff --git a/packages/web-app-files/src/mixins/actions/acceptShare.js b/packages/web-app-files/src/mixins/actions/acceptShare.js
new file mode 100644
index 00000000000..67bd143f2e3
--- /dev/null
+++ b/packages/web-app-files/src/mixins/actions/acceptShare.js
@@ -0,0 +1,52 @@
+import { triggerShareAction } from '../../helpers/share/triggerShareAction'
+
+import { checkRoute } from '../../helpers/route'
+import MixinRoutes from '../routes'
+import { shareStatus } from '../../helpers/shareStatus'
+import { mapGetters } from 'vuex'
+
+export default {
+  mixins: [MixinRoutes],
+  computed: {
+    ...mapGetters(['configuration', 'getToken', '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: {
+    async $_acceptShare_trigger(resource) {
+      try {
+        const share = await triggerShareAction(
+          resource,
+          shareStatus.accepted,
+          !this.isOcis,
+          this.$client,
+          this.configuration.server,
+          this.getToken
+        )
+        this.UPDATE_RESOURCE(share)
+      } catch (error) {
+        console.log(error)
+        this.showMessage({
+          title: this.$gettext('Error while accepting the selected share.'),
+          status: 'danger'
+        })
+      }
+    }
+  }
+}
diff --git a/packages/web-app-files/src/mixins/actions/declineShare.js b/packages/web-app-files/src/mixins/actions/declineShare.js
new file mode 100644
index 00000000000..19f093ae7a1
--- /dev/null
+++ b/packages/web-app-files/src/mixins/actions/declineShare.js
@@ -0,0 +1,52 @@
+import { triggerShareAction } from '../../helpers/share/triggerShareAction'
+
+import { checkRoute } from '../../helpers/route'
+import MixinRoutes from '../routes'
+import { shareStatus } from '../../helpers/shareStatus'
+import { mapGetters } from 'vuex'
+
+export default {
+  mixins: [MixinRoutes],
+  computed: {
+    ...mapGetters(['configuration', 'getToken', 'isOcis']),
+    $_declineShare_items() {
+      return [
+        {
+          icon: 'not_interested',
+          handler: this.$_declineShare_trigger,
+          label: () => this.$gettext('Decline share'),
+          isEnabled: ({ resource }) => {
+            if (!checkRoute(['files-shared-with-me'], this.$route.name)) {
+              return false
+            }
+
+            return [shareStatus.pending, shareStatus.accepted].includes(resource.status)
+          },
+          componentType: 'oc-button',
+          class: 'oc-files-actions-sidebar-decline-share-trigger'
+        }
+      ]
+    }
+  },
+  methods: {
+    async $_declineShare_trigger(resource) {
+      try {
+        const share = await triggerShareAction(
+          resource,
+          shareStatus.declined,
+          !this.isOcis,
+          this.$client,
+          this.configuration.server,
+          this.getToken
+        )
+        this.UPDATE_RESOURCE(share)
+      } catch (error) {
+        console.log(error)
+        this.showMessage({
+          title: this.$gettext('Error while declining the selected share.'),
+          status: 'danger'
+        })
+      }
+    }
+  }
+}
diff --git a/packages/web-app-files/src/mixins/actions/delete.js b/packages/web-app-files/src/mixins/actions/delete.js
index 26e6dc048f2..0e2fdac83d4 100644
--- a/packages/web-app-files/src/mixins/actions/delete.js
+++ b/packages/web-app-files/src/mixins/actions/delete.js
@@ -8,12 +8,10 @@ export default {
       return [
         {
           icon: 'delete',
-          label: () => {
-            return this.$gettext('Delete')
-          },
+          label: () => this.$gettext('Delete'),
           handler: this.$_delete_trigger,
           isEnabled: ({ resource }) => {
-            if (checkRoute(['files-trashbin'], this.$route.name)) {
+            if (checkRoute(['files-shared-with-me', 'files-trashbin'], this.$route.name)) {
               return false
             }
 
@@ -23,6 +21,7 @@ export default {
           class: 'oc-files-actions-sidebar-delete-trigger'
         },
         {
+          // this menu item is ONLY for the trashbin (permanently delete a file/folder)
           icon: 'delete',
           label: () => this.$gettext('Delete'),
           handler: this.$_delete_trigger,
diff --git a/packages/web-app-files/src/mixins/fileActions.js b/packages/web-app-files/src/mixins/fileActions.js
index 3927e51d0cf..03ef710c81c 100644
--- a/packages/web-app-files/src/mixins/fileActions.js
+++ b/packages/web-app-files/src/mixins/fileActions.js
@@ -1,7 +1,9 @@
 import { mapGetters, mapActions, mapState } from 'vuex'
 
 import { checkRoute } from '../helpers/route'
+import AcceptShare from './actions/acceptShare'
 import Copy from './actions/copy'
+import DeclineShare from './actions/declineShare'
 import Delete from './actions/delete'
 import Download from './actions/download'
 import Favorite from './actions/favorite'
@@ -17,6 +19,8 @@ const actionsMixins = [
   'navigate',
   'download',
   'favorite',
+  'acceptShare',
+  'declineShare',
   'copy',
   'move',
   'rename',
@@ -28,7 +32,19 @@ export const EDITOR_MODE_EDIT = 'edit'
 export const EDITOR_MODE_CREATE = 'create'
 
 export default {
-  mixins: [Copy, Delete, Download, Favorite, Fetch, Move, Navigate, Rename, Restore],
+  mixins: [
+    AcceptShare,
+    Copy,
+    DeclineShare,
+    Delete,
+    Download,
+    Favorite,
+    Fetch,
+    Move,
+    Navigate,
+    Rename,
+    Restore
+  ],
   computed: {
     ...mapState(['apps']),
     ...mapGetters('Files', ['highlightedFile', 'currentFolder']),
diff --git a/packages/web-app-files/src/views/SharedWithMe.vue b/packages/web-app-files/src/views/SharedWithMe.vue
index 075769b3fae..b197364efbe 100644
--- a/packages/web-app-files/src/views/SharedWithMe.vue
+++ b/packages/web-app-files/src/views/SharedWithMe.vue
@@ -38,16 +38,18 @@
               v-if="[shareStatus.pending, shareStatus.declined].includes(resource.status)"
               size="small"
               class="file-row-share-status-action"
-              @click.stop="triggerShareAction(resource, 'POST')"
+              @click.stop="$_acceptShare_trigger(resource)"
             >
+              <oc-icon size="small" name="check" />
               <translate>Accept</translate>
             </oc-button>
             <oc-button
               v-if="[shareStatus.pending, shareStatus.accepted].includes(resource.status)"
               size="small"
               class="file-row-share-status-action oc-ml-s"
-              @click.stop="triggerShareAction(resource, 'DELETE')"
+              @click.stop="$_declineShare_trigger(resource)"
             >
+              <oc-icon size="small" name="not_interested" />
               <translate>Decline</translate>
             </oc-button>
             <span
@@ -80,8 +82,10 @@
 <script>
 import { mapGetters, mapState, mapActions, mapMutations } from 'vuex'
 import { shareStatus } from '../helpers/shareStatus'
-import { aggregateResourceShares, buildResource, buildSharedResource } from '../helpers/resources'
+import { aggregateResourceShares, buildResource } from '../helpers/resources'
 import FileActions from '../mixins/fileActions'
+import MixinAcceptShare from '../mixins/actions/acceptShare'
+import MixinDeclineShare from '../mixins/actions/declineShare'
 import MixinFilesListPositioning from '../mixins/filesListPositioning'
 import MixinFilesListPagination from '../mixins/filesListPagination'
 
@@ -95,9 +99,19 @@ import debounce from 'lodash-es/debounce'
 const visibilityObserver = new VisibilityObserver()
 
 export default {
-  components: { ListLoader, NoContentMessage, ListInfo },
+  components: {
+    ListLoader,
+    NoContentMessage,
+    ListInfo
+  },
 
-  mixins: [FileActions, MixinFilesListPositioning, MixinFilesListPagination],
+  mixins: [
+    FileActions,
+    MixinAcceptShare,
+    MixinDeclineShare,
+    MixinFilesListPositioning,
+    MixinFilesListPagination
+  ],
 
   data: () => ({
     loading: true,
@@ -198,7 +212,10 @@ export default {
         })
       }, 250)
 
-      visibilityObserver.observe(component.$el, { onEnter: debounced, onExit: debounced.cancel })
+      visibilityObserver.observe(component.$el, {
+        onEnter: debounced,
+        onExit: debounced.cancel
+      })
     },
 
     async loadResources() {
@@ -217,7 +234,10 @@ export default {
       rootFolder = buildResource(rootFolder)
 
       if (resources.length < 1) {
-        this.LOAD_FILES({ currentFolder: rootFolder, files: [] })
+        this.LOAD_FILES({
+          currentFolder: rootFolder,
+          files: []
+        })
         this.loading = false
 
         return
@@ -231,7 +251,10 @@ export default {
         this.getToken
       )
 
-      this.LOAD_FILES({ currentFolder: rootFolder, files: resources })
+      this.LOAD_FILES({
+        currentFolder: rootFolder,
+        files: resources
+      })
 
       // Load quota
       const user = await this.$client.users.getUser(this.user.id)
@@ -250,54 +273,6 @@ export default {
         default:
           return this.$gettext('Pending')
       }
-    },
-
-    async triggerShareAction(resource, type) {
-      try {
-        // exec share action
-        let response = await this.$client.requests.ocs({
-          service: 'apps/files_sharing',
-          action: `api/v1/shares/pending/${resource.share.id}`,
-          method: type
-        })
-
-        // exit on failure
-        if (response.status !== 200) {
-          throw new Error(response.statusText)
-        }
-        // get updated share from response or re-fetch it
-        let share = null
-        // oc10
-        if (parseInt(response.headers.get('content-length')) > 0) {
-          response = await response.json()
-
-          if (response.ocs.data.length > 0) {
-            share = response.ocs.data[0]
-          }
-        } else {
-          // ocis
-          const { shareInfo } = await this.$client.shares.getShare(resource.share.id)
-          share = shareInfo
-        }
-
-        // update share in store
-        if (share) {
-          const sharedResource = await buildSharedResource(
-            share,
-            true,
-            !this.isOcis,
-            this.configuration.server,
-            this.getToken
-          )
-          this.UPDATE_RESOURCE(sharedResource)
-        }
-      } catch (error) {
-        this.showMessage({
-          title: this.$gettext('Error while changing share state'),
-          desc: error.message,
-          status: 'danger'
-        })
-      }
     }
   }
 }

From da7ecf5b1fca894aae08aa63376a8459615e3866 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Thu, 24 Jun 2021 17:04:08 +0200
Subject: [PATCH 03/22] Remove unnecessary params

---
 .../AppBar/SelectedResources/BatchActions.vue         |  4 +---
 .../src/helpers/share/triggerShareAction.js           | 11 ++---------
 .../web-app-files/src/mixins/actions/acceptShare.js   |  6 ++----
 .../web-app-files/src/mixins/actions/declineShare.js  |  6 ++----
 4 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue b/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue
index 75ed18a187b..f16f97e7113 100644
--- a/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue
+++ b/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue
@@ -256,9 +256,7 @@ export default {
             resource,
             newShareStatus,
             !this.isOcis,
-            this.$client,
-            this.configuration.server,
-            this.getToken
+            this.$client
           )
           if (share) {
             this.UPDATE_RESOURCE(share)
diff --git a/packages/web-app-files/src/helpers/share/triggerShareAction.js b/packages/web-app-files/src/helpers/share/triggerShareAction.js
index 53eb736627b..cac8cf01988 100644
--- a/packages/web-app-files/src/helpers/share/triggerShareAction.js
+++ b/packages/web-app-files/src/helpers/share/triggerShareAction.js
@@ -1,14 +1,7 @@
 import { buildSharedResource } from '../resources'
 import { shareStatus } from '../shareStatus'
 
-export async function triggerShareAction(
-  resource,
-  status,
-  allowReSharing,
-  $client,
-  serverUrl,
-  userToken
-) {
+export async function triggerShareAction(resource, status, allowReSharing, $client) {
   const method = _getRequestMethod(status)
   if (!method) {
     throw new Error('invalid new share status')
@@ -31,7 +24,7 @@ export async function triggerShareAction(
     response = await response.json()
     if (response.ocs.data.length > 0) {
       const share = response.ocs.data[0]
-      return buildSharedResource(share, true, allowReSharing, serverUrl, userToken)
+      return buildSharedResource(share, true, allowReSharing)
     }
   }
 
diff --git a/packages/web-app-files/src/mixins/actions/acceptShare.js b/packages/web-app-files/src/mixins/actions/acceptShare.js
index 67bd143f2e3..f33cba1d63e 100644
--- a/packages/web-app-files/src/mixins/actions/acceptShare.js
+++ b/packages/web-app-files/src/mixins/actions/acceptShare.js
@@ -8,7 +8,7 @@ import { mapGetters } from 'vuex'
 export default {
   mixins: [MixinRoutes],
   computed: {
-    ...mapGetters(['configuration', 'getToken', 'isOcis']),
+    ...mapGetters(['isOcis']),
     $_acceptShare_items() {
       return [
         {
@@ -35,9 +35,7 @@ export default {
           resource,
           shareStatus.accepted,
           !this.isOcis,
-          this.$client,
-          this.configuration.server,
-          this.getToken
+          this.$client
         )
         this.UPDATE_RESOURCE(share)
       } catch (error) {
diff --git a/packages/web-app-files/src/mixins/actions/declineShare.js b/packages/web-app-files/src/mixins/actions/declineShare.js
index 19f093ae7a1..34c8e3d1bcc 100644
--- a/packages/web-app-files/src/mixins/actions/declineShare.js
+++ b/packages/web-app-files/src/mixins/actions/declineShare.js
@@ -8,7 +8,7 @@ import { mapGetters } from 'vuex'
 export default {
   mixins: [MixinRoutes],
   computed: {
-    ...mapGetters(['configuration', 'getToken', 'isOcis']),
+    ...mapGetters(['isOcis']),
     $_declineShare_items() {
       return [
         {
@@ -35,9 +35,7 @@ export default {
           resource,
           shareStatus.declined,
           !this.isOcis,
-          this.$client,
-          this.configuration.server,
-          this.getToken
+          this.$client
         )
         this.UPDATE_RESOURCE(share)
       } catch (error) {

From 3ff7e9d7e6c0991a3f0719c9fe7c269e3b03366f Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Fri, 25 Jun 2021 13:07:30 +0200
Subject: [PATCH 04/22] Move unit test from SharedWithMe view to helper

---
 .../helpers/share/triggerShareAction.spec.js  | 50 +++++++++++
 .../tests/unit/views/SharedWithMe.setup.js    | 89 -------------------
 .../tests/unit/views/SharedWithMe.spec.js     | 68 --------------
 3 files changed, 50 insertions(+), 157 deletions(-)
 create mode 100644 packages/web-app-files/tests/unit/helpers/share/triggerShareAction.spec.js
 delete mode 100644 packages/web-app-files/tests/unit/views/SharedWithMe.setup.js
 delete mode 100644 packages/web-app-files/tests/unit/views/SharedWithMe.spec.js

diff --git a/packages/web-app-files/tests/unit/helpers/share/triggerShareAction.spec.js b/packages/web-app-files/tests/unit/helpers/share/triggerShareAction.spec.js
new file mode 100644
index 00000000000..3bb562e85cb
--- /dev/null
+++ b/packages/web-app-files/tests/unit/helpers/share/triggerShareAction.spec.js
@@ -0,0 +1,50 @@
+import { triggerShareAction } from '../../../../src/helpers/share/triggerShareAction'
+import { shareStatus } from '../../../../src/helpers/shareStatus'
+
+import OwnCloud from 'owncloud-sdk'
+
+jest.unmock('axios')
+const $client = new OwnCloud()
+
+jest.mock('../../../../src/helpers/resources', () => ({
+  buildSharedResource: jest.fn(share => share)
+}))
+
+describe('method triggerShareAction', () => {
+  beforeEach(() => {
+    fetch.resetMocks()
+  })
+
+  it('throws error if invalid share status given', async () => {
+    const statusText = 'invalid new share status'
+    await expect(triggerShareAction(null, shareStatus.pending, true, null)).rejects.toThrow(
+      statusText
+    )
+  })
+
+  it('throws error if share action response status is not 200', async () => {
+    const statusText = 'status is not 200'
+    fetch.mockResponse(new Error(), { status: 404, statusText })
+    await expect(
+      triggerShareAction({ share: { id: 1 } }, shareStatus.accepted, true, $client)
+    ).rejects.toThrow(statusText)
+  })
+
+  it('silently fails when the response has a content-length header value of 0', async () => {
+    fetch.mockResponse('', {
+      headers: { 'content-length': 0 }
+    })
+    await expect(
+      triggerShareAction({ share: { id: 1 } }, shareStatus.accepted, true, $client)
+    ).resolves.toBeNull()
+  })
+
+  it('returns a resource of type share if content-length header is present and valid', async () => {
+    fetch.mockResponse(JSON.stringify({ ocs: { data: [{ id: 1 }] } }), {
+      headers: { 'content-length': 1 }
+    })
+    await expect(
+      triggerShareAction({ share: { id: 1 } }, shareStatus.accepted, true, $client)
+    ).resolves.toMatchObject({ id: 1 })
+  })
+})
diff --git a/packages/web-app-files/tests/unit/views/SharedWithMe.setup.js b/packages/web-app-files/tests/unit/views/SharedWithMe.setup.js
deleted file mode 100644
index d82a4e546dd..00000000000
--- a/packages/web-app-files/tests/unit/views/SharedWithMe.setup.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import { mount, createLocalVue, config } from '@vue/test-utils'
-import Vuex from 'vuex'
-import OwnCloud from 'owncloud-sdk'
-import SharedWithMe from '../../../src/views/SharedWithMe'
-import { createStore } from 'vuex-extensions'
-import DesignSystem from 'owncloud-design-system'
-
-config.mocks.$ngettext = str => str
-config.mocks.$gettextInterpolate = str => str
-
-const createFile = ({ id, status = 1, type = 'folder' }) => ({
-  id: `file-id-${id}`,
-  type,
-  status,
-  name: `file-name-${id}`,
-  path: `/file-path/${id}`,
-  extension: '',
-  share: {
-    id: `file-share-id-${id}`
-  },
-  indicators: []
-})
-
-const localVue = createLocalVue()
-localVue.prototype.$client = new OwnCloud()
-localVue.prototype.$client.init({ baseUrl: 'http://none.de' })
-localVue.use(Vuex)
-localVue.use(DesignSystem)
-
-export const store = createStore(Vuex.Store, {
-  getters: {
-    configuration: () => ({
-      options: {
-        disablePreviews: true
-      }
-    }),
-    getToken: () => '',
-    isOcis: () => true
-  },
-  modules: {
-    Files: {
-      state: {
-        resource: null,
-        currentPage: 1
-      },
-      getters: {
-        totalFilesCount: () => ({ files: 15, folders: 20 }),
-        selectedFiles: () => [],
-        activeFiles: () => [createFile({ id: 1 }), createFile({ id: 2, status: 2 })],
-        activeFilesCount: () => ({ files: 0, folders: 1 }),
-        inProgress: () => [null],
-        highlightedFile: () => null,
-        pages: () => 3
-      },
-      mutations: {
-        UPDATE_RESOURCE: (state, resource) => {
-          state.resource = resource
-        },
-        UPDATE_CURRENT_PAGE: () => {}
-      },
-      namespaced: true
-    }
-  }
-})
-
-export const wrapper = mount(
-  { ...SharedWithMe, created: jest.fn(), mounted: jest.fn() },
-  {
-    localVue,
-    store,
-    stubs: {
-      'router-link': true,
-      translate: true,
-      'oc-pagination': true
-    },
-    data: () => ({
-      loading: false
-    })
-  }
-)
-
-jest.mock('../../../src/helpers/resources', () => ({
-  buildSharedResource: jest.fn(share => share)
-}))
-
-export const showMessage = jest.spyOn(wrapper.vm, 'showMessage').mockImplementation(v => v)
-export const getShare = jest
-  .spyOn(localVue.prototype.$client.shares, 'getShare')
-  .mockImplementation(v => v)
diff --git a/packages/web-app-files/tests/unit/views/SharedWithMe.spec.js b/packages/web-app-files/tests/unit/views/SharedWithMe.spec.js
deleted file mode 100644
index 735191d81fb..00000000000
--- a/packages/web-app-files/tests/unit/views/SharedWithMe.spec.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import { wrapper, store, showMessage, getShare } from './SharedWithMe.setup'
-
-jest.unmock('axios')
-
-describe('SharedWithMe component', () => {
-  describe('method triggerShareAction', () => {
-    beforeEach(() => {
-      fetch.resetMocks()
-      store.reset()
-      showMessage.mockClear()
-      getShare.mockClear()
-    })
-
-    it('errors if status is not 200', async () => {
-      const statusText = 'status is not 200'
-      fetch.mockResponse(new Error(), { status: 404, statusText })
-      await wrapper
-        .findAll('.file-row-share-status-action')
-        .at(1)
-        .trigger('click')
-
-      expect(showMessage.mock.results[0].value.desc).toBe(statusText)
-    })
-
-    it('returns a share if content-length header is present and valid (oc10)', async () => {
-      fetch.mockResponse(JSON.stringify({ ocs: { data: [{ id: 1 }] } }), {
-        headers: { 'content-length': 1 }
-      })
-      await wrapper
-        .findAll('.file-row-share-status-action')
-        .at(1)
-        .trigger('click')
-      await wrapper.vm.$nextTick()
-
-      expect(store.state.Files.resource).toMatchObject({ id: 1 })
-      expect(getShare).toBeCalledTimes(0)
-    })
-
-    it('errors if content-length header is not valid (oc10)', async () => {
-      fetch.mockResponse(JSON.stringify({ ocs: { data: [{ id: 1 }] } }), {
-        headers: { 'content-length': 0 }
-      })
-
-      await wrapper
-        .findAll('.file-row-share-status-action')
-        .at(1)
-        .trigger('click')
-      await wrapper.vm.$nextTick()
-
-      expect(showMessage.mock.results[0]).toBeFalsy()
-    })
-
-    it('returns a share if content-length header is not present (ocis)', async () => {
-      const shareInfo = { id: 1, shareinfo: true }
-      fetch.mockResponse(JSON.stringify({ ocs: { data: [{ id: 1 }] } }), {})
-      getShare.mockReturnValueOnce({ shareInfo })
-
-      await wrapper
-        .findAll('.file-row-share-status-action')
-        .at(1)
-        .trigger('click')
-      await wrapper.vm.$nextTick()
-
-      expect(store.state.Files.resource).toMatchObject(shareInfo)
-      expect(getShare).toBeCalledTimes(1)
-    })
-  })
-})

From e10c0f2ba18aa5b087fbdf68845518a908ed37bf Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Fri, 25 Jun 2021 14:51:29 +0200
Subject: [PATCH 05/22] Fix tests for declining a share

---
 .../AppBar/SelectedResources/BatchActions.vue | 15 +++++++-
 .../src/mixins/actions/navigate.js            |  2 +-
 .../shareWithUsers.feature                    |  6 +--
 .../FilesPageElement/fileActionsMenu.js       | 34 ++++++++++++++---
 .../pageObjects/FilesPageElement/filesList.js | 18 +++++++++
 .../pageObjects/sharedWithMePage.js           | 38 +++++++++++++++++++
 .../stepDefinitions/filesContext.js           | 27 ++++++++++++-
 7 files changed, 126 insertions(+), 14 deletions(-)

diff --git a/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue b/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue
index f16f97e7113..d956c2c752f 100644
--- a/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue
+++ b/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"
@@ -57,13 +58,23 @@
         </oc-button>
       </div>
       <div v-if="canAccept">
-        <oc-button id="accept-shares-btn" key="accept-shares-btn" @click="acceptShares()">
+        <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-shares-btn" key="decline-shares-btn" @click="declineShares()">
+        <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>
diff --git a/packages/web-app-files/src/mixins/actions/navigate.js b/packages/web-app-files/src/mixins/actions/navigate.js
index 21acf5fbc5b..6c8413c2111 100644
--- a/packages/web-app-files/src/mixins/actions/navigate.js
+++ b/packages/web-app-files/src/mixins/actions/navigate.js
@@ -21,7 +21,7 @@ export default {
           canBeDefault: true,
           componentType: 'router-link',
           route: this.route,
-          class: 'oc-files-actions-sidebar-navigate'
+          class: 'oc-files-actions-sidebar-navigate-trigger'
         }
       ]
     },
diff --git a/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature
index affe6f3cead..8f9cb901328 100644
--- a/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature
+++ b/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature
@@ -95,7 +95,7 @@ Feature: Shares in share-with pages
     And user "Brian" has accepted the share "simple-folder" offered by user "Alice"
     And user "Brian" has logged in using the webUI
     When the user browses to the shared-with-me page using the webUI
-    And the user deletes folder "simple-folder" using the webUI
+    And the user unshares folder "simple-folder" using the webUI
     And the user browses to the folder "Shares" on the files page
     Then folder "simple-folder" should not be listed on the webUI
 
@@ -109,11 +109,11 @@ Feature: Shares in share-with pages
     And user "Brian" has accepted the share "lorem.txt" offered by user "Alice"
     And user "Brian" has logged in using the webUI
     And the user browses to the shared-with-me page using the webUI
-    When the user batch deletes these files using the webUI
+    When the user batch unshares these files using the webUI
       | name          |
       | simple-folder |
       | lorem.txt     |
-    Then the deleted elements should not be listed on the webUI
+    Then the unshared elements should be in declined state on the webUI
 
   @issue-3040 @issue-4113 @ocis-reva-issue-39
   Scenario: see resource owner of parent shares in "shared with others" and "favorites" list
diff --git a/tests/acceptance/pageObjects/FilesPageElement/fileActionsMenu.js b/tests/acceptance/pageObjects/FilesPageElement/fileActionsMenu.js
index 7cffb3f6f5d..7734bf9f9d0 100644
--- a/tests/acceptance/pageObjects/FilesPageElement/fileActionsMenu.js
+++ b/tests/acceptance/pageObjects/FilesPageElement/fileActionsMenu.js
@@ -5,7 +5,9 @@ module.exports = {
      * @readonly
      */
     FileAction: Object.freeze({
+      acceptShare: 'acceptShare',
       download: 'download',
+      declineShare: 'declineShare',
       delete: 'delete',
       favorite: 'favorite',
       unmarkFavorite: 'unmarkFavorite',
@@ -138,6 +140,18 @@ module.exports = {
     copy: function() {
       return this.performFileAction(this.FileAction.copy)
     },
+    /**
+     * Trigger accepting a share
+     */
+    acceptShare: function() {
+      return this.performFileAction(this.FileAction.acceptShare)
+    },
+    /**
+     * Trigger declining a share
+     */
+    declineShare: function() {
+      return this.performFileAction(this.FileAction.declineShare)
+    },
     /**
      * Open a resource in the media viewer via its file action
      */
@@ -160,11 +174,11 @@ module.exports = {
       locateStrategy: 'xpath'
     },
     deleteButtonInAccordion: {
-      selector: '//button[normalize-space()="Delete"]',
+      selector: '//button[contains(@class, "oc-files-actions-sidebar-delete-trigger")]',
       locateStrategy: 'xpath'
     },
     downloadButtonInAccordion: {
-      selector: '//button[normalize-space()="Download"]',
+      selector: '//button[contains(@class, "oc-files-actions-sidebar-download-trigger")]',
       locateStrategy: 'xpath'
     },
     favoriteButtonInAccordion: {
@@ -176,11 +190,11 @@ module.exports = {
       locateStrategy: 'xpath'
     },
     restoreButtonInAccordion: {
-      selector: '//button[normalize-space()="Restore"]',
+      selector: '//button[contains(@class, "oc-files-actions-sidebar-restore-trigger")]',
       locateStrategy: 'xpath'
     },
     renameButtonInAccordion: {
-      selector: '//button[normalize-space()="Rename"]',
+      selector: '//button[contains(@class, "oc-files-actions-sidebar-rename-trigger")]',
       locateStrategy: 'xpath'
     },
     // TODO: Merge with selectors in personalPage
@@ -194,11 +208,19 @@ module.exports = {
       selector: '.oc-modal-body-input .oc-text-input'
     },
     moveButtonInAccordion: {
-      selector: '//button[normalize-space()="Move"]',
+      selector: '//button[contains(@class, "oc-files-actions-sidebar-move-trigger")]',
       locateStrategy: 'xpath'
     },
     copyButtonInAccordion: {
-      selector: '//button[normalize-space()="Copy"]',
+      selector: '//button[contains(@class, "oc-files-actions-sidebar-copy-trigger")]',
+      locateStrategy: 'xpath'
+    },
+    acceptShareButtonInAccordion: {
+      selector: '//button[contains(@class, "oc-files-actions-sidebar-accept-share-trigger")]',
+      locateStrategy: 'xpath'
+    },
+    declineShareButtonInAccordion: {
+      selector: '//button[contains(@class, "oc-files-actions-sidebar-decline-share-trigger")]',
       locateStrategy: 'xpath'
     },
     mediaViewerButtonInAccordion: {
diff --git a/tests/acceptance/pageObjects/FilesPageElement/filesList.js b/tests/acceptance/pageObjects/FilesPageElement/filesList.js
index 2630c6c8dcc..529d5bc2768 100644
--- a/tests/acceptance/pageObjects/FilesPageElement/filesList.js
+++ b/tests/acceptance/pageObjects/FilesPageElement/filesList.js
@@ -48,6 +48,24 @@ module.exports = {
       await filesRow.openFileActionsMenu(resource).delete()
       return this
     },
+    /**
+     * @param {string} resource
+     * @returns {Promise<exports.commands>}
+     */
+    acceptShare: async function(resource) {
+      await this.waitForFileVisible(resource)
+      await filesRow.openFileActionsMenu(resource).acceptShare()
+      return this
+    },
+    /**
+     * @param {string} resource
+     * @returns {Promise<exports.commands>}
+     */
+    declineShare: async function(resource) {
+      await this.waitForFileVisible(resource)
+      await filesRow.openFileActionsMenu(resource).declineShare()
+      return this
+    },
     /**
      * @param {string} fromName
      * @param {string} toName
diff --git a/tests/acceptance/pageObjects/sharedWithMePage.js b/tests/acceptance/pageObjects/sharedWithMePage.js
index fd306772929..adcc084fe94 100644
--- a/tests/acceptance/pageObjects/sharedWithMePage.js
+++ b/tests/acceptance/pageObjects/sharedWithMePage.js
@@ -43,6 +43,41 @@ module.exports = {
         .useCss()
       return status
     },
+    /**
+     * Gets the displayed share status of a file by its name.
+     * Important: this function ignores the user who shared the file. The same file/foldername could
+     * be shared by different users. In that case you need to use the more precise `getShareStatusOfResource`
+     * instead.
+     *
+     * @param {string} filename
+     *
+     * @returns {Promise<string>}
+     */
+    getShareStatusOfResourceByName: async function(filename) {
+      let status
+      const requiredXpath =
+        this.api.page.FilesPageElement.filesList().getFileRowSelectorByFileName(filename) +
+        '/' +
+        this.elements.shareStatusOnFileRow.selector
+      await this.useXpath()
+        .waitForAnimationToFinish()
+        .api.getText(requiredXpath, result => {
+          if (result.status === 0) {
+            status = result.value === '' ? 'Accepted' : result.value
+          } else {
+            throw new Error(
+              `Expected: share status of the resource but found unexpected response: ${result.value.error}`
+            )
+          }
+        })
+        .useCss()
+      return status
+    },
+    batchDeclineShares: function() {
+      return this.waitForElementVisible('@batchDeclineSharesButton')
+        .click('@batchDeclineSharesButton')
+        .waitForAjaxCallsToStartAndFinish()
+    },
     /**
      * @param {string} filename
      * @param {string} action - It takes one of the following : Decline and Accept
@@ -122,6 +157,9 @@ module.exports = {
       selector:
         '/ancestor::tr[contains(@class, "oc-tbody-tr")]//button[contains(@class,"file-row-share-status-action")][normalize-space(.)="%s"]',
       locateStrategy: 'xpath'
+    },
+    batchDeclineSharesButton: {
+      selector: '#decline-selected-shares-btn'
     }
   }
 }
diff --git a/tests/acceptance/stepDefinitions/filesContext.js b/tests/acceptance/stepDefinitions/filesContext.js
index 68a83f59666..61b19f3504b 100644
--- a/tests/acceptance/stepDefinitions/filesContext.js
+++ b/tests/acceptance/stepDefinitions/filesContext.js
@@ -10,13 +10,15 @@ const backendHelper = require('../helpers/backendHelper')
 const { move } = require('../helpers/webdavHelper')
 const path = require('../helpers/path')
 const util = require('util')
-let deletedElements
 const { download } = require('../helpers/webdavHelper')
 const fs = require('fs')
 const sharingHelper = require('../helpers/sharingHelper')
 
+let deletedElements
+let unsharedElements
 Before(() => {
   deletedElements = []
+  unsharedElements = []
 })
 
 When('the user browses to the files page', () => {
@@ -264,7 +266,7 @@ Then('the following files should be listed on the files-drop page:', async funct
 })
 
 When('the user unshares file/folder {string} using the webUI', function(element) {
-  return client.page.FilesPageElement.filesList().deleteFile(element)
+  return client.page.FilesPageElement.filesList().declineShare(element)
 })
 
 When('the user uploads folder {string} using the webUI', function(element) {
@@ -439,6 +441,18 @@ Then('folder {string} should not be listed on the webUI', folder => {
     })
 })
 
+Then('the unshared elements should be in declined state on the webUI', async function() {
+  for (const element of unsharedElements) {
+    const state = await client.page.sharedWithMePage().getShareStatusOfResourceByName(element)
+    assert.strictEqual(
+      state,
+      'Declined',
+      `Expected resource '${element}' to be in 'Declined' state but found '${state}'`
+    )
+  }
+  return client
+})
+
 Then('the deleted elements should not be listed on the webUI', function() {
   return assertDeletedElementsAreNotListed()
 })
@@ -504,6 +518,15 @@ When('the user/public batch deletes the marked files using the webUI', function(
   return client.page.personalPage().deleteAllCheckedFiles()
 })
 
+When('the user batch unshares these files using the webUI', async function(shares) {
+  for (const item of shares.rows()) {
+    await client.page.FilesPageElement.filesList().toggleFileOrFolderCheckbox('enable', item[0])
+    unsharedElements.push(item[0])
+  }
+
+  return client.page.personalPage().unshareAllCheckedFiles()
+})
+
 When('the user batch deletes these files using the webUI', async function(fileOrFolders) {
   for (const item of fileOrFolders.rows()) {
     await client.page.FilesPageElement.filesList().toggleFileOrFolderCheckbox('enable', item[0])

From 27a774d63a87e6f44c9212ab0b5a5f6856d4dd3d Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Fri, 25 Jun 2021 14:53:06 +0200
Subject: [PATCH 06/22] Changelog item

---
 changelog/unreleased/enhancement-share-batch-actions | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 changelog/unreleased/enhancement-share-batch-actions

diff --git a/changelog/unreleased/enhancement-share-batch-actions b/changelog/unreleased/enhancement-share-batch-actions
new file mode 100644
index 00000000000..e57a0532e84
--- /dev/null
+++ b/changelog/unreleased/enhancement-share-batch-actions
@@ -0,0 +1,6 @@
+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

From dd65fca9ebb8b8375dc22c8fcfe2bc2e45184c71 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Fri, 25 Jun 2021 14:54:37 +0200
Subject: [PATCH 07/22] Remove unneeded mutation mappings

---
 .../components/AppBar/SelectedResources/BatchActions.vue   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue b/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue
index d956c2c752f..569cd022880 100644
--- a/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue
+++ b/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue
@@ -183,12 +183,7 @@ export default {
   methods: {
     ...mapActions('Files', ['removeFilesFromTrashbin', 'resetFileSelection', 'setHighlightedFile']),
     ...mapActions(['showMessage']),
-    ...mapMutations('Files', [
-      'LOAD_FILES',
-      'SELECT_RESOURCES',
-      'CLEAR_CURRENT_FILES_LIST',
-      'UPDATE_RESOURCE'
-    ]),
+    ...mapMutations('Files', ['SELECT_RESOURCES', 'UPDATE_RESOURCE']),
 
     restoreFiles(resources = this.selectedFiles) {
       for (const resource of resources) {

From 8e6e97c69f6a415e204a87d06e9ac0f8492ffb11 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Mon, 28 Jun 2021 13:53:43 +0200
Subject: [PATCH 08/22] Fix e2e test about declining share

---
 .../web-app-files/src/mixins/actions/acceptShare.js   |  3 ++-
 .../web-app-files/src/mixins/actions/declineShare.js  |  3 ++-
 .../deleteFilesFolders.feature                        |  4 ++--
 .../shareWithUsers.feature                            | 11 ++++++-----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/packages/web-app-files/src/mixins/actions/acceptShare.js b/packages/web-app-files/src/mixins/actions/acceptShare.js
index f33cba1d63e..a546f0e4276 100644
--- a/packages/web-app-files/src/mixins/actions/acceptShare.js
+++ b/packages/web-app-files/src/mixins/actions/acceptShare.js
@@ -3,7 +3,7 @@ import { triggerShareAction } from '../../helpers/share/triggerShareAction'
 import { checkRoute } from '../../helpers/route'
 import MixinRoutes from '../routes'
 import { shareStatus } from '../../helpers/shareStatus'
-import { mapGetters } from 'vuex'
+import { mapGetters, mapMutations } from 'vuex'
 
 export default {
   mixins: [MixinRoutes],
@@ -29,6 +29,7 @@ export default {
     }
   },
   methods: {
+    ...mapMutations('Files', ['UPDATE_RESOURCE']),
     async $_acceptShare_trigger(resource) {
       try {
         const share = await triggerShareAction(
diff --git a/packages/web-app-files/src/mixins/actions/declineShare.js b/packages/web-app-files/src/mixins/actions/declineShare.js
index 34c8e3d1bcc..486a957f437 100644
--- a/packages/web-app-files/src/mixins/actions/declineShare.js
+++ b/packages/web-app-files/src/mixins/actions/declineShare.js
@@ -3,7 +3,7 @@ import { triggerShareAction } from '../../helpers/share/triggerShareAction'
 import { checkRoute } from '../../helpers/route'
 import MixinRoutes from '../routes'
 import { shareStatus } from '../../helpers/shareStatus'
-import { mapGetters } from 'vuex'
+import { mapGetters, mapMutations } from 'vuex'
 
 export default {
   mixins: [MixinRoutes],
@@ -29,6 +29,7 @@ export default {
     }
   },
   methods: {
+    ...mapMutations('Files', ['UPDATE_RESOURCE']),
     async $_declineShare_trigger(resource) {
       try {
         const share = await triggerShareAction(
diff --git a/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature b/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature
index a70de1c2e52..d3e962087b1 100644
--- a/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature
+++ b/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature
@@ -239,8 +239,8 @@ Feature: deleting files and folders
     And user "Brian" has shared folder "simple-folder" with user "Alice"
     And user "Brian" has shared file "lorem.txt" with user "Alice"
     And the user has browsed to the shared-with-me page
-    When the user deletes folder "simple-folder" using the webUI
-    And the user deletes file "lorem.txt" using the webUI
+    When the user unshares folder "simple-folder" using the webUI
+    And the user unshares file "lorem.txt" using the webUI
     Then as "Alice" folder "simple-folder" should not exist
     And as "Alice" file "lorem.txt" should not exist
     And no message should be displayed on the webUI
diff --git a/tests/acceptance/features/webUISharingInternalUsersToRootShareWithPage/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsersToRootShareWithPage/shareWithUsers.feature
index 05638a4536a..d534ebc77f5 100644
--- a/tests/acceptance/features/webUISharingInternalUsersToRootShareWithPage/shareWithUsers.feature
+++ b/tests/acceptance/features/webUISharingInternalUsersToRootShareWithPage/shareWithUsers.feature
@@ -76,13 +76,14 @@ Feature: Shares in share-with pages
     Then file "collaborate-on-this.txt" should be listed on the webUI
 
 
-  Scenario: deleting an entry on the shared-with-me page unshares from self
+  Scenario: unsharing an entry on the shared-with-me page results in declined share
     Given user "Alice" has shared folder "simple-folder" with user "Brian"
     And user "Brian" has logged in using the webUI
     When the user browses to the shared-with-me page using the webUI
-    And the user deletes folder "simple-folder" using the webUI
-    And the user browses to the files page
-    Then folder "simple-folder" should not be listed on the webUI
+    And the user unshares folder "simple-folder" using the webUI
+    And the user closes the app-sidebar using the webUI
+    Then folder "simple-folder" shared by "Alice Hansen" should be in "Declined" state on the webUI
+    And as "Brian" folder "simple-folder" should not exist
 
   @issue-2898
   Scenario: see resource owner for direct shares in "shared with me"
@@ -118,4 +119,4 @@ Feature: Shares in share-with pages
       | name              |
       | simple-folder     |
       | lorem.txt         |
-    Then the deleted elements should not be listed on the webUI
\ No newline at end of file
+    Then the deleted elements should not be listed on the webUI

From 5b889e6058fd9d601b68bd82719540a98b305d36 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Mon, 28 Jun 2021 17:26:27 +0200
Subject: [PATCH 09/22] Use decline share action in all files view sidebar

---
 packages/web-app-files/src/helpers/resources.js           | 8 +++++++-
 packages/web-app-files/src/mixins/actions/declineShare.js | 6 +++++-
 packages/web-app-files/src/mixins/actions/delete.js       | 4 ++++
 packages/web-app-files/src/mixins/fileActions.js          | 6 +++---
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/packages/web-app-files/src/helpers/resources.js b/packages/web-app-files/src/helpers/resources.js
index c5048ffa4f5..f62e16615a1 100644
--- a/packages/web-app-files/src/helpers/resources.js
+++ b/packages/web-app-files/src/helpers/resources.js
@@ -7,6 +7,7 @@ import { getIndicators } from './statusIndicators'
 import { bitmaskToRole, checkPermission, permissionsBitmask } from './collaborators'
 import { shareTypes, userShareTypes } from './shareTypes'
 import { $gettext } from '../gettext'
+import { shareStatus } from './shareStatus'
 
 // Should we move this to ODS?
 export function getFileIcon(extension) {
@@ -30,7 +31,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 +84,11 @@ export function buildResource(resource) {
       return this.permissions.indexOf('S') >= 0
     }
   }
+  if (result.isReceivedShare()) {
+    // safe to assume that the share status is `accepted` because otherwise we wouldn't have received the file/folder via webdav
+    result.status = shareStatus.accepted
+  }
+  return result
 }
 
 export function attachIndicators(resource, sharesTree) {
diff --git a/packages/web-app-files/src/mixins/actions/declineShare.js b/packages/web-app-files/src/mixins/actions/declineShare.js
index 486a957f437..1fd03270a1d 100644
--- a/packages/web-app-files/src/mixins/actions/declineShare.js
+++ b/packages/web-app-files/src/mixins/actions/declineShare.js
@@ -16,7 +16,11 @@ export default {
           handler: this.$_declineShare_trigger,
           label: () => this.$gettext('Decline share'),
           isEnabled: ({ resource }) => {
-            if (!checkRoute(['files-shared-with-me'], this.$route.name)) {
+            if (!checkRoute(['files-shared-with-me', 'files-personal'], this.$route.name)) {
+              return false
+            }
+            if (!resource.isReceivedShare()) {
+              // not a received share, but an own file/folder. Use `delete` action instead.
               return false
             }
 
diff --git a/packages/web-app-files/src/mixins/actions/delete.js b/packages/web-app-files/src/mixins/actions/delete.js
index 0e2fdac83d4..6f624b33cda 100644
--- a/packages/web-app-files/src/mixins/actions/delete.js
+++ b/packages/web-app-files/src/mixins/actions/delete.js
@@ -14,6 +14,10 @@ export default {
             if (checkRoute(['files-shared-with-me', 'files-trashbin'], this.$route.name)) {
               return false
             }
+            if (resource.isReceivedShare()) {
+              // not an own file/folder, but a received share. Use `declineShare` action instead.
+              return false
+            }
 
             return resource.canBeDeleted()
           },
diff --git a/packages/web-app-files/src/mixins/fileActions.js b/packages/web-app-files/src/mixins/fileActions.js
index 03ef710c81c..a43ef5ae93a 100644
--- a/packages/web-app-files/src/mixins/fileActions.js
+++ b/packages/web-app-files/src/mixins/fileActions.js
@@ -19,13 +19,13 @@ const actionsMixins = [
   'navigate',
   'download',
   'favorite',
-  'acceptShare',
-  'declineShare',
   'copy',
   'move',
   'rename',
   'restore',
-  'delete'
+  'delete',
+  'acceptShare',
+  'declineShare'
 ]
 
 export const EDITOR_MODE_EDIT = 'edit'

From cc63a9e12567f18dd12a53f143fcb6e30be221c6 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Mon, 28 Jun 2021 23:15:00 +0200
Subject: [PATCH 10/22] Make highlighted file reactive

---
 packages/web-app-files/src/store/getters.js   | 7 +++++--
 packages/web-app-files/src/store/mutations.js | 8 ++++----
 packages/web-app-files/src/store/state.js     | 2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/web-app-files/src/store/getters.js b/packages/web-app-files/src/store/getters.js
index 7cebc62d147..7020d1c2677 100644
--- a/packages/web-app-files/src/store/getters.js
+++ b/packages/web-app-files/src/store/getters.js
@@ -78,13 +78,16 @@ export default {
     // whenever no file is selected / no sidebar is open.
     // else it means we're loading the shares only for the sidebar contents and shouldn't
     // be showing a progress bar for the whole folder
-    return state.loadingFolder || (state.highlightedFile === null && state.sharesTreeLoading)
+    return state.loadingFolder || (state.highlightedResourceId === null && state.sharesTreeLoading)
   },
   quota: state => {
     return state.quota
   },
   highlightedFile: state => {
-    return state.highlightedFile
+    if (state.highlightedResourceId) {
+      return state.files.find(r => r.id === state.highlightedResourceId)
+    }
+    return null
   },
   publicLinkPassword: state => {
     // we need to use the state for reactivity
diff --git a/packages/web-app-files/src/store/mutations.js b/packages/web-app-files/src/store/mutations.js
index 5d51b9f2df2..d79993f46ff 100644
--- a/packages/web-app-files/src/store/mutations.js
+++ b/packages/web-app-files/src/store/mutations.js
@@ -116,11 +116,11 @@ export default {
   },
   UPDATE_CURRENT_FILE_SHARE_TYPES(state) {
     const files = [...state.files]
-    if (!state.highlightedFile) {
+    if (!state.highlightedResourceId) {
       return
     }
     const fileIndex = files.findIndex(f => {
-      return f.id === state.highlightedFile.id
+      return f.id === state.highlightedResourceId
     })
     files[fileIndex].shareTypes = computeShareTypes(state.currentFileOutgoingShares)
     state.files = files
@@ -222,7 +222,7 @@ export default {
       }
       file = state.files[fileIndex]
     }
-    state.highlightedFile = file
+    state.highlightedResourceId = file ? file.id : file
   },
   SET_PUBLIC_LINK_PASSWORD(state, password) {
     // cache into state for reactivity
@@ -249,7 +249,7 @@ export default {
   CLEAR_CURRENT_FILES_LIST(state) {
     state.currentFolder = null
     state.selected = []
-    state.highlightedFile = null
+    state.highlightedResourceId = null
     // release blob urls
     state.files.forEach(item => {
       if (item.previewUrl && item.previewUrl.startsWith('blob:')) {
diff --git a/packages/web-app-files/src/store/state.js b/packages/web-app-files/src/store/state.js
index 0beab8a10f8..6b76407e777 100644
--- a/packages/web-app-files/src/store/state.js
+++ b/packages/web-app-files/src/store/state.js
@@ -47,7 +47,7 @@ export default {
   sharesTreeLoading: false,
 
   loadingFolder: false,
-  highlightedFile: null,
+  highlightedResourceId: null,
   publicLinkPassword: null,
   uploaded: [],
   actionsInProgress: [],

From 7ebf005a6890b1bdfc21cbfdcaac4cc0c75284b2 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Tue, 29 Jun 2021 00:22:25 +0200
Subject: [PATCH 11/22] Introduce mixins for data mod when mounting and
 destroying sidebar

---
 packages/web-app-files/src/App.vue            | 13 +++-----
 .../src/mixins/sidebar/destroySideBar.js      | 10 ++++++
 .../src/mixins/sidebar/mountSideBar.js        | 32 +++++++++++++++++++
 .../web-app-files/src/views/Favorites.vue     |  7 ++--
 packages/web-app-files/src/views/Personal.vue | 10 +++---
 .../web-app-files/src/views/PublicFiles.vue   |  8 +++--
 .../web-app-files/src/views/SharedViaLink.vue |  7 ++--
 .../web-app-files/src/views/SharedWithMe.vue  |  8 +++--
 .../src/views/SharedWithOthers.vue            |  7 ++--
 packages/web-app-files/src/views/Trashbin.vue |  8 ++---
 10 files changed, 79 insertions(+), 31 deletions(-)
 create mode 100644 packages/web-app-files/src/mixins/sidebar/destroySideBar.js
 create mode 100644 packages/web-app-files/src/mixins/sidebar/mountSideBar.js

diff --git a/packages/web-app-files/src/App.vue b/packages/web-app-files/src/App.vue
index d8bf99dd68d..dc25553a238 100644
--- a/packages/web-app-files/src/App.vue
+++ b/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,
diff --git a/packages/web-app-files/src/mixins/sidebar/destroySideBar.js b/packages/web-app-files/src/mixins/sidebar/destroySideBar.js
new file mode 100644
index 00000000000..afd21b98feb
--- /dev/null
+++ b/packages/web-app-files/src/mixins/sidebar/destroySideBar.js
@@ -0,0 +1,10 @@
+import { mapActions } from 'vuex'
+
+export default {
+  methods: {
+    ...mapActions('Files', ['setHighlightedFile']),
+    $_destroySideBar_hideDetails() {
+      this.setHighlightedFile(null)
+    }
+  }
+}
diff --git a/packages/web-app-files/src/mixins/sidebar/mountSideBar.js b/packages/web-app-files/src/mixins/sidebar/mountSideBar.js
new file mode 100644
index 00000000000..0bb3c590832
--- /dev/null
+++ b/packages/web-app-files/src/mixins/sidebar/mountSideBar.js
@@ -0,0 +1,32 @@
+import { mapActions, mapGetters, mapMutations } from 'vuex'
+import { buildCollaboratorShare } from '../../helpers/resources'
+import { cloneDeep } from 'lodash-es'
+
+export default {
+  computed: {
+    ...mapGetters(['isOcis'])
+  },
+  methods: {
+    ...mapMutations('Files', ['UPDATE_RESOURCE']),
+    ...mapActions('Files', ['setHighlightedFile']),
+    async $_mountSideBar_showDetails(resource) {
+      // FIXME: to be improved when switching to graph api
+      if (resource.isReceivedShare() && !resource.share) {
+        // there are some pages where the share information is not pre-loaded. fetch on demand (upon mounting the sidebar)
+        const response = await this.$client.shares.getShares(resource.path, {
+          shared_with_me: true
+        })
+        const shares = response.map(element => {
+          return buildCollaboratorShare(element.shareInfo, resource, !this.isOcis)
+        })
+        if (shares?.length === 1) {
+          const r = cloneDeep(resource)
+          r.share = shares[0]
+          this.UPDATE_RESOURCE(r)
+        }
+      }
+
+      this.setHighlightedFile(resource)
+    }
+  }
+}
diff --git a/packages/web-app-files/src/views/Favorites.vue b/packages/web-app-files/src/views/Favorites.vue
index 0d3157937ee..484f646d668 100644
--- a/packages/web-app-files/src/views/Favorites.vue
+++ b/packages/web-app-files/src/views/Favorites.vue
@@ -19,7 +19,7 @@
         :target-route="targetRoute"
         :highlighted="highlightedFile ? highlightedFile.id : null"
         :header-position="headerPosition"
-        @showDetails="setHighlightedFile"
+        @showDetails="$_mountSideBar_showDetails"
         @fileClick="$_fileActions_triggerDefaultAction"
         @rowMounted="rowMounted"
       >
@@ -55,6 +55,7 @@ import { buildResource } from '../helpers/resources'
 import FileActions from '../mixins/fileActions'
 import MixinFilesListPositioning from '../mixins/filesListPositioning'
 import MixinFilesListPagination from '../mixins/filesListPagination'
+import MixinMountSideBar from '../mixins/sidebar/mountSideBar'
 
 import QuickActions from '../components/FilesList/QuickActions.vue'
 import ListLoader from '../components/FilesList/ListLoader.vue'
@@ -69,7 +70,7 @@ const visibilityObserver = new VisibilityObserver()
 export default {
   components: { QuickActions, ListLoader, NoContentMessage, ListInfo },
 
-  mixins: [FileActions, MixinFilesListPositioning, MixinFilesListPagination],
+  mixins: [FileActions, MixinFilesListPositioning, MixinFilesListPagination, MixinMountSideBar],
 
   data: () => ({
     loading: true
@@ -145,7 +146,7 @@ export default {
   },
 
   methods: {
-    ...mapActions('Files', ['setHighlightedFile', 'loadIndicators', 'loadPreview']),
+    ...mapActions('Files', ['loadIndicators', 'loadPreview']),
     ...mapMutations('Files', ['SELECT_RESOURCES', 'LOAD_FILES', 'CLEAR_CURRENT_FILES_LIST']),
     ...mapMutations(['SET_QUOTA']),
 
diff --git a/packages/web-app-files/src/views/Personal.vue b/packages/web-app-files/src/views/Personal.vue
index 89cc229de13..d5dd4d6b515 100644
--- a/packages/web-app-files/src/views/Personal.vue
+++ b/packages/web-app-files/src/views/Personal.vue
@@ -27,7 +27,7 @@
         :target-route="targetRoute"
         :highlighted="highlightedFile ? highlightedFile.id : null"
         :header-position="headerPosition"
-        @showDetails="setHighlightedFile"
+        @showDetails="$_mountSideBar_showDetails"
         @fileClick="$_fileActions_triggerDefaultAction"
         @rowMounted="rowMounted"
       >
@@ -71,6 +71,7 @@ import MixinFileActions from '../mixins/fileActions'
 import MixinFilesListScrolling from '../mixins/filesListScrolling'
 import MixinFilesListPositioning from '../mixins/filesListPositioning'
 import MixinFilesListPagination from '../mixins/filesListPagination'
+import MixinMountSideBar from '../mixins/sidebar/mountSideBar'
 import { buildResource } from '../helpers/resources'
 
 import QuickActions from '../components/FilesList/QuickActions.vue'
@@ -91,7 +92,8 @@ export default {
     MixinFileActions,
     MixinFilesListPositioning,
     MixinFilesListScrolling,
-    MixinFilesListPagination
+    MixinFilesListPagination,
+    MixinMountSideBar
   ],
 
   data: () => ({
@@ -190,7 +192,7 @@ export default {
   },
 
   methods: {
-    ...mapActions('Files', ['setHighlightedFile', 'loadIndicators', 'loadPreview']),
+    ...mapActions('Files', ['loadIndicators', 'loadPreview']),
     ...mapMutations('Files', [
       'SELECT_RESOURCES',
       'SET_CURRENT_FOLDER',
@@ -260,7 +262,7 @@ export default {
           const resource = this.activeFiles.find(r => r.name === resourceName)
 
           if (resource) {
-            this.setHighlightedFile(resource)
+            this.$_mountSideBar_showDetails(resource)
             this.scrollToResource(resource)
           }
         })
diff --git a/packages/web-app-files/src/views/PublicFiles.vue b/packages/web-app-files/src/views/PublicFiles.vue
index 1098bb6d43f..908f3d8f0f3 100644
--- a/packages/web-app-files/src/views/PublicFiles.vue
+++ b/packages/web-app-files/src/views/PublicFiles.vue
@@ -27,7 +27,7 @@
         :target-route="targetRoute"
         :highlighted="highlightedFile ? highlightedFile.id : null"
         :header-position="headerPosition"
-        @showDetails="setHighlightedFile"
+        @showDetails="$_mountSideBar_showDetails"
         @fileClick="$_fileActions_triggerDefaultAction"
         @rowMounted="rowMounted"
       >
@@ -59,6 +59,7 @@ import MixinAccessibleBreadcrumb from '../mixins/accessibleBreadcrumb'
 import MixinFileActions from '../mixins/fileActions'
 import MixinFilesListPositioning from '../mixins/filesListPositioning'
 import MixinFilesListPagination from '../mixins/filesListPagination'
+import MixinMountSideBar from '../mixins/sidebar/mountSideBar'
 
 import { buildResource } from '../helpers/resources'
 import ListLoader from '../components/FilesList/ListLoader.vue'
@@ -82,7 +83,8 @@ export default {
     MixinAccessibleBreadcrumb,
     MixinFileActions,
     MixinFilesListPositioning,
-    MixinFilesListPagination
+    MixinFilesListPagination,
+    MixinMountSideBar
   ],
 
   data: () => ({
@@ -161,7 +163,7 @@ export default {
     visibilityObserver.disconnect()
   },
   methods: {
-    ...mapActions('Files', ['setHighlightedFile', 'loadPreview']),
+    ...mapActions('Files', ['loadPreview']),
     ...mapMutations('Files', [
       'SELECT_RESOURCES',
       'SET_CURRENT_FOLDER',
diff --git a/packages/web-app-files/src/views/SharedViaLink.vue b/packages/web-app-files/src/views/SharedViaLink.vue
index 448e7c23d75..f15770e5526 100644
--- a/packages/web-app-files/src/views/SharedViaLink.vue
+++ b/packages/web-app-files/src/views/SharedViaLink.vue
@@ -23,7 +23,7 @@
         :target-route="targetRoute"
         :highlighted="highlightedFile ? highlightedFile.id : null"
         :header-position="headerPosition"
-        @showDetails="setHighlightedFile"
+        @showDetails="$_mountSideBar_showDetails"
         @fileClick="$_fileActions_triggerDefaultAction"
         @rowMounted="rowMounted"
       >
@@ -56,6 +56,7 @@ import FileActions from '../mixins/fileActions'
 import MixinFilesListPositioning from '../mixins/filesListPositioning'
 import MixinResources from '../mixins/resources'
 import MixinFilesListPagination from '../mixins/filesListPagination'
+import MixinMountSideBar from '../mixins/sidebar/mountSideBar'
 
 import ListLoader from '../components/FilesList/ListLoader.vue'
 import NoContentMessage from '../components/FilesList/NoContentMessage.vue'
@@ -69,7 +70,7 @@ const visibilityObserver = new VisibilityObserver()
 export default {
   components: { ListLoader, NoContentMessage, ListInfo },
 
-  mixins: [FileActions, MixinFilesListPositioning, MixinResources, MixinFilesListPagination],
+  mixins: [FileActions, MixinFilesListPositioning, MixinResources, MixinFilesListPagination, MixinMountSideBar],
 
   data: () => ({
     loading: true
@@ -144,7 +145,7 @@ export default {
   },
 
   methods: {
-    ...mapActions('Files', ['setHighlightedFile', 'loadIndicators', 'loadPreview']),
+    ...mapActions('Files', ['loadIndicators', 'loadPreview']),
     ...mapMutations('Files', ['LOAD_FILES', 'SELECT_RESOURCES', 'CLEAR_CURRENT_FILES_LIST']),
     ...mapMutations(['SET_QUOTA']),
 
diff --git a/packages/web-app-files/src/views/SharedWithMe.vue b/packages/web-app-files/src/views/SharedWithMe.vue
index 87e9d1bc2cc..ddb115c0582 100644
--- a/packages/web-app-files/src/views/SharedWithMe.vue
+++ b/packages/web-app-files/src/views/SharedWithMe.vue
@@ -25,7 +25,7 @@
         :target-route="targetRoute"
         :highlighted="highlightedFile ? highlightedFile.id : null"
         :header-position="headerPosition"
-        @showDetails="setHighlightedFile"
+        @showDetails="$_mountSideBar_showDetails"
         @fileClick="$_fileActions_triggerDefaultAction"
         @rowMounted="rowMounted"
       >
@@ -88,6 +88,7 @@ import MixinAcceptShare from '../mixins/actions/acceptShare'
 import MixinDeclineShare from '../mixins/actions/declineShare'
 import MixinFilesListPositioning from '../mixins/filesListPositioning'
 import MixinFilesListPagination from '../mixins/filesListPagination'
+import MixinMountSideBar from '../mixins/sidebar/mountSideBar'
 
 import ListLoader from '../components/FilesList/ListLoader.vue'
 import NoContentMessage from '../components/FilesList/NoContentMessage.vue'
@@ -110,7 +111,8 @@ export default {
     MixinAcceptShare,
     MixinDeclineShare,
     MixinFilesListPositioning,
-    MixinFilesListPagination
+    MixinFilesListPagination,
+    MixinMountSideBar
   ],
 
   data: () => ({
@@ -186,7 +188,7 @@ export default {
   },
 
   methods: {
-    ...mapActions('Files', ['setHighlightedFile', 'loadIndicators', 'loadPreview', 'loadAvatars']),
+    ...mapActions('Files', ['loadIndicators', 'loadPreview', 'loadAvatars']),
     ...mapActions(['showMessage']),
     ...mapMutations('Files', [
       'LOAD_FILES',
diff --git a/packages/web-app-files/src/views/SharedWithOthers.vue b/packages/web-app-files/src/views/SharedWithOthers.vue
index 1fd29a10aff..50f1ad481cf 100644
--- a/packages/web-app-files/src/views/SharedWithOthers.vue
+++ b/packages/web-app-files/src/views/SharedWithOthers.vue
@@ -25,7 +25,7 @@
         :target-route="targetRoute"
         :highlighted="highlightedFile ? highlightedFile.id : null"
         :header-position="headerPosition"
-        @showDetails="setHighlightedFile"
+        @showDetails="$_mountSideBar_showDetails"
         @fileClick="$_fileActions_triggerDefaultAction"
         @rowMounted="rowMounted"
       >
@@ -58,6 +58,7 @@ import FileActions from '../mixins/fileActions'
 import MixinFilesListPositioning from '../mixins/filesListPositioning'
 import MixinResources from '../mixins/resources'
 import MixinFilesListPagination from '../mixins/filesListPagination'
+import MixinMountSideBar from '../mixins/sidebar/mountSideBar'
 
 import ListLoader from '../components/FilesList/ListLoader.vue'
 import NoContentMessage from '../components/FilesList/NoContentMessage.vue'
@@ -71,7 +72,7 @@ const visibilityObserver = new VisibilityObserver()
 export default {
   components: { ListLoader, NoContentMessage, ListInfo },
 
-  mixins: [FileActions, MixinFilesListPositioning, MixinResources, MixinFilesListPagination],
+  mixins: [FileActions, MixinFilesListPositioning, MixinResources, MixinFilesListPagination, MixinMountSideBar],
 
   data: () => ({
     loading: true
@@ -145,7 +146,7 @@ export default {
   },
 
   methods: {
-    ...mapActions('Files', ['setHighlightedFile', 'loadIndicators', 'loadPreview', 'loadAvatars']),
+    ...mapActions('Files', ['loadIndicators', 'loadPreview', 'loadAvatars']),
     ...mapMutations('Files', [
       'LOAD_FILES',
       'SELECT_RESOURCES',
diff --git a/packages/web-app-files/src/views/Trashbin.vue b/packages/web-app-files/src/views/Trashbin.vue
index 791ceeb59d7..90c57050580 100644
--- a/packages/web-app-files/src/views/Trashbin.vue
+++ b/packages/web-app-files/src/views/Trashbin.vue
@@ -24,7 +24,7 @@
         :highlighted="highlightedFile ? highlightedFile.id : null"
         :are-resources-clickable="false"
         :header-position="headerPosition"
-        @showDetails="setHighlightedFile"
+        @showDetails="$_mountSideBar_showDetails"
       >
         <template #footer>
           <oc-pagination
@@ -48,12 +48,13 @@
 </template>
 
 <script>
-import { mapGetters, mapActions, mapMutations, mapState } from 'vuex'
+import { mapGetters, mapMutations, mapState } from 'vuex'
 
 import { buildDeletedResource, buildResource } from '../helpers/resources'
 import MixinFilesListPositioning from '../mixins/filesListPositioning'
 import MixinResources from '../mixins/resources'
 import MixinFilesListPagination from '../mixins/filesListPagination'
+import MixinMountSideBar from '../mixins/sidebar/mountSideBar'
 
 import ListLoader from '../components/FilesList/ListLoader.vue'
 import NoContentMessage from '../components/FilesList/NoContentMessage.vue'
@@ -62,7 +63,7 @@ import ListInfo from '../components/FilesList/ListInfo.vue'
 export default {
   components: { ListLoader, NoContentMessage, ListInfo },
 
-  mixins: [MixinFilesListPositioning, MixinResources, MixinFilesListPagination],
+  mixins: [MixinFilesListPositioning, MixinResources, MixinFilesListPagination, MixinMountSideBar],
 
   data: () => ({
     loading: true
@@ -123,7 +124,6 @@ export default {
   },
 
   methods: {
-    ...mapActions('Files', ['setHighlightedFile']),
     ...mapMutations('Files', ['LOAD_FILES', 'SELECT_RESOURCES', 'CLEAR_CURRENT_FILES_LIST']),
 
     async loadResources() {

From dc2e4c3163fafdcb9f2761bc32a0f6f45d97bd97 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Tue, 29 Jun 2021 10:01:54 +0200
Subject: [PATCH 12/22] Adjust tests about accepting shares

---
 .../acceptShares.feature                         | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/tests/acceptance/features/webUISharingAcceptSharesToRoot/acceptShares.feature b/tests/acceptance/features/webUISharingAcceptSharesToRoot/acceptShares.feature
index 8156606a9c4..0c404ba29f9 100644
--- a/tests/acceptance/features/webUISharingAcceptSharesToRoot/acceptShares.feature
+++ b/tests/acceptance/features/webUISharingAcceptSharesToRoot/acceptShares.feature
@@ -98,8 +98,8 @@ Feature: accept/decline shares coming from internal users
     And user "Alice" has shared folder "/simple-folder" with group "grp1"
     And user "Alice" has shared folder "/testimage.jpg" with user "Brian"
     And the user has browsed to the files page
-    When the user deletes folder "simple-folder" using the webUI
-    And the user deletes file "testimage.jpg" using the webUI
+    When the user unshares folder "simple-folder" using the webUI
+    And the user unshares file "testimage.jpg" using the webUI
     Then folder "simple-folder" should not be listed on the webUI
     And file "testimage.jpg" should not be listed on the webUI
     When the user browses to the shared-with-me page using the webUI
@@ -321,7 +321,7 @@ Feature: accept/decline shares coming from internal users
     And the user has browsed to the shared-with-me page
     When the user accepts share "lorem.txt" offered by user "Alice Hansen" using the webUI
     And the user browses to the files page
-    And the user deletes file "lorem.txt" using the webUI
+    And the user unshares file "lorem.txt" using the webUI
     Then file "lorem.txt" should not be listed on the webUI
     And file "testimage.jpg" should not be listed on the webUI
     When the user browses to the shared-with-me page using the webUI
@@ -353,16 +353,6 @@ Feature: accept/decline shares coming from internal users
     And file "lorem.txt" shared by "Alice Hansen" should be in "Declined" state on the webUI
     And folder "simple-folder" shared by "Alice Hansen" should be in "Declined" state on the webUI
 
-
-  Scenario: shared file status is changed to declined when user deletes the file
-    Given user "Alice" has created file "lorem.txt"
-    And user "Alice" has shared file "lorem.txt" with user "Brian"
-    And the user has reloaded the current page of the webUI
-    When the user deletes file "lorem.txt" using the webUI
-    And the user browses to the shared-with-me page
-    Then file "lorem.txt" shared by "Alice Hansen" should be in "Declined" state on the webUI
-
-
   Scenario: the deleted shared file is restored back to all files list when accepted from the shared with me file list
     Given user "Alice" has created file "lorem.txt"
     And user "Alice" has shared file "lorem.txt" with user "Brian"

From 745a28dbd9837b7cc96caf9f6a150639690dcf5d Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Tue, 29 Jun 2021 10:58:12 +0200
Subject: [PATCH 13/22] Remove resource after declining share when in personal
 route

---
 .../src/mixins/actions/declineShare.js        | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/packages/web-app-files/src/mixins/actions/declineShare.js b/packages/web-app-files/src/mixins/actions/declineShare.js
index 1fd03270a1d..bcefa384b7b 100644
--- a/packages/web-app-files/src/mixins/actions/declineShare.js
+++ b/packages/web-app-files/src/mixins/actions/declineShare.js
@@ -2,11 +2,12 @@ import { triggerShareAction } from '../../helpers/share/triggerShareAction'
 
 import { checkRoute } from '../../helpers/route'
 import MixinRoutes from '../routes'
+import MixinDestroySideBar from '../sidebar/destroySideBar'
 import { shareStatus } from '../../helpers/shareStatus'
 import { mapGetters, mapMutations } from 'vuex'
 
 export default {
-  mixins: [MixinRoutes],
+  mixins: [MixinRoutes, MixinDestroySideBar],
   computed: {
     ...mapGetters(['isOcis']),
     $_declineShare_items() {
@@ -33,7 +34,7 @@ export default {
     }
   },
   methods: {
-    ...mapMutations('Files', ['UPDATE_RESOURCE']),
+    ...mapMutations('Files', ['UPDATE_RESOURCE', 'REMOVE_FILE']),
     async $_declineShare_trigger(resource) {
       try {
         const share = await triggerShareAction(
@@ -42,7 +43,19 @@ export default {
           !this.isOcis,
           this.$client
         )
-        this.UPDATE_RESOURCE(share)
+        // handling of store mutations has to be differently per supported route
+        if (this.isSharedWithMeRoute) {
+          this.UPDATE_RESOURCE(share)
+          return
+        }
+        if (this.isPersonalRoute) {
+          this.$_destroySideBar_hideDetails()
+          this.REMOVE_FILE(resource)
+          return
+        }
+        console.error(
+          'Store mutation for declineShare not implemented for route ' + this.$route.name
+        )
       } catch (error) {
         console.log(error)
         this.showMessage({

From 695c7be524f43f46cd3c5858e9b6582a42969de3 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Tue, 29 Jun 2021 14:23:29 +0200
Subject: [PATCH 14/22] Make linter happy

---
 packages/web-app-files/src/views/SharedViaLink.vue    | 8 +++++++-
 packages/web-app-files/src/views/SharedWithOthers.vue | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/web-app-files/src/views/SharedViaLink.vue b/packages/web-app-files/src/views/SharedViaLink.vue
index f15770e5526..f50d347b8df 100644
--- a/packages/web-app-files/src/views/SharedViaLink.vue
+++ b/packages/web-app-files/src/views/SharedViaLink.vue
@@ -70,7 +70,13 @@ const visibilityObserver = new VisibilityObserver()
 export default {
   components: { ListLoader, NoContentMessage, ListInfo },
 
-  mixins: [FileActions, MixinFilesListPositioning, MixinResources, MixinFilesListPagination, MixinMountSideBar],
+  mixins: [
+    FileActions,
+    MixinFilesListPositioning,
+    MixinResources,
+    MixinFilesListPagination,
+    MixinMountSideBar
+  ],
 
   data: () => ({
     loading: true
diff --git a/packages/web-app-files/src/views/SharedWithOthers.vue b/packages/web-app-files/src/views/SharedWithOthers.vue
index 50f1ad481cf..473cef11da4 100644
--- a/packages/web-app-files/src/views/SharedWithOthers.vue
+++ b/packages/web-app-files/src/views/SharedWithOthers.vue
@@ -72,7 +72,13 @@ const visibilityObserver = new VisibilityObserver()
 export default {
   components: { ListLoader, NoContentMessage, ListInfo },
 
-  mixins: [FileActions, MixinFilesListPositioning, MixinResources, MixinFilesListPagination, MixinMountSideBar],
+  mixins: [
+    FileActions,
+    MixinFilesListPositioning,
+    MixinResources,
+    MixinFilesListPagination,
+    MixinMountSideBar
+  ],
 
   data: () => ({
     loading: true

From 8c9bb37498cf25ba3be20501c76d2b26430c0184 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Wed, 30 Jun 2021 15:59:48 +0200
Subject: [PATCH 15/22] Revert "decline share" action on "all files" page back
 to "delete" action

---
 .../AppBar/SelectedResources/BatchActions.vue |  6 ++---
 .../web-app-files/src/helpers/resources.js    |  5 ----
 .../src/mixins/actions/declineShare.js        | 25 +++----------------
 .../src/mixins/actions/delete.js              |  4 ---
 .../acceptShares.feature                      | 16 +++++++++---
 5 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue b/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue
index 569cd022880..5ef1f0cff93 100644
--- a/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue
+++ b/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue
@@ -135,7 +135,7 @@ export default {
     },
 
     canDelete() {
-      if (checkRoute(['files-shared-with-me'], this.$route.name)) {
+      if (this.isSharedWithMeRoute) {
         return false
       }
 
@@ -147,7 +147,7 @@ export default {
     },
 
     canAccept() {
-      if (!checkRoute(['files-shared-with-me'], this.$route.name)) {
+      if (!this.isSharedWithMeRoute) {
         return false
       }
       let canAccept = true
@@ -161,7 +161,7 @@ export default {
     },
 
     canDecline() {
-      if (!checkRoute(['files-shared-with-me'], this.$route.name)) {
+      if (!this.isSharedWithMeRoute) {
         return false
       }
       let canDecline = true
diff --git a/packages/web-app-files/src/helpers/resources.js b/packages/web-app-files/src/helpers/resources.js
index f62e16615a1..797294155da 100644
--- a/packages/web-app-files/src/helpers/resources.js
+++ b/packages/web-app-files/src/helpers/resources.js
@@ -7,7 +7,6 @@ import { getIndicators } from './statusIndicators'
 import { bitmaskToRole, checkPermission, permissionsBitmask } from './collaborators'
 import { shareTypes, userShareTypes } from './shareTypes'
 import { $gettext } from '../gettext'
-import { shareStatus } from './shareStatus'
 
 // Should we move this to ODS?
 export function getFileIcon(extension) {
@@ -84,10 +83,6 @@ export function buildResource(resource) {
       return this.permissions.indexOf('S') >= 0
     }
   }
-  if (result.isReceivedShare()) {
-    // safe to assume that the share status is `accepted` because otherwise we wouldn't have received the file/folder via webdav
-    result.status = shareStatus.accepted
-  }
   return result
 }
 
diff --git a/packages/web-app-files/src/mixins/actions/declineShare.js b/packages/web-app-files/src/mixins/actions/declineShare.js
index bcefa384b7b..486a957f437 100644
--- a/packages/web-app-files/src/mixins/actions/declineShare.js
+++ b/packages/web-app-files/src/mixins/actions/declineShare.js
@@ -2,12 +2,11 @@ import { triggerShareAction } from '../../helpers/share/triggerShareAction'
 
 import { checkRoute } from '../../helpers/route'
 import MixinRoutes from '../routes'
-import MixinDestroySideBar from '../sidebar/destroySideBar'
 import { shareStatus } from '../../helpers/shareStatus'
 import { mapGetters, mapMutations } from 'vuex'
 
 export default {
-  mixins: [MixinRoutes, MixinDestroySideBar],
+  mixins: [MixinRoutes],
   computed: {
     ...mapGetters(['isOcis']),
     $_declineShare_items() {
@@ -17,11 +16,7 @@ export default {
           handler: this.$_declineShare_trigger,
           label: () => this.$gettext('Decline share'),
           isEnabled: ({ resource }) => {
-            if (!checkRoute(['files-shared-with-me', 'files-personal'], this.$route.name)) {
-              return false
-            }
-            if (!resource.isReceivedShare()) {
-              // not a received share, but an own file/folder. Use `delete` action instead.
+            if (!checkRoute(['files-shared-with-me'], this.$route.name)) {
               return false
             }
 
@@ -34,7 +29,7 @@ export default {
     }
   },
   methods: {
-    ...mapMutations('Files', ['UPDATE_RESOURCE', 'REMOVE_FILE']),
+    ...mapMutations('Files', ['UPDATE_RESOURCE']),
     async $_declineShare_trigger(resource) {
       try {
         const share = await triggerShareAction(
@@ -43,19 +38,7 @@ export default {
           !this.isOcis,
           this.$client
         )
-        // handling of store mutations has to be differently per supported route
-        if (this.isSharedWithMeRoute) {
-          this.UPDATE_RESOURCE(share)
-          return
-        }
-        if (this.isPersonalRoute) {
-          this.$_destroySideBar_hideDetails()
-          this.REMOVE_FILE(resource)
-          return
-        }
-        console.error(
-          'Store mutation for declineShare not implemented for route ' + this.$route.name
-        )
+        this.UPDATE_RESOURCE(share)
       } catch (error) {
         console.log(error)
         this.showMessage({
diff --git a/packages/web-app-files/src/mixins/actions/delete.js b/packages/web-app-files/src/mixins/actions/delete.js
index 6f624b33cda..0e2fdac83d4 100644
--- a/packages/web-app-files/src/mixins/actions/delete.js
+++ b/packages/web-app-files/src/mixins/actions/delete.js
@@ -14,10 +14,6 @@ export default {
             if (checkRoute(['files-shared-with-me', 'files-trashbin'], this.$route.name)) {
               return false
             }
-            if (resource.isReceivedShare()) {
-              // not an own file/folder, but a received share. Use `declineShare` action instead.
-              return false
-            }
 
             return resource.canBeDeleted()
           },
diff --git a/tests/acceptance/features/webUISharingAcceptSharesToRoot/acceptShares.feature b/tests/acceptance/features/webUISharingAcceptSharesToRoot/acceptShares.feature
index c226e7df3c5..860c5594831 100644
--- a/tests/acceptance/features/webUISharingAcceptSharesToRoot/acceptShares.feature
+++ b/tests/acceptance/features/webUISharingAcceptSharesToRoot/acceptShares.feature
@@ -98,8 +98,8 @@ Feature: accept/decline shares coming from internal users
     And user "Alice" has shared folder "/simple-folder" with group "grp1"
     And user "Alice" has shared folder "/testimage.jpg" with user "Brian"
     And the user has browsed to the files page
-    When the user unshares folder "simple-folder" using the webUI
-    And the user unshares file "testimage.jpg" using the webUI
+    When the user deletes folder "simple-folder" using the webUI
+    And the user deletes file "testimage.jpg" using the webUI
     Then folder "simple-folder" should not be listed on the webUI
     And file "testimage.jpg" should not be listed on the webUI
     When the user browses to the shared-with-me page using the webUI
@@ -321,7 +321,7 @@ Feature: accept/decline shares coming from internal users
     And the user has browsed to the shared-with-me page
     When the user accepts share "lorem.txt" offered by user "Alice Hansen" using the webUI
     And the user browses to the files page
-    And the user unshares file "lorem.txt" using the webUI
+    And the user deletes file "lorem.txt" using the webUI
     Then file "lorem.txt" should not be listed on the webUI
     And file "testimage.jpg" should not be listed on the webUI
     When the user browses to the shared-with-me page using the webUI
@@ -353,6 +353,16 @@ Feature: accept/decline shares coming from internal users
     And file "lorem.txt" shared by "Alice Hansen" should be in "Declined" state on the webUI
     And folder "simple-folder" shared by "Alice Hansen" should be in "Declined" state on the webUI
 
+
+  Scenario: shared file status is changed to declined when user deletes the file
+    Given user "Alice" has created file "lorem.txt"
+    And user "Alice" has shared file "lorem.txt" with user "Brian"
+    And the user has reloaded the current page of the webUI
+    When the user deletes file "lorem.txt" using the webUI
+    And the user browses to the shared-with-me page
+    Then file "lorem.txt" shared by "Alice Hansen" should be in "Declined" state on the webUI
+
+
   Scenario: the deleted shared file is restored back to all files list when accepted from the shared with me file list
     Given user "Alice" has created file "lorem.txt"
     And user "Alice" has shared file "lorem.txt" with user "Brian"

From df7a6ac4666a47b95fff8834171ff5ba043e361a Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Wed, 30 Jun 2021 16:54:45 +0200
Subject: [PATCH 16/22] Use delete step in tests where delete button is
 expected

---
 .../webUISharingAcceptShares/acceptShares.feature    | 10 +++++-----
 .../acceptShares.feature                             | 12 ++++++------
 .../webUISharingExternal/federationSharing.feature   |  2 +-
 .../federationSharing.feature                        |  2 +-
 .../shareWithGroups.feature                          |  2 +-
 .../shareWithGroups.feature                          |  2 +-
 .../features/webUIWebdavLocks/locks.feature          |  4 ++--
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature b/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature
index 42d5e2ab618..f939e886839 100644
--- a/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature
+++ b/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature
@@ -39,7 +39,7 @@ Feature: accept/decline shares coming from internal users
     And the user has browsed to the files page
     And the user opens folder "Shares" using the webUI
     When the user shares folder "simple-folder" with group "grp1" as "Viewer" using the webUI
-    And the user unshares folder "simple-folder" using the webUI
+    And the user deletes folder "simple-folder" using the webUI
     And the user browses to the shared-with-me page using the webUI
     Then folder "simple-folder" shared by "Alice Hansen" should be in "Declined" state on the webUI
     And folder "simple-folder" shared by "Brian Murphy" should not be listed in the webUI
@@ -59,8 +59,8 @@ Feature: accept/decline shares coming from internal users
     And user "Brian" has accepted the share "testimage.jpg" offered by user "Alice"
     And the user has browsed to the files page
     When the user opens folder "Shares" using the webUI
-    And the user unshares folder "simple-folder" using the webUI
-    And the user unshares file "testimage.jpg" using the webUI
+    And the user deletes folder "simple-folder" using the webUI
+    And the user deletes file "testimage.jpg" using the webUI
     Then folder "simple-folder" should not be listed on the webUI
     And file "testimage.jpg" should not be listed on the webUI
     When the user browses to the shared-with-me page using the webUI
@@ -74,7 +74,7 @@ Feature: accept/decline shares coming from internal users
     And the user has browsed to the personal sharing settings page
     Then User-based auto accepting checkbox should not be displayed on the personal sharing settings page in the webUI
 
-  
+
   Scenario: User receives files when auto accept share is disabled
     Given user "Alice" has created file "toshare.txt"
     And user "Alice" has uploaded file with content "test" to "toshare.txt"
@@ -85,7 +85,7 @@ Feature: accept/decline shares coming from internal users
     Then file "toshare.txt" should not be listed on the webUI
     And folder "Shares" should not be listed on the webUI
 
-  
+
   Scenario: receive shares with same name from different users
     Given user "Carol" has been created with default attributes and without skeleton files
     And user "Carol" has created file "lorem.txt"
diff --git a/tests/acceptance/features/webUISharingAcceptSharesToRoot/acceptShares.feature b/tests/acceptance/features/webUISharingAcceptSharesToRoot/acceptShares.feature
index 860c5594831..2017e25eb48 100644
--- a/tests/acceptance/features/webUISharingAcceptSharesToRoot/acceptShares.feature
+++ b/tests/acceptance/features/webUISharingAcceptSharesToRoot/acceptShares.feature
@@ -40,7 +40,7 @@ Feature: accept/decline shares coming from internal users
     And user "Brian" has accepted the share "simple-folder" offered by user "Alice"
     And the user has browsed to the files page
     When the user shares folder "simple-folder (2)" with group "grp1" as "Viewer" using the webUI
-    And the user unshares folder "simple-folder (2)" using the webUI
+    And the user deletes folder "simple-folder (2)" using the webUI
     And the user browses to the shared-with-me page using the webUI
     Then folder "simple-folder (2)" shared by "Alice Hansen" should be in "Declined" state on the webUI
     And folder "simple-folder" shared by "Brian Murphy" should not be listed in the webUI
@@ -60,8 +60,8 @@ Feature: accept/decline shares coming from internal users
     And user "Brian" has accepted the share "simple-folder" offered by user "Alice"
     And user "Brian" has accepted the share "testimage.jpg" offered by user "Alice"
     And the user has browsed to the files page
-    When the user unshares folder "simple-folder" using the webUI
-    And the user unshares file "testimage.jpg" using the webUI
+    When the user deletes folder "simple-folder" using the webUI
+    And the user deletes file "testimage.jpg" using the webUI
     Then folder "simple-folder" should not be listed on the webUI
     And file "testimage.jpg" should not be listed on the webUI
     When the user browses to the shared-with-me page using the webUI
@@ -134,7 +134,7 @@ Feature: accept/decline shares coming from internal users
     And user "Alice" has shared folder "simple-folder" with user "Brian" with "create, read, share, update" permissions
     And user "Brian" has renamed folder "simple-folder" to "simple-folder-renamed"
     And the user has reloaded the current page of the webUI
-    When the user unshares folder "simple-folder-renamed" using the webUI
+    When the user deletes folder "simple-folder-renamed" using the webUI
     Then folder "simple-folder-renamed" should not be listed on the webUI
     When the user browses to the shared-with-me page using the webUI
     Then folder "simple-folder-renamed" shared by "Alice Hansen" should be in "Declined" state on the webUI
@@ -149,7 +149,7 @@ Feature: accept/decline shares coming from internal users
     And user "Brian" has moved folder "/simple-folder (2)" to "/simple-folder/shared"
     And the user has reloaded the current page of the webUI
     When the user opens folder "simple-folder" using the webUI
-    And the user unshares folder "shared" using the webUI
+    And the user deletes folder "shared" using the webUI
     Then folder "shared" should not be listed on the webUI
     When the user browses to the shared-with-me page using the webUI
     Then folder "shared" shared by "Alice Hansen" should be in "Declined" state on the webUI
@@ -161,7 +161,7 @@ Feature: accept/decline shares coming from internal users
     And user "Alice" has shared folder "/simple-folder" with user "Brian"
     And user "Brian" has renamed folder "/simple-folder" to "/simple-folder-renamed"
     And the user has reloaded the current page of the webUI
-    When the user unshares folder "simple-folder-renamed" using the webUI
+    When the user deletes folder "simple-folder-renamed" using the webUI
     And the user browses to the shared-with-me page using the webUI
     And the user accepts share "simple-folder-renamed" offered by user "Alice Hansen" using the webUI
     Then folder "simple-folder-renamed" shared by "Alice Hansen" should be in "Accepted" state on the webUI
diff --git a/tests/acceptance/features/webUISharingExternal/federationSharing.feature b/tests/acceptance/features/webUISharingExternal/federationSharing.feature
index f8fa965d0ed..7a6532aaaa5 100644
--- a/tests/acceptance/features/webUISharingExternal/federationSharing.feature
+++ b/tests/acceptance/features/webUISharingExternal/federationSharing.feature
@@ -168,7 +168,7 @@ Feature: Federation Sharing - sharing with users on other cloud storages
     And user "Alice" from remote server has shared "lorem.txt" with user "Alice" from local server
     And user "Alice" from server "LOCAL" has accepted the last pending share
     And the user has reloaded the current page of the webUI
-    When the user unshares file "lorem.txt" using the webUI
+    When the user deletes file "lorem.txt" using the webUI
     Then file "lorem.txt" should not be listed on the webUI
     And file "lorem.txt" should not be listed in the files page on the webUI
 
diff --git a/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature b/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature
index ddf1b39f0b3..9476f14d5a9 100644
--- a/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature
+++ b/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature
@@ -169,7 +169,7 @@ Feature: Federation Sharing - sharing with users on other cloud storages
     And user "Alice" from server "REMOTE" has shared "/lorem.txt" with user "Alice" from remote server
     And user "Alice" from server "LOCAL" has accepted the last pending share
     And the user has reloaded the current page of the webUI
-    When the user unshares file "lorem.txt" using the webUI
+    When the user deletes file "lorem.txt" using the webUI
     Then file "lorem.txt" should not be listed on the webUI
     And file "lorem.txt" should not be listed in the files page on the webUI
 
diff --git a/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature b/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature
index b4941ddc0cf..43886596e05 100644
--- a/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature
+++ b/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature
@@ -89,7 +89,7 @@ Feature: Sharing files and folders with internal groups
     Then file "new-lorem.txt" should be listed on the webUI
     And as "Alice" the content of "/Shares/new-lorem.txt" should be the same as the local "new-lorem.txt"
     # unshare the received shared file
-    When the user unshares file "new-lorem.txt" using the webUI
+    When the user deletes file "new-lorem.txt" using the webUI
     Then file "new-lorem.txt" should not be listed on the webUI
     # check that another group member can still see the file
     And as "Brian" the content of "/Shares/new-lorem.txt" should be the same as the local "new-lorem.txt"
diff --git a/tests/acceptance/features/webUISharingInternalGroupsToRoot/shareWithGroups.feature b/tests/acceptance/features/webUISharingInternalGroupsToRoot/shareWithGroups.feature
index c8adae82220..a88fd82b400 100644
--- a/tests/acceptance/features/webUISharingInternalGroupsToRoot/shareWithGroups.feature
+++ b/tests/acceptance/features/webUISharingInternalGroupsToRoot/shareWithGroups.feature
@@ -82,7 +82,7 @@ Feature: Sharing files and folders with internal groups
     Then file "new-lorem.txt" should be listed on the webUI
     And as "Alice" the content of "new-lorem.txt" should be the same as the local "new-lorem.txt"
     # unshare the received shared file
-    When the user unshares file "new-lorem.txt" using the webUI
+    When the user deletes file "new-lorem.txt" using the webUI
     Then file "new-lorem.txt" should not be listed on the webUI
     # check that another group member can still see the file
     When the user re-logs in as "Brian" using the webUI
diff --git a/tests/acceptance/features/webUIWebdavLocks/locks.feature b/tests/acceptance/features/webUIWebdavLocks/locks.feature
index f591a1589c2..5066dca71f8 100644
--- a/tests/acceptance/features/webUIWebdavLocks/locks.feature
+++ b/tests/acceptance/features/webUIWebdavLocks/locks.feature
@@ -338,8 +338,8 @@ Feature: Locks
     And user "sharer" has shared file "lorem.txt" with user "brand-new-user"
     And user "sharer" has shared folder "simple-folder" with user "brand-new-user"
     And the user has browsed to the files page
-    When the user unshares file "lorem (2).txt" using the webUI
-    And the user unshares folder "simple-folder (2)" using the webUI
+    When the user deletes file "lorem (2).txt" using the webUI
+    And the user deletes folder "simple-folder (2)" using the webUI
     Then notifications should be displayed on the webUI with the text
       | The file "lorem (2).txt" is locked and cannot be deleted.     |
       | The file "simple-folder (2)" is locked and cannot be deleted. |

From fee2fb57e81f3e1c74fc33e1a2443ec866357759 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Thu, 1 Jul 2021 16:10:43 +0200
Subject: [PATCH 17/22] Revert share loading when sidebar opens as it's not
 needed, yet

---
 .../src/mixins/sidebar/mountSideBar.js        | 26 ++-----------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/packages/web-app-files/src/mixins/sidebar/mountSideBar.js b/packages/web-app-files/src/mixins/sidebar/mountSideBar.js
index 0bb3c590832..2ff38ffbb81 100644
--- a/packages/web-app-files/src/mixins/sidebar/mountSideBar.js
+++ b/packages/web-app-files/src/mixins/sidebar/mountSideBar.js
@@ -1,31 +1,9 @@
-import { mapActions, mapGetters, mapMutations } from 'vuex'
-import { buildCollaboratorShare } from '../../helpers/resources'
-import { cloneDeep } from 'lodash-es'
+import { mapActions } from 'vuex'
 
 export default {
-  computed: {
-    ...mapGetters(['isOcis'])
-  },
   methods: {
-    ...mapMutations('Files', ['UPDATE_RESOURCE']),
     ...mapActions('Files', ['setHighlightedFile']),
-    async $_mountSideBar_showDetails(resource) {
-      // FIXME: to be improved when switching to graph api
-      if (resource.isReceivedShare() && !resource.share) {
-        // there are some pages where the share information is not pre-loaded. fetch on demand (upon mounting the sidebar)
-        const response = await this.$client.shares.getShares(resource.path, {
-          shared_with_me: true
-        })
-        const shares = response.map(element => {
-          return buildCollaboratorShare(element.shareInfo, resource, !this.isOcis)
-        })
-        if (shares?.length === 1) {
-          const r = cloneDeep(resource)
-          r.share = shares[0]
-          this.UPDATE_RESOURCE(r)
-        }
-      }
-
+    $_mountSideBar_showDetails(resource) {
       this.setHighlightedFile(resource)
     }
   }

From e72172f270c68f5a52e60622a4be6020611717ca Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Thu, 1 Jul 2021 16:11:00 +0200
Subject: [PATCH 18/22] Fix loading highlighted file in search mode

---
 packages/web-app-files/src/store/getters.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/web-app-files/src/store/getters.js b/packages/web-app-files/src/store/getters.js
index a2c67b02228..661eee8a5fe 100644
--- a/packages/web-app-files/src/store/getters.js
+++ b/packages/web-app-files/src/store/getters.js
@@ -86,9 +86,9 @@ export default {
   quota: state => {
     return state.quota
   },
-  highlightedFile: state => {
+  highlightedFile: (state, getters) => {
     if (state.highlightedResourceId) {
-      return state.files.find(r => r.id === state.highlightedResourceId)
+      return getters.filesAll.find(r => r.id === state.highlightedResourceId)
     }
     return null
   },

From 168c78d2f7ed1973a498d0ce79b2033f6cb6b439 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Thu, 1 Jul 2021 16:36:46 +0200
Subject: [PATCH 19/22] Fix e2e test for batch declining shares

---
 .../shareWithUsers.feature                                  | 6 +++---
 tests/acceptance/pageObjects/sharedWithMePage.js            | 5 +++++
 tests/acceptance/stepDefinitions/filesContext.js            | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature
index 8f9cb901328..af57a50da9e 100644
--- a/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature
+++ b/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature
@@ -89,7 +89,7 @@ Feature: Shares in share-with pages
     Then file "collaborate-on-this.txt" should be listed on the webUI
 
   @issue-ocis-730
-  Scenario: deleting an entry on the shared-with-me page unshares from self
+  Scenario: unsharing an entry on the shared-with-me page unshares from self
     Given user "Alice" has created folder "simple-folder"
     And user "Alice" has shared folder "simple-folder" with user "Brian"
     And user "Brian" has accepted the share "simple-folder" offered by user "Alice"
@@ -99,8 +99,8 @@ Feature: Shares in share-with pages
     And the user browses to the folder "Shares" on the files page
     Then folder "simple-folder" should not be listed on the webUI
 
-  @issue-ocis-730 @skipOnOC10 @issue-4582
-  Scenario: deleting multiple entries on the shared-with-me page
+  @issue-ocis-730 @issue-4582
+  Scenario: unsharing multiple entries on the shared-with-me page
     Given user "Alice" has created folder "simple-folder"
     And user "Alice" has created file "lorem.txt"
     And user "Alice" has shared folder "simple-folder" with user "Brian"
diff --git a/tests/acceptance/pageObjects/sharedWithMePage.js b/tests/acceptance/pageObjects/sharedWithMePage.js
index adcc084fe94..8b50a2dd1ae 100644
--- a/tests/acceptance/pageObjects/sharedWithMePage.js
+++ b/tests/acceptance/pageObjects/sharedWithMePage.js
@@ -133,6 +133,11 @@ module.exports = {
         shareFound = result.value.length > 0
       })
       return shareFound
+    },
+    unshareAllCheckedFiles: function() {
+      return this.waitForElementVisible('@batchDeclineSharesButton')
+        .click('@batchDeclineSharesButton')
+        .waitForAjaxCallsToStartAndFinish()
     }
   },
   elements: {
diff --git a/tests/acceptance/stepDefinitions/filesContext.js b/tests/acceptance/stepDefinitions/filesContext.js
index 7e4515da207..7dafef2656d 100644
--- a/tests/acceptance/stepDefinitions/filesContext.js
+++ b/tests/acceptance/stepDefinitions/filesContext.js
@@ -524,7 +524,7 @@ When('the user batch unshares these files using the webUI', async function(share
     unsharedElements.push(item[0])
   }
 
-  return client.page.personalPage().unshareAllCheckedFiles()
+  return client.page.sharedWithMePage().unshareAllCheckedFiles()
 })
 
 When('the user batch deletes these files using the webUI', async function(fileOrFolders) {

From 9caf39c9e4e31b2c341a8ab9cb518c53f6679884 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Fri, 2 Jul 2021 09:36:30 +0200
Subject: [PATCH 20/22] Add expected test failure about declining shares

---
 .../expected-failures-with-ocis-server-ocis-storage.md           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md b/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md
index 55ba9e87e07..5f554351505 100644
--- a/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md
+++ b/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md
@@ -62,6 +62,7 @@ Other free text and markdown formatting can be used elsewhere in the document if
 -   [webUISharingInternalUsersCollaborator/shareWithUsers.feature:36](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersCollaborator/shareWithUsers.feature#L36)
 -   [webUISharingInternalUsersCollaborator/shareWithUsers.feature:37](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersCollaborator/shareWithUsers.feature#L37)
 -   [webUISharingInternalUsersCollaborator/shareWithUsers.feature:38](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersCollaborator/shareWithUsers.feature#L38)
+    [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:92](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L92)
 -   [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:119](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L119)
 -   [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:155](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L155)
 -   [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:159](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L159)

From 05404eb2e25fd8c46324c4cd4f4b52dc23fdc063 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Fri, 2 Jul 2021 11:11:36 +0200
Subject: [PATCH 21/22] Add more issue links to changelog

---
 changelog/unreleased/enhancement-share-batch-actions | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changelog/unreleased/enhancement-share-batch-actions b/changelog/unreleased/enhancement-share-batch-actions
index e57a0532e84..9fdfe3811db 100644
--- a/changelog/unreleased/enhancement-share-batch-actions
+++ b/changelog/unreleased/enhancement-share-batch-actions
@@ -4,3 +4,6 @@ We've added batch actions for accepting and declining multiple selected incoming
 
 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

From 1e72e12ace33b084f147eec3882e3892ae9c8959 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Fri, 2 Jul 2021 11:38:20 +0200
Subject: [PATCH 22/22] Correctly await share action batches with a p-queue

---
 .../AppBar/SelectedResources/BatchActions.vue | 38 +++++++++++--------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue b/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue
index 5ef1f0cff93..c9ec383470d 100644
--- a/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue
+++ b/packages/web-app-files/src/components/AppBar/SelectedResources/BatchActions.vue
@@ -93,6 +93,7 @@ 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],
@@ -254,23 +255,30 @@ export default {
       this.triggerShareActions(shareStatus.declined)
     },
 
-    triggerShareActions(newShareStatus) {
+    async triggerShareActions(newShareStatus) {
       const errors = []
-      this.selectedFiles.forEach(async resource => {
-        try {
-          const share = await triggerShareAction(
-            resource,
-            newShareStatus,
-            !this.isOcis,
-            this.$client
-          )
-          if (share) {
-            this.UPDATE_RESOURCE(share)
-          }
-        } catch (error) {
-          errors.push(error)
-        }
+      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([])