Merge pull request #50534 from nextcloud/backport/50129/stable31

[stable31] fix(unified-search): load more than 5 items in folder filter

Author: AndyScherzinger

apps/files/src/plugins/search/folderSearch.ts

@@ -21,29 +21,34 @@ function init() {
 
 	logger.info('Initializing unified search plugin: folder search from files app')
 	OCA.UnifiedSearch.registerFilterAction({
-		id: 'files',
+		id: 'in-folder',
 		appId: 'files',
 		label: t('files', 'In folder'),
 		icon: imagePath('files', 'app.svg'),
-		callback: () => {
-			const filepicker = getFilePickerBuilder('Pick plain text files')
-				.addMimeTypeFilter('httpd/unix-directory')
-				.allowDirectories(true)
-				.addButton({
-					label: 'Pick',
-					callback: (nodes: Node[]) => {
-						logger.info('Folder picked', { folder: nodes[0] })
-						const folder = nodes[0]
-						emit('nextcloud:unified-search:add-filter', {
-							id: 'files',
-							payload: folder,
-							filterUpdateText: t('files', 'Search in folder: {folder}', { folder: folder.basename }),
-							filterParams: { path: folder.path },
-						})
-					},
-				})
-				.build()
-			filepicker.pick()
+		callback: (showFilePicker: boolean = true) => {
+			if (showFilePicker) {
+				const filepicker = getFilePickerBuilder('Pick plain text files')
+					.addMimeTypeFilter('httpd/unix-directory')
+					.allowDirectories(true)
+					.addButton({
+						label: 'Pick',
+						callback: (nodes: Node[]) => {
+							logger.info('Folder picked', { folder: nodes[0] })
+							const folder = nodes[0]
+							emit('nextcloud:unified-search:add-filter', {
+								id: 'in-folder',
+								appId: 'files',
+								payload: folder,
+								filterUpdateText: t('files', 'Search in folder: {folder}', { folder: folder.basename }),
+								filterParams: { path: folder.path },
+							})
+						},
+					})
+					.build()
+				filepicker.pick()
+			} else {
+				logger.debug('Folder search callback was handled without showing the file picker, it might already be open')
+			}
 		},
 	})
 }

core/src/components/UnifiedSearch/UnifiedSearchModal.vue

@@ -374,7 +374,7 @@ export default defineComponent({
 			const providersToSearch = this.filteredProviders.length > 0 ? this.filteredProviders : this.providers
 			const searchProvider = (provider, filters) => {
 				const params = {
-					type: provider.id,
+					type: provider.appId,
 					query,
 					cursor: null,
 					extraQueries: provider.extraParams,
@@ -397,13 +397,15 @@ export default defineComponent({
 
 				if (this.providerResultLimit > 5) {
 					params.limit = this.providerResultLimit
+					unifiedSearchLogger.debug('Limiting search to', params.limit)
 				}
 
 				const request = unifiedSearch(params).request
 
 				request().then((response) => {
 					newResults.push({
 						id: provider.id,
+						appId: provider.appId,
 						provider: provider.name,
 						inAppSearch: provider.inAppSearch,
 						results: response.data.ocs.data.entries,
@@ -500,14 +502,21 @@ export default defineComponent({
 		},
 		loadMoreResultsForProvider(providerId) {
 			this.providerResultLimit += 5
-			this.filters = this.filters.filter(filter => filter.type !== 'provider')
+			// If user wants more result for a particular filter remove other filters???
+			this.filters = this.filters.filter(filter => filter.id === providerId)
 			const provider = this.providers.find(provider => provider.id === providerId)
 			this.addProviderFilter(provider, true)
 		},
 		addProviderFilter(providerFilter, loadMoreResultsForProvider = false) {
+			unifiedSearchLogger.debug('Applying provider filter', { providerFilter, loadMoreResultsForProvider })
 			if (!providerFilter.id) return
 			if (providerFilter.isPluginFilter) {
-				providerFilter.callback()
+				// There is no way to know what should go into the callback currently
+				// Here we are passing isProviderFilterApplied (boolean) which is a flag sent to the plugin
+				// This is sent to the plugin so that depending on whether the filter is applied or not, the plugin can decide what to do
+				// TODO : In nextcloud/search, this should be a proper interface that the plugin can implement
+				const isProviderFilterApplied = this.filteredProviders.some(provider => provider.id === providerFilter.id)
+				providerFilter.callback(!isProviderFilterApplied)
 			}
 			this.providerResultLimit = loadMoreResultsForProvider ? this.providerResultLimit : 5
 			this.providerActionMenuIsOpen = false
@@ -521,6 +530,7 @@ export default defineComponent({
 			}
 			this.filteredProviders.push({
 				id: providerFilter.id,
+				appId: providerFilter.appId,
 				name: providerFilter.name,
 				icon: providerFilter.icon,
 				type: providerFilter.type || 'provider',
@@ -649,6 +659,7 @@ export default defineComponent({
 			this.updateDateFilter()
 		},
 		handlePluginFilter(addFilterEvent) {
+			unifiedSearchLogger.debug('Handling plugin filter', { addFilterEvent })
 			for (let i = 0; i < this.filteredProviders.length; i++) {
 				const provider = this.filteredProviders[i]
 				if (provider.id === addFilterEvent.id) {

core/src/store/unified-search-external-filters.js

@@ -4,9 +4,7 @@
  */
 import { defineStore } from 'pinia'
 
-export const useSearchStore = defineStore({
-	id: 'search',
-
+export const useSearchStore = defineStore('search', {
 	state: () => ({
 		externalFilters: [],
 	}),