Skip to content

control-plane-api: Add tenant filter to dataPlanes query - #3437

Merged
adrian-estuary merged 7 commits into
masterfrom
2065-filter-data-plane-tenant
Sep 1, 2026
Merged

control-plane-api: Add tenant filter to dataPlanes query#3437
adrian-estuary merged 7 commits into
masterfrom
2065-filter-data-plane-tenant

Conversation

@adrian-estuary

Copy link
Copy Markdown
Contributor

Description:

Related to estuary/ui#2065

Adding a new tenant string filter to allow filtering the DataPlanesQuery results to just data planes owned by that tenant. This is required to migrate the DataPlanesTable to GQL, since the current supabase query does this filtering.

Filter by tenant acmeCo/
Screenshot 2026-08-28 at 11 13 39鈥疉M

Filter by tenant umbrellaCo/
Screenshot 2026-08-28 at 11 14 47鈥疉M

Includes public data planes by default
Screenshot 2026-08-28 at 11 17 49鈥疉M

Workflow steps:

The filter will be used by the data planes table in the admin UI to filter planes to the selected tenant.

Documentation links affected:

No documentation changed.

Notes for reviewers:

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a couple of fixtures to represent a single user (bob) having admin access to two tenants (bobCo and bobCo2) so that I could test the new tenant filter for data planes.

Comment thread crates/control-plane-api/src/server/public/graphql/data_planes.rs Outdated
Comment thread crates/control-plane-api/src/server/public/graphql/data_planes.rs
@GregorShear
GregorShear requested a review from bbartman August 31, 2026 16:25
@bbartman

Copy link
Copy Markdown
Contributor

This looks good, you get my approval. Just finishing reviewing things from Greg and you should be fine.

@bbartman bbartman left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good from a backend perspective.

Comment thread crates/control-plane-api/src/server/public/graphql/data_planes.rs Outdated
@adrian-estuary
adrian-estuary force-pushed the 2065-filter-data-plane-tenant branch from b7ee022 to 3f71069 Compare September 1, 2026 16:46
Comment thread crates/control-plane-api/src/server/public/graphql/data_planes.rs Outdated
Fixes the edge-case where result set has exactly `limit` items, causing `hasNext` to incorrectly return `true`. This would cause clients to have to query for an empty last page unnecessarily.
@adrian-estuary
adrian-estuary merged commit 587f8bc into master Sep 1, 2026
11 checks passed
@adrian-estuary
adrian-estuary deleted the 2065-filter-data-plane-tenant branch September 1, 2026 22:07
@github-actions github-actions Bot added pending:agent-api Merged, ships via Deploy agent-api, and not yet deployed pending:agent Merged, in the control-plane-agent image, and not yet rolled to flow-agent and removed pending:agent-api Merged, ships via Deploy agent-api, and not yet deployed pending:agent Merged, in the control-plane-agent image, and not yet rolled to flow-agent labels Sep 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants