Skip to content

🤖 Review: Move Files Changed to top and remove prefix subtraction #382

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 1 commit into from
Oct 22, 2025
Merged

🤖 Review: Move Files Changed to top and remove prefix subtraction #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 3 additions & 36 deletions src/components/RightSidebar/CodeReview/FileTree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,15 +132,6 @@ const TreeHeader = styled.div`
gap: 8px;
`;

const CommonPrefix = styled.div`
padding: 6px 12px;
background: #1e1e1e;
border-bottom: 1px solid #3e3e42;
font-size: 11px;
color: #888;
font-family: var(--font-monospace);
`;

const EmptyState = styled.div`
padding: 20px;
color: #888;
Expand Down Expand Up @@ -194,7 +185,6 @@ const TreeNodeContent: React.FC<{
depth: number;
selectedPath: string | null;
onSelectFile: (path: string | null) => void;
commonPrefix: string | null;
getFileReadStatus?: (filePath: string) => { total: number; read: number } | null;
expandStateMap: Record<string, boolean>;
setExpandStateMap: (
Expand All @@ -205,7 +195,6 @@ const TreeNodeContent: React.FC<{
depth,
selectedPath,
onSelectFile,
commonPrefix,
getFileReadStatus,
expandStateMap,
setExpandStateMap,
Expand Down Expand Up @@ -317,7 +306,6 @@ const TreeNodeContent: React.FC<{
depth={depth + 1}
selectedPath={selectedPath}
onSelectFile={onSelectFile}
commonPrefix={commonPrefix}
getFileReadStatus={getFileReadStatus}
expandStateMap={expandStateMap}
setExpandStateMap={setExpandStateMap}
Expand All @@ -332,7 +320,6 @@ interface FileTreeExternalProps {
selectedPath: string | null;
onSelectFile: (path: string | null) => void;
isLoading?: boolean;
commonPrefix?: string | null;
getFileReadStatus?: (filePath: string) => { total: number; read: number } | null;
workspaceId: string;
}
Expand All @@ -342,7 +329,6 @@ export const FileTree: React.FC<FileTreeExternalProps> = ({
selectedPath,
onSelectFile,
isLoading = false,
commonPrefix = null,
getFileReadStatus,
workspaceId,
}) => {
Expand All @@ -353,42 +339,23 @@ export const FileTree: React.FC<FileTreeExternalProps> = ({
{ listener: true }
);

// Find the node at the common prefix path to start rendering from
const startNode = React.useMemo(() => {
if (!commonPrefix || !root) return root;

// Navigate to the node at the common prefix path
const parts = commonPrefix.split("/");
let current = root;

for (const part of parts) {
const child = current.children.find((c) => c.name === part);
if (!child) return root; // Fallback if path not found
current = child;
}

return current;
}, [root, commonPrefix]);

return (
<>
<TreeHeader>
<span>Files Changed</span>
{selectedPath && <ClearButton onClick={() => onSelectFile(null)}>Clear filter</ClearButton>}
</TreeHeader>
{commonPrefix && <CommonPrefix>{commonPrefix}/</CommonPrefix>}
<TreeContainer>
{isLoading && !startNode ? (
{isLoading && !root ? (
<EmptyState>Loading file tree...</EmptyState>
) : startNode ? (
startNode.children.map((child) => (
) : root ? (
root.children.map((child) => (
<TreeNodeContent
key={child.path}
node={child}
depth={0}
selectedPath={selectedPath}
onSelectFile={onSelectFile}
commonPrefix={commonPrefix}
getFileReadStatus={getFileReadStatus}
expandStateMap={expandStateMap}
setExpandStateMap={setExpandStateMap}
Expand Down
Loading