diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/da.xml b/src/Umbraco.Core/EmbeddedResources/Lang/da.xml index cc1cce6e5d..5cc91c1ae5 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/da.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/da.xml @@ -607,6 +607,8 @@ Dette index kan ikke genbygges for det ikke har nogen IIndexPopulator + Der blev ikke fundet nogen resultater + Viser %0% - %1% af %2% resultat(er) - Side %3% af %4% Indtast dit brugernavn diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml index 349e497758..3b8b70c360 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml @@ -628,6 +628,8 @@ This index cannot be rebuilt because it has no assigned IIndexPopulator + No results were found + Showing %0% - %1% of %2% result(s) - Page %3% of %4% Enter your username diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml index f447c65dfc..dae0637e46 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml @@ -644,6 +644,8 @@ This index cannot be rebuilt because it has no assigned IIndexPopulator + No results were found + Showing %0% - %1% of %2% result(s) - Page %3% of %4% Enter your username diff --git a/src/Umbraco.Core/Models/ContentEditing/SearchResults.cs b/src/Umbraco.Core/Models/ContentEditing/SearchResults.cs index fb7b0fc101..f847e6922e 100644 --- a/src/Umbraco.Core/Models/ContentEditing/SearchResults.cs +++ b/src/Umbraco.Core/Models/ContentEditing/SearchResults.cs @@ -5,6 +5,9 @@ namespace Umbraco.Cms.Core.Models.ContentEditing; [DataContract(Name = "results", Namespace = "")] public class SearchResults { + [DataMember(Name = "pageSize")] + public int PageSize { get; set; } + [DataMember(Name = "totalRecords")] public long TotalRecords { get; set; } diff --git a/src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs b/src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs index 4ab0ccd072..0fac0e482e 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs @@ -91,6 +91,7 @@ public class ExamineManagementController : UmbracoAuthorizedJsonController return new SearchResults { + PageSize = pageSize, TotalRecords = results.TotalItemCount, Results = results.Select(x => new SearchResult { diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.controller.js index 96caa4f8d4..117559d4cc 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.controller.js @@ -195,21 +195,23 @@ function ExamineManagementController($http, $q, $timeout, umbRequestHelper, loca searcher.isProcessing = true; + const pageIndex = pageNumber ? (pageNumber - 1) : 0; + umbRequestHelper.resourcePromise( $http.get(umbRequestHelper.getApiUrl("examineMgmtBaseUrl", "GetSearchResults", { searcherName: searcher.name, query: encodeURIComponent(vm.searchText), - pageIndex: pageNumber ? (pageNumber - 1) : 0 + pageIndex: pageIndex })), 'Failed to search') .then(searchResults => { searcher.isProcessing = false; - vm.searchResults = searchResults + vm.searchResults = searchResults; + vm.searchResults.pageIndex = pageIndex; vm.searchResults.pageNumber = pageNumber ? pageNumber : 1; - //20 is page size - vm.searchResults.totalPages = Math.ceil(vm.searchResults.totalRecords / 20); + vm.searchResults.totalPages = Math.ceil(vm.searchResults.totalRecords / vm.searchResults.pageSize); // add URLs to edit well known entities _.each(vm.searchResults.results, function (result) { var section = result.values["__IndexType"][0]; diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html index 63ef3d9279..7e6557bbfb 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html @@ -323,15 +323,32 @@ + ng-click="vm.showSearchResultDialog(result.values)"> + ({{ ::result.fieldCount }} fields) + - + {{ ::result.score | number:4 }} + + + + + No results were found + + + Showing %0% - %1% of %2% result(s) - Page %3% of %4% + + + +