Skip to content

release-26.1: ui/cluster-ui: add optional headers to jobs/databases pages#169865

Merged
trunk-io[bot] merged 1 commit into
cockroachdb:release-26.1from
janmorales7:backport26.1-169819
May 12, 2026
Merged

release-26.1: ui/cluster-ui: add optional headers to jobs/databases pages#169865
trunk-io[bot] merged 1 commit into
cockroachdb:release-26.1from
janmorales7:backport26.1-169819

Conversation

@janmorales7
Copy link
Copy Markdown
Contributor

@janmorales7 janmorales7 commented May 6, 2026

Informs: CNSL-2186

Backport 1/1 commits from #169819.

/cc @cockroachdb/release


Make the page header optional via a showHeader prop on both JobsPage and DatabasesPageV2, allowing parent components to suppress the heading when embedding these pages in other layouts.

Move the "Auto stats collection" toggle from the PageHeader actions slot into the PageConfig filter bar on the databases page so it sits alongside other page-level controls.

A local stylesheet (databasesPageRoot.module.scss) is introduced to add margin-top: 10px on the content section below PageConfig. This compensates for the shared PageConfig container's margin-bottom: -10px (a sticky-header spacing trick) without modifying the shared stylesheet that affects 16+ pages.

Release justification: Add optional header support for embedded pages

@trunk-io
Copy link
Copy Markdown
Contributor

trunk-io Bot commented May 6, 2026

😎 Merged successfully - details.

@blathers-crl
Copy link
Copy Markdown

blathers-crl Bot commented May 6, 2026

Thanks for opening a backport.

Before merging, please confirm that the change does not break backwards compatibility and otherwise complies with the backport policy. Include a brief release justification in the PR description explaining why the backport is appropriate. All backports must be reviewed by the TL for the owning area. While the stricter LTS policy does not yet apply, please exercise judgment and consider gating non-critical changes behind a disabled-by-default feature flag when appropriate.

@blathers-crl blathers-crl Bot added the backport Label PR's that are backports to older release branches label May 6, 2026
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@janmorales7 janmorales7 marked this pull request as ready for review May 7, 2026 14:32
@janmorales7 janmorales7 requested a review from a team as a code owner May 7, 2026 14:32
@janmorales7 janmorales7 requested review from dhartunian and removed request for a team May 7, 2026 14:32
@janmorales7 janmorales7 force-pushed the backport26.1-169819 branch from 75d72a7 to edcb1cd Compare May 12, 2026 13:56
Comment thread pkg/ui/workspaces/cluster-ui/src/jobs/jobsPage/jobsPage.tsx
Copy link
Copy Markdown
Collaborator

@dhartunian dhartunian left a comment

Choose a reason for hiding this comment

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

Two issues:

  1. The isEmbedded prop on JobsPage has no default value. On master/26.2 the function component destructures it with isEmbedded = false, but here the class component accesses this.props.isEmbedded directly. It works by accident (!undefined === true) but should have an explicit default — either via static defaultProps or by destructuring in render. As-is it's fragile and inconsistent with the master implementation.

  2. There's also a committed .pyc file in the 24.3 backport (#169868) — not this PR, but flagging since they're a set.

Make the page header optional via a `isEmbedded` prop on both
`JobsPage` and `DatabasesPageV2`, allowing parent components to
suppress the heading when embedding these pages in other layouts.

Move the "Auto stats collection" toggle from the `PageHeader` actions
slot into the `PageConfig` filter bar on the databases page so it
sits alongside other page-level controls.

A local stylesheet (`databasesPageRoot.module.scss`) is introduced
to add `margin-top: 10px` on the content section below `PageConfig`.
This compensates for the shared `PageConfig` container's
`margin-bottom: -10px` (a sticky-header spacing trick) without
modifying the shared stylesheet that affects 16+ pages.

Epic: none
Release note: None

Co-authored-by: Cursor <cursoragent@cursor.com>
@janmorales7 janmorales7 force-pushed the backport26.1-169819 branch from edcb1cd to 6f1edfe Compare May 12, 2026 14:42
@janmorales7 janmorales7 requested a review from dhartunian May 12, 2026 15:15
@janmorales7
Copy link
Copy Markdown
Contributor Author

/trunk merge

@trunk-io trunk-io Bot merged commit edb21aa into cockroachdb:release-26.1 May 12, 2026
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Label PR's that are backports to older release branches target-release-26.1.5

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants