Skip to content

🤖 refactor: move New Workspace to + icon on project row #929

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

Open
ammar-agent wants to merge 1 commit into
base: main
Choose a base branch
from
Open

🤖 refactor: move New Workspace to + icon on project row #929

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
1 change: 0 additions & 1 deletion docs/system-prompt.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,4 @@ You are in a git worktree at ${workspacePath}
}
```


{/* END SYSTEM_PROMPT_DOCS */}
38 changes: 22 additions & 16 deletions src/browser/components/ProjectSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,13 +471,13 @@ const ProjectSidebarInner: React.FC<ProjectSidebarProps> = ({
>
{!collapsed && (
<>
<div className="border-dark flex items-center justify-between border-b p-4">
<h2 className="text-foreground text-md m-0 font-semibold">Agents</h2>
<div className="border-dark flex items-center justify-between border-b py-2 pr-3 pl-4">
<h2 className="text-foreground text-md m-0 font-semibold">Projects</h2>
<TooltipWrapper inline>
<button
onClick={onAddProject}
aria-label="Add project"
className="text-foreground hover:bg-hover hover:border-border-light flex h-6 w-6 cursor-pointer items-center justify-center rounded border border-transparent bg-transparent p-0 text-lg transition-all duration-200"
className="text-muted-dark hover:text-foreground hover:bg-hover flex h-5 w-5 shrink-0 cursor-pointer items-center justify-center rounded-[3px] border-none bg-transparent text-lg transition-all duration-200"
>
+
</button>
Expand Down Expand Up @@ -565,7 +565,7 @@ const ProjectSidebarInner: React.FC<ProjectSidebarProps> = ({
}}
aria-label={`Manage secrets for ${projectName}`}
data-project-path={projectPath}
className="text-muted-dark mr-1 flex h-5 w-5 shrink-0 cursor-pointer items-center justify-center rounded-[3px] border-none bg-transparent text-sm opacity-0 transition-all duration-200 hover:bg-yellow-500/10 hover:text-yellow-500"
className="text-muted-dark flex h-5 w-5 shrink-0 cursor-pointer items-center justify-center rounded-[3px] border-none bg-transparent text-sm opacity-0 transition-all duration-200 hover:bg-yellow-500/10 hover:text-yellow-500"
>
<KeyRound size={12} />
</button>
Expand All @@ -590,6 +590,24 @@ const ProjectSidebarInner: React.FC<ProjectSidebarProps> = ({
Remove project
</Tooltip>
</TooltipWrapper>
<TooltipWrapper inline>
<button
onClick={(event) => {
event.stopPropagation();
handleAddWorkspace(projectPath);
}}
aria-label={`Add workspace to ${projectName}`}
data-project-path={projectPath}
className="text-muted-dark hover:text-foreground hover:bg-hover flex h-4 w-4 shrink-0 cursor-pointer items-center justify-center rounded-[3px] border-none bg-transparent text-base transition-all duration-200"
>
+
</button>
<Tooltip className="tooltip" align="right">
New Workspace
{selectedWorkspace?.projectPath === projectPath &&
` (${formatKeybind(KEYBINDS.NEW_WORKSPACE)})`}
</Tooltip>
</TooltipWrapper>
</DraggableProjectItem>

{isExpanded && (
Expand All @@ -598,18 +616,6 @@ const ProjectSidebarInner: React.FC<ProjectSidebarProps> = ({
role="region"
aria-label={`Workspaces for ${projectName}`}
>
<div className="border-hover border-b px-3 py-2">
<button
onClick={() => handleAddWorkspace(projectPath)}
data-project-path={projectPath}
aria-label={`Add workspace to ${projectName}`}
className="text-muted border-border-medium hover:bg-hover hover:border-border-darker hover:text-foreground w-full cursor-pointer rounded border border-dashed bg-transparent px-3 py-1.5 text-left text-[13px] transition-all duration-200"
>
+ New Workspace
{selectedWorkspace?.projectPath === projectPath &&
` (${formatKeybind(KEYBINDS.NEW_WORKSPACE)})`}
</button>
</div>
{(() => {
const allWorkspaces =
sortedWorkspacesByProject.get(projectPath) ?? [];
Expand Down
8 changes: 8 additions & 0 deletions src/browser/stories/App.sidebar.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ export const SingleProject: AppStory = {
createWorkspace({ id: "ws-3", name: "bugfix/memory-leak", projectName: "my-app" }),
];

expandProjects(["/home/user/projects/my-app"]);
return createMockORPCClient({
projects: groupWorkspacesByProject(workspaces),
workspaces,
Expand Down Expand Up @@ -99,6 +100,11 @@ export const MultipleProjects: AppStory = {
createWorkspace({ id: "ws-6", name: "main", projectName: "mobile" }),
];

expandProjects([
"/home/user/projects/frontend",
"/home/user/projects/backend",
"/home/user/projects/mobile",
]);
return createMockORPCClient({
projects: groupWorkspacesByProject(workspaces),
workspaces,
Expand Down Expand Up @@ -132,6 +138,7 @@ export const ManyWorkspaces: AppStory = {
createWorkspace({ id: `ws-${i}`, name, projectName: "big-app" })
);

expandProjects(["/home/user/projects/big-app"]);
return createMockORPCClient({
projects: groupWorkspacesByProject(workspaces),
workspaces,
Expand Down Expand Up @@ -195,6 +202,7 @@ export const GitStatusVariations: AppStory = {
["ws-ssh", { ahead: 1 }],
]);

expandProjects(["/home/user/projects/my-app"]);
return createMockORPCClient({
projects: groupWorkspacesByProject(workspaces),
workspaces,
Expand Down