From 3ed8da01e20ca2ab6f7eaa1d22702aecfc9f4ed5 Mon Sep 17 00:00:00 2001 From: Hawk Ticehurst Date: Thu, 1 Oct 2026 16:18:43 -0400 Subject: [PATCH] Agent Host changes for agents/remove-customization-count-badge --- .../sessions/browser/media/sessionsList.css | 5 --- .../sessions/browser/views/sessionsList.ts | 37 +++++-------------- .../test/browser/sessionsList.fixture.ts | 4 +- .../test/browser/sessionsList.test.ts | 7 +--- .../test/browser/sessionsListFixtureUtils.ts | 2 +- 5 files changed, 14 insertions(+), 41 deletions(-) diff --git a/src/vs/sessions/contrib/sessions/browser/media/sessionsList.css b/src/vs/sessions/contrib/sessions/browser/media/sessionsList.css index 209d5636a5d1f..de769c985f89d 100644 --- a/src/vs/sessions/contrib/sessions/browser/media/sessionsList.css +++ b/src/vs/sessions/contrib/sessions/browser/media/sessionsList.css @@ -1087,11 +1087,6 @@ white-space: nowrap; } - .session-section-count-badge { - flex-shrink: 0; - margin-left: var(--vscode-spacing-size40); - } - .session-section-migration-indicator { display: none; flex-shrink: 0; diff --git a/src/vs/sessions/contrib/sessions/browser/views/sessionsList.ts b/src/vs/sessions/contrib/sessions/browser/views/sessionsList.ts index e40d5d085782d..3cde91384b61c 100644 --- a/src/vs/sessions/contrib/sessions/browser/views/sessionsList.ts +++ b/src/vs/sessions/contrib/sessions/browser/views/sessionsList.ts @@ -43,8 +43,7 @@ import { IInstantiationService } from '../../../../../platform/instantiation/com import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js'; import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js'; import { WorkbenchObjectTree } from '../../../../../platform/list/browser/listService.js'; -import { IStyleOverride, defaultButtonStyles, defaultFindWidgetStyles, defaultInputBoxStyles, defaultKeybindingLabelStyles, defaultToggleStyles, getCountBadgeStyle } from '../../../../../platform/theme/browser/defaultStyles.js'; -import { buttonSecondaryBorder, buttonSecondaryForeground, buttonSecondaryHoverBackground } from '../../../../../platform/theme/common/colorRegistry.js'; +import { IStyleOverride, defaultButtonStyles, defaultFindWidgetStyles, defaultInputBoxStyles, defaultKeybindingLabelStyles, defaultToggleStyles } from '../../../../../platform/theme/browser/defaultStyles.js'; import { chartsOrange } from '../../../../../platform/theme/common/colors/chartsColors.js'; import { asCssVariable } from '../../../../../platform/theme/common/colorUtils.js'; import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js'; @@ -63,7 +62,6 @@ import { AgentSessionApprovalModel, agentSessionApprovalId, IAgentSessionApprova import { IVoicePlaybackService } from '../../../../../workbench/contrib/chat/common/voicePlaybackService.js'; import { Button } from '../../../../../base/browser/ui/button/button.js'; import { status } from '../../../../../base/browser/ui/aria/aria.js'; -import { CountBadge } from '../../../../../base/browser/ui/countBadge/countBadge.js'; import { IMarkdownRendererService } from '../../../../../platform/markdown/browser/markdownRenderer.js'; import { Action, ActionRunner, IAction, Separator, SubmenuAction, toAction } from '../../../../../base/common/actions.js'; import { IHoverService } from '../../../../../platform/hover/browser/hover.js'; @@ -2145,8 +2143,6 @@ interface ISessionSectionTemplate extends ISessionHeaderTemplate { readonly migrationIndicator: HTMLElement; readonly count: HTMLElement; readonly countLabel: HTMLElement; - readonly countBadgeContainer: HTMLElement; - readonly countBadge: CountBadge; readonly newBadge: HTMLElement; readonly keybindingHint: HTMLElement; readonly keybindingLabel: KeybindingLabel; @@ -2211,7 +2207,6 @@ export class SessionSectionRenderer implements ITreeRenderer, private readonly customizationsActive: IObservable = constObservable(false), - private readonly customizationsCount: IObservable = constObservable(0), private readonly customizationMigrationsAvailable: IObservable = constObservable(false), readonly templateId = SessionSectionRenderer.TEMPLATE_ID, readonly rowClassName?: string, @@ -2233,12 +2228,6 @@ export class SessionSectionRenderer implements ITreeRenderer, _index: number, template: ISessionSectionTemplate): void { @@ -2367,10 +2356,6 @@ export class SessionSectionRenderer implements ITreeRenderer { - template.countBadge.setCount(this.customizationsCount.read(reader)); - template.countLabel.style.display = 'none'; - template.countBadgeContainer.style.display = ''; - template.count.style.display = 'none'; template.migrationIndicator.classList.toggle('visible', this.customizationMigrationsAvailable.read(reader)); })); } @@ -2415,16 +2400,13 @@ export class SessionSectionRenderer implements ITreeRenderer { .find(element => element.querySelector('.session-section-label')?.textContent === 'Customizations'); const customizationsLabel = customizationsSection?.querySelector('.session-section-label'); const migrationIndicator = customizationsSection?.querySelector('.session-section-migration-indicator'); - const countBadge = customizationsSection?.querySelector('.session-section-count-badge .monaco-count-badge'); const customizationsPresentation = { - countBadge: countBadge?.textContent, - countBadgeNextToLabel: countBadge?.parentElement?.previousElementSibling === customizationsLabel, + hasTotalCountBadge: customizationsSection?.querySelector('.monaco-count-badge') !== null, migrationIndicatorVisible: migrationIndicator?.classList.contains('visible'), migrationIndicatorOutsideLabel: !!migrationIndicator && !customizationsLabel?.contains(migrationIndicator), hasExtensionsIcon: customizationsSection?.querySelector('.session-section-icon')?.classList.contains('codicon-extensions'), @@ -581,8 +579,7 @@ suite('Sessions - SessionsList', () => { ], headerInTreatment: true, customizationsPresentation: { - countBadge: '7', - countBadgeNextToLabel: true, + hasTotalCountBadge: false, migrationIndicatorVisible: true, migrationIndicatorOutsideLabel: true, hasExtensionsIcon: true, diff --git a/src/vs/sessions/contrib/sessions/test/browser/sessionsListFixtureUtils.ts b/src/vs/sessions/contrib/sessions/test/browser/sessionsListFixtureUtils.ts index e3643f017cde5..108062d1b3301 100644 --- a/src/vs/sessions/contrib/sessions/test/browser/sessionsListFixtureUtils.ts +++ b/src/vs/sessions/contrib/sessions/test/browser/sessionsListFixtureUtils.ts @@ -170,7 +170,7 @@ export interface ISessionsListFixtureHeader { readonly automationRunStatus?: IAutomationRun['status']; /** Shows New, Automations, and Customizations as navigation rows above the Sessions header. */ readonly navigationShortcuts?: boolean; - /** Count shown on the Customizations navigation row. */ + /** Customization count exposed in the navigation row's accessibility label. */ readonly customizationsCount?: number; /** Shows the Customizations navigation row's migrations-available indicator. */ readonly customizationMigrationsAvailable?: boolean;