From 79ff4e06fafb127ee06ef05263b62a34a96fbb86 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Mon, 16 Oct 2023 11:01:25 +0200
Subject: [PATCH 01/48] Integrate file editors in application menu, WIP
 texteditor

---
 packages/web-app-text-editor/src/index.ts     | 13 +++++-
 .../components/Topbar/ApplicationsMenu.vue    | 45 ++++++++++++++++---
 .../web-runtime/src/layouts/Application.vue   |  1 +
 3 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/packages/web-app-text-editor/src/index.ts b/packages/web-app-text-editor/src/index.ts
index 45b4e6a4c50..bed5d28ea52 100644
--- a/packages/web-app-text-editor/src/index.ts
+++ b/packages/web-app-text-editor/src/index.ts
@@ -1,6 +1,6 @@
 import translations from '../l10n/translations.json'
 import TextEditor from './App.vue'
-import { AppWrapperRoute } from '@ownclouders/web-pkg'
+import { AppNavigationItem, AppWrapperRoute } from '@ownclouders/web-pkg'
 
 // just a dummy function to trick gettext tools
 function $gettext(msg) {
@@ -92,7 +92,9 @@ const appInfo = {
   name: $gettext('Text Editor'),
   id: appId,
   icon: 'file-text',
+  color: '#2b2b2b',
   isFileEditor: true,
+  showInApplicationMenu: true,
   extensions: fileExtensions().map((extensionItem) => {
     return {
       extension: extensionItem.extension,
@@ -103,8 +105,17 @@ const appInfo = {
   })
 }
 
+const navItems = (): AppNavigationItem[] => [
+  {
+    enabled: () => {
+      return true
+    }
+  }
+]
+
 export default {
   appInfo,
   routes,
   translations
+  //navItems
 }
diff --git a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
index 8a5358effe8..67dbbd6c3e3 100644
--- a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
@@ -29,13 +29,11 @@
           <li v-for="(n, nid) in applicationsList" :key="`apps-menu-${nid}`">
             <oc-button
               :key="n.url ? 'apps-menu-external-link' : 'apps-menu-internal-link'"
-              :type="n.url ? 'a' : 'router-link'"
-              :target="n.target"
-              :href="n.url"
-              :to="n.path"
               :appearance="n.active ? 'raw-inverse' : 'raw'"
               :variation="n.active ? 'primary' : 'passive'"
               :class="{ 'oc-background-primary-gradient router-link-active': n.active }"
+              v-bind="getAdditionalAttributes(n)"
+              v-on="getAdditionalEventBindings(n)"
             >
               <oc-application-icon
                 :key="`apps-menu-icon-${nid}-${appIconKey}`"
@@ -52,11 +50,13 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, ComponentPublicInstance, ref, computed } from 'vue'
+import { defineComponent, PropType, ComponentPublicInstance, ref, computed, unref } from 'vue'
 import { OcDrop } from 'design-system/src/components'
 import OcApplicationIcon from 'design-system/src/components/OcApplicationIcon/OcApplicationIcon.vue'
 import { useGettext } from 'vue3-gettext'
 import * as uuid from 'uuid'
+import { useClientService, useStore } from '@ownclouders/web-pkg'
+import { Resource, SpaceResource } from '@ownclouders/web-client'
 
 export default defineComponent({
   components: {
@@ -70,6 +70,9 @@ export default defineComponent({
     }
   },
   setup() {
+    const store = useStore()
+    const clientService = useClientService()
+    const { webdav } = clientService
     const { $gettext } = useGettext()
     const appIconKey = ref('')
 
@@ -79,10 +82,40 @@ export default defineComponent({
     const updateAppIcons = () => {
       appIconKey.value = uuid.v4().replaceAll('-', '')
     }
+    const currentFolder = computed((): SpaceResource => {
+      return store.getters['Files/currentFolder']
+    })
+    const getAdditionalEventBindings = (item: any) => {
+      if (item.path == '/text-editor') {
+        return {
+          click: async () => {
+            const test = await webdav.putFileContents(unref(currentFolder), {
+              path: new Date().getTime() + '.txt',
+              content: $gettext('If this works very nice.')
+            })
+          }
+        }
+      }
+      return {}
+    }
+    const getAdditionalAttributes = (item: any) => {
+      console.log(item)
+      if (item.path == '/text-editor') {
+        return {}
+      }
+      return {
+        type: item.url ? 'a' : 'router-link',
+        target: item.target,
+        href: item.url,
+        to: item.path
+      }
+    }
     return {
       appIconKey,
       updateAppIcons,
-      applicationSwitcherLabel
+      applicationSwitcherLabel,
+      getAdditionalAttributes,
+      getAdditionalEventBindings
     }
   },
   mounted() {
diff --git a/packages/web-runtime/src/layouts/Application.vue b/packages/web-runtime/src/layouts/Application.vue
index 49fbaa3a232..131c1a221ab 100644
--- a/packages/web-runtime/src/layouts/Application.vue
+++ b/packages/web-runtime/src/layouts/Application.vue
@@ -204,6 +204,7 @@ export default defineComponent({
           type: 'link'
         })
       })
+      console.log(this.configuration.applications)
 
       return list
     }

From c2d9468ab1af875659f247364a8e58be34c1d2bb Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Mon, 16 Oct 2023 11:53:26 +0200
Subject: [PATCH 02/48] Text editor now working

---
 packages/web-app-text-editor/src/index.ts     |  2 +-
 .../components/Topbar/ApplicationsMenu.vue    | 32 ++++++++++++++++---
 .../src/components/Topbar/TopBar.vue          |  3 +-
 .../web-runtime/src/layouts/Application.vue   | 12 ++++++-
 packages/web-runtime/src/store/apps.ts        |  3 +-
 5 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/packages/web-app-text-editor/src/index.ts b/packages/web-app-text-editor/src/index.ts
index bed5d28ea52..59f5e5f9dd8 100644
--- a/packages/web-app-text-editor/src/index.ts
+++ b/packages/web-app-text-editor/src/index.ts
@@ -92,7 +92,7 @@ const appInfo = {
   name: $gettext('Text Editor'),
   id: appId,
   icon: 'file-text',
-  color: '#2b2b2b',
+  color: '#EF6C00',
   isFileEditor: true,
   showInApplicationMenu: true,
   extensions: fileExtensions().map((extensionItem) => {
diff --git a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
index 67dbbd6c3e3..46ec666bcff 100644
--- a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
@@ -55,7 +55,12 @@ import { OcDrop } from 'design-system/src/components'
 import OcApplicationIcon from 'design-system/src/components/OcApplicationIcon/OcApplicationIcon.vue'
 import { useGettext } from 'vue3-gettext'
 import * as uuid from 'uuid'
-import { useClientService, useStore } from '@ownclouders/web-pkg'
+import {
+  useClientService,
+  useFileActions,
+  useGetMatchingSpace,
+  useStore
+} from '@ownclouders/web-pkg'
 import { Resource, SpaceResource } from '@ownclouders/web-client'
 
 export default defineComponent({
@@ -69,12 +74,16 @@ export default defineComponent({
       default: () => []
     }
   },
-  setup() {
+  setup(props) {
     const store = useStore()
+    const { openEditor, getDefaultEditorAction } = useFileActions()
     const clientService = useClientService()
     const { webdav } = clientService
     const { $gettext } = useGettext()
     const appIconKey = ref('')
+    const { getMatchingSpace } = useGetMatchingSpace()
+
+    console.log('registered', props.applicationsList)
 
     const applicationSwitcherLabel = computed(() => {
       return $gettext('Application Switcher')
@@ -89,10 +98,20 @@ export default defineComponent({
       if (item.path == '/text-editor') {
         return {
           click: async () => {
-            const test = await webdav.putFileContents(unref(currentFolder), {
-              path: new Date().getTime() + '.txt',
-              content: $gettext('If this works very nice.')
+            const emptyResource = await webdav.putFileContents(unref(currentFolder), {
+              path: new Date().getTime() + 'empty.txt'
             })
+            const space = getMatchingSpace(emptyResource)
+            const fileActionsOptions = {
+              resources: [emptyResource],
+              space
+            }
+
+            const defaultEditorAction = getDefaultEditorAction(fileActionsOptions)
+
+            if (defaultEditorAction) {
+              defaultEditorAction.handler({ ...fileActionsOptions })
+            }
           }
         }
       }
@@ -186,3 +205,6 @@ export default defineComponent({
   }
 }
 </style>
+
+function openEditor(editor: any, arg1: any, webDavPath: any, fileId: any, EDITOR_MODE_EDIT: any,
+shareId: any) { throw new Error('Function not implemented.') }
diff --git a/packages/web-runtime/src/components/Topbar/TopBar.vue b/packages/web-runtime/src/components/Topbar/TopBar.vue
index c5974ccfcbf..7d42f5e4ecf 100644
--- a/packages/web-runtime/src/components/Topbar/TopBar.vue
+++ b/packages/web-runtime/src/components/Topbar/TopBar.vue
@@ -109,7 +109,8 @@ export default {
             return (
               store.getters
                 .getNavItemsByExtension(app.id)
-                .filter((navItem) => isNavItemPermitted(permittedMenus, navItem)).length > 0
+                .filter((navItem) => isNavItemPermitted(permittedMenus, navItem)).length > 0 ||
+              app.showInApplicationMenu
             )
           }
           return isNavItemPermitted(permittedMenus, app)
diff --git a/packages/web-runtime/src/layouts/Application.vue b/packages/web-runtime/src/layouts/Application.vue
index 131c1a221ab..b9b58b90c70 100644
--- a/packages/web-runtime/src/layouts/Application.vue
+++ b/packages/web-runtime/src/layouts/Application.vue
@@ -197,6 +197,16 @@ export default defineComponent({
         })
       })
 
+      // Add extensions with showInApplicationMenu
+      Object.values(this.apps).forEach((app: any) => {
+        if (app.showInApplicationMenu) {
+          list.push({
+            ...app,
+            type: 'extension'
+          })
+        }
+      })
+
       // Get extensions manually added into config
       this.configuration.applications.forEach((application) => {
         list.push({
@@ -204,7 +214,7 @@ export default defineComponent({
           type: 'link'
         })
       })
-      console.log(this.configuration.applications)
+      console.log('apps', list)
 
       return list
     }
diff --git a/packages/web-runtime/src/store/apps.ts b/packages/web-runtime/src/store/apps.ts
index 9960a185fe8..275ab20b9c6 100644
--- a/packages/web-runtime/src/store/apps.ts
+++ b/packages/web-runtime/src/store/apps.ts
@@ -86,7 +86,8 @@ const mutations = {
       ...(appInfo.iconColor && { iconColor: appInfo.iconColor }),
       img: appInfo.img || null,
       config: (state.fileEditorConfigs || {})[appInfo.id],
-      color: appInfo.color || ''
+      color: appInfo.color || '',
+      showInApplicationMenu: appInfo.showInApplicationMenu || false
     }
     state.meta[app.id] = app
   },

From d3a3506ecd9ebfbc71617a3d2e89ecf9cdb8749b Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Mon, 16 Oct 2023 14:18:58 +0200
Subject: [PATCH 03/48] Make apps work in general

---
 packages/web-app-draw-io/src/index.ts         |  2 +
 packages/web-app-text-editor/src/index.ts     | 10 +---
 .../actions/files/useFileActions.ts           |  2 +-
 .../components/Topbar/ApplicationsMenu.vue    | 46 ++++++++++---------
 .../src/components/Topbar/TopBar.vue          |  7 ++-
 .../web-runtime/src/layouts/Application.vue   |  2 -
 packages/web-runtime/src/store/apps.ts        |  3 +-
 7 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/packages/web-app-draw-io/src/index.ts b/packages/web-app-draw-io/src/index.ts
index 561367309a9..247af7a7cc0 100644
--- a/packages/web-app-draw-io/src/index.ts
+++ b/packages/web-app-draw-io/src/index.ts
@@ -26,6 +26,8 @@ const appInfo = {
   name: 'Draw.io',
   id: applicationId,
   icon: 'grid',
+  showInApplicationMenu: true,
+  defaultExtension: 'drawio',
   extensions: [
     {
       extension: 'drawio',
diff --git a/packages/web-app-text-editor/src/index.ts b/packages/web-app-text-editor/src/index.ts
index 59f5e5f9dd8..b1cb603e33a 100644
--- a/packages/web-app-text-editor/src/index.ts
+++ b/packages/web-app-text-editor/src/index.ts
@@ -95,6 +95,7 @@ const appInfo = {
   color: '#EF6C00',
   isFileEditor: true,
   showInApplicationMenu: true,
+  defaultExtension: 'txt',
   extensions: fileExtensions().map((extensionItem) => {
     return {
       extension: extensionItem.extension,
@@ -105,17 +106,8 @@ const appInfo = {
   })
 }
 
-const navItems = (): AppNavigationItem[] => [
-  {
-    enabled: () => {
-      return true
-    }
-  }
-]
-
 export default {
   appInfo,
   routes,
   translations
-  //navItems
 }
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActions.ts b/packages/web-pkg/src/composables/actions/files/useFileActions.ts
index a5234e9189f..b7d770c953b 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActions.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActions.ts
@@ -152,7 +152,7 @@ export const useFileActions = ({ store }: { store?: Store<any> } = {}) => {
 
   const routeOptsHelper = (app, driveAliasAndItem: string, filePath, fileId, mode, shareId) => {
     return {
-      name: app.routeName || app.app,
+      name: app.routeName || app.app || app.id,
       params: {
         driveAliasAndItem,
         filePath,
diff --git a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
index 46ec666bcff..998b30f47c5 100644
--- a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
@@ -56,6 +56,8 @@ import OcApplicationIcon from 'design-system/src/components/OcApplicationIcon/Oc
 import { useGettext } from 'vue3-gettext'
 import * as uuid from 'uuid'
 import {
+  EDITOR_MODE_EDIT,
+  resolveFileNameDuplicate,
   useClientService,
   useFileActions,
   useGetMatchingSpace,
@@ -83,8 +85,6 @@ export default defineComponent({
     const appIconKey = ref('')
     const { getMatchingSpace } = useGetMatchingSpace()
 
-    console.log('registered', props.applicationsList)
-
     const applicationSwitcherLabel = computed(() => {
       return $gettext('Application Switcher')
     })
@@ -94,32 +94,36 @@ export default defineComponent({
     const currentFolder = computed((): SpaceResource => {
       return store.getters['Files/currentFolder']
     })
-    const getAdditionalEventBindings = (item: any) => {
-      if (item.path == '/text-editor') {
-        return {
-          click: async () => {
-            const emptyResource = await webdav.putFileContents(unref(currentFolder), {
-              path: new Date().getTime() + 'empty.txt'
-            })
-            const space = getMatchingSpace(emptyResource)
-            const fileActionsOptions = {
-              resources: [emptyResource],
-              space
-            }
+    const files = computed((): Array<Resource> => store.getters['Files/files'])
+    const onEditorApplicationClick = async (item: any) => {
+      let fileName = $gettext('New file') + `.${item.defaultExtension}`
 
-            const defaultEditorAction = getDefaultEditorAction(fileActionsOptions)
+      if (unref(files).some((f) => f.name === fileName)) {
+        fileName = resolveFileNameDuplicate(fileName, item.defaultExtension, unref(files))
+      }
 
-            if (defaultEditorAction) {
-              defaultEditorAction.handler({ ...fileActionsOptions })
-            }
-          }
+      const emptyResource = await webdav.putFileContents(unref(currentFolder), {
+        path: fileName
+      })
+      const space = getMatchingSpace(emptyResource)
+      openEditor(
+        item,
+        space.getDriveAliasAndItem(emptyResource),
+        emptyResource.webDavPath,
+        emptyResource.id,
+        EDITOR_MODE_EDIT
+      )
+    }
+    const getAdditionalEventBindings = (item: any) => {
+      if (item.showInApplicationMenu && item.defaultExtension) {
+        return {
+          click: () => onEditorApplicationClick(item)
         }
       }
       return {}
     }
     const getAdditionalAttributes = (item: any) => {
-      console.log(item)
-      if (item.path == '/text-editor') {
+      if (item.showInApplicationMenu) {
         return {}
       }
       return {
diff --git a/packages/web-runtime/src/components/Topbar/TopBar.vue b/packages/web-runtime/src/components/Topbar/TopBar.vue
index 7d42f5e4ecf..c940b0b9dc9 100644
--- a/packages/web-runtime/src/components/Topbar/TopBar.vue
+++ b/packages/web-runtime/src/components/Topbar/TopBar.vue
@@ -110,7 +110,7 @@ export default {
               store.getters
                 .getNavItemsByExtension(app.id)
                 .filter((navItem) => isNavItemPermitted(permittedMenus, navItem)).length > 0 ||
-              app.showInApplicationMenu
+              (app.showInApplicationMenu && !permittedMenus.includes('user'))
             )
           }
           return isNavItemPermitted(permittedMenus, app)
@@ -137,10 +137,13 @@ export default {
           }
 
           const app: any = {
+            id: item.id,
             icon: icon,
             iconUrl: iconUrl,
             title: title,
-            color: color
+            color: color,
+            showInApplicationMenu: item.showInApplicationMenu,
+            defaultExtension: item.defaultExtension
           }
 
           if (item.url) {
diff --git a/packages/web-runtime/src/layouts/Application.vue b/packages/web-runtime/src/layouts/Application.vue
index b9b58b90c70..fa21a6bca0a 100644
--- a/packages/web-runtime/src/layouts/Application.vue
+++ b/packages/web-runtime/src/layouts/Application.vue
@@ -214,8 +214,6 @@ export default defineComponent({
           type: 'link'
         })
       })
-      console.log('apps', list)
-
       return list
     }
   },
diff --git a/packages/web-runtime/src/store/apps.ts b/packages/web-runtime/src/store/apps.ts
index 275ab20b9c6..bc9451e660b 100644
--- a/packages/web-runtime/src/store/apps.ts
+++ b/packages/web-runtime/src/store/apps.ts
@@ -87,7 +87,8 @@ const mutations = {
       img: appInfo.img || null,
       config: (state.fileEditorConfigs || {})[appInfo.id],
       color: appInfo.color || '',
-      showInApplicationMenu: appInfo.showInApplicationMenu || false
+      showInApplicationMenu: appInfo.showInApplicationMenu || false,
+      defaultExtension: appInfo.defaultExtension || ''
     }
     state.meta[app.id] = app
   },

From ebba6830ffe1cc5717bc79729081e75eeb3740a1 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Mon, 16 Oct 2023 14:58:47 +0200
Subject: [PATCH 04/48] Fix unittests

---
 .../components/Topbar/ApplicationsMenu.vue    |  6 ++--
 .../Topbar/ApplicationsMenu.spec.ts           | 28 +++++++++++++++++--
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
index 998b30f47c5..c6abf1212d8 100644
--- a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
@@ -78,7 +78,7 @@ export default defineComponent({
   },
   setup(props) {
     const store = useStore()
-    const { openEditor, getDefaultEditorAction } = useFileActions()
+    const { openEditor } = useFileActions()
     const clientService = useClientService()
     const { webdav } = clientService
     const { $gettext } = useGettext()
@@ -133,6 +133,7 @@ export default defineComponent({
         to: item.path
       }
     }
+
     return {
       appIconKey,
       updateAppIcons,
@@ -209,6 +210,3 @@ export default defineComponent({
   }
 }
 </style>
-
-function openEditor(editor: any, arg1: any, webDavPath: any, fileId: any, EDITOR_MODE_EDIT: any,
-shareId: any) { throw new Error('Function not implemented.') }
diff --git a/packages/web-runtime/tests/unit/components/Topbar/ApplicationsMenu.spec.ts b/packages/web-runtime/tests/unit/components/Topbar/ApplicationsMenu.spec.ts
index e2ba647fee5..02e9cb8ca96 100644
--- a/packages/web-runtime/tests/unit/components/Topbar/ApplicationsMenu.spec.ts
+++ b/packages/web-runtime/tests/unit/components/Topbar/ApplicationsMenu.spec.ts
@@ -1,5 +1,14 @@
 import ApplicationsMenu from 'web-runtime/src/components/Topbar/ApplicationsMenu.vue'
-import { defaultComponentMocks, defaultPlugins, shallowMount } from 'web-test-helpers'
+import {
+  RouteLocation,
+  createStore,
+  defaultComponentMocks,
+  defaultPlugins,
+  defaultStoreMockOptions,
+  mount,
+  shallowMount
+} from 'web-test-helpers'
+import { mock } from 'jest-mock-extended'
 
 const menuLinks = [
   {
@@ -25,6 +34,18 @@ describe('ApplicationsMenu component', () => {
 })
 
 function getWrapper(applicationsList = []) {
+  const storeOptions = {
+    ...defaultStoreMockOptions,
+    modules: { ...defaultStoreMockOptions.modules, user: { state: { id: 'alice', uuid: 1 } } }
+  }
+  const store = createStore(storeOptions)
+  const mocks = {
+    ...defaultComponentMocks({
+      currentRoute: mock<RouteLocation>({ query: { app: 'admin-settings' } })
+    }),
+    space: { driveType: 'personal', spaceRoles: { viewer: [], editor: [], manager: [] } }
+  }
+
   return {
     wrapper: shallowMount(ApplicationsMenu, {
       props: {
@@ -32,8 +53,9 @@ function getWrapper(applicationsList = []) {
       },
       global: {
         renderStubDefaultSlot: true,
-        mocks: defaultComponentMocks(),
-        plugins: [...defaultPlugins()]
+        mocks,
+        provide: mocks,
+        plugins: [...defaultPlugins(), store]
       }
     })
   }

From 9d59467af83eec6abc85ec3009de781346a43c81 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Mon, 16 Oct 2023 16:50:19 +0200
Subject: [PATCH 05/48] Add e2e test

---
 .../components/Topbar/ApplicationsMenu.vue    |  1 +
 .../features/smoke/applicationMenu.feature    | 17 ++++++++++++
 .../cucumber/features/smoke/search.feature    |  2 +-
 tests/e2e/cucumber/steps/ui/public.ts         | 26 +++++++++++++++++++
 .../support/objects/app-files/page/public.ts  | 13 ++++++++++
 .../objects/app-files/resource/actions.ts     | 19 ++++++++++++++
 .../support/objects/app-files/utils/editor.ts |  8 ++++++
 .../support/objects/runtime/application.ts    |  4 +--
 8 files changed, 87 insertions(+), 3 deletions(-)
 create mode 100644 tests/e2e/cucumber/features/smoke/applicationMenu.feature

diff --git a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
index c6abf1212d8..034011836c5 100644
--- a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
@@ -32,6 +32,7 @@
               :appearance="n.active ? 'raw-inverse' : 'raw'"
               :variation="n.active ? 'primary' : 'passive'"
               :class="{ 'oc-background-primary-gradient router-link-active': n.active }"
+              :data-test-id="n.id"
               v-bind="getAdditionalAttributes(n)"
               v-on="getAdditionalEventBindings(n)"
             >
diff --git a/tests/e2e/cucumber/features/smoke/applicationMenu.feature b/tests/e2e/cucumber/features/smoke/applicationMenu.feature
new file mode 100644
index 00000000000..3959cc1cd2f
--- /dev/null
+++ b/tests/e2e/cucumber/features/smoke/applicationMenu.feature
@@ -0,0 +1,17 @@
+Feature: Application menu
+  As a user
+  I want to open the editor via the application menu
+  So that I have instant access
+
+  Scenario: Open text editor via application menu
+    Given "Admin" creates following user using API
+      | id    |
+      | Alice |
+    And "Alice" logs in
+    When "Alice" opens the "text-editor" app
+    And "Alice" enters the text "Hello world" in editor "TextEditor"
+    And "Alice" saves the file viewer
+    And "Alice" closes the file viewer
+    Then following resources should be displayed in the files list for user "Alice"
+      | resource     |
+      | New file.txt |
diff --git a/tests/e2e/cucumber/features/smoke/search.feature b/tests/e2e/cucumber/features/smoke/search.feature
index 929fffe36f6..34dbf20feea 100644
--- a/tests/e2e/cucumber/features/smoke/search.feature
+++ b/tests/e2e/cucumber/features/smoke/search.feature
@@ -1,4 +1,4 @@
-Feature: Search
+  Feature: Search
   As a user
   I want to search for resources
   So that I can find them quickly
diff --git a/tests/e2e/cucumber/steps/ui/public.ts b/tests/e2e/cucumber/steps/ui/public.ts
index e9a0910b30a..3633b168b05 100644
--- a/tests/e2e/cucumber/steps/ui/public.ts
+++ b/tests/e2e/cucumber/steps/ui/public.ts
@@ -47,6 +47,32 @@ When(
   }
 )
 
+When(
+  '{string} saves the file viewer',
+  async function (this: World, stepUser: string): Promise<void> {
+    const { page } = this.actorsEnvironment.getActor({ key: stepUser })
+    await editor.save(page)
+  }
+)
+
+When(
+  '{string} enters the text {string} in editor {string}',
+  async function (
+    this: World,
+    stepUser: string,
+    text: string,
+    editorToOpen: string
+  ): Promise<void> {
+    const { page } = this.actorsEnvironment.getActor({ key: stepUser })
+    const pageObject = new objects.applicationFiles.page.Public({ page })
+    await pageObject.fillContentOfOpenDocumentOrMicrosoftWordDocument({
+      page,
+      text,
+      editorToOpen
+    })
+  }
+)
+
 When(
   '{string} should see the content {string} in editor {string}',
   async function (
diff --git a/tests/e2e/support/objects/app-files/page/public.ts b/tests/e2e/support/objects/app-files/page/public.ts
index 24dfde41ee8..563fbc89dbf 100644
--- a/tests/e2e/support/objects/app-files/page/public.ts
+++ b/tests/e2e/support/objects/app-files/page/public.ts
@@ -10,6 +10,7 @@ const dropUploadResourceSelector = '.upload-info-items [data-test-resource-name=
 const toggleUploadDetailsButton = '.upload-info-toggle-details-btn'
 const uploadInfoSuccessLabelSelector = '.upload-info-success'
 const publicLinkAuthorizeButton = '.oc-login-authorize-button'
+
 export class Public {
   #page: Page
 
@@ -94,4 +95,16 @@ export class Public {
   }): Promise<string> {
     return await po.openAndGetContentOfDocument({ page, editorToOpen })
   }
+
+  async fillContentOfOpenDocumentOrMicrosoftWordDocument({
+    page,
+    text,
+    editorToOpen
+  }: {
+    page: Page
+    text: string
+    editorToOpen: string
+  }): Promise<void> {
+    return await po.fillContentOfDocument({ page, text, editorToOpen })
+  }
 }
diff --git a/tests/e2e/support/objects/app-files/resource/actions.ts b/tests/e2e/support/objects/app-files/resource/actions.ts
index f7edd5131d0..c2dfed55e18 100644
--- a/tests/e2e/support/objects/app-files/resource/actions.ts
+++ b/tests/e2e/support/objects/app-files/resource/actions.ts
@@ -102,6 +102,7 @@ const collaboraWelcomeModalIframe = '.iframe-welcome-modal'
 const onlyOfficeCanvasEditorSelector = '#id_viewer_overlay'
 const onlyOfficeCanvasCursorSelector = '#id_target_cursor'
 const collaboraCanvasEditorSelector = '.leaflet-layer'
+const textEditorTextArea = '#text-editor-input'
 
 export const clickResource = async ({
   page,
@@ -311,6 +312,23 @@ const createDocumentFile = async (
   }
 }
 
+export const fillContentOfDocument = async ({
+  page,
+  text,
+  editorToOpen
+}: {
+  page: Page
+  text: string
+  editorToOpen: string
+}): Promise<void> => {
+  switch (editorToOpen) {
+    case 'TextEditor':
+      await page.locator(textEditorTextArea).fill(text)
+      break
+    default:
+      throw new Error("Editor should be 'TextEditor' but found " + editorToOpen)
+  }
+}
 export const openAndGetContentOfDocument = async ({
   page,
   editorToOpen
@@ -637,6 +655,7 @@ export interface moveOrCopyResourceArgs {
   action: 'copy' | 'move'
   method: string
 }
+
 export const pasteResource = async (
   args: Omit<moveOrCopyResourceArgs, 'action' | 'method'>
 ): Promise<void> => {
diff --git a/tests/e2e/support/objects/app-files/utils/editor.ts b/tests/e2e/support/objects/app-files/utils/editor.ts
index eca2e588a03..181656be586 100644
--- a/tests/e2e/support/objects/app-files/utils/editor.ts
+++ b/tests/e2e/support/objects/app-files/utils/editor.ts
@@ -1,6 +1,7 @@
 import { Page } from 'playwright'
 
 const closeTextEditorOrViewerButton = '#app-top-bar-close'
+const saveTextEditorOrViewerButton = '#app-save-action'
 
 export const close = (page: Page): Promise<unknown> => {
   return Promise.all([
@@ -8,3 +9,10 @@ export const close = (page: Page): Promise<unknown> => {
     page.locator(closeTextEditorOrViewerButton).click()
   ])
 }
+
+export const save = async (page: Page): Promise<unknown> => {
+  return Promise.all([
+    page.waitForResponse((res) => res.request().method() === 'PUT' && res.status() === 204),
+    page.locator(saveTextEditorOrViewerButton).click()
+  ])
+}
diff --git a/tests/e2e/support/objects/runtime/application.ts b/tests/e2e/support/objects/runtime/application.ts
index afd14a780b1..e932afa1935 100644
--- a/tests/e2e/support/objects/runtime/application.ts
+++ b/tests/e2e/support/objects/runtime/application.ts
@@ -2,7 +2,7 @@ import { Page } from 'playwright'
 import util from 'util'
 
 const appSwitcherButton = '#_appSwitcherButton'
-const appSelector = `//ul[contains(@class, "applications-list")]//a[@href="#/%s" or @href="/%s"]`
+const appSelector = `//ul[contains(@class, "applications-list")]//*[@data-test-id="%s"]`
 const notificationsBell = `#oc-notifications-bell`
 const notificationsDrop = `#oc-notifications-drop`
 const notificationsLoading = `#oc-notifications-drop .oc-notifications-loading`
@@ -22,7 +22,7 @@ export class Application {
 
   async open({ name }: { name: string }): Promise<void> {
     await this.#page.locator(appSwitcherButton).click()
-    await this.#page.locator(util.format(appSelector, name, name)).click()
+    await this.#page.locator(util.format(appSelector, name)).click()
   }
 
   async getNotificationMessages(): Promise<string[]> {

From 3087003b2be8f3366bc0bf0f055cdd24e23659ed Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Mon, 16 Oct 2023 17:12:26 +0200
Subject: [PATCH 06/48] Add e2e test

---
 tests/e2e/support/objects/runtime/application.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/e2e/support/objects/runtime/application.ts b/tests/e2e/support/objects/runtime/application.ts
index e932afa1935..450a62307d3 100644
--- a/tests/e2e/support/objects/runtime/application.ts
+++ b/tests/e2e/support/objects/runtime/application.ts
@@ -21,6 +21,7 @@ export class Application {
   }
 
   async open({ name }: { name: string }): Promise<void> {
+    await this.#page.waitForTimeout(1000)
     await this.#page.locator(appSwitcherButton).click()
     await this.#page.locator(util.format(appSelector, name)).click()
   }

From 7e5d00193ce3771230a4e73f728012676fed8404 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Mon, 16 Oct 2023 23:27:19 +0200
Subject: [PATCH 07/48] Implement temp files

---
 .../components/Topbar/ApplicationsMenu.vue    | 80 ++++++++++++++++++-
 1 file changed, 79 insertions(+), 1 deletion(-)

diff --git a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
index 034011836c5..610c16af97e 100644
--- a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
@@ -51,7 +51,15 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, ComponentPublicInstance, ref, computed, unref } from 'vue'
+import {
+  defineComponent,
+  PropType,
+  ComponentPublicInstance,
+  ref,
+  computed,
+  unref,
+  watch
+} from 'vue'
 import { OcDrop } from 'design-system/src/components'
 import OcApplicationIcon from 'design-system/src/components/OcApplicationIcon/OcApplicationIcon.vue'
 import { useGettext } from 'vue3-gettext'
@@ -62,6 +70,9 @@ import {
   useClientService,
   useFileActions,
   useGetMatchingSpace,
+  useLocalStorage,
+  useRouteQuery,
+  useRouter,
   useStore
 } from '@ownclouders/web-pkg'
 import { Resource, SpaceResource } from '@ownclouders/web-client'
@@ -85,6 +96,70 @@ export default defineComponent({
     const { $gettext } = useGettext()
     const appIconKey = ref('')
     const { getMatchingSpace } = useGetMatchingSpace()
+    const filesAppOpen = ref(false)
+
+    const tempCreatedFiles = useLocalStorage('oc_tempFiles')
+
+    if (!unref(tempCreatedFiles)) {
+      tempCreatedFiles.value = { files: [] }
+    }
+
+    const addTempFile = (spaceWebDavPath: string, path: string, id: string) => {
+      const temp = { ...tempCreatedFiles.value }
+      temp['files'].push({ spaceWebDavPath, path, id })
+      tempCreatedFiles.value = temp
+    }
+
+    const removeTempFile = (spaceWebDavPath: string, path: string, id: string) => {
+      const temp = { ...tempCreatedFiles.value }
+      const result = temp['files'].filter(
+        (file) =>
+          !(file.spaceWebDavPath === spaceWebDavPath && file.path === path && file.id === id)
+      )
+      temp['files'] = result
+      tempCreatedFiles.value = temp
+    }
+
+    const getTempFileIds = (): Array<{ spaceWebDavPath: string; path: string; id: string }> => {
+      return [...tempCreatedFiles.value['files']]
+    }
+
+    watch(
+      () => props.applicationsList,
+      () => {
+        const filesApp = props.applicationsList.find((app) => app.id === 'files')
+        if (!filesApp.active) {
+          filesAppOpen.value = false
+          return
+        }
+        filesAppOpen.value = true
+      },
+      { deep: true }
+    )
+
+    watch(
+      () => unref(filesAppOpen),
+      () => {
+        if (!unref(filesAppOpen)) {
+          return
+        }
+        const idsToRemove = getTempFileIds()
+        idsToRemove.forEach(async (file) => {
+          console.log(`Removing temp file ${file.path}`)
+          const space = { webDavPath: file.spaceWebDavPath } as SpaceResource
+
+          webdav.getFileInfo(space, { path: file.path }).then((resource) => {
+            if (resource.size > 0) {
+              return
+            }
+            webdav.deleteFile(space, { path: file.path }).then(() => {
+              removeTempFile(file.spaceWebDavPath, file.path, file.id)
+              store.commit('Files/REMOVE_FILES', [{ id: file.id }])
+            })
+          })
+        })
+      }
+    )
 
     const applicationSwitcherLabel = computed(() => {
       return $gettext('Application Switcher')
@@ -106,7 +181,10 @@ export default defineComponent({
       const emptyResource = await webdav.putFileContents(unref(currentFolder), {
         path: fileName
       })
+
       const space = getMatchingSpace(emptyResource)
+      addTempFile(space.webDavPath, emptyResource.path, emptyResource.id as string)
+
       openEditor(
         item,
         space.getDriveAliasAndItem(emptyResource),

From 0d0641e2d3096c105ce035977686e6ba5ab23c9a Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Tue, 17 Oct 2023 08:06:00 +0200
Subject: [PATCH 08/48] Fix local storage not updating

---
 packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
index 610c16af97e..3fad25b95fa 100644
--- a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
@@ -150,6 +150,7 @@ export default defineComponent({
 
           webdav.getFileInfo(space, { path: file.path }).then((resource) => {
             if (resource.size > 0) {
+              removeTempFile(file.spaceWebDavPath, file.path, file.id)
               return
             }
             webdav.deleteFile(space, { path: file.path }).then(() => {

From 4364b0946a0944f004d1052625cb10a63b995c83 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Tue, 17 Oct 2023 08:53:40 +0200
Subject: [PATCH 09/48] clean code a bit

---
 .../src/components/Topbar/ApplicationsMenu.vue           | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
index 3fad25b95fa..824ca0cebf1 100644
--- a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
@@ -104,13 +104,13 @@ export default defineComponent({
       tempCreatedFiles.value = { files: [] }
     }
 
-    const addTempFile = (spaceWebDavPath: string, path: string, id: string) => {
+    const addTempFileToLocalStorage = (spaceWebDavPath: string, path: string, id: string) => {
       const temp = { ...tempCreatedFiles.value }
       temp['files'].push({ spaceWebDavPath, path, id })
       tempCreatedFiles.value = temp
     }
 
-    const removeTempFile = (spaceWebDavPath: string, path: string, id: string) => {
+    const removeTempFileFromLocalStorage = (spaceWebDavPath: string, path: string, id: string) => {
       const temp = { ...tempCreatedFiles.value }
       const result = temp['files'].filter(
         (file) =>
@@ -149,12 +149,11 @@ export default defineComponent({
           const space = { webDavPath: file.spaceWebDavPath } as SpaceResource
 
           webdav.getFileInfo(space, { path: file.path }).then((resource) => {
+            removeTempFileFromLocalStorage(file.spaceWebDavPath, file.path, file.id)
             if (resource.size > 0) {
-              removeTempFile(file.spaceWebDavPath, file.path, file.id)
               return
             }
             webdav.deleteFile(space, { path: file.path }).then(() => {
-              removeTempFile(file.spaceWebDavPath, file.path, file.id)
               store.commit('Files/REMOVE_FILES', [{ id: file.id }])
             })
           })
@@ -184,7 +183,7 @@ export default defineComponent({
       })
 
       const space = getMatchingSpace(emptyResource)
-      addTempFile(space.webDavPath, emptyResource.path, emptyResource.id as string)
+      addTempFileToLocalStorage(space.webDavPath, emptyResource.path, emptyResource.id as string)
 
       openEditor(
         item,

From 1933b92cf68971b5808fc29264b9d0fd2547a6db Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Tue, 17 Oct 2023 10:04:15 +0200
Subject: [PATCH 10/48] Remove deleting empty file

---
 .../components/Topbar/ApplicationsMenu.vue    | 65 -------------------
 1 file changed, 65 deletions(-)

diff --git a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
index 824ca0cebf1..634125a4560 100644
--- a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
@@ -96,70 +96,6 @@ export default defineComponent({
     const { $gettext } = useGettext()
     const appIconKey = ref('')
     const { getMatchingSpace } = useGetMatchingSpace()
-    const filesAppOpen = ref(false)
-
-    const tempCreatedFiles = useLocalStorage('oc_tempFiles')
-
-    if (!unref(tempCreatedFiles)) {
-      tempCreatedFiles.value = { files: [] }
-    }
-
-    const addTempFileToLocalStorage = (spaceWebDavPath: string, path: string, id: string) => {
-      const temp = { ...tempCreatedFiles.value }
-      temp['files'].push({ spaceWebDavPath, path, id })
-      tempCreatedFiles.value = temp
-    }
-
-    const removeTempFileFromLocalStorage = (spaceWebDavPath: string, path: string, id: string) => {
-      const temp = { ...tempCreatedFiles.value }
-      const result = temp['files'].filter(
-        (file) =>
-          !(file.spaceWebDavPath === spaceWebDavPath && file.path === path && file.id === id)
-      )
-      temp['files'] = result
-      tempCreatedFiles.value = temp
-    }
-
-    const getTempFileIds = (): Array<{ spaceWebDavPath: string; path: string; id: string }> => {
-      return [...tempCreatedFiles.value['files']]
-    }
-
-    watch(
-      () => props.applicationsList,
-      () => {
-        const filesApp = props.applicationsList.find((app) => app.id === 'files')
-        if (!filesApp.active) {
-          filesAppOpen.value = false
-          return
-        }
-        filesAppOpen.value = true
-      },
-      { deep: true }
-    )
-
-    watch(
-      () => unref(filesAppOpen),
-      () => {
-        if (!unref(filesAppOpen)) {
-          return
-        }
-        const idsToRemove = getTempFileIds()
-        idsToRemove.forEach(async (file) => {
-          console.log(`Removing temp file ${file.path}`)
-          const space = { webDavPath: file.spaceWebDavPath } as SpaceResource
-
-          webdav.getFileInfo(space, { path: file.path }).then((resource) => {
-            removeTempFileFromLocalStorage(file.spaceWebDavPath, file.path, file.id)
-            if (resource.size > 0) {
-              return
-            }
-            webdav.deleteFile(space, { path: file.path }).then(() => {
-              store.commit('Files/REMOVE_FILES', [{ id: file.id }])
-            })
-          })
-        })
-      }
-    )
 
     const applicationSwitcherLabel = computed(() => {
       return $gettext('Application Switcher')
@@ -183,7 +119,6 @@ export default defineComponent({
       })
 
       const space = getMatchingSpace(emptyResource)
-      addTempFileToLocalStorage(space.webDavPath, emptyResource.path, emptyResource.id as string)
 
       openEditor(
         item,

From b8ce200fe46e16c32545b4d94ccddfaadc2f5e1e Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Tue, 17 Oct 2023 10:50:46 +0200
Subject: [PATCH 11/48] Implement useFolderLink composable

---
 packages/web-pkg/src/components/AppTopBar.vue | 16 ++++-
 .../src/components/Search/ResourcePreview.vue | 52 +++------------
 .../src/composables/folderLink/index.ts       |  1 +
 .../composables/folderLink/useFolderLink.ts   | 65 +++++++++++++++++++
 packages/web-pkg/src/composables/index.ts     |  1 +
 5 files changed, 89 insertions(+), 46 deletions(-)
 create mode 100644 packages/web-pkg/src/composables/folderLink/index.ts
 create mode 100644 packages/web-pkg/src/composables/folderLink/useFolderLink.ts

diff --git a/packages/web-pkg/src/components/AppTopBar.vue b/packages/web-pkg/src/components/AppTopBar.vue
index 2ebc1d24ba3..5292e471408 100644
--- a/packages/web-pkg/src/components/AppTopBar.vue
+++ b/packages/web-pkg/src/components/AppTopBar.vue
@@ -8,6 +8,11 @@
             id="app-top-bar-resource"
             :is-thumbnail-displayed="false"
             :resource="resource"
+            :parent-folder-name="parentFolderName"
+            :parent-folder-link-icon-additional-attributes="
+              parentFolderLinkIconAdditionalAttributes
+            "
+            :is-path-displayed="true"
           />
         </div>
         <div class="oc-flex main-actions">
@@ -77,6 +82,7 @@ import { Resource } from '@ownclouders/web-client/src'
 import { Action } from '../composables/actions/types'
 import ContextActionMenu from './ContextActions/ContextActionMenu.vue'
 import { useGettext } from 'vue3-gettext'
+import { useFolderLink } from '../composables'
 
 export default defineComponent({
   name: 'AppTopBar',
@@ -98,15 +104,21 @@ export default defineComponent({
     }
   },
   emits: ['close'],
-  setup() {
+  setup(props) {
     const { $gettext } = useGettext()
 
     const contextMenuLabel = computed(() => $gettext('Show context menu'))
     const closeButtonLabel = computed(() => $gettext('Close'))
 
+    const { getParentFolderName, getParentFolderLinkIconAdditionalAttributes } = useFolderLink()
+
     return {
       contextMenuLabel,
-      closeButtonLabel
+      closeButtonLabel,
+      parentFolderName: getParentFolderName(props.resource),
+      parentFolderLinkIconAdditionalAttributes: getParentFolderLinkIconAdditionalAttributes(
+        props.resource
+      )
     }
   }
 })
diff --git a/packages/web-pkg/src/components/Search/ResourcePreview.vue b/packages/web-pkg/src/components/Search/ResourcePreview.vue
index 7104cbfac46..ca67ef59aca 100644
--- a/packages/web-pkg/src/components/Search/ResourcePreview.vue
+++ b/packages/web-pkg/src/components/Search/ResourcePreview.vue
@@ -31,7 +31,8 @@ import { dirname } from 'path'
 import {
   useCapabilityShareJailEnabled,
   useGetMatchingSpace,
-  useFileActions
+  useFileActions,
+  useFolderLink
 } from '../../composables'
 import {
   extractParentFolderName,
@@ -63,6 +64,7 @@ export default defineComponent({
   },
   setup(props) {
     const { getInternalSpace, getMatchingSpace } = useGetMatchingSpace()
+    const { getParentFolderName, getParentFolderLinkIconAdditionalAttributes } = useFolderLink()
     const previewData = ref()
 
     const resource = computed((): Resource => {
@@ -86,7 +88,11 @@ export default defineComponent({
       hasShareJail: useCapabilityShareJailEnabled(),
       previewData,
       resource,
-      resourceDisabled
+      resourceDisabled,
+      parentFolderName: getParentFolderName(unref(resource)),
+      parentFolderLinkIconAdditionalAttributes: getParentFolderLinkIconAdditionalAttributes(
+        unref(resource)
+      )
     }
   },
   computed: {
@@ -114,30 +120,6 @@ export default defineComponent({
     matchingSpace() {
       return this.getMatchingSpace(this.resource)
     },
-    parentFolderName() {
-      if (isShareRoot(this.resource)) {
-        return this.$gettext('Shared with me')
-      }
-
-      const parentFolder = extractParentFolderName(this.resource)
-      if (parentFolder) {
-        return parentFolder
-      }
-
-      if (!this.hasShareJail) {
-        return this.$gettext('All files and folders')
-      }
-
-      if (isProjectSpaceResource(this.resource)) {
-        return this.$gettext('Spaces')
-      }
-
-      if (isProjectSpaceResource(this.matchingSpace) || isShareSpaceResource(this.matchingSpace)) {
-        return this.matchingSpace.name
-      }
-
-      return this.$gettext('Personal')
-    },
     displayThumbnails() {
       return (
         !this.configuration?.options?.disablePreviews &&
@@ -155,24 +137,6 @@ export default defineComponent({
         return createLocationSpaces('files-spaces-projects')
       }
       return this.createFolderLink(dirname(this.resource.path), this.resource.parentFolderId)
-    },
-
-    parentFolderLinkIconAdditionalAttributes() {
-      // Identify if resource is project space or is part of a project space and the resource is located in its root
-      if (
-        isProjectSpaceResource(this.resource) ||
-        (isProjectSpaceResource(
-          this.getInternalSpace(this.resource.storageId) || ({} as Resource)
-        ) &&
-          this.resource.path.split('/').length === 2)
-      ) {
-        return {
-          name: 'layout-grid',
-          'fill-type': 'fill'
-        }
-      }
-
-      return {}
     }
   },
   mounted() {
diff --git a/packages/web-pkg/src/composables/folderLink/index.ts b/packages/web-pkg/src/composables/folderLink/index.ts
new file mode 100644
index 00000000000..d9529b979f4
--- /dev/null
+++ b/packages/web-pkg/src/composables/folderLink/index.ts
@@ -0,0 +1 @@
+export * from './useFolderLink'
diff --git a/packages/web-pkg/src/composables/folderLink/useFolderLink.ts b/packages/web-pkg/src/composables/folderLink/useFolderLink.ts
new file mode 100644
index 00000000000..f7473e8f427
--- /dev/null
+++ b/packages/web-pkg/src/composables/folderLink/useFolderLink.ts
@@ -0,0 +1,65 @@
+import { Resource } from '@ownclouders/web-client'
+import {
+  extractParentFolderName,
+  isProjectSpaceResource,
+  isShareRoot,
+  isShareSpaceResource
+} from '@ownclouders/web-client/src/helpers'
+import { useGettext } from 'vue3-gettext'
+import { unref } from 'vue'
+import { computed } from 'vue/dist/vue'
+import { useCapabilityShareJailEnabled } from '../capability'
+import { useGetMatchingSpace } from '../spaces'
+
+export const useFolderLink = () => {
+  const { $gettext } = useGettext()
+  const hasShareJail = useCapabilityShareJailEnabled()
+  const { getInternalSpace, getMatchingSpace } = useGetMatchingSpace()
+
+  const getParentFolderName = (resource: Resource) => {
+    if (isShareRoot(resource)) {
+      return $gettext('Shared with me')
+    }
+
+    const parentFolder = extractParentFolderName(resource)
+    if (parentFolder) {
+      return parentFolder
+    }
+
+    if (!unref(hasShareJail)) {
+      return $gettext('All files and folders')
+    }
+
+    if (isProjectSpaceResource(resource)) {
+      return $gettext('Spaces')
+    }
+
+    const matchingSpace = unref(getMatchingSpace(resource))
+    if (isProjectSpaceResource(matchingSpace) || isShareSpaceResource(matchingSpace)) {
+      return matchingSpace.name
+    }
+
+    return $gettext('Personal')
+  }
+
+  const getParentFolderLinkIconAdditionalAttributes = (resource: Resource) => {
+    // Identify if resource is project space or is part of a project space and the resource is located in its root
+    if (
+      isProjectSpaceResource(resource) ||
+      (isProjectSpaceResource(getInternalSpace(resource.storageId) || ({} as Resource)) &&
+        resource.path.split('/').length === 2)
+    ) {
+      return {
+        name: 'layout-grid',
+        'fill-type': 'fill'
+      }
+    }
+
+    return {}
+  }
+
+  return {
+    getParentFolderName,
+    getParentFolderLinkIconAdditionalAttributes
+  }
+}
diff --git a/packages/web-pkg/src/composables/index.ts b/packages/web-pkg/src/composables/index.ts
index 9d854304270..1c5f20fa2a2 100644
--- a/packages/web-pkg/src/composables/index.ts
+++ b/packages/web-pkg/src/composables/index.ts
@@ -29,4 +29,5 @@ export * from './spaces'
 export * from './store'
 export * from './upload'
 export * from './viewMode'
+export * from './folderLink'
 export * from './embedMode'

From 28f1ad95e738d3970e3f1fff448b5e39d9968eac Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Tue, 17 Oct 2023 13:06:20 +0200
Subject: [PATCH 12/48] Lint

---
 packages/web-app-text-editor/src/index.ts           |  2 +-
 .../src/components/Search/ResourcePreview.vue       |  8 +-------
 .../src/composables/folderLink/useFolderLink.ts     |  1 -
 .../src/components/Topbar/ApplicationsMenu.vue      | 13 +------------
 .../unit/components/Topbar/ApplicationsMenu.spec.ts |  1 -
 5 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/packages/web-app-text-editor/src/index.ts b/packages/web-app-text-editor/src/index.ts
index b1cb603e33a..9cbf9853a1b 100644
--- a/packages/web-app-text-editor/src/index.ts
+++ b/packages/web-app-text-editor/src/index.ts
@@ -1,6 +1,6 @@
 import translations from '../l10n/translations.json'
 import TextEditor from './App.vue'
-import { AppNavigationItem, AppWrapperRoute } from '@ownclouders/web-pkg'
+import { AppWrapperRoute } from '@ownclouders/web-pkg'
 
 // just a dummy function to trick gettext tools
 function $gettext(msg) {
diff --git a/packages/web-pkg/src/components/Search/ResourcePreview.vue b/packages/web-pkg/src/components/Search/ResourcePreview.vue
index ca67ef59aca..09396c7957c 100644
--- a/packages/web-pkg/src/components/Search/ResourcePreview.vue
+++ b/packages/web-pkg/src/components/Search/ResourcePreview.vue
@@ -34,13 +34,7 @@ import {
   useFileActions,
   useFolderLink
 } from '../../composables'
-import {
-  extractParentFolderName,
-  isProjectSpaceResource,
-  isShareRoot,
-  isShareSpaceResource,
-  Resource
-} from '@ownclouders/web-client/src/helpers'
+import { isProjectSpaceResource, Resource } from '@ownclouders/web-client/src/helpers'
 import { eventBus } from '../../services'
 import { createFileRouteOptions, isResourceTxtFileAlmostEmpty } from '../../helpers'
 import { SearchResultValue } from './types'
diff --git a/packages/web-pkg/src/composables/folderLink/useFolderLink.ts b/packages/web-pkg/src/composables/folderLink/useFolderLink.ts
index f7473e8f427..d502da087bf 100644
--- a/packages/web-pkg/src/composables/folderLink/useFolderLink.ts
+++ b/packages/web-pkg/src/composables/folderLink/useFolderLink.ts
@@ -7,7 +7,6 @@ import {
 } from '@ownclouders/web-client/src/helpers'
 import { useGettext } from 'vue3-gettext'
 import { unref } from 'vue'
-import { computed } from 'vue/dist/vue'
 import { useCapabilityShareJailEnabled } from '../capability'
 import { useGetMatchingSpace } from '../spaces'
 
diff --git a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
index 634125a4560..c16d2d732fa 100644
--- a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
@@ -51,15 +51,7 @@
 </template>
 
 <script lang="ts">
-import {
-  defineComponent,
-  PropType,
-  ComponentPublicInstance,
-  ref,
-  computed,
-  unref,
-  watch
-} from 'vue'
+import { defineComponent, PropType, ComponentPublicInstance, ref, computed, unref } from 'vue'
 import { OcDrop } from 'design-system/src/components'
 import OcApplicationIcon from 'design-system/src/components/OcApplicationIcon/OcApplicationIcon.vue'
 import { useGettext } from 'vue3-gettext'
@@ -70,9 +62,6 @@ import {
   useClientService,
   useFileActions,
   useGetMatchingSpace,
-  useLocalStorage,
-  useRouteQuery,
-  useRouter,
   useStore
 } from '@ownclouders/web-pkg'
 import { Resource, SpaceResource } from '@ownclouders/web-client'
diff --git a/packages/web-runtime/tests/unit/components/Topbar/ApplicationsMenu.spec.ts b/packages/web-runtime/tests/unit/components/Topbar/ApplicationsMenu.spec.ts
index 02e9cb8ca96..209f7f3f2c9 100644
--- a/packages/web-runtime/tests/unit/components/Topbar/ApplicationsMenu.spec.ts
+++ b/packages/web-runtime/tests/unit/components/Topbar/ApplicationsMenu.spec.ts
@@ -5,7 +5,6 @@ import {
   defaultComponentMocks,
   defaultPlugins,
   defaultStoreMockOptions,
-  mount,
   shallowMount
 } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'

From eeec37ee82ad211b39424c9915ff831ad624666e Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Tue, 17 Oct 2023 14:11:42 +0200
Subject: [PATCH 13/48] Add priority ordering to app menu items

---
 .../src/components/OcResource/OcResource.vue  | 198 +++++++++---------
 packages/web-app-admin-settings/src/index.ts  |   6 +-
 packages/web-app-draw-io/src/index.ts         |   6 +-
 packages/web-app-files/src/index.ts           |   6 +-
 packages/web-app-text-editor/src/index.ts     |   6 +-
 .../components/Topbar/ApplicationsMenu.vue    |  10 +-
 .../src/components/Topbar/TopBar.vue          |   6 +-
 .../web-runtime/src/layouts/Application.vue   |  18 +-
 packages/web-runtime/src/store/apps.ts        |   2 +-
 9 files changed, 141 insertions(+), 117 deletions(-)

diff --git a/packages/design-system/src/components/OcResource/OcResource.vue b/packages/design-system/src/components/OcResource/OcResource.vue
index 7753d7744ba..72d2e7a170c 100644
--- a/packages/design-system/src/components/OcResource/OcResource.vue
+++ b/packages/design-system/src/components/OcResource/OcResource.vue
@@ -292,6 +292,7 @@ export default defineComponent({
     a {
       text-decoration: none;
     }
+
     a:hover,
     a:focus {
       outline-offset: 0;
@@ -301,6 +302,20 @@ export default defineComponent({
   &-indicators {
     display: flex;
 
+    a {
+      &:hover {
+        background-color: var(--oc-color-input-bg);
+        border-radius: 2px;
+      }
+
+      .text {
+        &:hover {
+          color: var(--oc-color-text-default);
+          text-decoration: underline;
+        }
+      }
+    }
+
     .parent-folder {
       display: flex;
       align-items: center;
@@ -315,15 +330,6 @@ export default defineComponent({
       .text {
         font-size: 0.8125rem;
         color: var(--oc-color-text-muted);
-        &:hover {
-          color: var(--oc-color-text-default);
-          text-decoration: underline;
-        }
-      }
-
-      &:hover {
-        background-color: var(--oc-color-input-bg);
-        border-radius: 2px;
       }
     }
   }
@@ -331,94 +337,94 @@ export default defineComponent({
 </style>
 
 <docs>
-  ```js
-    <template>
-      <div>
-        <oc-resource :resource="documents" parent-folder-link="parentFolderLink" class="oc-mb" />
-        <oc-resource :resource="notes" is-path-displayed="true" class="oc-mb" />
-        <oc-resource :resource="notes" is-resource-clickable="false" class="oc-mb" />
-        <oc-resource :resource="notes" :is-extension-displayed="false" class="oc-mb" />
-        <oc-resource :resource="forest" is-path-displayed="true" />
-        <oc-resource :resource="something" is-path-displayed="true" parent-folder-name="Example parent folder"  />
-      </div>
-    </template>
-    <script>
-    export default {
-      computed: {
-        documents() {
-          return {
-            name: "Documents",
-            path: "/Documents",
-            indicators: [],
-            type: "folder",
-            isFolder: true
-          }
-        },
-        notes() {
-          return {
-            name: "notes.txt",
-            extension: "txt",
-            path: "Documents/notes.txt",
-            indicators: this.indicators,
-            type: "file",
-            isFolder: false
-          }
-        },
-        forest() {
-          return {
-            name: "forest-image-with-filename-with-a-lot-of-characters.jpg",
-            extension: "jpg",
-            path: "images/nature/forest-image-with-filename-with-a-lot-of-characters.jpg",
-            thumbnail: "https://picsum.photos/200/300",
-            indicators: [],
-            type: "file",
-            isFolder: false,
-            opensInNewWindow: true,
-          }
-        },
-        something() {
-          return {
-            name: "another-image.jpg",
-            extension: "jpg",
-            path: "another-image.jpg",
-            thumbnail: "https://picsum.photos/200/300",
-            indicators: [],
-            type: "file",
-            isFolder: false,
-            opensInNewWindow: true,
+```js
+<template>
+  <div>
+    <oc-resource :resource="documents" parent-folder-link="parentFolderLink" class="oc-mb"/>
+    <oc-resource :resource="notes" is-path-displayed="true" class="oc-mb"/>
+    <oc-resource :resource="notes" is-resource-clickable="false" class="oc-mb"/>
+    <oc-resource :resource="notes" :is-extension-displayed="false" class="oc-mb"/>
+    <oc-resource :resource="forest" is-path-displayed="true"/>
+    <oc-resource :resource="something" is-path-displayed="true" parent-folder-name="Example parent folder"/>
+  </div>
+</template>
+<script>
+  export default {
+    computed: {
+      documents() {
+        return {
+          name: "Documents",
+          path: "/Documents",
+          indicators: [],
+          type: "folder",
+          isFolder: true
+        }
+      },
+      notes() {
+        return {
+          name: "notes.txt",
+          extension: "txt",
+          path: "Documents/notes.txt",
+          indicators: this.indicators,
+          type: "file",
+          isFolder: false
+        }
+      },
+      forest() {
+        return {
+          name: "forest-image-with-filename-with-a-lot-of-characters.jpg",
+          extension: "jpg",
+          path: "images/nature/forest-image-with-filename-with-a-lot-of-characters.jpg",
+          thumbnail: "https://picsum.photos/200/300",
+          indicators: [],
+          type: "file",
+          isFolder: false,
+          opensInNewWindow: true,
+        }
+      },
+      something() {
+        return {
+          name: "another-image.jpg",
+          extension: "jpg",
+          path: "another-image.jpg",
+          thumbnail: "https://picsum.photos/200/300",
+          indicators: [],
+          type: "file",
+          isFolder: false,
+          opensInNewWindow: true,
+        }
+      },
+      indicators() {
+        return [
+          {
+            id: 'files-sharing',
+            label: "Shared with other people",
+            visible: true,
+            icon: 'group',
+            handler: (resource, indicatorId) => alert(`Resource: ${resource.name}, indicator: ${indicatorId}`)
+          },
+          {
+            id: 'file-link',
+            label: "Shared via link",
+            visible: true,
+            icon: 'link',
           }
-        },
-        indicators() {
-          return [
-            {
-              id: 'files-sharing',
-              label: "Shared with other people",
-              visible: true,
-              icon: 'group',
-              handler: (resource, indicatorId) => alert(`Resource: ${resource.name}, indicator: ${indicatorId}`)
-            },
-            {
-              id: 'file-link',
-              label: "Shared via link",
-              visible: true,
-              icon: 'link',
-            }
-          ]
-        },
-        parentFolderLink() {
-          return {
-            name: "home",
-            params: {
-              action: "copy",
-              item: 'Documents',
-            },
-            query: {
-              resource: "notes"
-            }
+        ]
+      },
+      parentFolderLink() {
+        return {
+          name: "home",
+          params: {
+            action: "copy",
+            item: 'Documents',
+          },
+          query: {
+            resource: "notes"
           }
         }
-      },
-    }
-  </script>
-  ```
+      }
+    },
+  }
+</script>
+```
 </docs>
diff --git a/packages/web-app-admin-settings/src/index.ts b/packages/web-app-admin-settings/src/index.ts
index 86203706add..8210063e786 100644
--- a/packages/web-app-admin-settings/src/index.ts
+++ b/packages/web-app-admin-settings/src/index.ts
@@ -16,7 +16,11 @@ const appInfo = {
   id: 'admin-settings',
   icon: 'settings-4',
   color: '#2b2b2b',
-  isFileEditor: false
+  isFileEditor: false,
+  applicationMenu: {
+    enabled: () => true,
+    priority: 40
+  }
 }
 
 const routes = ({ $ability }: { $ability: Ability }) => [
diff --git a/packages/web-app-draw-io/src/index.ts b/packages/web-app-draw-io/src/index.ts
index 247af7a7cc0..77ed30890c6 100644
--- a/packages/web-app-draw-io/src/index.ts
+++ b/packages/web-app-draw-io/src/index.ts
@@ -26,7 +26,11 @@ const appInfo = {
   name: 'Draw.io',
   id: applicationId,
   icon: 'grid',
-  showInApplicationMenu: true,
+  applicationMenu: {
+    enabled: () => true,
+    priority: 30,
+    openAsEditor: true
+  },
   defaultExtension: 'drawio',
   extensions: [
     {
diff --git a/packages/web-app-files/src/index.ts b/packages/web-app-files/src/index.ts
index b43bf2473af..984466084a0 100644
--- a/packages/web-app-files/src/index.ts
+++ b/packages/web-app-files/src/index.ts
@@ -35,7 +35,11 @@ const appInfo = {
   color: 'var(--oc-color-swatch-primary-muted)',
   isFileEditor: false,
   extensions: [],
-  fileSideBars
+  fileSideBars,
+  applicationMenu: {
+    enabled: () => true,
+    priority: 10
+  }
 }
 export const navItems = (context): AppNavigationItem[] => {
   return [
diff --git a/packages/web-app-text-editor/src/index.ts b/packages/web-app-text-editor/src/index.ts
index 9cbf9853a1b..9ee73333fc7 100644
--- a/packages/web-app-text-editor/src/index.ts
+++ b/packages/web-app-text-editor/src/index.ts
@@ -94,7 +94,11 @@ const appInfo = {
   icon: 'file-text',
   color: '#EF6C00',
   isFileEditor: true,
-  showInApplicationMenu: true,
+  applicationMenu: {
+    enabled: () => true,
+    priority: 20,
+    openAsEditor: true
+  },
   defaultExtension: 'txt',
   extensions: fileExtensions().map((extensionItem) => {
     return {
diff --git a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
index c16d2d732fa..80a2ecba6cf 100644
--- a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
@@ -77,7 +77,7 @@ export default defineComponent({
       default: () => []
     }
   },
-  setup(props) {
+  setup() {
     const store = useStore()
     const { openEditor } = useFileActions()
     const clientService = useClientService()
@@ -118,7 +118,7 @@ export default defineComponent({
       )
     }
     const getAdditionalEventBindings = (item: any) => {
-      if (item.showInApplicationMenu && item.defaultExtension) {
+      if (item.applicationMenu?.openAsEditor) {
         return {
           click: () => onEditorApplicationClick(item)
         }
@@ -126,7 +126,7 @@ export default defineComponent({
       return {}
     }
     const getAdditionalAttributes = (item: any) => {
-      if (item.showInApplicationMenu) {
+      if (item.applicationMenu?.openAsEditor) {
         return {}
       }
       return {
@@ -159,12 +159,14 @@ export default defineComponent({
 .oc-drop {
   width: 280px;
 }
+
 .applications-list li {
   margin: var(--oc-space-xsmall) 0;
 
   &:first-child {
     margin-top: 0;
   }
+
   &:last-child {
     margin-bottom: 0;
   }
@@ -183,6 +185,7 @@ export default defineComponent({
         color: var(--oc-color-swatch-primary-contrast) !important;
       }
     }
+
     &.oc-button-passive-raw {
       &:focus,
       &:hover {
@@ -193,6 +196,7 @@ export default defineComponent({
     &:focus {
       text-decoration: none;
     }
+
     &:hover {
       background-color: var(--oc-color-background-hover);
       text-decoration: none;
diff --git a/packages/web-runtime/src/components/Topbar/TopBar.vue b/packages/web-runtime/src/components/Topbar/TopBar.vue
index c940b0b9dc9..4abfe6c085a 100644
--- a/packages/web-runtime/src/components/Topbar/TopBar.vue
+++ b/packages/web-runtime/src/components/Topbar/TopBar.vue
@@ -110,7 +110,9 @@ export default {
               store.getters
                 .getNavItemsByExtension(app.id)
                 .filter((navItem) => isNavItemPermitted(permittedMenus, navItem)).length > 0 ||
-              (app.showInApplicationMenu && !permittedMenus.includes('user'))
+              (app.applicationMenu.enabled instanceof Function &&
+                app.applicationMenu.enabled() &&
+                !permittedMenus.includes('user'))
             )
           }
           return isNavItemPermitted(permittedMenus, app)
@@ -142,7 +144,7 @@ export default {
             iconUrl: iconUrl,
             title: title,
             color: color,
-            showInApplicationMenu: item.showInApplicationMenu,
+            applicationMenu: item.applicationMenu,
             defaultExtension: item.defaultExtension
           }
 
diff --git a/packages/web-runtime/src/layouts/Application.vue b/packages/web-runtime/src/layouts/Application.vue
index fa21a6bca0a..b816a69dffe 100644
--- a/packages/web-runtime/src/layouts/Application.vue
+++ b/packages/web-runtime/src/layouts/Application.vue
@@ -189,17 +189,8 @@ export default defineComponent({
     applicationsList() {
       const list = []
 
-      // Get extensions which have at least one nav item
-      this.getExtensionsWithNavItems.forEach((extensionId) => {
-        list.push({
-          ...this.apps[extensionId],
-          type: 'extension'
-        })
-      })
-
-      // Add extensions with showInApplicationMenu
       Object.values(this.apps).forEach((app: any) => {
-        if (app.showInApplicationMenu) {
+        if (app.applicationMenu.enabled instanceof Function && app.applicationMenu.enabled()) {
           list.push({
             ...app,
             type: 'extension'
@@ -214,7 +205,12 @@ export default defineComponent({
           type: 'link'
         })
       })
-      return list
+
+      return list.sort(
+        (a, b) =>
+          (a.applicationMenu?.priority || Number.MAX_SAFE_INTEGER) -
+          (b.applicationMenu?.priority || Number.MAX_SAFE_INTEGER)
+      )
     }
   },
   mounted() {
diff --git a/packages/web-runtime/src/store/apps.ts b/packages/web-runtime/src/store/apps.ts
index bc9451e660b..86f5c4fedd7 100644
--- a/packages/web-runtime/src/store/apps.ts
+++ b/packages/web-runtime/src/store/apps.ts
@@ -87,7 +87,7 @@ const mutations = {
       img: appInfo.img || null,
       config: (state.fileEditorConfigs || {})[appInfo.id],
       color: appInfo.color || '',
-      showInApplicationMenu: appInfo.showInApplicationMenu || false,
+      applicationMenu: appInfo.applicationMenu || {},
       defaultExtension: appInfo.defaultExtension || ''
     }
     state.meta[app.id] = app

From 6a6c6a99589c556d41b89c7ddd1b09adea82ca6e Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Tue, 17 Oct 2023 14:45:01 +0200
Subject: [PATCH 14/48] Adjust colors

---
 packages/web-app-draw-io/src/index.ts         | 1 +
 packages/web-app-text-editor/src/index.ts     | 2 +-
 packages/web-pkg/src/components/AppTopBar.vue | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/web-app-draw-io/src/index.ts b/packages/web-app-draw-io/src/index.ts
index 77ed30890c6..15ae4cf33ca 100644
--- a/packages/web-app-draw-io/src/index.ts
+++ b/packages/web-app-draw-io/src/index.ts
@@ -26,6 +26,7 @@ const appInfo = {
   name: 'Draw.io',
   id: applicationId,
   icon: 'grid',
+  color: '#EF6C00',
   applicationMenu: {
     enabled: () => true,
     priority: 30,
diff --git a/packages/web-app-text-editor/src/index.ts b/packages/web-app-text-editor/src/index.ts
index 9ee73333fc7..f8638b8ab87 100644
--- a/packages/web-app-text-editor/src/index.ts
+++ b/packages/web-app-text-editor/src/index.ts
@@ -92,7 +92,7 @@ const appInfo = {
   name: $gettext('Text Editor'),
   id: appId,
   icon: 'file-text',
-  color: '#EF6C00',
+  color: '#7b27b6',
   isFileEditor: true,
   applicationMenu: {
     enabled: () => true,
diff --git a/packages/web-pkg/src/components/AppTopBar.vue b/packages/web-pkg/src/components/AppTopBar.vue
index 5292e471408..404a1d6e37a 100644
--- a/packages/web-pkg/src/components/AppTopBar.vue
+++ b/packages/web-pkg/src/components/AppTopBar.vue
@@ -151,6 +151,12 @@ export default defineComponent({
     flex-basis: 250px;
     margin: 0;
   }
+
+  .oc-resource-indicators {
+    .text {
+      color: var(--oc-color-swatch-brand-contrast);
+    }
+  }
 }
 
 .open-file-bar {

From a940746059369c01c4f387c8a280ce1664eda3b6 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Wed, 18 Oct 2023 14:09:34 +0200
Subject: [PATCH 15/48] WIP

---
 packages/web-runtime/src/App.vue              | 25 +++++++++++++++--
 .../components/Topbar/ApplicationsMenu.vue    | 27 ++++++++++++++++---
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/packages/web-runtime/src/App.vue b/packages/web-runtime/src/App.vue
index 5699cda4481..5954f08c519 100644
--- a/packages/web-runtime/src/App.vue
+++ b/packages/web-runtime/src/App.vue
@@ -54,10 +54,10 @@ import SkipTo from './components/SkipTo.vue'
 import LayoutApplication from './layouts/Application.vue'
 import LayoutLoading from './layouts/Loading.vue'
 import LayoutPlain from './layouts/Plain.vue'
-import { defineComponent } from 'vue'
+import { computed, defineComponent, unref, watch } from 'vue'
 import { isPublicLinkContext, isUserContext } from './router'
 import { additionalTranslations } from './helpers/additionalTranslations' // eslint-disable-line
-import { eventBus } from '@ownclouders/web-pkg'
+import { eventBus, useRouter } from '@ownclouders/web-pkg'
 import { useHead } from './composables/head'
 import { useStore } from '@ownclouders/web-pkg'
 
@@ -67,7 +67,28 @@ export default defineComponent({
   },
   setup() {
     const store = useStore()
+    const router = useRouter()
     useHead({ store })
+
+    const activeRoutePath = computed(() => router.resolve(unref(router.currentRoute)).path)
+
+    watch(
+      () => unref(router.currentRoute),
+      (newValue, oldValue) => {
+        if (newValue === oldValue) {
+          return
+        }
+        const oldApp = oldValue.path.split('/')[1]
+        const newApp = newValue.path.split('/')[1]
+        if (oldApp === newApp) {
+          return
+        }
+        //store.commit('Files/SET_CURRENT_FOLDER', null)
+        console.log(newValue)
+        console.log(newValue.path)
+      }
+    )
+    //activeRoutePath?.startsWith(app.path)
   },
   data() {
     return {
diff --git a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
index 80a2ecba6cf..900f19a8520 100644
--- a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
@@ -51,7 +51,15 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, ComponentPublicInstance, ref, computed, unref } from 'vue'
+import {
+  defineComponent,
+  PropType,
+  ComponentPublicInstance,
+  ref,
+  computed,
+  unref,
+  watch
+} from 'vue'
 import { OcDrop } from 'design-system/src/components'
 import OcApplicationIcon from 'design-system/src/components/OcApplicationIcon/OcApplicationIcon.vue'
 import { useGettext } from 'vue3-gettext'
@@ -65,6 +73,7 @@ import {
   useStore
 } from '@ownclouders/web-pkg'
 import { Resource, SpaceResource } from '@ownclouders/web-client'
+import { isPersonalSpaceResource } from '@ownclouders/web-client/src/helpers'
 
 export default defineComponent({
   components: {
@@ -96,14 +105,24 @@ export default defineComponent({
       return store.getters['Files/currentFolder']
     })
     const files = computed((): Array<Resource> => store.getters['Files/files'])
+
     const onEditorApplicationClick = async (item: any) => {
+      console.log(unref(currentFolder))
+      let destinationSpace = unref(currentFolder)
+      let destinationFiles = unref(files)
+      if (!destinationSpace) {
+        destinationSpace = unref(store.getters['runtime/spaces/spaces']).find(
+          ({ drive }) => !isPersonalSpaceResource(drive as SpaceResource)
+        )
+        destinationFiles = (await webdav.listFiles(destinationSpace)).children
+      }
       let fileName = $gettext('New file') + `.${item.defaultExtension}`
 
-      if (unref(files).some((f) => f.name === fileName)) {
-        fileName = resolveFileNameDuplicate(fileName, item.defaultExtension, unref(files))
+      if (destinationFiles.some((f) => f.name === fileName)) {
+        fileName = resolveFileNameDuplicate(fileName, item.defaultExtension, destinationFiles)
       }
 
-      const emptyResource = await webdav.putFileContents(unref(currentFolder), {
+      const emptyResource = await webdav.putFileContents(destinationSpace, {
         path: fileName
       })
 

From f196dc7288064ce076580187978f4ee9e4a51839 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Wed, 18 Oct 2023 14:25:00 +0200
Subject: [PATCH 16/48] Set destination for new file

---
 packages/web-runtime/src/App.vue                | 17 ++++++-----------
 .../src/components/Topbar/ApplicationsMenu.vue  | 10 +---------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/packages/web-runtime/src/App.vue b/packages/web-runtime/src/App.vue
index 5954f08c519..49bc90eed02 100644
--- a/packages/web-runtime/src/App.vue
+++ b/packages/web-runtime/src/App.vue
@@ -70,22 +70,17 @@ export default defineComponent({
     const router = useRouter()
     useHead({ store })
 
-    const activeRoutePath = computed(() => router.resolve(unref(router.currentRoute)).path)
+    const activeApp = computed(
+      () => router.resolve(unref(router.currentRoute)).path.split('/')?.[1]
+    )
 
     watch(
-      () => unref(router.currentRoute),
-      (newValue, oldValue) => {
-        if (newValue === oldValue) {
-          return
-        }
-        const oldApp = oldValue.path.split('/')[1]
-        const newApp = newValue.path.split('/')[1]
+      () => unref(activeApp),
+      (newApp, oldApp) => {
         if (oldApp === newApp) {
           return
         }
-        //store.commit('Files/SET_CURRENT_FOLDER', null)
-        console.log(newValue)
-        console.log(newValue.path)
+        store.commit('Files/SET_CURRENT_FOLDER', null)
       }
     )
     //activeRoutePath?.startsWith(app.path)
diff --git a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
index 900f19a8520..8a199ada708 100644
--- a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
@@ -51,15 +51,7 @@
 </template>
 
 <script lang="ts">
-import {
-  defineComponent,
-  PropType,
-  ComponentPublicInstance,
-  ref,
-  computed,
-  unref,
-  watch
-} from 'vue'
+import { defineComponent, PropType, ComponentPublicInstance, ref, computed, unref } from 'vue'
 import { OcDrop } from 'design-system/src/components'
 import OcApplicationIcon from 'design-system/src/components/OcApplicationIcon/OcApplicationIcon.vue'
 import { useGettext } from 'vue3-gettext'

From d59dd8d6e76eda3445fbeb77cbc296bae9f4475e Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Wed, 18 Oct 2023 14:34:22 +0200
Subject: [PATCH 17/48] add writable check

---
 .../web-runtime/src/components/Topbar/ApplicationsMenu.vue   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
index 8a199ada708..e253bae5573 100644
--- a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
@@ -99,15 +99,16 @@ export default defineComponent({
     const files = computed((): Array<Resource> => store.getters['Files/files'])
 
     const onEditorApplicationClick = async (item: any) => {
-      console.log(unref(currentFolder))
       let destinationSpace = unref(currentFolder)
       let destinationFiles = unref(files)
-      if (!destinationSpace) {
+
+      if (!destinationSpace || !destinationSpace.canCreate()) {
         destinationSpace = unref(store.getters['runtime/spaces/spaces']).find(
           ({ drive }) => !isPersonalSpaceResource(drive as SpaceResource)
         )
         destinationFiles = (await webdav.listFiles(destinationSpace)).children
       }
+
       let fileName = $gettext('New file') + `.${item.defaultExtension}`
 
       if (destinationFiles.some((f) => f.name === fileName)) {

From c5d45208de16905492aef0f7abd0955fb66335d3 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Wed, 18 Oct 2023 14:42:26 +0200
Subject: [PATCH 18/48] remove unneccersary double check

---
 packages/web-runtime/src/layouts/Application.vue | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/web-runtime/src/layouts/Application.vue b/packages/web-runtime/src/layouts/Application.vue
index b816a69dffe..ccaa42f9077 100644
--- a/packages/web-runtime/src/layouts/Application.vue
+++ b/packages/web-runtime/src/layouts/Application.vue
@@ -190,12 +190,10 @@ export default defineComponent({
       const list = []
 
       Object.values(this.apps).forEach((app: any) => {
-        if (app.applicationMenu.enabled instanceof Function && app.applicationMenu.enabled()) {
-          list.push({
-            ...app,
-            type: 'extension'
-          })
-        }
+        list.push({
+          ...app,
+          type: 'extension'
+        })
       })
 
       // Get extensions manually added into config

From 6a3665c09451d307849be2bbd9385e45698e225d Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Wed, 18 Oct 2023 14:58:11 +0200
Subject: [PATCH 19/48] Fix permission error for app menu entries

---
 packages/web-app-admin-settings/src/index.ts          | 5 ++++-
 packages/web-app-draw-io/src/index.ts                 | 5 ++++-
 packages/web-app-text-editor/src/index.ts             | 5 ++++-
 packages/web-runtime/src/components/Topbar/TopBar.vue | 4 +++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/packages/web-app-admin-settings/src/index.ts b/packages/web-app-admin-settings/src/index.ts
index 8210063e786..0a95b623bf7 100644
--- a/packages/web-app-admin-settings/src/index.ts
+++ b/packages/web-app-admin-settings/src/index.ts
@@ -5,6 +5,7 @@ import Groups from './views/Groups.vue'
 import Spaces from './views/Spaces.vue'
 import { Ability } from '@ownclouders/web-client/src/helpers/resource/types'
 import { AppNavigationItem } from '@ownclouders/web-pkg'
+import { Store } from 'vuex'
 
 // just a dummy function to trick gettext tools
 function $gettext(msg) {
@@ -18,7 +19,9 @@ const appInfo = {
   color: '#2b2b2b',
   isFileEditor: false,
   applicationMenu: {
-    enabled: () => true,
+    enabled: (store: Store<unknown>, ability: Ability) => {
+      return !!store.getters?.user?.id && ability.can('read-all', 'Setting')
+    },
     priority: 40
   }
 }
diff --git a/packages/web-app-draw-io/src/index.ts b/packages/web-app-draw-io/src/index.ts
index 15ae4cf33ca..3b9fc191c10 100644
--- a/packages/web-app-draw-io/src/index.ts
+++ b/packages/web-app-draw-io/src/index.ts
@@ -2,6 +2,7 @@ import { Resource } from '@ownclouders/web-client/src'
 import { AppWrapperRoute } from '@ownclouders/web-pkg'
 import translations from '../l10n/translations.json'
 import App from './App.vue'
+import {Store} from "vuex";
 
 const applicationId = 'draw-io'
 
@@ -28,7 +29,9 @@ const appInfo = {
   icon: 'grid',
   color: '#EF6C00',
   applicationMenu: {
-    enabled: () => true,
+    enabled: (store: Store<unknown>) => {
+      return !!store.getters?.user?.id
+    },
     priority: 30,
     openAsEditor: true
   },
diff --git a/packages/web-app-text-editor/src/index.ts b/packages/web-app-text-editor/src/index.ts
index f8638b8ab87..67721317367 100644
--- a/packages/web-app-text-editor/src/index.ts
+++ b/packages/web-app-text-editor/src/index.ts
@@ -1,6 +1,7 @@
 import translations from '../l10n/translations.json'
 import TextEditor from './App.vue'
 import { AppWrapperRoute } from '@ownclouders/web-pkg'
+import {Store} from "vuex";
 
 // just a dummy function to trick gettext tools
 function $gettext(msg) {
@@ -95,7 +96,9 @@ const appInfo = {
   color: '#7b27b6',
   isFileEditor: true,
   applicationMenu: {
-    enabled: () => true,
+    enabled: (store: Store<unknown>) => {
+      return !!store.getters?.user?.id
+    },
     priority: 20,
     openAsEditor: true
   },
diff --git a/packages/web-runtime/src/components/Topbar/TopBar.vue b/packages/web-runtime/src/components/Topbar/TopBar.vue
index 4abfe6c085a..5d37e749f23 100644
--- a/packages/web-runtime/src/components/Topbar/TopBar.vue
+++ b/packages/web-runtime/src/components/Topbar/TopBar.vue
@@ -47,6 +47,7 @@ import Notifications from './Notifications.vue'
 import FeedbackLink from './FeedbackLink.vue'
 import ThemeSwitcher from './ThemeSwitcher.vue'
 import {
+  useAbility,
   useCapabilityNotifications,
   useEmbedMode,
   useRouter,
@@ -77,6 +78,7 @@ export default {
     const isUserContext = useUserContext({ store })
     const language = useGettext()
     const router = useRouter()
+    const ability = useAbility()
     const { isEnabled: isEmbedModeEnabled } = useEmbedMode()
 
     const logoWidth = ref('150px')
@@ -111,7 +113,7 @@ export default {
                 .getNavItemsByExtension(app.id)
                 .filter((navItem) => isNavItemPermitted(permittedMenus, navItem)).length > 0 ||
               (app.applicationMenu.enabled instanceof Function &&
-                app.applicationMenu.enabled() &&
+                app.applicationMenu.enabled(store, ability) &&
                 !permittedMenus.includes('user'))
             )
           }

From 7dc792463f076379aca9457a85594ce3513094fe Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Wed, 18 Oct 2023 15:05:35 +0200
Subject: [PATCH 20/48] Git says modiefied.. I have no clue, but ill push it
 anyway

---
 packages/web-app-draw-io/src/index.ts     | 2 +-
 packages/web-app-text-editor/src/index.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/web-app-draw-io/src/index.ts b/packages/web-app-draw-io/src/index.ts
index 3b9fc191c10..2d87acb28f6 100644
--- a/packages/web-app-draw-io/src/index.ts
+++ b/packages/web-app-draw-io/src/index.ts
@@ -2,7 +2,7 @@ import { Resource } from '@ownclouders/web-client/src'
 import { AppWrapperRoute } from '@ownclouders/web-pkg'
 import translations from '../l10n/translations.json'
 import App from './App.vue'
-import {Store} from "vuex";
+import { Store } from 'vuex'
 
 const applicationId = 'draw-io'
 
diff --git a/packages/web-app-text-editor/src/index.ts b/packages/web-app-text-editor/src/index.ts
index 67721317367..ced7938dd86 100644
--- a/packages/web-app-text-editor/src/index.ts
+++ b/packages/web-app-text-editor/src/index.ts
@@ -1,7 +1,7 @@
 import translations from '../l10n/translations.json'
 import TextEditor from './App.vue'
 import { AppWrapperRoute } from '@ownclouders/web-pkg'
-import {Store} from "vuex";
+import { Store } from 'vuex'
 
 // just a dummy function to trick gettext tools
 function $gettext(msg) {

From 5f5a89d1b2cfee6814d2c95c90dc20ad325c46c9 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Wed, 18 Oct 2023 15:20:39 +0200
Subject: [PATCH 21/48] Add shareId on openEditor

---
 .../web-runtime/src/components/Topbar/ApplicationsMenu.vue    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
index e253bae5573..7d2e946b133 100644
--- a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
@@ -99,6 +99,7 @@ export default defineComponent({
     const files = computed((): Array<Resource> => store.getters['Files/files'])
 
     const onEditorApplicationClick = async (item: any) => {
+      console.log(getMatchingSpace(unref(currentFolder)))
       let destinationSpace = unref(currentFolder)
       let destinationFiles = unref(files)
 
@@ -126,7 +127,8 @@ export default defineComponent({
         space.getDriveAliasAndItem(emptyResource),
         emptyResource.webDavPath,
         emptyResource.id,
-        EDITOR_MODE_EDIT
+        EDITOR_MODE_EDIT,
+        space.shareId
       )
     }
     const getAdditionalEventBindings = (item: any) => {

From a75ddc5a8e32c790c2fd9c145bd9589d297cb798 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Wed, 18 Oct 2023 15:31:04 +0200
Subject: [PATCH 22/48] Fix unittests

---
 .../tests/unit/components/AppTopBar.spec.ts   | 25 +++++++++++++------
 .../__snapshots__/AppTopBar.spec.ts.snap      | 10 ++++----
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/packages/web-pkg/tests/unit/components/AppTopBar.spec.ts b/packages/web-pkg/tests/unit/components/AppTopBar.spec.ts
index 37c7321f4f1..af4398933f3 100644
--- a/packages/web-pkg/tests/unit/components/AppTopBar.spec.ts
+++ b/packages/web-pkg/tests/unit/components/AppTopBar.spec.ts
@@ -1,5 +1,10 @@
 import { mock } from 'jest-mock-extended'
-import { defaultPlugins, shallowMount } from 'web-test-helpers'
+import {
+  createStore,
+  defaultPlugins,
+  defaultStoreMockOptions,
+  shallowMount
+} from 'web-test-helpers'
 import { Resource } from '@ownclouders/web-client/src/helpers'
 import AppTopBar from '../../../src/components/AppTopBar.vue'
 import { Action } from '../../../src/composables/actions'
@@ -7,27 +12,31 @@ import { Action } from '../../../src/composables/actions'
 describe('AppTopBar', () => {
   describe('if no resource is present', () => {
     it('renders only a close button', () => {
-      const { wrapper } = getWrapper()
+      const { wrapper } = getWrapper(mock<Resource>({ path: '/test.txt' }))
       expect(wrapper.html()).toMatchSnapshot()
     })
   })
   describe('if a resource is present', () => {
     it('renders a resource and no actions (if none given) and a close button', () => {
-      const { wrapper } = getWrapper(mock<Resource>())
+      const { wrapper } = getWrapper(mock<Resource>({ path: '/test.txt' }))
       expect(wrapper.html()).toMatchSnapshot()
     })
 
     it('renders a resource and mainActions (if given) and a close button', () => {
-      const { wrapper } = getWrapper(mock<Resource>(), [], [mock<Action>()])
+      const { wrapper } = getWrapper(mock<Resource>({ path: '/test.txt' }), [], [mock<Action>()])
       expect(wrapper.html()).toMatchSnapshot()
     })
 
     it('renders a resource and dropdownActions (if given) and a close button', () => {
-      const { wrapper } = getWrapper(mock<Resource>(), [mock<Action>()], [])
+      const { wrapper } = getWrapper(mock<Resource>({ path: '/test.txt' }), [mock<Action>()], [])
       expect(wrapper.html()).toMatchSnapshot()
     })
     it('renders a resource and dropdownActions as well as mainActions (if both are passed) and a close button', () => {
-      const { wrapper } = getWrapper(mock<Resource>(), [mock<Action>()], [mock<Action>()])
+      const { wrapper } = getWrapper(
+        mock<Resource>({ path: '/test.txt' }),
+        [mock<Action>()],
+        [mock<Action>()]
+      )
       expect(wrapper.html()).toMatchSnapshot()
     })
   })
@@ -38,6 +47,8 @@ function getWrapper(
   dropDownActions: Action[] = [],
   mainActions: Action[] = []
 ) {
+  const storeOptions = { ...defaultStoreMockOptions }
+  const store = createStore(storeOptions)
   return {
     wrapper: shallowMount(AppTopBar, {
       props: {
@@ -46,7 +57,7 @@ function getWrapper(
         resource
       },
       global: {
-        plugins: [...defaultPlugins()]
+        plugins: [...defaultPlugins(), store]
       }
     })
   }
diff --git a/packages/web-pkg/tests/unit/components/__snapshots__/AppTopBar.spec.ts.snap b/packages/web-pkg/tests/unit/components/__snapshots__/AppTopBar.spec.ts.snap
index 24b297c8f87..20cf37d8b6f 100644
--- a/packages/web-pkg/tests/unit/components/__snapshots__/AppTopBar.spec.ts.snap
+++ b/packages/web-pkg/tests/unit/components/__snapshots__/AppTopBar.spec.ts.snap
@@ -5,7 +5,7 @@ exports[`AppTopBar if a resource is present renders a resource and dropdownActio
   <div class="oc-app-top-bar oc-flex">
     <span class="oc-app-top-bar-inner oc-px-m oc-flex oc-flex-middle oc-flex-between">
       <div class="open-file-bar oc-flex">
-        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfoldername="" resource="undefined"></oc-resource-stub>
+        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="true" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="All files and folders" resource="undefined"></oc-resource-stub>
       </div>
       <div class="oc-flex main-actions">
         <!--v-if-->
@@ -23,7 +23,7 @@ exports[`AppTopBar if a resource is present renders a resource and dropdownActio
   <div class="oc-app-top-bar oc-flex">
     <span class="oc-app-top-bar-inner oc-px-m oc-flex oc-flex-middle oc-flex-between">
       <div class="open-file-bar oc-flex">
-        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfoldername="" resource="undefined"></oc-resource-stub>
+        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="true" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="All files and folders" resource="undefined"></oc-resource-stub>
       </div>
       <div class="oc-flex main-actions">
         <context-action-menu-stub actionoptions="[object Object]" appearance="raw-inverse" menusections="[object Object]" variation="brand"></context-action-menu-stub>
@@ -41,7 +41,7 @@ exports[`AppTopBar if a resource is present renders a resource and mainActions (
   <div class="oc-app-top-bar oc-flex">
     <span class="oc-app-top-bar-inner oc-px-m oc-flex oc-flex-middle oc-flex-between">
       <div class="open-file-bar oc-flex">
-        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfoldername="" resource="undefined"></oc-resource-stub>
+        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="true" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="All files and folders" resource="undefined"></oc-resource-stub>
       </div>
       <div class="oc-flex main-actions">
         <context-action-menu-stub actionoptions="[object Object]" appearance="raw-inverse" menusections="[object Object]" variation="brand"></context-action-menu-stub>
@@ -58,7 +58,7 @@ exports[`AppTopBar if a resource is present renders a resource and no actions (i
   <div class="oc-app-top-bar oc-flex">
     <span class="oc-app-top-bar-inner oc-px-m oc-flex oc-flex-middle oc-flex-between">
       <div class="open-file-bar oc-flex">
-        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfoldername="" resource="undefined"></oc-resource-stub>
+        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="true" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="All files and folders" resource="undefined"></oc-resource-stub>
       </div>
       <div class="oc-flex main-actions">
         <!--v-if-->
@@ -75,7 +75,7 @@ exports[`AppTopBar if no resource is present renders only a close button 1`] = `
   <div class="oc-app-top-bar oc-flex">
     <span class="oc-app-top-bar-inner oc-px-m oc-flex oc-flex-middle oc-flex-between">
       <div class="open-file-bar oc-flex">
-        <!--v-if-->
+        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="true" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="All files and folders" resource="undefined"></oc-resource-stub>
       </div>
       <div class="oc-flex main-actions">
         <!--v-if-->

From 663f26dad1737e0719d3e51fd5ce0e50f2eaec34 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Thu, 19 Oct 2023 10:31:01 +0200
Subject: [PATCH 23/48] make use of useFolerLink in ResourceTable

---
 .../components/FilesList/ResourceTable.vue    | 123 +++++-------------
 .../filesList/useResourceRouteResolver.ts     |   7 +-
 .../composables/folderLink/useFolderLink.ts   |  69 ++++++++--
 3 files changed, 97 insertions(+), 102 deletions(-)

diff --git a/packages/web-pkg/src/components/FilesList/ResourceTable.vue b/packages/web-pkg/src/components/FilesList/ResourceTable.vue
index 473b1ef3855..1714d298cca 100644
--- a/packages/web-pkg/src/components/FilesList/ResourceTable.vue
+++ b/packages/web-pkg/src/components/FilesList/ResourceTable.vue
@@ -66,10 +66,10 @@
           :is-icon-displayed="!$slots['image']"
           :is-extension-displayed="areFileExtensionsShown"
           :is-resource-clickable="isResourceClickable(item.id)"
-          :folder-link="folderLink(item)"
-          :parent-folder-link="parentFolderLink(item)"
+          :folder-link="getFolderLink(item)"
+          :parent-folder-link="getParentFolderLink(item)"
           :parent-folder-link-icon-additional-attributes="
-            parentFolderLinkIconAdditionalAttributes(item)
+            getParentFolderLinkIconAdditionalAttributes(item)
           "
           :class="{ 'resource-table-resource-cut': isResourceCut(item) }"
           @click="emitFileClick(item)"
@@ -211,17 +211,9 @@
 <script lang="ts">
 import { defineComponent, PropType, computed, unref, ref, ComputedRef } from 'vue'
 import { mapGetters, mapActions, mapState } from 'vuex'
-import { dirname } from 'path'
 import { useWindowSize } from '@vueuse/core'
 import { Resource } from '@ownclouders/web-client'
-import {
-  extractDomSelector,
-  extractParentFolderName,
-  isProjectSpaceResource,
-  isShareRoot,
-  isShareSpaceResource,
-  SpaceResource
-} from '@ownclouders/web-client/src/helpers'
+import { extractDomSelector, SpaceResource } from '@ownclouders/web-client/src/helpers'
 import { ShareTypes } from '@ownclouders/web-client/src/helpers/share'
 
 import {
@@ -233,7 +225,8 @@ import {
   useUserContext,
   ViewModeConstants,
   useConfigurationManager,
-  useGetMatchingSpace
+  useGetMatchingSpace,
+  useFolderLink
 } from '../../composables'
 import { EVENT_TROW_MOUNTED, EVENT_FILE_DROPPED, ImageDimension } from '../../constants'
 import { eventBus } from '../../services'
@@ -250,7 +243,7 @@ import { useResourceRouteResolver } from '../../composables/filesList/useResourc
 import { ClipboardActions } from '../../helpers/clipboardActions'
 import { determineSortFields } from '../../helpers/ui/resourceTable'
 import { useFileActionsRename } from '../../composables/actions'
-import { createLocationShares, createLocationCommon, createLocationSpaces } from '../../router'
+import { createLocationCommon } from '../../router'
 import get from 'lodash-es/get'
 
 // ODS component import is necessary here for CERN to overwrite OcTable
@@ -444,6 +437,12 @@ export default defineComponent({
   setup(props, context) {
     const store = useStore()
     const configurationManager = useConfigurationManager()
+    const {
+      getFolderLink,
+      getParentFolderLink,
+      getParentFolderName,
+      getParentFolderLinkIconAdditionalAttributes
+    } = useFolderLink()
 
     const { width } = useWindowSize()
     const hasTags = computed(
@@ -486,7 +485,11 @@ export default defineComponent({
           targetRouteCallback: computed(() => props.targetRouteCallback)
         },
         context
-      )
+      ),
+      getFolderLink,
+      getParentFolderLink,
+      getParentFolderName,
+      getParentFolderLinkIconAdditionalAttributes
     }
   },
   data() {
@@ -769,47 +772,6 @@ export default defineComponent({
       }
       eventBus.publish(SideBarEventTopics.openWithPanel, panelToOpen)
     },
-    folderLink(file: Resource) {
-      return this.createFolderLink({
-        path: file.path,
-        fileId: file.fileId,
-        resource: file
-      })
-    },
-    parentFolderLink(file: Resource) {
-      const space = this.getMatchingSpace(file)
-      const parentFolderAccessible = this.isResourceAccessible({
-        space,
-        path: dirname(file.path)
-      })
-      if ((file.shareId && file.path === '/') || !parentFolderAccessible) {
-        return createLocationShares('files-shares-with-me')
-      }
-      if (isProjectSpaceResource(file)) {
-        return createLocationSpaces('files-spaces-projects')
-      }
-
-      return this.createFolderLink({
-        path: dirname(file.path),
-        ...(file.parentFolderId && { fileId: file.parentFolderId }),
-        resource: file
-      })
-    },
-    parentFolderLinkIconAdditionalAttributes(file) {
-      // Identify if resource is project space or is part of a project space and the resource is located in its root
-      if (
-        isProjectSpaceResource(file) ||
-        (isProjectSpaceResource(this.getInternalSpace(file.storageId) || ({} as Resource)) &&
-          file.path.split('/').length === 2)
-      ) {
-        return {
-          name: 'layout-grid',
-          'fill-type': 'fill'
-        }
-      }
-
-      return {}
-    },
     fileDragged(file) {
       this.addSelectedResource(file)
     },
@@ -978,39 +940,6 @@ export default defineComponent({
         resourceType,
         ownerName: resource.owner[0].displayName
       })
-    },
-    getParentFolderName(resource: Resource) {
-      const space = this.getMatchingSpace(resource)
-      const parentFolderAccessible = this.isResourceAccessible({
-        space,
-        path: dirname(resource.path)
-      })
-      if (isShareRoot(resource) || !parentFolderAccessible) {
-        return this.$gettext('Shared with me')
-      }
-      const parentFolder = extractParentFolderName(resource)
-      if (parentFolder) {
-        return parentFolder
-      }
-
-      if (isShareSpaceResource(space)) {
-        return space.name
-      }
-
-      if (this.hasProjectSpaces) {
-        if (isProjectSpaceResource(resource)) {
-          return this.$gettext('Spaces')
-        }
-        if (space?.driveType === 'project') {
-          return space.name
-        }
-      }
-
-      if (!this.hasShareJail) {
-        return this.$gettext('All files and folders')
-      }
-
-      return this.$gettext('Personal')
     }
   }
 })
@@ -1019,10 +948,12 @@ export default defineComponent({
 .oc-table.condensed > tbody > tr {
   height: 0 !important;
 }
+
 .resource-table {
   &-resource-cut {
     opacity: 0.6;
   }
+
   &-resource-wrapper {
     display: flex;
     align-items: center;
@@ -1037,21 +968,26 @@ export default defineComponent({
       }
     }
   }
+
   &-tag {
     max-width: 80px;
   }
+
   &-tag-more {
     cursor: pointer;
     border: 0 !important;
     vertical-align: text-bottom;
   }
+
   &-edit-name {
     display: inline-flex;
     margin-left: var(--oc-space-xsmall);
+
     svg {
       fill: var(--oc-color-text-muted);
     }
   }
+
   &-people {
     position: absolute;
     right: var(--oc-space-xsmall);
@@ -1266,15 +1202,18 @@ export default defineComponent({
     display: none;
   }
 }
+
 .oc-resource-icon-status-badge,
 .oc-resource-thumbnail-status-badge {
   .oc-icon {
     margin-top: -2px;
     margin-left: -1.5px;
+
     svg {
       fill: var(--oc-color-background-default) !important;
     }
   }
+
   .oc-spinner {
     margin-left: -2px;
     margin-top: -2px;
@@ -1288,26 +1227,32 @@ export default defineComponent({
     bottom: 2px !important;
   }
 }
+
 // on table row hover change the status badge background color
 .oc-tbody-tr:hover .oc-resource-icon-status-badge {
   background: var(--oc-color-background-hover) !important;
+
   .oc-icon {
     svg {
       fill: var(--oc-color-background-hover) !important;
     }
   }
+
   .oc-spinner {
     color: var(--oc-color-background-hover) !important;
   }
 }
+
 // on table row highlight change the status badge background color
 .oc-table-highlighted .oc-resource-icon-status-badge {
   background: var(--oc-color-background-highlight) !important;
+
   .oc-icon {
     svg {
       fill: var(--oc-color-background-highlight) !important;
     }
   }
+
   .oc-spinner {
     color: var(--oc-color-background-highlight) !important;
   }
diff --git a/packages/web-pkg/src/composables/filesList/useResourceRouteResolver.ts b/packages/web-pkg/src/composables/filesList/useResourceRouteResolver.ts
index 372da85122d..72acca2403e 100644
--- a/packages/web-pkg/src/composables/filesList/useResourceRouteResolver.ts
+++ b/packages/web-pkg/src/composables/filesList/useResourceRouteResolver.ts
@@ -1,4 +1,4 @@
-import { unref, Ref } from 'vue'
+import {unref, Ref} from 'vue'
 
 import { ConfigurationManager } from '../../configuration'
 import { useGetMatchingSpace } from '../spaces'
@@ -14,7 +14,10 @@ type ResourceRouteResolverOptions = {
   space?: Ref<SpaceResource>
 }
 
-export const useResourceRouteResolver = (options: ResourceRouteResolverOptions, context) => {
+export const useResourceRouteResolver = (
+  options: ResourceRouteResolverOptions,
+  context?: {emit: Function}
+) => {
   const configurationManager = options.configurationManager || useConfigurationManager()
   const targetRouteCallback = options.targetRouteCallback
   const { getInternalSpace, getMatchingSpace } = useGetMatchingSpace(options)
diff --git a/packages/web-pkg/src/composables/folderLink/useFolderLink.ts b/packages/web-pkg/src/composables/folderLink/useFolderLink.ts
index d502da087bf..573a6d0b971 100644
--- a/packages/web-pkg/src/composables/folderLink/useFolderLink.ts
+++ b/packages/web-pkg/src/composables/folderLink/useFolderLink.ts
@@ -7,35 +7,80 @@ import {
 } from '@ownclouders/web-client/src/helpers'
 import { useGettext } from 'vue3-gettext'
 import { unref } from 'vue'
-import { useCapabilityShareJailEnabled } from '../capability'
+import { useCapabilityProjectSpacesEnabled, useCapabilityShareJailEnabled } from '../capability'
 import { useGetMatchingSpace } from '../spaces'
+import { dirname } from 'path'
+import { useResourceRouteResolver } from '../filesList'
+import { createLocationShares, createLocationSpaces } from '../../router'
+import { useConfigurationManager } from '../configuration'
 
 export const useFolderLink = () => {
   const { $gettext } = useGettext()
   const hasShareJail = useCapabilityShareJailEnabled()
-  const { getInternalSpace, getMatchingSpace } = useGetMatchingSpace()
+  const hasProjectSpaces = useCapabilityProjectSpacesEnabled()
+  const { getInternalSpace, getMatchingSpace, isResourceAccessible } = useGetMatchingSpace()
+  const configurationManager = useConfigurationManager()
+  const { createFolderLink } = useResourceRouteResolver({
+    configurationManager
+  })
+
+  const getFolderLink = (resource: Resource) => {
+    return createFolderLink({
+      path: resource.path,
+      fileId: resource.fileId,
+      resource
+    })
+  }
+
+  const getParentFolderLink = (resource: Resource) => {
+    const space = getMatchingSpace(resource)
+    const parentFolderAccessible = isResourceAccessible({
+      space,
+      path: dirname(resource.path)
+    })
+    if ((resource.shareId && resource.path === '/') || !parentFolderAccessible) {
+      return createLocationShares('files-shares-with-me')
+    }
+    if (isProjectSpaceResource(resource)) {
+      return createLocationSpaces('files-spaces-projects')
+    }
+
+    return createFolderLink({
+      path: dirname(resource.path),
+      ...(resource.parentFolderId && { fileId: resource.parentFolderId }),
+      resource
+    })
+  }
 
   const getParentFolderName = (resource: Resource) => {
-    if (isShareRoot(resource)) {
+    const space = getMatchingSpace(resource)
+    const parentFolderAccessible = isResourceAccessible({
+      space,
+      path: dirname(resource.path)
+    })
+    if (isShareRoot(resource) || !parentFolderAccessible) {
       return $gettext('Shared with me')
     }
-
     const parentFolder = extractParentFolderName(resource)
     if (parentFolder) {
       return parentFolder
     }
 
-    if (!unref(hasShareJail)) {
-      return $gettext('All files and folders')
+    if (isShareSpaceResource(space)) {
+      return space.name
     }
 
-    if (isProjectSpaceResource(resource)) {
-      return $gettext('Spaces')
+    if (unref(hasProjectSpaces)) {
+      if (isProjectSpaceResource(resource)) {
+        return $gettext('Spaces')
+      }
+      if (space?.driveType === 'project') {
+        return space.name
+      }
     }
 
-    const matchingSpace = unref(getMatchingSpace(resource))
-    if (isProjectSpaceResource(matchingSpace) || isShareSpaceResource(matchingSpace)) {
-      return matchingSpace.name
+    if (!unref(hasShareJail)) {
+      return $gettext('All files and folders')
     }
 
     return $gettext('Personal')
@@ -58,6 +103,8 @@ export const useFolderLink = () => {
   }
 
   return {
+    getFolderLink,
+    getParentFolderLink,
     getParentFolderName,
     getParentFolderLinkIconAdditionalAttributes
   }

From c77cf2eaec0f3571e28b340dc0e1a30c592e3731 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Thu, 19 Oct 2023 10:39:28 +0200
Subject: [PATCH 24/48] Rm console.log

---
 packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
index 7d2e946b133..efe344dda2d 100644
--- a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
@@ -99,7 +99,6 @@ export default defineComponent({
     const files = computed((): Array<Resource> => store.getters['Files/files'])
 
     const onEditorApplicationClick = async (item: any) => {
-      console.log(getMatchingSpace(unref(currentFolder)))
       let destinationSpace = unref(currentFolder)
       let destinationFiles = unref(files)
 

From 5def28ee73be60e8d59a1acfdb0201d12426c372 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Thu, 19 Oct 2023 10:58:28 +0200
Subject: [PATCH 25/48] Fix class

---
 .../src/composables/filesList/useResourceRouteResolver.ts | 8 +++-----
 .../web-pkg/src/composables/folderLink/useFolderLink.ts   | 6 +-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/packages/web-pkg/src/composables/filesList/useResourceRouteResolver.ts b/packages/web-pkg/src/composables/filesList/useResourceRouteResolver.ts
index 72acca2403e..c75ce1e0ccd 100644
--- a/packages/web-pkg/src/composables/filesList/useResourceRouteResolver.ts
+++ b/packages/web-pkg/src/composables/filesList/useResourceRouteResolver.ts
@@ -1,9 +1,8 @@
-import {unref, Ref} from 'vue'
+import { unref, Ref } from 'vue'
 
 import { ConfigurationManager } from '../../configuration'
 import { useGetMatchingSpace } from '../spaces'
 import { createFileRouteOptions } from '../../helpers/router'
-import { useConfigurationManager } from '../configuration'
 import { createLocationSpaces, createLocationShares } from '../../router'
 import { CreateTargetRouteOptions } from '../../helpers/folderLink/types'
 import { Resource, SpaceResource } from '@ownclouders/web-client/src'
@@ -15,10 +14,9 @@ type ResourceRouteResolverOptions = {
 }
 
 export const useResourceRouteResolver = (
-  options: ResourceRouteResolverOptions,
-  context?: {emit: Function}
+  options: ResourceRouteResolverOptions = {},
+  context?: any
 ) => {
-  const configurationManager = options.configurationManager || useConfigurationManager()
   const targetRouteCallback = options.targetRouteCallback
   const { getInternalSpace, getMatchingSpace } = useGetMatchingSpace(options)
 
diff --git a/packages/web-pkg/src/composables/folderLink/useFolderLink.ts b/packages/web-pkg/src/composables/folderLink/useFolderLink.ts
index 573a6d0b971..027aec06704 100644
--- a/packages/web-pkg/src/composables/folderLink/useFolderLink.ts
+++ b/packages/web-pkg/src/composables/folderLink/useFolderLink.ts
@@ -12,17 +12,13 @@ import { useGetMatchingSpace } from '../spaces'
 import { dirname } from 'path'
 import { useResourceRouteResolver } from '../filesList'
 import { createLocationShares, createLocationSpaces } from '../../router'
-import { useConfigurationManager } from '../configuration'
 
 export const useFolderLink = () => {
   const { $gettext } = useGettext()
   const hasShareJail = useCapabilityShareJailEnabled()
   const hasProjectSpaces = useCapabilityProjectSpacesEnabled()
   const { getInternalSpace, getMatchingSpace, isResourceAccessible } = useGetMatchingSpace()
-  const configurationManager = useConfigurationManager()
-  const { createFolderLink } = useResourceRouteResolver({
-    configurationManager
-  })
+  const { createFolderLink } = useResourceRouteResolver()
 
   const getFolderLink = (resource: Resource) => {
     return createFolderLink({

From 386a5db00c30911214baa94aab815790e98b9e10 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Thu, 19 Oct 2023 13:19:52 +0200
Subject: [PATCH 26/48] Fix AppTopBar unittest

---
 .../tests/unit/components/AppTopBar.spec.ts   | 39 ++++++++++++++++---
 .../__snapshots__/AppTopBar.spec.ts.snap      | 10 ++---
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/packages/web-pkg/tests/unit/components/AppTopBar.spec.ts b/packages/web-pkg/tests/unit/components/AppTopBar.spec.ts
index af4398933f3..60a977cf421 100644
--- a/packages/web-pkg/tests/unit/components/AppTopBar.spec.ts
+++ b/packages/web-pkg/tests/unit/components/AppTopBar.spec.ts
@@ -1,6 +1,8 @@
 import { mock } from 'jest-mock-extended'
 import {
+  RouteLocation,
   createStore,
+  defaultComponentMocks,
   defaultPlugins,
   defaultStoreMockOptions,
   shallowMount
@@ -8,32 +10,52 @@ import {
 import { Resource } from '@ownclouders/web-client/src/helpers'
 import AppTopBar from '../../../src/components/AppTopBar.vue'
 import { Action } from '../../../src/composables/actions'
+import { ConfigurationManager } from '../../../types'
+
+jest.mock('../../../src/composables/configuration/useConfigurationManager', () => ({
+  useConfigurationManager: () =>
+    mock<ConfigurationManager>({
+      options: {
+        routing: {
+          fullShareOwnerPaths: false
+        }
+      }
+    })
+}))
 
 describe('AppTopBar', () => {
   describe('if no resource is present', () => {
     it('renders only a close button', () => {
-      const { wrapper } = getWrapper(mock<Resource>({ path: '/test.txt' }))
+      const { wrapper } = getWrapper(mock<Resource>({ path: '/test.txt', shareRoot: '/test' }))
       expect(wrapper.html()).toMatchSnapshot()
     })
   })
   describe('if a resource is present', () => {
     it('renders a resource and no actions (if none given) and a close button', () => {
-      const { wrapper } = getWrapper(mock<Resource>({ path: '/test.txt' }))
+      const { wrapper } = getWrapper(mock<Resource>({ path: '/test.txt', shareRoot: '/test' }))
       expect(wrapper.html()).toMatchSnapshot()
     })
 
     it('renders a resource and mainActions (if given) and a close button', () => {
-      const { wrapper } = getWrapper(mock<Resource>({ path: '/test.txt' }), [], [mock<Action>()])
+      const { wrapper } = getWrapper(
+        mock<Resource>({ path: '/test.txt', shareRoot: '/test' }),
+        [],
+        [mock<Action>()]
+      )
       expect(wrapper.html()).toMatchSnapshot()
     })
 
     it('renders a resource and dropdownActions (if given) and a close button', () => {
-      const { wrapper } = getWrapper(mock<Resource>({ path: '/test.txt' }), [mock<Action>()], [])
+      const { wrapper } = getWrapper(
+        mock<Resource>({ path: '/test.txt', shareRoot: '/test' }),
+        [mock<Action>()],
+        []
+      )
       expect(wrapper.html()).toMatchSnapshot()
     })
     it('renders a resource and dropdownActions as well as mainActions (if both are passed) and a close button', () => {
       const { wrapper } = getWrapper(
-        mock<Resource>({ path: '/test.txt' }),
+        mock<Resource>({ path: '/test.txt', shareRoot: '/test' }),
         [mock<Action>()],
         [mock<Action>()]
       )
@@ -49,6 +71,9 @@ function getWrapper(
 ) {
   const storeOptions = { ...defaultStoreMockOptions }
   const store = createStore(storeOptions)
+  const mocks = defaultComponentMocks({
+    currentRoute: mock<RouteLocation>({ name: 'admin-settings-general' })
+  })
   return {
     wrapper: shallowMount(AppTopBar, {
       props: {
@@ -57,7 +82,9 @@ function getWrapper(
         resource
       },
       global: {
-        plugins: [...defaultPlugins(), store]
+        plugins: [...defaultPlugins(), store],
+        mocks,
+        provide: mocks
       }
     })
   }
diff --git a/packages/web-pkg/tests/unit/components/__snapshots__/AppTopBar.spec.ts.snap b/packages/web-pkg/tests/unit/components/__snapshots__/AppTopBar.spec.ts.snap
index 20cf37d8b6f..e184ac94fd3 100644
--- a/packages/web-pkg/tests/unit/components/__snapshots__/AppTopBar.spec.ts.snap
+++ b/packages/web-pkg/tests/unit/components/__snapshots__/AppTopBar.spec.ts.snap
@@ -5,7 +5,7 @@ exports[`AppTopBar if a resource is present renders a resource and dropdownActio
   <div class="oc-app-top-bar oc-flex">
     <span class="oc-app-top-bar-inner oc-px-m oc-flex oc-flex-middle oc-flex-between">
       <div class="open-file-bar oc-flex">
-        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="true" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="All files and folders" resource="undefined"></oc-resource-stub>
+        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="true" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" resource="undefined"></oc-resource-stub>
       </div>
       <div class="oc-flex main-actions">
         <!--v-if-->
@@ -23,7 +23,7 @@ exports[`AppTopBar if a resource is present renders a resource and dropdownActio
   <div class="oc-app-top-bar oc-flex">
     <span class="oc-app-top-bar-inner oc-px-m oc-flex oc-flex-middle oc-flex-between">
       <div class="open-file-bar oc-flex">
-        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="true" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="All files and folders" resource="undefined"></oc-resource-stub>
+        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="true" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" resource="undefined"></oc-resource-stub>
       </div>
       <div class="oc-flex main-actions">
         <context-action-menu-stub actionoptions="[object Object]" appearance="raw-inverse" menusections="[object Object]" variation="brand"></context-action-menu-stub>
@@ -41,7 +41,7 @@ exports[`AppTopBar if a resource is present renders a resource and mainActions (
   <div class="oc-app-top-bar oc-flex">
     <span class="oc-app-top-bar-inner oc-px-m oc-flex oc-flex-middle oc-flex-between">
       <div class="open-file-bar oc-flex">
-        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="true" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="All files and folders" resource="undefined"></oc-resource-stub>
+        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="true" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" resource="undefined"></oc-resource-stub>
       </div>
       <div class="oc-flex main-actions">
         <context-action-menu-stub actionoptions="[object Object]" appearance="raw-inverse" menusections="[object Object]" variation="brand"></context-action-menu-stub>
@@ -58,7 +58,7 @@ exports[`AppTopBar if a resource is present renders a resource and no actions (i
   <div class="oc-app-top-bar oc-flex">
     <span class="oc-app-top-bar-inner oc-px-m oc-flex oc-flex-middle oc-flex-between">
       <div class="open-file-bar oc-flex">
-        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="true" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="All files and folders" resource="undefined"></oc-resource-stub>
+        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="true" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" resource="undefined"></oc-resource-stub>
       </div>
       <div class="oc-flex main-actions">
         <!--v-if-->
@@ -75,7 +75,7 @@ exports[`AppTopBar if no resource is present renders only a close button 1`] = `
   <div class="oc-app-top-bar oc-flex">
     <span class="oc-app-top-bar-inner oc-px-m oc-flex oc-flex-middle oc-flex-between">
       <div class="open-file-bar oc-flex">
-        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="true" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="All files and folders" resource="undefined"></oc-resource-stub>
+        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="true" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" resource="undefined"></oc-resource-stub>
       </div>
       <div class="oc-flex main-actions">
         <!--v-if-->

From 00a1e2d9a6c5d34eeb7ea42e2b67b9e5f6c91539 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Thu, 19 Oct 2023 13:50:44 +0200
Subject: [PATCH 27/48] Remove old unittests

---
 .../components/Search/ResourcePreview.spec.ts | 56 -------------------
 1 file changed, 56 deletions(-)

diff --git a/packages/web-pkg/tests/unit/components/Search/ResourcePreview.spec.ts b/packages/web-pkg/tests/unit/components/Search/ResourcePreview.spec.ts
index a0dde0dc33f..5837f74fe63 100644
--- a/packages/web-pkg/tests/unit/components/Search/ResourcePreview.spec.ts
+++ b/packages/web-pkg/tests/unit/components/Search/ResourcePreview.spec.ts
@@ -38,62 +38,6 @@ describe('Preview component', () => {
       expect(wrapper.vm.parentFolderLink.params.driveAliasAndItem).toEqual(driveAliasAndItem)
     })
   })
-
-  describe('computed method "parentFolderName"', () => {
-    it('should equal "All files and folders" if spaces capability is not present', () => {
-      const { wrapper } = getWrapper({
-        hasShareJail: false
-      })
-      expect(wrapper.vm.parentFolderName).toEqual('All files and folders')
-    })
-    it('should equal the space name if resource storage is representing a project space', () => {
-      const { wrapper } = getWrapper({
-        space: mock<SpaceResource>({
-          id: '1',
-          driveType: 'project',
-          name: 'New space',
-          getDriveAliasAndItem: jest.fn()
-        })
-      })
-      expect(wrapper.vm.parentFolderName).toEqual('New space')
-    })
-    it('should equal the share name if resource is representing a file or folder in the root of a share', () => {
-      const { wrapper } = getWrapper({
-        searchResult: {
-          id: '1',
-          data: {
-            path: '/My share/test.txt',
-            shareRoot: '/My share',
-            shareId: '1'
-          }
-        }
-      })
-      expect(wrapper.vm.parentFolderName).toEqual('My share')
-    })
-    it('should equal the "Shared with me" if resource is representing the root share', () => {
-      const { wrapper } = getWrapper({
-        searchResult: {
-          id: '1',
-          data: {
-            path: '/My share',
-            shareRoot: '/My share',
-            shareId: '1',
-            isShareRoot: () => true
-          }
-        }
-      })
-      expect(wrapper.vm.parentFolderName).toEqual('Shared with me')
-    })
-    it('should equal "Personal" if resource storage is not representing the personal home', () => {
-      const { wrapper } = getWrapper({
-        space: mock<SpaceResource>({
-          id: 1,
-          driveType: 'personal'
-        })
-      })
-      expect(wrapper.vm.parentFolderName).toEqual('Personal')
-    })
-  })
 })
 
 function getWrapper({

From 7b9fff169b07ac0defa99a164e5fbf915aab3801 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Thu, 19 Oct 2023 14:56:53 +0200
Subject: [PATCH 28/48] WIP add useFolderLink unittests

---
 .../src/helpers/router/routeOptions.ts        |   1 +
 .../folderLink/useFolderLink.spec.ts          | 142 ++++++++++++++++++
 2 files changed, 143 insertions(+)
 create mode 100644 packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts

diff --git a/packages/web-pkg/src/helpers/router/routeOptions.ts b/packages/web-pkg/src/helpers/router/routeOptions.ts
index 542ae89cc8a..2be31629bf3 100644
--- a/packages/web-pkg/src/helpers/router/routeOptions.ts
+++ b/packages/web-pkg/src/helpers/router/routeOptions.ts
@@ -22,6 +22,7 @@ export const createFileRouteOptions = (
   options?: { configurationManager?: ConfigurationManager }
 ): { params: RouteParams; query: LocationQuery } => {
   const config = options?.configurationManager || configurationManager
+  console.log(1337, options?.configurationManager)
   return {
     params: {
       driveAliasAndItem: space.getDriveAliasAndItem({ path: target.path || '' } as Resource)
diff --git a/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts b/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts
new file mode 100644
index 00000000000..dfbe32460d0
--- /dev/null
+++ b/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts
@@ -0,0 +1,142 @@
+import { mock } from 'jest-mock-extended'
+import {
+  RouteLocation,
+  createStore,
+  defaultComponentMocks,
+  defaultStoreMockOptions,
+  getComposableWrapper
+} from 'web-test-helpers'
+import { useFolderLink } from '../../../../src/composables'
+import { ConfigurationManager } from '../../../../src/configuration'
+
+jest.mock('../../../../src/composables/configuration/useConfigurationManager', () => ({
+  useConfigurationManager: () =>
+    mock<ConfigurationManager>({
+      options: {
+        routing: {
+          fullShareOwnerPaths: false,
+          idBased: true
+        }
+      }
+    })
+}))
+
+/*jest.mock('../../../../src/composables', () => ({
+  ...jest.requireActual('../../../../src/composables'),
+  useConfigurationManager: () =>
+    mockDeep<ConfigurationManager>({
+      options: {
+        routing: {
+          fullShareOwnerPaths: true
+        }
+      }
+    })
+}))*/
+
+describe('useFolderLink', () => {
+  it('getFolderLink should return the correct folder link', () => {
+    const resource = {
+      path: '/my-folder',
+      id: '1',
+      fileId: '1',
+      storageId: '1'
+    }
+    const wrapper = createWrapper()
+
+    const folderLink = wrapper.vm.getFolderLink(resource)
+    expect(folderLink).toEqual({
+      name: 'files-spaces-generic',
+      params: { driveAliasAndItem: 'personal/admin' },
+      query: {}
+    })
+  })
+
+  it('getParentFolderLink should return the correct parent folder link', () => {
+    const resource = {
+      path: '/my-folder',
+      id: '1',
+      fileId: '1',
+      storageId: '1',
+      parentFolderId: '1'
+    }
+
+    const wrapper = createWrapper()
+    const parentFolderLink = wrapper.vm.getParentFolderLink(resource)
+    expect(parentFolderLink).toEqual({
+      name: 'files-spaces-generic',
+      params: { driveAliasAndItem: 'personal/admin' },
+      query: {}
+    })
+  })
+  /*
+  it('getParentFolderName should return the correct parent folder name', () => {
+    const resource = {
+      path: '/my-folder',
+      shareId: 456
+      // ... other properties as needed
+    }
+
+    const { result } = renderHook(() => useFolderLink())
+
+    const parentFolderName = result.current.getParentFolderName(resource)
+    expect(parentFolderName).toBe('Shared with me')
+  })
+
+  it('getParentFolderLinkIconAdditionalAttributes should return the correct icon attributes', () => {
+    // Similar setup as the previous tests
+    const resource = {
+      path: '/my-folder'
+      // ... other properties as needed
+    }
+
+    const { result } = renderHook(() => useFolderLink())
+
+    const iconAttributes = result.current.getParentFolderLinkIconAdditionalAttributes(resource)
+    expect(iconAttributes).toEqual({
+      name: 'layout-grid',
+      'fill-type': 'fill'
+    })
+  })*/
+})
+
+const createWrapper = () => {
+  const storeOptions = { ...defaultStoreMockOptions }
+  storeOptions.modules.runtime.modules.spaces.getters.spaces = jest.fn(() => [
+    {
+      id: '1',
+      fileId: '1',
+      driveType: 'personal',
+      getDriveAliasAndItem: () => 'personal/admin'
+    }
+  ])
+  const store = createStore(storeOptions)
+  const mocks = defaultComponentMocks({
+    /*currentRoute: mock<RouteLocation>({
+      name: 'files-spaces-generic',
+      path: '/',
+      query: { fileId: undefined }
+    })*/
+  })
+  return getComposableWrapper(
+    () => {
+      const {
+        getParentFolderLink,
+        getFolderLink,
+        getParentFolderName,
+        getParentFolderLinkIconAdditionalAttributes
+      } = useFolderLink()
+
+      return {
+        getParentFolderLink,
+        getFolderLink,
+        getParentFolderName,
+        getParentFolderLinkIconAdditionalAttributes
+      }
+    },
+    {
+      mocks,
+      provide: mocks,
+      store
+    }
+  )
+}

From f9f85d23e92f04159f37c5c785794c08c834c1f9 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Thu, 19 Oct 2023 15:11:13 +0200
Subject: [PATCH 29/48] Fix tests

---
 .../folderLink/useFolderLink.spec.ts          | 85 +++++++++++--------
 1 file changed, 49 insertions(+), 36 deletions(-)

diff --git a/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts b/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts
index dfbe32460d0..a525613411d 100644
--- a/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts
@@ -7,9 +7,22 @@ import {
   getComposableWrapper
 } from 'web-test-helpers'
 import { useFolderLink } from '../../../../src/composables'
-import { ConfigurationManager } from '../../../../src/configuration'
+import { ConfigurationManager, configurationManager } from '../../../../src/configuration'
 
-jest.mock('../../../../src/composables/configuration/useConfigurationManager', () => ({
+jest.mock('../../../../src/configuration', () => {
+  return {
+    configurationManager: {
+      options: {
+        routing: {
+          fullShareOwnerPaths: false,
+          idBased: true
+        }
+      }
+    }
+  }
+})
+
+jest.mock('../../../../src/composables/configuration', () => ({
   useConfigurationManager: () =>
     mock<ConfigurationManager>({
       options: {
@@ -37,8 +50,8 @@ describe('useFolderLink', () => {
   it('getFolderLink should return the correct folder link', () => {
     const resource = {
       path: '/my-folder',
-      id: '1',
-      fileId: '1',
+      id: '2',
+      fileId: '2',
       storageId: '1'
     }
     const wrapper = createWrapper()
@@ -47,16 +60,16 @@ describe('useFolderLink', () => {
     expect(folderLink).toEqual({
       name: 'files-spaces-generic',
       params: { driveAliasAndItem: 'personal/admin' },
-      query: {}
+      query: {fileId: '2'}
     })
   })
 
   it('getParentFolderLink should return the correct parent folder link', () => {
     const resource = {
       path: '/my-folder',
-      id: '1',
-      fileId: '1',
-      storageId: '1',
+      id: '2',
+      fileId: '2',
+      storageId: '2',
       parentFolderId: '1'
     }
 
@@ -65,38 +78,38 @@ describe('useFolderLink', () => {
     expect(parentFolderLink).toEqual({
       name: 'files-spaces-generic',
       params: { driveAliasAndItem: 'personal/admin' },
-      query: {}
+      query: { fileId: '1' }
     })
   })
   /*
-  it('getParentFolderName should return the correct parent folder name', () => {
-    const resource = {
-      path: '/my-folder',
-      shareId: 456
-      // ... other properties as needed
-    }
+        it('getParentFolderName should return the correct parent folder name', () => {
+          const resource = {
+            path: '/my-folder',
+            shareId: 456
+            // ... other properties as needed
+          }
 
-    const { result } = renderHook(() => useFolderLink())
+          const { result } = renderHook(() => useFolderLink())
 
-    const parentFolderName = result.current.getParentFolderName(resource)
-    expect(parentFolderName).toBe('Shared with me')
-  })
+          const parentFolderName = result.current.getParentFolderName(resource)
+          expect(parentFolderName).toBe('Shared with me')
+        })
 
-  it('getParentFolderLinkIconAdditionalAttributes should return the correct icon attributes', () => {
-    // Similar setup as the previous tests
-    const resource = {
-      path: '/my-folder'
-      // ... other properties as needed
-    }
+        it('getParentFolderLinkIconAdditionalAttributes should return the correct icon attributes', () => {
+          // Similar setup as the previous tests
+          const resource = {
+            path: '/my-folder'
+            // ... other properties as needed
+          }
 
-    const { result } = renderHook(() => useFolderLink())
+          const { result } = renderHook(() => useFolderLink())
 
-    const iconAttributes = result.current.getParentFolderLinkIconAdditionalAttributes(resource)
-    expect(iconAttributes).toEqual({
-      name: 'layout-grid',
-      'fill-type': 'fill'
-    })
-  })*/
+          const iconAttributes = result.current.getParentFolderLinkIconAdditionalAttributes(resource)
+          expect(iconAttributes).toEqual({
+            name: 'layout-grid',
+            'fill-type': 'fill'
+          })
+        })*/
 })
 
 const createWrapper = () => {
@@ -112,10 +125,10 @@ const createWrapper = () => {
   const store = createStore(storeOptions)
   const mocks = defaultComponentMocks({
     /*currentRoute: mock<RouteLocation>({
-      name: 'files-spaces-generic',
-      path: '/',
-      query: { fileId: undefined }
-    })*/
+                  name: 'files-spaces-generic',
+                  path: '/',
+                  query: { fileId: undefined }
+                })*/
   })
   return getComposableWrapper(
     () => {

From 8f49c36199cc672a897a855decd2308e5d2ed362 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Thu, 19 Oct 2023 16:02:46 +0200
Subject: [PATCH 30/48] Add more tests

---
 .../src/helpers/router/routeOptions.ts        |   1 -
 .../folderLink/useFolderLink.spec.ts          | 101 +++++++++++-------
 2 files changed, 65 insertions(+), 37 deletions(-)

diff --git a/packages/web-pkg/src/helpers/router/routeOptions.ts b/packages/web-pkg/src/helpers/router/routeOptions.ts
index 2be31629bf3..542ae89cc8a 100644
--- a/packages/web-pkg/src/helpers/router/routeOptions.ts
+++ b/packages/web-pkg/src/helpers/router/routeOptions.ts
@@ -22,7 +22,6 @@ export const createFileRouteOptions = (
   options?: { configurationManager?: ConfigurationManager }
 ): { params: RouteParams; query: LocationQuery } => {
   const config = options?.configurationManager || configurationManager
-  console.log(1337, options?.configurationManager)
   return {
     params: {
       driveAliasAndItem: space.getDriveAliasAndItem({ path: target.path || '' } as Resource)
diff --git a/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts b/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts
index a525613411d..1e9a2ecc714 100644
--- a/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts
@@ -1,13 +1,12 @@
 import { mock } from 'jest-mock-extended'
 import {
-  RouteLocation,
   createStore,
   defaultComponentMocks,
   defaultStoreMockOptions,
   getComposableWrapper
 } from 'web-test-helpers'
 import { useFolderLink } from '../../../../src/composables'
-import { ConfigurationManager, configurationManager } from '../../../../src/configuration'
+import { ConfigurationManager } from '../../../../src/configuration'
 
 jest.mock('../../../../src/configuration', () => {
   return {
@@ -60,7 +59,7 @@ describe('useFolderLink', () => {
     expect(folderLink).toEqual({
       name: 'files-spaces-generic',
       params: { driveAliasAndItem: 'personal/admin' },
-      query: {fileId: '2'}
+      query: { fileId: '2' }
     })
   })
 
@@ -69,7 +68,7 @@ describe('useFolderLink', () => {
       path: '/my-folder',
       id: '2',
       fileId: '2',
-      storageId: '2',
+      storageId: '1',
       parentFolderId: '1'
     }
 
@@ -81,55 +80,85 @@ describe('useFolderLink', () => {
       query: { fileId: '1' }
     })
   })
-  /*
-        it('getParentFolderName should return the correct parent folder name', () => {
-          const resource = {
-            path: '/my-folder',
-            shareId: 456
-            // ... other properties as needed
-          }
 
-          const { result } = renderHook(() => useFolderLink())
+  describe('getParentFolderName should return the correct parent folder name', () => {
+    it('should equal "Personal" if share jail is enabled', () => {
+      const resource = {
+        path: '/my-folder',
+        storageId: '1'
+      }
+
+      const wrapper = createWrapper()
+      const parentFolderName = wrapper.vm.getParentFolderName(resource)
+      expect(parentFolderName).toEqual('Personal')
+    })
+    it('should equal "All files and folders" if share jail disabled', () => {
+      const resource = {
+        path: '/my-folder',
+        storageId: '1'
+      }
 
-          const parentFolderName = result.current.getParentFolderName(resource)
-          expect(parentFolderName).toBe('Shared with me')
-        })
+      const wrapper = createWrapper({ hasShareJail: false })
+      const parentFolderName = wrapper.vm.getParentFolderName(resource)
+      expect(parentFolderName).toEqual('All files and folders')
+    })
+    it('should equal the space name if resource storage is representing a project space', () => {
+      const resource = {
+        path: '/my-folder',
+        storageId: '2'
+      }
 
-        it('getParentFolderLinkIconAdditionalAttributes should return the correct icon attributes', () => {
-          // Similar setup as the previous tests
-          const resource = {
-            path: '/my-folder'
-            // ... other properties as needed
-          }
+      const wrapper = createWrapper()
+      const parentFolderName = wrapper.vm.getParentFolderName(resource)
+      expect(parentFolderName).toEqual('New space')
+    })
+    it('should equal the "Shared with me" if resource is representing the root share', () => {
+      const resource = {
+        path: '/My share',
+        shareRoot: '/My share',
+        shareId: '1',
+        isShareRoot: () => true
+      }
 
-          const { result } = renderHook(() => useFolderLink())
+      const wrapper = createWrapper()
+      const parentFolderName = wrapper.vm.getParentFolderName(resource)
+      expect(parentFolderName).toEqual('Shared with me')
+    })
+    it('should equal the share name if resource is representing a file or folder in the root of a share', () => {
+      const resource = {
+        path: '/My share/test.txt',
+        shareRoot: '/My share',
+        shareId: '1'
+      }
 
-          const iconAttributes = result.current.getParentFolderLinkIconAdditionalAttributes(resource)
-          expect(iconAttributes).toEqual({
-            name: 'layout-grid',
-            'fill-type': 'fill'
-          })
-        })*/
+      const wrapper = createWrapper()
+      const parentFolderName = wrapper.vm.getParentFolderName(resource)
+      expect(parentFolderName).toEqual('My share')
+    })
+  })
 })
 
-const createWrapper = () => {
+const createWrapper = ({ hasShareJail = true }: { hasShareJail?: boolean } = {}) => {
   const storeOptions = { ...defaultStoreMockOptions }
+  storeOptions.getters.capabilities.mockImplementation(() => ({
+    spaces: { projects: true, share_jail: hasShareJail }
+  }))
   storeOptions.modules.runtime.modules.spaces.getters.spaces = jest.fn(() => [
     {
       id: '1',
       fileId: '1',
       driveType: 'personal',
       getDriveAliasAndItem: () => 'personal/admin'
+    },
+    {
+      id: '2',
+      driveType: 'project',
+      name: 'New space',
+      getDriveAliasAndItem: jest.fn()
     }
   ])
   const store = createStore(storeOptions)
-  const mocks = defaultComponentMocks({
-    /*currentRoute: mock<RouteLocation>({
-                  name: 'files-spaces-generic',
-                  path: '/',
-                  query: { fileId: undefined }
-                })*/
-  })
+  const mocks = defaultComponentMocks({})
   return getComposableWrapper(
     () => {
       const {

From 926846b8539f7f2edecda978219f62e86650ea3b Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Thu, 19 Oct 2023 16:12:55 +0200
Subject: [PATCH 31/48] Refactor

---
 .../src/components/OcResource/OcResource.vue  | 175 +++++++++---------
 1 file changed, 87 insertions(+), 88 deletions(-)

diff --git a/packages/design-system/src/components/OcResource/OcResource.vue b/packages/design-system/src/components/OcResource/OcResource.vue
index 72d2e7a170c..fe37425ae84 100644
--- a/packages/design-system/src/components/OcResource/OcResource.vue
+++ b/packages/design-system/src/components/OcResource/OcResource.vue
@@ -292,7 +292,6 @@ export default defineComponent({
     a {
       text-decoration: none;
     }
-
     a:hover,
     a:focus {
       outline-offset: 0;
@@ -337,94 +336,94 @@ export default defineComponent({
 </style>
 
 <docs>
-```js
-<template>
-  <div>
-    <oc-resource :resource="documents" parent-folder-link="parentFolderLink" class="oc-mb"/>
-    <oc-resource :resource="notes" is-path-displayed="true" class="oc-mb"/>
-    <oc-resource :resource="notes" is-resource-clickable="false" class="oc-mb"/>
-    <oc-resource :resource="notes" :is-extension-displayed="false" class="oc-mb"/>
-    <oc-resource :resource="forest" is-path-displayed="true"/>
-    <oc-resource :resource="something" is-path-displayed="true" parent-folder-name="Example parent folder"/>
-  </div>
-</template>
-<script>
-  export default {
-    computed: {
-      documents() {
-        return {
-          name: "Documents",
-          path: "/Documents",
-          indicators: [],
-          type: "folder",
-          isFolder: true
-        }
-      },
-      notes() {
-        return {
-          name: "notes.txt",
-          extension: "txt",
-          path: "Documents/notes.txt",
-          indicators: this.indicators,
-          type: "file",
-          isFolder: false
-        }
-      },
-      forest() {
-        return {
-          name: "forest-image-with-filename-with-a-lot-of-characters.jpg",
-          extension: "jpg",
-          path: "images/nature/forest-image-with-filename-with-a-lot-of-characters.jpg",
-          thumbnail: "https://picsum.photos/200/300",
-          indicators: [],
-          type: "file",
-          isFolder: false,
-          opensInNewWindow: true,
-        }
-      },
-      something() {
-        return {
-          name: "another-image.jpg",
-          extension: "jpg",
-          path: "another-image.jpg",
-          thumbnail: "https://picsum.photos/200/300",
-          indicators: [],
-          type: "file",
-          isFolder: false,
-          opensInNewWindow: true,
-        }
-      },
-      indicators() {
-        return [
-          {
-            id: 'files-sharing',
-            label: "Shared with other people",
-            visible: true,
-            icon: 'group',
-            handler: (resource, indicatorId) => alert(`Resource: ${resource.name}, indicator: ${indicatorId}`)
-          },
-          {
-            id: 'file-link',
-            label: "Shared via link",
-            visible: true,
-            icon: 'link',
+  ```js
+    <template>
+      <div>
+        <oc-resource :resource="documents" parent-folder-link="parentFolderLink" class="oc-mb" />
+        <oc-resource :resource="notes" is-path-displayed="true" class="oc-mb" />
+        <oc-resource :resource="notes" is-resource-clickable="false" class="oc-mb" />
+        <oc-resource :resource="notes" :is-extension-displayed="false" class="oc-mb" />
+        <oc-resource :resource="forest" is-path-displayed="true" />
+        <oc-resource :resource="something" is-path-displayed="true" parent-folder-name="Example parent folder"  />
+      </div>
+    </template>
+    <script>
+    export default {
+      computed: {
+        documents() {
+          return {
+            name: "Documents",
+            path: "/Documents",
+            indicators: [],
+            type: "folder",
+            isFolder: true
           }
-        ]
-      },
-      parentFolderLink() {
-        return {
-          name: "home",
-          params: {
-            action: "copy",
-            item: 'Documents',
-          },
-          query: {
-            resource: "notes"
+        },
+        notes() {
+          return {
+            name: "notes.txt",
+            extension: "txt",
+            path: "Documents/notes.txt",
+            indicators: this.indicators,
+            type: "file",
+            isFolder: false
+          }
+        },
+        forest() {
+          return {
+            name: "forest-image-with-filename-with-a-lot-of-characters.jpg",
+            extension: "jpg",
+            path: "images/nature/forest-image-with-filename-with-a-lot-of-characters.jpg",
+            thumbnail: "https://picsum.photos/200/300",
+            indicators: [],
+            type: "file",
+            isFolder: false,
+            opensInNewWindow: true,
+          }
+        },
+        something() {
+          return {
+            name: "another-image.jpg",
+            extension: "jpg",
+            path: "another-image.jpg",
+            thumbnail: "https://picsum.photos/200/300",
+            indicators: [],
+            type: "file",
+            isFolder: false,
+            opensInNewWindow: true,
+          }
+        },
+        indicators() {
+          return [
+            {
+              id: 'files-sharing',
+              label: "Shared with other people",
+              visible: true,
+              icon: 'group',
+              handler: (resource, indicatorId) => alert(`Resource: ${resource.name}, indicator: ${indicatorId}`)
+            },
+            {
+              id: 'file-link',
+              label: "Shared via link",
+              visible: true,
+              icon: 'link',
+            }
+          ]
+        },
+        parentFolderLink() {
+          return {
+            name: "home",
+            params: {
+              action: "copy",
+              item: 'Documents',
+            },
+            query: {
+              resource: "notes"
+            }
           }
         }
-      }
-    },
-  }
-</script>
-```
+      },
+    }
+  </script>
+  ```
 </docs>

From 9109fcf665b7ff98127c5b64f362cd7956bb36c3 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Thu, 19 Oct 2023 16:14:50 +0200
Subject: [PATCH 32/48] Rm unused code

---
 .../composables/folderLink/useFolderLink.spec.ts     | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts b/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts
index 1e9a2ecc714..80385503afd 100644
--- a/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts
@@ -33,18 +33,6 @@ jest.mock('../../../../src/composables/configuration', () => ({
     })
 }))
 
-/*jest.mock('../../../../src/composables', () => ({
-  ...jest.requireActual('../../../../src/composables'),
-  useConfigurationManager: () =>
-    mockDeep<ConfigurationManager>({
-      options: {
-        routing: {
-          fullShareOwnerPaths: true
-        }
-      }
-    })
-}))*/
-
 describe('useFolderLink', () => {
   it('getFolderLink should return the correct folder link', () => {
     const resource = {

From 9097560562fb9ceffe38653fd30b2d78a9f41fc4 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Thu, 19 Oct 2023 16:15:30 +0200
Subject: [PATCH 33/48] Rm unused code

---
 packages/web-runtime/src/App.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/web-runtime/src/App.vue b/packages/web-runtime/src/App.vue
index 49bc90eed02..38f0983cbb7 100644
--- a/packages/web-runtime/src/App.vue
+++ b/packages/web-runtime/src/App.vue
@@ -83,7 +83,6 @@ export default defineComponent({
         store.commit('Files/SET_CURRENT_FOLDER', null)
       }
     )
-    //activeRoutePath?.startsWith(app.path)
   },
   data() {
     return {

From 842f3cfd5d84a9fe8303d8f2f9898aa1fd742e78 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Thu, 19 Oct 2023 16:16:49 +0200
Subject: [PATCH 34/48] Dont autoformat code that we don't touch

---
 tests/e2e/cucumber/features/smoke/search.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/cucumber/features/smoke/search.feature b/tests/e2e/cucumber/features/smoke/search.feature
index 34dbf20feea..929fffe36f6 100644
--- a/tests/e2e/cucumber/features/smoke/search.feature
+++ b/tests/e2e/cucumber/features/smoke/search.feature
@@ -1,4 +1,4 @@
-  Feature: Search
+Feature: Search
   As a user
   I want to search for resources
   So that I can find them quickly

From 1d53a12ab697edb72c5e674099678a6a4d3025be Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Fri, 20 Oct 2023 09:23:17 +0200
Subject: [PATCH 35/48] Dont destruct clientService and make use of appInfo
 type

---
 packages/web-pkg/src/apps/types.ts                     |  7 +++++++
 .../src/components/Topbar/ApplicationsMenu.vue         | 10 +++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/web-pkg/src/apps/types.ts b/packages/web-pkg/src/apps/types.ts
index bad8853b4a6..73144e60c89 100644
--- a/packages/web-pkg/src/apps/types.ts
+++ b/packages/web-pkg/src/apps/types.ts
@@ -52,6 +52,11 @@ export interface ApplicationQuickActions {
 
 export type AppConfigObject = Record<string, any>
 
+export interface ApplicationMenuItem {
+  enabled: () => boolean
+  priority: number
+}
+
 /** ApplicationInformation describes required information of an application */
 export interface ApplicationInformation {
   id?: string
@@ -59,7 +64,9 @@ export interface ApplicationInformation {
   icon?: string
   isFileEditor?: boolean
   extensions?: any[]
+  defaultExtension?: string
   fileSideBars?: any[]
+  applicationMenu?: ApplicationMenuItem
 }
 
 /**
diff --git a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
index efe344dda2d..47ac1deeac5 100644
--- a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
@@ -57,6 +57,7 @@ import OcApplicationIcon from 'design-system/src/components/OcApplicationIcon/Oc
 import { useGettext } from 'vue3-gettext'
 import * as uuid from 'uuid'
 import {
+  ApplicationInformation,
   EDITOR_MODE_EDIT,
   resolveFileNameDuplicate,
   useClientService,
@@ -82,7 +83,6 @@ export default defineComponent({
     const store = useStore()
     const { openEditor } = useFileActions()
     const clientService = useClientService()
-    const { webdav } = clientService
     const { $gettext } = useGettext()
     const appIconKey = ref('')
     const { getMatchingSpace } = useGetMatchingSpace()
@@ -98,7 +98,7 @@ export default defineComponent({
     })
     const files = computed((): Array<Resource> => store.getters['Files/files'])
 
-    const onEditorApplicationClick = async (item: any) => {
+    const onEditorApplicationClick = async (item: ApplicationInformation) => {
       let destinationSpace = unref(currentFolder)
       let destinationFiles = unref(files)
 
@@ -106,7 +106,7 @@ export default defineComponent({
         destinationSpace = unref(store.getters['runtime/spaces/spaces']).find(
           ({ drive }) => !isPersonalSpaceResource(drive as SpaceResource)
         )
-        destinationFiles = (await webdav.listFiles(destinationSpace)).children
+        destinationFiles = (await clientService.webdav.listFiles(destinationSpace)).children
       }
 
       let fileName = $gettext('New file') + `.${item.defaultExtension}`
@@ -115,7 +115,7 @@ export default defineComponent({
         fileName = resolveFileNameDuplicate(fileName, item.defaultExtension, destinationFiles)
       }
 
-      const emptyResource = await webdav.putFileContents(destinationSpace, {
+      const emptyResource = await clientService.webdav.putFileContents(destinationSpace, {
         path: fileName
       })
 
@@ -130,7 +130,7 @@ export default defineComponent({
         space.shareId
       )
     }
-    const getAdditionalEventBindings = (item: any) => {
+    const getAdditionalEventBindings = (item: ApplicationInformation) => {
       if (item.applicationMenu?.openAsEditor) {
         return {
           click: () => onEditorApplicationClick(item)

From 1c4ab821c7ec59c751fbec1b5d7cb560d327faee Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Fri, 20 Oct 2023 09:35:46 +0200
Subject: [PATCH 36/48] Make set_current_folder more bullet proof

---
 packages/web-runtime/src/App.vue | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/packages/web-runtime/src/App.vue b/packages/web-runtime/src/App.vue
index 38f0983cbb7..2edc8fc521b 100644
--- a/packages/web-runtime/src/App.vue
+++ b/packages/web-runtime/src/App.vue
@@ -60,6 +60,7 @@ import { additionalTranslations } from './helpers/additionalTranslations' // esl
 import { eventBus, useRouter } from '@ownclouders/web-pkg'
 import { useHead } from './composables/head'
 import { useStore } from '@ownclouders/web-pkg'
+import { RouteLocation, Router } from 'vue-router'
 
 export default defineComponent({
   components: {
@@ -70,16 +71,29 @@ export default defineComponent({
     const router = useRouter()
     useHead({ store })
 
-    const activeApp = computed(
-      () => router.resolve(unref(router.currentRoute)).path.split('/')?.[1]
-    )
+    const activeRoute = computed(() => router.resolve(unref(router.currentRoute)))
 
     watch(
-      () => unref(activeApp),
-      (newApp, oldApp) => {
+      () => unref(activeRoute),
+      (newRoute, oldRoute) => {
+        const getAppFromRoute = (route: RouteLocation): string => {
+          return route?.path?.split('/')?.[1]
+        }
+
+        const oldApp = getAppFromRoute(oldRoute)
+        const newApp = getAppFromRoute(newRoute)
+
         if (oldApp === newApp) {
           return
         }
+
+        if ('driveAliasAndItem' in newRoute.params) {
+          return
+        }
+
+        /*
+         * If app has been changed and no file context is set, we will reset current folder.
+         */
         store.commit('Files/SET_CURRENT_FOLDER', null)
       }
     )

From 1c3ff733382f7b5e5725cb7fef7af264733c470c Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Fri, 20 Oct 2023 09:47:35 +0200
Subject: [PATCH 37/48] Fix open preview app run into errors

---
 packages/web-pkg/src/components/AppTopBar.vue | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/web-pkg/src/components/AppTopBar.vue b/packages/web-pkg/src/components/AppTopBar.vue
index 404a1d6e37a..1dd0dd8bd1a 100644
--- a/packages/web-pkg/src/components/AppTopBar.vue
+++ b/packages/web-pkg/src/components/AppTopBar.vue
@@ -112,13 +112,19 @@ export default defineComponent({
 
     const { getParentFolderName, getParentFolderLinkIconAdditionalAttributes } = useFolderLink()
 
+    const parentFolderName = computed(() => {
+      return props.resource ? getParentFolderName(props.resource) : null
+    })
+
+    const parentFolderLinkIconAdditionalAttributes = computed(() => {
+      return props.resource ? getParentFolderLinkIconAdditionalAttributes(props.resource) : null
+    })
+
     return {
       contextMenuLabel,
       closeButtonLabel,
-      parentFolderName: getParentFolderName(props.resource),
-      parentFolderLinkIconAdditionalAttributes: getParentFolderLinkIconAdditionalAttributes(
-        props.resource
-      )
+      parentFolderName,
+      parentFolderLinkIconAdditionalAttributes
     }
   }
 })

From aa59e584bcb4b160b14888ec2e82ab834a51e76e Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Fri, 20 Oct 2023 11:11:19 +0200
Subject: [PATCH 38/48] Fix wrong path displayed in AppTopBar

---
 packages/web-pkg/src/components/AppTopBar.vue      | 14 +++++++++++---
 .../src/composables/spaces/useGetMatchingSpace.ts  |  5 +++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/packages/web-pkg/src/components/AppTopBar.vue b/packages/web-pkg/src/components/AppTopBar.vue
index 1dd0dd8bd1a..b6167d757e4 100644
--- a/packages/web-pkg/src/components/AppTopBar.vue
+++ b/packages/web-pkg/src/components/AppTopBar.vue
@@ -12,7 +12,7 @@
             :parent-folder-link-icon-additional-attributes="
               parentFolderLinkIconAdditionalAttributes
             "
-            :is-path-displayed="true"
+            :is-path-displayed="isPathDisplayed"
           />
         </div>
         <div class="oc-flex main-actions">
@@ -77,12 +77,13 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, PropType } from 'vue'
+import { computed, defineComponent, PropType, unref } from 'vue'
 import { Resource } from '@ownclouders/web-client/src'
 import { Action } from '../composables/actions/types'
 import ContextActionMenu from './ContextActions/ContextActionMenu.vue'
 import { useGettext } from 'vue3-gettext'
-import { useFolderLink } from '../composables'
+import { useFolderLink, useGetMatchingSpace } from '../composables'
+import { isProjectSpaceResource, isShareSpaceResource } from '@ownclouders/web-client/src/helpers'
 
 export default defineComponent({
   name: 'AppTopBar',
@@ -106,12 +107,18 @@ export default defineComponent({
   emits: ['close'],
   setup(props) {
     const { $gettext } = useGettext()
+    const { getMatchingSpace } = useGetMatchingSpace()
 
     const contextMenuLabel = computed(() => $gettext('Show context menu'))
     const closeButtonLabel = computed(() => $gettext('Close'))
 
     const { getParentFolderName, getParentFolderLinkIconAdditionalAttributes } = useFolderLink()
 
+    //FIXME: We currently have problems to display the parent foler name of a shared file, so we disabled it for now
+    const isPathDisplayed = computed(() => {
+      return !isShareSpaceResource(getMatchingSpace(props.resource))
+    })
+
     const parentFolderName = computed(() => {
       return props.resource ? getParentFolderName(props.resource) : null
     })
@@ -121,6 +128,7 @@ export default defineComponent({
     })
 
     return {
+      isPathDisplayed,
       contextMenuLabel,
       closeButtonLabel,
       parentFolderName,
diff --git a/packages/web-pkg/src/composables/spaces/useGetMatchingSpace.ts b/packages/web-pkg/src/composables/spaces/useGetMatchingSpace.ts
index 3b758933fb0..066428ee842 100644
--- a/packages/web-pkg/src/composables/spaces/useGetMatchingSpace.ts
+++ b/packages/web-pkg/src/composables/spaces/useGetMatchingSpace.ts
@@ -43,6 +43,11 @@ export const useGetMatchingSpace = (options?: GetMatchingSpaceOptions) => {
       storageId = unref(driveAliasAndItem).split('/')[1]
     }
 
+    console.log("bshare",  buildShareSpaceResource({
+      shareId: resource.shareId,
+      shareName: resource.shareRoot ? basename(resource.shareRoot) : resource.name,
+      serverUrl: configurationManager.serverUrl
+    }))
     return (
       getInternalSpace(storageId) ||
       buildShareSpaceResource({

From 77c7585a2104369ec27b7e88bf608d0e71a87ae2 Mon Sep 17 00:00:00 2001
From: Paul Neubauer <paulneubauer@live.de>
Date: Fri, 20 Oct 2023 14:11:31 +0200
Subject: [PATCH 39/48] Fix trashbin bug

---
 packages/web-client/src/helpers/space/types.ts   | 10 +++++-----
 .../composables/spaces/useGetMatchingSpace.ts    | 12 ++++++------
 .../src/components/Topbar/ApplicationsMenu.vue   | 16 +++++++++-------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/packages/web-client/src/helpers/space/types.ts b/packages/web-client/src/helpers/space/types.ts
index 243fae01248..a65804b1d8a 100644
--- a/packages/web-client/src/helpers/space/types.ts
+++ b/packages/web-client/src/helpers/space/types.ts
@@ -19,11 +19,11 @@ export interface SpaceResource extends Resource {
   getWebDavUrl({ path }: { path: string }): string
   getWebDavTrashUrl({ path }: { path: string }): string
   getDriveAliasAndItem(resource: Resource): string
-  isViewer(uuid: User): boolean
-  isEditor(uuid: User): boolean
-  isManager(uuid: User): boolean
-  isMember(uuid: User): boolean
-  isOwner(uuid: User): boolean
+  isViewer(user: User): boolean
+  isEditor(user: User): boolean
+  isManager(user: User): boolean
+  isMember(user: User): boolean
+  isOwner(user: User): boolean
 }
 
 export interface PersonalSpaceResource extends SpaceResource {
diff --git a/packages/web-pkg/src/composables/spaces/useGetMatchingSpace.ts b/packages/web-pkg/src/composables/spaces/useGetMatchingSpace.ts
index 066428ee842..3c9495147b9 100644
--- a/packages/web-pkg/src/composables/spaces/useGetMatchingSpace.ts
+++ b/packages/web-pkg/src/composables/spaces/useGetMatchingSpace.ts
@@ -5,6 +5,7 @@ import { useRouteParam } from '../router'
 import { Resource, SpaceResource } from '@ownclouders/web-client'
 import {
   MountPointSpaceResource,
+  PersonalSpaceResource,
   ProjectSpaceResource,
   User,
   buildShareSpaceResource,
@@ -42,12 +43,6 @@ export const useGetMatchingSpace = (options?: GetMatchingSpaceOptions) => {
     if (unref(driveAliasAndItem)?.startsWith('public/')) {
       storageId = unref(driveAliasAndItem).split('/')[1]
     }
-
-    console.log("bshare",  buildShareSpaceResource({
-      shareId: resource.shareId,
-      shareName: resource.shareRoot ? basename(resource.shareRoot) : resource.name,
-      serverUrl: configurationManager.serverUrl
-    }))
     return (
       getInternalSpace(storageId) ||
       buildShareSpaceResource({
@@ -63,6 +58,10 @@ export const useGetMatchingSpace = (options?: GetMatchingSpaceOptions) => {
       (s) => isMountPointSpaceResource(s) && extractStorageId(s.root.remoteItem.rootId) === space.id
     )
 
+  const getPersonalSpace = (): PersonalSpaceResource => {
+    return unref(spaces).find((s) => isPersonalSpaceResource(s) && s.isOwner(unref(user)))
+  }
+
   const isResourceAccessible = ({ space, path }: { space: SpaceResource; path: string }) => {
     if (!configurationManager.options.routing.fullShareOwnerPaths) {
       return true
@@ -80,6 +79,7 @@ export const useGetMatchingSpace = (options?: GetMatchingSpaceOptions) => {
   return {
     getInternalSpace,
     getMatchingSpace,
+    getPersonalSpace,
     isResourceAccessible
   }
 }
diff --git a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
index 47ac1deeac5..55d7082cb08 100644
--- a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
@@ -67,6 +67,8 @@ import {
 } from '@ownclouders/web-pkg'
 import { Resource, SpaceResource } from '@ownclouders/web-client'
 import { isPersonalSpaceResource } from '@ownclouders/web-client/src/helpers'
+import { join } from 'path'
+import { urlJoin } from '@ownclouders/web-client/src/utils'
 
 export default defineComponent({
   components: {
@@ -85,7 +87,7 @@ export default defineComponent({
     const clientService = useClientService()
     const { $gettext } = useGettext()
     const appIconKey = ref('')
-    const { getMatchingSpace } = useGetMatchingSpace()
+    const { getMatchingSpace, getPersonalSpace } = useGetMatchingSpace()
 
     const applicationSwitcherLabel = computed(() => {
       return $gettext('Application Switcher')
@@ -99,14 +101,14 @@ export default defineComponent({
     const files = computed((): Array<Resource> => store.getters['Files/files'])
 
     const onEditorApplicationClick = async (item: ApplicationInformation) => {
-      let destinationSpace = unref(currentFolder)
+      let destinationSpace = unref(currentFolder) ? getMatchingSpace(unref(currentFolder)) : null
       let destinationFiles = unref(files)
+      let filePath = unref(currentFolder)?.path
 
-      if (!destinationSpace || !destinationSpace.canCreate()) {
-        destinationSpace = unref(store.getters['runtime/spaces/spaces']).find(
-          ({ drive }) => !isPersonalSpaceResource(drive as SpaceResource)
-        )
+      if (!destinationSpace || !unref(currentFolder).canCreate()) {
+        destinationSpace = getPersonalSpace()
         destinationFiles = (await clientService.webdav.listFiles(destinationSpace)).children
+        filePath = ''
       }
 
       let fileName = $gettext('New file') + `.${item.defaultExtension}`
@@ -116,7 +118,7 @@ export default defineComponent({
       }
 
       const emptyResource = await clientService.webdav.putFileContents(destinationSpace, {
-        path: fileName
+        path: urlJoin(filePath, fileName)
       })
 
       const space = getMatchingSpace(emptyResource)

From 00d47619c30f62eef6773f25183065ea4fa78ccd Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Fri, 20 Oct 2023 14:22:25 +0200
Subject: [PATCH 40/48] Lint

---
 packages/web-pkg/src/components/AppTopBar.vue                 | 4 ++--
 packages/web-runtime/src/App.vue                              | 2 +-
 .../web-runtime/src/components/Topbar/ApplicationsMenu.vue    | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/web-pkg/src/components/AppTopBar.vue b/packages/web-pkg/src/components/AppTopBar.vue
index b6167d757e4..5ba8fa27b44 100644
--- a/packages/web-pkg/src/components/AppTopBar.vue
+++ b/packages/web-pkg/src/components/AppTopBar.vue
@@ -77,13 +77,13 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, PropType, unref } from 'vue'
+import { computed, defineComponent, PropType } from 'vue'
 import { Resource } from '@ownclouders/web-client/src'
 import { Action } from '../composables/actions/types'
 import ContextActionMenu from './ContextActions/ContextActionMenu.vue'
 import { useGettext } from 'vue3-gettext'
 import { useFolderLink, useGetMatchingSpace } from '../composables'
-import { isProjectSpaceResource, isShareSpaceResource } from '@ownclouders/web-client/src/helpers'
+import { isShareSpaceResource } from '@ownclouders/web-client/src/helpers'
 
 export default defineComponent({
   name: 'AppTopBar',
diff --git a/packages/web-runtime/src/App.vue b/packages/web-runtime/src/App.vue
index 2edc8fc521b..81203440396 100644
--- a/packages/web-runtime/src/App.vue
+++ b/packages/web-runtime/src/App.vue
@@ -60,7 +60,7 @@ import { additionalTranslations } from './helpers/additionalTranslations' // esl
 import { eventBus, useRouter } from '@ownclouders/web-pkg'
 import { useHead } from './composables/head'
 import { useStore } from '@ownclouders/web-pkg'
-import { RouteLocation, Router } from 'vue-router'
+import { RouteLocation } from 'vue-router'
 
 export default defineComponent({
   components: {
diff --git a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
index 55d7082cb08..7b290bf87b7 100644
--- a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
@@ -66,8 +66,6 @@ import {
   useStore
 } from '@ownclouders/web-pkg'
 import { Resource, SpaceResource } from '@ownclouders/web-client'
-import { isPersonalSpaceResource } from '@ownclouders/web-client/src/helpers'
-import { join } from 'path'
 import { urlJoin } from '@ownclouders/web-client/src/utils'
 
 export default defineComponent({

From 843faf8a99856061f5c623f6777153572fcad83a Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Fri, 20 Oct 2023 14:33:51 +0200
Subject: [PATCH 41/48] Fix types

---
 packages/web-pkg/src/apps/types.ts                            | 3 ++-
 .../web-test-helpers/src/mocks/useGetMatchingSpaceMock.ts     | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/web-pkg/src/apps/types.ts b/packages/web-pkg/src/apps/types.ts
index 73144e60c89..776be085316 100644
--- a/packages/web-pkg/src/apps/types.ts
+++ b/packages/web-pkg/src/apps/types.ts
@@ -54,7 +54,8 @@ export type AppConfigObject = Record<string, any>
 
 export interface ApplicationMenuItem {
   enabled: () => boolean
-  priority: number
+  priority: number,
+  openAsEditor?: boolean
 }
 
 /** ApplicationInformation describes required information of an application */
diff --git a/packages/web-test-helpers/src/mocks/useGetMatchingSpaceMock.ts b/packages/web-test-helpers/src/mocks/useGetMatchingSpaceMock.ts
index a9f79ed94fa..c25583d5ad0 100644
--- a/packages/web-test-helpers/src/mocks/useGetMatchingSpaceMock.ts
+++ b/packages/web-test-helpers/src/mocks/useGetMatchingSpaceMock.ts
@@ -1,6 +1,7 @@
 import { mock } from 'jest-mock-extended'
 import { Resource, SpaceResource } from '../../../web-client/src'
 import { useGetMatchingSpace } from '../../../web-pkg'
+import { PersonalSpaceResource } from '../../../web-client/src/helpers'
 
 export const useGetMatchingSpaceMock = (
   options: Partial<ReturnType<typeof useGetMatchingSpace>> = {}
@@ -12,6 +13,9 @@ export const useGetMatchingSpaceMock = (
     getMatchingSpace(resource: Resource) {
       return mock<SpaceResource>()
     },
+    getPersonalSpace() {
+      return mock<PersonalSpaceResource>()
+    },
     isResourceAccessible({ space, path }) {
       return false
     },

From acd50e16f3fef3e94acb9c7aaf95bda2231ca1f0 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Fri, 20 Oct 2023 14:40:18 +0200
Subject: [PATCH 42/48] Lint

---
 packages/web-pkg/src/apps/types.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web-pkg/src/apps/types.ts b/packages/web-pkg/src/apps/types.ts
index 776be085316..700544902bd 100644
--- a/packages/web-pkg/src/apps/types.ts
+++ b/packages/web-pkg/src/apps/types.ts
@@ -54,7 +54,7 @@ export type AppConfigObject = Record<string, any>
 
 export interface ApplicationMenuItem {
   enabled: () => boolean
-  priority: number,
+  priority: number
   openAsEditor?: boolean
 }
 

From 53300d2506f6ce61183845dbd0a1cff8d57511a5 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Fri, 20 Oct 2023 14:54:21 +0200
Subject: [PATCH 43/48] Update snapshots

---
 .../components/__snapshots__/AppTopBar.spec.ts.snap    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/web-pkg/tests/unit/components/__snapshots__/AppTopBar.spec.ts.snap b/packages/web-pkg/tests/unit/components/__snapshots__/AppTopBar.spec.ts.snap
index e184ac94fd3..cd4a92785b3 100644
--- a/packages/web-pkg/tests/unit/components/__snapshots__/AppTopBar.spec.ts.snap
+++ b/packages/web-pkg/tests/unit/components/__snapshots__/AppTopBar.spec.ts.snap
@@ -5,7 +5,7 @@ exports[`AppTopBar if a resource is present renders a resource and dropdownActio
   <div class="oc-app-top-bar oc-flex">
     <span class="oc-app-top-bar-inner oc-px-m oc-flex oc-flex-middle oc-flex-between">
       <div class="open-file-bar oc-flex">
-        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="true" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" resource="undefined"></oc-resource-stub>
+        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" resource="undefined"></oc-resource-stub>
       </div>
       <div class="oc-flex main-actions">
         <!--v-if-->
@@ -23,7 +23,7 @@ exports[`AppTopBar if a resource is present renders a resource and dropdownActio
   <div class="oc-app-top-bar oc-flex">
     <span class="oc-app-top-bar-inner oc-px-m oc-flex oc-flex-middle oc-flex-between">
       <div class="open-file-bar oc-flex">
-        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="true" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" resource="undefined"></oc-resource-stub>
+        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" resource="undefined"></oc-resource-stub>
       </div>
       <div class="oc-flex main-actions">
         <context-action-menu-stub actionoptions="[object Object]" appearance="raw-inverse" menusections="[object Object]" variation="brand"></context-action-menu-stub>
@@ -41,7 +41,7 @@ exports[`AppTopBar if a resource is present renders a resource and mainActions (
   <div class="oc-app-top-bar oc-flex">
     <span class="oc-app-top-bar-inner oc-px-m oc-flex oc-flex-middle oc-flex-between">
       <div class="open-file-bar oc-flex">
-        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="true" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" resource="undefined"></oc-resource-stub>
+        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" resource="undefined"></oc-resource-stub>
       </div>
       <div class="oc-flex main-actions">
         <context-action-menu-stub actionoptions="[object Object]" appearance="raw-inverse" menusections="[object Object]" variation="brand"></context-action-menu-stub>
@@ -58,7 +58,7 @@ exports[`AppTopBar if a resource is present renders a resource and no actions (i
   <div class="oc-app-top-bar oc-flex">
     <span class="oc-app-top-bar-inner oc-px-m oc-flex oc-flex-middle oc-flex-between">
       <div class="open-file-bar oc-flex">
-        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="true" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" resource="undefined"></oc-resource-stub>
+        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" resource="undefined"></oc-resource-stub>
       </div>
       <div class="oc-flex main-actions">
         <!--v-if-->
@@ -75,7 +75,7 @@ exports[`AppTopBar if no resource is present renders only a close button 1`] = `
   <div class="oc-app-top-bar oc-flex">
     <span class="oc-app-top-bar-inner oc-px-m oc-flex oc-flex-middle oc-flex-between">
       <div class="open-file-bar oc-flex">
-        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="true" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" resource="undefined"></oc-resource-stub>
+        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" resource="undefined"></oc-resource-stub>
       </div>
       <div class="oc-flex main-actions">
         <!--v-if-->

From 6daa77e8308f4517b0ab23c4aa75520ce8559199 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Mon, 23 Oct 2023 09:43:17 +0200
Subject: [PATCH 44/48] rm unnecessary type

---
 packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
index 7b290bf87b7..c1d35f7fce6 100644
--- a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
@@ -93,7 +93,7 @@ export default defineComponent({
     const updateAppIcons = () => {
       appIconKey.value = uuid.v4().replaceAll('-', '')
     }
-    const currentFolder = computed((): SpaceResource => {
+    const currentFolder = computed(() => {
       return store.getters['Files/currentFolder']
     })
     const files = computed((): Array<Resource> => store.getters['Files/files'])

From 7409fe7129fa65a672761578c7659a71eae1d32a Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Mon, 23 Oct 2023 09:54:05 +0200
Subject: [PATCH 45/48] Lint

---
 packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
index c1d35f7fce6..f4929c8f8ea 100644
--- a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
@@ -65,7 +65,7 @@ import {
   useGetMatchingSpace,
   useStore
 } from '@ownclouders/web-pkg'
-import { Resource, SpaceResource } from '@ownclouders/web-client'
+import { Resource } from '@ownclouders/web-client'
 import { urlJoin } from '@ownclouders/web-client/src/utils'
 
 export default defineComponent({

From a14cdea807db59fa70b55b9115a5f8de79a82219 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Mon, 23 Oct 2023 10:57:38 +0200
Subject: [PATCH 46/48] Fix acceptance tests

---
 .../components/FilesList/ResourceTable.vue    | 13 ++-----------
 .../composables/folderLink/useFolderLink.ts   |  9 ---------
 .../folderLink/useFolderLink.spec.ts          | 19 -------------------
 3 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/packages/web-pkg/src/components/FilesList/ResourceTable.vue b/packages/web-pkg/src/components/FilesList/ResourceTable.vue
index 1714d298cca..0ecf21e71b6 100644
--- a/packages/web-pkg/src/components/FilesList/ResourceTable.vue
+++ b/packages/web-pkg/src/components/FilesList/ResourceTable.vue
@@ -66,7 +66,7 @@
           :is-icon-displayed="!$slots['image']"
           :is-extension-displayed="areFileExtensionsShown"
           :is-resource-clickable="isResourceClickable(item.id)"
-          :folder-link="getFolderLink(item)"
+          :folder-link="createFolderLink(item)"
           :parent-folder-link="getParentFolderLink(item)"
           :parent-folder-link-icon-additional-attributes="
             getParentFolderLinkIconAdditionalAttributes(item)
@@ -437,12 +437,6 @@ export default defineComponent({
   setup(props, context) {
     const store = useStore()
     const configurationManager = useConfigurationManager()
-    const {
-      getFolderLink,
-      getParentFolderLink,
-      getParentFolderName,
-      getParentFolderLinkIconAdditionalAttributes
-    } = useFolderLink()
 
     const { width } = useWindowSize()
     const hasTags = computed(
@@ -486,10 +480,7 @@ export default defineComponent({
         },
         context
       ),
-      getFolderLink,
-      getParentFolderLink,
-      getParentFolderName,
-      getParentFolderLinkIconAdditionalAttributes
+      ...useFolderLink()
     }
   },
   data() {
diff --git a/packages/web-pkg/src/composables/folderLink/useFolderLink.ts b/packages/web-pkg/src/composables/folderLink/useFolderLink.ts
index 027aec06704..4dc81314354 100644
--- a/packages/web-pkg/src/composables/folderLink/useFolderLink.ts
+++ b/packages/web-pkg/src/composables/folderLink/useFolderLink.ts
@@ -20,14 +20,6 @@ export const useFolderLink = () => {
   const { getInternalSpace, getMatchingSpace, isResourceAccessible } = useGetMatchingSpace()
   const { createFolderLink } = useResourceRouteResolver()
 
-  const getFolderLink = (resource: Resource) => {
-    return createFolderLink({
-      path: resource.path,
-      fileId: resource.fileId,
-      resource
-    })
-  }
-
   const getParentFolderLink = (resource: Resource) => {
     const space = getMatchingSpace(resource)
     const parentFolderAccessible = isResourceAccessible({
@@ -99,7 +91,6 @@ export const useFolderLink = () => {
   }
 
   return {
-    getFolderLink,
     getParentFolderLink,
     getParentFolderName,
     getParentFolderLinkIconAdditionalAttributes
diff --git a/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts b/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts
index 80385503afd..5ba2420977f 100644
--- a/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts
@@ -34,23 +34,6 @@ jest.mock('../../../../src/composables/configuration', () => ({
 }))
 
 describe('useFolderLink', () => {
-  it('getFolderLink should return the correct folder link', () => {
-    const resource = {
-      path: '/my-folder',
-      id: '2',
-      fileId: '2',
-      storageId: '1'
-    }
-    const wrapper = createWrapper()
-
-    const folderLink = wrapper.vm.getFolderLink(resource)
-    expect(folderLink).toEqual({
-      name: 'files-spaces-generic',
-      params: { driveAliasAndItem: 'personal/admin' },
-      query: { fileId: '2' }
-    })
-  })
-
   it('getParentFolderLink should return the correct parent folder link', () => {
     const resource = {
       path: '/my-folder',
@@ -151,14 +134,12 @@ const createWrapper = ({ hasShareJail = true }: { hasShareJail?: boolean } = {})
     () => {
       const {
         getParentFolderLink,
-        getFolderLink,
         getParentFolderName,
         getParentFolderLinkIconAdditionalAttributes
       } = useFolderLink()
 
       return {
         getParentFolderLink,
-        getFolderLink,
         getParentFolderName,
         getParentFolderLinkIconAdditionalAttributes
       }

From 2e7820766ff3e87179301b5c469d63c57ae664b6 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Mon, 23 Oct 2023 11:02:20 +0200
Subject: [PATCH 47/48] Dont show parent folder in apptopbar if resource is
 public shared

---
 packages/web-pkg/src/components/AppTopBar.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/web-pkg/src/components/AppTopBar.vue b/packages/web-pkg/src/components/AppTopBar.vue
index 5ba8fa27b44..5158eb74b7e 100644
--- a/packages/web-pkg/src/components/AppTopBar.vue
+++ b/packages/web-pkg/src/components/AppTopBar.vue
@@ -77,13 +77,13 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, PropType } from 'vue'
+import { computed, defineComponent, PropType, unref } from 'vue'
 import { Resource } from '@ownclouders/web-client/src'
 import { Action } from '../composables/actions/types'
 import ContextActionMenu from './ContextActions/ContextActionMenu.vue'
 import { useGettext } from 'vue3-gettext'
 import { useFolderLink, useGetMatchingSpace } from '../composables'
-import { isShareSpaceResource } from '@ownclouders/web-client/src/helpers'
+import { isPublicSpaceResource, isShareSpaceResource } from '@ownclouders/web-client/src/helpers'
 
 export default defineComponent({
   name: 'AppTopBar',
@@ -114,9 +114,11 @@ export default defineComponent({
 
     const { getParentFolderName, getParentFolderLinkIconAdditionalAttributes } = useFolderLink()
 
-    //FIXME: We currently have problems to display the parent foler name of a shared file, so we disabled it for now
+    const space = computed(() => getMatchingSpace(props.resource))
+
+    //FIXME: We currently have problems to display the parent folder name of a shared file, so we disabled it for now
     const isPathDisplayed = computed(() => {
-      return !isShareSpaceResource(getMatchingSpace(props.resource))
+      return !isShareSpaceResource(unref(space)) && !isPublicSpaceResource(unref(space))
     })
 
     const parentFolderName = computed(() => {

From 992a9d89109505bf067d0a4e00057d247aec3a3f Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Mon, 23 Oct 2023 15:26:40 +0200
Subject: [PATCH 48/48] Fix general resource path

---
 .../src/components/OcResource/OcResource.vue  |  9 +++++
 .../OcResourceName/OcResourceName.vue         | 37 ++++++++++++++----
 .../OcTile/__snapshots__/OcTile.spec.ts.snap  |  4 +-
 packages/web-pkg/src/components/AppTopBar.vue |  9 ++++-
 .../components/FilesList/ResourceTable.vue    | 15 ++++++--
 .../src/components/Search/ResourcePreview.vue | 38 ++++++++++++++-----
 .../filesList/useResourceRouteResolver.ts     |  2 +-
 .../composables/folderLink/useFolderLink.ts   | 35 ++++++++++++++---
 .../components/Search/ResourcePreview.spec.ts | 11 +++++-
 .../__snapshots__/AppTopBar.spec.ts.snap      | 10 ++---
 .../folderLink/useFolderLink.spec.ts          | 19 ++++++++++
 11 files changed, 150 insertions(+), 39 deletions(-)

diff --git a/packages/design-system/src/components/OcResource/OcResource.vue b/packages/design-system/src/components/OcResource/OcResource.vue
index fe37425ae84..20f1d3929e3 100644
--- a/packages/design-system/src/components/OcResource/OcResource.vue
+++ b/packages/design-system/src/components/OcResource/OcResource.vue
@@ -50,6 +50,7 @@
         <oc-resource-name
           :key="resource.name"
           :name="resource.name"
+          :path-prefix="pathPrefix"
           :extension="resource.extension"
           :type="resource.type"
           :full-path="resource.path"
@@ -107,6 +108,14 @@ export default defineComponent({
       type: Object as PropType<Resource>,
       required: true
     },
+    /**
+     * The prefix that will be shown in the path
+     */
+    pathPrefix: {
+      type: String,
+      required: false,
+      default: ''
+    },
     /**
      * The resource folder link
      */
diff --git a/packages/design-system/src/components/OcResourceName/OcResourceName.vue b/packages/design-system/src/components/OcResourceName/OcResourceName.vue
index ab3a20762be..88eb7a909a5 100644
--- a/packages/design-system/src/components/OcResourceName/OcResourceName.vue
+++ b/packages/design-system/src/components/OcResourceName/OcResourceName.vue
@@ -21,6 +21,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue'
+import path from 'path'
 
 export default defineComponent({
   name: 'OcResourceName',
@@ -34,6 +35,14 @@ export default defineComponent({
       type: String,
       required: true
     },
+    /**
+     * The prefix that will be shown in the path
+     */
+    pathPrefix: {
+      type: String,
+      required: false,
+      default: ''
+    },
     /**
      * The extension of the resource, if there is one
      */
@@ -123,6 +132,9 @@ export default defineComponent({
       if (this.displayPath === this.fullPath) {
         return null
       }
+      if (this.pathPrefix) {
+        return path.join(this.pathPrefix, this.fullPath)
+      }
       return this.fullPath
     },
 
@@ -146,6 +158,7 @@ export default defineComponent({
   &-name {
     display: flex;
     min-width: 0;
+
     &:hover {
       text-decoration: underline;
       text-decoration-color: var(--oc-color-text-default);
@@ -167,13 +180,21 @@ export default defineComponent({
 
 <docs>
 ```js
-<oc-resource-name full-path="documents/notes.txt" name="notes.txt" extension="txt" type="file" :is-extension-displayed="false" />
-<oc-resource-name full-path="documents/notes.txt" name="notes.txt" extension="txt" type="file" />
-<oc-resource-name full-path="documents/notes.txt" name="super-long-file-name-which-will-be-truncated-when-exceeding-the-screen-space-while-still-preserving-the-file-extension-at-the-end.txt" extension="txt" type="file" />
-<oc-resource-name full-path="documents/notes.txt" name="super-long-file-name-which-will-not-be-truncated-when-you-disable-it-manually-via-the-truncate-property.txt" extension="txt" type="file" :truncate-name="false" />
-<oc-resource-name full-path="images/nature/forest.jpg" :is-path-displayed="true" name="forest.jpg" extension="jpg" type="file" />
-<oc-resource-name full-path="super-long-path-to-a-subfolder-which-is-a-lot-of-levels-away-from–the-root-super-long-path-to-a-subfolder-which-is-a-lot-of-levels-away-from–the-root/asdf.txt" :is-path-displayed="true" name="asdf.txt" extension="txt" type="file" />
-<oc-resource-name full-path="some-folder" name="regular-folder" extension="" type="folder" />
-<oc-resource-name full-path="folder-name-with.dot" name="folder-name-with.dot" extension="" type="folder" />
+<oc-resource-name full-path="documents/notes.txt" name="notes.txt" extension="txt" type="file"
+                  :is-extension-displayed="false"/>
+<oc-resource-name full-path="documents/notes.txt" name="notes.txt" extension="txt" type="file"/>
+<oc-resource-name full-path="documents/notes.txt"
+                  name="super-long-file-name-which-will-be-truncated-when-exceeding-the-screen-space-while-still-preserving-the-file-extension-at-the-end.txt"
+                  extension="txt" type="file"/>
+<oc-resource-name full-path="documents/notes.txt"
+                  name="super-long-file-name-which-will-not-be-truncated-when-you-disable-it-manually-via-the-truncate-property.txt"
+                  extension="txt" type="file" :truncate-name="false"/>
+<oc-resource-name full-path="images/nature/forest.jpg" :is-path-displayed="true" name="forest.jpg" extension="jpg"
+                  type="file"/>
+<oc-resource-name
+  full-path="super-long-path-to-a-subfolder-which-is-a-lot-of-levels-away-from–the-root-super-long-path-to-a-subfolder-which-is-a-lot-of-levels-away-from–the-root/asdf.txt"
+  :is-path-displayed="true" name="asdf.txt" extension="txt" type="file"/>
+<oc-resource-name full-path="some-folder" name="regular-folder" extension="" type="folder"/>
+<oc-resource-name full-path="folder-name-with.dot" name="folder-name-with.dot" extension="" type="folder"/>
 ```
 </docs>
diff --git a/packages/design-system/src/components/OcTile/__snapshots__/OcTile.spec.ts.snap b/packages/design-system/src/components/OcTile/__snapshots__/OcTile.spec.ts.snap
index a233c8ce8f0..9e3c132d6a6 100644
--- a/packages/design-system/src/components/OcTile/__snapshots__/OcTile.spec.ts.snap
+++ b/packages/design-system/src/components/OcTile/__snapshots__/OcTile.spec.ts.snap
@@ -13,7 +13,7 @@ exports[`OcTile component renders default space correctly 1`] = `
   <div class="oc-card-body oc-p-s">
     <div class="oc-flex oc-flex-between oc-flex-middle">
       <div class="oc-flex oc-flex-middle oc-text-truncate resource-name-wrapper">
-        <oc-resource-stub isextensiondisplayed="true" isicondisplayed="false" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="true" parentfoldername="" resource="[object Object]"></oc-resource-stub>
+        <oc-resource-stub isextensiondisplayed="true" isicondisplayed="false" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="true" parentfoldername="" pathprefix="" resource="[object Object]"></oc-resource-stub>
       </div>
       <div class="oc-flex oc-flex-middle">
         <!-- Slot for individual actions -->
@@ -40,7 +40,7 @@ exports[`OcTile component renders disabled space correctly 1`] = `
   <div class="oc-card-body oc-p-s">
     <div class="oc-flex oc-flex-between oc-flex-middle">
       <div class="oc-flex oc-flex-middle oc-text-truncate resource-name-wrapper">
-        <oc-resource-stub isextensiondisplayed="true" isicondisplayed="false" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="true" parentfoldername="" resource="[object Object]"></oc-resource-stub>
+        <oc-resource-stub isextensiondisplayed="true" isicondisplayed="false" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="true" parentfoldername="" pathprefix="" resource="[object Object]"></oc-resource-stub>
       </div>
       <div class="oc-flex oc-flex-middle">
         <!-- Slot for individual actions -->
diff --git a/packages/web-pkg/src/components/AppTopBar.vue b/packages/web-pkg/src/components/AppTopBar.vue
index 5158eb74b7e..d2bb5105ae7 100644
--- a/packages/web-pkg/src/components/AppTopBar.vue
+++ b/packages/web-pkg/src/components/AppTopBar.vue
@@ -7,6 +7,7 @@
             v-if="resource"
             id="app-top-bar-resource"
             :is-thumbnail-displayed="false"
+            :path-prefix="pathPrefix"
             :resource="resource"
             :parent-folder-name="parentFolderName"
             :parent-folder-link-icon-additional-attributes="
@@ -112,7 +113,8 @@ export default defineComponent({
     const contextMenuLabel = computed(() => $gettext('Show context menu'))
     const closeButtonLabel = computed(() => $gettext('Close'))
 
-    const { getParentFolderName, getParentFolderLinkIconAdditionalAttributes } = useFolderLink()
+    const { getParentFolderName, getParentFolderLinkIconAdditionalAttributes, getPathPrefix } =
+      useFolderLink()
 
     const space = computed(() => getMatchingSpace(props.resource))
 
@@ -121,6 +123,10 @@ export default defineComponent({
       return !isShareSpaceResource(unref(space)) && !isPublicSpaceResource(unref(space))
     })
 
+    const pathPrefix = computed(() => {
+      return props.resource ? getPathPrefix(props.resource) : null
+    })
+
     const parentFolderName = computed(() => {
       return props.resource ? getParentFolderName(props.resource) : null
     })
@@ -130,6 +136,7 @@ export default defineComponent({
     })
 
     return {
+      pathPrefix,
       isPathDisplayed,
       contextMenuLabel,
       closeButtonLabel,
diff --git a/packages/web-pkg/src/components/FilesList/ResourceTable.vue b/packages/web-pkg/src/components/FilesList/ResourceTable.vue
index 0ecf21e71b6..d436d0cf216 100644
--- a/packages/web-pkg/src/components/FilesList/ResourceTable.vue
+++ b/packages/web-pkg/src/components/FilesList/ResourceTable.vue
@@ -60,13 +60,14 @@
         <oc-resource
           :key="`${item.path}-${resourceDomSelector(item)}-${item.thumbnail}`"
           :resource="item"
+          :path-prefix="getPathPrefix(item)"
           :is-path-displayed="arePathsDisplayed"
           :parent-folder-name="getParentFolderName(item)"
           :is-thumbnail-displayed="shouldDisplayThumbnails(item)"
           :is-icon-displayed="!$slots['image']"
           :is-extension-displayed="areFileExtensionsShown"
           :is-resource-clickable="isResourceClickable(item.id)"
-          :folder-link="createFolderLink(item)"
+          :folder-link="getFolderLink(item)"
           :parent-folder-link="getParentFolderLink(item)"
           :parent-folder-link-icon-additional-attributes="
             getParentFolderLinkIconAdditionalAttributes(item)
@@ -248,6 +249,7 @@ import get from 'lodash-es/get'
 
 // ODS component import is necessary here for CERN to overwrite OcTable
 import OcTable from 'design-system/src/components/OcTable/OcTable.vue'
+import { useGettext } from 'vue3-gettext'
 
 const TAGS_MINIMUM_SCREEN_WIDTH = 850
 
@@ -437,6 +439,8 @@ export default defineComponent({
   setup(props, context) {
     const store = useStore()
     const configurationManager = useConfigurationManager()
+    const { getMatchingSpace } = useGetMatchingSpace()
+    const { $gettext } = useGettext()
 
     const { width } = useWindowSize()
     const hasTags = computed(
@@ -448,7 +452,7 @@ export default defineComponent({
 
     const getTagToolTip = (text: string) => (text.length > 7 ? text : '')
 
-    const isResourceDisabled = (resource) => {
+    const isResourceDisabled = (resource: Resource) => {
       return resource.processing === true
     }
 
@@ -472,7 +476,7 @@ export default defineComponent({
       hasShareJail: useCapabilityShareJailEnabled(),
       hasProjectSpaces: useCapabilityProjectSpacesEnabled(),
       isUserContext: useUserContext({ store }),
-      ...useGetMatchingSpace(),
+      getMatchingSpace,
       ...useResourceRouteResolver(
         {
           space: ref(props.space),
@@ -480,7 +484,10 @@ export default defineComponent({
         },
         context
       ),
-      ...useFolderLink()
+      ...useFolderLink({
+        space: ref(props.space),
+        targetRouteCallback: computed(() => props.targetRouteCallback)
+      })
     }
   },
   data() {
diff --git a/packages/web-pkg/src/components/Search/ResourcePreview.vue b/packages/web-pkg/src/components/Search/ResourcePreview.vue
index 09396c7957c..630aefee931 100644
--- a/packages/web-pkg/src/components/Search/ResourcePreview.vue
+++ b/packages/web-pkg/src/components/Search/ResourcePreview.vue
@@ -9,6 +9,7 @@
   >
     <oc-resource
       :resource="resource"
+      :path-prefix="pathPrefix"
       :is-path-displayed="true"
       :is-resource-clickable="false"
       :parent-folder-link="parentFolderLink"
@@ -27,17 +28,22 @@ import { debounce } from 'lodash-es'
 import { computed, defineComponent, PropType, ref, unref } from 'vue'
 import { mapGetters } from 'vuex'
 import { createLocationShares, createLocationSpaces } from '../../router'
-import { dirname } from 'path'
+import path, { dirname } from 'path'
 import {
   useCapabilityShareJailEnabled,
   useGetMatchingSpace,
   useFileActions,
   useFolderLink
 } from '../../composables'
-import { isProjectSpaceResource, Resource } from '@ownclouders/web-client/src/helpers'
+import {
+  isProjectSpaceResource,
+  isShareSpaceResource,
+  Resource
+} from '@ownclouders/web-client/src/helpers'
 import { eventBus } from '../../services'
 import { createFileRouteOptions, isResourceTxtFileAlmostEmpty } from '../../helpers'
 import { SearchResultValue } from './types'
+import { useGettext } from 'vue3-gettext'
 
 const visibilityObserver = new VisibilityObserver()
 
@@ -58,7 +64,9 @@ export default defineComponent({
   },
   setup(props) {
     const { getInternalSpace, getMatchingSpace } = useGetMatchingSpace()
-    const { getParentFolderName, getParentFolderLinkIconAdditionalAttributes } = useFolderLink()
+    const { getPathPrefix, getParentFolderName, getParentFolderLinkIconAdditionalAttributes } =
+      useFolderLink()
+    const { $gettext } = useGettext()
     const previewData = ref()
 
     const resource = computed((): Resource => {
@@ -71,11 +79,23 @@ export default defineComponent({
       }
     })
 
+    const space = computed(() => getMatchingSpace(unref(resource)))
+
+    const spaceName = computed(() => {
+      if (isShareSpaceResource(unref(space))) {
+        return path.join($gettext('Shared with me'), unref(space).name)
+      }
+
+      return unref(space).name
+    })
+
     const resourceDisabled = computed(() => {
       return unref(resource).disabled === true
     })
 
     return {
+      space,
+      spaceName,
       ...useFileActions(),
       getInternalSpace,
       getMatchingSpace,
@@ -83,6 +103,7 @@ export default defineComponent({
       previewData,
       resource,
       resourceDisabled,
+      pathPrefix: getPathPrefix(unref(resource)),
       parentFolderName: getParentFolderName(unref(resource)),
       parentFolderLinkIconAdditionalAttributes: getParentFolderLinkIconAdditionalAttributes(
         unref(resource)
@@ -106,14 +127,11 @@ export default defineComponent({
         : {
             click: () =>
               this.triggerDefaultAction({
-                space: this.matchingSpace,
+                space: this.space,
                 resources: [this.resource]
               })
           }
     },
-    matchingSpace() {
-      return this.getMatchingSpace(this.resource)
-    },
     displayThumbnails() {
       return (
         !this.configuration?.options?.disablePreviews &&
@@ -146,7 +164,7 @@ export default defineComponent({
       unobserve()
       const preview = await this.$previewService.loadPreview(
         {
-          space: this.matchingSpace,
+          space: this.space,
           resource: this.resource,
           dimensions: ImageDimension.Thumbnail
         },
@@ -165,13 +183,13 @@ export default defineComponent({
       eventBus.publish('app.search.options-drop.hide')
     },
     createFolderLink(p: string, fileId: string | number) {
-      if (!this.matchingSpace) {
+      if (!this.space) {
         return {}
       }
 
       return createLocationSpaces(
         'files-spaces-generic',
-        createFileRouteOptions(this.matchingSpace, { path: p, fileId })
+        createFileRouteOptions(this.space, { path: p, fileId })
       )
     }
   }
diff --git a/packages/web-pkg/src/composables/filesList/useResourceRouteResolver.ts b/packages/web-pkg/src/composables/filesList/useResourceRouteResolver.ts
index c75ce1e0ccd..a403f6419a5 100644
--- a/packages/web-pkg/src/composables/filesList/useResourceRouteResolver.ts
+++ b/packages/web-pkg/src/composables/filesList/useResourceRouteResolver.ts
@@ -7,7 +7,7 @@ import { createLocationSpaces, createLocationShares } from '../../router'
 import { CreateTargetRouteOptions } from '../../helpers/folderLink/types'
 import { Resource, SpaceResource } from '@ownclouders/web-client/src'
 
-type ResourceRouteResolverOptions = {
+export type ResourceRouteResolverOptions = {
   configurationManager?: ConfigurationManager
   targetRouteCallback?: Ref<any>
   space?: Ref<SpaceResource>
diff --git a/packages/web-pkg/src/composables/folderLink/useFolderLink.ts b/packages/web-pkg/src/composables/folderLink/useFolderLink.ts
index 4dc81314354..9a329448645 100644
--- a/packages/web-pkg/src/composables/folderLink/useFolderLink.ts
+++ b/packages/web-pkg/src/composables/folderLink/useFolderLink.ts
@@ -9,19 +9,40 @@ import { useGettext } from 'vue3-gettext'
 import { unref } from 'vue'
 import { useCapabilityProjectSpacesEnabled, useCapabilityShareJailEnabled } from '../capability'
 import { useGetMatchingSpace } from '../spaces'
-import { dirname } from 'path'
-import { useResourceRouteResolver } from '../filesList'
+import path, { dirname } from 'path'
+import { ResourceRouteResolverOptions, useResourceRouteResolver } from '../filesList'
 import { createLocationShares, createLocationSpaces } from '../../router'
 
-export const useFolderLink = () => {
+export const useFolderLink = (options: ResourceRouteResolverOptions = {}) => {
   const { $gettext } = useGettext()
   const hasShareJail = useCapabilityShareJailEnabled()
   const hasProjectSpaces = useCapabilityProjectSpacesEnabled()
   const { getInternalSpace, getMatchingSpace, isResourceAccessible } = useGetMatchingSpace()
-  const { createFolderLink } = useResourceRouteResolver()
+  const { createFolderLink } = useResourceRouteResolver(options)
+
+  const getPathPrefix = (resource: Resource) => {
+    const space = unref(options.space) || getMatchingSpace(resource)
+
+    if (isProjectSpaceResource(space)) {
+      return path.join($gettext('Spaces'), space.name)
+    }
+
+    if (isShareSpaceResource(space)) {
+      return path.join($gettext('Shares'), $gettext('Shared with me'), space.name)
+    }
+
+    return space.name
+  }
+  const getFolderLink = (resource: Resource) => {
+    return createFolderLink({
+      path: resource.path,
+      fileId: resource.fileId,
+      resource
+    })
+  }
 
   const getParentFolderLink = (resource: Resource) => {
-    const space = getMatchingSpace(resource)
+    const space = unref(options.space) || getMatchingSpace(resource)
     const parentFolderAccessible = isResourceAccessible({
       space,
       path: dirname(resource.path)
@@ -41,7 +62,7 @@ export const useFolderLink = () => {
   }
 
   const getParentFolderName = (resource: Resource) => {
-    const space = getMatchingSpace(resource)
+    const space = unref(options.space) || getMatchingSpace(resource)
     const parentFolderAccessible = isResourceAccessible({
       space,
       path: dirname(resource.path)
@@ -91,6 +112,8 @@ export const useFolderLink = () => {
   }
 
   return {
+    getPathPrefix,
+    getFolderLink,
     getParentFolderLink,
     getParentFolderName,
     getParentFolderLinkIconAdditionalAttributes
diff --git a/packages/web-pkg/tests/unit/components/Search/ResourcePreview.spec.ts b/packages/web-pkg/tests/unit/components/Search/ResourcePreview.spec.ts
index 5837f74fe63..957c0a177d6 100644
--- a/packages/web-pkg/tests/unit/components/Search/ResourcePreview.spec.ts
+++ b/packages/web-pkg/tests/unit/components/Search/ResourcePreview.spec.ts
@@ -16,12 +16,19 @@ jest.mock('../../../../src/composables/spaces/useGetMatchingSpace', () => ({
 }))
 
 describe('Preview component', () => {
+  const driveAliasAndItem = '1'
   jest.mocked(useGetMatchingSpace).mockImplementation(() => useGetMatchingSpaceMock())
   it('should set correct props on oc-resource component', () => {
-    const { wrapper } = getWrapper()
+    const { wrapper } = getWrapper({
+      space: mock<SpaceResource>({
+        id: '1',
+        driveType: 'project',
+        name: 'New space',
+        getDriveAliasAndItem: () => driveAliasAndItem
+      })
+    })
     const ocResource = wrapper.findComponent<any>('oc-resource-stub')
 
-    expect(ocResource.exists()).toBeTruthy()
     expect(ocResource.props().resource).toMatchObject(wrapper.vm.searchResult.data)
   })
   describe('computed parentFolderLink', () => {
diff --git a/packages/web-pkg/tests/unit/components/__snapshots__/AppTopBar.spec.ts.snap b/packages/web-pkg/tests/unit/components/__snapshots__/AppTopBar.spec.ts.snap
index cd4a92785b3..dbf7655debc 100644
--- a/packages/web-pkg/tests/unit/components/__snapshots__/AppTopBar.spec.ts.snap
+++ b/packages/web-pkg/tests/unit/components/__snapshots__/AppTopBar.spec.ts.snap
@@ -5,7 +5,7 @@ exports[`AppTopBar if a resource is present renders a resource and dropdownActio
   <div class="oc-app-top-bar oc-flex">
     <span class="oc-app-top-bar-inner oc-px-m oc-flex oc-flex-middle oc-flex-between">
       <div class="open-file-bar oc-flex">
-        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" resource="undefined"></oc-resource-stub>
+        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" pathprefix="Shares/Shared with me/test" resource="undefined"></oc-resource-stub>
       </div>
       <div class="oc-flex main-actions">
         <!--v-if-->
@@ -23,7 +23,7 @@ exports[`AppTopBar if a resource is present renders a resource and dropdownActio
   <div class="oc-app-top-bar oc-flex">
     <span class="oc-app-top-bar-inner oc-px-m oc-flex oc-flex-middle oc-flex-between">
       <div class="open-file-bar oc-flex">
-        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" resource="undefined"></oc-resource-stub>
+        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" pathprefix="Shares/Shared with me/test" resource="undefined"></oc-resource-stub>
       </div>
       <div class="oc-flex main-actions">
         <context-action-menu-stub actionoptions="[object Object]" appearance="raw-inverse" menusections="[object Object]" variation="brand"></context-action-menu-stub>
@@ -41,7 +41,7 @@ exports[`AppTopBar if a resource is present renders a resource and mainActions (
   <div class="oc-app-top-bar oc-flex">
     <span class="oc-app-top-bar-inner oc-px-m oc-flex oc-flex-middle oc-flex-between">
       <div class="open-file-bar oc-flex">
-        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" resource="undefined"></oc-resource-stub>
+        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" pathprefix="Shares/Shared with me/test" resource="undefined"></oc-resource-stub>
       </div>
       <div class="oc-flex main-actions">
         <context-action-menu-stub actionoptions="[object Object]" appearance="raw-inverse" menusections="[object Object]" variation="brand"></context-action-menu-stub>
@@ -58,7 +58,7 @@ exports[`AppTopBar if a resource is present renders a resource and no actions (i
   <div class="oc-app-top-bar oc-flex">
     <span class="oc-app-top-bar-inner oc-px-m oc-flex oc-flex-middle oc-flex-between">
       <div class="open-file-bar oc-flex">
-        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" resource="undefined"></oc-resource-stub>
+        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" pathprefix="Shares/Shared with me/test" resource="undefined"></oc-resource-stub>
       </div>
       <div class="oc-flex main-actions">
         <!--v-if-->
@@ -75,7 +75,7 @@ exports[`AppTopBar if no resource is present renders only a close button 1`] = `
   <div class="oc-app-top-bar oc-flex">
     <span class="oc-app-top-bar-inner oc-px-m oc-flex oc-flex-middle oc-flex-between">
       <div class="open-file-bar oc-flex">
-        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" resource="undefined"></oc-resource-stub>
+        <oc-resource-stub id="app-top-bar-resource" isextensiondisplayed="true" isicondisplayed="true" ispathdisplayed="false" isresourceclickable="true" isthumbnaildisplayed="false" parentfolderlinkiconadditionalattributes="[object Object]" parentfoldername="test" pathprefix="Shares/Shared with me/test" resource="undefined"></oc-resource-stub>
       </div>
       <div class="oc-flex main-actions">
         <!--v-if-->
diff --git a/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts b/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts
index 5ba2420977f..ffbacc26d92 100644
--- a/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts
@@ -34,6 +34,23 @@ jest.mock('../../../../src/composables/configuration', () => ({
 }))
 
 describe('useFolderLink', () => {
+  it('getFolderLink should return the correct folder link', () => {
+    const resource = {
+      path: '/my-folder',
+      id: '2',
+      fileId: '2',
+      storageId: '1'
+    }
+    const wrapper = createWrapper()
+
+    const folderLink = wrapper.vm.getFolderLink(resource)
+    expect(folderLink).toEqual({
+      name: 'files-spaces-generic',
+      params: { driveAliasAndItem: 'personal/admin' },
+      query: { fileId: '2' }
+    })
+  })
+
   it('getParentFolderLink should return the correct parent folder link', () => {
     const resource = {
       path: '/my-folder',
@@ -133,12 +150,14 @@ const createWrapper = ({ hasShareJail = true }: { hasShareJail?: boolean } = {})
   return getComposableWrapper(
     () => {
       const {
+        getFolderLink,
         getParentFolderLink,
         getParentFolderName,
         getParentFolderLinkIconAdditionalAttributes
       } = useFolderLink()
 
       return {
+        getFolderLink,
         getParentFolderLink,
         getParentFolderName,
         getParentFolderLinkIconAdditionalAttributes