Fix spaces in search results

owncloud · May 12, 2023 · f330e9b · f330e9b
1 parent 327dd53
commit f330e9b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/changelog/unreleased/bugfix-spaces-in-search-results b/changelog/unreleased/bugfix-spaces-in-search-results
@@ -0,0 +1,6 @@
+Bugfix: Spaces in search results
+
+Spaces in search results are no longer being displyed as folder resources, fixing wrong icons and sidebar panels.
+
+https://github.com/owncloud/web/issues/9022
+https://github.com/owncloud/web/pull/9026
diff --git a/packages/web-app-files/src/search/sdk/list.ts b/packages/web-app-files/src/search/sdk/list.ts
@@ -1,22 +1,31 @@
 import { SearchList, SearchResult } from 'web-app-search/src/types'
 import ListComponent from '../../components/Search/List.vue'
 import { ClientService } from 'web-pkg/src/services'
-import { buildResource } from 'web-client/src/helpers'
+import { ProjectSpaceResource, buildResource, isProjectSpaceResource } from 'web-client/src/helpers'
 import { Component } from 'vue'
-import { DavProperties } from 'web-client/src/webdav/constants'
+import { DavProperties, DavProperty } from 'web-client/src/webdav/constants'
 import { Store } from 'vuex'
+import { computed, Ref, unref } 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 projectSpaces: Ref<ProjectSpaceResource[]>
 
   constructor(store: Store<any>, clientService: ClientService) {
     this.component = ListComponent
     this.store = store
     this.clientService = clientService
+    this.projectSpaces = computed(() =>
+      this.store.getters['runtime/spaces/spaces'].filter((s) => isProjectSpaceResource(s))
+    )
+  }
+
+  getMatchingSpace(resourceId): ProjectSpaceResource {
+    return unref(this.projectSpaces).find(({ id }) => resourceId.startsWith(id))
   }
 
   async search(term: string): Promise<SearchResult> {
@@ -36,7 +45,8 @@ export default class List implements SearchList {
     return {
       totalResults: range ? parseInt(range?.split('/')[1]) : null,
       values: results.map((result) => {
-        const resource = buildResource(result)
+        const matchingSpace = this.getMatchingSpace(result.fileInfo[DavProperty.FileId])
+        const resource = !!matchingSpace ? matchingSpace : buildResource(result)
         // info: in oc10 we have no storageId in resources. All resources are mounted into the personal space.
         if (!resource.storageId) {
           resource.storageId = this.store.getters.user.id

diff --git a/packages/web-client/src/helpers/space/functions.ts b/packages/web-client/src/helpers/space/functions.ts
@@ -145,6 +145,7 @@ export function buildSpace(data): SpaceResource {
     mdate: data.lastModifiedDateTime,
     size: data.quota?.used,
     indicators: [],
+    tags: [],
     permissions: '',
     starred: false,
     etag: '',