Add conflict dialog custom content

owncloud · Oct 5, 2022 · 4ccc4bb · 4ccc4bb
1 parent d0d70d0
commit 4ccc4bb
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/packages/web-app-files/src/components/FilesList/KeyboardActions.vue b/packages/web-app-files/src/components/FilesList/KeyboardActions.vue
@@ -85,7 +85,10 @@ export default defineComponent({
     areCustomKeyBindingsEnabled() {
       const activeElementTag = document.activeElement.tagName
       const type = document.activeElement.getAttribute('type')
-      if (['textarea', 'input', 'select'].includes(activeElementTag.toLowerCase()) && type !== 'checkbox') {
+      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,7 +49,7 @@ export class ResourceTransfer extends ConflictDialog {
   showResultMessage(errors, movedResources: Array<Resource>, transferType: TransferType) {
     if (errors.length === 0) {
       const count = movedResources.length
-      if(count === 0) {
+      if (count === 0) {
         return
       }
       const ntitle =

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>
+        <p v-html="modal.customContent"></p>
+      </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) {