fix: incoming group share name in sidebar

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,41 +24,26 @@
   </div>
 </template>
 
-<script lang="ts">
-import { computed, defineComponent, inject, unref } from 'vue'
-import { isPersonalSpaceResource, Resource, SpaceResource } from '@opencloud-eu/web-client'
-import { useResourcesStore } from '../../../composables'
+<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 { 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 isPersonalSpaceResource(unref(space)) && unref(resource).path === '/'
-        ? 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>
 

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)
     )
   }