From b33cbd51354e58962bdd588fc93a1807b6cf1871 Mon Sep 17 00:00:00 2001
From: Jannik Stehle <j.stehle@opencloud.eu>
Date: Wed, 6 Aug 2025 16:13:47 +0200
Subject: [PATCH 1/2] fix: incoming group share name in sidebar

---
 .../web-pkg/src/components/SideBar/Files/FileInfo.vue    | 9 ++++-----
 .../src/composables/spaces/useGetMatchingSpace.ts        | 5 +++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/web-pkg/src/components/SideBar/Files/FileInfo.vue b/packages/web-pkg/src/components/SideBar/Files/FileInfo.vue
index 6e787aca18..74b2864303 100644
--- a/packages/web-pkg/src/components/SideBar/Files/FileInfo.vue
+++ b/packages/web-pkg/src/components/SideBar/Files/FileInfo.vue
@@ -26,8 +26,8 @@
 
 <script lang="ts">
 import { computed, defineComponent, inject, unref } from 'vue'
-import { isPersonalSpaceResource, Resource, SpaceResource } from '@opencloud-eu/web-client'
-import { useResourcesStore } from '../../../composables'
+import { Resource, SpaceResource } from '@opencloud-eu/web-client'
+import { useGetMatchingSpace, useResourcesStore } from '../../../composables'
 import ResourceIcon from '../../FilesList/ResourceIcon.vue'
 import ResourceName from '../../FilesList/ResourceName.vue'
 
@@ -42,15 +42,14 @@ export default defineComponent({
   },
   setup() {
     const resourcesStore = useResourcesStore()
+    const { isPersonalSpaceRoot } = useGetMatchingSpace()
 
     const resource = inject<Resource>('resource')
     const space = inject<SpaceResource>('space')
     const areFileExtensionsShown = computed(() => resourcesStore.areFileExtensionsShown)
 
     const resourceName = computed(() => {
-      return isPersonalSpaceResource(unref(space)) && unref(resource).path === '/'
-        ? unref(space).name
-        : unref(resource).name
+      return isPersonalSpaceRoot(unref(resource)) ? unref(space).name : unref(resource).name
     })
 
     return {
diff --git a/packages/web-pkg/src/composables/spaces/useGetMatchingSpace.ts b/packages/web-pkg/src/composables/spaces/useGetMatchingSpace.ts
index 8462c7601a..632e2704cf 100644
--- a/packages/web-pkg/src/composables/spaces/useGetMatchingSpace.ts
+++ b/packages/web-pkg/src/composables/spaces/useGetMatchingSpace.ts
@@ -1,5 +1,5 @@
 import { useRouteParam } from '../router'
-import { Resource, SpaceResource } from '@opencloud-eu/web-client'
+import { isIncomingShareResource, Resource, SpaceResource } from '@opencloud-eu/web-client'
 import {
   MountPointSpaceResource,
   extractStorageId,
@@ -81,7 +81,8 @@ export const useGetMatchingSpace = (options?: GetMatchingSpaceOptions) => {
     return (
       resource?.storageId &&
       resource?.storageId === spacesStore.personalSpace?.storageId &&
-      resource?.path === '/'
+      resource?.path === '/' &&
+      !isIncomingShareResource(resource)
     )
   }
 

From c9f71bb3170ad351c9eddb3c5247493812b2acfe Mon Sep 17 00:00:00 2001
From: Jannik Stehle <j.stehle@opencloud.eu>
Date: Thu, 7 Aug 2025 09:51:49 +0200
Subject: [PATCH 2/2] refactor: FileInfo to script setup

---
 .../src/components/SideBar/Files/FileInfo.vue | 40 ++++++-------------
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/packages/web-pkg/src/components/SideBar/Files/FileInfo.vue b/packages/web-pkg/src/components/SideBar/Files/FileInfo.vue
index 74b2864303..23672823c3 100644
--- a/packages/web-pkg/src/components/SideBar/Files/FileInfo.vue
+++ b/packages/web-pkg/src/components/SideBar/Files/FileInfo.vue
@@ -10,7 +10,7 @@
       <div class="file_info__body oc-text-overflow">
         <h3 data-testid="files-info-name" class="oc-font-semibold">
           <resource-name
-            :name="resourceName"
+            :name="name"
             :extension="resource.extension"
             :type="resource.type"
             :full-path="resource.webDavPath"
@@ -24,40 +24,26 @@
   </div>
 </template>
 
-<script lang="ts">
-import { computed, defineComponent, inject, unref } from 'vue'
+<script setup lang="ts">
+import { computed, inject, unref } from 'vue'
 import { Resource, SpaceResource } from '@opencloud-eu/web-client'
 import { useGetMatchingSpace, useResourcesStore } from '../../../composables'
 import ResourceIcon from '../../FilesList/ResourceIcon.vue'
 import ResourceName from '../../FilesList/ResourceName.vue'
 
-export default defineComponent({
-  name: 'FileInfo',
-  components: { ResourceIcon, ResourceName },
-  props: {
-    isSubPanelActive: {
-      type: Boolean,
-      default: true
-    }
-  },
-  setup() {
-    const resourcesStore = useResourcesStore()
-    const { isPersonalSpaceRoot } = useGetMatchingSpace()
+const { isSubPanelActive = true } = defineProps<{
+  isSubPanelActive?: boolean
+}>()
 
-    const resource = inject<Resource>('resource')
-    const space = inject<SpaceResource>('space')
-    const areFileExtensionsShown = computed(() => resourcesStore.areFileExtensionsShown)
+const resourcesStore = useResourcesStore()
+const { isPersonalSpaceRoot } = useGetMatchingSpace()
 
-    const resourceName = computed(() => {
-      return isPersonalSpaceRoot(unref(resource)) ? unref(space).name : unref(resource).name
-    })
+const resource = inject<Resource>('resource')
+const space = inject<SpaceResource>('space')
+const areFileExtensionsShown = computed(() => resourcesStore.areFileExtensionsShown)
 
-    return {
-      resource,
-      resourceName,
-      areFileExtensionsShown
-    }
-  }
+const name = computed(() => {
+  return isPersonalSpaceRoot(unref(resource)) ? unref(space).name : unref(resource).name
 })
 </script>