fix: stop pagination after short catalog pages

Author: kKaskak

src/models/catalog_with_filters.rs

@@ -1,4 +1,4 @@
-use crate::constants::{SKIP_EXTRA_PROP, TYPE_PRIORITIES};
+use crate::constants::{CATALOG_PAGE_SIZE, SKIP_EXTRA_PROP, TYPE_PRIORITIES};
 use crate::models::common::{
     compare_with_priorities, eq_update, resource_update_with_vector_content, ResourceAction,
     ResourceLoadable,
@@ -28,6 +28,9 @@ pub trait CatalogResourceAdapter {
     fn resource() -> &'static str;
     fn catalogs(manifest: &Manifest) -> &[ManifestCatalog];
     fn selectable_priority() -> SelectablePriority;
+    fn page_size() -> Option<usize> {
+        None
+    }
 }
 
 impl CatalogResourceAdapter for MetaItemPreview {
@@ -40,6 +43,9 @@ impl CatalogResourceAdapter for MetaItemPreview {
     fn selectable_priority() -> SelectablePriority {
         SelectablePriority::Type
     }
+    fn page_size() -> Option<usize> {
+        Some(CATALOG_PAGE_SIZE)
+    }
 }
 
 impl CatalogResourceAdapter for DescriptorPreview {
@@ -485,7 +491,11 @@ fn selectable_update<T: CatalogResourceAdapter>(
                             page.content
                                 .as_ref()
                                 .and_then(|content| content.ready())
-                                .filter(|content| !content.is_empty())
+                                .filter(|content| {
+                                    T::page_size()
+                                        .map(|page_size| content.len() == page_size)
+                                        .unwrap_or_else(|| !content.is_empty())
+                                })
                                 .map(|content| content.len())
                         })
                         .collect::<Option<Vec<_>>>()

src/unit_tests/catalog_with_filters/load_action.rs

@@ -1,3 +1,4 @@
+use crate::constants::CATALOG_PAGE_SIZE;
 use crate::models::catalog_with_filters::{CatalogWithFilters, Selected};
 use crate::models::common::{Loadable, ResourceLoadable};
 use crate::models::ctx::Ctx;
@@ -38,7 +39,7 @@ fn default_catalog() {
                     && method == "GET" =>
             {
                 future::ok(Box::new(ResourceResponse::Metas {
-                    metas: vec![MetaItemPreview::default()],
+                    metas: vec![MetaItemPreview::default(); CATALOG_PAGE_SIZE],
                 }) as Box<dyn Any + Send>)
                 .boxed_env()
             }
@@ -219,7 +220,7 @@ fn search_catalog() {
             ..
         })
     );
-    assert!(states[2].discover.selectable.next_page.is_some());
+    assert!(states[2].discover.selectable.next_page.is_none());
     assert_matches!(
         states[2].discover.catalog.first(),
         Some(ResourceLoadable {