From a4c17935006a72cd447a6c642b0bb33959a68af3 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Thu, 2 Nov 2023 20:55:44 +0100
Subject: [PATCH 01/25] Shortcut url followup 2

---
 .../composables/actions/files/useFileActionsOpenShortcut.spec.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsOpenShortcut.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsOpenShortcut.spec.ts
index 1a8e02c8549..f9faff51f8b 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsOpenShortcut.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsOpenShortcut.spec.ts
@@ -108,7 +108,6 @@ function getWrapper({
     })
   }
 
-  // url contains xss code to test xss protection
   mocks.$clientService.webdav.getFileContents.mockResolvedValue(
     mock<GetFileContentsResponse>({
       body: getFileContentsValue

From 41f450848b62e77a5b9f8a550bb4ad9359ad93c8 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Thu, 2 Nov 2023 21:01:55 +0100
Subject: [PATCH 02/25] open in same window if is ocis uri

---
 .../composables/actions/files/useFileActionsOpenShortcut.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsOpenShortcut.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsOpenShortcut.ts
index 34305f06733..2f4404ab1bb 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsOpenShortcut.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsOpenShortcut.ts
@@ -13,6 +13,7 @@ import { useGettext } from 'vue3-gettext'
 import { Store } from 'vuex'
 import { useClientService } from '../../clientService'
 import DOMPurify from 'dompurify'
+import { useConfigurationManager } from '../../configuration'
 
 export const useFileActionsOpenShortcut = ({ store }: { store?: Store<any> } = {}) => {
   const router = useRouter()
@@ -20,6 +21,7 @@ export const useFileActionsOpenShortcut = ({ store }: { store?: Store<any> } = {
   const isFilesAppActive = useIsFilesAppActive()
   const isSearchActive = useIsSearchActive()
   const clientService = useClientService()
+  const configurationManger = useConfigurationManager()
 
   const extractUrl = (fileContents: string) => {
     const regex = /URL=(.+)/
@@ -39,6 +41,10 @@ export const useFileActionsOpenShortcut = ({ store }: { store?: Store<any> } = {
       // Omit possible xss code
       const sanitizedUrl = DOMPurify.sanitize(url, { USE_PROFILES: { html: true } })
 
+      if (sanitizedUrl.startsWith(configurationManger.serverUrl)) {
+        return (window.location.href = sanitizedUrl)
+      }
+
       window.open(sanitizedUrl)
     } catch (e) {
       console.error(e)

From 7d9f94c8982735eed312684e5ff443e916464e10 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Thu, 2 Nov 2023 21:12:53 +0100
Subject: [PATCH 03/25] add more tests

---
 .../files/useFileActionsOpenShortcut.spec.ts  | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsOpenShortcut.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsOpenShortcut.spec.ts
index f9faff51f8b..2aed42db181 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsOpenShortcut.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsOpenShortcut.spec.ts
@@ -7,7 +7,7 @@ import {
   RouteLocation,
   getComposableWrapper
 } from 'web-test-helpers'
-import { useFileActionsOpenShortcut, useRoute } from '../../../../../src'
+import { ConfigurationManager, useFileActionsOpenShortcut, useRoute } from '../../../../../src'
 import { Resource } from '@ownclouders/web-client'
 import { GetFileContentsResponse } from '@ownclouders/web-client/src/webdav/getFileContents'
 
@@ -16,6 +16,13 @@ jest.mock('../../../../../src/composables/router', () => ({
   useRoute: jest.fn()
 }))
 
+jest.mock('../../../../../src/composables/configuration', () => ({
+  useConfigurationManager: () =>
+    mock<ConfigurationManager>({
+      serverUrl: 'https://demo.owncloud.com'
+    })
+}))
+
 window = Object.create(window)
 Object.defineProperty(window, 'location', {
   value: {
@@ -68,6 +75,18 @@ describe('openShortcut', () => {
           }
         })
       })
+      it('opens the url in the same window if url links to OCIS instance', () => {
+        getWrapper({
+          getFileContentsValue: '[InternetShortcut]\nURL=https://demo.owncloud.com',
+          setup: async ({ actions }) => {
+            await unref(actions)[0].handler({
+              resources: [mock<Resource>()],
+              space: null
+            })
+            expect(window.location.href).toBe('https://demo.owncloud.com')
+          }
+        })
+      })
     })
   })
   describe('method "extractUrl"', () => {

From 3a845fc90943f83da244ee61dba927cbaf2e50bc Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Fri, 3 Nov 2023 11:56:47 +0100
Subject: [PATCH 04/25] add drop

---
 .../src/components/CreateShortcutModal.vue    | 85 +++++++++++++++++--
 1 file changed, 79 insertions(+), 6 deletions(-)

diff --git a/packages/web-pkg/src/components/CreateShortcutModal.vue b/packages/web-pkg/src/components/CreateShortcutModal.vue
index 37e69132643..1c49219d4a0 100644
--- a/packages/web-pkg/src/components/CreateShortcutModal.vue
+++ b/packages/web-pkg/src/components/CreateShortcutModal.vue
@@ -9,8 +9,34 @@
       @confirm="createShortcut"
     >
       <template #content>
-        url
-        <oc-text-input v-model="inputUrl" />
+        <oc-text-input
+          id="create-shortcut-modal-url-input"
+          v-model="inputUrl"
+          :label="$gettext('Shortcut to a webpage or file')"
+        />
+        <oc-drop
+          v-if="showDrop"
+          class="oc-pt-s"
+          ref="dropRef"
+          padding-size="remove"
+          drop-id="create-shortcut-modal-contextmenu"
+          toggle="#create-shortcut-modal-url-input"
+          :close-on-click="true"
+        >
+          <oc-list>
+            <li class="oc-p-s">
+              <oc-button
+                class="oc-width-1-1"
+                appearance="raw"
+                justify-content="left"
+                @click="dropItemUrlClicked"
+              >
+                <oc-icon name="external-link" />
+                <span v-text="dropItemUrl" />
+              </oc-button>
+            </li>
+          </oc-list>
+        </oc-drop>
         <div class="oc-flex oc-flex-bottom oc-width-1-1 oc-mt-m">
           <oc-text-input
             v-model="inputFilename"
@@ -25,12 +51,13 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, ref, unref, computed } from 'vue'
+import { defineComponent, PropType, ref, unref, computed, watch, nextTick } from 'vue'
 import { SpaceResource } from '@ownclouders/web-client'
 import { useClientService, useStore } from '../composables'
 import { urlJoin } from '@ownclouders/web-client/src/utils'
 import { useGettext } from 'vue3-gettext'
 import DOMPurify from 'dompurify'
+import { OcDrop } from '@ownclouders/design-system/src/components'
 
 export default defineComponent({
   name: 'CreateShortcutModal',
@@ -48,14 +75,40 @@ export default defineComponent({
     const clientService = useClientService()
     const { $gettext } = useGettext()
     const store = useStore()
+    const dropRef = ref(null)
     const inputUrl = ref('')
     const inputFilename = ref('')
+
+    const showDrop = computed(() => unref(inputUrl).trim())
+
+    const isMaybeUrl = (input: string) => {
+      const urlPrefixes = ['http://', 'https://']
+      return urlPrefixes.some((prefix) => prefix.startsWith(input) || input.startsWith(prefix))
+    }
+
+    const dropItemUrl = computed(() => {
+      let url = unref(inputUrl).trim()
+
+      if (isMaybeUrl(url)) {
+        return url
+      }
+
+      return `https://${url}`
+    })
+
     const confirmButtonDisabled = computed(() => !(unref(inputUrl) && unref(inputFilename)))
 
     const currentFolder = computed(() => {
       return store.getters['Files/currentFolder']
     })
 
+    const dropItemUrlClicked = () => {
+      inputUrl.value = unref(dropItemUrl)
+      try {
+        inputFilename.value = new URL(unref(dropItemUrl)).host
+      } catch (e) {}
+    }
+
     const createShortcut = async () => {
       // Closes the modal
       props.cancel()
@@ -83,12 +136,32 @@ export default defineComponent({
       }
     }
 
+    watch(inputUrl, async (value) => {
+      await nextTick()
+      if (unref(showDrop) && unref(dropRef)) {
+        ;(unref(dropRef) as InstanceType<typeof OcDrop>).show()
+      }
+    })
+
     return {
-      confirmButtonDisabled,
-      createShortcut,
       inputUrl,
-      inputFilename
+      inputFilename,
+      showDrop,
+      dropRef,
+      dropItemUrl,
+      dropItemUrlClicked,
+      createShortcut,
+      confirmButtonDisabled
     }
   }
 })
 </script>
+<style lang="scss" scoped>
+#create-shortcut-modal-contextmenu {
+  width: 458px;
+
+  li:hover {
+    background-color: var(--oc-color-background-highlight);
+  }
+}
+</style>

From 5c0af5cfc8ee47a60b0f3be73261a0321a923d43 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Sat, 4 Nov 2023 11:21:31 +0100
Subject: [PATCH 05/25] Duplicate filename handling

---
 .../src/components/CreateShortcutModal.vue    | 52 +++++++++++++------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/packages/web-pkg/src/components/CreateShortcutModal.vue b/packages/web-pkg/src/components/CreateShortcutModal.vue
index 1c49219d4a0..14d35cf2bd3 100644
--- a/packages/web-pkg/src/components/CreateShortcutModal.vue
+++ b/packages/web-pkg/src/components/CreateShortcutModal.vue
@@ -16,8 +16,8 @@
         />
         <oc-drop
           v-if="showDrop"
-          class="oc-pt-s"
           ref="dropRef"
+          class="oc-pt-s"
           padding-size="remove"
           drop-id="create-shortcut-modal-contextmenu"
           toggle="#create-shortcut-modal-url-input"
@@ -37,11 +37,13 @@
             </li>
           </oc-list>
         </oc-drop>
-        <div class="oc-flex oc-flex-bottom oc-width-1-1 oc-mt-m">
+        <div class="oc-flex oc-width-1-1 oc-mt-m">
           <oc-text-input
             v-model="inputFilename"
             class="oc-width-1-1"
             :label="$gettext('Shortcut name')"
+            :error-message="inputFileNameErrorMessage"
+            :fix-message-line="true"
           />
           <span class="oc-ml-s">.url</span>
         </div>
@@ -52,12 +54,13 @@
 
 <script lang="ts">
 import { defineComponent, PropType, ref, unref, computed, watch, nextTick } from 'vue'
-import { SpaceResource } from '@ownclouders/web-client'
+import { Resource, SpaceResource } from '@ownclouders/web-client'
 import { useClientService, useStore } from '../composables'
 import { urlJoin } from '@ownclouders/web-client/src/utils'
 import { useGettext } from 'vue3-gettext'
 import DOMPurify from 'dompurify'
 import { OcDrop } from '@ownclouders/design-system/src/components'
+import { resolveFileNameDuplicate } from '../helpers'
 
 export default defineComponent({
   name: 'CreateShortcutModal',
@@ -79,13 +82,6 @@ export default defineComponent({
     const inputUrl = ref('')
     const inputFilename = ref('')
 
-    const showDrop = computed(() => unref(inputUrl).trim())
-
-    const isMaybeUrl = (input: string) => {
-      const urlPrefixes = ['http://', 'https://']
-      return urlPrefixes.some((prefix) => prefix.startsWith(input) || input.startsWith(prefix))
-    }
-
     const dropItemUrl = computed(() => {
       let url = unref(inputUrl).trim()
 
@@ -96,17 +92,40 @@ export default defineComponent({
       return `https://${url}`
     })
 
-    const confirmButtonDisabled = computed(() => !(unref(inputUrl) && unref(inputFilename)))
+    const showDrop = computed(() => unref(inputUrl).trim())
+    const confirmButtonDisabled = computed(
+      () => unref(fileAlreadyExists) || !unref(inputFilename) || !unref(inputUrl)
+    )
+    const currentFolder = computed(() => store.getters['Files/currentFolder'])
+    const files = computed((): Array<Resource> => store.getters['Files/files'])
+    const fileAlreadyExists = computed(
+      () => !!unref(files).find((file) => file.name === `${unref(inputFilename)}.url`)
+    )
+
+    const inputFileNameErrorMessage = computed(() => {
+      if (unref(fileAlreadyExists)) {
+        return $gettext('%{name} already exists', { name: `${unref(inputFilename)}.url` })
+      }
 
-    const currentFolder = computed(() => {
-      return store.getters['Files/currentFolder']
+      return ''
     })
 
+    const isMaybeUrl = (input: string) => {
+      const urlPrefixes = ['http://', 'https://']
+      return urlPrefixes.some((prefix) => prefix.startsWith(input) || input.startsWith(prefix))
+    }
+
     const dropItemUrlClicked = () => {
       inputUrl.value = unref(dropItemUrl)
       try {
-        inputFilename.value = new URL(unref(dropItemUrl)).host
-      } catch (e) {}
+        let fileName = new URL(unref(dropItemUrl)).host
+        if (unref(files).some((f) => f.name === `${fileName}.url`)) {
+          fileName = resolveFileNameDuplicate(`${fileName}.url`, 'url', unref(files)).slice(0, -4)
+        }
+        inputFilename.value = fileName
+      } catch (e) {
+        throw e
+      }
     }
 
     const createShortcut = async () => {
@@ -151,7 +170,8 @@ export default defineComponent({
       dropItemUrl,
       dropItemUrlClicked,
       createShortcut,
-      confirmButtonDisabled
+      confirmButtonDisabled,
+      inputFileNameErrorMessage
     }
   }
 })

From 0518a4338370e001795960f53d85d102537a733d Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Sun, 5 Nov 2023 09:58:15 +0100
Subject: [PATCH 06/25] Confirm modal with enter button

---
 packages/web-pkg/src/components/CreateShortcutModal.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/web-pkg/src/components/CreateShortcutModal.vue b/packages/web-pkg/src/components/CreateShortcutModal.vue
index 14d35cf2bd3..824fb45b3fa 100644
--- a/packages/web-pkg/src/components/CreateShortcutModal.vue
+++ b/packages/web-pkg/src/components/CreateShortcutModal.vue
@@ -7,6 +7,7 @@
       :button-confirm-disabled="confirmButtonDisabled"
       @cancel="cancel"
       @confirm="createShortcut"
+      @keydown.enter="onKeyDownEnter"
     >
       <template #content>
         <oc-text-input
@@ -128,6 +129,11 @@ export default defineComponent({
       }
     }
 
+    const onKeyDownEnter = () => {
+      if (!unref(confirmButtonDisabled)) {
+        createShortcut()
+      }
+    }
     const createShortcut = async () => {
       // Closes the modal
       props.cancel()
@@ -171,7 +177,8 @@ export default defineComponent({
       dropItemUrlClicked,
       createShortcut,
       confirmButtonDisabled,
-      inputFileNameErrorMessage
+      inputFileNameErrorMessage,
+      onKeyDownEnter
     }
   }
 })

From d63a9a901e7a7a3c60b6ed66c098097ec73a348d Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Mon, 6 Nov 2023 09:16:34 +0100
Subject: [PATCH 07/25] Add https in front of uri if missing

---
 .../actions/files/useFileActionsOpenShortcut.ts    | 14 +++++++++-----
 .../files/useFileActionsOpenShortcut.spec.ts       | 12 ++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsOpenShortcut.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsOpenShortcut.ts
index 2f4404ab1bb..fcf982f3afc 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsOpenShortcut.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsOpenShortcut.ts
@@ -36,16 +36,20 @@ export const useFileActionsOpenShortcut = ({ store }: { store?: Store<any> } = {
   const handler = async ({ resources, space }: FileActionOptions) => {
     try {
       const fileContents = (await clientService.webdav.getFileContents(space, resources[0])).body
-      const url = extractUrl(fileContents)
+      let url = extractUrl(fileContents)
+
+      // Add protocol if missing
+      url = url.match(/^http[s]?:\/\//) ? url : `https://${url}`
 
       // Omit possible xss code
-      const sanitizedUrl = DOMPurify.sanitize(url, { USE_PROFILES: { html: true } })
+      url = DOMPurify.sanitize(url, { USE_PROFILES: { html: true } })
 
-      if (sanitizedUrl.startsWith(configurationManger.serverUrl)) {
-        return (window.location.href = sanitizedUrl)
+      if (url.startsWith(configurationManger.serverUrl)) {
+        window.location.href = url
+        return
       }
 
-      window.open(sanitizedUrl)
+      window.open(url)
     } catch (e) {
       console.error(e)
       store.dispatch('showErrorMessage', {
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsOpenShortcut.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsOpenShortcut.spec.ts
index 2aed42db181..c648cdc4359 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsOpenShortcut.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsOpenShortcut.spec.ts
@@ -62,6 +62,18 @@ describe('openShortcut', () => {
       })
     })
     describe('method "handler"', () => {
+      it('adds http(s) protocol if missing and opens the url in a new tab', () => {
+        getWrapper({
+          getFileContentsValue: '[InternetShortcut]\nURL=owncloud.com',
+          setup: async ({ actions }) => {
+            await unref(actions)[0].handler({
+              resources: [mock<Resource>()],
+              space: null
+            })
+            expect(window.open).toHaveBeenCalledWith('https://owncloud.com')
+          }
+        })
+      })
       it('omits xss code and opens the url in a new tab', () => {
         getWrapper({
           getFileContentsValue:

From 6462e682119473ecc8090fd4dc021e6c0d82f03b Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Mon, 6 Nov 2023 09:33:03 +0100
Subject: [PATCH 08/25] Fix file extension placement

---
 .../src/components/CreateShortcutModal.vue    | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/packages/web-pkg/src/components/CreateShortcutModal.vue b/packages/web-pkg/src/components/CreateShortcutModal.vue
index 824fb45b3fa..e7a01b81cfe 100644
--- a/packages/web-pkg/src/components/CreateShortcutModal.vue
+++ b/packages/web-pkg/src/components/CreateShortcutModal.vue
@@ -46,7 +46,9 @@
             :error-message="inputFileNameErrorMessage"
             :fix-message-line="true"
           />
-          <span class="oc-ml-s">.url</span>
+          <span class="oc-ml-s oc-flex oc-flex-bottom create-shortcut-modal-url-extension"
+            >.url</span
+          >
         </div>
       </template>
     </oc-modal>
@@ -95,16 +97,16 @@ export default defineComponent({
 
     const showDrop = computed(() => unref(inputUrl).trim())
     const confirmButtonDisabled = computed(
-      () => unref(fileAlreadyExists) || !unref(inputFilename) || !unref(inputUrl)
+      () => unref(fileAlreadyExistss) || !unref(inputFilename) || !unref(inputUrl)
     )
     const currentFolder = computed(() => store.getters['Files/currentFolder'])
     const files = computed((): Array<Resource> => store.getters['Files/files'])
-    const fileAlreadyExists = computed(
+    const fileAlreadyExistss = computed(
       () => !!unref(files).find((file) => file.name === `${unref(inputFilename)}.url`)
     )
 
     const inputFileNameErrorMessage = computed(() => {
-      if (unref(fileAlreadyExists)) {
+      if (unref(fileAlreadyExistss)) {
         return $gettext('%{name} already exists', { name: `${unref(inputFilename)}.url` })
       }
 
@@ -184,11 +186,17 @@ export default defineComponent({
 })
 </script>
 <style lang="scss" scoped>
-#create-shortcut-modal-contextmenu {
-  width: 458px;
+.create-shortcut-modal {
+  &-url-extension {
+    margin-bottom: calc(var(--oc-space-xsmall) + 1.3125rem);
+  }
+
+  &-contextmenu {
+    width: 458px;
 
-  li:hover {
-    background-color: var(--oc-color-background-highlight);
+    li:hover {
+      background-color: var(--oc-color-background-highlight);
+    }
   }
 }
 </style>

From 7eb212a92e11d3d80c8824af486b86d27d48d850 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Mon, 6 Nov 2023 10:10:34 +0100
Subject: [PATCH 09/25] Add unit test

---
 .../src/components/CreateShortcutModal.vue    | 12 ++--
 .../components/CreateShortcutModal.spec.ts    | 70 +++++++++++++++++++
 2 files changed, 76 insertions(+), 6 deletions(-)
 create mode 100644 packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts

diff --git a/packages/web-pkg/src/components/CreateShortcutModal.vue b/packages/web-pkg/src/components/CreateShortcutModal.vue
index e7a01b81cfe..7dfef9a956a 100644
--- a/packages/web-pkg/src/components/CreateShortcutModal.vue
+++ b/packages/web-pkg/src/components/CreateShortcutModal.vue
@@ -6,7 +6,7 @@
       :button-confirm-text="$gettext('Create')"
       :button-confirm-disabled="confirmButtonDisabled"
       @cancel="cancel"
-      @confirm="createShortcut"
+      @confirm="createShortcut(inputUrl, inputFilename)"
       @keydown.enter="onKeyDownEnter"
     >
       <template #content>
@@ -133,19 +133,19 @@ export default defineComponent({
 
     const onKeyDownEnter = () => {
       if (!unref(confirmButtonDisabled)) {
-        createShortcut()
+        createShortcut(unref(inputUrl), unref(inputFilename))
       }
     }
-    const createShortcut = async () => {
+    const createShortcut = async (url: string, filename: string) => {
       // Closes the modal
       props.cancel()
 
       try {
         // Omit possible xss code
-        const sanitizedUrl = DOMPurify.sanitize(unref(inputUrl), { USE_PROFILES: { html: true } })
+        const sanitizedUrl = DOMPurify.sanitize(url, { USE_PROFILES: { html: true } })
 
-        const content = `[InternetShortcut]\nURL=${unref(sanitizedUrl)}`
-        const path = urlJoin(unref(currentFolder).path, `${unref(inputFilename)}.url`)
+        const content = `[InternetShortcut]\nURL=${sanitizedUrl}`
+        const path = urlJoin(unref(currentFolder).path, `${filename}.url`)
         const resource = await clientService.webdav.putFileContents(props.space, {
           path,
           content
diff --git a/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts b/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts
new file mode 100644
index 00000000000..5aacac16ede
--- /dev/null
+++ b/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts
@@ -0,0 +1,70 @@
+import CreateShortcutModal from '../../../src/components/CreateShortcutModal.vue'
+import {
+  createStore,
+  defaultComponentMocks,
+  defaultPlugins,
+  defaultStoreMockOptions,
+  mockAxiosReject,
+  RouteLocation,
+  shallowMount
+} from 'web-test-helpers'
+import { SpaceResource } from '@ownclouders/web-client'
+import { mock } from 'jest-mock-extended'
+import { FileResource } from '@ownclouders/web-client/src/helpers'
+
+describe('CreateShortcutModal', () => {
+  describe('method "createShortcut"', () => {
+    it('should show message on success', async () => {
+      const { wrapper, storeOptions } = getWrapper()
+      await wrapper.vm.createShortcut('https://owncloud.com', 'owncloud.url')
+      expect(storeOptions.modules.Files.mutations.UPSERT_RESOURCE).toHaveBeenCalled()
+      expect(storeOptions.actions.showMessage).toHaveBeenCalled()
+    })
+    it('should show error message on fail', async () => {
+      console.error = jest.fn()
+      const { wrapper, storeOptions } = getWrapper({ rejectPutFileContents: true })
+      await wrapper.vm.createShortcut('https://owncloud.com', 'owncloud.url')
+      expect(storeOptions.modules.Files.mutations.UPSERT_RESOURCE).not.toHaveBeenCalled()
+      expect(storeOptions.actions.showErrorMessage).toHaveBeenCalled()
+    })
+  })
+})
+
+function getWrapper({ rejectPutFileContents = false } = {}) {
+  const storeOptions = {
+    ...defaultStoreMockOptions
+  }
+
+  storeOptions.modules.Files.getters.currentFolder.mockImplementation(() => mock<FileResource>())
+
+  const store = createStore(storeOptions)
+
+  const mocks = {
+    ...defaultComponentMocks({
+      currentRoute: mock<RouteLocation>({ name: 'files-spaces-generic' })
+    })
+  }
+
+  if (rejectPutFileContents) {
+    mocks.$clientService.webdav.putFileContents.mockRejectedValue(() => mockAxiosReject())
+  } else {
+    mocks.$clientService.webdav.putFileContents.mockResolvedValue(mock<FileResource>())
+  }
+
+  return {
+    mocks,
+    storeOptions,
+    wrapper: shallowMount(CreateShortcutModal, {
+      props: {
+        cancel: jest.fn(),
+        space: mock<SpaceResource>(),
+        title: 'Personal quota'
+      },
+      global: {
+        plugins: [...defaultPlugins(), store],
+        mocks,
+        provide: mocks
+      }
+    })
+  }
+}

From 78a73b3a8c771b9a2786bdda39d9a8dbad91974a Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Mon, 6 Nov 2023 10:13:52 +0100
Subject: [PATCH 10/25] Don't throw

---
 packages/web-pkg/src/components/CreateShortcutModal.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/web-pkg/src/components/CreateShortcutModal.vue b/packages/web-pkg/src/components/CreateShortcutModal.vue
index 7dfef9a956a..f0bedca82af 100644
--- a/packages/web-pkg/src/components/CreateShortcutModal.vue
+++ b/packages/web-pkg/src/components/CreateShortcutModal.vue
@@ -126,9 +126,7 @@ export default defineComponent({
           fileName = resolveFileNameDuplicate(`${fileName}.url`, 'url', unref(files)).slice(0, -4)
         }
         inputFilename.value = fileName
-      } catch (e) {
-        throw e
-      }
+      } catch (_) {}
     }
 
     const onKeyDownEnter = () => {

From ecf3e87b498daa7109804e6a73996991bce53585 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Mon, 6 Nov 2023 10:38:58 +0100
Subject: [PATCH 11/25] Fix styling

---
 .../src/components/CreateShortcutModal.vue    | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/web-pkg/src/components/CreateShortcutModal.vue b/packages/web-pkg/src/components/CreateShortcutModal.vue
index f0bedca82af..8de8992844e 100644
--- a/packages/web-pkg/src/components/CreateShortcutModal.vue
+++ b/packages/web-pkg/src/components/CreateShortcutModal.vue
@@ -97,16 +97,16 @@ export default defineComponent({
 
     const showDrop = computed(() => unref(inputUrl).trim())
     const confirmButtonDisabled = computed(
-      () => unref(fileAlreadyExistss) || !unref(inputFilename) || !unref(inputUrl)
+      () => unref(fileAlreadyExists) || !unref(inputFilename) || !unref(inputUrl)
     )
     const currentFolder = computed(() => store.getters['Files/currentFolder'])
     const files = computed((): Array<Resource> => store.getters['Files/files'])
-    const fileAlreadyExistss = computed(
+    const fileAlreadyExists = computed(
       () => !!unref(files).find((file) => file.name === `${unref(inputFilename)}.url`)
     )
 
     const inputFileNameErrorMessage = computed(() => {
-      if (unref(fileAlreadyExistss)) {
+      if (unref(fileAlreadyExists)) {
         return $gettext('%{name} already exists', { name: `${unref(inputFilename)}.url` })
       }
 
@@ -134,6 +134,7 @@ export default defineComponent({
         createShortcut(unref(inputUrl), unref(inputFilename))
       }
     }
+
     const createShortcut = async (url: string, filename: string) => {
       // Closes the modal
       props.cancel()
@@ -161,7 +162,7 @@ export default defineComponent({
       }
     }
 
-    watch(inputUrl, async (value) => {
+    watch(inputUrl, async () => {
       await nextTick()
       if (unref(showDrop) && unref(dropRef)) {
         ;(unref(dropRef) as InstanceType<typeof OcDrop>).show()
@@ -188,13 +189,13 @@ export default defineComponent({
   &-url-extension {
     margin-bottom: calc(var(--oc-space-xsmall) + 1.3125rem);
   }
+}
 
-  &-contextmenu {
-    width: 458px;
+#create-shortcut-modal-contextmenu {
+  width: 458px;
 
-    li:hover {
-      background-color: var(--oc-color-background-highlight);
-    }
+  li:hover {
+    background-color: var(--oc-color-background-highlight);
   }
 }
 </style>

From b077352a95a9f39c652b111d7542b7ef3dbc0a7f Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Mon, 6 Nov 2023 12:05:50 +0100
Subject: [PATCH 12/25] Add search and fix unit tests

---
 .../src/components/CreateShortcutModal.vue    | 102 ++++++++++++++++--
 .../files/useFileActionsOpenShortcut.ts       |   5 +-
 .../files/useFileActionsOpenShortcut.spec.ts  |   2 +-
 3 files changed, 96 insertions(+), 13 deletions(-)

diff --git a/packages/web-pkg/src/components/CreateShortcutModal.vue b/packages/web-pkg/src/components/CreateShortcutModal.vue
index 8de8992844e..b24bce2da44 100644
--- a/packages/web-pkg/src/components/CreateShortcutModal.vue
+++ b/packages/web-pkg/src/components/CreateShortcutModal.vue
@@ -25,7 +25,7 @@
           :close-on-click="true"
         >
           <oc-list>
-            <li class="oc-p-s">
+            <li class="oc-p-xs">
               <oc-button
                 class="oc-width-1-1"
                 appearance="raw"
@@ -36,6 +36,29 @@
                 <span v-text="dropItemUrl" />
               </oc-button>
             </li>
+            <li v-if="searchTask.isRunning" class="oc-p-xs oc-flex oc-flex-center">
+              <oc-spinner />
+            </li>
+            <li v-for="(resource, index) in searchResults" :key="index" class="oc-p-xs">
+              <oc-button
+                class="oc-width-1-1"
+                appearance="raw"
+                justify-content="left"
+                @click="dropItemResourceClicked(resource)"
+              >
+                <oc-resource
+                  :resource="resource"
+                  :is-resource-clickable="false"
+                  :path-prefix="getPathPrefix(resource)"
+                  :is-path-displayed="true"
+                  :folder-link="getFolderLink(resource)"
+                  :parent-folder-link-icon-additional-attributes="
+                    getParentFolderLinkIconAdditionalAttributes(resource)
+                  "
+                  :parent-folder-name="getParentFolderName(resource)"
+                />
+              </oc-button>
+            </li>
           </oc-list>
         </oc-drop>
         <div class="oc-flex oc-width-1-1 oc-mt-m">
@@ -58,13 +81,18 @@
 <script lang="ts">
 import { defineComponent, PropType, ref, unref, computed, watch, nextTick } from 'vue'
 import { Resource, SpaceResource } from '@ownclouders/web-client'
-import { useClientService, useStore } from '../composables'
+import { useClientService, useFolderLink, useStore } from '../composables'
 import { urlJoin } from '@ownclouders/web-client/src/utils'
 import { useGettext } from 'vue3-gettext'
 import DOMPurify from 'dompurify'
 import { OcDrop } from '@ownclouders/design-system/src/components'
 import { resolveFileNameDuplicate } from '../helpers'
+import { DavProperties } from '@ownclouders/web-client/src/webdav'
+import { useTask } from 'vue-concurrency'
+import { debounce } from 'lodash-es'
 
+const SEARCH_LIMIT = 7
+const SEARCH_DEBOUNCE_TIME = 200
 export default defineComponent({
   name: 'CreateShortcutModal',
   props: {
@@ -81,9 +109,18 @@ export default defineComponent({
     const clientService = useClientService()
     const { $gettext } = useGettext()
     const store = useStore()
+    const {
+      getPathPrefix,
+      getParentFolderName,
+      getParentFolderLink,
+      getParentFolderLinkIconAdditionalAttributes,
+      getFolderLink
+    } = useFolderLink()
+
     const dropRef = ref(null)
     const inputUrl = ref('')
     const inputFilename = ref('')
+    const searchResults = ref(null)
 
     const dropItemUrl = computed(() => {
       let url = unref(inputUrl).trim()
@@ -113,6 +150,22 @@ export default defineComponent({
       return ''
     })
 
+    const searchTask = useTask(function* (signal, searchTerm: string) {
+      searchTerm = `name:"*${searchTerm}*"`
+
+      try {
+        const { resources } = yield clientService.webdav.search(searchTerm, {
+          searchLimit: SEARCH_LIMIT,
+          davProperties: DavProperties.Default
+        })
+
+        searchResults.value = resources
+      } catch (e) {
+        console.error(e)
+        searchResults.value = []
+      }
+    })
+
     const isMaybeUrl = (input: string) => {
       const urlPrefixes = ['http://', 'https://']
       return urlPrefixes.some((prefix) => prefix.startsWith(input) || input.startsWith(prefix))
@@ -121,14 +174,27 @@ export default defineComponent({
     const dropItemUrlClicked = () => {
       inputUrl.value = unref(dropItemUrl)
       try {
-        let fileName = new URL(unref(dropItemUrl)).host
-        if (unref(files).some((f) => f.name === `${fileName}.url`)) {
-          fileName = resolveFileNameDuplicate(`${fileName}.url`, 'url', unref(files)).slice(0, -4)
+        let filename = new URL(unref(dropItemUrl)).host
+        if (unref(files).some((f) => f.name === `${filename}.url`)) {
+          filename = resolveFileNameDuplicate(`${filename}.url`, 'url', unref(files)).slice(0, -4)
         }
-        inputFilename.value = fileName
+        inputFilename.value = filename
       } catch (_) {}
     }
 
+    const dropItemResourceClicked = (resource: Resource) => {
+      const webURL = new URL(window.location.href)
+      let filename = resource.name
+
+      inputUrl.value = `${webURL.origin}/f/${resource.id}`
+
+      if (unref(files).some((f) => f.name === `${filename}.url`)) {
+        filename = resolveFileNameDuplicate(`${filename}.url`, 'url', unref(files)).slice(0, -4)
+      }
+
+      inputFilename.value = filename
+    }
+
     const onKeyDownEnter = () => {
       if (!unref(confirmButtonDisabled)) {
         createShortcut(unref(inputUrl), unref(inputFilename))
@@ -166,6 +232,12 @@ export default defineComponent({
       await nextTick()
       if (unref(showDrop) && unref(dropRef)) {
         ;(unref(dropRef) as InstanceType<typeof OcDrop>).show()
+
+        const debouncedSearch = debounce(() => {
+          searchTask.perform(unref(inputUrl))
+        }, SEARCH_DEBOUNCE_TIME)
+
+        debouncedSearch()
       }
     })
 
@@ -175,11 +247,19 @@ export default defineComponent({
       showDrop,
       dropRef,
       dropItemUrl,
-      dropItemUrlClicked,
-      createShortcut,
+      searchResults,
       confirmButtonDisabled,
       inputFileNameErrorMessage,
-      onKeyDownEnter
+      searchTask,
+      createShortcut,
+      onKeyDownEnter,
+      dropItemUrlClicked,
+      dropItemResourceClicked,
+      getPathPrefix,
+      getFolderLink,
+      getParentFolderLink,
+      getParentFolderName,
+      getParentFolderLinkIconAdditionalAttributes
     }
   }
 })
@@ -194,6 +274,10 @@ export default defineComponent({
 #create-shortcut-modal-contextmenu {
   width: 458px;
 
+  .oc-resource-name {
+    text-decoration: none;
+  }
+
   li:hover {
     background-color: var(--oc-color-background-highlight);
   }
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsOpenShortcut.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsOpenShortcut.ts
index fcf982f3afc..c8605e1082f 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsOpenShortcut.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsOpenShortcut.ts
@@ -13,7 +13,6 @@ import { useGettext } from 'vue3-gettext'
 import { Store } from 'vuex'
 import { useClientService } from '../../clientService'
 import DOMPurify from 'dompurify'
-import { useConfigurationManager } from '../../configuration'
 
 export const useFileActionsOpenShortcut = ({ store }: { store?: Store<any> } = {}) => {
   const router = useRouter()
@@ -21,7 +20,6 @@ export const useFileActionsOpenShortcut = ({ store }: { store?: Store<any> } = {
   const isFilesAppActive = useIsFilesAppActive()
   const isSearchActive = useIsSearchActive()
   const clientService = useClientService()
-  const configurationManger = useConfigurationManager()
 
   const extractUrl = (fileContents: string) => {
     const regex = /URL=(.+)/
@@ -35,6 +33,7 @@ export const useFileActionsOpenShortcut = ({ store }: { store?: Store<any> } = {
   }
   const handler = async ({ resources, space }: FileActionOptions) => {
     try {
+      const webURL = new URL(window.location.href)
       const fileContents = (await clientService.webdav.getFileContents(space, resources[0])).body
       let url = extractUrl(fileContents)
 
@@ -44,7 +43,7 @@ export const useFileActionsOpenShortcut = ({ store }: { store?: Store<any> } = {
       // Omit possible xss code
       url = DOMPurify.sanitize(url, { USE_PROFILES: { html: true } })
 
-      if (url.startsWith(configurationManger.serverUrl)) {
+      if (url.startsWith(webURL.origin)) {
         window.location.href = url
         return
       }
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsOpenShortcut.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsOpenShortcut.spec.ts
index c648cdc4359..24cd11ee8ab 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsOpenShortcut.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsOpenShortcut.spec.ts
@@ -26,7 +26,7 @@ jest.mock('../../../../../src/composables/configuration', () => ({
 window = Object.create(window)
 Object.defineProperty(window, 'location', {
   value: {
-    href: ''
+    href: 'https://demo.owncloud.com'
   },
   writable: true
 })

From 340070fb6630ac9c01881a8693ca656e66fdeefe Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Mon, 6 Nov 2023 13:16:20 +0100
Subject: [PATCH 13/25] Add more tests

---
 .../src/components/CreateShortcutModal.vue    | 10 ++++----
 .../components/CreateShortcutModal.spec.ts    | 25 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/packages/web-pkg/src/components/CreateShortcutModal.vue b/packages/web-pkg/src/components/CreateShortcutModal.vue
index b24bce2da44..128608d3ce7 100644
--- a/packages/web-pkg/src/components/CreateShortcutModal.vue
+++ b/packages/web-pkg/src/components/CreateShortcutModal.vue
@@ -161,11 +161,16 @@ export default defineComponent({
 
         searchResults.value = resources
       } catch (e) {
+        // Don't show user faced error, as the core functionality does work without an intact search
         console.error(e)
         searchResults.value = []
       }
     })
 
+    const debouncedSearch = debounce(() => {
+      searchTask.perform(unref(inputUrl))
+    }, SEARCH_DEBOUNCE_TIME)
+
     const isMaybeUrl = (input: string) => {
       const urlPrefixes = ['http://', 'https://']
       return urlPrefixes.some((prefix) => prefix.startsWith(input) || input.startsWith(prefix))
@@ -232,11 +237,6 @@ export default defineComponent({
       await nextTick()
       if (unref(showDrop) && unref(dropRef)) {
         ;(unref(dropRef) as InstanceType<typeof OcDrop>).show()
-
-        const debouncedSearch = debounce(() => {
-          searchTask.perform(unref(inputUrl))
-        }, SEARCH_DEBOUNCE_TIME)
-
         debouncedSearch()
       }
     })
diff --git a/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts b/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts
index 5aacac16ede..a48573d7030 100644
--- a/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts
+++ b/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts
@@ -11,6 +11,7 @@ import {
 import { SpaceResource } from '@ownclouders/web-client'
 import { mock } from 'jest-mock-extended'
 import { FileResource } from '@ownclouders/web-client/src/helpers'
+import { SearchResource } from '@ownclouders/web-client/src/webdav/search'
 
 describe('CreateShortcutModal', () => {
   describe('method "createShortcut"', () => {
@@ -28,9 +29,22 @@ describe('CreateShortcutModal', () => {
       expect(storeOptions.actions.showErrorMessage).toHaveBeenCalled()
     })
   })
+  describe('method "searchTask"', () => {
+    it('should set "searchResults" correctly', async () => {
+      const { wrapper } = getWrapper()
+      await wrapper.vm.searchTask.perform()
+      expect(wrapper.vm.searchResults.length).toBe(3)
+    })
+    it('should reset "searchResults" on error', async () => {
+      console.error = jest.fn()
+      const { wrapper } = getWrapper({ rejectSearch: true })
+      await wrapper.vm.searchTask.perform()
+      expect(wrapper.vm.searchResults.length).toBe(0)
+    })
+  })
 })
 
-function getWrapper({ rejectPutFileContents = false } = {}) {
+function getWrapper({ rejectPutFileContents = false, rejectSearch = false } = {}) {
   const storeOptions = {
     ...defaultStoreMockOptions
   }
@@ -51,6 +65,15 @@ function getWrapper({ rejectPutFileContents = false } = {}) {
     mocks.$clientService.webdav.putFileContents.mockResolvedValue(mock<FileResource>())
   }
 
+  if (rejectSearch) {
+    mocks.$clientService.webdav.search.mockRejectedValue(() => mockAxiosReject())
+  } else {
+    mocks.$clientService.webdav.search.mockResolvedValue({
+      resources: [mock<SearchResource>(), mock<SearchResource>(), mock<SearchResource>()],
+      totalResults: 20
+    })
+  }
+
   return {
     mocks,
     storeOptions,

From 0232b2328faa62b790b5f49e08601012d50a5928 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Mon, 6 Nov 2023 13:16:56 +0100
Subject: [PATCH 14/25] Change code comment

---
 packages/web-pkg/src/components/CreateShortcutModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web-pkg/src/components/CreateShortcutModal.vue b/packages/web-pkg/src/components/CreateShortcutModal.vue
index 128608d3ce7..62ba0989f4d 100644
--- a/packages/web-pkg/src/components/CreateShortcutModal.vue
+++ b/packages/web-pkg/src/components/CreateShortcutModal.vue
@@ -161,7 +161,7 @@ export default defineComponent({
 
         searchResults.value = resources
       } catch (e) {
-        // Don't show user faced error, as the core functionality does work without an intact search
+        // Don't show user facing error, as the core functionality does work without an intact search
         console.error(e)
         searchResults.value = []
       }

From b429661b20ff21c932e1046dfb21b0c2178510f1 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Mon, 6 Nov 2023 13:24:22 +0100
Subject: [PATCH 15/25] Add changelog item

---
 changelog/unreleased/enhancement-create-shortcuts | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 changelog/unreleased/enhancement-create-shortcuts

diff --git a/changelog/unreleased/enhancement-create-shortcuts b/changelog/unreleased/enhancement-create-shortcuts
new file mode 100644
index 00000000000..5a844d10aab
--- /dev/null
+++ b/changelog/unreleased/enhancement-create-shortcuts
@@ -0,0 +1,12 @@
+Enhancement: Create shortcuts
+
+We've added a new functionality to add to shortcuts to web, those can be created via the "+ New" context menu.
+Users can enter URLs or pick a file via the drop down menu and create a '.url' file.
+
+'.url' files can be opened via web or downloaded and opened on the desktop.
+
+https://github.com/owncloud/web/pull/9890
+https://github.com/owncloud/web/pull/9908
+https://github.com/owncloud/web/issues/9796
+https://github.com/owncloud/web/issues/9887
+https://github.com/owncloud/web/issues/9850

From 74be4df90be728df39c0a4c910e76432951c4056 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Mon, 6 Nov 2023 13:27:01 +0100
Subject: [PATCH 16/25] Don't scope scss

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

diff --git a/packages/web-pkg/src/components/CreateShortcutModal.vue b/packages/web-pkg/src/components/CreateShortcutModal.vue
index 62ba0989f4d..3579861f788 100644
--- a/packages/web-pkg/src/components/CreateShortcutModal.vue
+++ b/packages/web-pkg/src/components/CreateShortcutModal.vue
@@ -264,7 +264,7 @@ export default defineComponent({
   }
 })
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
 .create-shortcut-modal {
   &-url-extension {
     margin-bottom: calc(var(--oc-space-xsmall) + 1.3125rem);
@@ -275,7 +275,7 @@ export default defineComponent({
   width: 458px;
 
   .oc-resource-name {
-    text-decoration: none;
+    text-decoration: none !important;
   }
 
   li:hover {

From 1866131b55402ebbd593159258f149c12a5df0a3 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Mon, 6 Nov 2023 19:31:24 +0100
Subject: [PATCH 17/25] Kick oc10 leftover

---
 packages/web-app-files/src/search/sdk/preview.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/web-app-files/src/search/sdk/preview.ts b/packages/web-app-files/src/search/sdk/preview.ts
index dd69165ee9b..9ee384ff668 100644
--- a/packages/web-app-files/src/search/sdk/preview.ts
+++ b/packages/web-app-files/src/search/sdk/preview.ts
@@ -72,10 +72,6 @@ export default class Preview implements SearchPreview {
           const matchingSpace = this.getProjectSpace(resource.parentFolderId)
           const data = matchingSpace ? matchingSpace : resource
 
-          // info: in oc10 we have no storageId in resources. All resources are mounted into the personal space.
-          if (!data.storageId) {
-            data.storageId = this.store.getters.user.id
-          }
           if (this.configurationManager.options.routing.fullShareOwnerPaths && data.shareRoot) {
             data.path = urlJoin(data.shareRoot, data.path)
           }

From 973df98c1d5b3f936b3a197e3461bd5d5e476adf Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Mon, 6 Nov 2023 20:07:34 +0100
Subject: [PATCH 18/25] Fix space icon not shown

---
 .../src/components/CreateShortcutModal.vue    | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/packages/web-pkg/src/components/CreateShortcutModal.vue b/packages/web-pkg/src/components/CreateShortcutModal.vue
index 3579861f788..569dde7ca56 100644
--- a/packages/web-pkg/src/components/CreateShortcutModal.vue
+++ b/packages/web-pkg/src/components/CreateShortcutModal.vue
@@ -81,7 +81,7 @@
 <script lang="ts">
 import { defineComponent, PropType, ref, unref, computed, watch, nextTick } from 'vue'
 import { Resource, SpaceResource } from '@ownclouders/web-client'
-import { useClientService, useFolderLink, useStore } from '../composables'
+import { useClientService, useConfigurationManager, useFolderLink, useStore } from '../composables'
 import { urlJoin } from '@ownclouders/web-client/src/utils'
 import { useGettext } from 'vue3-gettext'
 import DOMPurify from 'dompurify'
@@ -90,6 +90,7 @@ import { resolveFileNameDuplicate } from '../helpers'
 import { DavProperties } from '@ownclouders/web-client/src/webdav'
 import { useTask } from 'vue-concurrency'
 import { debounce } from 'lodash-es'
+import { isProjectSpaceResource } from '@ownclouders/web-client/src/helpers'
 
 const SEARCH_LIMIT = 7
 const SEARCH_DEBOUNCE_TIME = 200
@@ -116,6 +117,7 @@ export default defineComponent({
       getParentFolderLinkIconAdditionalAttributes,
       getFolderLink
     } = useFolderLink()
+    const configurationManager = useConfigurationManager()
 
     const dropRef = ref(null)
     const inputUrl = ref('')
@@ -133,15 +135,24 @@ export default defineComponent({
     })
 
     const showDrop = computed(() => unref(inputUrl).trim())
+
     const confirmButtonDisabled = computed(
       () => unref(fileAlreadyExists) || !unref(inputFilename) || !unref(inputUrl)
     )
     const currentFolder = computed(() => store.getters['Files/currentFolder'])
+
     const files = computed((): Array<Resource> => store.getters['Files/files'])
+
     const fileAlreadyExists = computed(
       () => !!unref(files).find((file) => file.name === `${unref(inputFilename)}.url`)
     )
 
+    const projectSpaces = computed(() =>
+      (store.getters['runtime/spaces/spaces'] as SpaceResource[]).filter((s) =>
+        isProjectSpaceResource(s)
+      )
+    )
+
     const inputFileNameErrorMessage = computed(() => {
       if (unref(fileAlreadyExists)) {
         return $gettext('%{name} already exists', { name: `${unref(inputFilename)}.url` })
@@ -159,7 +170,19 @@ export default defineComponent({
           davProperties: DavProperties.Default
         })
 
-        searchResults.value = resources
+        searchResults.value = resources.map((resource) => {
+          const projectSpace = unref(projectSpaces).find(
+            (space) => space.id === resource.parentFolderId
+          )
+
+          resource = projectSpace ? projectSpace : resource
+
+          if (configurationManager.options.routing.fullShareOwnerPaths && resource.shareRoot) {
+            resource.path = urlJoin(resource.shareRoot, resource.path)
+          }
+
+          return resource
+        })
       } catch (e) {
         // Don't show user facing error, as the core functionality does work without an intact search
         console.error(e)

From 3dce067b4b6d9f60a32c1ec47f9f2f85e576bbe0 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Mon, 6 Nov 2023 22:03:12 +0100
Subject: [PATCH 19/25] Refactor search

---
 packages/web-app-files/src/extensions.ts      |  8 +-
 .../web-app-files/src/search/sdk/index.ts     | 20 ++---
 packages/web-app-files/src/search/sdk/list.ts | 69 ++--------------
 .../web-app-files/src/search/sdk/preview.ts   | 79 ++-----------------
 .../src/components/CreateShortcutModal.vue    | 70 +++++-----------
 .../src/components/Search/ResourcePreview.vue | 38 +++++----
 .../web-pkg/src/composables/search/index.ts   |  1 +
 .../src/composables/search/useSearch.ts       | 66 ++++++++++++++++
 .../components/CreateShortcutModal.spec.ts    | 22 ++++--
 9 files changed, 148 insertions(+), 225 deletions(-)
 create mode 100644 packages/web-pkg/src/composables/search/useSearch.ts

diff --git a/packages/web-app-files/src/extensions.ts b/packages/web-app-files/src/extensions.ts
index 8d23073461a..e43c67966ed 100644
--- a/packages/web-app-files/src/extensions.ts
+++ b/packages/web-app-files/src/extensions.ts
@@ -3,8 +3,7 @@ import {
   Extension,
   useStore,
   useRouter,
-  useClientService,
-  useConfigurationManager
+  useSearch
 } from '@ownclouders/web-pkg'
 import { computed } from 'vue'
 import { SDKSearch } from './search'
@@ -12,8 +11,7 @@ import { SDKSearch } from './search'
 export const extensions = ({ applicationConfig }: ApplicationSetupOptions) => {
   const store = useStore()
   const router = useRouter()
-  const clientService = useClientService()
-  const configurationManager = useConfigurationManager()
+  const { search: searchFunction } = useSearch()
 
   return computed(
     () =>
@@ -21,7 +19,7 @@ export const extensions = ({ applicationConfig }: ApplicationSetupOptions) => {
         {
           id: 'com.github.owncloud.web.files.search',
           type: 'search',
-          searchProvider: new SDKSearch(store, router, clientService, configurationManager)
+          searchProvider: new SDKSearch(store, router, searchFunction)
         }
       ] satisfies Extension[]
   )
diff --git a/packages/web-app-files/src/search/sdk/index.ts b/packages/web-app-files/src/search/sdk/index.ts
index 9d5a13950cc..f0109e447c4 100644
--- a/packages/web-app-files/src/search/sdk/index.ts
+++ b/packages/web-app-files/src/search/sdk/index.ts
@@ -2,17 +2,12 @@ import Preview from './preview'
 import List from './list'
 import { Store } from 'vuex'
 import { Router } from 'vue-router'
-import {
-  ClientService,
-  ConfigurationManager,
-  SearchList,
-  SearchPreview,
-  SearchProvider
-} from '@ownclouders/web-pkg'
+import { SearchFunction, SearchList, SearchPreview, SearchProvider } from '@ownclouders/web-pkg'
 
 function $gettext(msg) {
   return msg
 }
+
 export default class Provider implements SearchProvider {
   public readonly id: string
   public readonly displayName: string
@@ -20,16 +15,11 @@ export default class Provider implements SearchProvider {
   public readonly listSearch: SearchList
   private readonly store: Store<any>
 
-  constructor(
-    store: Store<any>,
-    router: Router,
-    clientService: ClientService,
-    configurationManager: ConfigurationManager
-  ) {
+  constructor(store: Store<any>, router: Router, searchFunction: SearchFunction) {
     this.id = 'files.sdk'
     this.displayName = $gettext('Files')
-    this.previewSearch = new Preview(store, router, clientService, configurationManager)
-    this.listSearch = new List(store, clientService, configurationManager)
+    this.previewSearch = new Preview(router, searchFunction)
+    this.listSearch = new List(searchFunction)
     this.store = store
   }
 
diff --git a/packages/web-app-files/src/search/sdk/list.ts b/packages/web-app-files/src/search/sdk/list.ts
index 281abdab6c9..b9d89bee1f9 100644
--- a/packages/web-app-files/src/search/sdk/list.ts
+++ b/packages/web-app-files/src/search/sdk/list.ts
@@ -1,74 +1,19 @@
 import ListComponent from '../../components/Search/List.vue'
-import { ClientService, SearchList, SearchResult } from '@ownclouders/web-pkg'
-import { ProjectSpaceResource, isProjectSpaceResource } from '@ownclouders/web-client/src/helpers'
-import { Component, computed, Ref, unref } from 'vue'
-import { DavProperties } from '@ownclouders/web-client/src/webdav/constants'
-import { Store } from 'vuex'
-import { ConfigurationManager } from '@ownclouders/web-pkg'
-import { urlJoin } from '@ownclouders/web-client/src/utils'
+import { SearchFunction, SearchList, SearchResult } from '@ownclouders/web-pkg'
+import { Component } from 'vue'
 
 export const searchLimit = 200
 
 export default class List implements SearchList {
   public readonly component: Component
-  private readonly store: Store<any>
-  private readonly clientService: ClientService
-  private readonly configurationManager: ConfigurationManager
-  private readonly projectSpaces: Ref<ProjectSpaceResource[]>
+  private readonly searchFunction: SearchFunction
 
-  constructor(
-    store: Store<any>,
-    clientService: ClientService,
-    configurationManager: ConfigurationManager
-  ) {
+  constructor(searchFunction: SearchFunction) {
     this.component = ListComponent
-    this.store = store
-    this.clientService = clientService
-    this.configurationManager = configurationManager
-    this.projectSpaces = computed(() =>
-      this.store.getters['runtime/spaces/spaces'].filter((s) => isProjectSpaceResource(s))
-    )
+    this.searchFunction = searchFunction
   }
 
-  getProjectSpace(id): ProjectSpaceResource {
-    return unref(this.projectSpaces).find((s) => s.id === id)
-  }
-
-  async search(term: string): Promise<SearchResult> {
-    if (this.configurationManager.options.routing.fullShareOwnerPaths) {
-      await this.store.dispatch('runtime/spaces/loadMountPoints', {
-        graphClient: this.clientService.graphAuthenticated
-      })
-    }
-
-    if (!term) {
-      return {
-        totalResults: null,
-        values: []
-      }
-    }
-
-    const { resources, totalResults } = await this.clientService.webdav.search(term, {
-      searchLimit,
-      davProperties: DavProperties.Default
-    })
-
-    return {
-      totalResults,
-      values: resources.map((resource) => {
-        const matchingSpace = this.getProjectSpace(resource.parentFolderId)
-        const data = matchingSpace ? matchingSpace : resource
-
-        // info: in oc10 we have no storageId in resources. All resources are mounted into the personal space.
-        if (!data.storageId) {
-          data.storageId = this.store.getters.user.id
-        }
-        if (this.configurationManager.options.routing.fullShareOwnerPaths && data.shareRoot) {
-          data.path = urlJoin(data.shareRoot, data.path)
-        }
-
-        return { id: data.id, data }
-      })
-    }
+  public async search(term: string): Promise<SearchResult> {
+    return this.searchFunction(term, searchLimit)
   }
 }
diff --git a/packages/web-app-files/src/search/sdk/preview.ts b/packages/web-app-files/src/search/sdk/preview.ts
index 9ee384ff668..d3501efa838 100644
--- a/packages/web-app-files/src/search/sdk/preview.ts
+++ b/packages/web-app-files/src/search/sdk/preview.ts
@@ -1,88 +1,23 @@
-import { ClientService, Cache, SearchPreview, SearchResult } from '@ownclouders/web-pkg'
-import { ProjectSpaceResource, isProjectSpaceResource } from '@ownclouders/web-client/src/helpers'
-import { Component, computed, Ref, unref } from 'vue'
+import { SearchFunction, SearchPreview, SearchResult } from '@ownclouders/web-pkg'
+import { Component, unref } from 'vue'
 import { Router } from 'vue-router'
-import { DavProperties } from '@ownclouders/web-client/src/webdav/constants'
-import { Store } from 'vuex'
-import { ConfigurationManager, ResourcePreview } from '@ownclouders/web-pkg'
-import { urlJoin } from '@ownclouders/web-client/src/utils'
+import { ResourcePreview } from '@ownclouders/web-pkg'
 
 export const previewSearchLimit = 8
 
 export default class Preview implements SearchPreview {
   public readonly component: Component
-  private readonly cache: Cache<string, SearchResult>
   private readonly router: Router
-  private readonly store: Store<any>
-  private readonly clientService: ClientService
-  private readonly configurationManager: ConfigurationManager
-  private readonly projectSpaces: Ref<ProjectSpaceResource[]>
+  private readonly searchFunction: SearchFunction
 
-  constructor(
-    store: Store<any>,
-    router: Router,
-    clientService: ClientService,
-    configurationManager: ConfigurationManager
-  ) {
+  constructor(router: Router, searchFunction: SearchFunction) {
     this.component = ResourcePreview
     this.router = router
-    this.store = store
-    // define how long the cache should be valid, maybe conf option?
-    this.cache = new Cache({ ttl: 10000, capacity: 100 })
-    this.clientService = clientService
-    this.configurationManager = configurationManager
-    this.projectSpaces = computed(() =>
-      this.store.getters['runtime/spaces/spaces'].filter((s) => isProjectSpaceResource(s))
-    )
-  }
-
-  getProjectSpace(id): ProjectSpaceResource {
-    return unref(this.projectSpaces).find((s) => s.id === id)
+    this.searchFunction = searchFunction
   }
 
   public async search(term: string): Promise<SearchResult> {
-    if (!term) {
-      return {
-        totalResults: null,
-        values: []
-      }
-    }
-
-    if (this.configurationManager.options.routing.fullShareOwnerPaths) {
-      await this.store.dispatch('runtime/spaces/loadMountPoints', {
-        graphClient: this.clientService.graphAuthenticated
-      })
-    }
-
-    if (this.cache.has(term)) {
-      return this.cache.get(term)
-    }
-
-    const areHiddenFilesShown = this.store.state.Files?.areHiddenFilesShown
-
-    const { resources, totalResults } = await this.clientService.webdav.search(term, {
-      searchLimit: previewSearchLimit,
-      davProperties: DavProperties.Default
-    })
-
-    return {
-      totalResults,
-      values: resources
-        .map((resource) => {
-          const matchingSpace = this.getProjectSpace(resource.parentFolderId)
-          const data = matchingSpace ? matchingSpace : resource
-
-          if (this.configurationManager.options.routing.fullShareOwnerPaths && data.shareRoot) {
-            data.path = urlJoin(data.shareRoot, data.path)
-          }
-
-          return { id: data.id, data }
-        })
-        .filter(({ data }) => {
-          // filter results if hidden files shouldn't be shown due to settings
-          return !data.name.startsWith('.') || areHiddenFilesShown
-        })
-    }
+    return this.searchFunction(term, previewSearchLimit)
   }
 
   public get available(): boolean {
diff --git a/packages/web-pkg/src/components/CreateShortcutModal.vue b/packages/web-pkg/src/components/CreateShortcutModal.vue
index 569dde7ca56..440bd27ffd1 100644
--- a/packages/web-pkg/src/components/CreateShortcutModal.vue
+++ b/packages/web-pkg/src/components/CreateShortcutModal.vue
@@ -39,24 +39,14 @@
             <li v-if="searchTask.isRunning" class="oc-p-xs oc-flex oc-flex-center">
               <oc-spinner />
             </li>
-            <li v-for="(resource, index) in searchResults" :key="index" class="oc-p-xs">
+            <li v-for="(value, index) in searchResult?.values" v-else :key="index" class="oc-p-xs">
               <oc-button
                 class="oc-width-1-1"
                 appearance="raw"
                 justify-content="left"
-                @click="dropItemResourceClicked(resource)"
+                @click="dropItemResourceClicked(value)"
               >
-                <oc-resource
-                  :resource="resource"
-                  :is-resource-clickable="false"
-                  :path-prefix="getPathPrefix(resource)"
-                  :is-path-displayed="true"
-                  :folder-link="getFolderLink(resource)"
-                  :parent-folder-link-icon-additional-attributes="
-                    getParentFolderLinkIconAdditionalAttributes(resource)
-                  "
-                  :parent-folder-name="getParentFolderName(resource)"
-                />
+                <ResourcePreview :search-result="value" :is-clickable="false"></ResourcePreview>
               </oc-button>
             </li>
           </oc-list>
@@ -79,23 +69,25 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, ref, unref, computed, watch, nextTick } from 'vue'
+import { defineComponent, PropType, ref, unref, computed, watch, nextTick, Ref } from 'vue'
 import { Resource, SpaceResource } from '@ownclouders/web-client'
-import { useClientService, useConfigurationManager, useFolderLink, useStore } from '../composables'
+import { useClientService, useFolderLink, useSearch, useStore } from '../composables'
 import { urlJoin } from '@ownclouders/web-client/src/utils'
 import { useGettext } from 'vue3-gettext'
 import DOMPurify from 'dompurify'
 import { OcDrop } from '@ownclouders/design-system/src/components'
 import { resolveFileNameDuplicate } from '../helpers'
-import { DavProperties } from '@ownclouders/web-client/src/webdav'
 import { useTask } from 'vue-concurrency'
 import { debounce } from 'lodash-es'
-import { isProjectSpaceResource } from '@ownclouders/web-client/src/helpers'
+import ResourcePreview from './Search/ResourcePreview.vue'
+import { SearchResult } from './Search'
 
 const SEARCH_LIMIT = 7
 const SEARCH_DEBOUNCE_TIME = 200
+
 export default defineComponent({
   name: 'CreateShortcutModal',
+  components: { ResourcePreview },
   props: {
     space: {
       type: Object as PropType<SpaceResource>,
@@ -110,6 +102,7 @@ export default defineComponent({
     const clientService = useClientService()
     const { $gettext } = useGettext()
     const store = useStore()
+    const { search } = useSearch()
     const {
       getPathPrefix,
       getParentFolderName,
@@ -117,12 +110,11 @@ export default defineComponent({
       getParentFolderLinkIconAdditionalAttributes,
       getFolderLink
     } = useFolderLink()
-    const configurationManager = useConfigurationManager()
 
     const dropRef = ref(null)
     const inputUrl = ref('')
     const inputFilename = ref('')
-    const searchResults = ref(null)
+    const searchResult: Ref<SearchResult> = ref()
 
     const dropItemUrl = computed(() => {
       let url = unref(inputUrl).trim()
@@ -147,12 +139,6 @@ export default defineComponent({
       () => !!unref(files).find((file) => file.name === `${unref(inputFilename)}.url`)
     )
 
-    const projectSpaces = computed(() =>
-      (store.getters['runtime/spaces/spaces'] as SpaceResource[]).filter((s) =>
-        isProjectSpaceResource(s)
-      )
-    )
-
     const inputFileNameErrorMessage = computed(() => {
       if (unref(fileAlreadyExists)) {
         return $gettext('%{name} already exists', { name: `${unref(inputFilename)}.url` })
@@ -162,31 +148,17 @@ export default defineComponent({
     })
 
     const searchTask = useTask(function* (signal, searchTerm: string) {
-      searchTerm = `name:"*${searchTerm}*"`
+      searchTerm = `name:"*${searchTerm}*" NOT name:"*.url"`
 
       try {
-        const { resources } = yield clientService.webdav.search(searchTerm, {
-          searchLimit: SEARCH_LIMIT,
-          davProperties: DavProperties.Default
-        })
-
-        searchResults.value = resources.map((resource) => {
-          const projectSpace = unref(projectSpaces).find(
-            (space) => space.id === resource.parentFolderId
-          )
-
-          resource = projectSpace ? projectSpace : resource
-
-          if (configurationManager.options.routing.fullShareOwnerPaths && resource.shareRoot) {
-            resource.path = urlJoin(resource.shareRoot, resource.path)
-          }
-
-          return resource
-        })
+        searchResult.value = yield search(searchTerm, SEARCH_LIMIT)
       } catch (e) {
         // Don't show user facing error, as the core functionality does work without an intact search
         console.error(e)
-        searchResults.value = []
+        searchResult.value = {
+          totalResults: 0,
+          values: []
+        }
       }
     })
 
@@ -210,11 +182,11 @@ export default defineComponent({
       } catch (_) {}
     }
 
-    const dropItemResourceClicked = (resource: Resource) => {
+    const dropItemResourceClicked = ({ data }) => {
       const webURL = new URL(window.location.href)
-      let filename = resource.name
+      let filename = data.name
 
-      inputUrl.value = `${webURL.origin}/f/${resource.id}`
+      inputUrl.value = `${webURL.origin}/f/${data.id}`
 
       if (unref(files).some((f) => f.name === `${filename}.url`)) {
         filename = resolveFileNameDuplicate(`${filename}.url`, 'url', unref(files)).slice(0, -4)
@@ -270,7 +242,7 @@ export default defineComponent({
       showDrop,
       dropRef,
       dropItemUrl,
-      searchResults,
+      searchResult,
       confirmButtonDisabled,
       inputFileNameErrorMessage,
       searchTask,
diff --git a/packages/web-pkg/src/components/Search/ResourcePreview.vue b/packages/web-pkg/src/components/Search/ResourcePreview.vue
index 733c31c8f41..5e19dfeac29 100644
--- a/packages/web-pkg/src/components/Search/ResourcePreview.vue
+++ b/packages/web-pkg/src/components/Search/ResourcePreview.vue
@@ -3,14 +3,11 @@
     :resource="resource"
     :path-prefix="pathPrefix"
     :is-path-displayed="true"
-    :is-resource-clickable="true"
     :folder-link="folderLink"
-    :parent-folder-link="parentFolderLink"
     :parent-folder-link-icon-additional-attributes="parentFolderLinkIconAdditionalAttributes"
     :parent-folder-name="parentFolderName"
     :is-thumbnail-displayed="displayThumbnails"
-    @click="resourceClicked"
-    @click-folder="folderClicked"
+    v-bind="additionalAttrs"
     @click-parent-folder="folderClicked"
   />
 </template>
@@ -21,12 +18,7 @@ import { VisibilityObserver } from '../../observer'
 import { debounce } from 'lodash-es'
 import { computed, defineComponent, PropType, ref, unref } from 'vue'
 import { mapGetters } from 'vuex'
-import {
-  useCapabilityShareJailEnabled,
-  useGetMatchingSpace,
-  useFileActions,
-  useFolderLink
-} from '../../composables'
+import { useGetMatchingSpace, useFileActions, useFolderLink } from '../../composables'
 import { Resource } from '@ownclouders/web-client/src/helpers'
 import { eventBus } from '../../services'
 import { isResourceTxtFileAlmostEmpty } from '../../helpers'
@@ -42,11 +34,9 @@ export default defineComponent({
         return {}
       }
     },
-    provider: {
-      type: Object,
-      default: function () {
-        return {}
-      }
+    isClickable: {
+      type: Boolean,
+      default: true
     }
   },
   setup(props) {
@@ -89,9 +79,22 @@ export default defineComponent({
       eventBus.publish('app.search.options-drop.hide')
     }
 
+    const additionalAttrs = computed(() => {
+      if (!props.isClickable) {
+        return {}
+      }
+
+      return {
+        isResourceClickable: true,
+        parentFolderLink: getParentFolderLink(unref(resource)),
+        onClick: resourceClicked,
+        onClickFolder: folderClicked,
+        onClickParentFolder: folderClicked
+      }
+    })
+
     return {
       space,
-      hasShareJail: useCapabilityShareJailEnabled(),
       previewData,
       resource,
       resourceDisabled,
@@ -103,7 +106,8 @@ export default defineComponent({
       parentFolderName: getParentFolderName(unref(resource)),
       parentFolderLinkIconAdditionalAttributes: getParentFolderLinkIconAdditionalAttributes(
         unref(resource)
-      )
+      ),
+      additionalAttrs
     }
   },
   computed: {
diff --git a/packages/web-pkg/src/composables/search/index.ts b/packages/web-pkg/src/composables/search/index.ts
index f87cf0102a1..d9a37121ad6 100644
--- a/packages/web-pkg/src/composables/search/index.ts
+++ b/packages/web-pkg/src/composables/search/index.ts
@@ -1 +1,2 @@
 export * from './constants'
+export * from './useSearch'
diff --git a/packages/web-pkg/src/composables/search/useSearch.ts b/packages/web-pkg/src/composables/search/useSearch.ts
new file mode 100644
index 00000000000..61cb67a7780
--- /dev/null
+++ b/packages/web-pkg/src/composables/search/useSearch.ts
@@ -0,0 +1,66 @@
+import { computed, unref } from 'vue'
+import { SearchResult } from '../../components'
+import { DavProperties } from '@ownclouders/web-client/src/webdav'
+import { urlJoin } from '@ownclouders/web-client/src/utils'
+import { useConfigurationManager } from '../configuration'
+import { useStore } from '../store'
+import { useClientService } from '../clientService'
+import { isProjectSpaceResource } from '@ownclouders/web-client/src/helpers'
+
+export const useSearch = () => {
+  const store = useStore()
+  const configurationManager = useConfigurationManager()
+  const clientService = useClientService()
+  const areHiddenFilesShown = store.state.Files?.areHiddenFilesShown
+
+  const projectSpaces = computed(() =>
+    store.getters['runtime/spaces/spaces'].filter((s) => isProjectSpaceResource(s))
+  )
+  const getProjectSpace = (id) => {
+    return unref(projectSpaces).find((s) => s.id === id)
+  }
+  const search = async (term: string, searchLimit = null): Promise<SearchResult> => {
+    if (configurationManager.options.routing.fullShareOwnerPaths) {
+      await store.dispatch('runtime/spaces/loadMountPoints', {
+        graphClient: clientService.graphAuthenticated
+      })
+    }
+
+    if (!term) {
+      return {
+        totalResults: null,
+        values: []
+      }
+    }
+
+    const { resources, totalResults } = await clientService.webdav.search(term, {
+      searchLimit,
+      davProperties: DavProperties.Default
+    })
+
+    return {
+      totalResults,
+      values: resources
+        .map((resource) => {
+          const matchingSpace = getProjectSpace(resource.parentFolderId)
+          const data = matchingSpace ? matchingSpace : resource
+
+          if (configurationManager.options.routing.fullShareOwnerPaths && data.shareRoot) {
+            data.path = urlJoin(data.shareRoot, data.path)
+          }
+
+          return { id: data.id, data }
+        })
+        .filter(({ data }) => {
+          // filter results if hidden files shouldn't be shown due to settings
+          return !data.name.startsWith('.') || areHiddenFilesShown
+        })
+    }
+  }
+
+  return {
+    search
+  }
+}
+
+export type SearchFunction = ReturnType<typeof useSearch>['search']
diff --git a/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts b/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts
index a48573d7030..95ea5785a80 100644
--- a/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts
+++ b/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts
@@ -9,9 +9,21 @@ import {
   shallowMount
 } from 'web-test-helpers'
 import { SpaceResource } from '@ownclouders/web-client'
-import { mock } from 'jest-mock-extended'
+import { mock, mockDeep } from 'jest-mock-extended'
 import { FileResource } from '@ownclouders/web-client/src/helpers'
 import { SearchResource } from '@ownclouders/web-client/src/webdav/search'
+import { ConfigurationManager } from '../../../src'
+
+jest.mock('../../../src/composables/configuration/useConfigurationManager', () => ({
+  useConfigurationManager: () =>
+    mockDeep<ConfigurationManager>({
+      options: {
+        routing: {
+          fullShareOwnerPaths: false
+        }
+      }
+    })
+}))
 
 describe('CreateShortcutModal', () => {
   describe('method "createShortcut"', () => {
@@ -30,16 +42,16 @@ describe('CreateShortcutModal', () => {
     })
   })
   describe('method "searchTask"', () => {
-    it('should set "searchResults" correctly', async () => {
+    it('should set "searchResult" correctly', async () => {
       const { wrapper } = getWrapper()
       await wrapper.vm.searchTask.perform()
-      expect(wrapper.vm.searchResults.length).toBe(3)
+      expect(wrapper.vm.searchResult.values.length).toBe(3)
     })
-    it('should reset "searchResults" on error', async () => {
+    it('should reset "searchResult" on error', async () => {
       console.error = jest.fn()
       const { wrapper } = getWrapper({ rejectSearch: true })
       await wrapper.vm.searchTask.perform()
-      expect(wrapper.vm.searchResults.length).toBe(0)
+      expect(wrapper.vm.searchResult.values.length).toBe(0)
     })
   })
 })

From d792a4a425b8b80182e327513d40b4944a6d24b0 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Tue, 7 Nov 2023 12:27:50 +0100
Subject: [PATCH 20/25] Fix unit tests

---
 .../tests/unit/search/sdk.spec.ts             | 88 +------------------
 .../components/CreateShortcutModal.spec.ts    | 12 ++-
 2 files changed, 10 insertions(+), 90 deletions(-)

diff --git a/packages/web-app-files/tests/unit/search/sdk.spec.ts b/packages/web-app-files/tests/unit/search/sdk.spec.ts
index a75d8a5ff99..c8d4ec65380 100644
--- a/packages/web-app-files/tests/unit/search/sdk.spec.ts
+++ b/packages/web-app-files/tests/unit/search/sdk.spec.ts
@@ -1,26 +1,10 @@
 import { SDKSearch } from '../../../src/search'
-import { ClientService } from '@ownclouders/web-pkg'
 import { Store } from 'vuex'
 import { RouteLocation, Router } from 'vue-router'
 import { mock, mockDeep } from 'jest-mock-extended'
 import { ref } from 'vue'
 import { createStore, defaultStoreMockOptions } from 'web-test-helpers/src'
-import { ProjectSpaceResource } from '@ownclouders/web-client/src/helpers'
-import { ConfigurationManager } from '@ownclouders/web-pkg'
 
-const getClientServiceMock = (result = { resources: [], totalResults: 0 }) => {
-  const clientService = mockDeep<ClientService>()
-  clientService.webdav.search.mockResolvedValue(result)
-  return clientService
-}
-
-const configurationManager = mockDeep<ConfigurationManager>({
-  options: {
-    routing: {
-      fullShareOwnerPaths: false
-    }
-  }
-})
 jest.mock('@ownclouders/web-client/src/helpers/resource', () => ({
   buildResource: (v) => v
 }))
@@ -38,19 +22,12 @@ const storeWithoutFileSearch = mockDeep<Store<any>>({
 
 describe('SDKProvider', () => {
   it('is only available if announced via capabilities', () => {
-    const clientService = getClientServiceMock()
-    const search = new SDKSearch(
-      storeWithoutFileSearch,
-      mock<Router>(),
-      clientService,
-      configurationManager
-    )
+    const search = new SDKSearch(storeWithoutFileSearch, mock<Router>(), jest.fn())
     expect(search.available).toBe(false)
   })
 
   describe('SDKProvider previewSearch', () => {
     it('is not available on certain routes', () => {
-      const clientService = getClientServiceMock()
       ;[
         { route: 'foo', available: true },
         { route: 'search-provider-list' },
@@ -61,72 +38,11 @@ describe('SDKProvider', () => {
           mock<Router>({
             currentRoute: ref(mock<RouteLocation>({ name: v.route }))
           }),
-          clientService,
-          configurationManager
+          jest.fn()
         )
 
         expect(!!search.previewSearch.available).toBe(!!v.available)
       })
     })
-
-    it('can search', async () => {
-      const files = [
-        { id: 'foo', name: 'foo', fileInfo: {} },
-        { id: 'bar', name: 'bar', fileInfo: {} },
-        { id: 'baz', name: 'baz', fileInfo: {} }
-      ]
-      const clientService = getClientServiceMock({ resources: files, totalResults: 3 })
-      const search = new SDKSearch(getStore(), mock<Router>(), clientService, configurationManager)
-
-      const noTerm = await search.previewSearch.search('')
-      expect(noTerm).toEqual({ totalResults: null, values: [] })
-
-      const withTerm = await search.previewSearch.search('foo')
-      expect(withTerm.values.map((r) => r.data)).toMatchObject(files)
-
-      const withTermCached = await search.previewSearch.search('foo')
-      expect(withTermCached.values.map((r) => r.data)).toMatchObject(files)
-    })
-    it('properly returns space resources', async () => {
-      const spaceId = '1'
-      const space = mock<ProjectSpaceResource>({ id: spaceId, name: 'foo', driveType: 'project' })
-      const files = [{ id: 'foo', name: 'foo', parentFolderId: space.id }]
-      const clientService = getClientServiceMock({ resources: files, totalResults: 1 })
-      const search = new SDKSearch(
-        getStore([space]),
-        mock<Router>(),
-        clientService,
-        configurationManager
-      )
-      const withTerm = (await search.previewSearch.search('foo')) as any
-      expect(withTerm.values.map((r) => r.data)[0].id).toEqual(spaceId)
-    })
-  })
-  describe('SDKProvider listSearch', () => {
-    it('can search', async () => {
-      const files = [
-        { id: 'foo', name: 'foo', fileInfo: {} },
-        { id: 'bar', name: 'bar', fileInfo: {} },
-        { id: 'baz', name: 'baz', fileInfo: {} }
-      ]
-      const clientService = getClientServiceMock({ resources: files, totalResults: 3 })
-      const search = new SDKSearch(getStore(), mock<Router>(), clientService, configurationManager)
-      const withTerm = (await search.listSearch.search('foo')) as any
-      expect(withTerm.values.map((r) => r.data)).toMatchObject(files)
-    })
-    it('properly returns space resources', async () => {
-      const spaceId = '1'
-      const space = mock<ProjectSpaceResource>({ id: spaceId, driveType: 'project' })
-      const files = [{ id: 'foo', name: 'foo', parentFolderId: space.id }]
-      const clientService = getClientServiceMock({ resources: files, totalResults: 1 })
-      const search = new SDKSearch(
-        getStore([space]),
-        mock<Router>(),
-        clientService,
-        configurationManager
-      )
-      const withTerm = (await search.listSearch.search('foo')) as any
-      expect(withTerm.values.map((r) => r.data)[0].id).toEqual(spaceId)
-    })
   })
 })
diff --git a/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts b/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts
index 95ea5785a80..f0b2f249611 100644
--- a/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts
+++ b/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts
@@ -44,13 +44,13 @@ describe('CreateShortcutModal', () => {
   describe('method "searchTask"', () => {
     it('should set "searchResult" correctly', async () => {
       const { wrapper } = getWrapper()
-      await wrapper.vm.searchTask.perform()
+      await wrapper.vm.searchTask.perform('new file')
       expect(wrapper.vm.searchResult.values.length).toBe(3)
     })
     it('should reset "searchResult" on error', async () => {
       console.error = jest.fn()
       const { wrapper } = getWrapper({ rejectSearch: true })
-      await wrapper.vm.searchTask.perform()
+      await wrapper.vm.searchTask.perform('new folder')
       expect(wrapper.vm.searchResult.values.length).toBe(0)
     })
   })
@@ -81,8 +81,12 @@ function getWrapper({ rejectPutFileContents = false, rejectSearch = false } = {}
     mocks.$clientService.webdav.search.mockRejectedValue(() => mockAxiosReject())
   } else {
     mocks.$clientService.webdav.search.mockResolvedValue({
-      resources: [mock<SearchResource>(), mock<SearchResource>(), mock<SearchResource>()],
-      totalResults: 20
+      resources: [
+        mock<SearchResource>({ name: 'New File' }),
+        mock<SearchResource>({ name: 'New File (1)' }),
+        mock<SearchResource>({ name: 'New Folder' })
+      ],
+      totalResults: 3
     })
   }
 

From 36c6eaefd1a9eb23ba47c72eec4873f6df3e51ab Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Tue, 7 Nov 2023 12:55:44 +0100
Subject: [PATCH 21/25] Refactor tests

---
 .../unit/composables/search/useSearch.spec.ts | 92 +++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 packages/web-pkg/tests/unit/composables/search/useSearch.spec.ts

diff --git a/packages/web-pkg/tests/unit/composables/search/useSearch.spec.ts b/packages/web-pkg/tests/unit/composables/search/useSearch.spec.ts
new file mode 100644
index 00000000000..77fdf2e9604
--- /dev/null
+++ b/packages/web-pkg/tests/unit/composables/search/useSearch.spec.ts
@@ -0,0 +1,92 @@
+import { mock } from 'jest-mock-extended'
+import {
+  createStore,
+  defaultComponentMocks,
+  defaultStoreMockOptions,
+  getComposableWrapper
+} from 'web-test-helpers'
+import { useSearch } from '../../../../src/composables'
+import { ConfigurationManager } from '../../../../src/configuration'
+
+jest.mock('../../../../src/composables/configuration', () => ({
+  useConfigurationManager: () =>
+    mock<ConfigurationManager>({
+      options: {
+        routing: {
+          fullShareOwnerPaths: false,
+          idBased: true
+        }
+      }
+    })
+}))
+
+describe('useSearch', () => {
+  describe('method "search"', () => {
+    it('can search', async () => {
+      const files = [
+        { id: 'foo', name: 'foo', fileInfo: {} },
+        { id: 'bar', name: 'bar', fileInfo: {} },
+        { id: 'baz', name: 'baz', fileInfo: {} }
+      ]
+
+      const wrapper = createWrapper({ resources: files })
+
+      const noTermResult = await wrapper.vm.search('')
+      expect(noTermResult).toEqual({ totalResults: null, values: [] })
+
+      const withTermResult = await wrapper.vm.search('foo')
+      expect(withTermResult.values.map((r) => r.data)).toMatchObject(files)
+    })
+    it('properly returns space resources', async () => {
+      const files = [{ id: 'foo', name: 'foo', parentFolderId: '2' }]
+
+      const wrapper = createWrapper({ resources: files })
+
+      const withTerm = await wrapper.vm.search('foo')
+      expect(withTerm.values.map((r) => r.data)[0].id).toEqual('2')
+    })
+  })
+})
+
+const createWrapper = ({ resources = [] }: { resources?: any[] } = {}) => {
+  const storeOptions = { ...defaultStoreMockOptions }
+  storeOptions.getters.capabilities.mockImplementation(() => ({
+    spaces: { projects: true, share_jail: true }
+  }))
+  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({})
+
+  mocks.$clientService.webdav.search.mockResolvedValue({
+    resources,
+    totalResults: resources.length
+  })
+
+  return getComposableWrapper(
+    () => {
+      const { search } = useSearch()
+
+      return {
+        search
+      }
+    },
+    {
+      mocks,
+      provide: mocks,
+      store
+    }
+  )
+}

From 5dc4bb0b248f9842d0cf2a0a312219e301eb4368 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Tue, 7 Nov 2023 13:18:13 +0100
Subject: [PATCH 22/25] React on code review

---
 .../src/components/CreateShortcutModal.vue    | 22 ++++++++++++++-----
 .../web-pkg/src/components/Search/types.ts    |  4 +++-
 .../src/composables/search/useSearch.ts       |  4 ++--
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/packages/web-pkg/src/components/CreateShortcutModal.vue b/packages/web-pkg/src/components/CreateShortcutModal.vue
index 440bd27ffd1..07e68435060 100644
--- a/packages/web-pkg/src/components/CreateShortcutModal.vue
+++ b/packages/web-pkg/src/components/CreateShortcutModal.vue
@@ -39,14 +39,20 @@
             <li v-if="searchTask.isRunning" class="oc-p-xs oc-flex oc-flex-center">
               <oc-spinner />
             </li>
-            <li v-for="(value, index) in searchResult?.values" v-else :key="index" class="oc-p-xs">
+            <li
+              v-if="searchResult?.values?.length"
+              class="create-shortcut-modal-search-separator oc-text-muted oc-text-small oc-pl-xs"
+            >
+              <span v-text="$gettext('Link to a file')" />
+            </li>
+            <li v-for="(value, index) in searchResult?.values" :key="index" class="oc-p-xs">
               <oc-button
                 class="oc-width-1-1"
                 appearance="raw"
                 justify-content="left"
                 @click="dropItemResourceClicked(value)"
               >
-                <ResourcePreview :search-result="value" :is-clickable="false"></ResourcePreview>
+                <resource-preview :search-result="value" :is-clickable="false" />
               </oc-button>
             </li>
           </oc-list>
@@ -80,7 +86,7 @@ import { resolveFileNameDuplicate } from '../helpers'
 import { useTask } from 'vue-concurrency'
 import { debounce } from 'lodash-es'
 import ResourcePreview from './Search/ResourcePreview.vue'
-import { SearchResult } from './Search'
+import { SearchResult, SearchResultValue } from './Search'
 
 const SEARCH_LIMIT = 7
 const SEARCH_DEBOUNCE_TIME = 200
@@ -182,11 +188,11 @@ export default defineComponent({
       } catch (_) {}
     }
 
-    const dropItemResourceClicked = ({ data }) => {
+    const dropItemResourceClicked = (item: SearchResultValue) => {
       const webURL = new URL(window.location.href)
-      let filename = data.name
+      let filename = item.data.name
 
-      inputUrl.value = `${webURL.origin}/f/${data.id}`
+      inputUrl.value = `${webURL.origin}/f/${item.id}`
 
       if (unref(files).some((f) => f.name === `${filename}.url`)) {
         filename = resolveFileNameDuplicate(`${filename}.url`, 'url', unref(files)).slice(0, -4)
@@ -264,6 +270,10 @@ export default defineComponent({
   &-url-extension {
     margin-bottom: calc(var(--oc-space-xsmall) + 1.3125rem);
   }
+
+  &-search-separator:hover {
+    background: none !important;
+  }
 }
 
 #create-shortcut-modal-contextmenu {
diff --git a/packages/web-pkg/src/components/Search/types.ts b/packages/web-pkg/src/components/Search/types.ts
index 7b69aab40c6..f4147403520 100644
--- a/packages/web-pkg/src/components/Search/types.ts
+++ b/packages/web-pkg/src/components/Search/types.ts
@@ -1,6 +1,8 @@
+import { SearchResource } from '@ownclouders/web-client/src/webdav/search'
+
 export interface SearchResultValue {
   id: string | number
-  data: unknown
+  data: SearchResource
 }
 
 export interface SearchResult {
diff --git a/packages/web-pkg/src/composables/search/useSearch.ts b/packages/web-pkg/src/composables/search/useSearch.ts
index 61cb67a7780..d921c2c2810 100644
--- a/packages/web-pkg/src/composables/search/useSearch.ts
+++ b/packages/web-pkg/src/composables/search/useSearch.ts
@@ -11,8 +11,8 @@ export const useSearch = () => {
   const store = useStore()
   const configurationManager = useConfigurationManager()
   const clientService = useClientService()
-  const areHiddenFilesShown = store.state.Files?.areHiddenFilesShown
 
+  const areHiddenFilesShown = computed(() => store.state.Files?.areHiddenFilesShown)
   const projectSpaces = computed(() =>
     store.getters['runtime/spaces/spaces'].filter((s) => isProjectSpaceResource(s))
   )
@@ -53,7 +53,7 @@ export const useSearch = () => {
         })
         .filter(({ data }) => {
           // filter results if hidden files shouldn't be shown due to settings
-          return !data.name.startsWith('.') || areHiddenFilesShown
+          return !data.name.startsWith('.') || unref(areHiddenFilesShown)
         })
     }
   }

From 27973986f79d848ea8e363fef7dc7818a0a34f5b Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Tue, 7 Nov 2023 18:50:24 +0100
Subject: [PATCH 23/25] React on code review

---
 packages/web-app-files/package.json           |  3 +-
 .../src/components/AppBar/CreateAndUpload.vue |  9 ++--
 .../src/components/CreateShortcutModal.vue    | 48 ++++++++++---------
 .../components/FilesList/ContextActions.vue   |  2 +-
 .../components/CreateShortcutModal.spec.ts    |  2 +-
 pnpm-lock.yaml                                |  3 ++
 6 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/packages/web-app-files/package.json b/packages/web-app-files/package.json
index 6b243383011..7b63fdfbfd9 100644
--- a/packages/web-app-files/package.json
+++ b/packages/web-app-files/package.json
@@ -35,6 +35,7 @@
     "vuex": "4.1.0",
     "web-app-files": "workspace:*",
     "web-app-search": "workspace:*",
-    "web-runtime": "workspace:*"
+    "web-runtime": "workspace:*",
+    "dompurify": "^3.0.6"
   }
 }
diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
index f1eb15bb667..dc8d794fc25 100644
--- a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
@@ -170,9 +170,12 @@
 
 <script lang="ts">
 import { mapActions, mapGetters } from 'vuex'
-
-import { useFileActions, useFileActionsCreateNewShortcut } from '@ownclouders/web-pkg'
-import { isLocationPublicActive, isLocationSpacesActive } from '@ownclouders/web-pkg'
+import {
+  isLocationPublicActive,
+  isLocationSpacesActive,
+  useFileActions,
+  useFileActionsCreateNewShortcut
+} from '@ownclouders/web-pkg'
 import { useActiveLocation } from '@ownclouders/web-pkg'
 import {
   useFileActionsCreateNewFile,
diff --git a/packages/web-pkg/src/components/CreateShortcutModal.vue b/packages/web-pkg/src/components/CreateShortcutModal.vue
index 07e68435060..14a846575c0 100644
--- a/packages/web-pkg/src/components/CreateShortcutModal.vue
+++ b/packages/web-pkg/src/components/CreateShortcutModal.vue
@@ -39,22 +39,23 @@
             <li v-if="searchTask.isRunning" class="oc-p-xs oc-flex oc-flex-center">
               <oc-spinner />
             </li>
-            <li
-              v-if="searchResult?.values?.length"
-              class="create-shortcut-modal-search-separator oc-text-muted oc-text-small oc-pl-xs"
-            >
-              <span v-text="$gettext('Link to a file')" />
-            </li>
-            <li v-for="(value, index) in searchResult?.values" :key="index" class="oc-p-xs">
-              <oc-button
-                class="oc-width-1-1"
-                appearance="raw"
-                justify-content="left"
-                @click="dropItemResourceClicked(value)"
+            <template v-if="searchResult">
+              <li
+                class="create-shortcut-modal-search-separator oc-text-muted oc-text-small oc-pl-xs"
               >
-                <resource-preview :search-result="value" :is-clickable="false" />
-              </oc-button>
-            </li>
+                <span v-text="$gettext('Link to a file')" />
+              </li>
+              <li v-for="(value, index) in searchResult.values" :key="index" class="oc-p-xs">
+                <oc-button
+                  class="oc-width-1-1"
+                  appearance="raw"
+                  justify-content="left"
+                  @click="dropItemResourceClicked(value)"
+                >
+                  <resource-preview :search-result="value" :is-clickable="false" />
+                </oc-button>
+              </li>
+            </template>
           </oc-list>
         </oc-drop>
         <div class="oc-flex oc-width-1-1 oc-mt-m">
@@ -77,7 +78,7 @@
 <script lang="ts">
 import { defineComponent, PropType, ref, unref, computed, watch, nextTick, Ref } from 'vue'
 import { Resource, SpaceResource } from '@ownclouders/web-client'
-import { useClientService, useFolderLink, useSearch, useStore } from '../composables'
+import { useClientService, useFolderLink, useRouter, useSearch, useStore } from '../composables'
 import { urlJoin } from '@ownclouders/web-client/src/utils'
 import { useGettext } from 'vue3-gettext'
 import DOMPurify from 'dompurify'
@@ -87,6 +88,7 @@ import { useTask } from 'vue-concurrency'
 import { debounce } from 'lodash-es'
 import ResourcePreview from './Search/ResourcePreview.vue'
 import { SearchResult, SearchResultValue } from './Search'
+import { isLocationPublicActive } from '../router'
 
 const SEARCH_LIMIT = 7
 const SEARCH_DEBOUNCE_TIME = 200
@@ -108,6 +110,7 @@ export default defineComponent({
     const clientService = useClientService()
     const { $gettext } = useGettext()
     const store = useStore()
+    const router = useRouter()
     const { search } = useSearch()
     const {
       getPathPrefix,
@@ -120,7 +123,7 @@ export default defineComponent({
     const dropRef = ref(null)
     const inputUrl = ref('')
     const inputFilename = ref('')
-    const searchResult: Ref<SearchResult> = ref()
+    const searchResult: Ref<SearchResult> = ref(null)
 
     const dropItemUrl = computed(() => {
       let url = unref(inputUrl).trim()
@@ -154,17 +157,13 @@ export default defineComponent({
     })
 
     const searchTask = useTask(function* (signal, searchTerm: string) {
+      searchResult.value = null
       searchTerm = `name:"*${searchTerm}*" NOT name:"*.url"`
 
       try {
         searchResult.value = yield search(searchTerm, SEARCH_LIMIT)
       } catch (e) {
         // Don't show user facing error, as the core functionality does work without an intact search
-        console.error(e)
-        searchResult.value = {
-          totalResults: 0,
-          values: []
-        }
       }
     })
 
@@ -238,7 +237,10 @@ export default defineComponent({
       await nextTick()
       if (unref(showDrop) && unref(dropRef)) {
         ;(unref(dropRef) as InstanceType<typeof OcDrop>).show()
-        debouncedSearch()
+
+        if (!isLocationPublicActive(router, 'files-public-link')) {
+          debouncedSearch()
+        }
       }
     })
 
diff --git a/packages/web-pkg/src/components/FilesList/ContextActions.vue b/packages/web-pkg/src/components/FilesList/ContextActions.vue
index e26a2ab0aca..815f11d2f36 100644
--- a/packages/web-pkg/src/components/FilesList/ContextActions.vue
+++ b/packages/web-pkg/src/components/FilesList/ContextActions.vue
@@ -95,6 +95,7 @@ export default defineComponent({
 
     const menuItemsContext = computed(() => {
       const fileHandlers = [
+        ...unref(openShortcutActions),
         ...unref(editorActions),
         ...loadExternalAppActions(unref(actionOptions))
       ]
@@ -112,7 +113,6 @@ export default defineComponent({
 
     const menuItemsActions = computed(() => {
       return [
-        ...unref(openShortcutActions),
         ...unref(downloadArchiveActions),
         ...unref(downloadFileActions),
         ...unref(deleteActions),
diff --git a/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts b/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts
index f0b2f249611..11688a4ff3c 100644
--- a/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts
+++ b/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts
@@ -51,7 +51,7 @@ describe('CreateShortcutModal', () => {
       console.error = jest.fn()
       const { wrapper } = getWrapper({ rejectSearch: true })
       await wrapper.vm.searchTask.perform('new folder')
-      expect(wrapper.vm.searchResult.values.length).toBe(0)
+      expect(wrapper.vm.searchResult).toBe(null)
     })
   })
 })
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 20feb57eba4..afb7fa406ff 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -729,6 +729,9 @@ importers:
       design-system:
         specifier: workspace:@ownclouders/design-system@*
         version: link:../design-system
+      dompurify:
+        specifier: ^3.0.6
+        version: 3.0.6
       filesize:
         specifier: ^9.0.11
         version: 9.0.11

From c92dd13dc4d00c8a1a52f0737afc88d90400fb43 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Tue, 7 Nov 2023 18:55:13 +0100
Subject: [PATCH 24/25] Fix display Link to a file, shown if no search results

---
 .../src/components/CreateShortcutModal.vue    | 115 +++++++++---------
 1 file changed, 58 insertions(+), 57 deletions(-)

diff --git a/packages/web-pkg/src/components/CreateShortcutModal.vue b/packages/web-pkg/src/components/CreateShortcutModal.vue
index 14a846575c0..1adea80a6a0 100644
--- a/packages/web-pkg/src/components/CreateShortcutModal.vue
+++ b/packages/web-pkg/src/components/CreateShortcutModal.vue
@@ -1,58 +1,58 @@
 <template>
   <portal to="app.runtime.modal">
     <oc-modal
-      :title="$gettext('Create a Shortcut')"
-      :button-cancel-text="$gettext('Cancel')"
-      :button-confirm-text="$gettext('Create')"
-      :button-confirm-disabled="confirmButtonDisabled"
-      @cancel="cancel"
-      @confirm="createShortcut(inputUrl, inputFilename)"
-      @keydown.enter="onKeyDownEnter"
+        :title="$gettext('Create a Shortcut')"
+        :button-cancel-text="$gettext('Cancel')"
+        :button-confirm-text="$gettext('Create')"
+        :button-confirm-disabled="confirmButtonDisabled"
+        @cancel="cancel"
+        @confirm="createShortcut(inputUrl, inputFilename)"
+        @keydown.enter="onKeyDownEnter"
     >
       <template #content>
         <oc-text-input
-          id="create-shortcut-modal-url-input"
-          v-model="inputUrl"
-          :label="$gettext('Shortcut to a webpage or file')"
+            id="create-shortcut-modal-url-input"
+            v-model="inputUrl"
+            :label="$gettext('Shortcut to a webpage or file')"
         />
         <oc-drop
-          v-if="showDrop"
-          ref="dropRef"
-          class="oc-pt-s"
-          padding-size="remove"
-          drop-id="create-shortcut-modal-contextmenu"
-          toggle="#create-shortcut-modal-url-input"
-          :close-on-click="true"
+            v-if="showDrop"
+            ref="dropRef"
+            class="oc-pt-s"
+            padding-size="remove"
+            drop-id="create-shortcut-modal-contextmenu"
+            toggle="#create-shortcut-modal-url-input"
+            :close-on-click="true"
         >
           <oc-list>
             <li class="oc-p-xs">
               <oc-button
-                class="oc-width-1-1"
-                appearance="raw"
-                justify-content="left"
-                @click="dropItemUrlClicked"
+                  class="oc-width-1-1"
+                  appearance="raw"
+                  justify-content="left"
+                  @click="dropItemUrlClicked"
               >
-                <oc-icon name="external-link" />
-                <span v-text="dropItemUrl" />
+                <oc-icon name="external-link"/>
+                <span v-text="dropItemUrl"/>
               </oc-button>
             </li>
             <li v-if="searchTask.isRunning" class="oc-p-xs oc-flex oc-flex-center">
-              <oc-spinner />
+              <oc-spinner/>
             </li>
             <template v-if="searchResult">
-              <li
-                class="create-shortcut-modal-search-separator oc-text-muted oc-text-small oc-pl-xs"
+              <li v-if="searchResult.values.length"
+                  class="create-shortcut-modal-search-separator oc-text-muted oc-text-small oc-pl-xs"
               >
-                <span v-text="$gettext('Link to a file')" />
+                <span v-text="$gettext('Link to a file')"/>
               </li>
               <li v-for="(value, index) in searchResult.values" :key="index" class="oc-p-xs">
                 <oc-button
-                  class="oc-width-1-1"
-                  appearance="raw"
-                  justify-content="left"
-                  @click="dropItemResourceClicked(value)"
+                    class="oc-width-1-1"
+                    appearance="raw"
+                    justify-content="left"
+                    @click="dropItemResourceClicked(value)"
                 >
-                  <resource-preview :search-result="value" :is-clickable="false" />
+                  <resource-preview :search-result="value" :is-clickable="false"/>
                 </oc-button>
               </li>
             </template>
@@ -60,14 +60,14 @@
         </oc-drop>
         <div class="oc-flex oc-width-1-1 oc-mt-m">
           <oc-text-input
-            v-model="inputFilename"
-            class="oc-width-1-1"
-            :label="$gettext('Shortcut name')"
-            :error-message="inputFileNameErrorMessage"
-            :fix-message-line="true"
+              v-model="inputFilename"
+              class="oc-width-1-1"
+              :label="$gettext('Shortcut name')"
+              :error-message="inputFileNameErrorMessage"
+              :fix-message-line="true"
           />
           <span class="oc-ml-s oc-flex oc-flex-bottom create-shortcut-modal-url-extension"
-            >.url</span
+          >.url</span
           >
         </div>
       </template>
@@ -76,26 +76,26 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, ref, unref, computed, watch, nextTick, Ref } from 'vue'
-import { Resource, SpaceResource } from '@ownclouders/web-client'
-import { useClientService, useFolderLink, useRouter, useSearch, useStore } from '../composables'
-import { urlJoin } from '@ownclouders/web-client/src/utils'
-import { useGettext } from 'vue3-gettext'
+import {defineComponent, PropType, ref, unref, computed, watch, nextTick, Ref} from 'vue'
+import {Resource, SpaceResource} from '@ownclouders/web-client'
+import {useClientService, useFolderLink, useRouter, useSearch, useStore} from '../composables'
+import {urlJoin} from '@ownclouders/web-client/src/utils'
+import {useGettext} from 'vue3-gettext'
 import DOMPurify from 'dompurify'
-import { OcDrop } from '@ownclouders/design-system/src/components'
-import { resolveFileNameDuplicate } from '../helpers'
-import { useTask } from 'vue-concurrency'
-import { debounce } from 'lodash-es'
+import {OcDrop} from '@ownclouders/design-system/src/components'
+import {resolveFileNameDuplicate} from '../helpers'
+import {useTask} from 'vue-concurrency'
+import {debounce} from 'lodash-es'
 import ResourcePreview from './Search/ResourcePreview.vue'
-import { SearchResult, SearchResultValue } from './Search'
-import { isLocationPublicActive } from '../router'
+import {SearchResult, SearchResultValue} from './Search'
+import {isLocationPublicActive} from '../router'
 
 const SEARCH_LIMIT = 7
 const SEARCH_DEBOUNCE_TIME = 200
 
 export default defineComponent({
   name: 'CreateShortcutModal',
-  components: { ResourcePreview },
+  components: {ResourcePreview},
   props: {
     space: {
       type: Object as PropType<SpaceResource>,
@@ -108,10 +108,10 @@ export default defineComponent({
   },
   setup(props) {
     const clientService = useClientService()
-    const { $gettext } = useGettext()
+    const {$gettext} = useGettext()
     const store = useStore()
     const router = useRouter()
-    const { search } = useSearch()
+    const {search} = useSearch()
     const {
       getPathPrefix,
       getParentFolderName,
@@ -138,19 +138,19 @@ export default defineComponent({
     const showDrop = computed(() => unref(inputUrl).trim())
 
     const confirmButtonDisabled = computed(
-      () => unref(fileAlreadyExists) || !unref(inputFilename) || !unref(inputUrl)
+        () => unref(fileAlreadyExists) || !unref(inputFilename) || !unref(inputUrl)
     )
     const currentFolder = computed(() => store.getters['Files/currentFolder'])
 
     const files = computed((): Array<Resource> => store.getters['Files/files'])
 
     const fileAlreadyExists = computed(
-      () => !!unref(files).find((file) => file.name === `${unref(inputFilename)}.url`)
+        () => !!unref(files).find((file) => file.name === `${unref(inputFilename)}.url`)
     )
 
     const inputFileNameErrorMessage = computed(() => {
       if (unref(fileAlreadyExists)) {
-        return $gettext('%{name} already exists', { name: `${unref(inputFilename)}.url` })
+        return $gettext('%{name} already exists', {name: `${unref(inputFilename)}.url`})
       }
 
       return ''
@@ -184,7 +184,8 @@ export default defineComponent({
           filename = resolveFileNameDuplicate(`${filename}.url`, 'url', unref(files)).slice(0, -4)
         }
         inputFilename.value = filename
-      } catch (_) {}
+      } catch (_) {
+      }
     }
 
     const dropItemResourceClicked = (item: SearchResultValue) => {
@@ -212,7 +213,7 @@ export default defineComponent({
 
       try {
         // Omit possible xss code
-        const sanitizedUrl = DOMPurify.sanitize(url, { USE_PROFILES: { html: true } })
+        const sanitizedUrl = DOMPurify.sanitize(url, {USE_PROFILES: {html: true}})
 
         const content = `[InternetShortcut]\nURL=${sanitizedUrl}`
         const path = urlJoin(unref(currentFolder).path, `${filename}.url`)

From a5839b50d1611c365c98f4008c8a1ec6fdfc7b21 Mon Sep 17 00:00:00 2001
From: Jan Ackermann <jan.alexander.ackermann@outlook.com>
Date: Wed, 8 Nov 2023 08:12:02 +0100
Subject: [PATCH 25/25] Lint

---
 .../src/components/CreateShortcutModal.vue    | 117 +++++++++---------
 1 file changed, 58 insertions(+), 59 deletions(-)

diff --git a/packages/web-pkg/src/components/CreateShortcutModal.vue b/packages/web-pkg/src/components/CreateShortcutModal.vue
index 1adea80a6a0..29fbadd9feb 100644
--- a/packages/web-pkg/src/components/CreateShortcutModal.vue
+++ b/packages/web-pkg/src/components/CreateShortcutModal.vue
@@ -1,58 +1,58 @@
 <template>
   <portal to="app.runtime.modal">
     <oc-modal
-        :title="$gettext('Create a Shortcut')"
-        :button-cancel-text="$gettext('Cancel')"
-        :button-confirm-text="$gettext('Create')"
-        :button-confirm-disabled="confirmButtonDisabled"
-        @cancel="cancel"
-        @confirm="createShortcut(inputUrl, inputFilename)"
-        @keydown.enter="onKeyDownEnter"
+      :title="$gettext('Create a Shortcut')"
+      :button-cancel-text="$gettext('Cancel')"
+      :button-confirm-text="$gettext('Create')"
+      :button-confirm-disabled="confirmButtonDisabled"
+      @cancel="cancel"
+      @confirm="createShortcut(inputUrl, inputFilename)"
+      @keydown.enter="onKeyDownEnter"
     >
       <template #content>
         <oc-text-input
-            id="create-shortcut-modal-url-input"
-            v-model="inputUrl"
-            :label="$gettext('Shortcut to a webpage or file')"
+          id="create-shortcut-modal-url-input"
+          v-model="inputUrl"
+          :label="$gettext('Shortcut to a webpage or file')"
         />
         <oc-drop
-            v-if="showDrop"
-            ref="dropRef"
-            class="oc-pt-s"
-            padding-size="remove"
-            drop-id="create-shortcut-modal-contextmenu"
-            toggle="#create-shortcut-modal-url-input"
-            :close-on-click="true"
+          v-if="showDrop"
+          ref="dropRef"
+          class="oc-pt-s"
+          padding-size="remove"
+          drop-id="create-shortcut-modal-contextmenu"
+          toggle="#create-shortcut-modal-url-input"
+          :close-on-click="true"
         >
           <oc-list>
             <li class="oc-p-xs">
               <oc-button
-                  class="oc-width-1-1"
-                  appearance="raw"
-                  justify-content="left"
-                  @click="dropItemUrlClicked"
+                class="oc-width-1-1"
+                appearance="raw"
+                justify-content="left"
+                @click="dropItemUrlClicked"
               >
-                <oc-icon name="external-link"/>
-                <span v-text="dropItemUrl"/>
+                <oc-icon name="external-link" />
+                <span v-text="dropItemUrl" />
               </oc-button>
             </li>
             <li v-if="searchTask.isRunning" class="oc-p-xs oc-flex oc-flex-center">
-              <oc-spinner/>
+              <oc-spinner />
             </li>
-            <template v-if="searchResult">
-              <li v-if="searchResult.values.length"
-                  class="create-shortcut-modal-search-separator oc-text-muted oc-text-small oc-pl-xs"
+            <template v-if="searchResult?.values?.length">
+              <li
+                class="create-shortcut-modal-search-separator oc-text-muted oc-text-small oc-pl-xs"
               >
-                <span v-text="$gettext('Link to a file')"/>
+                <span v-text="$gettext('Link to a file')" />
               </li>
               <li v-for="(value, index) in searchResult.values" :key="index" class="oc-p-xs">
                 <oc-button
-                    class="oc-width-1-1"
-                    appearance="raw"
-                    justify-content="left"
-                    @click="dropItemResourceClicked(value)"
+                  class="oc-width-1-1"
+                  appearance="raw"
+                  justify-content="left"
+                  @click="dropItemResourceClicked(value)"
                 >
-                  <resource-preview :search-result="value" :is-clickable="false"/>
+                  <resource-preview :search-result="value" :is-clickable="false" />
                 </oc-button>
               </li>
             </template>
@@ -60,14 +60,14 @@
         </oc-drop>
         <div class="oc-flex oc-width-1-1 oc-mt-m">
           <oc-text-input
-              v-model="inputFilename"
-              class="oc-width-1-1"
-              :label="$gettext('Shortcut name')"
-              :error-message="inputFileNameErrorMessage"
-              :fix-message-line="true"
+            v-model="inputFilename"
+            class="oc-width-1-1"
+            :label="$gettext('Shortcut name')"
+            :error-message="inputFileNameErrorMessage"
+            :fix-message-line="true"
           />
           <span class="oc-ml-s oc-flex oc-flex-bottom create-shortcut-modal-url-extension"
-          >.url</span
+            >.url</span
           >
         </div>
       </template>
@@ -76,26 +76,26 @@
 </template>
 
 <script lang="ts">
-import {defineComponent, PropType, ref, unref, computed, watch, nextTick, Ref} from 'vue'
-import {Resource, SpaceResource} from '@ownclouders/web-client'
-import {useClientService, useFolderLink, useRouter, useSearch, useStore} from '../composables'
-import {urlJoin} from '@ownclouders/web-client/src/utils'
-import {useGettext} from 'vue3-gettext'
+import { defineComponent, PropType, ref, unref, computed, watch, nextTick, Ref } from 'vue'
+import { Resource, SpaceResource } from '@ownclouders/web-client'
+import { useClientService, useFolderLink, useRouter, useSearch, useStore } from '../composables'
+import { urlJoin } from '@ownclouders/web-client/src/utils'
+import { useGettext } from 'vue3-gettext'
 import DOMPurify from 'dompurify'
-import {OcDrop} from '@ownclouders/design-system/src/components'
-import {resolveFileNameDuplicate} from '../helpers'
-import {useTask} from 'vue-concurrency'
-import {debounce} from 'lodash-es'
+import { OcDrop } from '@ownclouders/design-system/src/components'
+import { resolveFileNameDuplicate } from '../helpers'
+import { useTask } from 'vue-concurrency'
+import { debounce } from 'lodash-es'
 import ResourcePreview from './Search/ResourcePreview.vue'
-import {SearchResult, SearchResultValue} from './Search'
-import {isLocationPublicActive} from '../router'
+import { SearchResult, SearchResultValue } from './Search'
+import { isLocationPublicActive } from '../router'
 
 const SEARCH_LIMIT = 7
 const SEARCH_DEBOUNCE_TIME = 200
 
 export default defineComponent({
   name: 'CreateShortcutModal',
-  components: {ResourcePreview},
+  components: { ResourcePreview },
   props: {
     space: {
       type: Object as PropType<SpaceResource>,
@@ -108,10 +108,10 @@ export default defineComponent({
   },
   setup(props) {
     const clientService = useClientService()
-    const {$gettext} = useGettext()
+    const { $gettext } = useGettext()
     const store = useStore()
     const router = useRouter()
-    const {search} = useSearch()
+    const { search } = useSearch()
     const {
       getPathPrefix,
       getParentFolderName,
@@ -138,19 +138,19 @@ export default defineComponent({
     const showDrop = computed(() => unref(inputUrl).trim())
 
     const confirmButtonDisabled = computed(
-        () => unref(fileAlreadyExists) || !unref(inputFilename) || !unref(inputUrl)
+      () => unref(fileAlreadyExists) || !unref(inputFilename) || !unref(inputUrl)
     )
     const currentFolder = computed(() => store.getters['Files/currentFolder'])
 
     const files = computed((): Array<Resource> => store.getters['Files/files'])
 
     const fileAlreadyExists = computed(
-        () => !!unref(files).find((file) => file.name === `${unref(inputFilename)}.url`)
+      () => !!unref(files).find((file) => file.name === `${unref(inputFilename)}.url`)
     )
 
     const inputFileNameErrorMessage = computed(() => {
       if (unref(fileAlreadyExists)) {
-        return $gettext('%{name} already exists', {name: `${unref(inputFilename)}.url`})
+        return $gettext('%{name} already exists', { name: `${unref(inputFilename)}.url` })
       }
 
       return ''
@@ -184,8 +184,7 @@ export default defineComponent({
           filename = resolveFileNameDuplicate(`${filename}.url`, 'url', unref(files)).slice(0, -4)
         }
         inputFilename.value = filename
-      } catch (_) {
-      }
+      } catch (_) {}
     }
 
     const dropItemResourceClicked = (item: SearchResultValue) => {
@@ -213,7 +212,7 @@ export default defineComponent({
 
       try {
         // Omit possible xss code
-        const sanitizedUrl = DOMPurify.sanitize(url, {USE_PROFILES: {html: true}})
+        const sanitizedUrl = DOMPurify.sanitize(url, { USE_PROFILES: { html: true } })
 
         const content = `[InternetShortcut]\nURL=${sanitizedUrl}`
         const path = urlJoin(unref(currentFolder).path, `${filename}.url`)