Fix storageId in location picker

owncloud · Jun 3, 2022 · 71b4923 · 71b4923
1 parent f09fc09
commit 71b4923
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 25 deletions.
diff --git a/packages/web-app-files/src/mixins/actions/copy.js b/packages/web-app-files/src/mixins/actions/copy.js
@@ -61,6 +61,11 @@ export default {
         query.storageId = this.$route.params.storageId
       }
 
+      if (isLocationSpacesActive(this.$router, 'files-spaces-personal')) {
+        context = 'personal'
+        query.storageId = this.$route.params.storageId
+      }
+
       const item = this.currentFolder.path || this.homeFolder
 
       return this.$router.push(

diff --git a/packages/web-app-files/src/mixins/actions/move.js b/packages/web-app-files/src/mixins/actions/move.js
@@ -63,6 +63,11 @@ export default {
         query.storageId = this.$route.params.storageId
       }
 
+      if (isLocationSpacesActive(this.$router, 'files-spaces-personal')) {
+        context = 'personal'
+        query.storageId = this.$route.params.storageId
+      }
+
       const item = this.currentFolder.path || this.homeFolder
 
       return this.$router.push(

diff --git a/packages/web-app-files/src/views/LocationPicker.vue b/packages/web-app-files/src/views/LocationPicker.vue
@@ -355,7 +355,8 @@ export default {
             item: itemPath
           },
           query: {
-            resource: this.resources
+            resource: this.resources,
+            ...(this.$route.query.storageId && { storageId: this.$route.query.storageId })
           }
         }
       }
@@ -364,21 +365,23 @@ export default {
     leaveLocationPicker(target) {
       switch (this.$route.params.context) {
         case 'public':
-          this.$router.push(
+          return this.$router.push(
             createLocationPublic('files-public-files', { params: { item: target } })
           )
-          break
         case 'space':
-          this.$router.push(
+          return this.$router.push(
             createLocationSpaces('files-spaces-project', {
               params: { storageId: this.$route.query.storageId, item: target || '/' }
             })
           )
-          break
-        default:
-          this.$router.push(
-            createLocationSpaces('files-spaces-personal', { params: { item: target || '/' } })
+        case 'personal':
+          return this.$router.push(
+            createLocationSpaces('files-spaces-personal', {
+              params: { storageId: this.$route.query.storageId, item: target || '/' }
+            })
           )
+        default:
+          return this.$router.push(createLocationSpaces('files-spaces-personal'))
       }
     },
 
@@ -429,13 +432,26 @@ export default {
                   targetPath
                 )
                 break
+              case 'personal':
               default:
-                targetPath = buildWebDavFilesPath(this.user.id, this.target || '/')
-                targetPath += `/${resourceName}`
-                promise = this.$client.files.move(
-                  buildWebDavFilesPath(this.user.id, resource),
-                  targetPath
-                )
+                if (this.hasShareJail) {
+                  targetPath = buildWebDavSpacesPath(
+                    this.$route.query.storageId,
+                    this.target || '/'
+                  )
+                  targetPath += `/${resourceName}`
+                  promise = this.$client.files.move(
+                    buildWebDavSpacesPath(this.$route.query.storageId, resource),
+                    targetPath
+                  )
+                } else {
+                  targetPath = buildWebDavFilesPath(this.user.id, this.target || '/')
+                  targetPath += `/${resourceName}`
+                  promise = this.$client.files.move(
+                    buildWebDavFilesPath(this.user.id, resource),
+                    targetPath
+                  )
+                }
             }
             break
           }
@@ -460,13 +476,27 @@ export default {
                   targetPath
                 )
                 break
+              case 'personal':
               default:
-                targetPath = buildWebDavFilesPath(this.user.id, this.target || '/')
-                targetPath += `/${resourceName}`
-                promise = this.$client.files.copy(
-                  buildWebDavFilesPath(this.user.id, resource),
-                  targetPath
-                )
+                if (this.hasShareJail) {
+                  targetPath = buildWebDavSpacesPath(
+                    this.$route.query.storageId,
+                    this.target || '/'
+                  )
+                  resourceName = basename(resource)
+                  targetPath += `/${resourceName}`
+                  promise = this.$client.files.copy(
+                    buildWebDavSpacesPath(this.$route.query.storageId, resource),
+                    targetPath
+                  )
+                } else {
+                  targetPath = buildWebDavFilesPath(this.user.id, this.target || '/')
+                  targetPath += `/${resourceName}`
+                  promise = this.$client.files.copy(
+                    buildWebDavFilesPath(this.user.id, resource),
+                    targetPath
+                  )
+                }
             }
             break
           }

diff --git a/packages/web-app-files/tests/unit/views/LocationPicker.spec.js b/packages/web-app-files/tests/unit/views/LocationPicker.spec.js
@@ -185,11 +185,7 @@ describe('LocationPicker', () => {
         expect(spyLeaveLocationPicker).toHaveBeenCalledWith('/some/item')
         expect(spyRouterPush).toHaveBeenCalledTimes(1)
         expect(spyRouterPush).toHaveBeenCalledWith({
-          name: 'files-spaces-personal',
-          params: {
-            item: '/some/item',
-            storageId: 'home'
-          }
+          name: 'files-spaces-personal'
         })
       })
     })

diff --git a/packages/web-app-files/tests/unit/views/Personal.spec.js b/packages/web-app-files/tests/unit/views/Personal.spec.js
@@ -17,6 +17,7 @@ const router = {
   afterEach: jest.fn(),
   currentRoute: {
     ...createLocationSpaces('files-spaces-personal'),
+    params: { storageId: '1234' },
     query: {}
   },
   resolve: (r) => {

diff --git a/packages/web-app-files/tests/unit/views/views.setup.js b/packages/web-app-files/tests/unit/views/views.setup.js
@@ -124,6 +124,7 @@ export const getStore = function ({
     },
     getters: {
       configuration: () => ({
+        server: 'https://owncloud.test',
         currentTheme: {
           loginPage: {
             backgroundImg: loginBackgroundImg