Slight adjustments after rebasing

owncloud · May 3, 2022 · dc14616 · dc14616
1 parent 9aff49e
commit dc14616
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
@@ -281,7 +281,10 @@ export default defineComponent({
 
         resource = buildResource(resource)
 
-        this.$uppyService.$emit('uploadedFileFetched', file, resource)
+        this.$uppyService.publish('uploadedFileFetched', {
+          uppyResource: file,
+          fetchedFile: resource
+        })
 
         // Update table only if the file was uploaded to the current directory
         if (fileIsInCurrentPath) {

diff --git a/packages/web-app-files/src/views/FilesDrop.vue b/packages/web-app-files/src/views/FilesDrop.vue
@@ -165,7 +165,12 @@ export default {
     },
 
     onFileSuccess(uppyResource) {
-      this.$uppyService.$emit('uploadedFileFetched', uppyResource, { name: uppyResource.name })
+      this.$uppyService.publish('uploadedFileFetched', {
+        uppyResource,
+        fetchedFile: {
+          name: uppyResource.name
+        }
+      })
     },
 
     onFileError(error) {

diff --git a/packages/web-runtime/src/components/UploadInfo.vue b/packages/web-runtime/src/components/UploadInfo.vue
@@ -120,7 +120,7 @@ export default {
         this.closeInfo()
       }
     })
-    this.$uppyService.subscribe('uploadedFileFetched', (uppyResource, fetchedFile) => {
+    this.$uppyService.subscribe('uploadedFileFetched', ({ uppyResource, fetchedFile }) => {
       this.successfulUploads.push({
         ...fetchedFile,
         targetRoute: uppyResource.meta.route
@@ -161,7 +161,7 @@ export default {
         query: targetRoute.query,
         params: {
           ...(storageId && path && { storageId }),
-          storage: targetRoute.params?.storage
+          ...(targetRoute.params?.storage && { storage: targetRoute.params?.storage })
         }
       }