From 6f1cbecb19f6de9a0a7eb4a854fdf03d876d04f2 Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Wed, 9 Mar 2022 09:58:22 +0100
Subject: [PATCH 1/9] Add and adjust unit tests

---
 .../src/components/SideBar/SideBar.vue        |  5 ++
 .../SideBar/Shares/FileShares.spec.js         |  4 ++
 .../unit/components/SideBar/SideBar.spec.js   | 60 ++++++++++++++++++-
 3 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/packages/web-app-files/src/components/SideBar/SideBar.vue b/packages/web-app-files/src/components/SideBar/SideBar.vue
index 8be8ff881b6..53e8e3e4805 100644
--- a/packages/web-app-files/src/components/SideBar/SideBar.vue
+++ b/packages/web-app-files/src/components/SideBar/SideBar.vue
@@ -246,6 +246,11 @@ export default {
     visibilityObserver.disconnect()
     hiddenObserver.disconnect()
   },
+  mounted() {
+    if (this.$route.params.spaceId && !this.highlightedFileIsSpace) {
+      this.loadSpaceTask.perform(this, this.$route.params.spaceId)
+    }
+  },
   methods: {
     ...mapActions('Files/sidebar', {
       closeSidebar: 'close',
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js
index 699075655c2..9176b111c84 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js
@@ -8,6 +8,10 @@ import Collaborators from '@/__fixtures__/collaborators'
 import mockAxios from 'jest-mock-axios'
 import { spaceRoleManager } from '../../../../../src/helpers/share'
 import VueCompositionAPI from '@vue/composition-api/dist/vue-composition-api'
+import mockAxios from 'jest-mock-axios'
+import { buildSpace } from '../../../../../src/helpers/resources'
+import { spaceRoleManager } from '../../../../../src/helpers/share'
+import VueCompositionAPI from '@vue/composition-api/dist/vue-composition-api'
 
 const localVue = createLocalVue()
 localVue.use(DesignSystem)
diff --git a/packages/web-app-files/tests/unit/components/SideBar/SideBar.spec.js b/packages/web-app-files/tests/unit/components/SideBar/SideBar.spec.js
index 360b3b240e7..328aedc2938 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/SideBar.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/SideBar.spec.js
@@ -10,6 +10,7 @@ import { buildResource, renameResource } from '@files/src/helpers/resources'
 
 import SideBar from '@files/src/components/SideBar/SideBar.vue'
 import { createLocationSpaces } from '../../../../src/router'
+import mockAxios from 'jest-mock-axios'
 
 jest.mock('web-pkg/src/observer')
 jest.mock('@files/src/helpers/resources', () => {
@@ -165,13 +166,58 @@ describe('SideBar', () => {
       })
     })
   })
+
+  describe('current space', () => {
+    beforeEach(() => {
+      buildResource.mockImplementation((item) => item)
+    })
+    afterEach(() => {
+      jest.clearAllMocks()
+      mockAxios.reset()
+    })
+    it('fetches the current space if a space id is given', async () => {
+      const spaceId = 1
+      mockAxios.request.mockImplementationOnce(() => {
+        return Promise.resolve({
+          data: { id: spaceId }
+        })
+      })
+
+      const mockFileInfo = jest.fn()
+      mockFileInfo.mockReturnValueOnce(Files['/'][1])
+
+      const wrapper = createWrapper({
+        item: simpleOwnFolder,
+        selectedItems: [simpleOwnFolder],
+        mocks: { $client: { files: { fileInfo: mockFileInfo } } },
+        spaceId
+      })
+
+      await wrapper.vm.loadSpaceTask.last
+      expect(wrapper.vm.currentSpace.id).toBe(spaceId)
+    })
+    it('does not fetch the current space if no space id is given', async () => {
+      const mockFileInfo = jest.fn()
+      mockFileInfo.mockReturnValueOnce(Files['/'][1])
+
+      const wrapper = createWrapper({
+        item: simpleOwnFolder,
+        selectedItems: [simpleOwnFolder],
+        mocks: { $client: { files: { fileInfo: mockFileInfo } } }
+      })
+
+      await wrapper.vm.loadSpaceTask.last
+      expect(wrapper.vm.currentSpace).toBeNull()
+    })
+  })
 })
 
 function createWrapper({
   item,
   selectedItems,
   mocks,
-  currentRouteName = 'files-spaces-personal-home'
+  currentRouteName = 'files-spaces-personal-home',
+  spaceId = undefined
 }) {
   const localVue = createLocalVue()
   localVue.use(Vuex)
@@ -180,6 +226,7 @@ function createWrapper({
     translations: 'does-not-matter.json',
     silent: true
   })
+
   return shallowMount(SideBar, {
     store: new Vuex.Store({
       getters: {
@@ -191,7 +238,11 @@ function createWrapper({
             api_enabled: true,
             public: { enabled: true }
           }
-        })
+        }),
+        getToken: jest.fn(() => 'GFwHKXdsMgoFwt'),
+        configuration: jest.fn(() => ({
+          server: 'http://example.com/'
+        }))
       },
       modules: {
         apps: {
@@ -237,6 +288,11 @@ function createWrapper({
           resolve: (r) => {
             return { href: r.name }
           }
+        },
+        $route: {
+          params: {
+            spaceId
+          }
         }
       },
       mocks

From 50f0c28fadc7661d4a1ef304556b20eec8afb22b Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Thu, 10 Mar 2022 09:54:49 +0100
Subject: [PATCH 2/9] Move laodSpaceTask from Sidebar to FileShares-panel

---
 .../components/SideBar/Shares/FileShares.vue  |  6 +-
 .../src/components/SideBar/SideBar.vue        |  5 --
 .../unit/components/SideBar/SideBar.spec.js   | 60 +------------------
 3 files changed, 5 insertions(+), 66 deletions(-)

diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
index f1b329b7754..f57df284cfd 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
@@ -114,11 +114,11 @@ export default {
       const promises = []
       const spaceShares = []
 
-      for (const role of Object.keys(ref.currentSpace.spaceRoles)) {
-        for (const userId of ref.currentSpace.spaceRoles[role]) {
+      for (const role of Object.keys(ref.space.spaceRoles)) {
+        for (const userId of ref.space.spaceRoles[role]) {
           promises.push(
             graphClient.users.getUser(userId).then((resolved) => {
-              spaceShares.push(buildSpaceShare({ ...resolved.data, role }, ref.currentSpace.id))
+              spaceShares.push(buildSpaceShare({ ...resolved.data, role }, ref.space.id))
             })
           )
         }
diff --git a/packages/web-app-files/src/components/SideBar/SideBar.vue b/packages/web-app-files/src/components/SideBar/SideBar.vue
index 53e8e3e4805..8be8ff881b6 100644
--- a/packages/web-app-files/src/components/SideBar/SideBar.vue
+++ b/packages/web-app-files/src/components/SideBar/SideBar.vue
@@ -246,11 +246,6 @@ export default {
     visibilityObserver.disconnect()
     hiddenObserver.disconnect()
   },
-  mounted() {
-    if (this.$route.params.spaceId && !this.highlightedFileIsSpace) {
-      this.loadSpaceTask.perform(this, this.$route.params.spaceId)
-    }
-  },
   methods: {
     ...mapActions('Files/sidebar', {
       closeSidebar: 'close',
diff --git a/packages/web-app-files/tests/unit/components/SideBar/SideBar.spec.js b/packages/web-app-files/tests/unit/components/SideBar/SideBar.spec.js
index 328aedc2938..360b3b240e7 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/SideBar.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/SideBar.spec.js
@@ -10,7 +10,6 @@ import { buildResource, renameResource } from '@files/src/helpers/resources'
 
 import SideBar from '@files/src/components/SideBar/SideBar.vue'
 import { createLocationSpaces } from '../../../../src/router'
-import mockAxios from 'jest-mock-axios'
 
 jest.mock('web-pkg/src/observer')
 jest.mock('@files/src/helpers/resources', () => {
@@ -166,58 +165,13 @@ describe('SideBar', () => {
       })
     })
   })
-
-  describe('current space', () => {
-    beforeEach(() => {
-      buildResource.mockImplementation((item) => item)
-    })
-    afterEach(() => {
-      jest.clearAllMocks()
-      mockAxios.reset()
-    })
-    it('fetches the current space if a space id is given', async () => {
-      const spaceId = 1
-      mockAxios.request.mockImplementationOnce(() => {
-        return Promise.resolve({
-          data: { id: spaceId }
-        })
-      })
-
-      const mockFileInfo = jest.fn()
-      mockFileInfo.mockReturnValueOnce(Files['/'][1])
-
-      const wrapper = createWrapper({
-        item: simpleOwnFolder,
-        selectedItems: [simpleOwnFolder],
-        mocks: { $client: { files: { fileInfo: mockFileInfo } } },
-        spaceId
-      })
-
-      await wrapper.vm.loadSpaceTask.last
-      expect(wrapper.vm.currentSpace.id).toBe(spaceId)
-    })
-    it('does not fetch the current space if no space id is given', async () => {
-      const mockFileInfo = jest.fn()
-      mockFileInfo.mockReturnValueOnce(Files['/'][1])
-
-      const wrapper = createWrapper({
-        item: simpleOwnFolder,
-        selectedItems: [simpleOwnFolder],
-        mocks: { $client: { files: { fileInfo: mockFileInfo } } }
-      })
-
-      await wrapper.vm.loadSpaceTask.last
-      expect(wrapper.vm.currentSpace).toBeNull()
-    })
-  })
 })
 
 function createWrapper({
   item,
   selectedItems,
   mocks,
-  currentRouteName = 'files-spaces-personal-home',
-  spaceId = undefined
+  currentRouteName = 'files-spaces-personal-home'
 }) {
   const localVue = createLocalVue()
   localVue.use(Vuex)
@@ -226,7 +180,6 @@ function createWrapper({
     translations: 'does-not-matter.json',
     silent: true
   })
-
   return shallowMount(SideBar, {
     store: new Vuex.Store({
       getters: {
@@ -238,11 +191,7 @@ function createWrapper({
             api_enabled: true,
             public: { enabled: true }
           }
-        }),
-        getToken: jest.fn(() => 'GFwHKXdsMgoFwt'),
-        configuration: jest.fn(() => ({
-          server: 'http://example.com/'
-        }))
+        })
       },
       modules: {
         apps: {
@@ -288,11 +237,6 @@ function createWrapper({
           resolve: (r) => {
             return { href: r.name }
           }
-        },
-        $route: {
-          params: {
-            spaceId
-          }
         }
       },
       mocks

From 9ba49e622f5927753911fcae232659a16f2f8cc7 Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Fri, 11 Mar 2022 09:59:26 +0100
Subject: [PATCH 3/9] Implement people sharing for resources within a space

---
 .../enhancement-spaces-sharing-within-space   |  6 +++
 .../SideBar/Details/FileDetails.vue           | 21 +++++++--
 .../components/SideBar/Links/FileLinks.vue    |  6 ++-
 .../components/SideBar/Shares/FileShares.vue  | 17 ++++---
 .../InviteCollaboratorForm.vue                | 10 +++-
 .../components/SideBar/Shares/SpaceShares.vue |  2 +-
 .../src/services/folder/loaderProject.ts      |  3 +-
 packages/web-app-files/src/store/actions.js   | 46 +++++++++++++------
 .../tests/unit/store/actions.spec.js          |  2 +-
 9 files changed, 81 insertions(+), 32 deletions(-)
 create mode 100644 changelog/unreleased/enhancement-spaces-sharing-within-space

diff --git a/changelog/unreleased/enhancement-spaces-sharing-within-space b/changelog/unreleased/enhancement-spaces-sharing-within-space
new file mode 100644
index 00000000000..04ab2c30172
--- /dev/null
+++ b/changelog/unreleased/enhancement-spaces-sharing-within-space
@@ -0,0 +1,6 @@
+Enhancement: Implement people sharing for resources within a space
+
+Resources within a space can now be shared with other people.
+
+https://github.com/owncloud/web/pull/6577
+https://github.com/owncloud/web/issues/6283
diff --git a/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue b/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue
index 0fb37dbffcb..2045ef1e344 100644
--- a/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue
+++ b/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue
@@ -92,8 +92,9 @@ import { ImageDimension } from '../../../constants'
 import { loadPreview } from '../../../helpers/resource'
 import upperFirst from 'lodash-es/upperFirst'
 import path from 'path'
-import { createLocationSpaces, isAuthenticatedRoute } from '../../../router'
+import { createLocationSpaces, isAuthenticatedRoute, isLocationSpacesActive } from '../../../router'
 import { ShareTypes } from '../../../helpers/share'
+import { useRoute, useRouter } from 'web-pkg/src/composables'
 import { getIndicators } from '../../../helpers/statusIndicators'
 
 export default {
@@ -103,11 +104,20 @@ export default {
   inject: ['displayedItem'],
   setup() {
     const sharedParentDir = ref('')
-    const sharedParentRoute = computed(() =>
-      createLocationSpaces('files-spaces-personal-home', {
+    const router = useRouter()
+    const route = useRoute()
+
+    const sharedParentRoute = computed(() => {
+      if (isLocationSpacesActive(router, 'files-spaces-project')) {
+        return createLocationSpaces('files-spaces-project', {
+          params: { spaceId: route.value.params.spaceId, item: sharedParentDir.value }
+        })
+      }
+
+      return createLocationSpaces('files-spaces-personal-home', {
         params: { item: sharedParentDir.value }
       })
-    )
+    })
 
     return {
       sharedParentDir,
@@ -307,7 +317,8 @@ export default {
       await this.loadSharesTree({
         client: this.$client,
         path: this.file.path,
-        $gettext: this.$gettext
+        $gettext: this.$gettext,
+        spaceId: this.$route.params.spaceId
       })
       this.shareIndicators = getIndicators(this.file, this.sharesTree)
     },
diff --git a/packages/web-app-files/src/components/SideBar/Links/FileLinks.vue b/packages/web-app-files/src/components/SideBar/Links/FileLinks.vue
index 17aa0d6e9d5..6fa2d077a5f 100644
--- a/packages/web-app-files/src/components/SideBar/Links/FileLinks.vue
+++ b/packages/web-app-files/src/components/SideBar/Links/FileLinks.vue
@@ -197,12 +197,14 @@ export default {
       this.loadCurrentFileOutgoingShares({
         client: this.$client,
         path: this.highlightedFile.path,
-        $gettext: this.$gettext
+        $gettext: this.$gettext,
+        spaceId: this.$route.params.spaceId
       })
       this.loadSharesTree({
         client: this.$client,
         path: dirname(this.highlightedFile.path),
-        $gettext: this.$gettext
+        $gettext: this.$gettext,
+        spaceId: this.$route.params.spaceId
       })
     },
     linksComparator(l1, l2) {
diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
index f57df284cfd..f111fb3f881 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
@@ -31,7 +31,8 @@
       <template v-if="showShareesList && hasSharees">
         <ul
           id="files-collaborators-list"
-          class="oc-list oc-list-divider oc-overflow-hidden oc-m-rm"
+          class="oc-list oc-list-divider oc-overflow-hidden"
+          :class="{ 'oc-mb-l': showSpaceMembers, 'oc-m-rm': !showSpaceMembers }"
           :aria-label="$gettext('Share receivers')"
         >
           <li v-for="collaborator in collaborators" :key="collaborator.key">
@@ -246,7 +247,7 @@ export default {
     },
 
     currentUserCanShare() {
-      return this.highlightedFile.canShare()
+      return this.highlightedFile.canShare({ user: this.user })
     },
     noResharePermsMessage() {
       const translatedFile = this.$gettext("You don't have permission to share this file.")
@@ -340,24 +341,28 @@ export default {
       this.deleteShare({
         client: this.$client,
         share: share,
-        resource: this.highlightedFile
+        resource: this.highlightedFile,
+        spaceId: this.$route.params.spaceId
       })
     },
     $_reloadShares() {
       this.loadCurrentFileOutgoingShares({
         client: this.$client,
         path: this.highlightedFile.path,
-        $gettext: this.$gettext
+        $gettext: this.$gettext,
+        spaceId: this.$route.params.spaceId
       })
       this.loadIncomingShares({
         client: this.$client,
         path: this.highlightedFile.path,
-        $gettext: this.$gettext
+        $gettext: this.$gettext,
+        spaceId: this.$route.params.spaceId
       })
       this.loadSharesTree({
         client: this.$client,
         path: dirname(this.highlightedFile.path),
-        $gettext: this.$gettext
+        $gettext: this.$gettext,
+        spaceId: this.$route.params.spaceId
       })
     }
   }
diff --git a/packages/web-app-files/src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.vue b/packages/web-app-files/src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.vue
index ba4371891f2..f6eb18d7a27 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.vue
@@ -254,6 +254,14 @@ export default {
               : SharePermissions.permissionsToBitmask(
                   this.selectedRole.permissions(!this.isOcis || this.resourceIsSpace)
                 )
+
+            let spaceId
+            if (this.resourceIsSpace) {
+              spaceId = this.highlightedFile.id
+            } else if (this.$route.params.spaceId) {
+              spaceId = this.$route.params.spaceId
+            }
+
             this.addShare({
               client: this.$client,
               graphClient: this.graphClient,
@@ -264,7 +272,7 @@ export default {
               shareType: collaborator.value.shareType,
               permissions: bitmask,
               expirationDate: this.expirationDate,
-              storageId: this.resourceIsSpace ? this.highlightedFile.id : null
+              spaceId
             })
           })
         )
diff --git a/packages/web-app-files/src/components/SideBar/Shares/SpaceShares.vue b/packages/web-app-files/src/components/SideBar/Shares/SpaceShares.vue
index 778b56d139b..06632eab958 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/SpaceShares.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/SpaceShares.vue
@@ -53,7 +53,7 @@ export default {
       yield ref.loadCurrentFileOutgoingShares({
         client: graphClient,
         path: ref.space.id,
-        space: ref.space
+        resource: ref.space
       })
     })
 
diff --git a/packages/web-app-files/src/services/folder/loaderProject.ts b/packages/web-app-files/src/services/folder/loaderProject.ts
index 63f2de369a4..ef83b1064b8 100644
--- a/packages/web-app-files/src/services/folder/loaderProject.ts
+++ b/packages/web-app-files/src/services/folder/loaderProject.ts
@@ -60,7 +60,8 @@ export class FolderLoaderProject implements FolderLoader {
       })
       ref.loadIndicators({
         client: ref.$client,
-        currentFolder: currentFolder?.path
+        currentFolder: currentFolder?.path,
+        spaceId: ref.space.id
       })
 
       if (!sameRoute) {
diff --git a/packages/web-app-files/src/store/actions.js b/packages/web-app-files/src/store/actions.js
index db8d5e80c8b..5d0df3edc2f 100644
--- a/packages/web-app-files/src/store/actions.js
+++ b/packages/web-app-files/src/store/actions.js
@@ -151,17 +151,17 @@ export default {
       value: computeShareTypes(state.currentFileOutgoingShares)
     })
   },
-  loadCurrentFileOutgoingShares(context, { client, path, space }) {
+  loadCurrentFileOutgoingShares(context, { client, path, resource, spaceId }) {
     context.commit('CURRENT_FILE_OUTGOING_SHARES_SET', [])
     context.commit('CURRENT_FILE_OUTGOING_SHARES_ERROR', null)
     context.commit('CURRENT_FILE_OUTGOING_SHARES_LOADING', true)
 
-    if (space) {
+    if (resource?.type === 'space') {
       const promises = []
       const spaceShares = []
 
-      for (const role of Object.keys(space.spaceRoles)) {
-        for (const userId of space.spaceRoles[role]) {
+      for (const role of Object.keys(resource.spaceRoles)) {
+        for (const userId of resource.spaceRoles[role]) {
           promises.push(
             client.users.getUser(userId).then((resolved) => {
               spaceShares.push(
@@ -170,7 +170,7 @@ export default {
                     ...resolved.data,
                     role
                   },
-                  space.id
+                  resource.id
                 )
               )
             })
@@ -190,9 +190,14 @@ export default {
         })
     }
 
+    let spaceRef
+    if (spaceId) {
+      spaceRef = `${spaceId}${path}`
+    }
+
     // see https://owncloud.dev/owncloud-sdk/Shares.html
     client.shares
-      .getShares(path, { reshares: true })
+      .getShares(path, { reshares: true, spaceRef })
       .then((data) => {
         context.commit(
           'CURRENT_FILE_OUTGOING_SHARES_SET',
@@ -391,12 +396,18 @@ export default {
       return
     }
 
+    let spaceRef
+    if (spaceId) {
+      spaceRef = `${spaceId}${path}`
+    }
+
     const remoteShare = shareType === ShareTypes.remote.value
     client.shares
       .shareFileWithUser(path, shareWith, {
         permissions: permissions,
         remoteUser: remoteShare,
-        expirationDate: expirationDate
+        expirationDate: expirationDate,
+        spaceRef
       })
       .then((share) => {
         context.commit(
@@ -408,7 +419,7 @@ export default {
           )
         )
         context.dispatch('updateCurrentFileShareTypes')
-        context.dispatch('loadIndicators', { client, currentFolder: path })
+        context.dispatch('loadIndicators', { client, currentFolder: path, spaceId })
       })
       .catch((e) => {
         context.dispatch(
@@ -422,7 +433,7 @@ export default {
         )
       })
   },
-  deleteShare(context, { client, graphClient, share, resource }) {
+  deleteShare(context, { client, graphClient, share, resource, spaceId }) {
     const additionalParams = {}
     if (share.shareType === ShareTypes.space.value) {
       additionalParams.shareWith = share.collaborator.name
@@ -435,7 +446,7 @@ export default {
 
         if (share.shareType !== ShareTypes.space.value) {
           context.dispatch('updateCurrentFileShareTypes')
-          context.dispatch('loadIndicators', { client, currentFolder: resource.path })
+          context.dispatch('loadIndicators', { client, currentFolder: resource.path, spaceId })
         } else {
           context.commit('CURRENT_FILE_OUTGOING_SHARES_LOADING', true)
 
@@ -466,7 +477,7 @@ export default {
    * This will add new entries into the shares tree and will
    * not remove unrelated existing ones.
    */
-  loadSharesTree(context, { client, path }) {
+  loadSharesTree(context, { client, path, spaceId }) {
     context.commit('SHARESTREE_ERROR', null)
     // prune shares tree cache for all unrelated paths, keeping only
     // existing relevant parent entries
@@ -479,6 +490,11 @@ export default {
       return Promise.resolve()
     }
 
+    let spaceRef
+    if (spaceId) {
+      spaceRef = `${spaceId}${path}`
+    }
+
     // remove last entry which is the root folder
     parentPaths.pop()
 
@@ -496,7 +512,7 @@ export default {
       shareQueriesPromises.push(
         shareQueriesQueue.add(() =>
           client.shares
-            .getShares(queryPath, { reshares: true })
+            .getShares(queryPath, { reshares: true, spaceRef })
             .then((data) => {
               data.forEach((element) => {
                 sharesTree[queryPath].push({
@@ -517,7 +533,7 @@ export default {
       shareQueriesPromises.push(
         shareQueriesQueue.add(() =>
           client.shares
-            .getShares(queryPath, { shared_with_me: true })
+            .getShares(queryPath, { shared_with_me: true, spaceRef })
             .then((data) => {
               data.forEach((element) => {
                 sharesTree[queryPath].push({
@@ -619,11 +635,11 @@ export default {
     commit('CLEAR_RESOURCES_TO_DELETE_LIST')
   },
 
-  async loadIndicators({ dispatch, commit }, { client, currentFolder }) {
+  async loadIndicators({ dispatch, commit }, { client, currentFolder, spaceId }) {
     // kind of bruteforce for now: remove the shares for the current folder and children, reload shares tree for the current folder.
     // TODO: when we refactor the shares tree we want to modify shares tree nodes incrementally during adding and removing shares, not loading everything new from the backend.
     commit('SHARESTREE_PRUNE_OUTSIDE_PATH', dirname(currentFolder))
-    await dispatch('loadSharesTree', { client, path: currentFolder })
+    await dispatch('loadSharesTree', { client, path: currentFolder, spaceId })
     commit('LOAD_INDICATORS')
   },
 
diff --git a/packages/web-app-files/tests/unit/store/actions.spec.js b/packages/web-app-files/tests/unit/store/actions.spec.js
index 9389907411f..d6f08ae09bd 100644
--- a/packages/web-app-files/tests/unit/store/actions.spec.js
+++ b/packages/web-app-files/tests/unit/store/actions.spec.js
@@ -85,7 +85,7 @@ describe('vuex store actions', () => {
       await actions.loadCurrentFileOutgoingShares(stateMock, {
         client: clientMock,
         path: 'path',
-        space: dataSet.space
+        resource: dataSet.space
       })
 
       expect(commitSpy).toBeCalledTimes(dataSet.expectedCommitCalls)

From 7b572f41c2856c705a1f6f12083665694eaba21c Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Fri, 11 Mar 2022 10:25:34 +0100
Subject: [PATCH 4/9] Fix unit tests

---
 .../unit/components/SideBar/Links/FileLinks.spec.js    | 10 ++++++++++
 .../unit/components/SideBar/Shares/FileShares.spec.js  |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/packages/web-app-files/tests/unit/components/SideBar/Links/FileLinks.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Links/FileLinks.spec.js
index 79cf38f5a59..16556a28a84 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Links/FileLinks.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Links/FileLinks.spec.js
@@ -235,6 +235,11 @@ describe('FileLinks', () => {
       stubs: stubs,
       provide: {
         changeView: jest.fn()
+      },
+      mocks: {
+        $route: {
+          params: {}
+        }
       }
     })
   }
@@ -249,6 +254,11 @@ describe('FileLinks', () => {
       },
       provide: {
         changeView: jest.fn()
+      },
+      mocks: {
+        $route: {
+          params: {}
+        }
       }
     })
   }
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js
index 9176b111c84..6404f6ac138 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js
@@ -274,6 +274,11 @@ function getMountedWrapper(data, loading = false) {
       'oc-icon': true,
       'oc-spinner': true,
       'avatar-image': true
+    },
+    mocks: {
+      $route: {
+        params: {}
+      }
     }
   })
 }

From 1f3d3d400eff7f3743221b3bef6f72c60b57fac9 Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Fri, 11 Mar 2022 12:11:08 +0100
Subject: [PATCH 5/9] Add unit tests for the invite collaborator form

---
 .../InviteCollaboratorForm.spec.js            | 110 +++++++++++++++++-
 1 file changed, 109 insertions(+), 1 deletion(-)

diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.spec.js
index ee3bf750993..1cc4a495877 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.spec.js
@@ -1,3 +1,40 @@
+import { createLocalVue, mount } from '@vue/test-utils'
+import GetTextPlugin from 'vue-gettext'
+import InviteCollaboratorForm from '../../../../../../src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm'
+import { ShareTypes } from '../../../../../../src/helpers/share'
+import Vuex from 'vuex'
+import DesignSystem from 'owncloud-design-system'
+import VueSelect from 'vue-select'
+import stubs from '@/tests/unit/stubs'
+
+const localVue = createLocalVue()
+localVue.use(GetTextPlugin, {
+  translations: 'does-not-matter.json',
+  silent: true
+})
+localVue.use(DesignSystem)
+localVue.use(VueSelect)
+localVue.use(Vuex)
+
+const folderMock = {
+  type: 'folder',
+  isFolder: true,
+  ownerId: 'alice',
+  ownerDisplayName: 'alice',
+  mdate: 'Wed, 21 Oct 2015 07:28:00 GMT',
+  size: '740',
+  isMounted: jest.fn(() => true),
+  name: 'lorem.txt',
+  privateLink: 'some-link',
+  canShare: jest.fn(() => true),
+  path: '/documents'
+}
+
+const spaceMock = {
+  id: 1,
+  type: 'space'
+}
+
 describe('InviteCollaboratorForm', () => {
   describe('renders correctly', () => {
     it.todo('renders a select field for share receivers')
@@ -9,7 +46,78 @@ describe('InviteCollaboratorForm', () => {
   })
   describe('behaves correctly', () => {
     it.todo('upon mount fetches recipients')
-    it.todo('clicking the invite-sharees button starts promise queue')
+    it('the "share" button', async () => {
+      const selectedCollaborators = [
+        { shareWith: 'marie', value: { shareType: ShareTypes.user.value }, label: 'label' }
+      ]
+      const wrapper = getWrapper({ selectedCollaborators })
+      const spyTriggerUpload = jest.spyOn(wrapper.vm, 'share')
+      const shareBtn = wrapper.find('#new-collaborators-form-create-button')
+      expect(shareBtn.exists()).toBeTruthy()
+
+      await shareBtn.trigger('click')
+      expect(spyTriggerUpload).toHaveBeenCalledTimes(0)
+    })
+    it.each([
+      { spaceId: undefined, highlightedFile: folderMock },
+      { spaceId: undefined, highlightedFile: spaceMock },
+      { spaceId: 1, highlightedFile: folderMock }
+    ])('calls the "addShare" action', async (dataSet) => {
+      const selectedCollaborators = [
+        { shareWith: 'marie', value: { shareType: ShareTypes.user.value }, label: 'label' }
+      ]
+      const wrapper = getWrapper({
+        selectedCollaborators,
+        spaceId: dataSet.spaceId,
+        highlightedFile: dataSet.highlightedFile
+      })
+      const addShareSpy = jest.spyOn(wrapper.vm, 'addShare')
+      await wrapper.vm.share()
+      expect(addShareSpy).toBeCalled()
+    })
     it.todo('resets focus upon selecting an invitee')
   })
 })
+
+function getWrapper({ selectedCollaborators = [], spaceId, highlightedFile = folderMock } = {}) {
+  return mount(InviteCollaboratorForm, {
+    localVue,
+    stubs: {
+      'recipient-container': true,
+      'role-dropdown': true,
+      ...stubs
+    },
+    data() {
+      return {
+        selectedCollaborators
+      }
+    },
+    mocks: {
+      $route: {
+        params: { spaceId }
+      }
+    },
+    store: new Vuex.Store({
+      modules: {
+        Files: {
+          namespaced: true,
+          getters: {
+            highlightedFile: () => {
+              return highlightedFile
+            }
+          },
+          actions: {
+            addShare: jest.fn()
+          }
+        }
+      },
+      getters: {
+        isOcis: () => true,
+        getToken: jest.fn(() => 'GFwHKXdsMgoFwt'),
+        configuration: jest.fn(() => ({
+          server: 'http://example.com/'
+        }))
+      }
+    })
+  })
+}

From 5ee513bb01de76db1a5b160f943b7e2b3ed52fec Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Mon, 14 Mar 2022 09:38:02 +0100
Subject: [PATCH 6/9] Add default DAV properties to the fetch space resources
 request

---
 packages/web-app-files/src/services/folder/loaderProject.ts  | 5 ++++-
 .../Shares/InviteCollaborator/InviteCollaboratorForm.spec.js | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/web-app-files/src/services/folder/loaderProject.ts b/packages/web-app-files/src/services/folder/loaderProject.ts
index ef83b1064b8..ddd3d114b6a 100644
--- a/packages/web-app-files/src/services/folder/loaderProject.ts
+++ b/packages/web-app-files/src/services/folder/loaderProject.ts
@@ -4,6 +4,7 @@ import { useTask } from 'vue-concurrency'
 import { isLocationSpacesActive } from '../../router'
 import { clientService } from 'web-pkg/src/services'
 import { buildResource, buildSpace, buildWebDavSpacesPath } from '../../helpers/resources'
+import { DavProperties } from 'web-pkg/src/constants'
 
 export class FolderLoaderProject implements FolderLoader {
   public isEnabled(router: Router): boolean {
@@ -37,7 +38,9 @@ export class FolderLoaderProject implements FolderLoader {
       }
 
       const webDavResponse = yield ref.$client.files.list(
-        buildWebDavSpacesPath(ref.$route.params.storageId, path || '')
+        buildWebDavSpacesPath(ref.$route.params.storageId, path || ''),
+        1,
+        DavProperties.Default
       )
 
       let resources = []
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.spec.js
index 1cc4a495877..55303e86d1b 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.spec.js
@@ -46,7 +46,7 @@ describe('InviteCollaboratorForm', () => {
   })
   describe('behaves correctly', () => {
     it.todo('upon mount fetches recipients')
-    it('the "share" button', async () => {
+    it('clicking the invite-sharees button calls the "share"-action', async () => {
       const selectedCollaborators = [
         { shareWith: 'marie', value: { shareType: ShareTypes.user.value }, label: 'label' }
       ]

From ae5b23b1cfe401a69002181488b1195fff9b9e78 Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Wed, 16 Mar 2022 08:44:58 +0100
Subject: [PATCH 7/9] Rename 'spaceId' to 'storageId' after rebase

---
 .../SideBar/Details/FileDetails.vue           |  4 +--
 .../components/SideBar/Links/FileLinks.vue    |  4 +--
 .../components/SideBar/Shares/FileShares.vue  |  8 +++---
 .../InviteCollaboratorForm.vue                | 10 +++----
 .../src/services/folder/loaderProject.ts      |  2 +-
 packages/web-app-files/src/store/actions.js   | 26 +++++++++----------
 .../InviteCollaboratorForm.spec.js            | 12 ++++-----
 7 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue b/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue
index 2045ef1e344..949ca990277 100644
--- a/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue
+++ b/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue
@@ -110,7 +110,7 @@ export default {
     const sharedParentRoute = computed(() => {
       if (isLocationSpacesActive(router, 'files-spaces-project')) {
         return createLocationSpaces('files-spaces-project', {
-          params: { spaceId: route.value.params.spaceId, item: sharedParentDir.value }
+          params: { storageId: route.value.params.storageId, item: sharedParentDir.value }
         })
       }
 
@@ -318,7 +318,7 @@ export default {
         client: this.$client,
         path: this.file.path,
         $gettext: this.$gettext,
-        spaceId: this.$route.params.spaceId
+        storageId: this.$route.params.storageId
       })
       this.shareIndicators = getIndicators(this.file, this.sharesTree)
     },
diff --git a/packages/web-app-files/src/components/SideBar/Links/FileLinks.vue b/packages/web-app-files/src/components/SideBar/Links/FileLinks.vue
index 6fa2d077a5f..23fe194bad7 100644
--- a/packages/web-app-files/src/components/SideBar/Links/FileLinks.vue
+++ b/packages/web-app-files/src/components/SideBar/Links/FileLinks.vue
@@ -198,13 +198,13 @@ export default {
         client: this.$client,
         path: this.highlightedFile.path,
         $gettext: this.$gettext,
-        spaceId: this.$route.params.spaceId
+        storageId: this.$route.params.storageId
       })
       this.loadSharesTree({
         client: this.$client,
         path: dirname(this.highlightedFile.path),
         $gettext: this.$gettext,
-        spaceId: this.$route.params.spaceId
+        storageId: this.$route.params.storageId
       })
     },
     linksComparator(l1, l2) {
diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
index f111fb3f881..38127a8da9d 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
@@ -342,7 +342,7 @@ export default {
         client: this.$client,
         share: share,
         resource: this.highlightedFile,
-        spaceId: this.$route.params.spaceId
+        storageId: this.$route.params.storageId
       })
     },
     $_reloadShares() {
@@ -350,19 +350,19 @@ export default {
         client: this.$client,
         path: this.highlightedFile.path,
         $gettext: this.$gettext,
-        spaceId: this.$route.params.spaceId
+        storageId: this.$route.params.storageId
       })
       this.loadIncomingShares({
         client: this.$client,
         path: this.highlightedFile.path,
         $gettext: this.$gettext,
-        spaceId: this.$route.params.spaceId
+        storageId: this.$route.params.storageId
       })
       this.loadSharesTree({
         client: this.$client,
         path: dirname(this.highlightedFile.path),
         $gettext: this.$gettext,
-        spaceId: this.$route.params.spaceId
+        storageId: this.$route.params.storageId
       })
     }
   }
diff --git a/packages/web-app-files/src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.vue b/packages/web-app-files/src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.vue
index f6eb18d7a27..ce00aebefb0 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.vue
@@ -255,11 +255,11 @@ export default {
                   this.selectedRole.permissions(!this.isOcis || this.resourceIsSpace)
                 )
 
-            let spaceId
+            let storageId
             if (this.resourceIsSpace) {
-              spaceId = this.highlightedFile.id
-            } else if (this.$route.params.spaceId) {
-              spaceId = this.$route.params.spaceId
+              storageId = this.highlightedFile.id
+            } else if (this.$route.params.storageId) {
+              storageId = this.$route.params.storageId
             }
 
             this.addShare({
@@ -272,7 +272,7 @@ export default {
               shareType: collaborator.value.shareType,
               permissions: bitmask,
               expirationDate: this.expirationDate,
-              spaceId
+              storageId
             })
           })
         )
diff --git a/packages/web-app-files/src/services/folder/loaderProject.ts b/packages/web-app-files/src/services/folder/loaderProject.ts
index ddd3d114b6a..be38f907aa9 100644
--- a/packages/web-app-files/src/services/folder/loaderProject.ts
+++ b/packages/web-app-files/src/services/folder/loaderProject.ts
@@ -64,7 +64,7 @@ export class FolderLoaderProject implements FolderLoader {
       ref.loadIndicators({
         client: ref.$client,
         currentFolder: currentFolder?.path,
-        spaceId: ref.space.id
+        storageId: ref.space.id
       })
 
       if (!sameRoute) {
diff --git a/packages/web-app-files/src/store/actions.js b/packages/web-app-files/src/store/actions.js
index 5d0df3edc2f..d4469b94748 100644
--- a/packages/web-app-files/src/store/actions.js
+++ b/packages/web-app-files/src/store/actions.js
@@ -151,7 +151,7 @@ export default {
       value: computeShareTypes(state.currentFileOutgoingShares)
     })
   },
-  loadCurrentFileOutgoingShares(context, { client, path, resource, spaceId }) {
+  loadCurrentFileOutgoingShares(context, { client, path, resource, storageId }) {
     context.commit('CURRENT_FILE_OUTGOING_SHARES_SET', [])
     context.commit('CURRENT_FILE_OUTGOING_SHARES_ERROR', null)
     context.commit('CURRENT_FILE_OUTGOING_SHARES_LOADING', true)
@@ -191,8 +191,8 @@ export default {
     }
 
     let spaceRef
-    if (spaceId) {
-      spaceRef = `${spaceId}${path}`
+    if (storageId) {
+      spaceRef = `${storageId}${path}`
     }
 
     // see https://owncloud.dev/owncloud-sdk/Shares.html
@@ -397,8 +397,8 @@ export default {
     }
 
     let spaceRef
-    if (spaceId) {
-      spaceRef = `${spaceId}${path}`
+    if (storageId) {
+      spaceRef = `${storageId}${path}`
     }
 
     const remoteShare = shareType === ShareTypes.remote.value
@@ -419,7 +419,7 @@ export default {
           )
         )
         context.dispatch('updateCurrentFileShareTypes')
-        context.dispatch('loadIndicators', { client, currentFolder: path, spaceId })
+        context.dispatch('loadIndicators', { client, currentFolder: path, storageId })
       })
       .catch((e) => {
         context.dispatch(
@@ -433,7 +433,7 @@ export default {
         )
       })
   },
-  deleteShare(context, { client, graphClient, share, resource, spaceId }) {
+  deleteShare(context, { client, graphClient, share, resource, storageId }) {
     const additionalParams = {}
     if (share.shareType === ShareTypes.space.value) {
       additionalParams.shareWith = share.collaborator.name
@@ -446,7 +446,7 @@ export default {
 
         if (share.shareType !== ShareTypes.space.value) {
           context.dispatch('updateCurrentFileShareTypes')
-          context.dispatch('loadIndicators', { client, currentFolder: resource.path, spaceId })
+          context.dispatch('loadIndicators', { client, currentFolder: resource.path, storageId })
         } else {
           context.commit('CURRENT_FILE_OUTGOING_SHARES_LOADING', true)
 
@@ -477,7 +477,7 @@ export default {
    * This will add new entries into the shares tree and will
    * not remove unrelated existing ones.
    */
-  loadSharesTree(context, { client, path, spaceId }) {
+  loadSharesTree(context, { client, path, storageId }) {
     context.commit('SHARESTREE_ERROR', null)
     // prune shares tree cache for all unrelated paths, keeping only
     // existing relevant parent entries
@@ -491,8 +491,8 @@ export default {
     }
 
     let spaceRef
-    if (spaceId) {
-      spaceRef = `${spaceId}${path}`
+    if (storageId) {
+      spaceRef = `${storageId}${path}`
     }
 
     // remove last entry which is the root folder
@@ -635,11 +635,11 @@ export default {
     commit('CLEAR_RESOURCES_TO_DELETE_LIST')
   },
 
-  async loadIndicators({ dispatch, commit }, { client, currentFolder, spaceId }) {
+  async loadIndicators({ dispatch, commit }, { client, currentFolder, storageId }) {
     // kind of bruteforce for now: remove the shares for the current folder and children, reload shares tree for the current folder.
     // TODO: when we refactor the shares tree we want to modify shares tree nodes incrementally during adding and removing shares, not loading everything new from the backend.
     commit('SHARESTREE_PRUNE_OUTSIDE_PATH', dirname(currentFolder))
-    await dispatch('loadSharesTree', { client, path: currentFolder, spaceId })
+    await dispatch('loadSharesTree', { client, path: currentFolder, storageId })
     commit('LOAD_INDICATORS')
   },
 
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.spec.js
index 55303e86d1b..b676c62de0f 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.spec.js
@@ -59,16 +59,16 @@ describe('InviteCollaboratorForm', () => {
       expect(spyTriggerUpload).toHaveBeenCalledTimes(0)
     })
     it.each([
-      { spaceId: undefined, highlightedFile: folderMock },
-      { spaceId: undefined, highlightedFile: spaceMock },
-      { spaceId: 1, highlightedFile: folderMock }
+      { storageId: undefined, highlightedFile: folderMock },
+      { storageId: undefined, highlightedFile: spaceMock },
+      { storageId: 1, highlightedFile: folderMock }
     ])('calls the "addShare" action', async (dataSet) => {
       const selectedCollaborators = [
         { shareWith: 'marie', value: { shareType: ShareTypes.user.value }, label: 'label' }
       ]
       const wrapper = getWrapper({
         selectedCollaborators,
-        spaceId: dataSet.spaceId,
+        storageId: dataSet.storageId,
         highlightedFile: dataSet.highlightedFile
       })
       const addShareSpy = jest.spyOn(wrapper.vm, 'addShare')
@@ -79,7 +79,7 @@ describe('InviteCollaboratorForm', () => {
   })
 })
 
-function getWrapper({ selectedCollaborators = [], spaceId, highlightedFile = folderMock } = {}) {
+function getWrapper({ selectedCollaborators = [], storageId, highlightedFile = folderMock } = {}) {
   return mount(InviteCollaboratorForm, {
     localVue,
     stubs: {
@@ -94,7 +94,7 @@ function getWrapper({ selectedCollaborators = [], spaceId, highlightedFile = fol
     },
     mocks: {
       $route: {
-        params: { spaceId }
+        params: { storageId }
       }
     },
     store: new Vuex.Store({

From cbee41173a9b4843af2cb1cbd10d700a28c43e6c Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Thu, 17 Mar 2022 11:01:44 +0100
Subject: [PATCH 8/9] Small adjustments after rebasing

---
 .../src/components/SideBar/Shares/FileShares.vue   |  6 +++---
 .../components/SideBar/Shares/FileShares.spec.js   | 14 ++++----------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
index 38127a8da9d..d980808ce04 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
@@ -115,11 +115,11 @@ export default {
       const promises = []
       const spaceShares = []
 
-      for (const role of Object.keys(ref.space.spaceRoles)) {
-        for (const userId of ref.space.spaceRoles[role]) {
+      for (const role of Object.keys(ref.currentSpace.spaceRoles)) {
+        for (const userId of ref.currentSpace.spaceRoles[role]) {
           promises.push(
             graphClient.users.getUser(userId).then((resolved) => {
-              spaceShares.push(buildSpaceShare({ ...resolved.data, role }, ref.space.id))
+              spaceShares.push(buildSpaceShare({ ...resolved.data, role }, ref.currentSpace.id))
             })
           )
         }
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js
index 6404f6ac138..8fbde376718 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js
@@ -8,10 +8,6 @@ import Collaborators from '@/__fixtures__/collaborators'
 import mockAxios from 'jest-mock-axios'
 import { spaceRoleManager } from '../../../../../src/helpers/share'
 import VueCompositionAPI from '@vue/composition-api/dist/vue-composition-api'
-import mockAxios from 'jest-mock-axios'
-import { buildSpace } from '../../../../../src/helpers/resources'
-import { spaceRoleManager } from '../../../../../src/helpers/share'
-import VueCompositionAPI from '@vue/composition-api/dist/vue-composition-api'
 
 const localVue = createLocalVue()
 localVue.use(DesignSystem)
@@ -267,18 +263,16 @@ function getMountedWrapper(data, loading = false) {
     localVue,
     store: createStore(data),
     mocks: {
-      sharesLoading: loading
+      sharesLoading: loading,
+      $route: {
+        params: {}
+      }
     },
     stubs: {
       'oc-button': false,
       'oc-icon': true,
       'oc-spinner': true,
       'avatar-image': true
-    },
-    mocks: {
-      $route: {
-        params: {}
-      }
     }
   })
 }

From 062e0f07fd287555eeb0bdb0f5ff0f458ded081a Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Fri, 18 Mar 2022 12:47:29 +0100
Subject: [PATCH 9/9] Bump SDK to v3.0.0-alpha.2

---
 packages/web-runtime/package.json |  2 +-
 yarn.lock                         | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/web-runtime/package.json b/packages/web-runtime/package.json
index 4d3c1b5d92b..613a99497f9 100644
--- a/packages/web-runtime/package.json
+++ b/packages/web-runtime/package.json
@@ -19,7 +19,7 @@
     "marked": "^4.0.12",
     "oidc-client": "1.11.5",
     "owncloud-design-system": "^13.0.0-rc.4",
-    "owncloud-sdk": "~3.0.0-alpha.1",
+    "owncloud-sdk": "~3.0.0-alpha.2",
     "p-queue": "^6.1.1",
     "popper-max-size-modifier": "^0.2.0",
     "portal-vue": "^2.1.7",
diff --git a/yarn.lock b/yarn.lock
index a8e3ac70251..671c40aa5a4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9570,9 +9570,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"owncloud-sdk@npm:~3.0.0-alpha.1":
-  version: 3.0.0-alpha.1
-  resolution: "owncloud-sdk@npm:3.0.0-alpha.1"
+"owncloud-sdk@npm:~3.0.0-alpha.2":
+  version: 3.0.0-alpha.2
+  resolution: "owncloud-sdk@npm:3.0.0-alpha.2"
   peerDependencies:
     axios: ^0.26.0
     cross-fetch: ^3.0.6
@@ -9582,7 +9582,7 @@ __metadata:
     uuid: ^8.2.0
     webdav: 4.8.0
     xml-js: ^1.6.11
-  checksum: 0e91758c3e7ba1fa72faf10a1e6a2a094776255dade51bbed42d44a9326918314f433405ebf147ad679b97c90abcdfd44e3170d2dd781ced26fa4937cc9f7a60
+  checksum: 46674a77d7a7c174be5876abee6f75365461f52da1ab8f2dc187602d28474a010aea06d810285a1f1b3becd7b38bd7e250019d56b607d3e3d7ac0fd6207818b3
   languageName: node
   linkType: hard
 
@@ -13540,7 +13540,7 @@ __metadata:
     marked: ^4.0.12
     oidc-client: 1.11.5
     owncloud-design-system: ^13.0.0-rc.4
-    owncloud-sdk: ~3.0.0-alpha.1
+    owncloud-sdk: ~3.0.0-alpha.2
     p-queue: ^6.1.1
     popper-max-size-modifier: ^0.2.0
     portal-vue: ^2.1.7