Skip to content

web search done right

Make next page arrow in-active when there are no next results

Mikkel Denkercdc2cd2a6f77
diff --git a/core/src/api/search.rs b/core/src/api/search.rs
index 2d95a3fb..26fead6e 100644
--- a/core/src/api/search.rs
+++ b/core/src/api/search.rs
@@ -60,6 +60,7 @@ struct SearchTemplate {
prev_page_url: Option<String>,
default_optics: Vec<OpticLink>,
current_optic_url: Option<String>,
+ has_more_results: bool,
}
enum RegionSelection {
@@ -170,6 +171,7 @@ pub async fn route(
prev_page_url,
default_optics: DEFAULT_OPTICS.to_vec(),
current_optic_url,
+ has_more_results: result.has_more_results,
};
Ok(HtmlTemplate(template).into_response())
diff --git a/core/src/searcher/distributed.rs b/core/src/searcher/distributed.rs
index 9fa34d26..d953a991 100644
--- a/core/src/searcher/distributed.rs
+++ b/core/src/searcher/distributed.rs
@@ -541,8 +541,15 @@ impl DistributedSearcher {
.map(|result| result.local_result.num_websites)
.sum();
+ let num_shard_websites: usize = initial_results
+ .iter()
+ .map(|res| res.local_result.websites.len())
+ .sum();
+
let top_websites = self.combine_results(initial_results, pipeline);
+ let has_more_results = num_shard_websites != top_websites.len();
+
// retrieve webpages
let mut retrieved_webpages: Vec<_> = self
.retrieve_webpages(&top_websites, &query.query)
@@ -568,6 +575,7 @@ impl DistributedSearcher {
widget,
discussions,
search_duration_ms,
+ has_more_results,
})
}
diff --git a/core/src/searcher/local.rs b/core/src/searcher/local.rs
index c3cdda4b..d93ccca4 100644
--- a/core/src/searcher/local.rs
+++ b/core/src/searcher/local.rs
@@ -318,7 +318,12 @@ impl LocalSearcher {
let search_result = self.search_initial(&search_query, true)?;
+ let search_len = search_result.websites.len();
+
let top_websites = pipeline.apply(search_result.websites);
+
+ let has_more_results = search_len != top_websites.len();
+
let pointers: Vec<_> = top_websites
.into_iter()
.map(|website| website.pointer)
@@ -340,6 +345,7 @@ impl LocalSearcher {
direct_answer: None,
sidebar: search_result.entity_sidebar.map(Sidebar::Entity),
search_duration_ms: start.elapsed().as_millis(),
+ has_more_results,
})
}
diff --git a/core/src/searcher/mod.rs b/core/src/searcher/mod.rs
index fe1bbf6a..5938301a 100644
--- a/core/src/searcher/mod.rs
+++ b/core/src/searcher/mod.rs
@@ -51,6 +51,7 @@ pub struct WebsitesResult {
pub direct_answer: Option<DisplayedAnswer>,
pub discussions: Option<Vec<DisplayedWebpage>>,
pub search_duration_ms: u128,
+ pub has_more_results: bool,
}
#[derive(Debug, Serialize, Deserialize, Clone)]
diff --git a/frontend/src/pages/search.astro b/frontend/src/pages/search.astro
index 971cbfb0..9e242278 100644
--- a/frontend/src/pages/search.astro
+++ b/frontend/src/pages/search.astro
@@ -141,9 +141,15 @@ import { askama } from "../askama";
<div class="mx-2">
Page {askama`current_page $ 5`}
</div>
- <a href="{{ next_page_url }}">
- <Hero class="change-page-active" icon="chevron-right" />
- </a>
+ {
+ askama.if_(
+ "has_more_results",
+ <a href="{{ next_page_url }}">
+ <Hero class="change-page-active" icon="chevron-right" />
+ </a>,
+ <Hero class="change-page-inactive" icon="chevron-right" />
+ )
+ }
</div>
</div>