Small adjustments after rebasing

owncloud · Mar 17, 2022 · 7c6efec · 7c6efec
1 parent 1f16bfb
commit 7c6efec
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 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
@@ -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
@@ -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: {}
-      }
     }
   })
 }