Published Content Query has "skip" applied twice (umbraco#11378)

* Fix double skip Skipping is done as part of the query now, causing `skip` to be applied twice * More instances of skipping Fix more areas where skip is applied twice
Nuklon · Nov 3, 2021 · 1c4cab5 · 1c4cab5
1 parent 9a64df7
commit 1c4cab5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs b/src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
@@ -145,9 +145,7 @@ public IEnumerable<ISearchResult> Search(string query, UmbracoEntityTypes entity
 
             totalFound = result.TotalItemCount;
 
-            var pagedResult = result.Skip(Convert.ToInt32(pageIndex));
-
-            return pagedResult;
+            return result;
         }
 
         private bool BuildQuery(StringBuilder sb, string query, string searchFrom, List<string> fields, string type)

diff --git a/src/Umbraco.Infrastructure/Examine/ExamineUmbracoIndexingHandler.cs b/src/Umbraco.Infrastructure/Examine/ExamineUmbracoIndexingHandler.cs
@@ -194,9 +194,8 @@ public void DeleteDocumentsForContentTypes(IReadOnlyCollection<int> removedConte
                             .Field("nodeType", id.ToInvariantString())
                             .Execute(QueryOptions.SkipTake(page * pageSize, pageSize));
                         total = results.TotalItemCount;
-                        var paged = results.Skip(page * pageSize);
-
-                        foreach (ISearchResult item in paged)
+
+                        foreach (ISearchResult item in results)
                         {
                             if (int.TryParse(item.Id, NumberStyles.Integer, CultureInfo.InvariantCulture, out int contentId))
                             {

diff --git a/src/Umbraco.Infrastructure/PublishedContentQuery.cs b/src/Umbraco.Infrastructure/PublishedContentQuery.cs
@@ -295,7 +295,7 @@ public IEnumerable<PublishedSearchResult> Search(string term, int skip, int take
             totalRecords = results.TotalItemCount;
 
             return new CultureContextualSearchResults(
-                results.Skip(skip).ToPublishedSearchResults(_publishedSnapshot.Content), _variationContextAccessor,
+                results.ToPublishedSearchResults(_publishedSnapshot.Content), _variationContextAccessor,
                 culture);
         }
 
@@ -324,7 +324,7 @@ public IEnumerable<PublishedSearchResult> Search(IQueryExecutor query, int skip,
 
             totalRecords = results.TotalItemCount;
 
-            return results.Skip(skip).ToPublishedSearchResults(_publishedSnapshot);
+            return results.ToPublishedSearchResults(_publishedSnapshot);
         }
 
         /// <summary>

diff --git a/src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs b/src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs
@@ -91,12 +91,10 @@ public ActionResult<SearchResults> GetSearchResults(string searcherName, string
                 return SearchResults.Empty();
             }
 
-            var pagedResults = results.Skip(pageIndex * pageSize);
-
             return new SearchResults
             {
                 TotalRecords = results.TotalItemCount,
-                Results = pagedResults.Select(x => new SearchResult
+                Results = results.Select(x => new SearchResult
                 {
                     Id = x.Id,
                     Score = x.Score,