Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -257,15 +257,8 @@ const ChatSearchResultRow: React.FC<ChatSearchResultRowProps> = ({
className: statusClassName,
label: statusLabel,
prIcon,
diffStatus,
lineStats,
} = getChatDisplayConfig(chat);
const PRIcon = prIcon?.icon;
const additions = diffStatus?.additions ?? 0;
const deletions = diffStatus?.deletions ?? 0;
const changedFiles = diffStatus?.changed_files ?? 0;
const hasLineStats =
Boolean(diffStatus?.url) &&
(additions > 0 || deletions > 0 || changedFiles > 0);
const subtitle = chat.last_turn_summary?.trim() || "No summary available";

useEffect(() => {
Expand Down Expand Up @@ -298,18 +291,20 @@ const ChatSearchResultRow: React.FC<ChatSearchResultRowProps> = ({
{chat.title}
</div>
<div className="flex min-w-0 items-center gap-1.5 text-xs">
{PRIcon && prIcon && (
<PRIcon
{prIcon && (
<prIcon.icon
role="img"
aria-label={prIcon.label}
className={cn("size-3.5 shrink-0", prIcon.className)}
/>
)}
{hasLineStats && (
{lineStats && (
<span className="inline-flex shrink-0 items-center gap-0.5 tabular-nums">
<span className="text-git-added-bright">+{additions}</span>
<span className="text-git-added-bright">
+{lineStats.additions}
</span>
<span className="text-git-deleted-bright">
&minus;{deletions}
&minus;{lineStats.deletions}
</span>
</span>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,17 +139,8 @@ export const ChatTreeNode: React.FC<ChatTreeNodeProps> = ({
className: statusClassName,
label: statusLabel,
prIcon,
diffStatus,
lineStats,
} = getChatDisplayConfig(chat);
const PRIcon = prIcon?.icon;
const hasLinkedDiffStatus = Boolean(diffStatus?.url);
const changedFiles = diffStatus?.changed_files ?? 0;
const additions = diffStatus?.additions ?? 0;
const deletions = diffStatus?.deletions ?? 0;
const hasLineStats = additions > 0 || deletions > 0 || changedFiles > 0;
const filesChangedLabel = `${changedFiles} ${
changedFiles === 1 ? "file" : "files"
}`;
const workspaceId = chat.workspace_id;
const isArchivingThisChat = isArchiving && archivingChatId === chat.id;
const isExpanded = normalizedSearch ? true : (expandedById[chatID] ?? false);
Expand Down Expand Up @@ -266,23 +257,25 @@ export const ChatTreeNode: React.FC<ChatTreeNodeProps> = ({
)}
</div>
<div className="flex min-w-0 items-center gap-1.5">
{PRIcon && prIcon && (
<PRIcon
{prIcon && (
<prIcon.icon
role="img"
aria-label={prIcon.label}
className={cn("size-3.5 shrink-0", prIcon.className)}
/>
)}
{hasLinkedDiffStatus && hasLineStats && (
{lineStats && (
<span
className="inline-flex shrink-0 items-center gap-0.5 text-[13px] leading-4 tabular-nums"
title={`${filesChangedLabel}, +${additions} -${deletions}`}
title={`${lineStats.changedFiles} ${
lineStats.changedFiles === 1 ? "file" : "files"
}, +${lineStats.additions} -${lineStats.deletions}`}
>
<span className="text-git-added-bright">
+{additions}
+{lineStats.additions}
</span>
<span className="text-git-deleted-bright">
&minus;{deletions}
&minus;{lineStats.deletions}
</span>
</span>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,29 @@ const getPRIconConfig = (
};
};

const getChatDiffStatus = (chat: Chat): ChatDiffStatus | undefined => {
return chat.diff_status;
type ChatLineStats = {
additions: number;
deletions: number;
changedFiles: number;
};

const getLineStats = (
diffStatus: ChatDiffStatus | undefined,
): ChatLineStats | undefined => {
if (!diffStatus?.url) {
return undefined;
}
const { additions, deletions, changed_files: changedFiles } = diffStatus;
return additions > 0 || deletions > 0 || changedFiles > 0
? { additions, deletions, changedFiles }
: undefined;
};

/**
* Returns the icons and styling that represent a chat's current state.
*
* The status icon always reflects the chat status.
* The status icon always reflects the chat status. Line stats are only
* present when the diff is linked and at least one count is positive.
*/
export const getChatDisplayConfig = (
chat: Chat,
Expand All @@ -100,15 +115,14 @@ export const getChatDisplayConfig = (
className: string;
label: string;
prIcon: ChatIconConfig | undefined;
diffStatus: ChatDiffStatus | undefined;
lineStats: ChatLineStats | undefined;
} => {
const diffStatus = getChatDiffStatus(chat);
const config = getChatStatusDisplay(chat.status);
return {
icon: config.icon,
className: config.className,
label: config.label,
prIcon: getPRIconConfig(diffStatus),
diffStatus,
prIcon: getPRIconConfig(chat.diff_status),
lineStats: getLineStats(chat.diff_status),
};
};
Loading