Move the tabs store to the tabs router

apps/desktop/src/lib/trpc/routers/index.ts

@@ -3,6 +3,7 @@ import { router } from "..";
 import { createExternalRouter } from "./external";
 import { createNotificationsRouter } from "./notifications";
 import { createProjectsRouter } from "./projects";
+import { createTabsRouter } from "./tabs";
 import { createTerminalRouter } from "./terminal";
 import { createWindowRouter } from "./window";
 import { createWorkspacesRouter } from "./workspaces";
@@ -16,6 +17,7 @@ export const createAppRouter = (window: BrowserWindow) => {
 		window: createWindowRouter(window),
 		projects: createProjectsRouter(window),
 		workspaces: createWorkspacesRouter(),
+		tabs: createTabsRouter(),
 		terminal: createTerminalRouter(),
 		notifications: createNotificationsRouter(),
 		external: createExternalRouter(),

apps/desktop/src/lib/trpc/routers/notifications/index.ts

@@ -0,0 +1,2 @@
+export type { NotificationsRouter } from "./notifications";
+export { createNotificationsRouter } from "./notifications";

apps/desktop/src/lib/trpc/routers/notifications.ts → apps/desktop/src/lib/trpc/routers/notifications/notifications.ts

@@ -35,3 +35,5 @@ export const createNotificationsRouter = () => {
 		}),
 	});
 };
+
+export type NotificationsRouter = ReturnType<typeof createNotificationsRouter>;

apps/desktop/src/lib/trpc/routers/projects/projects.ts

@@ -8,6 +8,7 @@ import { z } from "zod";
 import { publicProcedure, router } from "../..";
 import { getGitRoot } from "../workspaces/utils/git";
 import { assignRandomColor } from "./utils/colors";
+import { getAllWithWorkspaces } from "./utils";
 
 export const createProjectsRouter = (window: BrowserWindow) => {
 	return router({
@@ -111,7 +112,13 @@ export const createProjectsRouter = (window: BrowserWindow) => {
 
 				return { success: true };
 			}),
+
+		getAllWithWorkspaces: publicProcedure.query(() => {
+			return getAllWithWorkspaces(db.data.projects, db.data.workspaces);
+		}),
 	});
 };
 
 export type ProjectsRouter = ReturnType<typeof createProjectsRouter>;
+
+export type ProjectWithWorkspaces = ReturnType<typeof getAllWithWorkspaces>[number];

apps/desktop/src/lib/trpc/routers/projects/utils/index.ts

@@ -0,0 +1 @@
+export * from "./utils";

apps/desktop/src/lib/trpc/routers/projects/utils/utils.ts

@@ -0,0 +1,24 @@
+import type { Project, Workspace } from "main/lib/db/schemas";
+
+/**
+ * Returns projects with their workspaces, ordered by project.tabOrder then workspace.tabOrder
+ */
+export function getAllWithWorkspaces(
+	allProjects: Project[],
+	allWorkspaces: Workspace[],
+) {
+	const activeProjects = allProjects
+		.filter((p) => p.tabOrder !== null)
+		.sort((a, b) => a.tabOrder! - b.tabOrder!);
+
+	return activeProjects.map((project) => {
+		const projectWorkspaces = allWorkspaces
+			.filter((w) => w.projectId === project.id)
+			.sort((a, b) => a.tabOrder - b.tabOrder);
+
+		return {
+			...project,
+			workspaces: projectWorkspaces,
+		};
+	});
+}

apps/desktop/src/lib/trpc/routers/tabs/index.ts

@@ -0,0 +1,2 @@
+export type { TabsRouter, Tab } from "./tabs";
+export { createTabsRouter } from "./tabs";