Add pagination for adoption requests

Author: andrewjstone

nexus/external-api/src/lib.rs

@@ -6684,7 +6684,7 @@ pub trait NexusExternalApi {
     }]
     async fn physical_disk_list_adoption_requests(
         rqctx: RequestContext<Self::Context>,
-        query: Query<PaginationParams<EmptyScanParams, String>>,
+        query_params: Query<PaginatedById>,
     ) -> Result<
         HttpResponseOk<
             ResultsPage<latest::physical_disk::PhysicalDiskAdoptionRequest>,

nexus/src/external_api/http_entrypoints.rs

@@ -6740,36 +6740,31 @@ impl NexusExternalApi for NexusExternalApiImpl {
 
     async fn physical_disk_list_adoption_requests(
         rqctx: RequestContext<Self::Context>,
-        query: Query<PaginationParams<EmptyScanParams, String>>,
+        query_params: Query<PaginatedById>,
     ) -> Result<
         HttpResponseOk<ResultsPage<PhysicalDiskAdoptionRequest>>,
         HttpError,
     > {
         let apictx = rqctx.context();
-        let pag_params = query.into_inner();
-        if let dropshot::WhichPage::Next(last_seen) = &pag_params.page {
-            return Err(Error::invalid_value(
-                last_seen.clone(),
-                "bad page token",
-            )
-            .into());
-        }
         let handler = async {
             let nexus = &apictx.context.nexus;
+            let query = query_params.into_inner();
             let opctx =
                 crate::context::op_context_for_external_api(&rqctx).await?;
-            let pagparams = DataPageParams {
-                marker: None,
-                direction: dropshot::PaginationOrder::Ascending,
-                limit: std::num::NonZeroU32::new(100).unwrap(),
-            };
             let requests = nexus
-                .physical_disk_adoption_request_list(&opctx, &pagparams)
+                .physical_disk_adoption_request_list(
+                    &opctx,
+                    &data_page_params_for(&rqctx, &query)?,
+                )
                 .await?
                 .into_iter()
                 .map(|r| r.into())
                 .collect();
-            Ok(HttpResponseOk(ResultsPage { items: requests, next_page: None }))
+            Ok(HttpResponseOk(ScanById::results_page(
+                &query,
+                requests,
+                &|_, req: &PhysicalDiskAdoptionRequest| req.id,
+            )?))
         };
         apictx
             .context

…i/nexus/nexus-2026040200.0.0-57a417.json …i/nexus/nexus-2026040200.0.0-57f2d4.jsonopenapi/nexus/nexus-2026040200.0.0-57a417.json renamed to openapi/nexus/nexus-2026040200.0.0-57f2d4.json openapi/nexus/nexus-2026040200.0.0-57a417.json renamed to openapi/nexus/nexus-2026040200.0.0-57f2d4.json

@@ -7722,6 +7722,13 @@
               "nullable": true,
               "type": "string"
             }
+          },
+          {
+            "in": "query",
+            "name": "sort_by",
+            "schema": {
+              "$ref": "#/components/schemas/IdSortMode"
+            }
           }
         ],
         "responses": {

openapi/nexus/nexus-latest.json

@@ -1 +1 @@
-nexus-2026040200.0.0-57a417.json
+nexus-2026040200.0.0-57f2d4.json