fix(files): setup cannot be in mixins

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>

diff --git a/apps/files/src/components/FileEntry.vue b/apps/files/src/components/FileEntry.vue
index 274656f5d70e308d546ab6216fd97883ce4538be..0ccd5622a5eaf147b7ca06bc31c88f00a15e69ee 100644 (file)
--- a/apps/files/src/components/FileEntry.vue
+++ b/apps/files/src/components/FileEntry.vue
@@ -100,6 +100,12 @@ import { defineComponent } from 'vue'
 import { formatFileSize } from '@nextcloud/files'
 import moment from '@nextcloud/moment'
 
+import { useActionsMenuStore } from '../store/actionsmenu.ts'
+import { useDragAndDropStore } from '../store/dragging.ts'
+import { useFilesStore } from '../store/files.ts'
+import { useRenamingStore } from '../store/renaming.ts'
+import { useSelectionStore } from '../store/selection.ts'
+
 import FileEntryMixin from './FileEntryMixin.ts'
 import NcDateTime from '@nextcloud/vue/dist/Components/NcDateTime.js'
 import CustomElementRender from './CustomElementRender.vue'
@@ -139,6 +145,21 @@ export default defineComponent({
                },
        },
 
+       setup() {
+               const actionsMenuStore = useActionsMenuStore()
+               const draggingStore = useDragAndDropStore()
+               const filesStore = useFilesStore()
+               const renamingStore = useRenamingStore()
+               const selectionStore = useSelectionStore()
+               return {
+                       actionsMenuStore,
+                       draggingStore,
+                       filesStore,
+                       renamingStore,
+                       selectionStore,
+               }
+       },
+
        computed: {
                /**
                 * Conditionally add drag and drop listeners

diff --git a/apps/files/src/components/FileEntryGrid.vue b/apps/files/src/components/FileEntryGrid.vue
index 1d10f3d2948d6de3e8bb5fc8296bbe4d01d5024d..9d332491bea05700417230a3370edd1ba40c78fb 100644 (file)
--- a/apps/files/src/components/FileEntryGrid.vue
+++ b/apps/files/src/components/FileEntryGrid.vue
@@ -75,6 +75,11 @@
 <script lang="ts">
 import { defineComponent } from 'vue'
 
+import { useActionsMenuStore } from '../store/actionsmenu.ts'
+import { useDragAndDropStore } from '../store/dragging.ts'
+import { useFilesStore } from '../store/files.ts'
+import { useRenamingStore } from '../store/renaming.ts'
+import { useSelectionStore } from '../store/selection.ts'
 import FileEntryMixin from './FileEntryMixin.ts'
 import FileEntryActions from './FileEntry/FileEntryActions.vue'
 import FileEntryCheckbox from './FileEntry/FileEntryCheckbox.vue'
@@ -97,6 +102,21 @@ export default defineComponent({
 
        inheritAttrs: false,
 
+       setup() {
+               const actionsMenuStore = useActionsMenuStore()
+               const draggingStore = useDragAndDropStore()
+               const filesStore = useFilesStore()
+               const renamingStore = useRenamingStore()
+               const selectionStore = useSelectionStore()
+               return {
+                       actionsMenuStore,
+                       draggingStore,
+                       filesStore,
+                       renamingStore,
+                       selectionStore,
+               }
+       },
+
        data() {
                return {
                        gridMode: true,

diff --git a/apps/files/src/components/FileEntryMixin.ts b/apps/files/src/components/FileEntryMixin.ts
index 68320c807333a4f207df7210258857d60053de4a..69638d33212e82c560fce1c0be6b6a1ce91701a0 100644 (file)
--- a/apps/files/src/components/FileEntryMixin.ts
+++ b/apps/files/src/components/FileEntryMixin.ts
@@ -31,12 +31,6 @@ import { Upload, getUploader } from '@nextcloud/upload'
 import { vOnClickOutside } from '@vueuse/components'
 import Vue, { defineComponent } from 'vue'
 
-import { useActionsMenuStore } from '../store/actionsmenu.ts'
-import { useDragAndDropStore } from '../store/dragging.ts'
-import { useFilesStore } from '../store/files.ts'
-import { useRenamingStore } from '../store/renaming.ts'
-import { useSelectionStore } from '../store/selection.ts'
-
 import { action as sidebarAction } from '../actions/sidebarAction.ts'
 import { getDragAndDropPreview } from '../utils/dragUtils.ts'
 import { handleCopyMoveNodeTo } from '../actions/moveOrCopyAction.ts'
@@ -62,21 +56,6 @@ export default defineComponent({
                },
        },
 
-       setup() {
-               const actionsMenuStore = useActionsMenuStore()
-               const draggingStore = useDragAndDropStore()
-               const filesStore = useFilesStore()
-               const renamingStore = useRenamingStore()
-               const selectionStore = useSelectionStore()
-               return {
-                       actionsMenuStore,
-                       draggingStore,
-                       filesStore,
-                       renamingStore,
-                       selectionStore,
-               }
-       },
-
        data() {
                return {
                        loading: '',