From a354df8597054b77670d1d0b418b2bd2b5391400 Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Tue, 11 Oct 2022 14:16:57 +0200
Subject: [PATCH 1/5] Hide actions in space trash bins in case of insufficient
 permissions

---
 changelog/unreleased/bugfix-space-trashbin-actions     |  6 ++++++
 packages/web-app-files/src/mixins/actions/delete.js    | 10 +++++++++-
 .../web-app-files/src/mixins/actions/emptyTrashBin.js  |  8 ++++++++
 packages/web-app-files/src/mixins/actions/restore.ts   |  8 +++++++-
 .../web-app-files/src/views/spaces/GenericTrash.vue    |  9 ++++++++-
 5 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 changelog/unreleased/bugfix-space-trashbin-actions

diff --git a/changelog/unreleased/bugfix-space-trashbin-actions b/changelog/unreleased/bugfix-space-trashbin-actions
new file mode 100644
index 00000000000..cb8e3b243bf
--- /dev/null
+++ b/changelog/unreleased/bugfix-space-trashbin-actions
@@ -0,0 +1,6 @@
+Bugfix: Hide actions in space trash bins
+
+Actions in space trash bins are now hidden if the current user has insufficient permissions.
+
+https://github.com/owncloud/web/pull/7768
+https://github.com/owncloud/web/issues/7702
diff --git a/packages/web-app-files/src/mixins/actions/delete.js b/packages/web-app-files/src/mixins/actions/delete.js
index b918e817f2f..1afe81b5d23 100644
--- a/packages/web-app-files/src/mixins/actions/delete.js
+++ b/packages/web-app-files/src/mixins/actions/delete.js
@@ -6,12 +6,13 @@ import {
   isLocationTrashActive,
   isLocationCommonActive
 } from '../../router'
+import { isProjectSpaceResource } from 'web-client/src/helpers'
 
 export default {
   mixins: [MixinDeleteResources],
   computed: {
     ...mapState('Files', ['currentFolder']),
-    ...mapGetters(['capabilities']),
+    ...mapGetters(['capabilities', 'user']),
     $_delete_items() {
       return [
         {
@@ -60,6 +61,13 @@ export default {
             if (this.capabilities?.files?.permanent_deletion === false) {
               return false
             }
+
+            const { manager, editor } = this.space?.spaceRoles
+            const isProjectSpace = isProjectSpaceResource(this.space)
+            if (isProjectSpace && ![...manager, ...editor].includes(this.user.uuid)) {
+              return false
+            }
+
             return resources.length > 0
           },
           componentType: 'button',
diff --git a/packages/web-app-files/src/mixins/actions/emptyTrashBin.js b/packages/web-app-files/src/mixins/actions/emptyTrashBin.js
index a6d7659caa0..a2ea62b9268 100644
--- a/packages/web-app-files/src/mixins/actions/emptyTrashBin.js
+++ b/packages/web-app-files/src/mixins/actions/emptyTrashBin.js
@@ -1,6 +1,7 @@
 import { mapActions, mapGetters, mapState } from 'vuex'
 import { isLocationTrashActive } from '../../router'
 import { buildWebDavFilesTrashPath, buildWebDavSpacesTrashPath } from '../../helpers/resources'
+import { isProjectSpaceResource } from 'web-client/src/helpers'
 
 export default {
   computed: {
@@ -21,6 +22,13 @@ export default {
             if (this.capabilities?.files?.permanent_deletion === false) {
               return false
             }
+
+            const { manager, editor } = this.space?.spaceRoles
+            const isProjectSpace = isProjectSpaceResource(this.space)
+            if (isProjectSpace && ![...manager, ...editor].includes(this.user.uuid)) {
+              return false
+            }
+
             // empty trash bin is not available for individual resources, but only for the trash bin as a whole
             return resources.length === 0
           },
diff --git a/packages/web-app-files/src/mixins/actions/restore.ts b/packages/web-app-files/src/mixins/actions/restore.ts
index 946ae866ca7..bc206da8258 100644
--- a/packages/web-app-files/src/mixins/actions/restore.ts
+++ b/packages/web-app-files/src/mixins/actions/restore.ts
@@ -7,7 +7,7 @@ import {
   buildWebDavSpacesTrashPath
 } from '../../helpers/resources'
 import { clientService } from 'web-pkg/src/services'
-import { buildWebDavSpacesPath } from 'web-client/src/helpers'
+import { buildWebDavSpacesPath, isProjectSpaceResource } from 'web-client/src/helpers'
 
 export default {
   computed: {
@@ -29,6 +29,12 @@ export default {
               return false
             }
 
+            const { manager, editor } = this.space?.spaceRoles
+            const isProjectSpace = isProjectSpaceResource(this.space)
+            if (isProjectSpace && ![...manager, ...editor].includes(this.user.uuid)) {
+              return false
+            }
+
             return resources.length > 0
           },
           componentType: 'button',
diff --git a/packages/web-app-files/src/views/spaces/GenericTrash.vue b/packages/web-app-files/src/views/spaces/GenericTrash.vue
index ed10452a24d..b0e5bccec91 100644
--- a/packages/web-app-files/src/views/spaces/GenericTrash.vue
+++ b/packages/web-app-files/src/views/spaces/GenericTrash.vue
@@ -34,6 +34,7 @@
           :sort-by="sortBy"
           :sort-dir="sortDir"
           :space="space"
+          :has-actions="showActions"
           @sort="handleSort"
         >
           <template #contextMenu="{ resource }">
@@ -78,7 +79,7 @@ import { computed, defineComponent, PropType } from '@vue/composition-api'
 import { Resource } from 'web-client'
 import { useCapabilityShareJailEnabled, useTranslations } from 'web-pkg/src/composables'
 import { createLocationTrash } from '../../router'
-import { SpaceResource } from 'web-client/src/helpers'
+import { isProjectSpaceResource, SpaceResource } from 'web-client/src/helpers'
 
 export default defineComponent({
   name: 'GenericTrash',
@@ -125,6 +126,7 @@ export default defineComponent({
   computed: {
     ...mapState('Files', ['files']),
     ...mapGetters('Files', ['highlightedFile', 'totalFilesCount']),
+    ...mapGetters(['user']),
 
     isEmpty() {
       return this.paginatedResources.length < 1
@@ -148,6 +150,11 @@ export default defineComponent({
           onClick: () => bus.publish('app.files.list.load')
         }
       ]
+    },
+
+    showActions() {
+      const { manager, editor } = this.space?.spaceRoles
+      return !isProjectSpaceResource(this.space) || [...manager, ...editor].includes(this.user.uuid)
     }
   },
 

From a7d164fe0d481dd8c8c3394a3b4b6cb651217ddf Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Tue, 11 Oct 2022 14:43:13 +0200
Subject: [PATCH 2/5] Fix and add unit tests

---
 .../tests/unit/mixins/actions/delete.spec.js      |  1 +
 .../unit/mixins/actions/emptyTrashBin.spec.js     | 15 ++++++++++++++-
 .../tests/unit/mixins/actions/restore.spec.js     | 13 ++++++++++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/packages/web-app-files/tests/unit/mixins/actions/delete.spec.js b/packages/web-app-files/tests/unit/mixins/actions/delete.spec.js
index b80a81dcae9..06a269748b8 100644
--- a/packages/web-app-files/tests/unit/mixins/actions/delete.spec.js
+++ b/packages/web-app-files/tests/unit/mixins/actions/delete.spec.js
@@ -67,6 +67,7 @@ function getWrapper({ deletePermanent = false, invalidLocation = false } = {}) {
     localVue,
     store,
     mocks: {
+      space: { driveType: 'personal', spaceRoles: { viewer: [], editor: [], manager: [] } },
       $router: {
         currentRoute: invalidLocation
           ? createLocationShares('files-shares-via-link')
diff --git a/packages/web-app-files/tests/unit/mixins/actions/emptyTrashBin.spec.js b/packages/web-app-files/tests/unit/mixins/actions/emptyTrashBin.spec.js
index a88d14232d4..9f68421bd15 100644
--- a/packages/web-app-files/tests/unit/mixins/actions/emptyTrashBin.spec.js
+++ b/packages/web-app-files/tests/unit/mixins/actions/emptyTrashBin.spec.js
@@ -30,6 +30,14 @@ describe('emptyTrashBin', () => {
       const wrapper = getWrapper({ invalidLocation: true })
       expect(wrapper.vm.$_emptyTrashBin_items[0].isEnabled({ resources: [] })).toBe(false)
     })
+    it('should be false in a space trash bin with insufficient permissions', () => {
+      const wrapper = getWrapper({ driveType: 'project' })
+      expect(
+        wrapper.vm.$_emptyTrashBin_items[0].isEnabled({
+          resources: [{ canBeRestored: () => true }]
+        })
+      ).toBe(false)
+    })
   })
 
   describe('method "$_emptyTrashBin_trigger"', () => {
@@ -65,7 +73,11 @@ describe('emptyTrashBin', () => {
   })
 })
 
-function getWrapper({ invalidLocation = false, resolveClearTrashBin = true } = {}) {
+function getWrapper({
+  invalidLocation = false,
+  resolveClearTrashBin = true,
+  driveType = 'personal'
+} = {}) {
   return mount(Component, {
     localVue,
     mocks: {
@@ -79,6 +91,7 @@ function getWrapper({ invalidLocation = false, resolveClearTrashBin = true } = {
       },
       $gettext: jest.fn(),
       $pgettext: jest.fn(),
+      space: { driveType, spaceRoles: { viewer: [], editor: [], manager: [] } },
       $client: {
         ...sdkMock,
         fileTrash: {
diff --git a/packages/web-app-files/tests/unit/mixins/actions/restore.spec.js b/packages/web-app-files/tests/unit/mixins/actions/restore.spec.js
index 18e42a01a7a..be8ef53a60a 100644
--- a/packages/web-app-files/tests/unit/mixins/actions/restore.spec.js
+++ b/packages/web-app-files/tests/unit/mixins/actions/restore.spec.js
@@ -38,6 +38,12 @@ describe('restore', () => {
       const wrapper = getWrapper({ invalidLocation: true })
       expect(wrapper.vm.$_restore_items[0].isEnabled({ resources: [{}] })).toBe(false)
     })
+    it('should be false in a space trash bin with insufficient permissions', () => {
+      const wrapper = getWrapper({ driveType: 'project' })
+      expect(
+        wrapper.vm.$_restore_items[0].isEnabled({ resources: [{ canBeRestored: () => true }] })
+      ).toBe(false)
+    })
   })
 
   describe('method "$_restore_trigger"', () => {
@@ -65,7 +71,11 @@ describe('restore', () => {
   })
 })
 
-function getWrapper({ invalidLocation = false, resolveClearTrashBin: resolveRestore = true } = {}) {
+function getWrapper({
+  invalidLocation = false,
+  resolveClearTrashBin: resolveRestore = true,
+  driveType = 'personal'
+} = {}) {
   return mount(Component, {
     localVue,
     mocks: {
@@ -79,6 +89,7 @@ function getWrapper({ invalidLocation = false, resolveClearTrashBin: resolveRest
       },
       $gettext: jest.fn(),
       $gettextInterpolate: jest.fn(),
+      space: { driveType, spaceRoles: { viewer: [], editor: [], manager: [] } },
       $client: {
         ...sdkMock,
         fileTrash: {

From 21490126129ad286bea3bd62e135e8f94b87f148 Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Wed, 12 Oct 2022 10:29:37 +0200
Subject: [PATCH 3/5] Fix e2e tests

---
 .../e2e/cucumber/steps/app-files/resource.ts  | 23 +++++++++------
 .../objects/app-files/resource/actions.ts     | 29 ++++++++++++++++++-
 .../objects/app-files/resource/index.ts       | 14 ++++++++-
 3 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/tests/e2e/cucumber/steps/app-files/resource.ts b/tests/e2e/cucumber/steps/app-files/resource.ts
index 6d375308e71..3cf56d3297f 100644
--- a/tests/e2e/cucumber/steps/app-files/resource.ts
+++ b/tests/e2e/cucumber/steps/app-files/resource.ts
@@ -167,11 +167,14 @@ Then(
     const { page } = this.actorsEnvironment.getActor({ key: stepUser })
     const resourceObject = new objects.applicationFiles.Resource({ page })
     for (const info of stepTable.hashes()) {
-      const message = await resourceObject.deleteTrashBin({ resource: info.resource })
-      const paths = info.resource.split('/')
       if (actionType === 'should not') {
-        expect(message).toBe(`failed to delete "${paths[paths.length - 1]}"`)
+        const isVisible = await resourceObject.isDeleteTrashBinButtonVisible({
+          resource: info.resource
+        })
+        expect(isVisible).toBe(false)
       } else {
+        const message = await resourceObject.deleteTrashBin({ resource: info.resource })
+        const paths = info.resource.split('/')
         expect(message).toBe(`"${paths[paths.length - 1]}" was deleted successfully`)
       }
     }
@@ -190,14 +193,16 @@ Then(
     const { page } = this.actorsEnvironment.getActor({ key: stepUser })
     const resourceObject = new objects.applicationFiles.Resource({ page })
     for (const info of stepTable.hashes()) {
-      const message = await resourceObject.restoreTrashBin({
-        resource: info.resource,
-        actionType
-      })
-      const paths = info.resource.split('/')
       if (actionType === 'should not') {
-        expect(message).toBe(`failed to restore "${paths[paths.length - 1]}"`)
+        const isVisible = await resourceObject.isRestoreTrashBinButtonVisible({
+          resource: info.resource
+        })
+        expect(isVisible).toBe(false)
       } else {
+        const message = await resourceObject.restoreTrashBin({
+          resource: info.resource
+        })
+        const paths = info.resource.split('/')
         expect(message).toBe(`${paths[paths.length - 1]} was restored successfully`)
       }
     }
diff --git a/tests/e2e/support/objects/app-files/resource/actions.ts b/tests/e2e/support/objects/app-files/resource/actions.ts
index 7c8b0a947f6..ebdea123da0 100644
--- a/tests/e2e/support/objects/app-files/resource/actions.ts
+++ b/tests/e2e/support/objects/app-files/resource/actions.ts
@@ -471,9 +471,22 @@ export const deleteResourceTrashbin = async (args: deleteResourceArgs): Promise<
   return message.trim().toLowerCase()
 }
 
+export const getDeleteResourceButtonVisibility = async (
+  args: deleteResourceArgs
+): Promise<boolean> => {
+  const { page, resource } = args
+  const resourceCheckbox = page.locator(
+    util.format(checkBoxForTrashbin, `/${resource.replace(/^\/+/, '')}`)
+  )
+  await new Promise((resolve) => setTimeout(resolve, 5000))
+  if (!(await resourceCheckbox.isChecked())) {
+    await resourceCheckbox.check()
+  }
+  return await page.locator(permanentDeleteButton).isVisible()
+}
+
 export interface restoreResourceTrashbinArgs {
   resource: string
-  actionType: string
   page: Page
 }
 
@@ -499,6 +512,20 @@ export const restoreResourceTrashbin = async (
   return message.trim().toLowerCase()
 }
 
+export const getRestoreResourceButtonVisibility = async (
+  args: restoreResourceTrashbinArgs
+): Promise<boolean> => {
+  const { page, resource } = args
+  const resourceCheckbox = page.locator(
+    util.format(checkBoxForTrashbin, `/${resource.replace(/^\/+/, '')}`)
+  )
+  await new Promise((resolve) => setTimeout(resolve, 5000))
+  if (!(await resourceCheckbox.isChecked())) {
+    await resourceCheckbox.check()
+  }
+  return await page.locator(restoreResourceButton).isVisible()
+}
+
 export interface searchResourceGlobalSearchArgs {
   keyword: string
   page: Page
diff --git a/tests/e2e/support/objects/app-files/resource/index.ts b/tests/e2e/support/objects/app-files/resource/index.ts
index 823368d0ce5..d1647f5494c 100644
--- a/tests/e2e/support/objects/app-files/resource/index.ts
+++ b/tests/e2e/support/objects/app-files/resource/index.ts
@@ -28,7 +28,9 @@ import {
   editResources,
   editResourcesArgs,
   openFileInViewer,
-  openFileInViewerArgs
+  openFileInViewerArgs,
+  getDeleteResourceButtonVisibility,
+  getRestoreResourceButtonVisibility
 } from './actions'
 
 export class Resource {
@@ -115,6 +117,10 @@ export class Resource {
     return message
   }
 
+  async isDeleteTrashBinButtonVisible(args: Omit<deleteResourceArgs, 'page'>): Promise<boolean> {
+    return await getDeleteResourceButtonVisibility({ ...args, page: this.#page })
+  }
+
   async restoreTrashBin(args: Omit<restoreResourceTrashbinArgs, 'page'>): Promise<string> {
     const startUrl = this.#page.url()
     const message = await restoreResourceTrashbin({ ...args, page: this.#page })
@@ -122,6 +128,12 @@ export class Resource {
     return message
   }
 
+  async isRestoreTrashBinButtonVisible(
+    args: Omit<restoreResourceTrashbinArgs, 'page'>
+  ): Promise<boolean> {
+    return await getRestoreResourceButtonVisibility({ ...args, page: this.#page })
+  }
+
   async searchResource(args: Omit<searchResourceGlobalSearchArgs, 'page'>): Promise<void> {
     await searchResourceGlobalSearch({ ...args, page: this.#page })
   }

From d42c6d885173565e6eec0345f324649c84c6d4b6 Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Thu, 13 Oct 2022 08:18:21 +0200
Subject: [PATCH 4/5] Intruduce methods to check the space role for the current
 user

---
 packages/web-app-files/src/mixins/actions/delete.js   |  7 +++++--
 .../web-app-files/src/mixins/actions/emptyTrashBin.js |  7 +++++--
 packages/web-app-files/src/mixins/actions/restore.ts  |  7 +++++--
 .../web-app-files/src/views/spaces/GenericTrash.vue   |  7 +++++--
 .../tests/unit/mixins/actions/emptyTrashBin.spec.js   |  2 +-
 .../tests/unit/mixins/actions/restore.spec.js         |  2 +-
 packages/web-client/src/helpers/space/functions.ts    | 11 ++++++++++-
 packages/web-client/src/helpers/space/types.ts        |  3 +++
 .../e2e/support/objects/app-files/resource/actions.ts |  2 --
 9 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/packages/web-app-files/src/mixins/actions/delete.js b/packages/web-app-files/src/mixins/actions/delete.js
index 1afe81b5d23..2aa2a812f19 100644
--- a/packages/web-app-files/src/mixins/actions/delete.js
+++ b/packages/web-app-files/src/mixins/actions/delete.js
@@ -62,9 +62,12 @@ export default {
               return false
             }
 
-            const { manager, editor } = this.space?.spaceRoles
             const isProjectSpace = isProjectSpaceResource(this.space)
-            if (isProjectSpace && ![...manager, ...editor].includes(this.user.uuid)) {
+            if (
+              isProjectSpace &&
+              !this.space.isEditor(this.user.uuid) &&
+              !this.space.isManager(this.user.uuid)
+            ) {
               return false
             }
 
diff --git a/packages/web-app-files/src/mixins/actions/emptyTrashBin.js b/packages/web-app-files/src/mixins/actions/emptyTrashBin.js
index a2ea62b9268..238604fafec 100644
--- a/packages/web-app-files/src/mixins/actions/emptyTrashBin.js
+++ b/packages/web-app-files/src/mixins/actions/emptyTrashBin.js
@@ -23,9 +23,12 @@ export default {
               return false
             }
 
-            const { manager, editor } = this.space?.spaceRoles
             const isProjectSpace = isProjectSpaceResource(this.space)
-            if (isProjectSpace && ![...manager, ...editor].includes(this.user.uuid)) {
+            if (
+              isProjectSpace &&
+              !this.space.isEditor(this.user.uuid) &&
+              !this.space.isManager(this.user.uuid)
+            ) {
               return false
             }
 
diff --git a/packages/web-app-files/src/mixins/actions/restore.ts b/packages/web-app-files/src/mixins/actions/restore.ts
index bc206da8258..7c20781a997 100644
--- a/packages/web-app-files/src/mixins/actions/restore.ts
+++ b/packages/web-app-files/src/mixins/actions/restore.ts
@@ -29,9 +29,12 @@ export default {
               return false
             }
 
-            const { manager, editor } = this.space?.spaceRoles
             const isProjectSpace = isProjectSpaceResource(this.space)
-            if (isProjectSpace && ![...manager, ...editor].includes(this.user.uuid)) {
+            if (
+              isProjectSpace &&
+              !this.space.isEditor(this.user.uuid) &&
+              !this.space.isManager(this.user.uuid)
+            ) {
               return false
             }
 
diff --git a/packages/web-app-files/src/views/spaces/GenericTrash.vue b/packages/web-app-files/src/views/spaces/GenericTrash.vue
index b0e5bccec91..1f3ebcc5bbc 100644
--- a/packages/web-app-files/src/views/spaces/GenericTrash.vue
+++ b/packages/web-app-files/src/views/spaces/GenericTrash.vue
@@ -153,8 +153,11 @@ export default defineComponent({
     },
 
     showActions() {
-      const { manager, editor } = this.space?.spaceRoles
-      return !isProjectSpaceResource(this.space) || [...manager, ...editor].includes(this.user.uuid)
+      return (
+        !isProjectSpaceResource(this.space) ||
+        this.space.isEditor(this.user.uuid) ||
+        this.space.isManager(this.user.uuid)
+      )
     }
   },
 
diff --git a/packages/web-app-files/tests/unit/mixins/actions/emptyTrashBin.spec.js b/packages/web-app-files/tests/unit/mixins/actions/emptyTrashBin.spec.js
index 9f68421bd15..633252faa7f 100644
--- a/packages/web-app-files/tests/unit/mixins/actions/emptyTrashBin.spec.js
+++ b/packages/web-app-files/tests/unit/mixins/actions/emptyTrashBin.spec.js
@@ -91,7 +91,7 @@ function getWrapper({
       },
       $gettext: jest.fn(),
       $pgettext: jest.fn(),
-      space: { driveType, spaceRoles: { viewer: [], editor: [], manager: [] } },
+      space: { driveType, isEditor: () => false, isManager: () => false },
       $client: {
         ...sdkMock,
         fileTrash: {
diff --git a/packages/web-app-files/tests/unit/mixins/actions/restore.spec.js b/packages/web-app-files/tests/unit/mixins/actions/restore.spec.js
index be8ef53a60a..d3219b679ab 100644
--- a/packages/web-app-files/tests/unit/mixins/actions/restore.spec.js
+++ b/packages/web-app-files/tests/unit/mixins/actions/restore.spec.js
@@ -89,7 +89,7 @@ function getWrapper({
       },
       $gettext: jest.fn(),
       $gettextInterpolate: jest.fn(),
-      space: { driveType, spaceRoles: { viewer: [], editor: [], manager: [] } },
+      space: { driveType, isEditor: () => false, isManager: () => false },
       $client: {
         ...sdkMock,
         fileTrash: {
diff --git a/packages/web-client/src/helpers/space/functions.ts b/packages/web-client/src/helpers/space/functions.ts
index 7953f7ef3b2..dbf4d658243 100644
--- a/packages/web-client/src/helpers/space/functions.ts
+++ b/packages/web-client/src/helpers/space/functions.ts
@@ -1,6 +1,6 @@
 import { User } from '../user'
 import { buildWebDavSpacesPath, extractDomSelector, Resource } from '../resource'
-import { SpacePeopleShareRoles, spaceRoleEditor, spaceRoleManager } from '../share'
+import { SpacePeopleShareRoles, spaceRoleEditor, spaceRoleManager, spaceRoleViewer } from '../share'
 import { PublicSpaceResource, ShareSpaceResource, SpaceResource, SHARE_JAIL_ID } from './types'
 import { DavProperty } from 'web-pkg/src/constants'
 import { buildWebDavPublicPath } from 'files/src/helpers/resources'
@@ -197,6 +197,15 @@ export function buildSpace(data): SpaceResource {
     },
     getWebDavUrl(resource: Resource): string {
       return urlJoin(this.webDavUrl, resource.path)
+    },
+    isViewer(uuid: string): boolean {
+      return this.spaceRoles[spaceRoleViewer.name].includes(uuid)
+    },
+    isEditor(uuid: string): boolean {
+      return this.spaceRoles[spaceRoleEditor.name].includes(uuid)
+    },
+    isManager(uuid: string): boolean {
+      return this.spaceRoles[spaceRoleManager.name].includes(uuid)
     }
   }
   Object.defineProperty(s, 'nodeId', {
diff --git a/packages/web-client/src/helpers/space/types.ts b/packages/web-client/src/helpers/space/types.ts
index 90a7e9537a8..e8b4bbad5f6 100644
--- a/packages/web-client/src/helpers/space/types.ts
+++ b/packages/web-client/src/helpers/space/types.ts
@@ -38,6 +38,9 @@ export const isPersonalSpaceResource = (resource: Resource): resource is Persona
 
 export interface ProjectSpaceResource extends SpaceResource {
   __projectSpaceResource?: any
+  isViewer(uuid: string): boolean
+  isEditor(uuid: string): boolean
+  isManager(uuid: string): boolean
 }
 export const isProjectSpaceResource = (resource: Resource): resource is ProjectSpaceResource => {
   return resource.driveType === 'project'
diff --git a/tests/e2e/support/objects/app-files/resource/actions.ts b/tests/e2e/support/objects/app-files/resource/actions.ts
index ebdea123da0..acd3137bc76 100644
--- a/tests/e2e/support/objects/app-files/resource/actions.ts
+++ b/tests/e2e/support/objects/app-files/resource/actions.ts
@@ -478,7 +478,6 @@ export const getDeleteResourceButtonVisibility = async (
   const resourceCheckbox = page.locator(
     util.format(checkBoxForTrashbin, `/${resource.replace(/^\/+/, '')}`)
   )
-  await new Promise((resolve) => setTimeout(resolve, 5000))
   if (!(await resourceCheckbox.isChecked())) {
     await resourceCheckbox.check()
   }
@@ -519,7 +518,6 @@ export const getRestoreResourceButtonVisibility = async (
   const resourceCheckbox = page.locator(
     util.format(checkBoxForTrashbin, `/${resource.replace(/^\/+/, '')}`)
   )
-  await new Promise((resolve) => setTimeout(resolve, 5000))
   if (!(await resourceCheckbox.isChecked())) {
     await resourceCheckbox.check()
   }

From d8ec4aba6ac3822ab07ff391c800acfcabe5f463 Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Thu, 13 Oct 2022 12:33:44 +0200
Subject: [PATCH 5/5] Remove unnecessary variable assignment

---
 packages/web-app-files/src/mixins/actions/delete.js        | 3 +--
 packages/web-app-files/src/mixins/actions/emptyTrashBin.js | 3 +--
 packages/web-app-files/src/mixins/actions/restore.ts       | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/web-app-files/src/mixins/actions/delete.js b/packages/web-app-files/src/mixins/actions/delete.js
index 2aa2a812f19..0e6992a7d01 100644
--- a/packages/web-app-files/src/mixins/actions/delete.js
+++ b/packages/web-app-files/src/mixins/actions/delete.js
@@ -62,9 +62,8 @@ export default {
               return false
             }
 
-            const isProjectSpace = isProjectSpaceResource(this.space)
             if (
-              isProjectSpace &&
+              isProjectSpaceResource(this.space) &&
               !this.space.isEditor(this.user.uuid) &&
               !this.space.isManager(this.user.uuid)
             ) {
diff --git a/packages/web-app-files/src/mixins/actions/emptyTrashBin.js b/packages/web-app-files/src/mixins/actions/emptyTrashBin.js
index 238604fafec..d1f744762f8 100644
--- a/packages/web-app-files/src/mixins/actions/emptyTrashBin.js
+++ b/packages/web-app-files/src/mixins/actions/emptyTrashBin.js
@@ -23,9 +23,8 @@ export default {
               return false
             }
 
-            const isProjectSpace = isProjectSpaceResource(this.space)
             if (
-              isProjectSpace &&
+              isProjectSpaceResource(this.space) &&
               !this.space.isEditor(this.user.uuid) &&
               !this.space.isManager(this.user.uuid)
             ) {
diff --git a/packages/web-app-files/src/mixins/actions/restore.ts b/packages/web-app-files/src/mixins/actions/restore.ts
index 7c20781a997..7c03b280f7d 100644
--- a/packages/web-app-files/src/mixins/actions/restore.ts
+++ b/packages/web-app-files/src/mixins/actions/restore.ts
@@ -29,9 +29,8 @@ export default {
               return false
             }
 
-            const isProjectSpace = isProjectSpaceResource(this.space)
             if (
-              isProjectSpace &&
+              isProjectSpaceResource(this.space) &&
               !this.space.isEditor(this.user.uuid) &&
               !this.space.isManager(this.user.uuid)
             ) {