From 557e16d55ccf7517eda8682674b40d3acfb26ff4 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Thu, 17 Feb 2022 14:12:42 +0100
Subject: [PATCH] Fix file and folder upload postprocessing

---
 .../src/components/AppBar/CreateAndUpload.vue        | 12 ++++++------
 tests/acceptance/pageObjects/personalPage.js         |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
index 0a4e91be6de..bd8f1deb7de 100644
--- a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
@@ -210,14 +210,14 @@ export default {
     ...mapActions(['openFile', 'showMessage', 'createModal', 'setModalInputErrorMessage']),
     ...mapMutations('Files', ['UPSERT_RESOURCE']),
 
-    uploadSuccess() {
-      this.$emit('success')
+    uploadSuccess(args, file) {
+      this.$emit('success', args, file)
     },
-    uploadError() {
-      this.$emit('error')
+    uploadError(error) {
+      this.$emit('error', error)
     },
-    uploadProgress() {
-      this.$emit('progress')
+    uploadProgress(progress) {
+      this.$emit('progress', progress)
     },
 
     showCreateResourceModal(
diff --git a/tests/acceptance/pageObjects/personalPage.js b/tests/acceptance/pageObjects/personalPage.js
index 72a0eca6f5d..7097cacf1e1 100644
--- a/tests/acceptance/pageObjects/personalPage.js
+++ b/tests/acceptance/pageObjects/personalPage.js
@@ -182,8 +182,8 @@ module.exports = {
      * @param {string} folderName
      */
     uploadFolder: function (folderName) {
-      return this.waitForElementVisible('@newFileMenuButton')
-        .click('@newFileMenuButton')
+      return this.waitForElementVisible('@uploadFilesButton')
+        .click('@uploadFilesButton')
         .waitForElementVisible('@fileUploadButton')
         .setValue('@folderUploadInput', folderName)
         .waitForElementVisible(
@@ -193,7 +193,7 @@ module.exports = {
           false
         )
         .waitForElementNotVisible('@fileUploadProgress')
-        .click('@newFileMenuButton')
+        .click('@uploadFilesButton')
     },
     /**
      * Returns whether files or folders can be created in the current page.