From e3c8ee39b71a534e7638a48d03f95038b090feab Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Tue, 16 Jan 2024 10:43:13 +0100
Subject: [PATCH 1/3] refactor: remove clipboard from vuex files store

---
 .../src/components/AppBar/CreateAndUpload.vue | 17 ++++---
 .../useKeyboardTableActions.ts                | 12 ++---
 .../useKeyboardTableSpaceActions.ts           | 20 ++-------
 packages/web-app-files/src/store/actions.ts   | 40 +++++------------
 packages/web-app-files/src/store/getters.ts   |  6 ---
 packages/web-app-files/src/store/mutations.ts | 11 -----
 packages/web-app-files/src/store/state.ts     |  2 -
 .../components/AppBar/CreateAndUpload.spec.ts | 12 ++---
 .../components/FilesList/ResourceTable.vue    | 15 ++++---
 .../actions/files/useFileActionsCopy.ts       |  9 ++--
 .../actions/files/useFileActionsMove.ts       |  9 ++--
 .../actions/files/useFileActionsPaste.ts      | 12 +++--
 .../src/composables/piniaStores/clipboard.ts  | 44 +++++++++++++++++++
 .../src/composables/piniaStores/index.ts      |  1 +
 .../actions/files/useFileActionsCopy.spec.ts  | 11 +++--
 packages/web-test-helpers/src/mocks/pinia.ts  |  7 ++-
 .../src/mocks/store/filesModuleMockOptions.ts |  7 +--
 17 files changed, 117 insertions(+), 118 deletions(-)
 create mode 100644 packages/web-pkg/src/composables/piniaStores/clipboard.ts

diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
index 2cb88d5be1c..1649d8bbf86 100644
--- a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
@@ -177,7 +177,7 @@
       <oc-button
         :disabled="uploadOrFileCreationBlocked"
         class="clear-clipboard-btn"
-        @click="clearClipboardFiles"
+        @click="clearClipboard"
       >
         <oc-icon fill-type="line" name="close" />
       </oc-button>
@@ -186,12 +186,12 @@
 </template>
 
 <script lang="ts">
-import { mapActions, mapGetters } from 'vuex'
 import {
   isLocationPublicActive,
   isLocationSpacesActive,
   useAppsStore,
   useCapabilityStore,
+  useClipboardStore,
   useFileActions,
   useFileActionsCreateNewShortcut,
   useMessages,
@@ -274,6 +274,11 @@ export default defineComponent({
     const capabilityRefs = storeToRefs(capabilityStore)
     const route = useRoute()
     const language = useGettext()
+
+    const clipboardStore = useClipboardStore()
+    const { clearClipboard } = clipboardStore
+    const { resources: clipboardResources } = storeToRefs(clipboardStore)
+
     const areFileExtensionsShown = computed(() => unref(store.state.Files.areFileExtensionsShown))
 
     useUpload({ uppyService })
@@ -359,7 +364,7 @@ export default defineComponent({
 
     const handlePasteFileEvent = (event) => {
       // Ignore file in clipboard if there are already files from owncloud in the clipboard
-      if (store.state.Files.clipboardResources.length || !unref(canUpload)) {
+      if (unref(clipboardResources).length || !unref(canUpload)) {
         return
       }
       // Browsers only allow single files to be pasted for security reasons
@@ -456,14 +461,14 @@ export default defineComponent({
       actionKeySuffix,
       showDrop,
       areFileExtensionsShown,
+      clearClipboard,
+      clipboardResources,
 
       // HACK: exported for unit tests:
       onUploadComplete
     }
   },
   computed: {
-    ...mapGetters('Files', ['clipboardResources']),
-
     showPasteHereButton() {
       return this.clipboardResources && this.clipboardResources.length !== 0
     },
@@ -521,8 +526,6 @@ export default defineComponent({
     }
   },
   methods: {
-    ...mapActions('Files', ['clearClipboardFiles']),
-
     getIconResource(fileHandler) {
       return { type: 'file', extension: fileHandler.ext } as Resource
     }
diff --git a/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableActions.ts b/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableActions.ts
index 37f51d698ea..916314bc9b3 100644
--- a/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableActions.ts
+++ b/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableActions.ts
@@ -1,17 +1,11 @@
-import { Key, KeyboardActions, ModifierKey, useMessages } from '@ownclouders/web-pkg'
+import { Key, KeyboardActions, ModifierKey, useClipboardStore } from '@ownclouders/web-pkg'
 import { useStore } from '@ownclouders/web-pkg'
-import { useGettext } from 'vue3-gettext'
 
 export const useKeyboardTableActions = (keyActions: KeyboardActions) => {
   const store = useStore()
-  const messageStore = useMessages()
-  const language = useGettext()
+  const { copyResources } = useClipboardStore()
 
   keyActions.bindKeyAction({ modifier: ModifierKey.Ctrl, primary: Key.C }, () => {
-    store.dispatch('Files/copySelectedFiles', {
-      ...language,
-      resources: store.getters['Files/selectedFiles'],
-      messageStore
-    })
+    copyResources(store.getters['Files/selectedFiles'])
   })
 }
diff --git a/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableSpaceActions.ts b/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableSpaceActions.ts
index 2ffbf615e2e..81d0fa83fd9 100644
--- a/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableSpaceActions.ts
+++ b/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableSpaceActions.ts
@@ -1,25 +1,18 @@
-import { Key, KeyboardActions, ModifierKey, useMessages } from '@ownclouders/web-pkg'
+import { Key, KeyboardActions, ModifierKey, useClipboardStore } from '@ownclouders/web-pkg'
 import { SpaceResource } from '@ownclouders/web-client'
 import { useStore } from '@ownclouders/web-pkg'
-import { useGettext } from 'vue3-gettext'
 import { unref } from 'vue'
 import { useFileActionsPaste } from '@ownclouders/web-pkg'
 
 export const useKeyboardTableSpaceActions = (keyActions: KeyboardActions, space: SpaceResource) => {
   const store = useStore()
-  const messageStore = useMessages()
-  const language = useGettext()
+  const { copyResources, cutResources } = useClipboardStore()
 
   const { actions: pasteFileActions } = useFileActionsPaste({ store })
   const pasteFileAction = unref(pasteFileActions)[0].handler
 
   keyActions.bindKeyAction({ modifier: ModifierKey.Ctrl, primary: Key.C }, () => {
-    store.dispatch('Files/copySelectedFiles', {
-      ...language,
-      space: space,
-      resources: store.getters['Files/selectedFiles'],
-      messageStore
-    })
+    copyResources(store.getters['Files/selectedFiles'])
   })
 
   keyActions.bindKeyAction({ modifier: ModifierKey.Ctrl, primary: Key.V }, () => {
@@ -27,11 +20,6 @@ export const useKeyboardTableSpaceActions = (keyActions: KeyboardActions, space:
   })
 
   keyActions.bindKeyAction({ modifier: ModifierKey.Ctrl, primary: Key.X }, () => {
-    store.dispatch('Files/cutSelectedFiles', {
-      ...language,
-      space: space,
-      resources: store.getters['Files/selectedFiles'],
-      messageStore
-    })
+    cutResources(store.getters['Files/selectedFiles'])
   })
 }
diff --git a/packages/web-app-files/src/store/actions.ts b/packages/web-app-files/src/store/actions.ts
index bbdfea1b334..67d5cea69f8 100644
--- a/packages/web-app-files/src/store/actions.ts
+++ b/packages/web-app-files/src/store/actions.ts
@@ -45,34 +45,18 @@ export default {
       context.commit('ADD_FILE_SELECTION', file)
     }
   },
-  copySelectedFiles(
-    context,
-    options: { resources: Resource[]; messageStore: MessageStore } & Language
-  ) {
-    const { $gettext } = options
-    context.commit('CLIPBOARD_SELECTED', options)
-    context.commit('SET_CLIPBOARD_ACTION', ClipboardActions.Copy)
-    options.messageStore.showMessage({ title: $gettext('Copied to clipboard!'), status: 'success' })
-  },
-  cutSelectedFiles(
-    context,
-    options: {
-      space: SpaceResource
-      resources: Resource[]
-      messageStore: MessageStore
-    } & Language
-  ) {
-    const { $gettext } = options
-    context.commit('CLIPBOARD_SELECTED', options)
-    context.commit('SET_CLIPBOARD_ACTION', ClipboardActions.Cut)
-    options.messageStore.showMessage({ title: $gettext('Cut to clipboard!'), status: 'success' })
-  },
-  clearClipboardFiles(context) {
-    context.commit('CLEAR_CLIPBOARD')
-  },
   pasteSelectedFiles(
     context,
-    { targetSpace, clientService, loadingService, $gettext, $ngettext, sourceSpace, resources }
+    {
+      targetSpace,
+      clientService,
+      loadingService,
+      $gettext,
+      $ngettext,
+      sourceSpace,
+      resources,
+      clipboardStore
+    }
   ) {
     const copyMove = new ResourceTransfer(
       sourceSpace,
@@ -85,10 +69,10 @@ export default {
       $ngettext
     )
     let movedResourcesPromise
-    if (context.state.clipboardAction === ClipboardActions.Cut) {
+    if (clipboardStore.action === ClipboardActions.Cut) {
       movedResourcesPromise = copyMove.perform(TransferType.MOVE)
     }
-    if (context.state.clipboardAction === ClipboardActions.Copy) {
+    if (clipboardStore.action === ClipboardActions.Copy) {
       movedResourcesPromise = copyMove.perform(TransferType.COPY)
     }
     return movedResourcesPromise.then((movedResources) => {
diff --git a/packages/web-app-files/src/store/getters.ts b/packages/web-app-files/src/store/getters.ts
index a06fc2de83d..f7c83494dd8 100644
--- a/packages/web-app-files/src/store/getters.ts
+++ b/packages/web-app-files/src/store/getters.ts
@@ -11,12 +11,6 @@ export default {
   currentFolder: (state) => {
     return state.currentFolder
   },
-  clipboardResources: (state) => {
-    return state.clipboardResources
-  },
-  clipboardAction: (state) => {
-    return state.clipboardAction
-  },
   activeFiles: (state, getters) => {
     let files = [].concat(getters.files)
 
diff --git a/packages/web-app-files/src/store/mutations.ts b/packages/web-app-files/src/store/mutations.ts
index bf56bafc20d..6725077b221 100644
--- a/packages/web-app-files/src/store/mutations.ts
+++ b/packages/web-app-files/src/store/mutations.ts
@@ -1,6 +1,5 @@
 import { set, has } from 'lodash-es'
 import { getIndicators } from '@ownclouders/web-pkg'
-import { Resource } from '@ownclouders/web-client/src/helpers'
 
 export default {
   LOAD_FILES(state, { currentFolder, files }) {
@@ -13,16 +12,6 @@ export default {
   CLEAR_FILES(state) {
     state.files = []
   },
-  CLEAR_CLIPBOARD(state) {
-    state.clipboardResources = []
-    state.clipboardAction = null
-  },
-  CLIPBOARD_SELECTED(state, { resources }: { resources: Resource[] }) {
-    state.clipboardResources = resources
-  },
-  SET_CLIPBOARD_ACTION(state, action) {
-    state.clipboardAction = action
-  },
   SET_LATEST_SELECTED_FILE_ID(state, fileId) {
     state.latestSelectedId = fileId
   },
diff --git a/packages/web-app-files/src/store/state.ts b/packages/web-app-files/src/store/state.ts
index 8d5aff7908d..e5e71d66c57 100644
--- a/packages/web-app-files/src/store/state.ts
+++ b/packages/web-app-files/src/store/state.ts
@@ -3,8 +3,6 @@ export default {
   files: [],
   selectedIds: [],
   latestSelectedId: null,
-  clipboardResources: [],
-  clipboardAction: null,
   versions: [],
 
   /**
diff --git a/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.ts b/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.ts
index 914513a5ca2..17c30e9f295 100644
--- a/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.ts
+++ b/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.ts
@@ -7,7 +7,8 @@ import {
   useFileActionsCreateNewFile,
   useRequest,
   useSpacesStore,
-  CapabilityStore
+  CapabilityStore,
+  useClipboardStore
 } from '@ownclouders/web-pkg'
 import { eventBus, UppyResource } from '@ownclouders/web-pkg'
 import {
@@ -116,9 +117,10 @@ describe('CreateAndUpload component', () => {
       expect(storeOptions.modules.Files.actions.pasteSelectedFiles).toHaveBeenCalled()
     })
     it('call "clear clipboard"-action', async () => {
-      const { wrapper, storeOptions } = getWrapper({ clipboardResources: [mock<Resource>()] })
+      const { wrapper } = getWrapper({ clipboardResources: [mock<Resource>()] })
       await wrapper.find(elSelector.clearClipboardBtn).trigger('click')
-      expect(storeOptions.modules.Files.actions.clearClipboardFiles).toHaveBeenCalled()
+      const clipboardStore = useClipboardStore()
+      expect(clipboardStore.clearClipboard).toHaveBeenCalled()
     })
   })
   describe('method "onUploadComplete"', () => {
@@ -197,7 +199,6 @@ function getWrapper({
   const storeOptions = { ...defaultStoreMockOptions }
   storeOptions.modules.Files.state.areFileExtensionsShown = areFileExtensionsShown
   storeOptions.modules.Files.getters.currentFolder.mockImplementation(() => currentFolder)
-  storeOptions.modules.Files.getters.clipboardResources.mockImplementation(() => clipboardResources)
   storeOptions.modules.Files.getters.files.mockImplementation(() => files)
   const store = createStore(storeOptions)
   const mocks = {
@@ -224,7 +225,8 @@ function getWrapper({
             piniaOptions: {
               appsState: { fileExtensions },
               spacesState: { spaces: spaces as any },
-              capabilityState: { capabilities }
+              capabilityState: { capabilities },
+              clipboardState: { resources: clipboardResources }
             }
           }),
           store
diff --git a/packages/web-pkg/src/components/FilesList/ResourceTable.vue b/packages/web-pkg/src/components/FilesList/ResourceTable.vue
index 306475086a8..cf2d26071e0 100644
--- a/packages/web-pkg/src/components/FilesList/ResourceTable.vue
+++ b/packages/web-pkg/src/components/FilesList/ResourceTable.vue
@@ -230,7 +230,8 @@ import {
   useEmbedMode,
   useAuthStore,
   useCapabilityStore,
-  useConfigStore
+  useConfigStore,
+  useClipboardStore
 } from '../../composables'
 import ResourceListItem from './ResourceListItem.vue'
 import ResourceGhostElement from './ResourceGhostElement.vue'
@@ -457,6 +458,9 @@ export default defineComponent({
     const configStore = useConfigStore()
     const { options: configOptions } = storeToRefs(configStore)
 
+    const clipboardStore = useClipboardStore()
+    const { resources: clipboardResources, action: clipboardAction } = storeToRefs(clipboardStore)
+
     const authStore = useAuthStore()
     const { userContextReady } = storeToRefs(authStore)
 
@@ -500,6 +504,8 @@ export default defineComponent({
       hasProjectSpaces: capabilityRefs.spacesEnabled,
       userContextReady,
       getMatchingSpace,
+      clipboardResources,
+      clipboardAction,
       ...useResourceRouteResolver(
         {
           space: ref(props.space),
@@ -523,12 +529,7 @@ export default defineComponent({
     }
   },
   computed: {
-    ...mapState('Files', [
-      'areFileExtensionsShown',
-      'latestSelectedId',
-      'clipboardResources',
-      'clipboardAction'
-    ]),
+    ...mapState('Files', ['areFileExtensionsShown', 'latestSelectedId']),
 
     fields() {
       if (this.resources.length === 0) {
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsCopy.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsCopy.ts
index 8705a4cd72b..f9509e5e290 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsCopy.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsCopy.ts
@@ -11,14 +11,13 @@ import { FileAction, FileActionOptions } from '../types'
 import { isProjectSpaceResource } from '@ownclouders/web-client/src/helpers'
 import { useRouter } from '../../router'
 import { useStore } from '../../store'
-import { useConfigStore, useMessages } from '../../piniaStores'
+import { useConfigStore, useClipboardStore } from '../../piniaStores'
 
 export const useFileActionsCopy = ({ store }: { store?: Store<any> } = {}) => {
   store = store || useStore()
   const configStore = useConfigStore()
-  const messageStore = useMessages()
   const router = useRouter()
-
+  const { copyResources } = useClipboardStore()
   const language = useGettext()
   const { $gettext } = language
 
@@ -33,12 +32,12 @@ export const useFileActionsCopy = ({ store }: { store?: Store<any> } = {}) => {
     return $gettext('Ctrl + C')
   })
 
-  const handler = ({ space, resources }: FileActionOptions) => {
+  const handler = ({ resources }: FileActionOptions) => {
     if (isLocationCommonActive(router, 'files-common-search')) {
       resources = resources.filter((r) => !isProjectSpaceResource(r))
     }
 
-    store.dispatch('Files/copySelectedFiles', { ...language, space, resources, messageStore })
+    copyResources(resources)
   }
 
   const actions = computed((): FileAction[] => {
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsMove.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsMove.ts
index 61d3544f567..7e3f4c4fffd 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsMove.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsMove.ts
@@ -10,12 +10,13 @@ import { ActionOptions, FileAction } from '../types'
 import { computed, unref } from 'vue'
 import { useRouter } from '../../router'
 import { useStore } from '../../store'
-import { useMessages } from '../../piniaStores'
+import { useClipboardStore } from '../../piniaStores'
+import { Resource } from '@ownclouders/web-client'
 
 export const useFileActionsMove = ({ store }: { store?: Store<any> } = {}) => {
   store = store || useStore()
-  const messageStore = useMessages()
   const router = useRouter()
+  const { cutResources } = useClipboardStore()
   const language = useGettext()
   const { $gettext } = language
 
@@ -30,8 +31,8 @@ export const useFileActionsMove = ({ store }: { store?: Store<any> } = {}) => {
     return $gettext('Ctrl + X')
   })
 
-  const handler = ({ space, resources }: ActionOptions) => {
-    store.dispatch('Files/cutSelectedFiles', { ...language, space, resources, messageStore })
+  const handler = ({ resources }: ActionOptions) => {
+    cutResources(resources as Resource[])
   }
   const actions = computed((): FileAction[] => [
     {
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsPaste.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsPaste.ts
index ca13a620d4c..48821183827 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsPaste.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsPaste.ts
@@ -13,6 +13,7 @@ import { useRouter } from '../../router'
 import { useStore } from '../../store'
 import { FileAction, FileActionOptions } from '../types'
 import { Resource, SpaceResource } from '@ownclouders/web-client'
+import { useClipboardStore } from '../../piniaStores'
 
 export const useFileActionsPaste = ({ store }: { store?: Store<any> } = {}) => {
   store = store || useStore()
@@ -21,6 +22,7 @@ export const useFileActionsPaste = ({ store }: { store?: Store<any> } = {}) => {
   const loadingService = useLoadingService()
   const { getMatchingSpace } = useGetMatchingSpace()
   const { $gettext, $ngettext } = useGettext()
+  const clipboardStore = useClipboardStore()
 
   const isMacOs = computed(() => {
     return window.navigator.platform.match('Mac')
@@ -35,7 +37,7 @@ export const useFileActionsPaste = ({ store }: { store?: Store<any> } = {}) => {
 
   const handler = async ({ space: targetSpace }: FileActionOptions) => {
     const resourceSpaceMapping: Record<string, { space: SpaceResource; resources: Resource[] }> =
-      store.getters['Files/clipboardResources'].reduce((acc, resource) => {
+      clipboardStore.resources.reduce((acc, resource) => {
         if (resource.storageId in acc) {
           acc[resource.storageId].resources.push(resource)
           return acc
@@ -52,6 +54,7 @@ export const useFileActionsPaste = ({ store }: { store?: Store<any> } = {}) => {
       }, {})
     const promises = Object.values(resourceSpaceMapping).map(
       ({ space: sourceSpace, resources: resourcesToCopy }) => {
+        // TODO: move away from store, no need to sit there
         return store.dispatch('Files/pasteSelectedFiles', {
           targetSpace,
           sourceSpace: sourceSpace,
@@ -59,12 +62,13 @@ export const useFileActionsPaste = ({ store }: { store?: Store<any> } = {}) => {
           clientService,
           loadingService,
           $gettext,
-          $ngettext
+          $ngettext,
+          clipboardStore
         })
       }
     )
     await Promise.all(promises)
-    store.commit('Files/CLEAR_CLIPBOARD')
+    clipboardStore.clearClipboard()
   }
 
   const actions = computed((): FileAction[] => [
@@ -75,7 +79,7 @@ export const useFileActionsPaste = ({ store }: { store?: Store<any> } = {}) => {
       label: () => $gettext('Paste'),
       shortcut: unref(pasteShortcutString),
       isEnabled: ({ resources }) => {
-        if (store.getters['Files/clipboardResources'].length === 0) {
+        if (clipboardStore.resources.length === 0) {
           return false
         }
         if (
diff --git a/packages/web-pkg/src/composables/piniaStores/clipboard.ts b/packages/web-pkg/src/composables/piniaStores/clipboard.ts
new file mode 100644
index 00000000000..d866c4f5eaa
--- /dev/null
+++ b/packages/web-pkg/src/composables/piniaStores/clipboard.ts
@@ -0,0 +1,44 @@
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+import { Resource } from '@ownclouders/web-client'
+import { ClipboardActions } from '../../helpers'
+import { useGettext } from 'vue3-gettext'
+import { useMessages } from './messages'
+
+export const useClipboardStore = defineStore('clipboard', () => {
+  const { $gettext } = useGettext()
+  const { showMessage } = useMessages()
+
+  const action = ref<ClipboardActions>()
+  const resources = ref<Resource[]>([])
+
+  const copyResources = (r: Resource[]) => {
+    action.value = ClipboardActions.Copy
+    resources.value = r
+
+    showMessage({ title: $gettext('Copied to clipboard!'), status: 'success' })
+  }
+
+  const cutResources = (r: Resource[]) => {
+    action.value = ClipboardActions.Cut
+    resources.value = r
+
+    showMessage({ title: $gettext('Cut to clipboard!'), status: 'success' })
+  }
+
+  const clearClipboard = () => {
+    action.value = undefined
+    resources.value = []
+  }
+
+  return {
+    action,
+    resources,
+
+    copyResources,
+    cutResources,
+    clearClipboard
+  }
+})
+
+export type ClipboardStore = ReturnType<typeof useClipboardStore>
diff --git a/packages/web-pkg/src/composables/piniaStores/index.ts b/packages/web-pkg/src/composables/piniaStores/index.ts
index 05dd085a8f0..8eabe289a0e 100644
--- a/packages/web-pkg/src/composables/piniaStores/index.ts
+++ b/packages/web-pkg/src/composables/piniaStores/index.ts
@@ -1,6 +1,7 @@
 export * from './apps'
 export * from './auth'
 export * from './capabilities'
+export * from './clipboard'
 export * from './config'
 export * from './extensionRegistry'
 export * from './messages'
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCopy.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCopy.spec.ts
index 71d79bb9464..3507be6e8c0 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCopy.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCopy.spec.ts
@@ -10,6 +10,7 @@ import {
   getComposableWrapper
 } from 'web-test-helpers'
 import { useFileActionsCopy } from '../../../../../src/composables/actions/files'
+import { useClipboardStore } from '../../../../../src/composables/piniaStores'
 
 describe('copy', () => {
   describe('search context', () => {
@@ -32,13 +33,11 @@ describe('copy', () => {
         ])('should filter non copyable resources', ({ resources, copyAbleResources }) => {
           getWrapper({
             searchLocation: true,
-            setup: ({ actions }, { storeOptions }) => {
+            setup: ({ actions }) => {
               unref(actions)[0].handler({ space: null, resources })
-              expect(storeOptions.modules.Files.actions.copySelectedFiles).toHaveBeenCalledWith(
-                expect.anything(),
-                expect.objectContaining({
-                  resources: resources.filter((r) => copyAbleResources.includes(r.id as string))
-                })
+              const clipboardStore = useClipboardStore()
+              expect(clipboardStore.copyResources).toHaveBeenCalledWith(
+                resources.filter((r) => copyAbleResources.includes(r.id as string))
               )
             }
           })
diff --git a/packages/web-test-helpers/src/mocks/pinia.ts b/packages/web-test-helpers/src/mocks/pinia.ts
index a819de87123..f4cc96efcbc 100644
--- a/packages/web-test-helpers/src/mocks/pinia.ts
+++ b/packages/web-test-helpers/src/mocks/pinia.ts
@@ -5,9 +5,9 @@ import { Message, Modal, WebThemeType } from '../../../web-pkg/src/composables/p
 import { Capabilities } from '../../../web-client/src/ocs'
 import { mock } from 'jest-mock-extended'
 import { SpaceResource } from '../../../web-client/src'
-import { Share } from '../../../web-client/src/helpers'
-import { ApplicationFileExtension } from '../../../web-pkg/types'
 import { OptionsConfig } from '../../../web-pkg/src/composables/piniaStores/config/types'
+import { Resource, Share } from '../../../web-client/src/helpers'
+import { ApplicationFileExtension, ClipboardActions } from '../../../web-pkg/types'
 
 export { createTestingPinia }
 
@@ -21,6 +21,7 @@ export type PiniaMockOptions = {
     publicLinkContextReady?: boolean
   }
   themeState?: { availableThemes?: WebThemeType[]; currentTheme?: WebThemeType }
+  clipboardState?: { action?: ClipboardActions; resources?: Resource[] }
   configState?: {
     server?: string
     options?: OptionsConfig
@@ -39,6 +40,7 @@ export function createMockStore({
   stubActions = true,
   appsState = {},
   authState = {},
+  clipboardState = {},
   configState = {},
   themeState = {},
   messagesState = {},
@@ -63,6 +65,7 @@ export function createMockStore({
     initialState: {
       apps: { ...appsState },
       auth: { ...authState },
+      clipboard: { resources: [], ...clipboardState },
       config: {
         apps: [],
         external_apps: [],
diff --git a/packages/web-test-helpers/src/mocks/store/filesModuleMockOptions.ts b/packages/web-test-helpers/src/mocks/store/filesModuleMockOptions.ts
index 9fbd71ccb57..5117f2891f6 100644
--- a/packages/web-test-helpers/src/mocks/store/filesModuleMockOptions.ts
+++ b/packages/web-test-helpers/src/mocks/store/filesModuleMockOptions.ts
@@ -12,7 +12,6 @@ export const filesModuleMockOptions = {
       files: jest.fn(() => []),
       activeFiles: jest.fn(),
       highlightedFile: jest.fn(),
-      clipboardResources: jest.fn(() => []),
       selectedFiles: jest.fn(() => []),
       versions: jest.fn(() => []),
       outgoingCollaborators: jest.fn(() => []),
@@ -35,13 +34,11 @@ export const filesModuleMockOptions = {
       REMOVE_FILE: jest.fn(),
       REMOVE_FILES: jest.fn(),
       RESET_SELECTION: jest.fn(),
-      SET_LATEST_SELECTED_FILE_ID: jest.fn(),
-      CLEAR_CLIPBOARD: jest.fn()
+      SET_LATEST_SELECTED_FILE_ID: jest.fn()
     },
     actions: {
       deleteFiles: jest.fn(),
       pasteSelectedFiles: jest.fn(),
-      clearClipboardFiles: jest.fn(),
       loadIndicators: jest.fn(),
       loadVersions: jest.fn(),
       loadShares: jest.fn(),
@@ -52,8 +49,6 @@ export const filesModuleMockOptions = {
       changeShare: jest.fn(),
       addLink: jest.fn(),
       addShare: jest.fn(),
-      copySelectedFiles: jest.fn(),
-      cutSelectedFiles: jest.fn(),
       resetFileSelection: jest.fn(),
       toggleFileSelection: jest.fn()
     }

From c6dea1625f016f193ec84acd7f54edd3d7d7295c Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Tue, 16 Jan 2024 10:49:25 +0100
Subject: [PATCH 2/3] refactor: move ResourceTransfer to web-pkg

---
 .../src/helpers/resource/actions/index.ts     |  2 --
 .../src/helpers/resource/actions/types.ts     |  4 ----
 packages/web-app-files/src/store/actions.ts   | 10 +++++++--
 .../src/views/spaces/GenericSpace.vue         |  3 ++-
 .../resource/conflictHandling/index.ts        |  1 +
 .../resource/conflictHandling}/transfer.ts    | 22 ++++++++-----------
 .../resource/conflictHandling/types.ts        |  5 +++++
 .../resourcesTransfer.spec.ts                 | 14 +++++++++---
 8 files changed, 36 insertions(+), 25 deletions(-)
 delete mode 100644 packages/web-app-files/src/helpers/resource/actions/types.ts
 rename packages/{web-app-files/src/helpers/resource/actions => web-pkg/src/helpers/resource/conflictHandling}/transfer.ts (95%)
 rename packages/{web-app-files/tests/unit/helpers/resource => web-pkg/tests/unit/helpers/resource/conflictHandling}/resourcesTransfer.spec.ts (95%)

diff --git a/packages/web-app-files/src/helpers/resource/actions/index.ts b/packages/web-app-files/src/helpers/resource/actions/index.ts
index 0aafc3ed689..116d6e0e1b7 100644
--- a/packages/web-app-files/src/helpers/resource/actions/index.ts
+++ b/packages/web-app-files/src/helpers/resource/actions/index.ts
@@ -1,3 +1 @@
-export * from './transfer'
 export * from './upload'
-export * from './types'
diff --git a/packages/web-app-files/src/helpers/resource/actions/types.ts b/packages/web-app-files/src/helpers/resource/actions/types.ts
deleted file mode 100644
index 9223c7d1a3e..00000000000
--- a/packages/web-app-files/src/helpers/resource/actions/types.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export enum TransferType {
-  COPY,
-  MOVE
-}
diff --git a/packages/web-app-files/src/store/actions.ts b/packages/web-app-files/src/store/actions.ts
index 67d5cea69f8..437377ba2b8 100644
--- a/packages/web-app-files/src/store/actions.ts
+++ b/packages/web-app-files/src/store/actions.ts
@@ -1,12 +1,18 @@
 import PQueue from 'p-queue'
 
-import { MessageStore, CapabilityStore, getParentPaths, ConfigStore } from '@ownclouders/web-pkg'
+import {
+  MessageStore,
+  CapabilityStore,
+  getParentPaths,
+  ConfigStore,
+  ResourceTransfer,
+  TransferType
+} from '@ownclouders/web-pkg'
 import {
   buildShare,
   buildCollaboratorShare,
   ShareTypes
 } from '@ownclouders/web-client/src/helpers/share'
-import { ResourceTransfer, TransferType } from '../helpers/resource'
 import { avatarUrl } from '../helpers/user'
 import { has } from 'lodash-es'
 import get from 'lodash-es/get'
diff --git a/packages/web-app-files/src/views/spaces/GenericSpace.vue b/packages/web-app-files/src/views/spaces/GenericSpace.vue
index 5dc96acd62b..827531a8b47 100644
--- a/packages/web-app-files/src/views/spaces/GenericSpace.vue
+++ b/packages/web-app-files/src/views/spaces/GenericSpace.vue
@@ -169,6 +169,8 @@ import {
 
 import {
   ProcessorType,
+  ResourceTransfer,
+  TransferType,
   useCapabilityStore,
   useConfigStore,
   useEmbedMode,
@@ -212,7 +214,6 @@ import SpaceHeader from '../../components/Spaces/SpaceHeader.vue'
 import WhitespaceContextMenu from 'web-app-files/src/components/Spaces/WhitespaceContextMenu.vue'
 import { eventBus } from '@ownclouders/web-pkg'
 import { useResourcesViewDefaults } from '../../composables'
-import { ResourceTransfer, TransferType } from '../../helpers/resource'
 import { FolderLoaderOptions } from '../../services/folder'
 import { BreadcrumbItem } from 'design-system/src/components/OcBreadcrumb/types'
 import { v4 as uuidv4 } from 'uuid'
diff --git a/packages/web-pkg/src/helpers/resource/conflictHandling/index.ts b/packages/web-pkg/src/helpers/resource/conflictHandling/index.ts
index d4254c788c1..12e2a6def5d 100644
--- a/packages/web-pkg/src/helpers/resource/conflictHandling/index.ts
+++ b/packages/web-pkg/src/helpers/resource/conflictHandling/index.ts
@@ -1,3 +1,4 @@
 export * from './conflictDialog'
 export * from './conflictUtils'
+export * from './transfer'
 export * from './types'
diff --git a/packages/web-app-files/src/helpers/resource/actions/transfer.ts b/packages/web-pkg/src/helpers/resource/conflictHandling/transfer.ts
similarity index 95%
rename from packages/web-app-files/src/helpers/resource/actions/transfer.ts
rename to packages/web-pkg/src/helpers/resource/conflictHandling/transfer.ts
index 32fe7afc506..dd93b11fda8 100644
--- a/packages/web-app-files/src/helpers/resource/actions/transfer.ts
+++ b/packages/web-pkg/src/helpers/resource/conflictHandling/transfer.ts
@@ -1,21 +1,16 @@
 import { Resource } from '@ownclouders/web-client'
 import { basename, join } from 'path'
 import { SpaceResource } from '@ownclouders/web-client/src/helpers'
-import {
-  ClientService,
-  LoadingService,
-  LoadingTaskCallbackArguments,
-  useMessages
-} from '@ownclouders/web-pkg'
 import {
   ConflictDialog,
+  FileConflict,
   ResolveStrategy,
+  TransferType,
   isResourceBeeingMovedToSameLocation,
-  resolveFileNameDuplicate,
-  FileConflict
-} from '@ownclouders/web-pkg'
-
-import { TransferType } from '.'
+  resolveFileNameDuplicate
+} from '.'
+import { ClientService, LoadingService, LoadingTaskCallbackArguments } from '../../../services'
+import { useMessages } from '../../../composables'
 
 export class ResourceTransfer extends ConflictDialog {
   constructor(
@@ -165,8 +160,9 @@ export class ResourceTransfer extends ConflictDialog {
       let targetName = resource.name
       let overwriteTarget = false
       if (hasConflict) {
-        const resolveStrategy = resolvedConflicts.find((e) => e.resource.id === resource.id)
-          ?.strategy
+        const resolveStrategy = resolvedConflicts.find(
+          (e) => e.resource.id === resource.id
+        )?.strategy
         if (resolveStrategy === ResolveStrategy.SKIP) {
           continue
         }
diff --git a/packages/web-pkg/src/helpers/resource/conflictHandling/types.ts b/packages/web-pkg/src/helpers/resource/conflictHandling/types.ts
index c401f55710f..72da81ca65e 100644
--- a/packages/web-pkg/src/helpers/resource/conflictHandling/types.ts
+++ b/packages/web-pkg/src/helpers/resource/conflictHandling/types.ts
@@ -8,3 +8,8 @@ export interface ResolveConflict {
   strategy: ResolveStrategy
   doForAllConflicts: boolean
 }
+
+export enum TransferType {
+  COPY,
+  MOVE
+}
diff --git a/packages/web-app-files/tests/unit/helpers/resource/resourcesTransfer.spec.ts b/packages/web-pkg/tests/unit/helpers/resource/conflictHandling/resourcesTransfer.spec.ts
similarity index 95%
rename from packages/web-app-files/tests/unit/helpers/resource/resourcesTransfer.spec.ts
rename to packages/web-pkg/tests/unit/helpers/resource/conflictHandling/resourcesTransfer.spec.ts
index c7d914105cd..8f1c4e27f4e 100644
--- a/packages/web-app-files/tests/unit/helpers/resource/resourcesTransfer.spec.ts
+++ b/packages/web-pkg/tests/unit/helpers/resource/conflictHandling/resourcesTransfer.spec.ts
@@ -1,11 +1,19 @@
-import { ClientService, LoadingService, LoadingTaskCallbackArguments } from '@ownclouders/web-pkg'
-import { ResourceTransfer, TransferType } from '../../../../src/helpers/resource'
-import { ResolveConflict, resolveFileNameDuplicate } from '@ownclouders/web-pkg'
+import {
+  ResolveConflict,
+  ResourceTransfer,
+  TransferType,
+  resolveFileNameDuplicate
+} from '../../../../../src/helpers/resource/conflictHandling'
 import { mock, mockDeep, mockReset } from 'jest-mock-extended'
 import { buildSpace, Resource } from '@ownclouders/web-client/src/helpers'
 import { ListFilesResult } from '@ownclouders/web-client/src/webdav/listFiles'
 import { Drive } from '@ownclouders/web-client/src/generated'
 import { createTestingPinia } from 'web-test-helpers'
+import {
+  ClientService,
+  LoadingService,
+  LoadingTaskCallbackArguments
+} from '../../../../../src/services'
 
 const clientServiceMock = mockDeep<ClientService>()
 const loadingServiceMock = mock<LoadingService>({

From 3bf3d812acae1ab500bcfb0dd8eed37d2f1c21ea Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Tue, 16 Jan 2024 11:02:04 +0100
Subject: [PATCH 3/3] refactor: remove pasteSelectedFiles from vuex files store

---
 packages/web-app-files/src/store/actions.ts   | 62 +------------------
 .../components/AppBar/CreateAndUpload.spec.ts | 20 ++++--
 .../actions/files/useFileActionsPaste.ts      | 61 ++++++++++++++----
 .../resource/conflictHandling/transfer.ts     |  5 +-
 .../src/mocks/store/filesModuleMockOptions.ts |  1 -
 5 files changed, 68 insertions(+), 81 deletions(-)

diff --git a/packages/web-app-files/src/store/actions.ts b/packages/web-app-files/src/store/actions.ts
index 437377ba2b8..0cd7229e1bb 100644
--- a/packages/web-app-files/src/store/actions.ts
+++ b/packages/web-app-files/src/store/actions.ts
@@ -1,13 +1,6 @@
 import PQueue from 'p-queue'
 
-import {
-  MessageStore,
-  CapabilityStore,
-  getParentPaths,
-  ConfigStore,
-  ResourceTransfer,
-  TransferType
-} from '@ownclouders/web-pkg'
+import { MessageStore, CapabilityStore, ConfigStore, getParentPaths } from '@ownclouders/web-pkg'
 import {
   buildShare,
   buildCollaboratorShare,
@@ -16,7 +9,6 @@ import {
 import { avatarUrl } from '../helpers/user'
 import { has } from 'lodash-es'
 import get from 'lodash-es/get'
-import { ClipboardActions } from '@ownclouders/web-pkg'
 import {
   buildResource,
   isProjectSpaceResource,
@@ -51,58 +43,6 @@ export default {
       context.commit('ADD_FILE_SELECTION', file)
     }
   },
-  pasteSelectedFiles(
-    context,
-    {
-      targetSpace,
-      clientService,
-      loadingService,
-      $gettext,
-      $ngettext,
-      sourceSpace,
-      resources,
-      clipboardStore
-    }
-  ) {
-    const copyMove = new ResourceTransfer(
-      sourceSpace,
-      resources,
-      targetSpace,
-      context.state.currentFolder,
-      clientService,
-      loadingService,
-      $gettext,
-      $ngettext
-    )
-    let movedResourcesPromise
-    if (clipboardStore.action === ClipboardActions.Cut) {
-      movedResourcesPromise = copyMove.perform(TransferType.MOVE)
-    }
-    if (clipboardStore.action === ClipboardActions.Copy) {
-      movedResourcesPromise = copyMove.perform(TransferType.COPY)
-    }
-    return movedResourcesPromise.then((movedResources) => {
-      const loadingResources = []
-      const fetchedResources = []
-      for (const resource of movedResources) {
-        loadingResources.push(
-          (async () => {
-            const movedResource = await (clientService.webdav as WebDAV).getFileInfo(
-              targetSpace,
-              resource
-            )
-            fetchedResources.push(movedResource)
-          })()
-        )
-      }
-
-      return Promise.all(loadingResources).then(() => {
-        const currentFolder = context.getters.currentFolder
-        context.commit('UPSERT_RESOURCES', fetchedResources)
-        context.commit('LOAD_INDICATORS', currentFolder.path)
-      })
-    })
-  },
   resetFileSelection(context) {
     context.commit('RESET_SELECTION')
   },
diff --git a/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.ts b/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.ts
index 17c30e9f295..6f502bf8993 100644
--- a/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.ts
+++ b/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.ts
@@ -8,7 +8,8 @@ import {
   useRequest,
   useSpacesStore,
   CapabilityStore,
-  useClipboardStore
+  useClipboardStore,
+  useFileActionsPaste
 } from '@ownclouders/web-pkg'
 import { eventBus, UppyResource } from '@ownclouders/web-pkg'
 import {
@@ -28,7 +29,8 @@ jest.mock('@ownclouders/web-pkg', () => ({
   useExtensionRegistry: jest.fn(),
   useRequest: jest.fn(),
   useFileActionsCreateNewFile: jest.fn(),
-  useFileActions: jest.fn()
+  useFileActions: jest.fn(),
+  useFileActionsPaste: jest.fn()
 }))
 
 const elSelector = {
@@ -106,7 +108,7 @@ describe('CreateAndUpload component', () => {
       expect(wrapper.findAll(`${elSelector.clipboardBtns} .oc-button`).length).toBe(2)
     })
     it('call the "paste files"-action', async () => {
-      const { wrapper, storeOptions } = getWrapper({
+      const { wrapper, mocks } = getWrapper({
         clipboardResources: [
           mock<Resource>({
             shareRoot: undefined
@@ -114,7 +116,7 @@ describe('CreateAndUpload component', () => {
         ]
       })
       await wrapper.find(elSelector.pasteFilesBtn).trigger('click')
-      expect(storeOptions.modules.Files.actions.pasteSelectedFiles).toHaveBeenCalled()
+      expect(mocks.pasteActionHandler).toHaveBeenCalled()
     })
     it('call "clear clipboard"-action', async () => {
       const { wrapper } = getWrapper({ clipboardResources: [mock<Resource>()] })
@@ -196,13 +198,21 @@ function getWrapper({
     })
   )
 
+  const pasteActionHandler = jest.fn()
+  jest.mocked(useFileActionsPaste).mockReturnValue(
+    mock<ReturnType<typeof useFileActionsPaste>>({
+      actions: ref([mock<FileAction>({ handler: pasteActionHandler })])
+    })
+  )
+
   const storeOptions = { ...defaultStoreMockOptions }
   storeOptions.modules.Files.state.areFileExtensionsShown = areFileExtensionsShown
   storeOptions.modules.Files.getters.currentFolder.mockImplementation(() => currentFolder)
   storeOptions.modules.Files.getters.files.mockImplementation(() => files)
   const store = createStore(storeOptions)
   const mocks = {
-    ...defaultComponentMocks({ currentRoute: mock<RouteLocation>({ name: currentRouteName }) })
+    ...defaultComponentMocks({ currentRoute: mock<RouteLocation>({ name: currentRouteName }) }),
+    pasteActionHandler
   }
   const capabilities = {
     spaces: { enabled: true },
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsPaste.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsPaste.ts
index 48821183827..a2bdf451b9e 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsPaste.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsPaste.ts
@@ -14,6 +14,7 @@ import { useStore } from '../../store'
 import { FileAction, FileActionOptions } from '../types'
 import { Resource, SpaceResource } from '@ownclouders/web-client'
 import { useClipboardStore } from '../../piniaStores'
+import { ClipboardActions, ResourceTransfer, TransferType } from '../../../helpers'
 
 export const useFileActionsPaste = ({ store }: { store?: Store<any> } = {}) => {
   store = store || useStore()
@@ -35,6 +36,53 @@ export const useFileActionsPaste = ({ store }: { store?: Store<any> } = {}) => {
     return $gettext('Ctrl + V')
   })
 
+  const currentFolder = computed<Resource>(() => store.getters['Files/currentFolder'])
+
+  const pasteSelectedFiles = ({
+    targetSpace,
+    sourceSpace,
+    resources
+  }: {
+    targetSpace: SpaceResource
+    sourceSpace: SpaceResource
+    resources: Resource[]
+  }) => {
+    const copyMove = new ResourceTransfer(
+      sourceSpace,
+      resources,
+      targetSpace,
+      unref(currentFolder),
+      clientService,
+      loadingService,
+      $gettext,
+      $ngettext
+    )
+    let movedResourcesPromise: Promise<Resource[]>
+    if (clipboardStore.action === ClipboardActions.Cut) {
+      movedResourcesPromise = copyMove.perform(TransferType.MOVE)
+    }
+    if (clipboardStore.action === ClipboardActions.Copy) {
+      movedResourcesPromise = copyMove.perform(TransferType.COPY)
+    }
+    return movedResourcesPromise.then((movedResources) => {
+      const loadingResources = []
+      const fetchedResources: Resource[] = []
+      for (const resource of movedResources) {
+        loadingResources.push(
+          (async () => {
+            const movedResource = await clientService.webdav.getFileInfo(targetSpace, resource)
+            fetchedResources.push(movedResource)
+          })()
+        )
+      }
+
+      return Promise.all(loadingResources).then(() => {
+        store.commit('Files/UPSERT_RESOURCES', fetchedResources)
+        store.commit('Files/LOAD_INDICATORS', unref(currentFolder).path)
+      })
+    })
+  }
+
   const handler = async ({ space: targetSpace }: FileActionOptions) => {
     const resourceSpaceMapping: Record<string, { space: SpaceResource; resources: Resource[] }> =
       clipboardStore.resources.reduce((acc, resource) => {
@@ -52,19 +100,10 @@ export const useFileActionsPaste = ({ store }: { store?: Store<any> } = {}) => {
         acc[matchingSpace.id].resources.push(resource)
         return acc
       }, {})
+
     const promises = Object.values(resourceSpaceMapping).map(
       ({ space: sourceSpace, resources: resourcesToCopy }) => {
-        // TODO: move away from store, no need to sit there
-        return store.dispatch('Files/pasteSelectedFiles', {
-          targetSpace,
-          sourceSpace: sourceSpace,
-          resources: resourcesToCopy,
-          clientService,
-          loadingService,
-          $gettext,
-          $ngettext,
-          clipboardStore
-        })
+        return pasteSelectedFiles({ targetSpace, sourceSpace, resources: resourcesToCopy })
       }
     )
     await Promise.all(promises)
diff --git a/packages/web-pkg/src/helpers/resource/conflictHandling/transfer.ts b/packages/web-pkg/src/helpers/resource/conflictHandling/transfer.ts
index dd93b11fda8..8fb091c503a 100644
--- a/packages/web-pkg/src/helpers/resource/conflictHandling/transfer.ts
+++ b/packages/web-pkg/src/helpers/resource/conflictHandling/transfer.ts
@@ -160,9 +160,8 @@ export class ResourceTransfer extends ConflictDialog {
       let targetName = resource.name
       let overwriteTarget = false
       if (hasConflict) {
-        const resolveStrategy = resolvedConflicts.find(
-          (e) => e.resource.id === resource.id
-        )?.strategy
+        const resolveStrategy = resolvedConflicts.find((e) => e.resource.id === resource.id)
+          ?.strategy
         if (resolveStrategy === ResolveStrategy.SKIP) {
           continue
         }
diff --git a/packages/web-test-helpers/src/mocks/store/filesModuleMockOptions.ts b/packages/web-test-helpers/src/mocks/store/filesModuleMockOptions.ts
index 5117f2891f6..4eace4cdecc 100644
--- a/packages/web-test-helpers/src/mocks/store/filesModuleMockOptions.ts
+++ b/packages/web-test-helpers/src/mocks/store/filesModuleMockOptions.ts
@@ -38,7 +38,6 @@ export const filesModuleMockOptions = {
     },
     actions: {
       deleteFiles: jest.fn(),
-      pasteSelectedFiles: jest.fn(),
       loadIndicators: jest.fn(),
       loadVersions: jest.fn(),
       loadShares: jest.fn(),