From af1bc4b4c3034833769deffbab12a91a48fd6b0b Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Wed, 27 Apr 2022 14:39:33 +0200
Subject: [PATCH] Fix tests, polishing

---
 .../src/components/AppBar/CreateAndUpload.vue |  3 +-
 .../web-runtime/src/components/UploadInfo.vue | 35 ++++++++++++++++---
 .../src/composables/upload/useUpload.ts       |  4 +--
 .../web-runtime/src/services/uppyService.ts   |  9 +++--
 .../Folder,With,Comma/sunday,monday.txt       |  1 +
 5 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
index 7cf25f07138..794ad4992d4 100644
--- a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
@@ -302,8 +302,7 @@ export default defineComponent({
       }
     },
 
-    onFileError(error) {
-      console.error(error)
+    onFileError(file) {
       this.showMessage({
         title: this.$gettext('Failed to upload'),
         status: 'danger'
diff --git a/packages/web-runtime/src/components/UploadInfo.vue b/packages/web-runtime/src/components/UploadInfo.vue
index 1f743264f9a..8c2894fcb09 100644
--- a/packages/web-runtime/src/components/UploadInfo.vue
+++ b/packages/web-runtime/src/components/UploadInfo.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="upload-info" class="oc-rounded oc-box-shadow-medium" :class="{ 'oc-hidden': !showInfo }">
-    <div class="upload-info-title oc-flex oc-flex-between oc-flex-middle oc-px-m oc-pt-m">
+    <div class="upload-info-title oc-flex oc-flex-between oc-flex-middle oc-p-m">
       <span class="oc-flex oc-flex-middle">
         <oc-icon
           v-if="!filesUploading && !uploadCancelled"
@@ -21,8 +21,11 @@
         <oc-icon name="close" />
       </oc-button>
     </div>
-    <div class="upload-info-status-bar oc-px-m" />
-    <div class="upload-info-successful-uploads oc-p-m">
+    <div
+      class="upload-info-status-bar oc-px-m"
+      :class="{ 'oc-mb-m': successfulUploads.length && filesUploading.length }"
+    />
+    <div class="upload-info-successful-uploads oc-px-m oc-pb-m">
       <ul id="files-collaborators-list" class="oc-list">
         <li
           v-for="(item, idx) in successfulUploads"
@@ -181,7 +184,7 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 #upload-info {
   position: absolute;
   right: 20px;
@@ -193,4 +196,28 @@ export default {
   max-height: 50vh;
   overflow-y: auto;
 }
+.upload-info-status-bar .uppy-StatusBar,
+.upload-info-status-bar .uppy-StatusBar-actionBtn--retry:hover {
+  background-color: unset !important;
+}
+.upload-info-status-bar .uppy-StatusBar-content {
+  padding-left: 0.25rem !important;
+  color: var(--oc-color-text-default);
+}
+.upload-info-status-bar .uppy-StatusBar-actions {
+  right: 0.25rem !important;
+}
+.upload-info-status-bar .uppy-c-btn {
+  color: var(--oc-color-text-default);
+}
+.upload-info-status-bar .uppy-StatusBar-statusSecondary {
+  color: var(--oc-color-swatch-passive-default);
+}
+.upload-info-status-bar .uppy-StatusBar-details,
+.upload-info-status-bar .uppy-StatusBar-actionBtn--retry svg {
+  display: none;
+}
+.upload-info-status-bar .uppy-StatusBar-statusPrimary {
+  font-size: 0.9rem;
+}
 </style>
diff --git a/packages/web-runtime/src/composables/upload/useUpload.ts b/packages/web-runtime/src/composables/upload/useUpload.ts
index 63ed41ce7c1..b425717a652 100644
--- a/packages/web-runtime/src/composables/upload/useUpload.ts
+++ b/packages/web-runtime/src/composables/upload/useUpload.ts
@@ -39,6 +39,7 @@ export function useUpload(options: UploadOptions): UploadResult {
   const store = useStore()
   const publicLinkPassword = computed((): string => store.getters['Files/publicLinkPassword'])
   const isPublicLocation = useActiveLocation(isLocationPublicActive, 'files-public-files')
+  const isPublicDropLocation = useActiveLocation(isLocationPublicActive, 'files-public-drop')
   const clientService = useClientService()
   const getToken = computed((): string => store.getters.getToken)
 
@@ -47,9 +48,8 @@ export function useUpload(options: UploadOptions): UploadResult {
   const uploadChunkSize = computed((): number => store.getters.configuration.uploadChunkSize)
 
   const headers = computed((): { [key: string]: string } => {
-    if (unref(isPublicLocation)) {
+    if (unref(isPublicLocation) || unref(isPublicDropLocation)) {
       const password = unref(publicLinkPassword)
-
       if (password) {
         return { Authorization: 'Basic ' + Buffer.from('public:' + password).toString('base64') }
       }
diff --git a/packages/web-runtime/src/services/uppyService.ts b/packages/web-runtime/src/services/uppyService.ts
index 785075e7345..74e2f342571 100644
--- a/packages/web-runtime/src/services/uppyService.ts
+++ b/packages/web-runtime/src/services/uppyService.ts
@@ -39,7 +39,7 @@ export class UppyService extends Vue {
       chunkSize: chunkSize,
       removeFingerprintOnSuccess: true,
       overridePatchMethod: !!tusHttpMethodOverride,
-      retryDelays: [0, 3000, 5000, 10000, 20000]
+      retryDelays: [0]
     }
 
     const xhrPlugin = this.uppy.getPlugin('XHRUpload')
@@ -177,7 +177,9 @@ export class UppyService extends Vue {
         this.$emit('uploadSuccess', file)
         this.uppy.removeFile(file.id)
       })
-
+      result.failed.forEach((file) => {
+        this.$emit('uploadError', file)
+      })
       this.uploadInputs.forEach((item) => {
         item.value = null
       })
@@ -200,9 +202,6 @@ export class UppyService extends Vue {
         })
       }
     })
-    this.uppy.on('upload-error', () => {
-      this.$emit('uploadError')
-    })
   }
 
   registerUploadInput(el: HTMLInputElement) {
diff --git a/tests/e2e/filesForUpload/Folder,With,Comma/sunday,monday.txt b/tests/e2e/filesForUpload/Folder,With,Comma/sunday,monday.txt
index e69de29bb2d..7305cfdd379 100644
--- a/tests/e2e/filesForUpload/Folder,With,Comma/sunday,monday.txt
+++ b/tests/e2e/filesForUpload/Folder,With,Comma/sunday,monday.txt
@@ -0,0 +1 @@
+sunday,monday