Skip to content

refactor(chat): Remove loading dots from context display #7557

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
merged 2 commits into from
Mar 27, 2025
Merged

refactor(chat): Remove loading dots from context display #7557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87904b2
refactor(chat): Remove loading dots from context display
abeatrix Mar 26, 2025
6484f45
Update unit tests
abeatrix Mar 26, 2025
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
12 changes: 4 additions & 8 deletions vscode/webviews/chat/Transcript.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,12 +389,8 @@ function expectCells(expectedCells: CellMatcher[], containerElement?: HTMLElemen
expect(textElement.innerText.trim()).toBe(expectedCell.message)
} else if ('loading' in expectedCell.message) {
const statusElement = cell.querySelector('[role="status"]')
if (i === expectedCells.length - 1) {
expect(statusElement).not.toBeNull()
expect(statusElement).toHaveAttribute('aria-busy', 'true')
} else {
expect(statusElement).toBeNull()
}
// This has been moved to the Transcript level.
expect(statusElement).toBeNull()
}
if (expectedCell.canSubmit !== undefined) {
const submitButton = cell.querySelector('button[type="submit"]')
Expand All @@ -415,8 +411,8 @@ function expectCells(expectedCells: CellMatcher[], containerElement?: HTMLElemen
)
} else if (expectedCell.context.loading) {
const statusElement = cell.querySelector('[role="status"]')
expect(statusElement).not.toBeNull()
expect(statusElement).toHaveAttribute('aria-busy', 'true')
// This has been moved to the Transcript level.
expect(statusElement).toBeNull()
}
} else {
throw new Error('unknown cell')
Expand Down
197 changes: 93 additions & 104 deletions vscode/webviews/chat/cells/contextCell/ContextCell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import {
import { Tooltip, TooltipContent, TooltipTrigger } from '../../../components/shadcn/ui/tooltip'
import { useTelemetryRecorder } from '../../../utils/telemetry'
import { useConfig } from '../../../utils/useConfig'
import { LoadingDots } from '../../components/LoadingDots'
import { Cell } from '../Cell'
import styles from './ContextCell.module.css'

Expand Down Expand Up @@ -165,112 +164,102 @@ export const ContextCell: FunctionComponent<{
data-testid="context"
aria-disabled={isContextLoading || !hasContent}
>
{isContextLoading && !isAgenticChat ? (
<LoadingDots />
) : (
<>
<AccordionContent className="tw-flex tw-flex-col" overflow={false}>
{internalDebugContext && contextAlternatives && (
<div>
<button onClick={prevSelectedAlternative} type="button">
←
</button>
<button onClick={nextSelectedAlternative} type="button">
→
</button>{' '}
Ranking mechanism:{' '}
{selectedAlternative === undefined
? 'actual'
: `${
contextAlternatives[selectedAlternative]
.strategy
}: (${(selectedAlternative ?? -1) + 1} of ${
contextAlternatives.length
})`}
</div>
)}
<ul className="tw-list-none tw-flex tw-flex-col tw-gap-2 tw-pt-4">
{contextItemsToDisplay?.map((item, i) => (
<li
// biome-ignore lint/correctness/useJsxKeyInIterable:
// biome-ignore lint/suspicious/noArrayIndexKey: stable order
key={i}
data-testid="context-item"
>
<FileLink
uri={item.uri}
repoName={item.repoName}
revision={item.revision}
source={item.source}
range={item.range}
title={item.title}
isTooLarge={item.isTooLarge}
isTooLargeReason={item.isTooLargeReason}
isIgnored={item.isIgnored}
providerUri={
item.type === 'openctx'
? item.providerUri
: undefined
}
linkClassName={styles.contextItemLink}
className={clsx(
styles.linkContainer,
MENTION_CLASS_NAME
)}
/>
{internalDebugContext &&
item.metadata &&
item.metadata.length > 0 && (
<span className={styles.contextItemMetadata}>
{item.metadata.join(', ')}
</span>
)}
</li>
))}

{!isForFirstMessage && (
<span
<>
<AccordionContent className="tw-flex tw-flex-col" overflow={false}>
{internalDebugContext && contextAlternatives && (
<div>
<button onClick={prevSelectedAlternative} type="button">
←
</button>
<button onClick={nextSelectedAlternative} type="button">
→
</button>{' '}
Ranking mechanism:{' '}
{selectedAlternative === undefined
? 'actual'
: `${
contextAlternatives[selectedAlternative].strategy
}: (${(selectedAlternative ?? -1) + 1} of ${
contextAlternatives.length
})`}
</div>
)}
<ul className="tw-list-none tw-flex tw-flex-col tw-gap-2 tw-pt-4">
{contextItemsToDisplay?.map((item, i) => (
<li
// biome-ignore lint/correctness/useJsxKeyInIterable:
// biome-ignore lint/suspicious/noArrayIndexKey: stable order
key={i}
data-testid="context-item"
>
<FileLink
uri={item.uri}
repoName={item.repoName}
revision={item.revision}
source={item.source}
range={item.range}
title={item.title}
isTooLarge={item.isTooLarge}
isTooLargeReason={item.isTooLargeReason}
isIgnored={item.isIgnored}
providerUri={
item.type === 'openctx'
? item.providerUri
: undefined
}
linkClassName={styles.contextItemLink}
className={clsx(
styles.contextItem,
'tw-flex tw-items-center tw-gap-2'
styles.linkContainer,
MENTION_CLASS_NAME
)}
>
<MessagesSquareIcon size={14} className="tw-ml-1" />
<span>
Prior messages and context in this conversation
</span>
/>
{internalDebugContext &&
item.metadata &&
item.metadata.length > 0 && (
<span className={styles.contextItemMetadata}>
{item.metadata.join(', ')}
</span>
)}
</li>
))}

{!isForFirstMessage && (
<span
className={clsx(
styles.contextItem,
'tw-flex tw-items-center tw-gap-2'
)}
>
<MessagesSquareIcon size={14} className="tw-ml-1" />
<span>
Prior messages and context in this conversation
</span>
)}
{!isContextLoading && isAgenticChat && (
<li>
<Tooltip>
<TooltipTrigger asChild>
<span
className={clsx(
styles.contextItem,
'tw-flex tw-items-center tw-gap-2 tw-text-muted-foreground'
)}
>
<BrainIcon
size={14}
className="tw-ml-1"
/>
<span>
Selected from agentic context
</span>
</span>
</TooltipTrigger>
<TooltipContent side="bottom">
Fetches additional context to improve
response quality when needed
</TooltipContent>
</Tooltip>
</li>
)}
</ul>
</AccordionContent>
</>
)}
</span>
)}
{!isContextLoading && isAgenticChat && (
<li>
<Tooltip>
<TooltipTrigger asChild>
<span
className={clsx(
styles.contextItem,
'tw-flex tw-items-center tw-gap-2 tw-text-muted-foreground'
)}
>
<BrainIcon size={14} className="tw-ml-1" />
<span>Selected from agentic context</span>
</span>
</TooltipTrigger>
<TooltipContent side="bottom">
Fetches additional context to improve response
quality when needed
</TooltipContent>
</Tooltip>
</li>
)}
</ul>
</AccordionContent>
</>
</Cell>
</AccordionItem>
</Accordion>
Expand Down
Loading