Small fixes and polishing

owncloud · Apr 27, 2022 · f887105 · f887105
1 parent ae25b61
commit f887105
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 15 deletions.
diff --git a/packages/web-app-files/src/App.vue b/packages/web-app-files/src/App.vue
@@ -20,7 +20,7 @@
 </template>
 <script lang="ts">
 import Mixins from './mixins'
-import { mapActions, mapGetters, mapState } from 'vuex'
+import { mapActions, mapState } from 'vuex'
 import SideBar from './components/SideBar/SideBar.vue'
 import { defineComponent } from '@vue/composition-api'
 
@@ -30,7 +30,6 @@ export default defineComponent({
   },
   mixins: [Mixins],
   computed: {
-    ...mapGetters('Files', ['dropzone']),
     ...mapState('Files/sidebar', {
       sidebarClosed: 'closed',
       sidebarActivePanel: 'activePanel'

diff --git a/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.js b/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.js
@@ -242,8 +242,7 @@ function createStore(state = { currentFolder: {} }, fileHandlers = []) {
           ...state
         },
         getters: {
-          currentFolder: () => state.currentFolder,
-          dropzone: () => {}
+          currentFolder: () => state.currentFolder
         }
       }
     }

diff --git a/packages/web-runtime/src/components/UploadInfo.vue b/packages/web-runtime/src/components/UploadInfo.vue
@@ -1,10 +1,6 @@
 <template>
-  <div
-    id="upload-info"
-    class="oc-p-m oc-rounded oc-box-shadow-medium"
-    :class="{ 'oc-hidden': !showInfo }"
-  >
-    <div class="upload-info-title oc-flex oc-flex-between oc-flex-middle oc-mb-m">
+  <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">
       <span class="oc-flex oc-flex-middle">
         <oc-icon
           v-if="!filesUploading && !uploadCancelled"
@@ -16,12 +12,17 @@
         <span v-text="uploadInfoTitle" />
       </span>
 
-      <oc-button id="close-upload-info-btn" appearance="raw" @click="closeInfo">
+      <oc-button
+        id="close-upload-info-btn"
+        v-oc-tooltip="$gettext('Close')"
+        appearance="raw"
+        @click="closeInfo"
+      >
         <oc-icon name="close" />
       </oc-button>
     </div>
-    <div class="upload-info-status-bar" />
-    <div class="upload-info-successful-uploads">
+    <div class="upload-info-status-bar oc-px-m" />
+    <div class="upload-info-successful-uploads oc-p-m">
       <ul id="files-collaborators-list" class="oc-list">
         <li
           v-for="(item, idx) in successfulUploads"
@@ -184,8 +185,12 @@ export default {
 #upload-info {
   position: absolute;
   right: 20px;
-  background: #fff;
+  background-color: var(--oc-color-background-secondary);
   bottom: 20px;
   width: 300px;
 }
+.upload-info-successful-uploads {
+  max-height: 50vh;
+  overflow-y: auto;
+}
 </style>
diff --git a/packages/web-runtime/src/composables/upload/useUpload.ts b/packages/web-runtime/src/composables/upload/useUpload.ts
@@ -80,7 +80,8 @@ export function useUpload(options: UploadOptions): UploadResult {
   watch(
     uppyOptions,
     () => {
-      if (unref(uppyOptions).isTusSupported) {
+      // @TODO use Tus once the backend supports it on password protected links
+      if (unref(uppyOptions).isTusSupported && !unref(publicLinkPassword)) {
         options.uppyService.useTus(unref(uppyOptions) as any)
         return
       }