From 6787465f21ec1426b67a6f715fb9383201c8afb5 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Thu, 27 Apr 2023 12:07:50 +0200
Subject: [PATCH 01/26] WIP

---
 .../components/FilesList/ContextActions.vue   |   6 +-
 .../src/composables/actions/files/index.ts    |   1 +
 .../files/useFileActionsCreateNewFolder.ts    | 193 ++++++++++++++++++
 3 files changed, 199 insertions(+), 1 deletion(-)
 create mode 100644 packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts

diff --git a/packages/web-app-files/src/components/FilesList/ContextActions.vue b/packages/web-app-files/src/components/FilesList/ContextActions.vue
index 0e72e1ac978..9634ebe1f32 100644
--- a/packages/web-app-files/src/components/FilesList/ContextActions.vue
+++ b/packages/web-app-files/src/components/FilesList/ContextActions.vue
@@ -31,9 +31,11 @@ import {
   useFileActionsShowEditTags,
   useFileActionsNavigate,
   useFileActionsFavorite,
-  useFileActionsCreateSpaceFromResource
+  useFileActionsCreateSpaceFromResource,
+  useFileActionsCreateNewFolder
 } from '../../composables/actions/files'
 import { FileActionOptions } from 'web-pkg/src/composables/actions'
+import { create } from 'domain'
 
 export default defineComponent({
   name: 'ContextActions',
@@ -49,6 +51,7 @@ export default defineComponent({
 
     const { editorActions, loadExternalAppActions } = useFileActions()
 
+    const { actions: createNewFolder } = useFileActionsCreateNewFolder({ store })
     const { actions: acceptShareActions } = useFileActionsAcceptShare({ store })
     const { actions: copyActions } = useFileActionsCopy({ store })
     const { actions: createQuickLinkActions } = useFileActionsCreateQuickLink({ store })
@@ -107,6 +110,7 @@ export default defineComponent({
 
     const menuItemsActions = computed(() => {
       return [
+        ...unref(createNewFolder),
         ...unref(downloadArchiveActions),
         ...unref(downloadFileActions),
         ...unref(deleteActions),
diff --git a/packages/web-app-files/src/composables/actions/files/index.ts b/packages/web-app-files/src/composables/actions/files/index.ts
index 1203708d328..9580c8a7628 100644
--- a/packages/web-app-files/src/composables/actions/files/index.ts
+++ b/packages/web-app-files/src/composables/actions/files/index.ts
@@ -19,3 +19,4 @@ export * from './useFileActionsShowDetails'
 export * from './useFileActionsShowEditTags'
 export * from './useFileActionsShowShares'
 export * from './useFileActionsCreateSpaceFromResource'
+export * from './useFileActionsCreateNewFolder'
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
new file mode 100644
index 00000000000..f01f7e7293c
--- /dev/null
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
@@ -0,0 +1,193 @@
+import { Resource, extractNameWithoutExtension } from 'web-client/src/helpers'
+import { Store } from 'vuex'
+import { computed, unref } from 'vue'
+import { useStore } from 'web-pkg/src/composables'
+import { FileAction, FileActionOptions } from 'web-pkg/src/composables/actions'
+import { useGettext } from 'vue3-gettext'
+import { resolveFileNameDuplicate } from 'web-app-files/src/helpers/resource'
+
+export const useFileActionsCreateNewFolder = ({ store }: { store?: Store<any> } = {}) => {
+  store = store || useStore()
+  const { $gettext } = useGettext()
+
+  const files = computed((): Array<Resource> => store.getters['Files/files'])
+  const areFileExtensionsShown = computed(
+    (): boolean => store.getters['Files/areFileExtensionsShown']
+  )
+
+  const checkNewFolderName = (folderName) => {
+    if (folderName.trim() === '') {
+      return $gettext('Folder name cannot be empty')
+    }
+
+    if (/[/]/.test(folderName)) {
+      return $gettext('Folder name cannot contain "/"')
+    }
+
+    if (folderName === '.') {
+      return $gettext('Folder name cannot be equal to "."')
+    }
+
+    if (folderName === '..') {
+      return $gettext('Folder name cannot be equal to ".."')
+    }
+
+    const exists = unref(files).find((file) => file.name === folderName)
+
+    if (exists) {
+      const translated = $gettext('%{name} already exists')
+      return $gettext(translated, { name: folderName }, true)
+    }
+
+    return null
+  }
+
+  const checkNewFileName = (fileName) => {
+    if (fileName === '') {
+      return $gettext('File name cannot be empty')
+    }
+
+    if (/[/]/.test(fileName)) {
+      return $gettext('File name cannot contain "/"')
+    }
+
+    if (fileName === '.') {
+      return $gettext('File name cannot be equal to "."')
+    }
+
+    if (fileName === '..') {
+      return $gettext('File name cannot be equal to ".."')
+    }
+
+    if (/\s+$/.test(fileName)) {
+      return $gettext('File name cannot end with whitespace')
+    }
+
+    const exists = unref(files).find((file) => file.name === fileName)
+
+    if (exists) {
+      const translated = $gettext('%{name} already exists')
+      return $gettext(translated, { name: fileName }, true)
+    }
+
+    return null
+  }
+
+  const addAppProviderFileFunc = async (fileName) => {}
+
+  const addNewFolder = async (folderName) => {
+    /*folderName = folderName.trimEnd()
+
+    try {
+      const path = join(this.item, folderName)
+      const resource = await (clientService.webdav as WebDAV).createFolder(this.space, {
+        path
+      })
+
+      if (this.loadIndicatorsForNewFile) {
+        resource.indicators = getIndicators({ resource, ancestorMetaData: this.ancestorMetaData })
+      }
+
+      this.UPSERT_RESOURCE(resource)
+      this.hideModal()
+
+      this.showMessage({
+        title: this.$gettextInterpolate(
+          this.$gettext('"%{folderName}" was created successfully'),
+          {
+            folderName
+          }
+        )
+      })
+    } catch (error) {
+      console.error(error)
+      this.showMessage({
+        title: this.$gettext('Failed to create folder'),
+        status: 'danger'
+      })
+    }*/
+    // TODO
+  }
+
+  const handler = ({ space, resources }: FileActionOptions) => {
+    const checkInputValue = (value) => {
+      /*this.setModalInputErrorMessage(
+        isFolder
+          ? this.checkNewFolderName(value)
+          : this.checkNewFileName(this.areFileExtensionsShown ? value : `${value}.${ext}`) //TODO
+      )*/
+    }
+    const addAppProviderFile = false
+    const isFolder = true
+    const ext = ''
+    let defaultName = isFolder ? $gettext('New folder') : $gettext('New file') + `.${ext}`
+
+    if (unref(files).some((f) => f.name === defaultName)) {
+      defaultName = resolveFileNameDuplicate(defaultName, isFolder ? '' : ext, files)
+    }
+
+    if (!areFileExtensionsShown) {
+      defaultName = extractNameWithoutExtension({ name: defaultName, extension: ext } as any)
+    }
+
+    // Sets action to be executed after creation of the file
+    if (!isFolder) {
+      //this.newFileAction = openAction // TODO
+    }
+
+    const inputSelectionRange =
+      isFolder || !areFileExtensionsShown ? null : [0, defaultName.length - (ext.length + 1)]
+
+    const modal = {
+      variation: 'passive',
+      title: isFolder ? $gettext('Create a new folder') : $gettext('Create a new file'),
+      cancelText: $gettext('Cancel'),
+      confirmText: $gettext('Create'),
+      hasInput: true,
+      inputValue: defaultName,
+      inputLabel: isFolder ? $gettext('Folder name') : $gettext('File name'),
+      inputError: isFolder
+        ? checkNewFolderName(defaultName)
+        : checkNewFileName(areFileExtensionsShown ? defaultName : `${defaultName}.${ext}`),
+      inputSelectionRange,
+      onCancel: store.dispatch('hideModal'),
+      onConfirm: isFolder
+        ? addNewFolder
+        : addAppProviderFile
+        ? addAppProviderFileFunc
+        : (fileName) => {
+            /*if (!this.areFileExtensionsShown) {
+              fileName = `${fileName}.${ext}`
+            }
+            this.addNewFile(fileName)*/
+            //TODO
+          },
+      onInput: checkInputValue
+    }
+
+    store.dispatch('createModal', modal)
+  }
+
+  const actions = computed((): FileAction[] => {
+    return [
+      {
+        name: 'create-folder',
+        icon: 'add',
+        handler,
+        label: () => {
+          return $gettext('Create new Folder')
+        },
+        isEnabled: ({ resources }) => {
+          return true
+        },
+        canBeDefault: true,
+        componentType: 'button',
+        class: 'oc-files-actions-download-archive-trigger'
+      }
+    ]
+  })
+
+  return {
+    actions
+  }
+}

From 667e727b6a754e538c03a3949e8a27b40cf1749d Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Thu, 27 Apr 2023 12:30:40 +0200
Subject: [PATCH 02/26] Make createFolder work

---
 .../files/useFileActionsCreateNewFolder.ts    | 53 ++++++++++++-------
 1 file changed, 33 insertions(+), 20 deletions(-)

diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
index f01f7e7293c..d8df4234e6a 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
@@ -1,20 +1,33 @@
 import { Resource, extractNameWithoutExtension } from 'web-client/src/helpers'
 import { Store } from 'vuex'
 import { computed, unref } from 'vue'
-import { useStore } from 'web-pkg/src/composables'
+import { useClientService, useRouter, useStore } from 'web-pkg/src/composables'
 import { FileAction, FileActionOptions } from 'web-pkg/src/composables/actions'
 import { useGettext } from 'vue3-gettext'
 import { resolveFileNameDuplicate } from 'web-app-files/src/helpers/resource'
+import { join } from 'path'
+import { WebDAV } from 'web-client/src/webdav'
+import { isLocationSpacesActive } from 'web-app-files/src/router'
+import { getIndicators } from 'web-app-files/src/helpers/statusIndicators'
 
 export const useFileActionsCreateNewFolder = ({ store }: { store?: Store<any> } = {}) => {
   store = store || useStore()
+  const router = useRouter()
   const { $gettext } = useGettext()
 
+  const clientService = useClientService()
+  const currentFolder = computed((): Resource => store.getters['Files/currentFolder'])
   const files = computed((): Array<Resource> => store.getters['Files/files'])
+  const ancestorMetaData = computed(() => store.getters['Files/ancestorMetaData'])
   const areFileExtensionsShown = computed(
     (): boolean => store.getters['Files/areFileExtensionsShown']
   )
 
+  const storageId = unref(currentFolder).storageId
+  const currentSpace = store.getters['runtime/spaces/spaces'].find(
+    (space) => space.id === storageId
+  ) //TODO is this the way to replace this.space ( ͡° ͜ʖ ͡°)?
+
   const checkNewFolderName = (folderName) => {
     if (folderName.trim() === '') {
       return $gettext('Folder name cannot be empty')
@@ -75,38 +88,38 @@ export const useFileActionsCreateNewFolder = ({ store }: { store?: Store<any> }
 
   const addAppProviderFileFunc = async (fileName) => {}
 
+  const loadIndicatorsForNewFile = computed(() => {
+    return (
+      isLocationSpacesActive(router, 'files-spaces-projects') && currentSpace.driveType !== 'share'
+    )
+  })
+
   const addNewFolder = async (folderName) => {
-    /*folderName = folderName.trimEnd()
+    folderName = folderName.trimEnd()
 
     try {
-      const path = join(this.item, folderName)
-      const resource = await (clientService.webdav as WebDAV).createFolder(this.space, {
+      const path = join(unref(currentFolder).path, folderName) // TODO: Why was this.item used here isn't it just the currentFolderPath?
+      const resource = await (clientService.webdav as WebDAV).createFolder(currentSpace, {
         path
       })
 
-      if (this.loadIndicatorsForNewFile) {
-        resource.indicators = getIndicators({ resource, ancestorMetaData: this.ancestorMetaData })
+      if (unref(loadIndicatorsForNewFile)) {
+        resource.indicators = getIndicators({ resource, ancestorMetaData: unref(ancestorMetaData) })
       }
 
-      this.UPSERT_RESOURCE(resource)
-      this.hideModal()
+      store.commit('Files/UPSERT_RESOURCE', resource)
+      store.dispatch('hideModal')
 
-      this.showMessage({
-        title: this.$gettextInterpolate(
-          this.$gettext('"%{folderName}" was created successfully'),
-          {
-            folderName
-          }
-        )
+      store.dispatch('showMessage', {
+        title: $gettext('"%{folderName}" was created successfully', { folderName })
       })
     } catch (error) {
       console.error(error)
-      this.showMessage({
-        title: this.$gettext('Failed to create folder'),
+      store.dispatch('showMessage', {
+        title: $gettext('Failed to create folder'),
         status: 'danger'
       })
-    }*/
-    // TODO
+    }
   }
 
   const handler = ({ space, resources }: FileActionOptions) => {
@@ -150,7 +163,7 @@ export const useFileActionsCreateNewFolder = ({ store }: { store?: Store<any> }
         ? checkNewFolderName(defaultName)
         : checkNewFileName(areFileExtensionsShown ? defaultName : `${defaultName}.${ext}`),
       inputSelectionRange,
-      onCancel: store.dispatch('hideModal'),
+      onCancel: () => store.dispatch('hideModal'),
       onConfirm: isFolder
         ? addNewFolder
         : addAppProviderFile

From 2a685cdab3c7fa9b1cd9b4346ba969d2d937d430 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Thu, 27 Apr 2023 12:42:47 +0200
Subject: [PATCH 03/26] Fix unref files

---
 .../composables/actions/files/useFileActionsCreateNewFolder.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
index d8df4234e6a..0cfd2ed0b7a 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
@@ -136,7 +136,7 @@ export const useFileActionsCreateNewFolder = ({ store }: { store?: Store<any> }
     let defaultName = isFolder ? $gettext('New folder') : $gettext('New file') + `.${ext}`
 
     if (unref(files).some((f) => f.name === defaultName)) {
-      defaultName = resolveFileNameDuplicate(defaultName, isFolder ? '' : ext, files)
+      defaultName = resolveFileNameDuplicate(defaultName, isFolder ? '' : ext, unref(files))
     }
 
     if (!areFileExtensionsShown) {

From a98ff9afa7e73352d5e1610a2736a8696a9563df Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Thu, 27 Apr 2023 14:38:19 +0200
Subject: [PATCH 04/26] Refactor useFileCreateNewFolder, implement
 useFileCreateNewFile

---
 .../components/FilesList/ContextActions.vue   |  11 +-
 .../src/composables/actions/files/index.ts    |   1 +
 .../files/useFileActionsCreateNewFile.ts      | 198 ++++++++++++++++++
 .../files/useFileActionsCreateNewFolder.ts    |  93 ++------
 4 files changed, 222 insertions(+), 81 deletions(-)
 create mode 100644 packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts

diff --git a/packages/web-app-files/src/components/FilesList/ContextActions.vue b/packages/web-app-files/src/components/FilesList/ContextActions.vue
index 9634ebe1f32..65dd39c8005 100644
--- a/packages/web-app-files/src/components/FilesList/ContextActions.vue
+++ b/packages/web-app-files/src/components/FilesList/ContextActions.vue
@@ -32,10 +32,10 @@ import {
   useFileActionsNavigate,
   useFileActionsFavorite,
   useFileActionsCreateSpaceFromResource,
-  useFileActionsCreateNewFolder
+  useFileActionsCreateNewFolder,
+  useFileActionsCreateNewFile
 } from '../../composables/actions/files'
 import { FileActionOptions } from 'web-pkg/src/composables/actions'
-import { create } from 'domain'
 
 export default defineComponent({
   name: 'ContextActions',
@@ -51,6 +51,12 @@ export default defineComponent({
 
     const { editorActions, loadExternalAppActions } = useFileActions()
 
+    const { actions: createNewFile } = useFileActionsCreateNewFile({
+      store,
+      openAction: null,
+      addAppProviderFile: false,
+      extension: 'txt'
+    })
     const { actions: createNewFolder } = useFileActionsCreateNewFolder({ store })
     const { actions: acceptShareActions } = useFileActionsAcceptShare({ store })
     const { actions: copyActions } = useFileActionsCopy({ store })
@@ -110,6 +116,7 @@ export default defineComponent({
 
     const menuItemsActions = computed(() => {
       return [
+        ...unref(createNewFile),
         ...unref(createNewFolder),
         ...unref(downloadArchiveActions),
         ...unref(downloadFileActions),
diff --git a/packages/web-app-files/src/composables/actions/files/index.ts b/packages/web-app-files/src/composables/actions/files/index.ts
index 9580c8a7628..4b2f09f7364 100644
--- a/packages/web-app-files/src/composables/actions/files/index.ts
+++ b/packages/web-app-files/src/composables/actions/files/index.ts
@@ -20,3 +20,4 @@ export * from './useFileActionsShowEditTags'
 export * from './useFileActionsShowShares'
 export * from './useFileActionsCreateSpaceFromResource'
 export * from './useFileActionsCreateNewFolder'
+export * from './useFileActionsCreateNewFile'
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
new file mode 100644
index 00000000000..5a59489a4cc
--- /dev/null
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
@@ -0,0 +1,198 @@
+import { Resource, extractNameWithoutExtension } from 'web-client/src/helpers'
+import { Store } from 'vuex'
+import { computed, ref, unref } from 'vue'
+import { useClientService, useRouter, useStore } from 'web-pkg/src/composables'
+import { FileAction } from 'web-pkg/src/composables/actions'
+import { useGettext } from 'vue3-gettext'
+import { resolveFileNameDuplicate } from 'web-app-files/src/helpers/resource'
+import { join } from 'path'
+import { WebDAV } from 'web-client/src/webdav'
+import { isLocationSpacesActive } from 'web-app-files/src/router'
+import { getIndicators } from 'web-app-files/src/helpers/statusIndicators'
+import { EDITOR_MODE_CREATE, useFileActions } from './useFileActions'
+
+export const useFileActionsCreateNewFile = ({
+  store,
+  openAction,
+  addAppProviderFile,
+  extension
+}: {
+  store?: Store<any>
+  openAction?: any
+  addAppProviderFile?: boolean
+  extension?: string
+} = {}) => {
+  store = store || useStore()
+  const router = useRouter()
+  const { $gettext } = useGettext()
+
+  const { openEditor } = useFileActions()
+  const clientService = useClientService()
+  const currentFolder = computed((): Resource => store.getters['Files/currentFolder'])
+  const files = computed((): Array<Resource> => store.getters['Files/files'])
+  const ancestorMetaData = computed(() => store.getters['Files/ancestorMetaData'])
+  const areFileExtensionsShown = computed(
+    (): boolean => store.getters['Files/areFileExtensionsShown']
+  )
+  const storageId = unref(currentFolder).storageId
+  const currentSpace = store.getters['runtime/spaces/spaces'].find(
+    (space) => space.id === storageId
+  )
+  const newFileAction = ref(null)
+
+  const checkNewFileName = (fileName) => {
+    if (fileName === '') {
+      return $gettext('File name cannot be empty')
+    }
+
+    if (/[/]/.test(fileName)) {
+      return $gettext('File name cannot contain "/"')
+    }
+
+    if (fileName === '.') {
+      return $gettext('File name cannot be equal to "."')
+    }
+
+    if (fileName === '..') {
+      return $gettext('File name cannot be equal to ".."')
+    }
+
+    if (/\s+$/.test(fileName)) {
+      return $gettext('File name cannot end with whitespace')
+    }
+
+    const exists = unref(files).find((file) => file.name === fileName)
+
+    if (exists) {
+      const translated = $gettext('%{name} already exists')
+      return $gettext(translated, { name: fileName }, true)
+    }
+
+    return null
+  }
+
+  const addAppProviderFileFunc = async (fileName) => {}
+
+  const loadIndicatorsForNewFile = computed(() => {
+    return (
+      isLocationSpacesActive(router, 'files-spaces-projects') && currentSpace.driveType !== 'share'
+    )
+  })
+
+  const addNewFile = async (fileName) => {
+    if (fileName === '') {
+      return
+    }
+
+    try {
+      const path = join(unref(currentFolder).path, fileName)
+      const resource = await (clientService.webdav as WebDAV).putFileContents(currentSpace, {
+        path
+      })
+
+      if (loadIndicatorsForNewFile) {
+        resource.indicators = getIndicators({ resource, ancestorMetaData: unref(ancestorMetaData) })
+      }
+
+      store.commit('Files/UPSERT_RESOURCE', resource)
+
+      if (unref(newFileAction)) {
+        openEditor(
+          unref(newFileAction),
+          unref(currentSpace).getDriveAliasAndItem(resource),
+          resource.webDavPath,
+          resource.fileId,
+          EDITOR_MODE_CREATE
+        )
+        store.dispatch('hideModal')
+
+        return
+      }
+
+      store.dispatch('hideModal')
+      store.dispatch('showMessage', {
+        title: $gettext('"%{fileName}" was created successfully', { fileName })
+      })
+    } catch (error) {
+      console.error(error)
+      store.dispatch('showMessage', {
+        title: $gettext('Failed to create file'),
+        status: 'danger'
+      })
+    }
+  }
+
+  const handler = () => {
+    const checkInputValue = (value) => {
+      store.dispatch(
+        'setModalInputErrorMessage',
+        checkNewFileName(areFileExtensionsShown ? value : `${value}.${extension}`)
+      )
+    }
+    let defaultName = $gettext('New file') + `.${extension}`
+
+    if (unref(files).some((f) => f.name === defaultName)) {
+      defaultName = resolveFileNameDuplicate(defaultName, extension, unref(files))
+    }
+
+    if (!areFileExtensionsShown) {
+      defaultName = extractNameWithoutExtension({ name: defaultName, extension } as any)
+    }
+
+    // Sets action to be executed after creation of the file
+    newFileAction.value = openAction
+
+    const inputSelectionRange = !areFileExtensionsShown
+      ? null
+      : [0, defaultName.length - (extension.length + 1)]
+
+    const modal = {
+      variation: 'passive',
+      title: $gettext('Create a new file'),
+      cancelText: $gettext('Cancel'),
+      confirmText: $gettext('Create'),
+      hasInput: true,
+      inputValue: defaultName,
+      inputLabel: $gettext('File name'),
+      inputError: checkNewFileName(
+        areFileExtensionsShown ? defaultName : `${defaultName}.${extension}`
+      ),
+      inputSelectionRange,
+      onCancel: () => store.dispatch('hideModal'),
+      onConfirm: addAppProviderFile
+        ? addAppProviderFileFunc
+        : (fileName) => {
+            if (!areFileExtensionsShown) {
+              fileName = `${fileName}.${extension}`
+            }
+            addNewFile(fileName)
+          },
+      onInput: checkInputValue
+    }
+
+    store.dispatch('createModal', modal)
+  }
+
+  const actions = computed((): FileAction[] => {
+    return [
+      {
+        name: 'create-new-file',
+        icon: 'add',
+        handler,
+        label: () => {
+          return $gettext('Create new File')
+        },
+        isEnabled: ({ resources }) => {
+          return true
+        },
+        canBeDefault: true,
+        componentType: 'button',
+        class: 'oc-files-actions-create-new-file'
+      }
+    ]
+  })
+
+  return {
+    actions
+  }
+}
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
index 0cfd2ed0b7a..b36a4321811 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
@@ -1,8 +1,8 @@
-import { Resource, extractNameWithoutExtension } from 'web-client/src/helpers'
+import { Resource } from 'web-client/src/helpers'
 import { Store } from 'vuex'
 import { computed, unref } from 'vue'
 import { useClientService, useRouter, useStore } from 'web-pkg/src/composables'
-import { FileAction, FileActionOptions } from 'web-pkg/src/composables/actions'
+import { FileAction } from 'web-pkg/src/composables/actions'
 import { useGettext } from 'vue3-gettext'
 import { resolveFileNameDuplicate } from 'web-app-files/src/helpers/resource'
 import { join } from 'path'
@@ -19,14 +19,11 @@ export const useFileActionsCreateNewFolder = ({ store }: { store?: Store<any> }
   const currentFolder = computed((): Resource => store.getters['Files/currentFolder'])
   const files = computed((): Array<Resource> => store.getters['Files/files'])
   const ancestorMetaData = computed(() => store.getters['Files/ancestorMetaData'])
-  const areFileExtensionsShown = computed(
-    (): boolean => store.getters['Files/areFileExtensionsShown']
-  )
 
   const storageId = unref(currentFolder).storageId
   const currentSpace = store.getters['runtime/spaces/spaces'].find(
     (space) => space.id === storageId
-  ) //TODO is this the way to replace this.space ( ͡° ͜ʖ ͡°)?
+  )
 
   const checkNewFolderName = (folderName) => {
     if (folderName.trim() === '') {
@@ -55,39 +52,6 @@ export const useFileActionsCreateNewFolder = ({ store }: { store?: Store<any> }
     return null
   }
 
-  const checkNewFileName = (fileName) => {
-    if (fileName === '') {
-      return $gettext('File name cannot be empty')
-    }
-
-    if (/[/]/.test(fileName)) {
-      return $gettext('File name cannot contain "/"')
-    }
-
-    if (fileName === '.') {
-      return $gettext('File name cannot be equal to "."')
-    }
-
-    if (fileName === '..') {
-      return $gettext('File name cannot be equal to ".."')
-    }
-
-    if (/\s+$/.test(fileName)) {
-      return $gettext('File name cannot end with whitespace')
-    }
-
-    const exists = unref(files).find((file) => file.name === fileName)
-
-    if (exists) {
-      const translated = $gettext('%{name} already exists')
-      return $gettext(translated, { name: fileName }, true)
-    }
-
-    return null
-  }
-
-  const addAppProviderFileFunc = async (fileName) => {}
-
   const loadIndicatorsForNewFile = computed(() => {
     return (
       isLocationSpacesActive(router, 'files-spaces-projects') && currentSpace.driveType !== 'share'
@@ -98,7 +62,7 @@ export const useFileActionsCreateNewFolder = ({ store }: { store?: Store<any> }
     folderName = folderName.trimEnd()
 
     try {
-      const path = join(unref(currentFolder).path, folderName) // TODO: Why was this.item used here isn't it just the currentFolderPath?
+      const path = join(unref(currentFolder).path, folderName)
       const resource = await (clientService.webdav as WebDAV).createFolder(currentSpace, {
         path
       })
@@ -122,59 +86,30 @@ export const useFileActionsCreateNewFolder = ({ store }: { store?: Store<any> }
     }
   }
 
-  const handler = ({ space, resources }: FileActionOptions) => {
+  const handler = () => {
     const checkInputValue = (value) => {
-      /*this.setModalInputErrorMessage(
-        isFolder
-          ? this.checkNewFolderName(value)
-          : this.checkNewFileName(this.areFileExtensionsShown ? value : `${value}.${ext}`) //TODO
-      )*/
+      store.dispatch('setModalInputErrorMessage', checkNewFolderName(value))
     }
-    const addAppProviderFile = false
-    const isFolder = true
-    const ext = ''
-    let defaultName = isFolder ? $gettext('New folder') : $gettext('New file') + `.${ext}`
+    let defaultName = $gettext('New folder')
 
     if (unref(files).some((f) => f.name === defaultName)) {
-      defaultName = resolveFileNameDuplicate(defaultName, isFolder ? '' : ext, unref(files))
-    }
-
-    if (!areFileExtensionsShown) {
-      defaultName = extractNameWithoutExtension({ name: defaultName, extension: ext } as any)
-    }
-
-    // Sets action to be executed after creation of the file
-    if (!isFolder) {
-      //this.newFileAction = openAction // TODO
+      defaultName = resolveFileNameDuplicate(defaultName, '', unref(files))
     }
 
-    const inputSelectionRange =
-      isFolder || !areFileExtensionsShown ? null : [0, defaultName.length - (ext.length + 1)]
+    const inputSelectionRange = null
 
     const modal = {
       variation: 'passive',
-      title: isFolder ? $gettext('Create a new folder') : $gettext('Create a new file'),
+      title: $gettext('Create a new folder'),
       cancelText: $gettext('Cancel'),
       confirmText: $gettext('Create'),
       hasInput: true,
       inputValue: defaultName,
-      inputLabel: isFolder ? $gettext('Folder name') : $gettext('File name'),
-      inputError: isFolder
-        ? checkNewFolderName(defaultName)
-        : checkNewFileName(areFileExtensionsShown ? defaultName : `${defaultName}.${ext}`),
+      inputLabel: $gettext('Folder name'),
+      inputError: checkNewFolderName(defaultName),
       inputSelectionRange,
       onCancel: () => store.dispatch('hideModal'),
-      onConfirm: isFolder
-        ? addNewFolder
-        : addAppProviderFile
-        ? addAppProviderFileFunc
-        : (fileName) => {
-            /*if (!this.areFileExtensionsShown) {
-              fileName = `${fileName}.${ext}`
-            }
-            this.addNewFile(fileName)*/
-            //TODO
-          },
+      onConfirm: addNewFolder,
       onInput: checkInputValue
     }
 
@@ -195,7 +130,7 @@ export const useFileActionsCreateNewFolder = ({ store }: { store?: Store<any> }
         },
         canBeDefault: true,
         componentType: 'button',
-        class: 'oc-files-actions-download-archive-trigger'
+        class: 'oc-files-actions-create-new-folder'
       }
     ]
   })

From f41a535a2dfc593caea6faa67dfdac7d108285a7 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Thu, 27 Apr 2023 15:11:28 +0200
Subject: [PATCH 05/26] Implement composables into CreateAndUpload

---
 .../src/components/AppBar/CreateAndUpload.vue | 44 +++++++++++++++----
 .../components/FilesList/ContextActions.vue   |  9 ----
 .../files/useFileActionsCreateNewFile.ts      | 11 ++---
 .../files/useFileActionsCreateNewFolder.ts    | 11 ++---
 4 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
index 61f376ddec0..9917211dd5d 100644
--- a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
@@ -25,23 +25,23 @@
       >
         <oc-list id="create-list">
           <li class="create-list-folder oc-menu-item-hover">
-            <oc-button id="new-folder-btn" appearance="raw" @click="showCreateResourceModal">
+            <oc-button id="new-folder-btn" appearance="raw" @click="createNewFolder[0].handler">
               <oc-resource-icon :resource="folderIconResource" size="medium" />
               <span v-text="$gettext('Folder')" />
             </oc-button>
           </li>
           <li
-            v-for="(newFileHandler, key) in newFileHandlers"
+            v-for="(fileAction, key) in fileActions"
             :key="`file-creation-item-${key}`"
             class="create-list-file oc-menu-item-hover"
           >
             <oc-button
               appearance="raw"
-              :class="['new-file-btn-' + newFileHandler.ext]"
-              @click="showCreateResourceModal(false, newFileHandler.ext, newFileHandler.action)"
+              :class="['new-file-btn-' + fileAction.ext]"
+              @click="fileAction.handler"
             >
-              <oc-resource-icon :resource="getIconResource(newFileHandler)" size="medium" />
-              <span>{{ newFileHandler.menuTitle($gettext) }}</span>
+              <oc-resource-icon :resource="getIconResource(fileAction)" size="medium" />
+              <span>{{ fileAction.title }}</span>
             </oc-button>
           </li>
           <template v-if="mimetypesAllowedForCreation">
@@ -141,7 +141,11 @@ import { join } from 'path'
 
 import { useFileActions, EDITOR_MODE_CREATE } from '../../composables/actions/files/useFileActions'
 import { isLocationPublicActive, isLocationSpacesActive } from '../../router'
-import { useActiveLocation } from '../../composables'
+import {
+  useActiveLocation,
+  useFileActionsCreateNewFile,
+  useFileActionsCreateNewFolder
+} from '../../composables'
 
 import {
   useRequest,
@@ -161,7 +165,8 @@ import {
   onBeforeUnmount,
   PropType,
   unref,
-  watch
+  watch,
+  ref
 } from 'vue'
 import { useUpload } from 'web-runtime/src/composables/upload'
 import { useUploadHelpers } from '../../composables/upload'
@@ -175,6 +180,7 @@ import { stringify } from 'qs'
 import { useService } from 'web-pkg/src/composables/service'
 import { UppyService } from 'web-runtime/src/services/uppyService'
 import { getIndicators } from 'web-app-files/src/helpers/statusIndicators'
+import { useGettext } from 'vue3-gettext'
 
 export default defineComponent({
   components: {
@@ -206,9 +212,27 @@ export default defineComponent({
     const uppyService = useService<UppyService>('$uppyService')
     const clientService = useClientService()
     const store = useStore()
+    const { $gettext } = useGettext()
+    const { actions: createNewFolder } = useFileActionsCreateNewFolder({ store })
+    const fileActions = ref([])
+
     let filesSelectedSub
     let uploadCompletedSub
 
+    const newFileHandlers = store.getters['newFileHandlers']
+    unref(newFileHandlers).forEach((element) => {
+      const { actions } = useFileActionsCreateNewFile({
+        store,
+        openAction: element.action,
+        addAppProviderFile: false,
+        extension: element.ext
+      })
+      fileActions.value.push({
+        handler: unref(actions)[0].handler,
+        ext: element.ext,
+        title: element.menuTitle($gettext)
+      })
+    })
     const currentFolder = computed(() => {
       return store.getters['Files/currentFolder']
     })
@@ -258,7 +282,9 @@ export default defineComponent({
       hasSpaces: useCapabilitySpacesEnabled(),
       isUserContext: useUserContext({ store }),
       canUpload,
-      currentFolder
+      currentFolder,
+      fileActions,
+      createNewFolder
     }
   },
   data: () => ({
diff --git a/packages/web-app-files/src/components/FilesList/ContextActions.vue b/packages/web-app-files/src/components/FilesList/ContextActions.vue
index 65dd39c8005..6f934e0d1f5 100644
--- a/packages/web-app-files/src/components/FilesList/ContextActions.vue
+++ b/packages/web-app-files/src/components/FilesList/ContextActions.vue
@@ -51,13 +51,6 @@ export default defineComponent({
 
     const { editorActions, loadExternalAppActions } = useFileActions()
 
-    const { actions: createNewFile } = useFileActionsCreateNewFile({
-      store,
-      openAction: null,
-      addAppProviderFile: false,
-      extension: 'txt'
-    })
-    const { actions: createNewFolder } = useFileActionsCreateNewFolder({ store })
     const { actions: acceptShareActions } = useFileActionsAcceptShare({ store })
     const { actions: copyActions } = useFileActionsCopy({ store })
     const { actions: createQuickLinkActions } = useFileActionsCreateQuickLink({ store })
@@ -116,8 +109,6 @@ export default defineComponent({
 
     const menuItemsActions = computed(() => {
       return [
-        ...unref(createNewFile),
-        ...unref(createNewFolder),
         ...unref(downloadArchiveActions),
         ...unref(downloadFileActions),
         ...unref(deleteActions),
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
index 5a59489a4cc..8589dc54d72 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
@@ -34,9 +34,9 @@ export const useFileActionsCreateNewFile = ({
   const areFileExtensionsShown = computed(
     (): boolean => store.getters['Files/areFileExtensionsShown']
   )
-  const storageId = unref(currentFolder).storageId
-  const currentSpace = store.getters['runtime/spaces/spaces'].find(
-    (space) => space.id === storageId
+  const storageId = computed(() => unref(currentFolder).storageId)
+  const currentSpace = computed(() =>
+    store.getters['runtime/spaces/spaces'].find((space) => space.id === unref(storageId))
   )
   const newFileAction = ref(null)
 
@@ -75,7 +75,8 @@ export const useFileActionsCreateNewFile = ({
 
   const loadIndicatorsForNewFile = computed(() => {
     return (
-      isLocationSpacesActive(router, 'files-spaces-projects') && currentSpace.driveType !== 'share'
+      isLocationSpacesActive(router, 'files-spaces-projects') &&
+      unref(currentSpace).driveType !== 'share'
     )
   })
 
@@ -86,7 +87,7 @@ export const useFileActionsCreateNewFile = ({
 
     try {
       const path = join(unref(currentFolder).path, fileName)
-      const resource = await (clientService.webdav as WebDAV).putFileContents(currentSpace, {
+      const resource = await (clientService.webdav as WebDAV).putFileContents(unref(currentSpace), {
         path
       })
 
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
index b36a4321811..b4e9a24b6df 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
@@ -20,9 +20,9 @@ export const useFileActionsCreateNewFolder = ({ store }: { store?: Store<any> }
   const files = computed((): Array<Resource> => store.getters['Files/files'])
   const ancestorMetaData = computed(() => store.getters['Files/ancestorMetaData'])
 
-  const storageId = unref(currentFolder).storageId
-  const currentSpace = store.getters['runtime/spaces/spaces'].find(
-    (space) => space.id === storageId
+  const storageId = computed(() => unref(currentFolder).storageId)
+  const currentSpace = computed(() =>
+    store.getters['runtime/spaces/spaces'].find((space) => space.id === unref(storageId))
   )
 
   const checkNewFolderName = (folderName) => {
@@ -54,7 +54,8 @@ export const useFileActionsCreateNewFolder = ({ store }: { store?: Store<any> }
 
   const loadIndicatorsForNewFile = computed(() => {
     return (
-      isLocationSpacesActive(router, 'files-spaces-projects') && currentSpace.driveType !== 'share'
+      isLocationSpacesActive(router, 'files-spaces-projects') &&
+      unref(currentSpace).driveType !== 'share'
     )
   })
 
@@ -63,7 +64,7 @@ export const useFileActionsCreateNewFolder = ({ store }: { store?: Store<any> }
 
     try {
       const path = join(unref(currentFolder).path, folderName)
-      const resource = await (clientService.webdav as WebDAV).createFolder(currentSpace, {
+      const resource = await (clientService.webdav as WebDAV).createFolder(unref(currentSpace), {
         path
       })
 

From 4bc18e4cededc94949ad243611aadfafa6361552 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Thu, 27 Apr 2023 15:20:25 +0200
Subject: [PATCH 06/26] Refactor CreateAndUpload

---
 .../src/components/AppBar/CreateAndUpload.vue | 299 +++---------------
 1 file changed, 36 insertions(+), 263 deletions(-)

diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
index 9917211dd5d..2787011cc44 100644
--- a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
@@ -46,16 +46,15 @@
           </li>
           <template v-if="mimetypesAllowedForCreation">
             <li
-              v-for="(mimetype, key) in mimetypesAllowedForCreation"
+              v-for="(mimeTypeAction, key) in mimeTypeActions"
               :key="`file-creation-item-external-${key}`"
               class="create-list-file oc-menu-item-hover"
             >
-              <oc-button
-                appearance="raw"
-                @click="showCreateResourceModal(false, mimetype.ext, false, true)"
-              >
-                <oc-resource-icon :resource="getIconResource(mimetype)" size="medium" />
-                <span v-text="$gettextInterpolate($gettext('%{name}'), { name: mimetype.name })" />
+              <oc-button appearance="raw" @click="mimeTypeAction.handler">
+                <oc-resource-icon :resource="getIconResource(mimeTypeAction)" size="medium" />
+                <span
+                  v-text="$gettextInterpolate($gettext('%{name}'), { name: mimeTypeAction.name })"
+                />
               </oc-button>
             </li>
           </template>
@@ -71,7 +70,7 @@
           variation="primary"
           :aria-label="newButtonAriaLabel"
           :disabled="uploadOrFileCreationBlocked"
-          @click="showCreateResourceModal"
+          @click="createNewFolder[0].handler"
         >
           <oc-icon name="resource-type-folder" />
           <span v-if="!hideButtonLabels" v-text="$gettext('New Folder')" />
@@ -214,12 +213,13 @@ export default defineComponent({
     const store = useStore()
     const { $gettext } = useGettext()
     const { actions: createNewFolder } = useFileActionsCreateNewFolder({ store })
-    const fileActions = ref([])
 
     let filesSelectedSub
     let uploadCompletedSub
 
+    // use all new file handler actions
     const newFileHandlers = store.getters['newFileHandlers']
+    const fileActions = ref([])
     unref(newFileHandlers).forEach((element) => {
       const { actions } = useFileActionsCreateNewFile({
         store,
@@ -233,6 +233,30 @@ export default defineComponent({
         title: element.menuTitle($gettext)
       })
     })
+
+    const mimetypesAllowedForCreation = computed(() => {
+      // we can't use `mapGetters` here because the External app doesn't exist in all deployments
+      const mimeTypes = store.getters['External/mimeTypes']
+      if (!mimeTypes) {
+        return []
+      }
+      return mimeTypes.filter((mimetype) => mimetype.allow_creation) || []
+    })
+    // use all mime type handler actions
+    const mimeTypeActions = ref([])
+    unref(mimetypesAllowedForCreation).forEach((element) => {
+      const { actions } = useFileActionsCreateNewFile({
+        store,
+        openAction: false,
+        addAppProviderFile: true,
+        extension: element.ext
+      })
+      mimeTypeActions.value.push({
+        handler: unref(actions)[0].handler,
+        ext: element.ext,
+        name: element.name
+      })
+    })
     const currentFolder = computed(() => {
       return store.getters['Files/currentFolder']
     })
@@ -284,7 +308,9 @@ export default defineComponent({
       canUpload,
       currentFolder,
       fileActions,
-      createNewFolder
+      mimeTypeActions,
+      createNewFolder,
+      mimetypesAllowedForCreation
     }
   },
   data: () => ({
@@ -302,14 +328,6 @@ export default defineComponent({
     hideButtonLabels() {
       return this.limitedScreenSpace && this.showPasteHereButton
     },
-    mimetypesAllowedForCreation() {
-      // we can't use `mapGetters` here because the External app doesn't exist in all deployments
-      const mimeTypes = this.$store.getters['External/mimeTypes']
-      if (!mimeTypes) {
-        return []
-      }
-      return mimeTypes.filter((mimetype) => mimetype.allow_creation) || []
-    },
 
     showActions() {
       return !(this.uploadOrFileCreationBlocked && this.isPublicLocation)
@@ -417,251 +435,6 @@ export default defineComponent({
       }
     },
 
-    showCreateResourceModal(
-      isFolder = true,
-      ext = 'txt',
-      openAction = null,
-      addAppProviderFile = false
-    ) {
-      const checkInputValue = (value) => {
-        this.setModalInputErrorMessage(
-          isFolder
-            ? this.checkNewFolderName(value)
-            : this.checkNewFileName(this.areFileExtensionsShown ? value : `${value}.${ext}`)
-        )
-      }
-      let defaultName = isFolder
-        ? this.$gettext('New folder')
-        : this.$gettext('New file') + `.${ext}`
-
-      if (this.files.some((f) => f.name === defaultName)) {
-        defaultName = resolveFileNameDuplicate(defaultName, isFolder ? '' : ext, this.files)
-      }
-
-      if (!this.areFileExtensionsShown) {
-        defaultName = extractNameWithoutExtension({ name: defaultName, extension: ext } as any)
-      }
-
-      // Sets action to be executed after creation of the file
-      if (!isFolder) {
-        this.newFileAction = openAction
-      }
-
-      const inputSelectionRange =
-        isFolder || !this.areFileExtensionsShown ? null : [0, defaultName.length - (ext.length + 1)]
-
-      const modal = {
-        variation: 'passive',
-        title: isFolder ? this.$gettext('Create a new folder') : this.$gettext('Create a new file'),
-        cancelText: this.$gettext('Cancel'),
-        confirmText: this.$gettext('Create'),
-        hasInput: true,
-        inputValue: defaultName,
-        inputLabel: isFolder ? this.$gettext('Folder name') : this.$gettext('File name'),
-        inputError: isFolder
-          ? this.checkNewFolderName(defaultName)
-          : this.checkNewFileName(
-              this.areFileExtensionsShown ? defaultName : `${defaultName}.${ext}`
-            ),
-        inputSelectionRange,
-        onCancel: this.hideModal,
-        onConfirm: isFolder
-          ? this.addNewFolder
-          : addAppProviderFile
-          ? this.addAppProviderFile
-          : (fileName) => {
-              if (!this.areFileExtensionsShown) {
-                fileName = `${fileName}.${ext}`
-              }
-              this.addNewFile(fileName)
-            },
-        onInput: checkInputValue
-      }
-
-      this.createModal(modal)
-    },
-
-    async addNewFolder(folderName) {
-      folderName = folderName.trimEnd()
-
-      try {
-        const path = join(this.item, folderName)
-        const resource = await (this.$clientService.webdav as WebDAV).createFolder(this.space, {
-          path
-        })
-
-        if (this.loadIndicatorsForNewFile) {
-          resource.indicators = getIndicators({ resource, ancestorMetaData: this.ancestorMetaData })
-        }
-
-        this.UPSERT_RESOURCE(resource)
-        this.hideModal()
-
-        this.showMessage({
-          title: this.$gettextInterpolate(
-            this.$gettext('"%{folderName}" was created successfully'),
-            {
-              folderName
-            }
-          )
-        })
-      } catch (error) {
-        console.error(error)
-        this.showMessage({
-          title: this.$gettext('Failed to create folder'),
-          status: 'danger'
-        })
-      }
-    },
-
-    checkNewFolderName(folderName) {
-      if (folderName.trim() === '') {
-        return this.$gettext('Folder name cannot be empty')
-      }
-
-      if (/[/]/.test(folderName)) {
-        return this.$gettext('Folder name cannot contain "/"')
-      }
-
-      if (folderName === '.') {
-        return this.$gettext('Folder name cannot be equal to "."')
-      }
-
-      if (folderName === '..') {
-        return this.$gettext('Folder name cannot be equal to ".."')
-      }
-
-      const exists = this.files.find((file) => file.name === folderName)
-
-      if (exists) {
-        const translated = this.$gettext('%{name} already exists')
-        return this.$gettextInterpolate(translated, { name: folderName }, true)
-      }
-
-      return null
-    },
-
-    async addNewFile(fileName) {
-      if (fileName === '') {
-        return
-      }
-
-      try {
-        const path = join(this.item, fileName)
-        const resource = await (this.$clientService.webdav as WebDAV).putFileContents(this.space, {
-          path
-        })
-
-        if (this.loadIndicatorsForNewFile) {
-          resource.indicators = getIndicators({ resource, ancestorMetaData: this.ancestorMetaData })
-        }
-
-        this.UPSERT_RESOURCE(resource)
-
-        if (this.newFileAction) {
-          this.openEditor(
-            this.newFileAction,
-            this.space.getDriveAliasAndItem(resource),
-            resource.webDavPath,
-            resource.fileId,
-            EDITOR_MODE_CREATE
-          )
-          this.hideModal()
-
-          return
-        }
-
-        this.hideModal()
-        this.showMessage({
-          title: this.$gettextInterpolate(this.$gettext('"%{fileName}" was created successfully'), {
-            fileName
-          })
-        })
-      } catch (error) {
-        console.error(error)
-        this.showMessage({
-          title: this.$gettext('Failed to create file'),
-          status: 'danger'
-        })
-      }
-    },
-    async addAppProviderFile(fileName) {
-      // FIXME: this belongs in web-app-external, but the app provider handles file creation differently than other editor extensions. Needs more refactoring.
-      if (fileName === '') {
-        return
-      }
-      try {
-        const baseUrl = urlJoin(
-          configurationManager.serverUrl,
-          this.capabilities.files.app_providers[0].new_url
-        )
-        const query = stringify({
-          parent_container_id: this.currentFolder.fileId,
-          filename: fileName
-        })
-        const url = `${baseUrl}?${query}`
-        const response = await this.makeRequest('POST', url)
-
-        if (response.status !== 200) {
-          throw new Error(`An error has occurred: ${response.status}`)
-        }
-
-        const path = join(this.item, fileName) || ''
-        const resource = await (this.$clientService.webdav as WebDAV).getFileInfo(this.space, {
-          path
-        })
-
-        if (this.loadIndicatorsForNewFile) {
-          resource.indicators = getIndicators({ resource, ancestorMetaData: this.ancestorMetaData })
-        }
-
-        this.triggerDefaultAction({ space: this.space, resources: [resource] })
-        this.UPSERT_RESOURCE(resource)
-        this.hideModal()
-        this.showMessage({
-          title: this.$gettextInterpolate(this.$gettext('"%{fileName}" was created successfully'), {
-            fileName
-          })
-        })
-      } catch (error) {
-        console.error(error)
-        this.showMessage({
-          title: this.$gettext('Failed to create file'),
-          status: 'danger'
-        })
-      }
-    },
-    checkNewFileName(fileName) {
-      if (fileName === '') {
-        return this.$gettext('File name cannot be empty')
-      }
-
-      if (/[/]/.test(fileName)) {
-        return this.$gettext('File name cannot contain "/"')
-      }
-
-      if (fileName === '.') {
-        return this.$gettext('File name cannot be equal to "."')
-      }
-
-      if (fileName === '..') {
-        return this.$gettext('File name cannot be equal to ".."')
-      }
-
-      if (/\s+$/.test(fileName)) {
-        return this.$gettext('File name cannot end with whitespace')
-      }
-
-      const exists = this.files.find((file) => file.name === fileName)
-
-      if (exists) {
-        const translated = this.$gettext('%{name} already exists')
-        return this.$gettextInterpolate(translated, { name: fileName }, true)
-      }
-
-      return null
-    },
-
     onFilesSelected(filesToUpload: File[]) {
       const uploader = new ResourcesUpload(
         filesToUpload,

From 69423d36693b8d4e7be1b6a98581bbfb21c0b047 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Thu, 27 Apr 2023 15:41:51 +0200
Subject: [PATCH 07/26] Reimplement addAppProviderFileFunc

---
 .../files/useFileActionsCreateNewFile.ts      | 51 +++++++++++++++++--
 1 file changed, 48 insertions(+), 3 deletions(-)

diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
index 8589dc54d72..5091ecc892a 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
@@ -1,7 +1,7 @@
 import { Resource, extractNameWithoutExtension } from 'web-client/src/helpers'
 import { Store } from 'vuex'
 import { computed, ref, unref } from 'vue'
-import { useClientService, useRouter, useStore } from 'web-pkg/src/composables'
+import { useClientService, useRequest, useRouter, useStore } from 'web-pkg/src/composables'
 import { FileAction } from 'web-pkg/src/composables/actions'
 import { useGettext } from 'vue3-gettext'
 import { resolveFileNameDuplicate } from 'web-app-files/src/helpers/resource'
@@ -10,6 +10,9 @@ import { WebDAV } from 'web-client/src/webdav'
 import { isLocationSpacesActive } from 'web-app-files/src/router'
 import { getIndicators } from 'web-app-files/src/helpers/statusIndicators'
 import { EDITOR_MODE_CREATE, useFileActions } from './useFileActions'
+import { urlJoin } from 'web-client/src/utils'
+import { configurationManager } from 'web-pkg/src'
+import { stringify } from 'querystring'
 
 export const useFileActionsCreateNewFile = ({
   store,
@@ -25,8 +28,9 @@ export const useFileActionsCreateNewFile = ({
   store = store || useStore()
   const router = useRouter()
   const { $gettext } = useGettext()
+  const { makeRequest } = useRequest()
 
-  const { openEditor } = useFileActions()
+  const { openEditor, triggerDefaultAction } = useFileActions()
   const clientService = useClientService()
   const currentFolder = computed((): Resource => store.getters['Files/currentFolder'])
   const files = computed((): Array<Resource> => store.getters['Files/files'])
@@ -40,6 +44,8 @@ export const useFileActionsCreateNewFile = ({
   )
   const newFileAction = ref(null)
 
+  const capabilities = computed(() => store.getters['capabilities'])
+
   const checkNewFileName = (fileName) => {
     if (fileName === '') {
       return $gettext('File name cannot be empty')
@@ -71,7 +77,46 @@ export const useFileActionsCreateNewFile = ({
     return null
   }
 
-  const addAppProviderFileFunc = async (fileName) => {}
+  const addAppProviderFileFunc = async (fileName) => {
+    // FIXME: this belongs in web-app-external, but the app provider handles file creation differently than other editor extensions. Needs more refactoring.
+    if (fileName === '') {
+      return
+    }
+    try {
+      const baseUrl = urlJoin(
+        configurationManager.serverUrl,
+        unref(capabilities).files.app_providers[0].new_url
+      )
+      const query = stringify({
+        parent_container_id: unref(currentFolder).fileId,
+        filename: fileName
+      })
+      const url = `${baseUrl}?${query}`
+      const response = await makeRequest('POST', url)
+      if (response.status !== 200) {
+        throw new Error(`An error has occurred: ${response.status}`)
+      }
+      const path = join(unref(currentFolder).path, fileName) || ''
+      const resource = await (clientService.webdav as WebDAV).getFileInfo(unref(currentSpace), {
+        path
+      })
+      if (unref(loadIndicatorsForNewFile)) {
+        resource.indicators = getIndicators({ resource, ancestorMetaData: unref(ancestorMetaData) })
+      }
+      triggerDefaultAction({ space: unref(currentSpace), resources: [resource] })
+      store.commit('Files/UPSERT_RESOURCE', resource)
+      store.dispatch('hideModal')
+      store.dispatch('showMessage', {
+        title: $gettext('"%{fileName}" was created successfully', { fileName })
+      })
+    } catch (error) {
+      console.error(error)
+      store.dispatch('showMessage', {
+        title: $gettext('Failed to create file'),
+        status: 'danger'
+      })
+    }
+  }
 
   const loadIndicatorsForNewFile = computed(() => {
     return (

From 55b9d7d3570f423f3d91e0406f01de1cf991567e Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Thu, 27 Apr 2023 15:42:53 +0200
Subject: [PATCH 08/26] Fix import

---
 .../composables/actions/files/useFileActionsCreateNewFile.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
index 5091ecc892a..81b4c78448f 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
@@ -12,7 +12,7 @@ import { getIndicators } from 'web-app-files/src/helpers/statusIndicators'
 import { EDITOR_MODE_CREATE, useFileActions } from './useFileActions'
 import { urlJoin } from 'web-client/src/utils'
 import { configurationManager } from 'web-pkg/src'
-import { stringify } from 'querystring'
+import { stringify } from 'qs'
 
 export const useFileActionsCreateNewFile = ({
   store,

From 07d5bf7d655e13b30540b3cb9fa8c53d1baadb05 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Thu, 27 Apr 2023 15:56:02 +0200
Subject: [PATCH 09/26] Make linter happy

---
 .../src/components/AppBar/CreateAndUpload.vue        | 12 +++---------
 .../src/components/FilesList/ContextActions.vue      |  4 +---
 .../SideBar/Shares/Links/CreateQuickLink.vue         |  3 ++-
 .../actions/files/useFileActionsCreateNewFile.ts     | 12 ++++++------
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
index 2787011cc44..f44086c73dd 100644
--- a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
@@ -136,9 +136,8 @@
 
 <script lang="ts">
 import { mapActions, mapGetters, mapMutations, mapState } from 'vuex'
-import { join } from 'path'
 
-import { useFileActions, EDITOR_MODE_CREATE } from '../../composables/actions/files/useFileActions'
+import { useFileActions } from '../../composables/actions/files/useFileActions'
 import { isLocationPublicActive, isLocationSpacesActive } from '../../router'
 import {
   useActiveLocation,
@@ -170,15 +169,10 @@ import {
 import { useUpload } from 'web-runtime/src/composables/upload'
 import { useUploadHelpers } from '../../composables/upload'
 import { eventBus } from 'web-pkg/src/services/eventBus'
-import { extractNameWithoutExtension, Resource, SpaceResource } from 'web-client/src/helpers'
-import { resolveFileNameDuplicate, ResourcesUpload } from '../../helpers/resource'
-import { WebDAV } from 'web-client/src/webdav'
-import { configurationManager } from 'web-pkg/src/configuration'
-import { urlJoin } from 'web-client/src/utils'
-import { stringify } from 'qs'
+import { Resource, SpaceResource } from 'web-client/src/helpers'
+import { ResourcesUpload } from '../../helpers/resource'
 import { useService } from 'web-pkg/src/composables/service'
 import { UppyService } from 'web-runtime/src/services/uppyService'
-import { getIndicators } from 'web-app-files/src/helpers/statusIndicators'
 import { useGettext } from 'vue3-gettext'
 
 export default defineComponent({
diff --git a/packages/web-app-files/src/components/FilesList/ContextActions.vue b/packages/web-app-files/src/components/FilesList/ContextActions.vue
index 6f934e0d1f5..0e72e1ac978 100644
--- a/packages/web-app-files/src/components/FilesList/ContextActions.vue
+++ b/packages/web-app-files/src/components/FilesList/ContextActions.vue
@@ -31,9 +31,7 @@ import {
   useFileActionsShowEditTags,
   useFileActionsNavigate,
   useFileActionsFavorite,
-  useFileActionsCreateSpaceFromResource,
-  useFileActionsCreateNewFolder,
-  useFileActionsCreateNewFile
+  useFileActionsCreateSpaceFromResource
 } from '../../composables/actions/files'
 import { FileActionOptions } from 'web-pkg/src/composables/actions'
 
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Links/CreateQuickLink.vue b/packages/web-app-files/src/components/SideBar/Shares/Links/CreateQuickLink.vue
index fa7fc42c3a5..5adee0482a0 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Links/CreateQuickLink.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Links/CreateQuickLink.vue
@@ -13,9 +13,10 @@
         />
       </div>
       <oc-button
+        v-oc-tooltip="$gettext('Create link')"
         class="oc-ml-s"
         size="small"
-        v-oc-tooltip="$gettext('Create link')"
+        appearance="raw"
         :aria-label="$gettext('Create link')"
         @click="createQuickLink"
       >
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
index 81b4c78448f..69fff08a250 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
@@ -136,7 +136,7 @@ export const useFileActionsCreateNewFile = ({
         path
       })
 
-      if (loadIndicatorsForNewFile) {
+      if (loadIndicatorsForNewFile.value) {
         resource.indicators = getIndicators({ resource, ancestorMetaData: unref(ancestorMetaData) })
       }
 
@@ -172,7 +172,7 @@ export const useFileActionsCreateNewFile = ({
     const checkInputValue = (value) => {
       store.dispatch(
         'setModalInputErrorMessage',
-        checkNewFileName(areFileExtensionsShown ? value : `${value}.${extension}`)
+        checkNewFileName(areFileExtensionsShown.value ? value : `${value}.${extension}`)
       )
     }
     let defaultName = $gettext('New file') + `.${extension}`
@@ -181,14 +181,14 @@ export const useFileActionsCreateNewFile = ({
       defaultName = resolveFileNameDuplicate(defaultName, extension, unref(files))
     }
 
-    if (!areFileExtensionsShown) {
+    if (!areFileExtensionsShown.value) {
       defaultName = extractNameWithoutExtension({ name: defaultName, extension } as any)
     }
 
     // Sets action to be executed after creation of the file
     newFileAction.value = openAction
 
-    const inputSelectionRange = !areFileExtensionsShown
+    const inputSelectionRange = !areFileExtensionsShown.value
       ? null
       : [0, defaultName.length - (extension.length + 1)]
 
@@ -201,14 +201,14 @@ export const useFileActionsCreateNewFile = ({
       inputValue: defaultName,
       inputLabel: $gettext('File name'),
       inputError: checkNewFileName(
-        areFileExtensionsShown ? defaultName : `${defaultName}.${extension}`
+        areFileExtensionsShown.value ? defaultName : `${defaultName}.${extension}`
       ),
       inputSelectionRange,
       onCancel: () => store.dispatch('hideModal'),
       onConfirm: addAppProviderFile
         ? addAppProviderFileFunc
         : (fileName) => {
-            if (!areFileExtensionsShown) {
+            if (!areFileExtensionsShown.value) {
               fileName = `${fileName}.${extension}`
             }
             addNewFile(fileName)

From a7282a306af77f37d4fe0881cf7fb14fb199ffbe Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Thu, 27 Apr 2023 16:34:14 +0200
Subject: [PATCH 10/26] PoC: let CreateNewFile composable accumulate available
 actions

---
 .../src/components/AppBar/CreateAndUpload.vue | 49 ++++++---------
 .../files/useFileActionsCreateNewFile.ts      | 59 +++++++++++--------
 .../web-pkg/src/composables/actions/types.ts  |  1 +
 3 files changed, 53 insertions(+), 56 deletions(-)

diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
index f44086c73dd..27c4df69829 100644
--- a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
@@ -41,7 +41,7 @@
               @click="fileAction.handler"
             >
               <oc-resource-icon :resource="getIconResource(fileAction)" size="medium" />
-              <span>{{ fileAction.title }}</span>
+              <span>{{ fileAction.label() }}</span>
             </oc-button>
           </li>
           <template v-if="mimetypesAllowedForCreation">
@@ -163,8 +163,7 @@ import {
   onBeforeUnmount,
   PropType,
   unref,
-  watch,
-  ref
+  watch
 } from 'vue'
 import { useUpload } from 'web-runtime/src/composables/upload'
 import { useUploadHelpers } from '../../composables/upload'
@@ -213,19 +212,13 @@ export default defineComponent({
 
     // use all new file handler actions
     const newFileHandlers = store.getters['newFileHandlers']
-    const fileActions = ref([])
-    unref(newFileHandlers).forEach((element) => {
-      const { actions } = useFileActionsCreateNewFile({
-        store,
-        openAction: element.action,
-        addAppProviderFile: false,
-        extension: element.ext
-      })
-      fileActions.value.push({
-        handler: unref(actions)[0].handler,
-        ext: element.ext,
-        title: element.menuTitle($gettext)
-      })
+
+    const { actions: createNewFileActions } = useFileActionsCreateNewFile({
+      store,
+      newFileHandlers
+    })
+    const fileActions = computed(() => {
+      return unref(createNewFileActions)
     })
 
     const mimetypesAllowedForCreation = computed(() => {
@@ -236,21 +229,17 @@ export default defineComponent({
       }
       return mimeTypes.filter((mimetype) => mimetype.allow_creation) || []
     })
-    // use all mime type handler actions
-    const mimeTypeActions = ref([])
-    unref(mimetypesAllowedForCreation).forEach((element) => {
-      const { actions } = useFileActionsCreateNewFile({
-        store,
-        openAction: false,
-        addAppProviderFile: true,
-        extension: element.ext
-      })
-      mimeTypeActions.value.push({
-        handler: unref(actions)[0].handler,
-        ext: element.ext,
-        name: element.name
-      })
+
+    // FIXME: Same like above, need to add mimetypesAllowedForCreation
+    // const { actions: mimeTypeFileActions } = useFileActionsCreateNewFile({
+    //   store,
+    //   mimetypesAllowedForCreation
+    // })
+    const mimeTypeActions = computed(() => {
+      return []
+      // return unref(mimeTypeFileActions)
     })
+
     const currentFolder = computed(() => {
       return store.getters['Files/currentFolder']
     })
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
index 69fff08a250..367ff756ef1 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
@@ -1,8 +1,8 @@
 import { Resource, extractNameWithoutExtension } from 'web-client/src/helpers'
 import { Store } from 'vuex'
-import { computed, ref, unref } from 'vue'
+import { computed, unref } from 'vue'
 import { useClientService, useRequest, useRouter, useStore } from 'web-pkg/src/composables'
-import { FileAction } from 'web-pkg/src/composables/actions'
+import { FileAction, FileActionOptions } from 'web-pkg/src/composables/actions'
 import { useGettext } from 'vue3-gettext'
 import { resolveFileNameDuplicate } from 'web-app-files/src/helpers/resource'
 import { join } from 'path'
@@ -16,14 +16,12 @@ import { stringify } from 'qs'
 
 export const useFileActionsCreateNewFile = ({
   store,
-  openAction,
-  addAppProviderFile,
-  extension
+  newFileHandlers,
+  mimetypesAllowedForCreation
 }: {
   store?: Store<any>
-  openAction?: any
-  addAppProviderFile?: boolean
-  extension?: string
+  newFileHandlers?: any // FIXME: type?
+  mimetypesAllowedForCreation?: any // FIXME: type?
 } = {}) => {
   store = store || useStore()
   const router = useRouter()
@@ -42,7 +40,6 @@ export const useFileActionsCreateNewFile = ({
   const currentSpace = computed(() =>
     store.getters['runtime/spaces/spaces'].find((space) => space.id === unref(storageId))
   )
-  const newFileAction = ref(null)
 
   const capabilities = computed(() => store.getters['capabilities'])
 
@@ -125,7 +122,7 @@ export const useFileActionsCreateNewFile = ({
     )
   })
 
-  const addNewFile = async (fileName) => {
+  const addNewFile = async (fileName, openAction) => {
     if (fileName === '') {
       return
     }
@@ -142,9 +139,9 @@ export const useFileActionsCreateNewFile = ({
 
       store.commit('Files/UPSERT_RESOURCE', resource)
 
-      if (unref(newFileAction)) {
+      if (openAction) {
         openEditor(
-          unref(newFileAction),
+          openAction,
           unref(currentSpace).getDriveAliasAndItem(resource),
           resource.webDavPath,
           resource.fileId,
@@ -168,7 +165,12 @@ export const useFileActionsCreateNewFile = ({
     }
   }
 
-  const handler = () => {
+  const handler = (
+    fileActionOptions: FileActionOptions,
+    extension: string,
+    addAppProviderFile: boolean,
+    openAction: any // FIXME: type?
+  ) => {
     const checkInputValue = (value) => {
       store.dispatch(
         'setModalInputErrorMessage',
@@ -185,9 +187,6 @@ export const useFileActionsCreateNewFile = ({
       defaultName = extractNameWithoutExtension({ name: defaultName, extension } as any)
     }
 
-    // Sets action to be executed after creation of the file
-    newFileAction.value = openAction
-
     const inputSelectionRange = !areFileExtensionsShown.value
       ? null
       : [0, defaultName.length - (extension.length + 1)]
@@ -211,7 +210,7 @@ export const useFileActionsCreateNewFile = ({
             if (!areFileExtensionsShown.value) {
               fileName = `${fileName}.${extension}`
             }
-            addNewFile(fileName)
+            addNewFile(fileName, openAction)
           },
       onInput: checkInputValue
     }
@@ -220,22 +219,30 @@ export const useFileActionsCreateNewFile = ({
   }
 
   const actions = computed((): FileAction[] => {
-    return [
-      {
+    const actions = []
+    for (const newFileHandler of newFileHandlers) {
+      const addAppProviderFile = false
+      const openAction = newFileHandler.action
+      console.log(newFileHandler)
+
+      actions.push({
         name: 'create-new-file',
         icon: 'add',
-        handler,
-        label: () => {
-          return $gettext('Create new File')
-        },
+        handler: (args) => handler(args, newFileHandler.ext, addAppProviderFile, openAction),
+        label: () => newFileHandler.menuTitle($gettext),
         isEnabled: ({ resources }) => {
           return true
         },
         canBeDefault: true,
         componentType: 'button',
-        class: 'oc-files-actions-create-new-file'
-      }
-    ]
+        class: 'oc-files-actions-create-new-file',
+        ext: newFileHandler.ext
+      })
+    }
+
+    // TODO: Same for mimetypesAllowedForCreation
+
+    return actions
   })
 
   return {
diff --git a/packages/web-pkg/src/composables/actions/types.ts b/packages/web-pkg/src/composables/actions/types.ts
index d6618c5efa4..1ed0719dc3d 100644
--- a/packages/web-pkg/src/composables/actions/types.ts
+++ b/packages/web-pkg/src/composables/actions/types.ts
@@ -16,6 +16,7 @@ export interface Action<T = ActionOptions> {
   shortcut?: string
   keepOpen?: boolean
   opensInNewWindow?: boolean
+  ext?: string
 
   label(options?: T): string
   isEnabled(options?: T): boolean

From 74f41741f2b78fdd53aa3f512e5c3560d96ff885 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Fri, 28 Apr 2023 10:41:36 +0200
Subject: [PATCH 11/26] Address PR issues

---
 .../src/components/AppBar/CreateAndUpload.vue | 35 ++++++++++---------
 .../files/useFileActionsCreateNewFile.ts      | 24 ++++++++++---
 2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
index 27c4df69829..c434201bb37 100644
--- a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
@@ -25,7 +25,7 @@
       >
         <oc-list id="create-list">
           <li class="create-list-folder oc-menu-item-hover">
-            <oc-button id="new-folder-btn" appearance="raw" @click="createNewFolder[0].handler">
+            <oc-button id="new-folder-btn" appearance="raw" @click="createNewFolderAction">
               <oc-resource-icon :resource="folderIconResource" size="medium" />
               <span v-text="$gettext('Folder')" />
             </oc-button>
@@ -53,7 +53,9 @@
               <oc-button appearance="raw" @click="mimeTypeAction.handler">
                 <oc-resource-icon :resource="getIconResource(mimeTypeAction)" size="medium" />
                 <span
-                  v-text="$gettextInterpolate($gettext('%{name}'), { name: mimeTypeAction.name })"
+                  v-text="
+                    $gettextInterpolate($gettext('%{name}'), { name: mimeTypeAction.label() })
+                  "
                 />
               </oc-button>
             </li>
@@ -70,7 +72,7 @@
           variation="primary"
           :aria-label="newButtonAriaLabel"
           :disabled="uploadOrFileCreationBlocked"
-          @click="createNewFolder[0].handler"
+          @click="createNewFolderAction"
         >
           <oc-icon name="resource-type-folder" />
           <span v-if="!hideButtonLabels" v-text="$gettext('New Folder')" />
@@ -205,24 +207,25 @@ export default defineComponent({
     const clientService = useClientService()
     const store = useStore()
     const { $gettext } = useGettext()
-    const { actions: createNewFolder } = useFileActionsCreateNewFolder({ store })
 
     let filesSelectedSub
     let uploadCompletedSub
 
-    // use all new file handler actions
-    const newFileHandlers = store.getters['newFileHandlers']
+    const { actions: createNewFolder } = useFileActionsCreateNewFolder({ store })
+    const createNewFolderAction = computed(() => unref(createNewFolder)[0].handler)
+
+    const newFileHandlers = computed(() => store.getters.newFileHandlers)
 
     const { actions: createNewFileActions } = useFileActionsCreateNewFile({
       store,
-      newFileHandlers
+      newFileHandlers: unref(newFileHandlers)
     })
+
     const fileActions = computed(() => {
       return unref(createNewFileActions)
     })
 
     const mimetypesAllowedForCreation = computed(() => {
-      // we can't use `mapGetters` here because the External app doesn't exist in all deployments
       const mimeTypes = store.getters['External/mimeTypes']
       if (!mimeTypes) {
         return []
@@ -230,14 +233,13 @@ export default defineComponent({
       return mimeTypes.filter((mimetype) => mimetype.allow_creation) || []
     })
 
-    // FIXME: Same like above, need to add mimetypesAllowedForCreation
-    // const { actions: mimeTypeFileActions } = useFileActionsCreateNewFile({
-    //   store,
-    //   mimetypesAllowedForCreation
-    // })
+    const { actions: createNewFileMimeTypeActions } = useFileActionsCreateNewFile({
+      store,
+      mimetypesAllowedForCreation: unref(mimetypesAllowedForCreation)
+    })
+
     const mimeTypeActions = computed(() => {
-      return []
-      // return unref(mimeTypeFileActions)
+      return unref(createNewFileMimeTypeActions)
     })
 
     const currentFolder = computed(() => {
@@ -293,7 +295,8 @@ export default defineComponent({
       fileActions,
       mimeTypeActions,
       createNewFolder,
-      mimetypesAllowedForCreation
+      mimetypesAllowedForCreation,
+      createNewFolderAction
     }
   },
   data: () => ({
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
index 367ff756ef1..03e0cae9ee8 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
@@ -220,11 +220,9 @@ export const useFileActionsCreateNewFile = ({
 
   const actions = computed((): FileAction[] => {
     const actions = []
-    for (const newFileHandler of newFileHandlers) {
+    for (const newFileHandler of newFileHandlers || []) {
       const addAppProviderFile = false
       const openAction = newFileHandler.action
-      console.log(newFileHandler)
-
       actions.push({
         name: 'create-new-file',
         icon: 'add',
@@ -239,8 +237,24 @@ export const useFileActionsCreateNewFile = ({
         ext: newFileHandler.ext
       })
     }
-
-    // TODO: Same for mimetypesAllowedForCreation
+    console.log('mimetypesAllowedForCreation', mimetypesAllowedForCreation)
+    for (const mimeType of mimetypesAllowedForCreation || []) {
+      const openAction = false
+      const addAppProviderFile = true
+      actions.push({
+        name: 'create-new-file',
+        icon: 'add',
+        handler: (args) => handler(args, mimeType.ext, addAppProviderFile, openAction),
+        label: () => mimeType.name,
+        isEnabled: ({ resources }) => {
+          return true
+        },
+        canBeDefault: true,
+        componentType: 'button',
+        class: 'oc-files-actions-create-new-file',
+        ext: mimeType.ext
+      })
+    }
 
     return actions
   })

From e3755626ab051b8e226beb25fb300a721c03296c Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Fri, 28 Apr 2023 11:15:28 +0200
Subject: [PATCH 12/26] remove dev leftover

---
 .../src/composables/actions/files/useFileActionsCreateNewFile.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
index 03e0cae9ee8..b9b05b89aae 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
@@ -237,7 +237,6 @@ export const useFileActionsCreateNewFile = ({
         ext: newFileHandler.ext
       })
     }
-    console.log('mimetypesAllowedForCreation', mimetypesAllowedForCreation)
     for (const mimeType of mimetypesAllowedForCreation || []) {
       const openAction = false
       const addAppProviderFile = true

From ad4b4bb2fc972affa27c0c193df1c5db5ff8e584 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Fri, 28 Apr 2023 11:30:57 +0200
Subject: [PATCH 13/26] Add basic tests for file/folder name validation

---
 .../files/useFileActionsCreateNewFile.ts      |  3 +-
 .../files/useFileActionsCreateNewFolder.ts    |  3 +-
 .../files/useFileActionsCreateNewFile.spec.ts | 45 +++++++++++++++++++
 .../useFileActionsCreateNewFolder.spec.ts     | 45 +++++++++++++++++++
 4 files changed, 94 insertions(+), 2 deletions(-)
 create mode 100644 packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
 create mode 100644 packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts

diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
index b9b05b89aae..8173d4b766f 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
@@ -259,6 +259,7 @@ export const useFileActionsCreateNewFile = ({
   })
 
   return {
-    actions
+    actions,
+    checkNewFileName
   }
 }
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
index b4e9a24b6df..a3a0855ad4c 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
@@ -137,6 +137,7 @@ export const useFileActionsCreateNewFolder = ({ store }: { store?: Store<any> }
   })
 
   return {
-    actions
+    actions,
+    checkNewFolderName
   }
 }
diff --git a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
new file mode 100644
index 00000000000..4d6b214c482
--- /dev/null
+++ b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
@@ -0,0 +1,45 @@
+import { useFileActionsCreateNewFile } from 'web-app-files/src/composables'
+
+describe('useFileActionsCreateNewFile', () => {
+  describe('checkNewFileName', () => {
+    it('returns error message if file name is empty', () => {
+      const { checkNewFileName } = useFileActionsCreateNewFile()
+
+      const result = checkNewFileName('')
+
+      expect(result).toBe('File name cannot be empty')
+    })
+
+    it('returns error message if file name contains "/"', () => {
+      const { checkNewFileName } = useFileActionsCreateNewFile()
+
+      const result = checkNewFileName('file/name')
+
+      expect(result).toBe('File name cannot contain "/"')
+    })
+
+    it('returns error message if file name is equal to "."', () => {
+      const { checkNewFileName } = useFileActionsCreateNewFile()
+
+      const result = checkNewFileName('.')
+
+      expect(result).toBe('File name cannot be equal to "."')
+    })
+
+    it('returns error message if file name is equal to ".."', () => {
+      const { checkNewFileName } = useFileActionsCreateNewFile()
+
+      const result = checkNewFileName('..')
+
+      expect(result).toBe('File name cannot be equal to ".."')
+    })
+
+    it('returns error message if file name ends with whitespace', () => {
+      const { checkNewFileName } = useFileActionsCreateNewFile()
+
+      const result = checkNewFileName('file name ')
+
+      expect(result).toBe('File name cannot end with whitespace')
+    })
+  })
+})
diff --git a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts
new file mode 100644
index 00000000000..ea04fdb1fcc
--- /dev/null
+++ b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts
@@ -0,0 +1,45 @@
+import { useFileActionsCreateNewFolder } from 'web-app-files/src/composables'
+
+describe('useFileActionsCreateNewFolder', () => {
+  describe('checkNewFileName', () => {
+    it('returns error message if file name is empty', () => {
+      const { checkNewFolderName } = useFileActionsCreateNewFolder()
+
+      const result = checkNewFolderName('')
+
+      expect(result).toBe('File name cannot be empty')
+    })
+
+    it('returns error message if file name contains "/"', () => {
+      const { checkNewFolderName } = useFileActionsCreateNewFolder()
+
+      const result = checkNewFolderName('file/name')
+
+      expect(result).toBe('File name cannot contain "/"')
+    })
+
+    it('returns error message if file name is equal to "."', () => {
+      const { checkNewFolderName } = useFileActionsCreateNewFolder()
+
+      const result = checkNewFolderName('.')
+
+      expect(result).toBe('File name cannot be equal to "."')
+    })
+
+    it('returns error message if file name is equal to ".."', () => {
+      const { checkNewFolderName } = useFileActionsCreateNewFolder()
+
+      const result = checkNewFolderName('..')
+
+      expect(result).toBe('File name cannot be equal to ".."')
+    })
+
+    it('returns error message if file name ends with whitespace', () => {
+      const { checkNewFolderName } = useFileActionsCreateNewFolder()
+
+      const result = checkNewFolderName('file name ')
+
+      expect(result).toBe('File name cannot end with whitespace')
+    })
+  })
+})

From cdfe227c93e71de3ebcc7a212a0ab8564d6effc6 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Fri, 28 Apr 2023 11:41:14 +0200
Subject: [PATCH 14/26] Remove old CreateAndUpload.spec unittests

---
 .../components/AppBar/CreateAndUpload.spec.ts | 101 ------------------
 1 file changed, 101 deletions(-)

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 bb3211496cf..8be4c75e19c 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
@@ -106,29 +106,6 @@ describe('CreateAndUpload component', () => {
       expect(storeOptions.modules.Files.actions.clearClipboardFiles).toHaveBeenCalled()
     })
   })
-  describe('button triggers', () => {
-    it('should create a modal if "New folder" button is clicked', async () => {
-      const { wrapper } = getWrapper()
-      const createModalSpy = jest.spyOn(wrapper.vm, 'createModal')
-      await wrapper.find(elSelector.newFolderBtn).trigger('click')
-      expect(createModalSpy).toHaveBeenCalled()
-    })
-    it.each(fileHandlerMocks)(
-      'should create a modal if "New file" button is clicked',
-      async (fileHandler) => {
-        const { wrapper } = getWrapper({ newFileHandlers: fileHandlerMocks })
-        const createModalSpy = jest.spyOn(wrapper.vm, 'createModal')
-        const showCreateResourceModal = jest.spyOn(wrapper.vm, 'showCreateResourceModal')
-        await wrapper.find(`.new-file-btn-${fileHandler.ext}`).trigger('click')
-        expect(createModalSpy).toHaveBeenCalled()
-        expect(showCreateResourceModal).toHaveBeenCalledWith(
-          false,
-          fileHandler.ext,
-          fileHandler.action
-        )
-      }
-    )
-  })
   describe('method "onUploadComplete"', () => {
     it.each([
       { driveType: 'personal', updated: 1 },
@@ -160,84 +137,6 @@ describe('CreateAndUpload component', () => {
       expect(eventSpy).toHaveBeenCalled()
     })
   })
-  describe('methods "addNewFolder" & "addNewFile"', () => {
-    it.each(['addNewFolder', 'addNewFile'])(
-      'updates the resource after the folder as been created successfully',
-      async (method) => {
-        const createMethod = method === 'addNewFolder' ? 'createFolder' : 'putFileContents'
-        const { wrapper, mocks, storeOptions } = getWrapper({ item: '/' })
-        mocks.$clientService.webdav[createMethod].mockResolvedValue(mockDeep<Resource>())
-        await wrapper.vm[method]('New resource')
-        expect(storeOptions.modules.Files.mutations.UPSERT_RESOURCE).toHaveBeenCalled()
-      }
-    )
-    it.each(['addNewFolder', 'addNewFile'])(
-      'shows a message when an error occurres',
-      async (method) => {
-        const createMethod = method === 'addNewFolder' ? 'createFolder' : 'putFileContents'
-        jest.spyOn(console, 'error').mockImplementation(() => undefined)
-        const { wrapper, mocks, storeOptions } = getWrapper({ item: '/' })
-        mocks.$clientService.webdav[createMethod].mockRejectedValue(new Error())
-        await wrapper.vm[method]('New resource')
-        expect(storeOptions.actions.showMessage).toHaveBeenCalled()
-      }
-    )
-    it('opens the file editor after a file has been created and a supported editor is available', async () => {
-      const { wrapper, mocks } = getWrapper({
-        newFileAction: true,
-        item: '/',
-        newFileHandlers: fileHandlerMocks
-      })
-      const openEditorSpy = jest.spyOn(wrapper.vm, 'openEditor').mockImplementation()
-      mocks.$clientService.webdav.putFileContents.mockResolvedValue(mockDeep<Resource>())
-      await wrapper.vm.addNewFile('New resource.txt')
-      expect(openEditorSpy).toHaveBeenCalled()
-    })
-  })
-  describe('methods "checkNewFolderName" & "checkNewFileName"', () => {
-    it.each([
-      { name: '', validFileName: false, validFolderName: false },
-      { name: '  ', validFileName: false, validFolderName: false },
-      { name: '/name', validFileName: false, validFolderName: false },
-      { name: '.', validFileName: false, validFolderName: false },
-      { name: '..', validFileName: false, validFolderName: false },
-      { name: 'name ', validFileName: false, validFolderName: true },
-      { name: 'name', validFileName: true, validFolderName: true }
-    ])('verifies the resource name', (data) => {
-      const { name, validFileName, validFolderName } = data
-      const { wrapper } = getWrapper()
-      const folderResult = wrapper.vm.checkNewFolderName(name)
-      expect(folderResult === null).toBe(validFolderName)
-      const fileResult = wrapper.vm.checkNewFileName(name)
-      expect(fileResult === null).toBe(validFileName)
-    })
-    it('shows error when the resource name already exists', () => {
-      const existingFile = mockDeep<Resource>({ name: 'someFile.txt' })
-      const { wrapper } = getWrapper({ files: [existingFile] })
-      const folderResult = wrapper.vm.checkNewFolderName(existingFile.name)
-      expect(folderResult).not.toBeNull()
-      const fileResult = wrapper.vm.checkNewFileName(existingFile.name)
-      expect(fileResult).not.toBeNull()
-    })
-  })
-  describe('method "addAppProviderFile"', () => {
-    it('triggers the default file action', async () => {
-      const { wrapper, mocks } = getWrapper({ item: '/' })
-      const defaultActionSpy = jest
-        .spyOn(wrapper.vm, 'triggerDefaultAction')
-        .mockImplementation(() => undefined)
-      mocks.$clientService.webdav.getFileInfo.mockResolvedValue(mockDeep<Resource>())
-      await wrapper.vm.addAppProviderFile('someFile.txt')
-      expect(defaultActionSpy).toHaveBeenCalled()
-    })
-    it('shows a message when an error occurred', async () => {
-      jest.spyOn(console, 'error').mockImplementation(() => undefined)
-      const { wrapper, mocks, storeOptions } = getWrapper({ item: '/' })
-      mocks.$clientService.webdav.getFileInfo.mockRejectedValue(new Error())
-      await wrapper.vm.addAppProviderFile('someFile.txt')
-      expect(storeOptions.actions.showMessage).toHaveBeenCalled()
-    })
-  })
   describe('drop target', () => {
     it('is being initialized when user can upload', () => {
       const { mocks } = getWrapper()

From cf78597088e5c0c79709aeab3c95699bf40511d5 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Tue, 2 May 2023 09:11:26 +0200
Subject: [PATCH 15/26] Address PR issues

---
 .../src/components/AppBar/CreateAndUpload.vue | 25 +++++--------------
 .../files/useFileActionsCreateNewFile.ts      |  6 ++---
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
index c434201bb37..b842e2849c2 100644
--- a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
@@ -31,7 +31,7 @@
             </oc-button>
           </li>
           <li
-            v-for="(fileAction, key) in fileActions"
+            v-for="(fileAction, key) in createNewFileActions"
             :key="`file-creation-item-${key}`"
             class="create-list-file oc-menu-item-hover"
           >
@@ -46,17 +46,13 @@
           </li>
           <template v-if="mimetypesAllowedForCreation">
             <li
-              v-for="(mimeTypeAction, key) in mimeTypeActions"
+              v-for="(mimeTypeAction, key) in createNewFileMimeTypeActions"
               :key="`file-creation-item-external-${key}`"
               class="create-list-file oc-menu-item-hover"
             >
               <oc-button appearance="raw" @click="mimeTypeAction.handler">
                 <oc-resource-icon :resource="getIconResource(mimeTypeAction)" size="medium" />
-                <span
-                  v-text="
-                    $gettextInterpolate($gettext('%{name}'), { name: mimeTypeAction.label() })
-                  "
-                />
+                <span v-text="$gettext(mimeTypeAction.label())" />
               </oc-button>
             </li>
           </template>
@@ -174,7 +170,6 @@ import { Resource, SpaceResource } from 'web-client/src/helpers'
 import { ResourcesUpload } from '../../helpers/resource'
 import { useService } from 'web-pkg/src/composables/service'
 import { UppyService } from 'web-runtime/src/services/uppyService'
-import { useGettext } from 'vue3-gettext'
 
 export default defineComponent({
   components: {
@@ -206,7 +201,6 @@ export default defineComponent({
     const uppyService = useService<UppyService>('$uppyService')
     const clientService = useClientService()
     const store = useStore()
-    const { $gettext } = useGettext()
 
     let filesSelectedSub
     let uploadCompletedSub
@@ -215,16 +209,13 @@ export default defineComponent({
     const createNewFolderAction = computed(() => unref(createNewFolder)[0].handler)
 
     const newFileHandlers = computed(() => store.getters.newFileHandlers)
+    console.log('newFileHandlers', newFileHandlers)
 
     const { actions: createNewFileActions } = useFileActionsCreateNewFile({
       store,
       newFileHandlers: unref(newFileHandlers)
     })
 
-    const fileActions = computed(() => {
-      return unref(createNewFileActions)
-    })
-
     const mimetypesAllowedForCreation = computed(() => {
       const mimeTypes = store.getters['External/mimeTypes']
       if (!mimeTypes) {
@@ -238,10 +229,6 @@ export default defineComponent({
       mimetypesAllowedForCreation: unref(mimetypesAllowedForCreation)
     })
 
-    const mimeTypeActions = computed(() => {
-      return unref(createNewFileMimeTypeActions)
-    })
-
     const currentFolder = computed(() => {
       return store.getters['Files/currentFolder']
     })
@@ -292,8 +279,8 @@ export default defineComponent({
       isUserContext: useUserContext({ store }),
       canUpload,
       currentFolder,
-      fileActions,
-      mimeTypeActions,
+      createNewFileActions,
+      createNewFileMimeTypeActions,
       createNewFolder,
       mimetypesAllowedForCreation,
       createNewFolderAction
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
index 8173d4b766f..e147c8b9b88 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
@@ -67,8 +67,7 @@ export const useFileActionsCreateNewFile = ({
     const exists = unref(files).find((file) => file.name === fileName)
 
     if (exists) {
-      const translated = $gettext('%{name} already exists')
-      return $gettext(translated, { name: fileName }, true)
+      return $gettext('%{name} already exists', { name: fileName }, true)
     }
 
     return null
@@ -221,12 +220,11 @@ export const useFileActionsCreateNewFile = ({
   const actions = computed((): FileAction[] => {
     const actions = []
     for (const newFileHandler of newFileHandlers || []) {
-      const addAppProviderFile = false
       const openAction = newFileHandler.action
       actions.push({
         name: 'create-new-file',
         icon: 'add',
-        handler: (args) => handler(args, newFileHandler.ext, addAppProviderFile, openAction),
+        handler: (args) => handler(args, newFileHandler.ext, !openAction, openAction),
         label: () => newFileHandler.menuTitle($gettext),
         isEnabled: ({ resources }) => {
           return true

From fa0a8cfbbab8c09f28e199a2a75b7a12322bc797 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Tue, 2 May 2023 09:16:21 +0200
Subject: [PATCH 16/26] Address PR issue

---
 .../composables/actions/files/useFileActionsCreateNewFolder.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
index a3a0855ad4c..fa29660cb63 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
@@ -45,8 +45,7 @@ export const useFileActionsCreateNewFolder = ({ store }: { store?: Store<any> }
     const exists = unref(files).find((file) => file.name === folderName)
 
     if (exists) {
-      const translated = $gettext('%{name} already exists')
-      return $gettext(translated, { name: folderName }, true)
+      return $gettext('%{name} already exists', { name: folderName }, true)
     }
 
     return null

From c92da28fc8dfdff7efd939b897405801a0ac4f76 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Tue, 2 May 2023 13:59:35 +0200
Subject: [PATCH 17/26] Implement working unittests for
 useFileActionsCreateNewFolder.spec.ts

---
 .../files/useFileActionsCreateNewFolder.ts    |   3 +-
 .../files/useFileActionsCreateNewFile.spec.ts |  45 -----
 .../useFileActionsCreateNewFolder.spec.ts     | 161 ++++++++++++++----
 3 files changed, 127 insertions(+), 82 deletions(-)

diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
index fa29660cb63..6815dde9f18 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
@@ -137,6 +137,7 @@ export const useFileActionsCreateNewFolder = ({ store }: { store?: Store<any> }
 
   return {
     actions,
-    checkNewFolderName
+    checkNewFolderName,
+    addNewFolder
   }
 }
diff --git a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
index 4d6b214c482..e69de29bb2d 100644
--- a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
+++ b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
@@ -1,45 +0,0 @@
-import { useFileActionsCreateNewFile } from 'web-app-files/src/composables'
-
-describe('useFileActionsCreateNewFile', () => {
-  describe('checkNewFileName', () => {
-    it('returns error message if file name is empty', () => {
-      const { checkNewFileName } = useFileActionsCreateNewFile()
-
-      const result = checkNewFileName('')
-
-      expect(result).toBe('File name cannot be empty')
-    })
-
-    it('returns error message if file name contains "/"', () => {
-      const { checkNewFileName } = useFileActionsCreateNewFile()
-
-      const result = checkNewFileName('file/name')
-
-      expect(result).toBe('File name cannot contain "/"')
-    })
-
-    it('returns error message if file name is equal to "."', () => {
-      const { checkNewFileName } = useFileActionsCreateNewFile()
-
-      const result = checkNewFileName('.')
-
-      expect(result).toBe('File name cannot be equal to "."')
-    })
-
-    it('returns error message if file name is equal to ".."', () => {
-      const { checkNewFileName } = useFileActionsCreateNewFile()
-
-      const result = checkNewFileName('..')
-
-      expect(result).toBe('File name cannot be equal to ".."')
-    })
-
-    it('returns error message if file name ends with whitespace', () => {
-      const { checkNewFileName } = useFileActionsCreateNewFile()
-
-      const result = checkNewFileName('file name ')
-
-      expect(result).toBe('File name cannot end with whitespace')
-    })
-  })
-})
diff --git a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts
index ea04fdb1fcc..e9b0f58c643 100644
--- a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts
+++ b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts
@@ -1,45 +1,134 @@
+import { mock } from 'jest-mock-extended'
+import { nextTick, unref } from 'vue'
 import { useFileActionsCreateNewFolder } from 'web-app-files/src/composables'
+import { SpaceResource } from 'web-client/src'
+import { FolderResource } from 'web-client/src/helpers'
+import {
+  RouteLocation,
+  createStore,
+  defaultComponentMocks,
+  defaultStoreMockOptions,
+  getComposableWrapper
+} from 'web-test-helpers/src'
 
 describe('useFileActionsCreateNewFolder', () => {
-  describe('checkNewFileName', () => {
-    it('returns error message if file name is empty', () => {
-      const { checkNewFolderName } = useFileActionsCreateNewFolder()
-
-      const result = checkNewFolderName('')
-
-      expect(result).toBe('File name cannot be empty')
-    })
-
-    it('returns error message if file name contains "/"', () => {
-      const { checkNewFolderName } = useFileActionsCreateNewFolder()
-
-      const result = checkNewFolderName('file/name')
-
-      expect(result).toBe('File name cannot contain "/"')
+  describe('checkFolderName', () => {
+    it.each([
+      { input: '', output: 'Folder name cannot be empty' },
+      { input: '/', output: 'Folder name cannot contain "/"' },
+      { input: '.', output: 'Folder name cannot be equal to "."' },
+      { input: '..', output: 'Folder name cannot be equal to ".."' },
+      { input: 'myfolder', output: null }
+    ])('should validate folder name %s', async (data) => {
+      const space = mock<SpaceResource>({ id: '1' })
+      getWrapper({
+        space,
+        setup: async ({ checkNewFolderName }) => {
+          const result = checkNewFolderName(data.input)
+          expect(result).toBe(data.output)
+        }
+      })
     })
-
-    it('returns error message if file name is equal to "."', () => {
-      const { checkNewFolderName } = useFileActionsCreateNewFolder()
-
-      const result = checkNewFolderName('.')
-
-      expect(result).toBe('File name cannot be equal to "."')
+  })
+  describe('addNewFolder', () => {
+    it('create new folder', async () => {
+      const space = mock<SpaceResource>({ id: '1' })
+      getWrapper({
+        space,
+        setup: async ({ addNewFolder }, { storeOptions }) => {
+          await addNewFolder('myfolder')
+          await nextTick()
+          expect(storeOptions.modules.Files.mutations.UPSERT_RESOURCE).toHaveBeenCalled()
+          expect(storeOptions.actions.hideModal).toHaveBeenCalled()
+          expect(storeOptions.actions.showMessage).toHaveBeenCalledWith(
+            expect.anything(),
+            expect.objectContaining({
+              title: '"myfolder" was created successfully'
+            })
+          )
+        }
+      })
     })
-
-    it('returns error message if file name is equal to ".."', () => {
-      const { checkNewFolderName } = useFileActionsCreateNewFolder()
-
-      const result = checkNewFolderName('..')
-
-      expect(result).toBe('File name cannot be equal to ".."')
+    it('show error message if createFolder fails', async () => {
+      const consoleErrorMock = jest.spyOn(console, 'error').mockImplementation()
+      const space = mock<SpaceResource>({ id: '1' })
+      getWrapper({
+        resolveCreateFolder: false,
+        space,
+        setup: async ({ addNewFolder }, { storeOptions }) => {
+          await addNewFolder('myfolder')
+          await nextTick()
+          expect(storeOptions.actions.showMessage).toHaveBeenCalledWith(
+            expect.anything(),
+            expect.objectContaining({
+              title: 'Failed to create folder',
+              status: 'danger'
+            })
+          )
+          consoleErrorMock.mockRestore()
+        }
+      })
     })
-
-    it('returns error message if file name ends with whitespace', () => {
-      const { checkNewFolderName } = useFileActionsCreateNewFolder()
-
-      const result = checkNewFolderName('file name ')
-
-      expect(result).toBe('File name cannot end with whitespace')
+  })
+  describe('createNewFolderModal', () => {
+    it('should show modal', async () => {
+      const space = mock<SpaceResource>({ id: '1' })
+      getWrapper({
+        space,
+        setup: async ({ actions }, { storeOptions }) => {
+          unref(actions)[0].handler()
+          await nextTick()
+          expect(storeOptions.actions.createModal).toHaveBeenCalled()
+        }
+      })
     })
   })
 })
+
+function getWrapper({
+  resolveCreateFolder = true,
+  space = undefined,
+  setup
+}: {
+  resolveCreateFolder?: boolean
+  space?: SpaceResource
+  setup: (
+    instance: ReturnType<typeof useFileActionsCreateNewFolder>,
+    options: { storeOptions: typeof defaultStoreMockOptions }
+  ) => void
+}) {
+  const mocks = {
+    ...defaultComponentMocks({
+      currentRoute: mock<RouteLocation>({ name: 'files-spaces-generic' })
+    }),
+    space
+  }
+  mocks.$clientService.webdav.createFolder.mockImplementation(() => {
+    if (resolveCreateFolder) {
+      return Promise.resolve({ id: 1, type: 'folder' } as FolderResource)
+    }
+    return Promise.reject('error')
+  })
+
+  const storeOptions = {
+    ...defaultStoreMockOptions
+  }
+  const currentFolder = {
+    id: 1,
+    path: '/'
+  }
+  storeOptions.modules.Files.getters.currentFolder.mockReturnValue(currentFolder)
+  const store = createStore(storeOptions)
+  return {
+    wrapper: getComposableWrapper(
+      () => {
+        const instance = useFileActionsCreateNewFolder({ store })
+        setup(instance, { storeOptions })
+      },
+      {
+        store,
+        mocks
+      }
+    )
+  }
+}

From 8bfdfe36b7a5ee2a8e642ecb418200dcd36ce10d Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Tue, 2 May 2023 14:57:12 +0200
Subject: [PATCH 18/26] Implement working unittests for
 useFileActionsCreateNewFile

---
 .../files/useFileActionsCreateNewFile.ts      |   3 +-
 .../files/useFileActionsCreateNewFile.spec.ts | 140 ++++++++++++++++++
 2 files changed, 142 insertions(+), 1 deletion(-)

diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
index e147c8b9b88..da9cc5e6910 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
@@ -258,6 +258,7 @@ export const useFileActionsCreateNewFile = ({
 
   return {
     actions,
-    checkNewFileName
+    checkNewFileName,
+    addNewFile
   }
 }
diff --git a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
index e69de29bb2d..309cabbb5ea 100644
--- a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
+++ b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
@@ -0,0 +1,140 @@
+import { mock } from 'jest-mock-extended'
+import { nextTick, unref } from 'vue'
+import { useFileActionsCreateNewFile } from 'web-app-files/src/composables'
+import { SpaceResource } from 'web-client/src'
+import { FolderResource } from 'web-client/src/helpers'
+import { FileActionOptions } from 'web-pkg/src/composables/actions'
+import {
+  RouteLocation,
+  createStore,
+  defaultComponentMocks,
+  defaultStoreMockOptions,
+  getComposableWrapper
+} from 'web-test-helpers/src'
+
+describe('useFileActionsCreateNewFile', () => {
+  describe('checkFileName', () => {
+    it.each([
+      { input: '', output: 'File name cannot be empty' },
+      { input: '/', output: 'File name cannot contain "/"' },
+      { input: '.', output: 'File name cannot be equal to "."' },
+      { input: '..', output: 'File name cannot be equal to ".."' },
+      { input: 'myfile.txt', output: null }
+    ])('should validate file name %s', async (data) => {
+      const space = mock<SpaceResource>({ id: '1' })
+      getWrapper({
+        space,
+        setup: async ({ checkNewFileName }) => {
+          const result = checkNewFileName(data.input)
+          expect(result).toBe(data.output)
+        }
+      })
+    })
+  })
+
+  describe('addNewFile', () => {
+    it('create new file', async () => {
+      const space = mock<SpaceResource>({ id: '1' })
+      getWrapper({
+        space,
+        setup: async ({ addNewFile }, { storeOptions }) => {
+          await addNewFile('myfile.txt', null)
+          await nextTick()
+          expect(storeOptions.modules.Files.mutations.UPSERT_RESOURCE).toHaveBeenCalled()
+          expect(storeOptions.actions.hideModal).toHaveBeenCalled()
+          expect(storeOptions.actions.showMessage).toHaveBeenCalledWith(
+            expect.anything(),
+            expect.objectContaining({
+              title: '"myfile.txt" was created successfully'
+            })
+          )
+        }
+      })
+    })
+    it('show error message if createFile fails', async () => {
+      const consoleErrorMock = jest.spyOn(console, 'error').mockImplementation()
+      const space = mock<SpaceResource>({ id: '1' })
+      getWrapper({
+        resolveCreateFile: false,
+        space,
+        setup: async ({ addNewFile }, { storeOptions }) => {
+          await addNewFile('myfolder', null)
+          await nextTick()
+          expect(storeOptions.actions.showMessage).toHaveBeenCalledWith(
+            expect.anything(),
+            expect.objectContaining({
+              title: 'Failed to create file',
+              status: 'danger'
+            })
+          )
+          consoleErrorMock.mockRestore()
+        }
+      })
+    })
+  })
+  describe('createNewFileModal', () => {
+    it('should show modal', async () => {
+      const space = mock<SpaceResource>({ id: '1' })
+      getWrapper({
+        space,
+        setup: async ({ actions }, { storeOptions }) => {
+          const fileActionOptions: FileActionOptions = { space, resources: [] } as FileActionOptions
+          unref(actions)[0].handler(fileActionOptions)
+          await nextTick()
+          expect(storeOptions.actions.createModal).toHaveBeenCalled()
+        }
+      })
+    })
+  })
+})
+
+function getWrapper({
+  resolveCreateFile = true,
+  space = undefined,
+  setup
+}: {
+  resolveCreateFile?: boolean
+  space?: SpaceResource
+  setup: (
+    instance: ReturnType<typeof useFileActionsCreateNewFile>,
+    options: { storeOptions: typeof defaultStoreMockOptions }
+  ) => void
+}) {
+  const mocks = {
+    ...defaultComponentMocks({
+      currentRoute: mock<RouteLocation>({ name: 'files-spaces-generic' })
+    }),
+    space
+  }
+  mocks.$clientService.webdav.putFileContents.mockImplementation(() => {
+    if (resolveCreateFile) {
+      return Promise.resolve({ id: 1, type: 'folder' } as FolderResource)
+    }
+    return Promise.reject('error')
+  })
+
+  const storeOptions = {
+    ...defaultStoreMockOptions
+  }
+  const currentFolder = {
+    id: 1,
+    path: '/'
+  }
+  storeOptions.modules.Files.getters.currentFolder.mockReturnValue(currentFolder)
+  const store = createStore(storeOptions)
+  return {
+    wrapper: getComposableWrapper(
+      () => {
+        const instance = useFileActionsCreateNewFile({
+          store,
+          newFileHandlers: [{ action: null, ext: '.txt', menuTitle: jest.fn() }]
+        })
+        setup(instance, { storeOptions })
+      },
+      {
+        store,
+        mocks
+      }
+    )
+  }
+}

From 100a8cb39c6e7bd5185a065d9a374c1d0b559740 Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Wed, 3 May 2023 10:21:17 +0200
Subject: [PATCH 19/26] Fix file extension and mime type fiel actions

---
 .../src/components/AppBar/CreateAndUpload.vue |  6 +--
 .../files/useFileActionsCreateNewFile.ts      | 22 ++++----
 packages/web-runtime/src/helpers/settings.ts  | 53 +++++++++++++++++++
 3 files changed, 64 insertions(+), 17 deletions(-)
 create mode 100644 packages/web-runtime/src/helpers/settings.ts

diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
index b842e2849c2..8992c139b4b 100644
--- a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
@@ -209,11 +209,10 @@ export default defineComponent({
     const createNewFolderAction = computed(() => unref(createNewFolder)[0].handler)
 
     const newFileHandlers = computed(() => store.getters.newFileHandlers)
-    console.log('newFileHandlers', newFileHandlers)
 
     const { actions: createNewFileActions } = useFileActionsCreateNewFile({
       store,
-      newFileHandlers: unref(newFileHandlers)
+      newFileHandlers: newFileHandlers
     })
 
     const mimetypesAllowedForCreation = computed(() => {
@@ -226,7 +225,7 @@ export default defineComponent({
 
     const { actions: createNewFileMimeTypeActions } = useFileActionsCreateNewFile({
       store,
-      mimetypesAllowedForCreation: unref(mimetypesAllowedForCreation)
+      mimetypesAllowedForCreation: mimetypesAllowedForCreation
     })
 
     const currentFolder = computed(() => {
@@ -292,7 +291,6 @@ export default defineComponent({
   computed: {
     ...mapGetters(['capabilities', 'configuration', 'newFileHandlers', 'user']),
     ...mapGetters('Files', ['ancestorMetaData', 'files', 'selectedFiles', 'clipboardResources']),
-    ...mapState('Files', ['areFileExtensionsShown']),
     ...mapGetters('runtime/spaces', ['spaces']),
 
     showPasteHereButton() {
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
index da9cc5e6910..0ccd371db15 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
@@ -1,6 +1,6 @@
 import { Resource, extractNameWithoutExtension } from 'web-client/src/helpers'
 import { Store } from 'vuex'
-import { computed, unref } from 'vue'
+import { computed, Ref, unref } from 'vue'
 import { useClientService, useRequest, useRouter, useStore } from 'web-pkg/src/composables'
 import { FileAction, FileActionOptions } from 'web-pkg/src/composables/actions'
 import { useGettext } from 'vue3-gettext'
@@ -20,8 +20,8 @@ export const useFileActionsCreateNewFile = ({
   mimetypesAllowedForCreation
 }: {
   store?: Store<any>
-  newFileHandlers?: any // FIXME: type?
-  mimetypesAllowedForCreation?: any // FIXME: type?
+  newFileHandlers?: Ref<any> // FIXME: type?
+  mimetypesAllowedForCreation?: Ref<any> // FIXME: type?
 } = {}) => {
   store = store || useStore()
   const router = useRouter()
@@ -33,9 +33,7 @@ export const useFileActionsCreateNewFile = ({
   const currentFolder = computed((): Resource => store.getters['Files/currentFolder'])
   const files = computed((): Array<Resource> => store.getters['Files/files'])
   const ancestorMetaData = computed(() => store.getters['Files/ancestorMetaData'])
-  const areFileExtensionsShown = computed(
-    (): boolean => store.getters['Files/areFileExtensionsShown']
-  )
+  const areFileExtensionsShown = computed((): boolean => store.state.Files.areFileExtensionsShown)
   const storageId = computed(() => unref(currentFolder).storageId)
   const currentSpace = computed(() =>
     store.getters['runtime/spaces/spaces'].find((space) => space.id === unref(storageId))
@@ -167,7 +165,6 @@ export const useFileActionsCreateNewFile = ({
   const handler = (
     fileActionOptions: FileActionOptions,
     extension: string,
-    addAppProviderFile: boolean,
     openAction: any // FIXME: type?
   ) => {
     const checkInputValue = (value) => {
@@ -203,7 +200,7 @@ export const useFileActionsCreateNewFile = ({
       ),
       inputSelectionRange,
       onCancel: () => store.dispatch('hideModal'),
-      onConfirm: addAppProviderFile
+      onConfirm: !openAction
         ? addAppProviderFileFunc
         : (fileName) => {
             if (!areFileExtensionsShown.value) {
@@ -219,12 +216,12 @@ export const useFileActionsCreateNewFile = ({
 
   const actions = computed((): FileAction[] => {
     const actions = []
-    for (const newFileHandler of newFileHandlers || []) {
+    for (const newFileHandler of unref(newFileHandlers) || []) {
       const openAction = newFileHandler.action
       actions.push({
         name: 'create-new-file',
         icon: 'add',
-        handler: (args) => handler(args, newFileHandler.ext, !openAction, openAction),
+        handler: (args) => handler(args, newFileHandler.ext, openAction),
         label: () => newFileHandler.menuTitle($gettext),
         isEnabled: ({ resources }) => {
           return true
@@ -235,13 +232,12 @@ export const useFileActionsCreateNewFile = ({
         ext: newFileHandler.ext
       })
     }
-    for (const mimeType of mimetypesAllowedForCreation || []) {
+    for (const mimeType of unref(mimetypesAllowedForCreation) || []) {
       const openAction = false
-      const addAppProviderFile = true
       actions.push({
         name: 'create-new-file',
         icon: 'add',
-        handler: (args) => handler(args, mimeType.ext, addAppProviderFile, openAction),
+        handler: (args) => handler(args, mimeType.ext, openAction),
         label: () => mimeType.name,
         isEnabled: ({ resources }) => {
           return true
diff --git a/packages/web-runtime/src/helpers/settings.ts b/packages/web-runtime/src/helpers/settings.ts
new file mode 100644
index 00000000000..3f9a8e78018
--- /dev/null
+++ b/packages/web-runtime/src/helpers/settings.ts
@@ -0,0 +1,53 @@
+export interface SettingValue {
+  identifier: {
+    bundle: string
+    extension: string
+    setting: string
+  }
+  value: {
+    accountUuid: string
+    bundleId: string
+    id: string
+    resource: {
+      type: string
+    }
+    settingId: string
+    boolValue?: boolean
+    listValue?: {
+      values: {
+        stringValue: string
+      }[]
+    }
+  }
+}
+
+export interface AccountBundleSetting {
+  description: string
+  displayName: string
+  id: string
+  name: string
+  resource: {
+    type: string
+  }
+  singleChoiceValue?: {
+    options: Record<string, any>[]
+  }
+  boolValue?: Record<string, any>
+}
+
+export interface AccountBundle {
+  displayName: string
+  extension: string
+  id: string
+  name: string
+  resource: {
+    type: string
+  }
+  settings: AccountBundleSetting[]
+  type: string
+}
+
+export interface LanguageOption {
+  label: string
+  value: string
+}

From 5791cef83c7446781ca85b670a2fd438749e0964 Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Wed, 3 May 2023 10:25:26 +0200
Subject: [PATCH 20/26] Remove unrelated file

---
 packages/web-runtime/src/helpers/settings.ts | 53 --------------------
 1 file changed, 53 deletions(-)
 delete mode 100644 packages/web-runtime/src/helpers/settings.ts

diff --git a/packages/web-runtime/src/helpers/settings.ts b/packages/web-runtime/src/helpers/settings.ts
deleted file mode 100644
index 3f9a8e78018..00000000000
--- a/packages/web-runtime/src/helpers/settings.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-export interface SettingValue {
-  identifier: {
-    bundle: string
-    extension: string
-    setting: string
-  }
-  value: {
-    accountUuid: string
-    bundleId: string
-    id: string
-    resource: {
-      type: string
-    }
-    settingId: string
-    boolValue?: boolean
-    listValue?: {
-      values: {
-        stringValue: string
-      }[]
-    }
-  }
-}
-
-export interface AccountBundleSetting {
-  description: string
-  displayName: string
-  id: string
-  name: string
-  resource: {
-    type: string
-  }
-  singleChoiceValue?: {
-    options: Record<string, any>[]
-  }
-  boolValue?: Record<string, any>
-}
-
-export interface AccountBundle {
-  displayName: string
-  extension: string
-  id: string
-  name: string
-  resource: {
-    type: string
-  }
-  settings: AccountBundleSetting[]
-  type: string
-}
-
-export interface LanguageOption {
-  label: string
-  value: string
-}

From 3de5db83b0fd6eba4ddef3429f36f187634b776f Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Wed, 3 May 2023 11:48:31 +0200
Subject: [PATCH 21/26] Make linter happy

---
 .../web-app-files/src/components/AppBar/CreateAndUpload.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
index 8992c139b4b..84d173b0263 100644
--- a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
@@ -133,7 +133,7 @@
 </template>
 
 <script lang="ts">
-import { mapActions, mapGetters, mapMutations, mapState } from 'vuex'
+import { mapActions, mapGetters, mapMutations } from 'vuex'
 
 import { useFileActions } from '../../composables/actions/files/useFileActions'
 import { isLocationPublicActive, isLocationSpacesActive } from '../../router'

From 0945b4fcce6f1ab5834ae3e9eb4214c89f8eca24 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Wed, 3 May 2023 11:59:51 +0200
Subject: [PATCH 22/26] Fix ref error in unittest

---
 .../actions/files/useFileActionsCreateNewFile.spec.ts         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
index 309cabbb5ea..04ac2155ab0 100644
--- a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
+++ b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
@@ -1,5 +1,5 @@
 import { mock } from 'jest-mock-extended'
-import { nextTick, unref } from 'vue'
+import { nextTick, ref, unref } from 'vue'
 import { useFileActionsCreateNewFile } from 'web-app-files/src/composables'
 import { SpaceResource } from 'web-client/src'
 import { FolderResource } from 'web-client/src/helpers'
@@ -127,7 +127,7 @@ function getWrapper({
       () => {
         const instance = useFileActionsCreateNewFile({
           store,
-          newFileHandlers: [{ action: null, ext: '.txt', menuTitle: jest.fn() }]
+          newFileHandlers: ref([{ action: null, ext: '.txt', menuTitle: jest.fn() }])
         })
         setup(instance, { storeOptions })
       },

From b9d4b14379c7e183ad4f2ff78ebe57fb1df86856 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Wed, 3 May 2023 13:44:17 +0200
Subject: [PATCH 23/26] Fix space issue, fix locationspace generic

---
 .../src/components/AppBar/CreateAndUpload.vue |  7 ++++++-
 .../files/useFileActionsCreateNewFile.ts      | 19 ++++++++-----------
 .../files/useFileActionsCreateNewFolder.ts    | 19 ++++++++-----------
 .../files/useFileActionsCreateNewFile.spec.ts |  1 +
 .../useFileActionsCreateNewFolder.spec.ts     |  4 ++--
 5 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
index 84d173b0263..3a35a172b24 100644
--- a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
@@ -205,13 +205,17 @@ export default defineComponent({
     let filesSelectedSub
     let uploadCompletedSub
 
-    const { actions: createNewFolder } = useFileActionsCreateNewFolder({ store })
+    const { actions: createNewFolder } = useFileActionsCreateNewFolder({
+      store,
+      space: props.space
+    })
     const createNewFolderAction = computed(() => unref(createNewFolder)[0].handler)
 
     const newFileHandlers = computed(() => store.getters.newFileHandlers)
 
     const { actions: createNewFileActions } = useFileActionsCreateNewFile({
       store,
+      space: props.space,
       newFileHandlers: newFileHandlers
     })
 
@@ -225,6 +229,7 @@ export default defineComponent({
 
     const { actions: createNewFileMimeTypeActions } = useFileActionsCreateNewFile({
       store,
+      space: props.space,
       mimetypesAllowedForCreation: mimetypesAllowedForCreation
     })
 
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
index 0ccd371db15..e1170a119c8 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
@@ -1,4 +1,4 @@
-import { Resource, extractNameWithoutExtension } from 'web-client/src/helpers'
+import { Resource, SpaceResource, extractNameWithoutExtension } from 'web-client/src/helpers'
 import { Store } from 'vuex'
 import { computed, Ref, unref } from 'vue'
 import { useClientService, useRequest, useRouter, useStore } from 'web-pkg/src/composables'
@@ -16,10 +16,12 @@ import { stringify } from 'qs'
 
 export const useFileActionsCreateNewFile = ({
   store,
+  space,
   newFileHandlers,
   mimetypesAllowedForCreation
 }: {
   store?: Store<any>
+  space?: Ref<SpaceResource>
   newFileHandlers?: Ref<any> // FIXME: type?
   mimetypesAllowedForCreation?: Ref<any> // FIXME: type?
 } = {}) => {
@@ -34,10 +36,6 @@ export const useFileActionsCreateNewFile = ({
   const files = computed((): Array<Resource> => store.getters['Files/files'])
   const ancestorMetaData = computed(() => store.getters['Files/ancestorMetaData'])
   const areFileExtensionsShown = computed((): boolean => store.state.Files.areFileExtensionsShown)
-  const storageId = computed(() => unref(currentFolder).storageId)
-  const currentSpace = computed(() =>
-    store.getters['runtime/spaces/spaces'].find((space) => space.id === unref(storageId))
-  )
 
   const capabilities = computed(() => store.getters['capabilities'])
 
@@ -91,13 +89,13 @@ export const useFileActionsCreateNewFile = ({
         throw new Error(`An error has occurred: ${response.status}`)
       }
       const path = join(unref(currentFolder).path, fileName) || ''
-      const resource = await (clientService.webdav as WebDAV).getFileInfo(unref(currentSpace), {
+      const resource = await (clientService.webdav as WebDAV).getFileInfo(unref(space), {
         path
       })
       if (unref(loadIndicatorsForNewFile)) {
         resource.indicators = getIndicators({ resource, ancestorMetaData: unref(ancestorMetaData) })
       }
-      triggerDefaultAction({ space: unref(currentSpace), resources: [resource] })
+      triggerDefaultAction({ space: unref(space), resources: [resource] })
       store.commit('Files/UPSERT_RESOURCE', resource)
       store.dispatch('hideModal')
       store.dispatch('showMessage', {
@@ -114,8 +112,7 @@ export const useFileActionsCreateNewFile = ({
 
   const loadIndicatorsForNewFile = computed(() => {
     return (
-      isLocationSpacesActive(router, 'files-spaces-projects') &&
-      unref(currentSpace).driveType !== 'share'
+      isLocationSpacesActive(router, 'files-spaces-generic') && unref(space).driveType !== 'share'
     )
   })
 
@@ -126,7 +123,7 @@ export const useFileActionsCreateNewFile = ({
 
     try {
       const path = join(unref(currentFolder).path, fileName)
-      const resource = await (clientService.webdav as WebDAV).putFileContents(unref(currentSpace), {
+      const resource = await (clientService.webdav as WebDAV).putFileContents(unref(space), {
         path
       })
 
@@ -139,7 +136,7 @@ export const useFileActionsCreateNewFile = ({
       if (openAction) {
         openEditor(
           openAction,
-          unref(currentSpace).getDriveAliasAndItem(resource),
+          unref(space).getDriveAliasAndItem(resource),
           resource.webDavPath,
           resource.fileId,
           EDITOR_MODE_CREATE
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
index 6815dde9f18..492c48fbb95 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
@@ -1,6 +1,6 @@
-import { Resource } from 'web-client/src/helpers'
+import { Resource, SpaceResource } from 'web-client/src/helpers'
 import { Store } from 'vuex'
-import { computed, unref } from 'vue'
+import { Ref, computed, unref } from 'vue'
 import { useClientService, useRouter, useStore } from 'web-pkg/src/composables'
 import { FileAction } from 'web-pkg/src/composables/actions'
 import { useGettext } from 'vue3-gettext'
@@ -10,7 +10,10 @@ import { WebDAV } from 'web-client/src/webdav'
 import { isLocationSpacesActive } from 'web-app-files/src/router'
 import { getIndicators } from 'web-app-files/src/helpers/statusIndicators'
 
-export const useFileActionsCreateNewFolder = ({ store }: { store?: Store<any> } = {}) => {
+export const useFileActionsCreateNewFolder = ({
+  store,
+  space
+}: { store?: Store<any>; space?: Ref<SpaceResource> } = {}) => {
   store = store || useStore()
   const router = useRouter()
   const { $gettext } = useGettext()
@@ -20,11 +23,6 @@ export const useFileActionsCreateNewFolder = ({ store }: { store?: Store<any> }
   const files = computed((): Array<Resource> => store.getters['Files/files'])
   const ancestorMetaData = computed(() => store.getters['Files/ancestorMetaData'])
 
-  const storageId = computed(() => unref(currentFolder).storageId)
-  const currentSpace = computed(() =>
-    store.getters['runtime/spaces/spaces'].find((space) => space.id === unref(storageId))
-  )
-
   const checkNewFolderName = (folderName) => {
     if (folderName.trim() === '') {
       return $gettext('Folder name cannot be empty')
@@ -53,8 +51,7 @@ export const useFileActionsCreateNewFolder = ({ store }: { store?: Store<any> }
 
   const loadIndicatorsForNewFile = computed(() => {
     return (
-      isLocationSpacesActive(router, 'files-spaces-projects') &&
-      unref(currentSpace).driveType !== 'share'
+      isLocationSpacesActive(router, 'files-spaces-generic') && unref(space).driveType !== 'share'
     )
   })
 
@@ -63,7 +60,7 @@ export const useFileActionsCreateNewFolder = ({ store }: { store?: Store<any> }
 
     try {
       const path = join(unref(currentFolder).path, folderName)
-      const resource = await (clientService.webdav as WebDAV).createFolder(unref(currentSpace), {
+      const resource = await (clientService.webdav as WebDAV).createFolder(unref(space), {
         path
       })
 
diff --git a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
index 04ac2155ab0..4816bd1ed9f 100644
--- a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
+++ b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
@@ -127,6 +127,7 @@ function getWrapper({
       () => {
         const instance = useFileActionsCreateNewFile({
           store,
+          space: ref(space),
           newFileHandlers: ref([{ action: null, ext: '.txt', menuTitle: jest.fn() }])
         })
         setup(instance, { storeOptions })
diff --git a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts
index e9b0f58c643..cd79182cd2d 100644
--- a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts
+++ b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts
@@ -1,5 +1,5 @@
 import { mock } from 'jest-mock-extended'
-import { nextTick, unref } from 'vue'
+import { nextTick, ref, unref } from 'vue'
 import { useFileActionsCreateNewFolder } from 'web-app-files/src/composables'
 import { SpaceResource } from 'web-client/src'
 import { FolderResource } from 'web-client/src/helpers'
@@ -122,7 +122,7 @@ function getWrapper({
   return {
     wrapper: getComposableWrapper(
       () => {
-        const instance = useFileActionsCreateNewFolder({ store })
+        const instance = useFileActionsCreateNewFolder({ store, space: ref(space) })
         setup(instance, { storeOptions })
       },
       {

From 08c264ff5fab878bd655a0e07a71769a8b9ad863 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Wed, 3 May 2023 14:00:24 +0200
Subject: [PATCH 24/26] Remove ref from space

---
 .../actions/files/useFileActionsCreateNewFile.ts   | 14 ++++++--------
 .../actions/files/useFileActionsCreateNewFolder.ts |  8 +++-----
 .../files/useFileActionsCreateNewFile.spec.ts      |  2 +-
 .../files/useFileActionsCreateNewFolder.spec.ts    |  2 +-
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
index e1170a119c8..a431a0bdcfc 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFile.ts
@@ -21,7 +21,7 @@ export const useFileActionsCreateNewFile = ({
   mimetypesAllowedForCreation
 }: {
   store?: Store<any>
-  space?: Ref<SpaceResource>
+  space?: SpaceResource
   newFileHandlers?: Ref<any> // FIXME: type?
   mimetypesAllowedForCreation?: Ref<any> // FIXME: type?
 } = {}) => {
@@ -89,13 +89,13 @@ export const useFileActionsCreateNewFile = ({
         throw new Error(`An error has occurred: ${response.status}`)
       }
       const path = join(unref(currentFolder).path, fileName) || ''
-      const resource = await (clientService.webdav as WebDAV).getFileInfo(unref(space), {
+      const resource = await (clientService.webdav as WebDAV).getFileInfo(space, {
         path
       })
       if (unref(loadIndicatorsForNewFile)) {
         resource.indicators = getIndicators({ resource, ancestorMetaData: unref(ancestorMetaData) })
       }
-      triggerDefaultAction({ space: unref(space), resources: [resource] })
+      triggerDefaultAction({ space: space, resources: [resource] })
       store.commit('Files/UPSERT_RESOURCE', resource)
       store.dispatch('hideModal')
       store.dispatch('showMessage', {
@@ -111,9 +111,7 @@ export const useFileActionsCreateNewFile = ({
   }
 
   const loadIndicatorsForNewFile = computed(() => {
-    return (
-      isLocationSpacesActive(router, 'files-spaces-generic') && unref(space).driveType !== 'share'
-    )
+    return isLocationSpacesActive(router, 'files-spaces-generic') && space.driveType !== 'share'
   })
 
   const addNewFile = async (fileName, openAction) => {
@@ -123,7 +121,7 @@ export const useFileActionsCreateNewFile = ({
 
     try {
       const path = join(unref(currentFolder).path, fileName)
-      const resource = await (clientService.webdav as WebDAV).putFileContents(unref(space), {
+      const resource = await (clientService.webdav as WebDAV).putFileContents(space, {
         path
       })
 
@@ -136,7 +134,7 @@ export const useFileActionsCreateNewFile = ({
       if (openAction) {
         openEditor(
           openAction,
-          unref(space).getDriveAliasAndItem(resource),
+          space.getDriveAliasAndItem(resource),
           resource.webDavPath,
           resource.fileId,
           EDITOR_MODE_CREATE
diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
index 492c48fbb95..20f24332271 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
@@ -13,7 +13,7 @@ import { getIndicators } from 'web-app-files/src/helpers/statusIndicators'
 export const useFileActionsCreateNewFolder = ({
   store,
   space
-}: { store?: Store<any>; space?: Ref<SpaceResource> } = {}) => {
+}: { store?: Store<any>; space?: SpaceResource } = {}) => {
   store = store || useStore()
   const router = useRouter()
   const { $gettext } = useGettext()
@@ -50,9 +50,7 @@ export const useFileActionsCreateNewFolder = ({
   }
 
   const loadIndicatorsForNewFile = computed(() => {
-    return (
-      isLocationSpacesActive(router, 'files-spaces-generic') && unref(space).driveType !== 'share'
-    )
+    return isLocationSpacesActive(router, 'files-spaces-generic') && space.driveType !== 'share'
   })
 
   const addNewFolder = async (folderName) => {
@@ -60,7 +58,7 @@ export const useFileActionsCreateNewFolder = ({
 
     try {
       const path = join(unref(currentFolder).path, folderName)
-      const resource = await (clientService.webdav as WebDAV).createFolder(unref(space), {
+      const resource = await (clientService.webdav as WebDAV).createFolder(space, {
         path
       })
 
diff --git a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
index 4816bd1ed9f..2d775cc091f 100644
--- a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
+++ b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
@@ -127,7 +127,7 @@ function getWrapper({
       () => {
         const instance = useFileActionsCreateNewFile({
           store,
-          space: ref(space),
+          space,
           newFileHandlers: ref([{ action: null, ext: '.txt', menuTitle: jest.fn() }])
         })
         setup(instance, { storeOptions })
diff --git a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts
index cd79182cd2d..c01437d0eec 100644
--- a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts
+++ b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts
@@ -122,7 +122,7 @@ function getWrapper({
   return {
     wrapper: getComposableWrapper(
       () => {
-        const instance = useFileActionsCreateNewFolder({ store, space: ref(space) })
+        const instance = useFileActionsCreateNewFolder({ store, space })
         setup(instance, { storeOptions })
       },
       {

From 8d4e6e587f7e2bb33ebc90e8ae9ac7d8a333cda1 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Wed, 3 May 2023 14:08:39 +0200
Subject: [PATCH 25/26] Fix unittests

---
 .../actions/files/useFileActionsCreateNewFolder.ts       | 2 +-
 .../actions/files/useFileActionsCreateNewFile.spec.ts    | 9 +++++++--
 .../actions/files/useFileActionsCreateNewFolder.spec.ts  | 9 +++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
index 20f24332271..792f948ba42 100644
--- a/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
+++ b/packages/web-app-files/src/composables/actions/files/useFileActionsCreateNewFolder.ts
@@ -1,6 +1,6 @@
 import { Resource, SpaceResource } from 'web-client/src/helpers'
 import { Store } from 'vuex'
-import { Ref, computed, unref } from 'vue'
+import { computed, unref } from 'vue'
 import { useClientService, useRouter, useStore } from 'web-pkg/src/composables'
 import { FileAction } from 'web-pkg/src/composables/actions'
 import { useGettext } from 'vue3-gettext'
diff --git a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
index 2d775cc091f..8f4b7b61e7e 100644
--- a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
+++ b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
@@ -2,7 +2,7 @@ import { mock } from 'jest-mock-extended'
 import { nextTick, ref, unref } from 'vue'
 import { useFileActionsCreateNewFile } from 'web-app-files/src/composables'
 import { SpaceResource } from 'web-client/src'
-import { FolderResource } from 'web-client/src/helpers'
+import { Resource } from 'web-client/src/helpers'
 import { FileActionOptions } from 'web-pkg/src/composables/actions'
 import {
   RouteLocation,
@@ -108,7 +108,12 @@ function getWrapper({
   }
   mocks.$clientService.webdav.putFileContents.mockImplementation(() => {
     if (resolveCreateFile) {
-      return Promise.resolve({ id: 1, type: 'folder' } as FolderResource)
+      return Promise.resolve({
+        id: 1,
+        type: 'folder',
+        path: '/',
+        isReceivedShare: jest.fn()
+      } as Resource)
     }
     return Promise.reject('error')
   })
diff --git a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts
index c01437d0eec..864699ee04d 100644
--- a/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts
+++ b/packages/web-app-files/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts
@@ -1,5 +1,5 @@
 import { mock } from 'jest-mock-extended'
-import { nextTick, ref, unref } from 'vue'
+import { nextTick, unref } from 'vue'
 import { useFileActionsCreateNewFolder } from 'web-app-files/src/composables'
 import { SpaceResource } from 'web-client/src'
 import { FolderResource } from 'web-client/src/helpers'
@@ -105,7 +105,12 @@ function getWrapper({
   }
   mocks.$clientService.webdav.createFolder.mockImplementation(() => {
     if (resolveCreateFolder) {
-      return Promise.resolve({ id: 1, type: 'folder' } as FolderResource)
+      return Promise.resolve({
+        id: 1,
+        type: 'folder',
+        isReceivedShare: jest.fn(),
+        path: '/'
+      } as FolderResource)
     }
     return Promise.reject('error')
   })

From 18a7a4cb2f3727b3ae794ced7de538020c2b6662 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Wed, 3 May 2023 14:55:54 +0200
Subject: [PATCH 26/26] Remove accidental change

---
 .../src/components/SideBar/Shares/Links/CreateQuickLink.vue    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/web-app-files/src/components/SideBar/Shares/Links/CreateQuickLink.vue b/packages/web-app-files/src/components/SideBar/Shares/Links/CreateQuickLink.vue
index 5adee0482a0..fa7fc42c3a5 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Links/CreateQuickLink.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Links/CreateQuickLink.vue
@@ -13,10 +13,9 @@
         />
       </div>
       <oc-button
-        v-oc-tooltip="$gettext('Create link')"
         class="oc-ml-s"
         size="small"
-        appearance="raw"
+        v-oc-tooltip="$gettext('Create link')"
         :aria-label="$gettext('Create link')"
         @click="createQuickLink"
       >