From bf234f6acc6f57a8018b77117790737b4c8b1a14 Mon Sep 17 00:00:00 2001
From: fenn-cs <fenn25.fn@gmail.com>
Date: Mon, 11 Dec 2023 22:24:32 +0100
Subject: Rephrase unified search helper text

Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
---
 core/src/views/UnifiedSearchModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core')

diff --git a/core/src/views/UnifiedSearchModal.vue b/core/src/views/UnifiedSearchModal.vue
index ca314fa2673..500ed8ebf26 100644
--- a/core/src/views/UnifiedSearchModal.vue
+++ b/core/src/views/UnifiedSearchModal.vue
@@ -217,7 +217,7 @@ export default {
 
 				return {
 					show: isEmptySearch || hasNoResults,
-					text: this.searching && hasNoResults ? t('core', 'Searching …') : (isEmptySearch ? t('core', 'Start typing in search') : t('core', 'No matching results')),
+					text: this.searching && hasNoResults ? t('core', 'Searching …') : (isEmptySearch ? t('core', 'Start typing to search') : t('core', 'No matching results')),
 					icon: MagnifyIcon,
 				}
 			},
-- 
cgit v1.2.3


From 527c51a18e92b1ac5246b2fdf936a69cc73c5efd Mon Sep 17 00:00:00 2001
From: fenn-cs <fenn25.fn@gmail.com>
Date: Mon, 11 Dec 2023 22:43:53 +0100
Subject: Unified search: update people select with API calls

On change/input from user which has the effect of filtering,
 we want to send the query to the API to obtained fresh results,
 based on the databased on not just preloaded contacts.

Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
---
 core/src/components/UnifiedSearch/SearchableList.vue | 4 ++++
 core/src/views/UnifiedSearchModal.vue                | 2 ++
 2 files changed, 6 insertions(+)

(limited to 'core')

diff --git a/core/src/components/UnifiedSearch/SearchableList.vue b/core/src/components/UnifiedSearch/SearchableList.vue
index 43f7ace1b64..33f45d06266 100644
--- a/core/src/components/UnifiedSearch/SearchableList.vue
+++ b/core/src/components/UnifiedSearch/SearchableList.vue
@@ -32,6 +32,7 @@
 				:label="labelText"
 				trailing-button-icon="close"
 				:show-trailing-button="searchTerm !== ''"
+				@update:value="searchTermChanged"
 				@trailing-button-click="clearSearch">
 				<Magnify :size="20" />
 			</NcTextField>
@@ -126,6 +127,9 @@ export default {
 			this.clearSearch()
 			this.opened = false
 		},
+		searchTermChanged(term) {
+			this.$emit('search-term-change', term)
+		},
 	},
 }
 </script>
diff --git a/core/src/views/UnifiedSearchModal.vue b/core/src/views/UnifiedSearchModal.vue
index 500ed8ebf26..db13dd29a95 100644
--- a/core/src/views/UnifiedSearchModal.vue
+++ b/core/src/views/UnifiedSearchModal.vue
@@ -56,6 +56,7 @@
 				<SearchableList :label-text="t('core', 'Search people')"
 					:search-list="userContacts"
 					:empty-content-text="t('core', 'Not found')"
+					@search-term-change="debouncedFilterContacts"
 					@item-selected="applyPersonFilter">
 					<template #trigger>
 						<NcButton>
@@ -199,6 +200,7 @@ export default {
 			results: [],
 			contacts: [],
 			debouncedFind: debounce(this.find, 300),
+			debouncedFilterContacts: debounce(this.filterContacts, 300),
 			showDateRangeModal: false,
 			internalIsVisible: false,
 		}
-- 
cgit v1.2.3


From c0374c79d7879171eb086ec1dcc70ae75bd441fa Mon Sep 17 00:00:00 2001
From: fenn-cs <fenn25.fn@gmail.com>
Date: Tue, 12 Dec 2023 19:46:56 +0100
Subject: Add authenicated user to person list for search filtering

As expected, a user does not see themselves in their contact list,
 however, when using the contact list for filtering search, a user,
 might want to limit the search to things that pertain to them.

Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
---
 core/src/services/UnifiedSearchService.js | 16 ++++++++++++++++
 core/src/views/UnifiedSearchModal.vue     |  6 +++---
 2 files changed, 19 insertions(+), 3 deletions(-)

(limited to 'core')

diff --git a/core/src/services/UnifiedSearchService.js b/core/src/services/UnifiedSearchService.js
index e477a59eb4c..fddbd6b1e1d 100644
--- a/core/src/services/UnifiedSearchService.js
+++ b/core/src/services/UnifiedSearchService.js
@@ -22,6 +22,7 @@
 
 import { generateOcsUrl, generateUrl } from '@nextcloud/router'
 import axios from '@nextcloud/axios'
+import { getCurrentUser } from '@nextcloud/auth'
 
 /**
  * Create a cancel token
@@ -103,5 +104,20 @@ export async function getContacts({ searchTerm }) {
 	const { data: { contacts } } = await axios.post(generateUrl('/contactsmenu/contacts'), {
 		filter: searchTerm,
 	})
+	/*
+	 * Add authenticated user to list of contacts for search filter
+	 * If authtenicated user is searching/filtering, do not add them to the list
+	 */
+	if (!searchTerm) {
+		let authenticatedUser = getCurrentUser()
+		authenticatedUser = {
+			id: authenticatedUser.uid,
+			fullName: 'Me',
+			emailAddresses: [],
+		  }
+		contacts.unshift(authenticatedUser)
+		return contacts
+	  }
+
 	return contacts
 }
diff --git a/core/src/views/UnifiedSearchModal.vue b/core/src/views/UnifiedSearchModal.vue
index db13dd29a95..49a07136fe8 100644
--- a/core/src/views/UnifiedSearchModal.vue
+++ b/core/src/views/UnifiedSearchModal.vue
@@ -194,7 +194,7 @@ export default {
 			filteredProviders: [],
 			searching: false,
 			searchQuery: '',
-			placesFilter: '',
+			placessearchTerm: '',
 			dateTimeFilter: null,
 			filters: [],
 			results: [],
@@ -244,7 +244,7 @@ export default {
 			this.providers = providers
 			console.debug('Search providers', this.providers)
 		})
-		getContacts({ filter: '' }).then((contacts) => {
+		getContacts({ searchTerm: '' }).then((contacts) => {
 			this.contacts = this.mapContacts(contacts)
 			console.debug('Contacts', this.contacts)
 		})
@@ -364,7 +364,7 @@ export default {
 			})
 		},
 		filterContacts(query) {
-			getContacts({ filter: query }).then((contacts) => {
+			getContacts({ searchTerm: query }).then((contacts) => {
 				this.contacts = this.mapContacts(contacts)
 				console.debug(`Contacts filtered by ${query}`, this.contacts)
 			})
-- 
cgit v1.2.3