Skip to content

fix(v2): settings page-shell header, Look label alignment, folded API token (TASK-688) #3153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lilyshen0722 merged 4 commits into from
Nov 1, 2026
Merged

fix(v2): settings page-shell header, Look label alignment, folded API token (TASK-688) #3153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
edd4ccf
fix(v2): settings uses the page-shell header, left-aligned Look label…
lilyshen0722 Nov 1, 2026
ce64956
fix(v2): settings header bar runs edge to edge and stays pinned (TASK…
lilyshen0722 Nov 1, 2026
04935c7
test(v2): assert the folded token detail container is absent (TASK-688)
lilyshen0722 Nov 1, 2026
009ee5a
Merge main into ember/task-688-followup; keep wisp's header and shell…
lilyshen0722 Nov 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions frontend/src/v2/__tests__/V2SettingsPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,10 @@ describe('V2SettingsPage', () => {
});
renderSettings();

expect(await screen.findByText(/shown once, when generated/i)).toBeInTheDocument();
expect(screen.getByText(/ends in cret/i)).toBeInTheDocument();
expect(screen.getByText(/^Created [45] Sep 2026$/)).toBeInTheDocument();
expect(await screen.findByText(/active · ends in cret/i)).toBeInTheDocument();
expect(screen.queryByText(/shown once/i)).not.toBeInTheDocument();
expect(screen.queryByText('••••••••••••••••••••••••••••••••')).not.toBeInTheDocument();
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
expect(document.querySelector('.v2-settings__token-detail')).toBeNull();
expect(screen.queryByRole('button', { name: 'Copy' })).not.toBeInTheDocument();
expect(screen.queryByRole('button', { name: 'Show' })).not.toBeInTheDocument();
expect(screen.queryByText('cm_user_secret')).not.toBeInTheDocument();
Expand Down
19 changes: 7 additions & 12 deletions frontend/src/v2/components/V2SettingsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ const V2ApiTokenSection: React.FC = () => {
const maskedToken = '••••••••••••••••••••••••••••••••';
const createdLabel = createdAt ? formatTokenCreatedAt(createdAt) : null;

const statusLabel = hasToken ? 'Active' : 'None';
const statusLabel = hasToken ? `Active${last4 ? ` · ends in ${last4}` : ''}` : 'None';

return (
<div className="v2-settings__token">
Expand All @@ -511,24 +511,19 @@ const V2ApiTokenSection: React.FC = () => {
</button>
)}
</div>
{(error || notice || hasToken) && (
{(error || notice || token) && (
<div className="v2-settings__token-detail">
{error && <p className="v2-settings__message v2-settings__message--error" role="alert">{error}</p>}
{notice && <p className="v2-settings__message" role="status">{notice}</p>}
{hasToken && (
{token && (
<>
<div className="v2-settings__token-value">
<code>{token && showToken ? token : maskedToken}</code>
{token && (
<>
<button type="button" className="v2-settings__secondary" onClick={() => setShowToken((visible) => !visible)}>
{showToken ? 'Hide' : 'Show'}
</button>
<button type="button" className="v2-settings__secondary" onClick={() => void copy()}>Copy</button>
</>
)}
<button type="button" className="v2-settings__secondary" onClick={() => setShowToken((visible) => !visible)}>
{showToken ? 'Hide' : 'Show'}
</button>
<button type="button" className="v2-settings__secondary" onClick={() => void copy()}>Copy</button>
</div>
{!token && <p className="v2-settings__token-meta">Shown once, when generated.{last4 ? ` Ends in ${last4}.` : ''}</p>}
{createdLabel && <p className="v2-settings__token-meta">{createdLabel}</p>}
</>
)}
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/v2/v2.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8418,7 +8418,8 @@ details[open] > .v2-settings__summary > .v2-settings__icon:last-child { transfor
/* D215 Settings › Look: a label and a segment per row. Language moved here
from the rail (TASK-691). */
.v2-settings__look { display: flex; flex-direction: column; }
.v2-settings__look .v2-settings__row { justify-content: space-between; }
.v2-settings__look .v2-settings__row { justify-content: flex-start; }
.v2-settings__look .v2-settings__row > :last-child { margin-left: auto; }
.v2-settings__look .v2-settings__row + .v2-settings__row { border-top: 1px solid var(--v2-border-soft); }


Expand Down
Loading