mirror of
https://github.com/nextcloud/server.git
synced 2026-02-03 20:41:22 -05:00
fix(unified-search): Remove hard-coded search result limit
A change added in https://github.com/nextcloud/server/pull/45317 introduced a hard stop (25) that prevents full search results from showing up. If there are more than 25 search results for a query only 25 can be seen. So two main issues: - Only 25 results can be seen in total no matter what. - Breaks web client pagination, which typically adds 5 results per request. Signed-off-by: nfebe <fenn25.fn@gmail.com>
This commit is contained in:
parent
8c9781d520
commit
2053112887
5 changed files with 12 additions and 5 deletions
|
|
@ -34,6 +34,7 @@ class ConfigLexicon implements ILexicon {
|
|||
public const USER_TIMEZONE = 'timezone';
|
||||
|
||||
public const UNIFIED_SEARCH_MIN_SEARCH_LENGTH = 'unified_search_min_search_length';
|
||||
public const UNIFIED_SEARCH_MAX_RESULTS_PER_REQUEST = 'unified_search_max_results_per_request';
|
||||
|
||||
public const LASTCRON_TIMESTAMP = 'lastcron';
|
||||
|
||||
|
|
@ -93,6 +94,7 @@ class ConfigLexicon implements ILexicon {
|
|||
new Entry(self::OCM_DISCOVERY_ENABLED, ValueType::BOOL, true, 'enable/disable OCM', lazy: true),
|
||||
new Entry(self::OCM_INVITE_ACCEPT_DIALOG, ValueType::STRING, '', 'route to local invite accept dialog', lazy: true, note: 'set as empty string to disable feature'),
|
||||
new Entry(self::UNIFIED_SEARCH_MIN_SEARCH_LENGTH, ValueType::INT, 1, 'Minimum search length to trigger the request', lazy: false, rename: 'unified-search.min-search-length'),
|
||||
new Entry(self::UNIFIED_SEARCH_MAX_RESULTS_PER_REQUEST, ValueType::INT, 25, 'Maximum results returned per search request', lazy: false, rename: 'unified-search.max-results-per-request'),
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@ declare(strict_types=1);
|
|||
namespace OC\Core\Controller;
|
||||
|
||||
use InvalidArgumentException;
|
||||
use OC\Core\AppInfo\Application;
|
||||
use OC\Core\AppInfo\ConfigLexicon;
|
||||
use OC\Core\ResponseDefinitions;
|
||||
use OC\Search\SearchComposer;
|
||||
use OC\Search\SearchQuery;
|
||||
|
|
@ -19,6 +21,7 @@ use OCP\AppFramework\Http\Attribute\NoAdminRequired;
|
|||
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
|
||||
use OCP\AppFramework\Http\DataResponse;
|
||||
use OCP\AppFramework\OCSController;
|
||||
use OCP\IAppConfig;
|
||||
use OCP\IL10N;
|
||||
use OCP\IRequest;
|
||||
use OCP\IURLGenerator;
|
||||
|
|
@ -39,6 +42,7 @@ class UnifiedSearchController extends OCSController {
|
|||
private IRouter $router,
|
||||
private IURLGenerator $urlGenerator,
|
||||
private IL10N $l10n,
|
||||
private IAppConfig $appConfig,
|
||||
) {
|
||||
parent::__construct('core', $request);
|
||||
}
|
||||
|
|
@ -72,7 +76,7 @@ class UnifiedSearchController extends OCSController {
|
|||
* @param string $providerId ID of the provider
|
||||
* @param string $term Term to search
|
||||
* @param int|null $sortOrder Order of entries
|
||||
* @param int|null $limit Maximum amount of entries, limited to 25
|
||||
* @param int|null $limit Maximum amount of entries (capped by configurable unified-search.max-results-per-request, default: 25)
|
||||
* @param int|string|null $cursor Offset for searching
|
||||
* @param string $from The current user URL
|
||||
*
|
||||
|
|
@ -96,7 +100,8 @@ class UnifiedSearchController extends OCSController {
|
|||
[$route, $routeParameters] = $this->getRouteInformation($from);
|
||||
|
||||
$limit ??= SearchQuery::LIMIT_DEFAULT;
|
||||
$limit = max(1, min($limit, 25));
|
||||
$maxLimit = $this->appConfig->getValueInt(Application::APP_ID, ConfigLexicon::UNIFIED_SEARCH_MAX_RESULTS_PER_REQUEST);
|
||||
$limit = max(1, min($limit, $maxLimit));
|
||||
|
||||
try {
|
||||
$filters = $this->composer->buildFilterList($providerId, $this->request->getParams());
|
||||
|
|
|
|||
|
|
@ -8511,7 +8511,7 @@
|
|||
{
|
||||
"name": "limit",
|
||||
"in": "query",
|
||||
"description": "Maximum amount of entries, limited to 25",
|
||||
"description": "Maximum amount of entries (capped by configurable unified-search.max-results-per-request, default: 25)",
|
||||
"schema": {
|
||||
"type": "integer",
|
||||
"format": "int64",
|
||||
|
|
|
|||
|
|
@ -8511,7 +8511,7 @@
|
|||
{
|
||||
"name": "limit",
|
||||
"in": "query",
|
||||
"description": "Maximum amount of entries, limited to 25",
|
||||
"description": "Maximum amount of entries (capped by configurable unified-search.max-results-per-request, default: 25)",
|
||||
"schema": {
|
||||
"type": "integer",
|
||||
"format": "int64",
|
||||
|
|
|
|||
|
|
@ -12024,7 +12024,7 @@
|
|||
{
|
||||
"name": "limit",
|
||||
"in": "query",
|
||||
"description": "Maximum amount of entries, limited to 25",
|
||||
"description": "Maximum amount of entries (capped by configurable unified-search.max-results-per-request, default: 25)",
|
||||
"schema": {
|
||||
"type": "integer",
|
||||
"format": "int64",
|
||||
|
|
|
|||
Loading…
Reference in a new issue