From a4af79dadd871229cbc2af6069b5222e7672e0eb Mon Sep 17 00:00:00 2001 From: AviPeltz Date: Mon, 5 Jan 2026 13:55:46 -0800 Subject: [PATCH 1/6] feat(desktop): add workspaces list page and project context menu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add WorkspacesListView component with time-grouped workspaces - Make WorkspaceSidebarHeader clickable to navigate to workspaces list - Show both open and closed workspaces in the list - Allow opening closed worktrees from the list view - Add context menu to project headers with Close Project option - Add Open in Finder and Project Settings to project context menu 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 --- .../ProjectSection/ProjectHeader.tsx | 101 ++++- .../ProjectSection/ProjectSection.tsx | 1 + .../WorkspaceSidebarHeader.tsx | 16 +- .../WorkspacesListView/WorkspacesListView.tsx | 421 ++++++++++++++++++ .../components/WorkspacesListView/index.ts | 1 + .../src/renderer/screens/main/index.tsx | 4 + apps/desktop/src/renderer/stores/app-state.ts | 20 +- 7 files changed, 546 insertions(+), 18 deletions(-) create mode 100644 apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspacesListView.tsx create mode 100644 apps/desktop/src/renderer/screens/main/components/WorkspacesListView/index.ts diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectHeader.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectHeader.tsx index ec36067e449..7b00a495eb7 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectHeader.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectHeader.tsx @@ -1,6 +1,18 @@ +import { + ContextMenu, + ContextMenuContent, + ContextMenuItem, + ContextMenuSeparator, + ContextMenuTrigger, +} from "@superset/ui/context-menu"; +import { toast } from "@superset/ui/sonner"; import { cn } from "@superset/ui/utils"; +import { LuFolderOpen, LuSettings, LuX } from "react-icons/lu"; +import { trpc } from "renderer/lib/trpc"; +import { useOpenSettings } from "renderer/stores/app-state"; interface ProjectHeaderProps { + projectId: string; projectName: string; isCollapsed: boolean; onToggleCollapse: () => void; @@ -8,24 +20,87 @@ interface ProjectHeaderProps { } export function ProjectHeader({ + projectId, projectName, isCollapsed, onToggleCollapse, workspaceCount, }: ProjectHeaderProps) { + const utils = trpc.useUtils(); + const openSettings = useOpenSettings(); + + const closeProject = trpc.projects.close.useMutation({ + onSuccess: (data) => { + utils.workspaces.getAllGrouped.invalidate(); + utils.workspaces.getActive.invalidate(); + utils.projects.getRecents.invalidate(); + if (data.terminalWarning) { + toast.warning(data.terminalWarning); + } + }, + onError: (error) => { + toast.error(`Failed to close project: ${error.message}`); + }, + }); + + const openInFinder = trpc.external.openInFinder.useMutation({ + onError: (error) => toast.error(`Failed to open: ${error.message}`), + }); + + const { data: project } = trpc.projects.get.useQuery({ id: projectId }); + + const handleCloseProject = () => { + closeProject.mutate({ id: projectId }); + }; + + const handleOpenInFinder = () => { + if (project?.mainRepoPath) { + openInFinder.mutate(project.mainRepoPath); + } + }; + + const handleOpenSettings = () => { + openSettings("project"); + }; + return ( - + + + + + + + + Open in Finder + + + + Project Settings + + + + + {closeProject.isPending ? "Closing..." : "Close Project"} + + + ); } diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectSection.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectSection.tsx index fe109d9971e..711f9fb8f10 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectSection.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectSection.tsx @@ -67,6 +67,7 @@ export function ProjectSection({ return (
toggleProjectCollapsed(projectId)} diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader.tsx index b51c2ab9292..c167b7995a2 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader.tsx @@ -1,12 +1,20 @@ -import { LuLayers } from "react-icons/lu"; +import { LuChevronRight, LuLayers } from "react-icons/lu"; +import { useOpenWorkspacesList } from "renderer/stores/app-state"; export function WorkspaceSidebarHeader() { + const openWorkspacesList = useOpenWorkspacesList(); + return ( -
+
+ + ); } diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspacesListView.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspacesListView.tsx new file mode 100644 index 00000000000..f141f446f25 --- /dev/null +++ b/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspacesListView.tsx @@ -0,0 +1,421 @@ +import { Badge } from "@superset/ui/badge"; +import { Input } from "@superset/ui/input"; +import { cn } from "@superset/ui/utils"; +import { useMemo, useState } from "react"; +import { LuArrowRight, LuGitBranch, LuGitFork, LuSearch } from "react-icons/lu"; +import { trpc } from "renderer/lib/trpc"; +import { useSetActiveWorkspace } from "renderer/react-query/workspaces"; +import { useCloseWorkspacesList } from "renderer/stores/app-state"; + +const GITHUB_STATUS_STALE_TIME = 5 * 60 * 1000; // 5 minutes + +interface WorkspaceItem { + // Unique identifier - either workspace id or worktree id for closed ones + uniqueId: string; + // If open, this is the workspace id + workspaceId: string | null; + // For closed worktrees, this is the worktree id + worktreeId: string | null; + projectId: string; + projectName: string; + projectColor: string; + worktreePath: string; + type: "worktree" | "branch"; + branch: string; + name: string; + lastOpenedAt: number; + createdAt: number; + isUnread: boolean; + isOpen: boolean; +} + +interface TimeGroup { + label: string; + count: number; + workspaces: WorkspaceItem[]; +} + +function getTimeGroupLabel(timestamp: number): string { + const now = Date.now(); + const diff = now - timestamp; + const days = Math.floor(diff / (1000 * 60 * 60 * 24)); + + if (days === 0) return "Today"; + if (days === 1) return "Yesterday"; + if (days < 7) return `${days} days ago`; + if (days < 14) return "1 week ago"; + if (days < 21) return "2 weeks ago"; + if (days < 28) return "3 weeks ago"; + if (days < 60) return "1 month ago"; + if (days < 90) return "2 months ago"; + if (days < 180) return "3 months ago"; + if (days < 365) return "6 months ago"; + return "Over a year ago"; +} + +function getTimeSortKey(timestamp: number): number { + const now = Date.now(); + const diff = now - timestamp; + const days = Math.floor(diff / (1000 * 60 * 60 * 24)); + + if (days === 0) return 0; + if (days === 1) return 1; + if (days < 7) return days; + if (days < 14) return 7; + if (days < 21) return 14; + if (days < 28) return 21; + if (days < 60) return 30; + if (days < 90) return 60; + if (days < 180) return 90; + if (days < 365) return 180; + return 365; +} + +function formatDate(timestamp: number): string { + const date = new Date(timestamp); + return date.toLocaleDateString("en-US", { month: "short", day: "numeric" }); +} + +export function WorkspacesListView() { + const [searchQuery, setSearchQuery] = useState(""); + const utils = trpc.useUtils(); + + // Fetch all data + const { data: groups = [] } = trpc.workspaces.getAllGrouped.useQuery(); + const { data: allProjects = [] } = trpc.projects.getRecents.useQuery(); + const { data: activeWorkspace } = trpc.workspaces.getActive.useQuery(); + + // Fetch worktrees for all projects + const worktreeQueries = trpc.useQueries((t) => + allProjects.map((project) => + t.workspaces.getWorktreesByProject({ projectId: project.id }), + ), + ); + + const setActiveWorkspace = useSetActiveWorkspace(); + const openWorktree = trpc.workspaces.openWorktree.useMutation({ + onSuccess: () => { + utils.workspaces.getAllGrouped.invalidate(); + utils.workspaces.getActive.invalidate(); + closeWorkspacesList(); + }, + }); + const closeWorkspacesList = useCloseWorkspacesList(); + + // Combine open workspaces and closed worktrees into a single list + const allItems = useMemo(() => { + const items: WorkspaceItem[] = []; + const seenWorktreeIds = new Set(); + + // First, add all open workspaces from groups + for (const group of groups) { + for (const ws of group.workspaces) { + items.push({ + uniqueId: ws.id, + workspaceId: ws.id, + worktreeId: null, + projectId: ws.projectId, + projectName: group.project.name, + projectColor: group.project.color, + worktreePath: ws.worktreePath, + type: ws.type, + branch: ws.branch, + name: ws.name, + lastOpenedAt: ws.lastOpenedAt, + createdAt: ws.createdAt, + isUnread: ws.isUnread, + isOpen: true, + }); + } + } + + // Track which worktrees are already open + for (const query of worktreeQueries) { + if (query.data) { + for (const wt of query.data) { + if (wt.hasActiveWorkspace) { + seenWorktreeIds.add(wt.id); + } + } + } + } + + // Add closed worktrees (those without active workspaces) + for (let i = 0; i < allProjects.length; i++) { + const project = allProjects[i]; + const worktrees = worktreeQueries[i]?.data; + + if (!worktrees) continue; + + for (const wt of worktrees) { + // Skip if this worktree has an active workspace + if (wt.hasActiveWorkspace) continue; + + items.push({ + uniqueId: `wt-${wt.id}`, + workspaceId: null, + worktreeId: wt.id, + projectId: project.id, + projectName: project.name, + projectColor: project.color, + worktreePath: wt.path, + type: "worktree", + branch: wt.branch, + name: wt.branch, // Use branch name for closed worktrees + lastOpenedAt: wt.createdAt, // Use createdAt for closed worktrees + createdAt: wt.createdAt, + isUnread: false, + isOpen: false, + }); + } + } + + return items; + }, [groups, allProjects, worktreeQueries]); + + // Filter workspaces by search query + const filteredWorkspaces = useMemo(() => { + if (!searchQuery.trim()) return allItems; + const query = searchQuery.toLowerCase(); + return allItems.filter( + (ws) => + ws.name.toLowerCase().includes(query) || + ws.projectName.toLowerCase().includes(query) || + ws.branch.toLowerCase().includes(query), + ); + }, [allItems, searchQuery]); + + // Group workspaces by time period + const timeGroups = useMemo(() => { + const groupsMap = new Map(); + + for (const ws of filteredWorkspaces) { + const label = getTimeGroupLabel(ws.lastOpenedAt); + if (!groupsMap.has(label)) { + groupsMap.set(label, []); + } + groupsMap.get(label)?.push(ws); + } + + // Sort groups by time (most recent first) + const sortedGroups = Array.from(groupsMap.entries()) + .map(([label, workspaces]) => ({ + label, + count: workspaces.length, + workspaces: workspaces.sort((a, b) => b.lastOpenedAt - a.lastOpenedAt), + })) + .sort((a, b) => { + const aTime = a.workspaces[0]?.lastOpenedAt ?? 0; + const bTime = b.workspaces[0]?.lastOpenedAt ?? 0; + return getTimeSortKey(bTime) - getTimeSortKey(aTime); + }); + + return sortedGroups; + }, [filteredWorkspaces]); + + const handleItemClick = (item: WorkspaceItem) => { + if (item.isOpen && item.workspaceId) { + // Open workspace - just switch to it + setActiveWorkspace.mutate({ id: item.workspaceId }); + closeWorkspacesList(); + } else if (!item.isOpen && item.worktreeId) { + // Closed worktree - open it + openWorktree.mutate({ worktreeId: item.worktreeId }); + } + }; + + return ( +
+
+ {/* Search header */} +
+
+ + setSearchQuery(e.target.value)} + className="pl-9" + /> +
+
+ + {/* Workspaces list */} +
+ {timeGroups.map((group) => ( +
+ {/* Time group header */} +
+ + {group.label} + + + {group.count} + +
+ + {/* Workspaces in this group */} + {group.workspaces.map((ws) => ( + handleItemClick(ws)} + isOpening={ + openWorktree.isPending && + openWorktree.variables?.worktreeId === ws.worktreeId + } + /> + ))} +
+ ))} + + {filteredWorkspaces.length === 0 && ( +
+ {searchQuery + ? "No workspaces match your search" + : "No workspaces yet"} +
+ )} +
+
+
+ ); +} + +interface WorkspaceRowProps { + workspace: WorkspaceItem; + isActive: boolean; + onClick: () => void; + isOpening?: boolean; +} + +function WorkspaceRow({ + workspace, + isActive, + onClick, + isOpening, +}: WorkspaceRowProps) { + const isBranch = workspace.type === "branch"; + const [hasHovered, setHasHovered] = useState(false); + + // Lazy-load GitHub status on hover to avoid N+1 queries + const { data: githubStatus } = trpc.workspaces.getGitHubStatus.useQuery( + { workspaceId: workspace.workspaceId ?? "" }, + { + enabled: + hasHovered && workspace.type === "worktree" && !!workspace.workspaceId, + staleTime: GITHUB_STATUS_STALE_TIME, + }, + ); + + const pr = githubStatus?.pr; + const showDiffStats = pr && (pr.additions > 0 || pr.deletions > 0); + + return ( + + ); +} diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/index.ts b/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/index.ts new file mode 100644 index 00000000000..7d55b16cb61 --- /dev/null +++ b/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/index.ts @@ -0,0 +1 @@ +export { WorkspacesListView } from "./WorkspacesListView"; diff --git a/apps/desktop/src/renderer/screens/main/index.tsx b/apps/desktop/src/renderer/screens/main/index.tsx index e153796a46c..e339381a8ec 100644 --- a/apps/desktop/src/renderer/screens/main/index.tsx +++ b/apps/desktop/src/renderer/screens/main/index.tsx @@ -30,6 +30,7 @@ import { TasksView } from "./components/TasksView"; import { TopBar } from "./components/TopBar"; import { WorkspaceInitEffects } from "./components/WorkspaceInitEffects"; import { ResizableWorkspaceSidebar } from "./components/WorkspaceSidebar"; +import { WorkspacesListView } from "./components/WorkspacesListView"; import { WorkspaceView } from "./components/WorkspaceView"; function LoadingSpinner() { @@ -295,6 +296,9 @@ export function MainScreen() { if (currentView === "tasks" && hasTasksAccess) { return ; } + if (currentView === "workspaces-list") { + return ; + } return ; }; diff --git a/apps/desktop/src/renderer/stores/app-state.ts b/apps/desktop/src/renderer/stores/app-state.ts index 296752c34d8..ddc7b6f3aa6 100644 --- a/apps/desktop/src/renderer/stores/app-state.ts +++ b/apps/desktop/src/renderer/stores/app-state.ts @@ -1,7 +1,7 @@ import { create } from "zustand"; import { devtools } from "zustand/middleware"; -export type AppView = "workspace" | "settings" | "tasks"; +export type AppView = "workspace" | "settings" | "tasks" | "workspaces-list"; export type SettingsSection = | "account" | "project" @@ -16,6 +16,7 @@ interface AppState { currentView: AppView; isSettingsTabOpen: boolean; isTasksTabOpen: boolean; + isWorkspacesListOpen: boolean; settingsSection: SettingsSection; setView: (view: AppView) => void; openSettings: (section?: SettingsSection) => void; @@ -24,6 +25,8 @@ interface AppState { setSettingsSection: (section: SettingsSection) => void; openTasks: () => void; closeTasks: () => void; + openWorkspacesList: () => void; + closeWorkspacesList: () => void; } export const useAppStore = create()( @@ -32,6 +35,7 @@ export const useAppStore = create()( currentView: "workspace", isSettingsTabOpen: false, isTasksTabOpen: false, + isWorkspacesListOpen: false, settingsSection: "project", setView: (view) => { @@ -65,6 +69,14 @@ export const useAppStore = create()( closeTasks: () => { set({ currentView: "workspace", isTasksTabOpen: false }); }, + + openWorkspacesList: () => { + set({ currentView: "workspaces-list", isWorkspacesListOpen: true }); + }, + + closeWorkspacesList: () => { + set({ currentView: "workspace", isWorkspacesListOpen: false }); + }, }), { name: "AppStore" }, ), @@ -76,6 +88,8 @@ export const useIsSettingsTabOpen = () => useAppStore((state) => state.isSettingsTabOpen); export const useIsTasksTabOpen = () => useAppStore((state) => state.isTasksTabOpen); +export const useIsWorkspacesListOpen = () => + useAppStore((state) => state.isWorkspacesListOpen); export const useSettingsSection = () => useAppStore((state) => state.settingsSection); export const useSetSettingsSection = () => @@ -87,3 +101,7 @@ export const useCloseSettingsTab = () => useAppStore((state) => state.closeSettingsTab); export const useOpenTasks = () => useAppStore((state) => state.openTasks); export const useCloseTasks = () => useAppStore((state) => state.closeTasks); +export const useOpenWorkspacesList = () => + useAppStore((state) => state.openWorkspacesList); +export const useCloseWorkspacesList = () => + useAppStore((state) => state.closeWorkspacesList); From c774b902eb6739c54867a45c9796f00324ce78d9 Mon Sep 17 00:00:00 2001 From: AviPeltz Date: Mon, 5 Jan 2026 14:12:53 -0800 Subject: [PATCH 2/6] fix(desktop): close workspaces list when clicking sidebar item MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When viewing the workspaces list page, clicking a workspace in the sidebar now properly navigates to that workspace's terminal view. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 --- .../WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx index c7fb51da427..81340b17eaf 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx @@ -26,6 +26,7 @@ import { useWorkspaceDeleteHandler, } from "renderer/react-query/workspaces"; import { useWorkspaceRename } from "renderer/screens/main/hooks/useWorkspaceRename"; +import { useCloseWorkspacesList } from "renderer/stores/app-state"; import { useTabsStore } from "renderer/stores/tabs/store"; import { extractPaneIdsFromLayout } from "renderer/stores/tabs/utils"; import { @@ -72,6 +73,7 @@ export function WorkspaceListItem({ const isBranchWorkspace = type === "branch"; const setActiveWorkspace = useSetActiveWorkspace(); const reorderWorkspaces = useReorderWorkspaces(); + const closeWorkspacesList = useCloseWorkspacesList(); const [hasHovered, setHasHovered] = useState(false); const rename = useWorkspaceRename(id, name); const tabs = useTabsStore((s) => s.tabs); @@ -120,6 +122,8 @@ export function WorkspaceListItem({ if (!rename.isRenaming) { setActiveWorkspace.mutate({ id }); clearWorkspaceAttention(id); + // Close workspaces list view if open, to show the workspace's terminal view + closeWorkspacesList(); } }; From 7f312ad6a215efffda6accf71a735058f8e63e60 Mon Sep 17 00:00:00 2001 From: AviPeltz Date: Mon, 5 Jan 2026 14:36:13 -0800 Subject: [PATCH 3/6] workspace page and and close project on sidebar --- .../WorkspaceSidebarHeader.tsx | 8 +- .../WorkspacesListView/WorkspacesListView.tsx | 101 +++++++++--------- 2 files changed, 54 insertions(+), 55 deletions(-) diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx index 06b227370e6..4cb312a2512 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx @@ -10,15 +10,15 @@ export function WorkspaceSidebarHeader() {
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspacesListView.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspacesListView.tsx index f141f446f25..f3697adcbf5 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspacesListView.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspacesListView.tsx @@ -207,7 +207,8 @@ export function WorkspacesListView() { .sort((a, b) => { const aTime = a.workspaces[0]?.lastOpenedAt ?? 0; const bTime = b.workspaces[0]?.lastOpenedAt ?? 0; - return getTimeSortKey(bTime) - getTimeSortKey(aTime); + // Lower sort key = more recent, so ascending order puts recent first + return getTimeSortKey(aTime) - getTimeSortKey(bTime); }); return sortedGroups; @@ -225,60 +226,58 @@ export function WorkspacesListView() { }; return ( -
-
- {/* Search header */} -
-
- - setSearchQuery(e.target.value)} - className="pl-9" - /> -
+
+ {/* Search header */} +
+
+ + setSearchQuery(e.target.value)} + className="pl-9" + />
+
- {/* Workspaces list */} -
- {timeGroups.map((group) => ( -
- {/* Time group header */} -
- - {group.label} - - - {group.count} - -
- - {/* Workspaces in this group */} - {group.workspaces.map((ws) => ( - handleItemClick(ws)} - isOpening={ - openWorktree.isPending && - openWorktree.variables?.worktreeId === ws.worktreeId - } - /> - ))} + {/* Workspaces list */} +
+ {timeGroups.map((group) => ( +
+ {/* Time group header */} +
+ + {group.label} + + + {group.count} +
- ))} - {filteredWorkspaces.length === 0 && ( -
- {searchQuery - ? "No workspaces match your search" - : "No workspaces yet"} -
- )} -
+ {/* Workspaces in this group */} + {group.workspaces.map((ws) => ( + handleItemClick(ws)} + isOpening={ + openWorktree.isPending && + openWorktree.variables?.worktreeId === ws.worktreeId + } + /> + ))} +
+ ))} + + {filteredWorkspaces.length === 0 && ( +
+ {searchQuery + ? "No workspaces match your search" + : "No workspaces yet"} +
+ )}
); From 272bd38c17193a42d8bd21fdc8f65c37d2d2dc1f Mon Sep 17 00:00:00 2001 From: AviPeltz Date: Mon, 5 Jan 2026 15:05:11 -0800 Subject: [PATCH 4/6] workpaces search and much more --- .../WorkspaceSidebarHeader.tsx | 31 ++++++++-- .../WorkspacesListView/WorkspacesListView.tsx | 61 ++++++++++++------- 2 files changed, 64 insertions(+), 28 deletions(-) diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx index 4cb312a2512..a4fb37433b4 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx @@ -1,16 +1,38 @@ -import { LuChevronRight, LuLayers } from "react-icons/lu"; -import { useOpenWorkspacesList } from "renderer/stores/app-state"; +import { cn } from "@superset/ui/utils"; +import { LuLayers } from "react-icons/lu"; +import { + useCloseWorkspacesList, + useCurrentView, + useOpenWorkspacesList, +} from "renderer/stores/app-state"; import { NewWorkspaceButton } from "./NewWorkspaceButton"; export function WorkspaceSidebarHeader() { + const currentView = useCurrentView(); const openWorkspacesList = useOpenWorkspacesList(); + const closeWorkspacesList = useCloseWorkspacesList(); + + const isWorkspacesListOpen = currentView === "workspaces-list"; + + const handleClick = () => { + if (isWorkspacesListOpen) { + closeWorkspacesList(); + } else { + openWorkspacesList(); + } + }; return (
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspacesListView.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspacesListView.tsx index f3697adcbf5..e58b0f9df4b 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspacesListView.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspacesListView.tsx @@ -1,8 +1,15 @@ import { Badge } from "@superset/ui/badge"; +import { Button } from "@superset/ui/button"; import { Input } from "@superset/ui/input"; import { cn } from "@superset/ui/utils"; import { useMemo, useState } from "react"; -import { LuArrowRight, LuGitBranch, LuGitFork, LuSearch } from "react-icons/lu"; +import { + LuArrowRight, + LuGitBranch, + LuGitFork, + LuSearch, + LuX, +} from "react-icons/lu"; import { trpc } from "renderer/lib/trpc"; import { useSetActiveWorkspace } from "renderer/react-query/workspaces"; import { useCloseWorkspacesList } from "renderer/stores/app-state"; @@ -226,19 +233,27 @@ export function WorkspacesListView() { }; return ( -
- {/* Search header */} -
-
- +
+ {/* Header with search */} +
+
+ setSearchQuery(e.target.value)} - className="pl-9" + className="pl-9 bg-background/50" />
+
{/* Workspaces list */} @@ -246,11 +261,11 @@ export function WorkspacesListView() { {timeGroups.map((group) => (
{/* Time group header */} -
- +
+ {group.label} - + {group.count}
@@ -272,7 +287,7 @@ export function WorkspacesListView() { ))} {filteredWorkspaces.length === 0 && ( -
+
{searchQuery ? "No workspaces match your search" : "No workspaces yet"} @@ -320,9 +335,9 @@ function WorkspaceRow({ onMouseEnter={() => !hasHovered && setHasHovered(true)} className={cn( "flex items-center gap-3 w-full px-4 py-2.5 text-left", - "hover:bg-muted/50 transition-colors group", - isActive && "bg-muted", - !workspace.isOpen && "opacity-60", + "hover:bg-background/50 transition-colors group", + isActive && "bg-background/70", + !workspace.isOpen && "opacity-50", isOpening && "opacity-50 cursor-wait", )} > @@ -332,37 +347,37 @@ function WorkspaceRow({
{isBranch ? ( ) : ( - + )}
{/* Open/Closed indicator dot */}
{/* Project name */} - + {workspace.projectName} {/* Chevron separator */} - {">"} + {">"} {/* Workspace/branch name */} {workspace.name} @@ -395,12 +410,12 @@ function WorkspaceRow({ )} {/* Date */} - + {formatDate(workspace.lastOpenedAt)} {/* Action button - visible on hover */} -
+
{isOpening ? ( Opening... ) : workspace.isOpen ? ( From 1a1c51c89ecc0a237416e9995fd235388d2ce752 Mon Sep 17 00:00:00 2001 From: AviPeltz Date: Mon, 5 Jan 2026 16:42:28 -0800 Subject: [PATCH 5/6] make the page less confusing --- .../lib/trpc/routers/workspaces/workspaces.ts | 2 + .../ProjectSection/ProjectHeader.tsx | 8 +- .../ProjectSection/ProjectSection.tsx | 3 + .../WorkspaceSidebar/WorkspaceSidebar.tsx | 1 + .../WorkspaceSidebarHeader.tsx | 4 +- .../WorkspaceRow/WorkspaceRow.tsx | 144 +++++++ .../WorkspacesListView/WorkspaceRow/index.ts | 1 + .../WorkspacesListView/WorkspacesListView.tsx | 407 ++++++------------ .../components/WorkspacesListView/types.ts | 26 ++ .../components/WorkspacesListView/utils.ts | 31 ++ apps/desktop/src/renderer/stores/app-state.ts | 2 - 11 files changed, 339 insertions(+), 290 deletions(-) create mode 100644 apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspaceRow/WorkspaceRow.tsx create mode 100644 apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspaceRow/index.ts create mode 100644 apps/desktop/src/renderer/screens/main/components/WorkspacesListView/types.ts create mode 100644 apps/desktop/src/renderer/screens/main/components/WorkspacesListView/utils.ts diff --git a/apps/desktop/src/lib/trpc/routers/workspaces/workspaces.ts b/apps/desktop/src/lib/trpc/routers/workspaces/workspaces.ts index 278072e61cd..5afb68f0fa8 100644 --- a/apps/desktop/src/lib/trpc/routers/workspaces/workspaces.ts +++ b/apps/desktop/src/lib/trpc/routers/workspaces/workspaces.ts @@ -826,6 +826,7 @@ export const createWorkspacesRouter = () => { name: string; color: string; tabOrder: number; + mainRepoPath: string; }; workspaces: Array<{ id: string; @@ -852,6 +853,7 @@ export const createWorkspacesRouter = () => { color: project.color, // biome-ignore lint/style/noNonNullAssertion: filter guarantees tabOrder is not null tabOrder: project.tabOrder!, + mainRepoPath: project.mainRepoPath, }, workspaces: [], }); diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectHeader.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectHeader.tsx index 7b00a495eb7..64bfb467109 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectHeader.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectHeader.tsx @@ -14,6 +14,7 @@ import { useOpenSettings } from "renderer/stores/app-state"; interface ProjectHeaderProps { projectId: string; projectName: string; + mainRepoPath: string; isCollapsed: boolean; onToggleCollapse: () => void; workspaceCount: number; @@ -22,6 +23,7 @@ interface ProjectHeaderProps { export function ProjectHeader({ projectId, projectName, + mainRepoPath, isCollapsed, onToggleCollapse, workspaceCount, @@ -47,16 +49,12 @@ export function ProjectHeader({ onError: (error) => toast.error(`Failed to open: ${error.message}`), }); - const { data: project } = trpc.projects.get.useQuery({ id: projectId }); - const handleCloseProject = () => { closeProject.mutate({ id: projectId }); }; const handleOpenInFinder = () => { - if (project?.mainRepoPath) { - openInFinder.mutate(project.mainRepoPath); - } + openInFinder.mutate(mainRepoPath); }; const handleOpenSettings = () => { diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectSection.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectSection.tsx index 711f9fb8f10..a0e4152f94f 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectSection.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectSection.tsx @@ -28,6 +28,7 @@ interface Workspace { interface ProjectSectionProps { projectId: string; projectName: string; + mainRepoPath: string; workspaces: Workspace[]; activeWorkspaceId: string | null; /** Base index for keyboard shortcuts (0-based) */ @@ -37,6 +38,7 @@ interface ProjectSectionProps { export function ProjectSection({ projectId, projectName, + mainRepoPath, workspaces, activeWorkspaceId, shortcutBaseIndex, @@ -69,6 +71,7 @@ export function ProjectSection({ toggleProjectCollapsed(projectId)} workspaceCount={workspaces.length} diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebar.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebar.tsx index 805144283ce..4ffc0650a78 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebar.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebar.tsx @@ -31,6 +31,7 @@ export function WorkspaceSidebar() { key={group.project.id} projectId={group.project.id} projectName={group.project.name} + mainRepoPath={group.project.mainRepoPath} workspaces={group.workspaces} activeWorkspaceId={activeWorkspaceId} shortcutBaseIndex={projectShortcutIndices[index]} diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx index a4fb37433b4..9103919cf38 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx @@ -37,9 +37,7 @@ export function WorkspaceSidebarHeader() {
- - Workspaces - + Workspaces
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspaceRow/WorkspaceRow.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspaceRow/WorkspaceRow.tsx new file mode 100644 index 00000000000..928f7769a06 --- /dev/null +++ b/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspaceRow/WorkspaceRow.tsx @@ -0,0 +1,144 @@ +import { cn } from "@superset/ui/utils"; +import { useState } from "react"; +import { + LuArrowRight, + LuGitBranch, + LuGitFork, + LuRotateCw, +} from "react-icons/lu"; +import { trpc } from "renderer/lib/trpc"; +import type { WorkspaceItem } from "../types"; +import { getRelativeTime } from "../utils"; + +const GITHUB_STATUS_STALE_TIME = 5 * 60 * 1000; // 5 minutes + +interface WorkspaceRowProps { + workspace: WorkspaceItem; + isActive: boolean; + onSwitch: () => void; + onReopen: () => void; + isOpening?: boolean; +} + +export function WorkspaceRow({ + workspace, + isActive, + onSwitch, + onReopen, + isOpening, +}: WorkspaceRowProps) { + const isBranch = workspace.type === "branch"; + const [hasHovered, setHasHovered] = useState(false); + + // Lazy-load GitHub status on hover to avoid N+1 queries + const { data: githubStatus } = trpc.workspaces.getGitHubStatus.useQuery( + { workspaceId: workspace.workspaceId ?? "" }, + { + enabled: + hasHovered && workspace.type === "worktree" && !!workspace.workspaceId, + staleTime: GITHUB_STATUS_STALE_TIME, + }, + ); + + const pr = githubStatus?.pr; + const showDiffStats = pr && (pr.additions > 0 || pr.deletions > 0); + + const timeText = workspace.isOpen + ? `Opened ${getRelativeTime(workspace.lastOpenedAt)}` + : `Created ${getRelativeTime(workspace.createdAt)}`; + + const handleClick = () => { + if (workspace.isOpen) { + onSwitch(); + } else { + onReopen(); + } + }; + + return ( + + ); +} diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspaceRow/index.ts b/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspaceRow/index.ts new file mode 100644 index 00000000000..0a45a4a8467 --- /dev/null +++ b/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspaceRow/index.ts @@ -0,0 +1 @@ +export * from "./WorkspaceRow"; diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspacesListView.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspacesListView.tsx index e58b0f9df4b..8a3d50a2cbb 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspacesListView.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspacesListView.tsx @@ -1,90 +1,24 @@ -import { Badge } from "@superset/ui/badge"; import { Button } from "@superset/ui/button"; import { Input } from "@superset/ui/input"; +import { toast } from "@superset/ui/sonner"; import { cn } from "@superset/ui/utils"; import { useMemo, useState } from "react"; -import { - LuArrowRight, - LuGitBranch, - LuGitFork, - LuSearch, - LuX, -} from "react-icons/lu"; +import { LuSearch, LuX } from "react-icons/lu"; import { trpc } from "renderer/lib/trpc"; import { useSetActiveWorkspace } from "renderer/react-query/workspaces"; import { useCloseWorkspacesList } from "renderer/stores/app-state"; +import type { FilterMode, ProjectGroup, WorkspaceItem } from "./types"; +import { WorkspaceRow } from "./WorkspaceRow"; -const GITHUB_STATUS_STALE_TIME = 5 * 60 * 1000; // 5 minutes - -interface WorkspaceItem { - // Unique identifier - either workspace id or worktree id for closed ones - uniqueId: string; - // If open, this is the workspace id - workspaceId: string | null; - // For closed worktrees, this is the worktree id - worktreeId: string | null; - projectId: string; - projectName: string; - projectColor: string; - worktreePath: string; - type: "worktree" | "branch"; - branch: string; - name: string; - lastOpenedAt: number; - createdAt: number; - isUnread: boolean; - isOpen: boolean; -} - -interface TimeGroup { - label: string; - count: number; - workspaces: WorkspaceItem[]; -} - -function getTimeGroupLabel(timestamp: number): string { - const now = Date.now(); - const diff = now - timestamp; - const days = Math.floor(diff / (1000 * 60 * 60 * 24)); - - if (days === 0) return "Today"; - if (days === 1) return "Yesterday"; - if (days < 7) return `${days} days ago`; - if (days < 14) return "1 week ago"; - if (days < 21) return "2 weeks ago"; - if (days < 28) return "3 weeks ago"; - if (days < 60) return "1 month ago"; - if (days < 90) return "2 months ago"; - if (days < 180) return "3 months ago"; - if (days < 365) return "6 months ago"; - return "Over a year ago"; -} - -function getTimeSortKey(timestamp: number): number { - const now = Date.now(); - const diff = now - timestamp; - const days = Math.floor(diff / (1000 * 60 * 60 * 24)); - - if (days === 0) return 0; - if (days === 1) return 1; - if (days < 7) return days; - if (days < 14) return 7; - if (days < 21) return 14; - if (days < 28) return 21; - if (days < 60) return 30; - if (days < 90) return 60; - if (days < 180) return 90; - if (days < 365) return 180; - return 365; -} - -function formatDate(timestamp: number): string { - const date = new Date(timestamp); - return date.toLocaleDateString("en-US", { month: "short", day: "numeric" }); -} +const FILTER_OPTIONS: { value: FilterMode; label: string }[] = [ + { value: "all", label: "All" }, + { value: "active", label: "Active" }, + { value: "closed", label: "Closed" }, +]; export function WorkspacesListView() { const [searchQuery, setSearchQuery] = useState(""); + const [filterMode, setFilterMode] = useState("all"); const utils = trpc.useUtils(); // Fetch all data @@ -100,19 +34,22 @@ export function WorkspacesListView() { ); const setActiveWorkspace = useSetActiveWorkspace(); + const closeWorkspacesList = useCloseWorkspacesList(); + const openWorktree = trpc.workspaces.openWorktree.useMutation({ onSuccess: () => { utils.workspaces.getAllGrouped.invalidate(); utils.workspaces.getActive.invalidate(); closeWorkspacesList(); }, + onError: (error) => { + toast.error(`Failed to open workspace: ${error.message}`); + }, }); - const closeWorkspacesList = useCloseWorkspacesList(); // Combine open workspaces and closed worktrees into a single list const allItems = useMemo(() => { const items: WorkspaceItem[] = []; - const seenWorktreeIds = new Set(); // First, add all open workspaces from groups for (const group of groups) { @@ -123,7 +60,6 @@ export function WorkspacesListView() { worktreeId: null, projectId: ws.projectId, projectName: group.project.name, - projectColor: group.project.color, worktreePath: ws.worktreePath, type: ws.type, branch: ws.branch, @@ -136,17 +72,6 @@ export function WorkspacesListView() { } } - // Track which worktrees are already open - for (const query of worktreeQueries) { - if (query.data) { - for (const wt of query.data) { - if (wt.hasActiveWorkspace) { - seenWorktreeIds.add(wt.id); - } - } - } - } - // Add closed worktrees (those without active workspaces) for (let i = 0; i < allProjects.length; i++) { const project = allProjects[i]; @@ -164,12 +89,11 @@ export function WorkspacesListView() { worktreeId: wt.id, projectId: project.id, projectName: project.name, - projectColor: project.color, worktreePath: wt.path, type: "worktree", branch: wt.branch, - name: wt.branch, // Use branch name for closed worktrees - lastOpenedAt: wt.createdAt, // Use createdAt for closed worktrees + name: wt.branch, + lastOpenedAt: wt.createdAt, createdAt: wt.createdAt, isUnread: false, isOpen: false, @@ -180,72 +104,126 @@ export function WorkspacesListView() { return items; }, [groups, allProjects, worktreeQueries]); - // Filter workspaces by search query - const filteredWorkspaces = useMemo(() => { - if (!searchQuery.trim()) return allItems; - const query = searchQuery.toLowerCase(); - return allItems.filter( - (ws) => - ws.name.toLowerCase().includes(query) || - ws.projectName.toLowerCase().includes(query) || - ws.branch.toLowerCase().includes(query), - ); - }, [allItems, searchQuery]); + // Filter by search query and filter mode + const filteredItems = useMemo(() => { + let items = allItems; - // Group workspaces by time period - const timeGroups = useMemo(() => { - const groupsMap = new Map(); + // Apply filter mode + if (filterMode === "active") { + items = items.filter((ws) => ws.isOpen); + } else if (filterMode === "closed") { + items = items.filter((ws) => !ws.isOpen); + } + + // Apply search filter + if (searchQuery.trim()) { + const query = searchQuery.toLowerCase(); + items = items.filter( + (ws) => + ws.name.toLowerCase().includes(query) || + ws.projectName.toLowerCase().includes(query) || + ws.branch.toLowerCase().includes(query), + ); + } - for (const ws of filteredWorkspaces) { - const label = getTimeGroupLabel(ws.lastOpenedAt); - if (!groupsMap.has(label)) { - groupsMap.set(label, []); + return items; + }, [allItems, searchQuery, filterMode]); + + // Group by project + const projectGroups = useMemo(() => { + const groupsMap = new Map(); + + for (const item of filteredItems) { + if (!groupsMap.has(item.projectId)) { + groupsMap.set(item.projectId, { + projectId: item.projectId, + projectName: item.projectName, + workspaces: [], + }); } - groupsMap.get(label)?.push(ws); + groupsMap.get(item.projectId)?.workspaces.push(item); } - // Sort groups by time (most recent first) - const sortedGroups = Array.from(groupsMap.entries()) - .map(([label, workspaces]) => ({ - label, - count: workspaces.length, - workspaces: workspaces.sort((a, b) => b.lastOpenedAt - a.lastOpenedAt), - })) - .sort((a, b) => { - const aTime = a.workspaces[0]?.lastOpenedAt ?? 0; - const bTime = b.workspaces[0]?.lastOpenedAt ?? 0; - // Lower sort key = more recent, so ascending order puts recent first - return getTimeSortKey(aTime) - getTimeSortKey(bTime); + // Sort workspaces within each group: active first, then by lastOpenedAt + for (const group of groupsMap.values()) { + group.workspaces.sort((a, b) => { + // Active workspaces first + if (a.isOpen !== b.isOpen) return a.isOpen ? -1 : 1; + // Then by most recently opened/created + return b.lastOpenedAt - a.lastOpenedAt; }); + } - return sortedGroups; - }, [filteredWorkspaces]); + // Sort groups by most recent activity + return Array.from(groupsMap.values()).sort((a, b) => { + const aRecent = Math.max(...a.workspaces.map((w) => w.lastOpenedAt)); + const bRecent = Math.max(...b.workspaces.map((w) => w.lastOpenedAt)); + return bRecent - aRecent; + }); + }, [filteredItems]); - const handleItemClick = (item: WorkspaceItem) => { - if (item.isOpen && item.workspaceId) { - // Open workspace - just switch to it + const handleSwitch = (item: WorkspaceItem) => { + if (item.workspaceId) { setActiveWorkspace.mutate({ id: item.workspaceId }); closeWorkspacesList(); - } else if (!item.isOpen && item.worktreeId) { - // Closed worktree - open it + } + }; + + const handleReopen = (item: WorkspaceItem) => { + if (item.worktreeId) { openWorktree.mutate({ worktreeId: item.worktreeId }); } }; + // Count stats for filter badges + const activeCount = allItems.filter((w) => w.isOpen).length; + const closedCount = allItems.filter((w) => !w.isOpen).length; + return (
- {/* Header with search */} + {/* Header */}
+ {/* Filter toggle */} +
+ {FILTER_OPTIONS.map((option) => { + const count = + option.value === "all" + ? allItems.length + : option.value === "active" + ? activeCount + : closedCount; + return ( + + ); + })} +
+ + {/* Search */}
setSearchQuery(e.target.value)} - className="pl-9 bg-background/50" + className="pl-9 h-8 bg-background/50" />
+ + {/* Close button */}
- {/* Workspaces list */} + {/* Workspaces list grouped by project */}
- {timeGroups.map((group) => ( -
- {/* Time group header */} + {projectGroups.map((group) => ( +
+ {/* Project header */}
- {group.label} + {group.projectName} - {group.count} + {group.workspaces.length}
- {/* Workspaces in this group */} + {/* Workspaces in this project */} {group.workspaces.map((ws) => ( handleItemClick(ws)} + onSwitch={() => handleSwitch(ws)} + onReopen={() => handleReopen(ws)} isOpening={ openWorktree.isPending && openWorktree.variables?.worktreeId === ws.worktreeId @@ -286,150 +265,18 @@ export function WorkspacesListView() {
))} - {filteredWorkspaces.length === 0 && ( + {filteredItems.length === 0 && (
{searchQuery ? "No workspaces match your search" - : "No workspaces yet"} + : filterMode === "active" + ? "No active workspaces" + : filterMode === "closed" + ? "No closed workspaces" + : "No workspaces yet"}
)}
); } - -interface WorkspaceRowProps { - workspace: WorkspaceItem; - isActive: boolean; - onClick: () => void; - isOpening?: boolean; -} - -function WorkspaceRow({ - workspace, - isActive, - onClick, - isOpening, -}: WorkspaceRowProps) { - const isBranch = workspace.type === "branch"; - const [hasHovered, setHasHovered] = useState(false); - - // Lazy-load GitHub status on hover to avoid N+1 queries - const { data: githubStatus } = trpc.workspaces.getGitHubStatus.useQuery( - { workspaceId: workspace.workspaceId ?? "" }, - { - enabled: - hasHovered && workspace.type === "worktree" && !!workspace.workspaceId, - staleTime: GITHUB_STATUS_STALE_TIME, - }, - ); - - const pr = githubStatus?.pr; - const showDiffStats = pr && (pr.additions > 0 || pr.deletions > 0); - - return ( - - ); -} diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/types.ts b/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/types.ts new file mode 100644 index 00000000000..587000def29 --- /dev/null +++ b/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/types.ts @@ -0,0 +1,26 @@ +export interface WorkspaceItem { + // Unique identifier - either workspace id or worktree id for closed ones + uniqueId: string; + // If open, this is the workspace id + workspaceId: string | null; + // For closed worktrees, this is the worktree id + worktreeId: string | null; + projectId: string; + projectName: string; + worktreePath: string; + type: "worktree" | "branch"; + branch: string; + name: string; + lastOpenedAt: number; + createdAt: number; + isUnread: boolean; + isOpen: boolean; +} + +export interface ProjectGroup { + projectId: string; + projectName: string; + workspaces: WorkspaceItem[]; +} + +export type FilterMode = "all" | "active" | "closed"; diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/utils.ts b/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/utils.ts new file mode 100644 index 00000000000..f48a59cd59f --- /dev/null +++ b/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/utils.ts @@ -0,0 +1,31 @@ +/** + * Returns a human-readable relative time string + * e.g., "2 hours ago", "yesterday", "3 days ago" + */ +export function getRelativeTime(timestamp: number): string { + const now = Date.now(); + const diff = now - timestamp; + + const minutes = Math.floor(diff / (1000 * 60)); + const hours = Math.floor(diff / (1000 * 60 * 60)); + const days = Math.floor(diff / (1000 * 60 * 60 * 24)); + + if (minutes < 1) return "just now"; + if (minutes < 60) return `${minutes}m ago`; + if (hours < 24) return `${hours}h ago`; + if (days === 1) return "yesterday"; + if (days < 7) return `${days} days ago`; + if (days < 14) return "1 week ago"; + if (days < 30) return `${Math.floor(days / 7)} weeks ago`; + if (days < 60) return "1 month ago"; + if (days < 365) return `${Math.floor(days / 30)} months ago`; + return "over a year ago"; +} + +/** + * Format timestamp as short date (e.g., "Mar 15") + */ +export function formatDate(timestamp: number): string { + const date = new Date(timestamp); + return date.toLocaleDateString("en-US", { month: "short", day: "numeric" }); +} diff --git a/apps/desktop/src/renderer/stores/app-state.ts b/apps/desktop/src/renderer/stores/app-state.ts index ddc7b6f3aa6..ba6ffcd1cc9 100644 --- a/apps/desktop/src/renderer/stores/app-state.ts +++ b/apps/desktop/src/renderer/stores/app-state.ts @@ -88,8 +88,6 @@ export const useIsSettingsTabOpen = () => useAppStore((state) => state.isSettingsTabOpen); export const useIsTasksTabOpen = () => useAppStore((state) => state.isTasksTabOpen); -export const useIsWorkspacesListOpen = () => - useAppStore((state) => state.isWorkspacesListOpen); export const useSettingsSection = () => useAppStore((state) => state.settingsSection); export const useSetSettingsSection = () => From ccdfedea90f6a2ad8eef9239a2335f89d759f281 Mon Sep 17 00:00:00 2001 From: AviPeltz Date: Mon, 5 Jan 2026 16:58:04 -0800 Subject: [PATCH 6/6] baller ass shiat --- .../WorkspaceRow/WorkspaceRow.tsx | 15 +++--- .../components/WorkspacesListView/utils.ts | 47 ++++++++++++------- 2 files changed, 38 insertions(+), 24 deletions(-) diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspaceRow/WorkspaceRow.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspaceRow/WorkspaceRow.tsx index 928f7769a06..8f06de0e4f7 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspaceRow/WorkspaceRow.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspaceRow/WorkspaceRow.tsx @@ -124,18 +124,21 @@ export function WorkspaceRow({ {/* Action indicator - visible on hover */} -
+
{isOpening ? ( <> - - Opening... + + Opening... ) : workspace.isOpen ? ( - + <> + Switch to + + ) : ( <> - Reopen - + Reopen + )}
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/utils.ts b/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/utils.ts index f48a59cd59f..1640b168863 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/utils.ts +++ b/apps/desktop/src/renderer/screens/main/components/WorkspacesListView/utils.ts @@ -1,3 +1,20 @@ +// Time unit constants (in milliseconds) +const MS_PER_SECOND = 1000; +const MS_PER_MINUTE = MS_PER_SECOND * 60; +const MS_PER_HOUR = MS_PER_MINUTE * 60; +const MS_PER_DAY = MS_PER_HOUR * 24; + +// Time threshold constants (in their respective units) +const MINUTES_PER_HOUR = 60; +const HOURS_PER_DAY = 24; +const DAYS_PER_WEEK = 7; +const DAYS_PER_MONTH = 30; +const DAYS_PER_YEAR = 365; + +// Relative time display thresholds (in days) +const TWO_WEEKS_DAYS = 14; +const TWO_MONTHS_DAYS = 60; + /** * Returns a human-readable relative time string * e.g., "2 hours ago", "yesterday", "3 days ago" @@ -6,26 +23,20 @@ export function getRelativeTime(timestamp: number): string { const now = Date.now(); const diff = now - timestamp; - const minutes = Math.floor(diff / (1000 * 60)); - const hours = Math.floor(diff / (1000 * 60 * 60)); - const days = Math.floor(diff / (1000 * 60 * 60 * 24)); + const minutes = Math.floor(diff / MS_PER_MINUTE); + const hours = Math.floor(diff / MS_PER_HOUR); + const days = Math.floor(diff / MS_PER_DAY); if (minutes < 1) return "just now"; - if (minutes < 60) return `${minutes}m ago`; - if (hours < 24) return `${hours}h ago`; + if (minutes < MINUTES_PER_HOUR) return `${minutes}m ago`; + if (hours < HOURS_PER_DAY) return `${hours}h ago`; if (days === 1) return "yesterday"; - if (days < 7) return `${days} days ago`; - if (days < 14) return "1 week ago"; - if (days < 30) return `${Math.floor(days / 7)} weeks ago`; - if (days < 60) return "1 month ago"; - if (days < 365) return `${Math.floor(days / 30)} months ago`; + if (days < DAYS_PER_WEEK) return `${days} days ago`; + if (days < TWO_WEEKS_DAYS) return "1 week ago"; + if (days < DAYS_PER_MONTH) + return `${Math.floor(days / DAYS_PER_WEEK)} weeks ago`; + if (days < TWO_MONTHS_DAYS) return "1 month ago"; + if (days < DAYS_PER_YEAR) + return `${Math.floor(days / DAYS_PER_MONTH)} months ago`; return "over a year ago"; } - -/** - * Format timestamp as short date (e.g., "Mar 15") - */ -export function formatDate(timestamp: number): string { - const date = new Date(timestamp); - return date.toLocaleDateString("en-US", { month: "short", day: "numeric" }); -}