' +
diff --git a/internal/cloudcp/portal/frontend/src/account_view.ts b/internal/cloudcp/portal/frontend/src/account_view.ts
index 4966dc340..7abd25d92 100644
--- a/internal/cloudcp/portal/frontend/src/account_view.ts
+++ b/internal/cloudcp/portal/frontend/src/account_view.ts
@@ -397,7 +397,7 @@ function renderAccessMemberAction(accountID: string, member: PortalAccessMember,
return group;
}
-function renderAccessMemberRow(accountID: string, member: PortalAccessMember, isOwner: boolean, canManage: boolean, activeJob: PortalAccessJob): HTMLElement {
+function renderAccessMemberRow(accountID: string, member: PortalAccessMember, isOwner: boolean, canManage: boolean, activeJob: PortalAccessJob, clientLanguage: boolean): HTMLElement {
var showActionColumn = canManage && activeJob === 'remove';
var row = document.createElement('div');
row.className = 'access-member-row' + (showActionColumn ? '' : ' access-member-row-readonly');
@@ -431,7 +431,7 @@ function renderAccessMemberRow(accountID: string, member: PortalAccessMember, is
caption.className = 'access-member-caption';
caption.textContent = (member.state || 'active') === 'pending'
? 'Invitation pending acceptance.'
- : portalRoleCapabilityCopy(member.role);
+ : portalRoleCapabilityCopy(member.role, clientLanguage);
identity.appendChild(caption);
row.appendChild(identity);
@@ -494,6 +494,7 @@ export function renderAccessSection(accountID: string, entry: PortalAccountUIEnt
var actorRole = section.getAttribute('data-actor-role') || '';
var isOwner = actorRole === 'owner';
var canManage = section.getAttribute('data-can-manage') === 'true';
+ var clientLanguage = section.getAttribute('data-client-language') === 'true';
var activeJob = canManage ? entry.activeAccessJob : '';
section.classList.toggle('visible', entry.accessVisible);
renderAccessStats(accountID, entry, canManage);
@@ -544,7 +545,7 @@ export function renderAccessSection(accountID: string, entry: PortalAccountUIEnt
renderAccessRosterHead(roster, activeJob, canManage);
for (var i = 0; i < entry.accessQuery.data.length; i += 1) {
var member = entry.accessQuery.data[i];
- roster.appendChild(renderAccessMemberRow(accountID, member, isOwner, canManage, activeJob));
+ roster.appendChild(renderAccessMemberRow(accountID, member, isOwner, canManage, activeJob, clientLanguage));
}
}
diff --git a/internal/cloudcp/portal/frontend/src/shell_view.test.ts b/internal/cloudcp/portal/frontend/src/shell_view.test.ts
index 0fc03fd6e..4b97091f4 100644
--- a/internal/cloudcp/portal/frontend/src/shell_view.test.ts
+++ b/internal/cloudcp/portal/frontend/src/shell_view.test.ts
@@ -224,8 +224,7 @@ describe('shell view', function() {
expect(html).toContain('Gamma Workspace');
expect(html).toContain('Unhealthy');
expect(html).toContain('Checking');
- expect(html).toContain('This workspace is in a failed state.');
- expect(html).toContain('Health check pending');
+ expect(html).toContain('This client is in a failed state.');
expect(html).toContain('/api/accounts/acct_1/tenants/ws_active/handoff');
expect(html).toContain('/api/accounts/acct_1/tenants/ws_active/handoff?target_path=%2Fsettings%2Finfrastructure%3Fadd%3Dlinux-host');
expect(html).toContain('Open client');
@@ -248,9 +247,10 @@ describe('shell view', function() {
expect(html).toContain('id="access-detail-acct_1" hidden');
expect(html).toContain('Choose the smallest role');
expect(html).toContain('Full account, billing, and access control.');
- expect(html).toContain('Workspace control, billing, and roster management.');
- expect(html).toContain('Workspace control without billing or roster ownership.');
- expect(html).toContain('Review access without control-plane changes.');
+ expect(html).toContain('Client control, billing, and roster management.');
+ expect(html).toContain('Client control without billing or roster ownership.');
+ expect(html).toContain('Review client status without control-plane changes.');
+ expect(html).not.toContain('Workspace control, billing, and roster management.');
expect(html).toContain('data-can-manage="true"');
expect(html).toContain('Remove stale access');
expect(html).toContain('data-action="workspace-action"');
@@ -396,6 +396,71 @@ describe('shell view', function() {
expect(html).not.toContain('Services');
});
+ it('labels mixed account surfaces and keeps MSP client copy scoped', function() {
+ var html = renderAuthenticatedPortalHTML(
+ createContext({
+ bootstrap: createBootstrap({
+ accounts: [
+ {
+ id: 'acct_msp_mixed',
+ name: 'Provider Account',
+ kind: 'msp',
+ kind_label: 'MSP',
+ role: 'owner',
+ can_manage: true,
+ has_billing: true,
+ members: [],
+ workspaces: [
+ {
+ id: 'ws_client',
+ display_name: 'Acme Dental',
+ state: 'active',
+ healthy: true,
+ health_status: 'healthy',
+ },
+ ],
+ },
+ {
+ id: 'acct_cloud_mixed',
+ name: 'Hosted Ops',
+ kind: 'cloud',
+ kind_label: 'Cloud',
+ role: 'admin',
+ can_manage: true,
+ has_billing: true,
+ members: [],
+ workspaces: [
+ {
+ id: 'ws_ops',
+ display_name: 'Operations Workspace',
+ state: 'active',
+ healthy: true,
+ health_status: 'healthy',
+ agent_count: 1,
+ alert_route_count: 1,
+ report_schedule_count: 1,
+ },
+ ],
+ },
+ ],
+ }),
+ })
+ );
+
+ expect(html).toContain('data-shell-section="workspaces">Workspaces');
+ expect(html).toContain('
Provider Account
');
+ expect(html).toContain('MSP account · Owner');
+ expect(html).toContain('
Hosted Ops
');
+ expect(html).toContain('Cloud account · Admin');
+ expect(html).toContain('data-client-language="true"');
+ expect(html).toContain('data-client-language="false"');
+ expect(html).toContain('Add client');
+ expect(html).toContain('Open client');
+ expect(html).toContain('Open workspace');
+ expect(html).toContain('Client control, billing, and roster management.');
+ expect(html).toContain('Workspace control, billing, and roster management.');
+ });
+
it('renders one simple account context strip without summary facts', function() {
var html = renderAuthenticatedPortalHTML(
createContext({
@@ -795,6 +860,8 @@ describe('shell view', function() {
);
expect(html).toContain('Suspended');
+ expect(html).toContain('This client is suspended.');
+ expect(html).not.toContain('This workspace is suspended.');
expect(html).toContain('Add client');
expect(html).toContain('Paused Workspace');
});
diff --git a/internal/cloudcp/portal/frontend/src/shell_view.ts b/internal/cloudcp/portal/frontend/src/shell_view.ts
index d14ebc81d..0023af4b7 100644
--- a/internal/cloudcp/portal/frontend/src/shell_view.ts
+++ b/internal/cloudcp/portal/frontend/src/shell_view.ts
@@ -472,9 +472,6 @@ function renderWorkspaceCard(account: PortalAccountSummary, workspace: PortalWor
if (createdLabel) {
metaParts.push('
Created ' + escapeHTML(createdLabel) + '');
}
- if (workspace.last_health_check && status === 'healthy') {
- metaParts.push('
Checked recently');
- }
var openAction = '';
if (state === 'active') {
@@ -511,9 +508,8 @@ function renderWorkspaceCard(account: PortalAccountSummary, workspace: PortalWor
'
' +
'
' +
'
' + escapeHTML(workspace.display_name) + '
' +
- '
' + metaParts.join('') + '
' +
'
' +
- '
' + escapeHTML(workspaceRowNote(workspace)) + '
' +
+ (metaParts.length ? '
' + metaParts.join('') + '
' : '') +
'
' +
'
' +
setupBadgeHTML(workspace) +
@@ -641,6 +637,14 @@ function workspaceSetupDiagnosticsLine(workspace: PortalWorkspaceSummary): strin
return guide.diagnostics.length ? guide.diagnostics[0] : workspaceSetupNextStep(workspace);
}
+function workspaceSummaryStatusCopy(workspace: PortalWorkspaceSummary, clientLanguage: boolean): string {
+ if (!clientLanguage) return workspaceStatusCopy(workspace);
+ var state = String(workspace.state || '');
+ if (state === 'suspended') return 'This client is suspended.';
+ if (state === 'failed') return 'This client is in a failed state.';
+ return workspaceStatusCopy(workspace);
+}
+
function workspaceSummaryContext(entry: WorkspaceSummaryEntry, includeAccountName: boolean, note: string): string {
if (!includeAccountName) return note;
return entry.account.name + ' · ' + note;
@@ -684,7 +688,7 @@ function renderWorkspaceSummaryDecision(
if (attention.length) {
var attentionEntry = attention[0];
title = 'Review ' + attentionEntry.workspace.display_name;
- description = workspaceSummaryContext(attentionEntry, accounts.length > 1, workspaceStatusCopy(attentionEntry.workspace));
+ description = workspaceSummaryContext(attentionEntry, accounts.length > 1, workspaceSummaryStatusCopy(attentionEntry.workspace, clientLanguage));
primaryAction = renderWorkspaceAnchorAction(
workspaceRowAnchorID(attentionEntry.account.id, attentionEntry.workspace.id),
clientLanguage ? 'Review client' : 'Review workspace',
@@ -704,7 +708,7 @@ function renderWorkspaceSummaryDecision(
} else if (suspended.length) {
var suspendedEntry = suspended[0];
title = 'Review ' + suspendedEntry.workspace.display_name;
- description = workspaceSummaryContext(suspendedEntry, accounts.length > 1, workspaceStatusCopy(suspendedEntry.workspace));
+ description = workspaceSummaryContext(suspendedEntry, accounts.length > 1, workspaceSummaryStatusCopy(suspendedEntry.workspace, clientLanguage));
primaryAction = renderWorkspaceAnchorAction(
workspaceRowAnchorID(suspendedEntry.account.id, suspendedEntry.workspace.id),
clientLanguage ? 'Review client' : 'Review workspace',
@@ -880,19 +884,19 @@ function renderProviderSetupTemplates(accounts: PortalAccountSummary[]): string
var template = templateAccount.setup_templates[0];
return (
'
' +
- '' +
- '
' +
- '
' + escapeHTML(template.title || 'Provider setup template') + '
' +
- '
Use the same onboarding shape for each client, then finish the tenant-owned configuration inside that client workspace.
' +
+ '
' +
+ '' +
+ '' + escapeHTML(template.title || 'Provider setup template') + '' +
+ '' + escapeHTML(templateAccount.name) + '' +
+ '
' +
+ 'Use the same onboarding shape for each client, then finish the tenant-owned configuration inside that client workspace.
' +
+ '' +
+ '
Agent naming' + escapeHTML(template.agent_naming) + '
' +
+ '
Alert routing' + escapeHTML(template.alert_routing) + '
' +
+ '
Reports' + escapeHTML(template.reporting) + '
' +
+ '
Access' + escapeHTML(template.access) + '
' +
'
' +
- '
' +
- '
Agent naming' + escapeHTML(template.agent_naming) + '
' +
- '
Alert routing' + escapeHTML(template.alert_routing) + '
' +
- '
Reports' + escapeHTML(template.reporting) + '
' +
- '
Access' + escapeHTML(template.access) + '
' +
- '
' +
+ '' +
''
);
}
@@ -994,6 +998,18 @@ function renderAccountBlockHeader(
);
}
+function renderAccountSurfaceHeader(account: PortalAccountSummary, showHeader: boolean): string {
+ if (!showHeader) return '';
+ return (
+ ''
+ );
+}
+
function renderNoHostedWorkspacesSection(): string {
return (
'
' +
@@ -1267,6 +1283,12 @@ function renderAccountWorkspaceSection(account: PortalAccountSummary, accountAPI
}
function renderAccountAccessSection(account: PortalAccountSummary): string {
+ var clientLanguage = accountUsesClientLanguage(account);
+ var accessRoleCopy = {
+ admin: clientLanguage ? 'Client control, billing, and roster management.' : 'Workspace control, billing, and roster management.',
+ tech: clientLanguage ? 'Client control without billing or roster ownership.' : 'Workspace control without billing or roster ownership.',
+ readOnly: clientLanguage ? 'Review client status without control-plane changes.' : 'Review access without control-plane changes.',
+ };
var accessTaskStrip = account.can_manage
? (
'' +
@@ -1286,9 +1308,9 @@ function renderAccountAccessSection(account: PortalAccountSummary): string {
'
' +
'' +
'
OwnerFull account, billing, and access control.
' +
- '
AdminWorkspace control, billing, and roster management.
' +
- '
TechWorkspace control without billing or roster ownership.
' +
- '
Read-onlyReview access without control-plane changes.
' +
+ '
Admin' + escapeHTML(accessRoleCopy.admin) + '
' +
+ '
Tech' + escapeHTML(accessRoleCopy.tech) + '
' +
+ '
Read-only' + escapeHTML(accessRoleCopy.readOnly) + '
' +
'
' + escapeHTML('Review who has access. An owner or admin must make changes.') + '
'
@@ -1551,6 +1575,7 @@ export function renderAuthenticatedPortalHTML(context: ShellViewContext): string
? accounts.map(function(account) {
return (
'' +
+ renderAccountSurfaceHeader(account, accounts.length > 1) +
renderAccountWorkspaceSection(account, context.accountAPIBasePath) +
''
);
@@ -1561,6 +1586,7 @@ export function renderAuthenticatedPortalHTML(context: ShellViewContext): string
? accounts.map(function(account) {
return (
'' +
+ renderAccountSurfaceHeader(account, accounts.length > 1) +
renderAccountAccessSection(account) +
''
);
diff --git a/internal/cloudcp/portal/frontend/src/styles.css b/internal/cloudcp/portal/frontend/src/styles.css
index e8e21f87c..25500cbaf 100644
--- a/internal/cloudcp/portal/frontend/src/styles.css
+++ b/internal/cloudcp/portal/frontend/src/styles.css
@@ -293,6 +293,10 @@ header .logout-btn:hover,
border-top: 1px solid var(--border);
}
+.account-surface-header .portal-section-copy {
+ margin: 4px 0 0;
+}
+
.account-content-panel { display: block; }
.account-content-panel-workspaces,
@@ -357,7 +361,7 @@ header .logout-btn:hover,
.workspace-row-primary {
display: flex;
flex-direction: column;
- gap: 1px;
+ gap: 2px;
min-width: 0;
}
@@ -370,13 +374,19 @@ header .logout-btn:hover,
.workspace-name {
margin: 0;
+ min-width: 0;
+ max-width: 100%;
font-size: 14px;
font-weight: 600;
color: var(--ink);
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.workspace-meta {
display: flex;
+ flex-wrap: wrap;
gap: 6px;
}
@@ -391,12 +401,6 @@ header .logout-btn:hover,
color: var(--border);
}
-.workspace-row-note {
- margin: 0;
- font-size: 12px;
- color: var(--ink-secondary);
-}
-
.workspace-row-status-cell {
display: flex;
align-items: center;
@@ -1524,29 +1528,33 @@ header .logout-btn:hover,
background: var(--bg);
}
-.workspace-template-heading {
- display: flex;
- align-items: flex-start;
- justify-content: space-between;
- gap: 12px;
-}
-
-.workspace-template-heading h3 {
- margin: 0;
+.workspace-template-summary {
+ cursor: pointer;
font-size: 14px;
+ font-weight: 600;
color: var(--ink);
}
-.workspace-template-heading p {
- margin: 3px 0 0;
+.workspace-template-summary::marker,
+.workspace-template-summary::-webkit-details-marker {
+ color: var(--ink-muted);
+}
+
+.workspace-template-summary-meta {
+ margin-left: 8px;
+ color: var(--ink-secondary);
+ font-size: 12px;
+ font-weight: 400;
+}
+
+.workspace-template-intro {
+ margin: 10px 0 0;
color: var(--ink-secondary);
font-size: 12px;
}
-.workspace-template-heading > span {
- flex: 0 0 auto;
- color: var(--ink-secondary);
- font-size: 12px;
+.workspace-template-details[open] .workspace-template-grid {
+ margin-top: 10px;
}
.workspace-template-grid {
@@ -1754,9 +1762,6 @@ header .logout-btn:hover,
.workspace-setup-queue-actions {
justify-content: flex-start;
}
- .workspace-template-heading {
- flex-direction: column;
- }
.workspace-template-grid,
.workspace-setup-guide {
grid-template-columns: 1fr;
diff --git a/scripts/release_control/subsystem_lookup_test.py b/scripts/release_control/subsystem_lookup_test.py
index f12ee6133..e0b0abd6a 100644
--- a/scripts/release_control/subsystem_lookup_test.py
+++ b/scripts/release_control/subsystem_lookup_test.py
@@ -2860,7 +2860,7 @@ class SubsystemLookupTest(unittest.TestCase):
{
"heading": "## Shared Boundaries",
"path": "internal/api/access_control_handlers.go",
- "line": 318,
+ "line": 327,
"heading_line": 112,
}
],