[native] feat(search): Display folder path for folder search results

Signed-off-by: Marcel Klehr <[email protected]>

Author: marcelklehr

src/ui/components/native/Item.vue

@@ -22,10 +22,10 @@
       <v-list-item-subtitle v-if="item.type === 'bookmark'">
         {{ item.url | hostname }}
       </v-list-item-subtitle>
-      <v-list-item-subtitle v-if="item.type === 'bookmark' && showFolderPath">
+      <v-list-item-subtitle v-if="showFolderPath">
         <Breadcrumbs
           in-item
-          :items="getBookmarkPath(item)"
+          :items="item.type === 'bookmark' ? getBookmarkPath(item) : getFolderPath(item)"
           :tree="tree" />
       </v-list-item-subtitle>
     </v-list-item-content>
@@ -121,6 +121,14 @@ export default {
     },
   },
   methods: {
+    getFolderPath(item) {
+      const folders = [item]
+      while (this.tree && folders[folders.length - 1 ] && String(folders[folders.length - 1 ].id) !== String(this.tree.id)) {
+        folders.push(this.findItem(folders[folders.length - 1 ].parentId, this.tree))
+      }
+      folders.pop() // remove last folder
+      return folders.reverse()
+    },
     getBookmarkPath(item) {
       const folders = [item]
       while (this.tree && folders[folders.length - 1 ] && String(folders[folders.length - 1 ].id) !== String(this.tree.id)) {

src/ui/views/native/Tree.vue

@@ -467,12 +467,11 @@ export default {
       }, 500)
     },
     search(query, tree) {
-      return Object.values(tree.index.bookmark)
+      return Object.values(tree.index.folder)
         .filter(item => {
           const matchTitleFully = item.title ? query.split(' ').every(term => item.title.toLowerCase().split(' ').some(word => word === term)) : false
           const matchTitlePartially = item.title ? query.split(' ').every(term => item.title.toLowerCase().includes(term)) : false
-          const matchUrl = query.split(' ').every(term => item.url.toLowerCase().includes(term))
-          return matchUrl || matchTitleFully || matchTitlePartially
+          return matchTitleFully || matchTitlePartially
         })
         .sort((a, b) => {
           const matchTitlePartiallyA = a.title ? query.split(' ').every(term => a.title.toLowerCase().includes(term)) : false
@@ -483,7 +482,25 @@ export default {
           const matchTitleA = a.title ? query.split(' ').every(term => a.title.toLowerCase().split(' ').some(word => word === term)) : false
           const matchTitleB = b.title ? query.split(' ').every(term => b.title.toLowerCase().split(' ').some(word => word === term)) : false
           return matchTitleA ? (matchTitleB ? 0 : -1) : 1
-        })
+        }).concat(
+          Object.values(tree.index.bookmark)
+            .filter(item => {
+              const matchTitleFully = item.title ? query.split(' ').every(term => item.title.toLowerCase().split(' ').some(word => word === term)) : false
+              const matchTitlePartially = item.title ? query.split(' ').every(term => item.title.toLowerCase().includes(term)) : false
+              const matchUrl = query.split(' ').every(term => item.url.toLowerCase().includes(term))
+              return matchUrl || matchTitleFully || matchTitlePartially
+            })
+            .sort((a, b) => {
+              const matchTitlePartiallyA = a.title ? query.split(' ').every(term => a.title.toLowerCase().includes(term)) : false
+              const matchTitlePartiallyB = b.title ? query.split(' ').every(term => b.title.toLowerCase().includes(term)) : false
+              return matchTitlePartiallyA ? (matchTitlePartiallyB ? 0 : -1) : 1
+            })
+            .sort((a, b) => {
+              const matchTitleA = a.title ? query.split(' ').every(term => a.title.toLowerCase().split(' ').some(word => word === term)) : false
+              const matchTitleB = b.title ? query.split(' ').every(term => b.title.toLowerCase().split(' ').some(word => word === term)) : false
+              return matchTitleA ? (matchTitleB ? 0 : -1) : 1
+            })
+        )
     },
     goBack() {
       if (this.isAddingBookmark) {