[full-ci] Bugfix: Issues related to transfer/upload and keyboard acti…

…ons (#7735) * Fix several issues related to copy/upload and keyboard actions * Add conflict dialog custom content * Use div instead of p, changelog
owncloud · Oct 5, 2022 · 22eeffc · 22eeffc
1 parent f0b3f95
commit 22eeffc
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 11 deletions.
diff --git a/changelog/unreleased/bugfix-move-files-between-spaces b/changelog/unreleased/bugfix-move-files-between-spaces
@@ -3,4 +3,5 @@ Bugfix: Inhibit move files between spaces
 We've inhibited moving files between spaces and will offer the user to copy instead.
 
 https://github.com/owncloud/web/pull/7652
-https://github.com/owncloud/web/issues/6892
+https://github.com/owncloud/web/issues/6892
+https://github.com/owncloud/web/pull/7735
diff --git a/changelog/unreleased/enhancement-make-keybindings-global b/changelog/unreleased/enhancement-make-keybindings-global
@@ -3,4 +3,5 @@ Enhancement: Make keybindings global
 We've made keybindings global and introduced a data-attribute to mark elements that need custom keybindings
 
 https://github.com/owncloud/web/pull/7569
-https://github.com/owncloud/web/pull/7648
+https://github.com/owncloud/web/pull/7648
+https://github.com/owncloud/web/pull/7735
diff --git a/packages/web-app-files/src/components/FilesList/KeyboardActions.vue b/packages/web-app-files/src/components/FilesList/KeyboardActions.vue
@@ -84,7 +84,11 @@ export default defineComponent({
 
     areCustomKeyBindingsEnabled() {
       const activeElementTag = document.activeElement.tagName
-      if (['textarea', 'input', 'select'].includes(activeElementTag.toLowerCase())) {
+      const type = document.activeElement.getAttribute('type')
+      if (
+        ['textarea', 'input', 'select'].includes(activeElementTag.toLowerCase()) &&
+        type !== 'checkbox'
+      ) {
         return true
       }
       const closestSelectionEl = window.getSelection().focusNode as HTMLElement

diff --git a/packages/web-app-files/src/helpers/resource/actions/transfer.ts b/packages/web-app-files/src/helpers/resource/actions/transfer.ts
@@ -49,6 +49,9 @@ export class ResourceTransfer extends ConflictDialog {
   showResultMessage(errors, movedResources: Array<Resource>, transferType: TransferType) {
     if (errors.length === 0) {
       const count = movedResources.length
+      if (count === 0) {
+        return
+      }
       const ntitle =
         transferType === TransferType.COPY
           ? this.$ngettext(

diff --git a/packages/web-app-files/src/helpers/resource/actions/upload.ts b/packages/web-app-files/src/helpers/resource/actions/upload.ts
@@ -111,11 +111,11 @@ export class ResourcesUpload extends ConflictDialog {
         })
         continue
       }
-
+      const conflictsLeft = allConflictsCount - count
       const resolvedConflict: ResolveConflict = await this.resolveFileExists(
         { name: conflict.name, isFolder } as Resource,
-        allConflictsCount - count,
-        false,
+        conflictsLeft,
+        conflictsLeft === 1,
         isFolder
       )
       count++

diff --git a/packages/web-app-files/src/helpers/resource/conflictHandling/conflictDialog.ts b/packages/web-app-files/src/helpers/resource/conflictHandling/conflictDialog.ts
@@ -130,9 +130,8 @@ export class ConflictDialog {
         variation: 'danger',
         icon: 'alarm-warning',
         title: this.$gettext('Copy here?'),
-        message: this.$gettext(
-          'Moving files from one space to another is not possible. Do you want to copy instead? Note: Links and shares of the original file are not copied.'
-        ),
+        customContent:
+          '<p>Moving files from one space to another is not possible. Do you want to copy instead?</p><p>Note: Links and shares of the original file are not copied.</p>',
         cancelText: this.$gettext('Cancel'),
         confirmText: this.$gettext('Copy here'),
         onCancel: () => {

diff --git a/packages/web-runtime/src/App.vue b/packages/web-runtime/src/App.vue
@@ -34,7 +34,11 @@
       @confirm-secondary="modal.onConfirmSecondary"
       @mounted="focusModal"
       @beforeDestroy="focusModal"
-    />
+    >
+      <template v-if="modal.customContent" #content>
+        <div v-html="modal.customContent"></div>
+      </template>
+    </oc-modal>
   </div>
 </template>
 <script lang="ts">

diff --git a/packages/web-runtime/src/store/modal.js b/packages/web-runtime/src/store/modal.js
@@ -27,7 +27,8 @@ const state = {
   onCheckboxValueChanged: emptyReturn,
   onConfirmSecondary: emptyReturn,
   contextualHelperLabel: '',
-  contextualHelperData: {}
+  contextualHelperData: {},
+  customContent: ''
 }
 
 const actions = {
@@ -75,6 +76,7 @@ const mutations = {
     state.onConfirmSecondary = modal.onConfirmSecondary || emptyReturn
     state.contextualHelperLabel = modal.contextualHelperLabel
     state.contextualHelperData = modal.contextualHelperData
+    state.customContent = modal.customContent || ''
   },
 
   HIDE_MODAL(state) {