Unified search

css/global.scss

@@ -1 +1,2 @@
 @include icon-black-white('notes', 'notes', 1);
+@include icon-black-white('notes-trans', 'notes', 1);

lib/AppInfo/Application.php

@@ -20,6 +20,7 @@ public function __construct(array $urlParams = []) {
 
 	public function register(IRegistrationContext $context): void {
 		$context->registerCapability(Capabilities::class);
+		$context->registerSearchProvider(SearchProvider::class);
 		$context->registerDashboardWidget(DashboardWidget::class);
 		$context->registerEventListener(
 			BeforeTemplateRenderedEvent::class,

lib/AppInfo/SearchProvider.php

@@ -0,0 +1,84 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\Notes\AppInfo;
+
+use OCA\Notes\Service\Note;
+use OCA\Notes\Service\NotesService;
+use OCA\Notes\Service\Util;
+
+use OCP\IUser;
+use OCP\IURLGenerator;
+use OCP\Search\IProvider;
+use OCP\Search\ISearchQuery;
+use OCP\Search\SearchResult;
+use OCP\Search\SearchResultEntry;
+
+class SearchProvider implements IProvider {
+
+	/** @var Util */
+	private $util;
+	/** @var NotesService */
+	private $notesService;
+	/** @var IURLGenerator */
+	private $url;
+
+	public function __construct(
+		Util $util,
+		NotesService $notesService,
+		IURLGenerator $url
+	) {
+		$this->util = $util;
+		$this->notesService = $notesService;
+		$this->url = $url;
+	}
+
+
+	public function getId(): string {
+		return Application::APP_ID;
+	}
+
+	public function getName(): string {
+		return $this->util->l10n->t('Notes');
+	}
+
+	public function getOrder(string $route, array $routeParameters): int {
+		if (strpos($route, 'files' . '.') === 0) {
+			return 25;
+		} elseif (strpos($route, Application::APP_ID . '.') === 0) {
+			return -1;
+		}
+		return 4;
+	}
+
+	public function search(IUser $user, ISearchQuery $query): SearchResult {
+		$notes = $this->notesService->search($user->getUID(), $query->getTerm());
+		// sort by modified time
+		usort($notes, function (Note $a, Note $b) {
+			return $b->getModified() - $a->getModified();
+		});
+		// create SearchResultEntry from Note
+		$result = array_map(
+			function (Note $note) : SearchResultEntry {
+				$excerpt = $note->getCategory();
+				try {
+					$excerpt = $note->getExcerpt();
+				} catch (\Throwable $e) {
+				}
+				return new SearchResultEntry(
+					'',
+					$note->getTitle(),
+					$excerpt,
+					$this->url->linkToRouteAbsolute('notes.page.index') . 'note/'.$note->getId(),
+					'icon-notes-trans'
+				);
+			},
+			$notes
+		);
+		return SearchResult::complete(
+			$this->getName(),
+			$result
+		);
+	}
+}

lib/Service/NotesService.php

@@ -58,6 +58,39 @@ public function get(string $userId, int $id) : Note {
 		return $note;
 	}
 
+	public function search(string $userId, string $search) : array {
+		$terms = preg_split('/\s+/', $search);
+		$notes = $this->getAll($userId)['notes'];
+		return array_values(array_filter(
+			$notes,
+			function (Note $note) use ($terms) : bool {
+				return $this->searchTermsInNote($note, $terms);
+			}
+		));
+	}
+	private function searchTermsInNote(Note $note, array $terms) : bool {
+		try {
+			$d = $note->getData();
+			$strings = [ $d['title'], $d['category'], $d['content'] ];
+			foreach ($terms as $term) {
+				if (!$this->searchTermInData($strings, $term)) {
+					return false;
+				}
+			}
+			return true;
+		} catch (\Throwable $e) {
+			return false;
+		}
+	}
+	private function searchTermInData(array $strings, string $term) : bool {
+		foreach ($strings as $str) {
+			if (stripos($str, $term) !== false) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 
 	/**
 	 * @throws \OCP\Files\NotPermittedException

src/App.vue

@@ -13,7 +13,6 @@
 				<NavigationList v-show="!loading.notes"
 					:filtered-notes="filteredNotes"
 					:category="filter.category"
-					:search="filter.search"
 					@category-selected="onSelectCategory"
 					@note-deleted="onNoteDeleted"
 				/>
@@ -45,7 +44,6 @@ import {
 	Content,
 } from '@nextcloud/vue'
 import { showSuccess } from '@nextcloud/dialogs'
-import { emit } from '@nextcloud/event-bus'
 import '@nextcloud/dialogs/styles/toast.scss'
 
 import { config } from './config'
@@ -70,7 +68,6 @@ export default {
 		return {
 			filter: {
 				category: null,
-				search: '',
 			},
 			loading: {
 				notes: true,
@@ -89,20 +86,12 @@ export default {
 		},
 
 		filteredNotes() {
-			const search = this.filter.search.toLowerCase()
-
 			const notes = this.notes.filter(note => {
 				if (this.filter.category !== null
 					&& this.filter.category !== note.category
 					&& !note.category.startsWith(this.filter.category + '/')) {
 					return false
 				}
-				const searchFields = ['title', 'category']
-				if (search !== '') {
-					return searchFields.some(
-						searchField => note[searchField].toLowerCase().indexOf(search) !== -1
-					)
-				}
 				return true
 			})
 
@@ -128,9 +117,6 @@ export default {
 
 	created() {
 		store.commit('setDocumentTitle', document.title)
-		if (typeof OCA.Search === 'function') {
-			this.search = new OCA.Search(this.onSearch, this.onResetSearch)
-		}
 		window.addEventListener('beforeunload', this.onClose)
 		this.loadNotes()
 	},
@@ -205,16 +191,6 @@ export default {
 			}
 		},
 
-		onSearch(query) {
-			this.filter.search = query
-
-			emit('toggle-navigation', { open: true })
-		},
-
-		onResetSearch() {
-			this.filter.search = ''
-		},
-
 		onNewNote() {
 			if (this.loading.create) {
 				return

src/components/NavigationList.vue

@@ -7,24 +7,6 @@
 			@category-selected="$emit('category-selected', $event)"
 		/>
 
-		<!-- search result header -->
-		<AppNavigationCaption v-if="search && filteredNotes.length" :title="searchResultTitle" class="search-result-header" />
-
-		<!-- nothing found -->
-		<li v-if="search && !filteredNotes.length" class="no-search-result">
-			<span class="nav-entry">
-				<div id="emptycontent" class="emptycontent-search">
-					<div class="icon-search" />
-					<h2 v-if="category!==null">
-						{{ t('notes', 'No search result for “{search}” in {category}', { search: search, category: categoryTitle(category) }) }}
-					</h2>
-					<h2 v-else>
-						{{ t('notes', 'No search result for “{search}”', { search: search }) }}
-					</h2>
-				</div>
-			</span>
-		</li>
-
 		<!-- list of notes -->
 		<template v-for="item in noteItems">
 			<AppNavigationCaption v-if="category!==null && category!==item.category"
@@ -92,10 +74,6 @@ export default {
 			type: String,
 			default: null,
 		},
-		search: {
-			type: String,
-			default: '',
-		},
 	},
 
 	data() {
@@ -145,14 +123,6 @@ export default {
 		noteItems() {
 			return this.groupedNotes
 		},
-
-		searchResultTitle() {
-			if (this.category !== null) {
-				return t('notes', 'Search result for “{search}” in {category}', { search: this.search, category: this.categoryTitle(this.category) })
-			} else {
-				return t('notes', 'Search result for “{search}”', { search: this.search })
-			}
-		},
 	},
 
 	watch: {
@@ -209,23 +179,3 @@ export default {
 	},
 }
 </script>
-<style scoped>
-.search-result-header {
-	color: inherit;
-}
-
-li.no-search-result {
-	order: 1;
-}
-
-li .nav-entry .emptycontent-search {
-	white-space: normal;
-}
-
-@media (max-height: 600px) {
-	li .nav-entry .emptycontent-search {
-		margin-top: inherit;
-	}
-}
-
-</style>