Rename resourceId query option to shareId

owncloud · Apr 28, 2022 · 84f2b11 · 84f2b11
1 parent c656c60
commit 84f2b11
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 18 deletions.
diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
@@ -405,10 +405,7 @@ export default {
           await this.$client.files.createFolder(path)
           resource = await this.$client.files.fileInfo(path, DavProperties.Default)
         } else if (this.isSpacesShareLocation) {
-          path = buildWebDavSpacesPath(
-            [SHARE_JAIL_ID, this.$route.query.resourceId].join('!'),
-            path
-          )
+          path = buildWebDavSpacesPath([SHARE_JAIL_ID, this.$route.query.shareId].join('!'), path)
           await this.$client.files.createFolder(path)
           resource = await this.$client.files.fileInfo(path, DavProperties.Default)
         } else {
@@ -501,10 +498,7 @@ export default {
           await this.$client.files.putFileContents(path, '')
           resource = await this.$client.files.fileInfo(path, DavProperties.Default)
         } else if (this.isSpacesShareLocation) {
-          path = buildWebDavSpacesPath(
-            [SHARE_JAIL_ID, this.$route.query.resourceId].join('!'),
-            path
-          )
+          path = buildWebDavSpacesPath([SHARE_JAIL_ID, this.$route.query.shareId].join('!'), path)
           await this.$client.files.putFileContents(path, '')
           resource = await this.$client.files.fileInfo(path, DavProperties.Default)
         } else {
@@ -580,10 +574,7 @@ export default {
           path = buildWebDavSpacesPath(this.$route.params.storageId, path)
           resource = await this.$client.files.fileInfo(path, DavProperties.Default)
         } else if (this.isSpacesShareLocation) {
-          path = buildWebDavSpacesPath(
-            [SHARE_JAIL_ID, this.$route.query.resourceId].join('!'),
-            path
-          )
+          path = buildWebDavSpacesPath([SHARE_JAIL_ID, this.$route.query.shareId].join('!'), path)
           resource = await this.$client.files.fileInfo(path, DavProperties.Default)
         } else {
           resource = await this.$client.publicFiles.getFileInfo(

diff --git a/packages/web-app-files/src/router/spaces.ts b/packages/web-app-files/src/router/spaces.ts
@@ -71,7 +71,7 @@ export const buildRoutes = (components: RouteComponents): RouteConfig[] => [
         meta: {
           patchCleanPath: true,
           title: $gettext('Files shared with me'),
-          contextQueryItems: ['resourceId']
+          contextQueryItems: ['shareId']
         }
       }
     ]

diff --git a/packages/web-app-files/src/views/shares/SharedResource.vue b/packages/web-app-files/src/views/shares/SharedResource.vue
@@ -132,7 +132,7 @@ export default defineComponent({
     MixinFilesListFilter
   ],
   setup() {
-    const shareId = useRouteQuery('resourceId')
+    const shareId = useRouteQuery('shareId')
     const shareName = useRouteParam('shareName')
     const relativePath = useRouteParam('item', '')
     return {
@@ -142,7 +142,7 @@ export default defineComponent({
           shareName: unref(shareName)
         },
         query: {
-          resourceId: unref(shareId)
+          shareId: unref(shareId)
         }
       }),
       shareId,

diff --git a/packages/web-app-files/src/views/shares/SharedWithMe.vue b/packages/web-app-files/src/views/shares/SharedWithMe.vue
@@ -223,9 +223,7 @@ export default defineComponent({
     const resourceTargetParamMapping = computed(() =>
       unref(hasSpaces) ? { name: 'shareName', path: 'item' } : null
     )
-    const resourceTargetQueryMapping = computed(() =>
-      unref(hasSpaces) ? { id: 'resourceId' } : null
-    )
+    const resourceTargetQueryMapping = computed(() => (unref(hasSpaces) ? { id: 'shareId' } : null))
 
     const viewMode = computed(() =>
       parseInt(String(unref(useRouteQuery('view-mode', ShareStatus.accepted.toString()))))