merge develop into hotfix branch

WorldBrain · May 10, 2024 · 4679c4b · 4679c4b
2 parents 31b03b0 + 67bbe81
commit 4679c4b
Show file tree

Hide file tree

Showing 8 changed files with 895 additions and 663 deletions.
diff --git a/external/@worldbrain/memex-common b/external/@worldbrain/memex-common
diff --git a/src/background-script/quick-and-dirty-migrations/tags-migration.test.data.ts b/src/background-script/quick-and-dirty-migrations/tags-migration.test.data.ts
diff --git a/src/background-script/quick-and-dirty-migrations/tags-migration.test.ts b/src/background-script/quick-and-dirty-migrations/tags-migration.test.ts
diff --git a/src/dashboard-refactor/util.ts b/src/dashboard-refactor/util.ts
@@ -9,7 +9,7 @@ import {
     initNormalizedState,
     NormalizedState,
 } from '@worldbrain/memex-common/lib/common-ui/utils/normalized-state'
-import { eventProviderDomains } from '@worldbrain/memex-common/lib/constants'
+import { EVENT_PROVIDER_DOMAINS } from '@worldbrain/memex-common/lib/constants'
 import type {
     PageAnnotationsCacheInterface,
     UnifiedList,
@@ -110,12 +110,17 @@ export const stateToSearchParams = (
         filterByListIds.push(listData.localId!)
     }
 
+    const isBlankSearch = !searchFilters.searchQuery.trim().length
+
     // Blank search doesn't use standard skip+limit pagination. Instead it requires the caller to keep
     //  track of the oldest timestamp and supply that as the new upper-bound on each reinvocation
-    const blankSearchUpperBound = !searchFilters.searchQuery.trim().length
+    const blankSearchUpperBound = isBlankSearch
         ? searchResults.blankSearchOldestResultTimestamp
         : null
 
+    // Use a larger page size for blank searches to reduce the chance of duped results, due to annots/visits/bookmarks appearing in different result pages
+    const limit = isBlankSearch ? searchFilters.limit * 3 : searchFilters.limit
+
     // TODO: Dynamically set these flags based on state
     const termsSearchOpts: TermsSearchOpts = {
         matchNotes: true,
@@ -126,8 +131,8 @@ export const stateToSearchParams = (
     }
 
     return {
+        limit,
         skip: searchFilters.skip,
-        limit: searchFilters.limit,
         query: searchFilters.searchQuery,
         filterByDomains: searchFilters.domainsIncluded,
         filterByListIds,