clean up

Author: Kitenite

apps/web/client/src/app/project/[id]/_hooks/use-start-project.tsx

@@ -27,7 +27,7 @@ export const useStartProject = () => {
     const apiUtils = api.useUtils();
     const { data: user, isLoading: isUserLoading, error: userError } = api.user.get.useQuery();
     const { data: project, isLoading: isProjectLoading, error: projectError } = api.project.get.useQuery({ projectId: editorEngine.projectId });
-    const { data: branch, isLoading: isBranchLoading, error: branchError } = api.branch.get.useQuery({ projectId: editorEngine.projectId });
+    const { data: branch, isLoading: isBranchLoading, error: branchError } = api.branch.getByProjectId.useQuery({ projectId: editorEngine.projectId });
     const { data: canvasWithFrames, isLoading: isCanvasLoading, error: canvasError } = api.userCanvas.getWithFrames.useQuery({ projectId: editorEngine.projectId });
     const { data: conversations, isLoading: isConversationsLoading, error: conversationsError } = api.chat.conversation.getAll.useQuery({ projectId: editorEngine.projectId });
     const { data: creationRequest, isLoading: isCreationRequestLoading, error: creationRequestError } = api.project.createRequest.getPendingRequest.useQuery({ projectId: editorEngine.projectId });
@@ -45,6 +45,12 @@ export const useStartProject = () => {
         }
     }, [project]);
 
+    useEffect(() => {
+        if (branch) {
+            editorEngine.branches.switchToBranch(branch.id);
+        }
+    }, [branch]);
+
     const startSandbox = async (project: Project) => {
         try {
             await editorEngine.sandbox.session.start(project.sandbox.id);

apps/web/client/src/server/api/routers/project/branch.ts

@@ -12,16 +12,16 @@ export const branchRouter = createTRPCRouter({
             }),
         )
         .query(async ({ ctx, input }) => {
-            const dbBranch = await ctx.db.query.branches.findFirst({
+            const dbBranches = await ctx.db.query.branches.findMany({
                 where: eq(branches.projectId, input.projectId),
             });
-            if (!dbBranch) {
+            if (!dbBranches) {
                 throw new TRPCError({
                     code: 'NOT_FOUND',
                     message: 'Branch not found',
                 });
             }
-            return fromDbBranch(dbBranch);
+            return dbBranches.map(fromDbBranch);
         }),
     create: protectedProcedure
         .input(branchInsertSchema)

apps/web/client/src/server/api/routers/publish/helpers/publish.ts

@@ -23,7 +23,8 @@ export async function publish({ db, deployment }: { db: DrizzleDb; deployment: D
         const deploymentUrls = await getProjectUrls(db, projectId, type);
         const sandboxId = await getSandboxId(db, projectId);
 
-        const updateDeploymentResult1 = await updateDeployment(db, deploymentId, {
+        const updateDeploymentResult1 = await updateDeployment(db, {
+            id: deploymentId,
             status: DeploymentStatus.IN_PROGRESS,
             message: 'Creating build environment...',
             progress: 10,
@@ -42,7 +43,8 @@ export async function publish({ db, deployment }: { db: DrizzleDb; deployment: D
         );
 
         try {
-            const updateDeploymentResult2 = await updateDeployment(db, deploymentId, {
+            const updateDeploymentResult2 = await updateDeployment(db, {
+                id: deploymentId,
                 status: DeploymentStatus.IN_PROGRESS,
                 message: 'Creating optimized build...',
                 progress: 20,
@@ -60,10 +62,11 @@ export async function publish({ db, deployment }: { db: DrizzleDb; deployment: D
                 skipBadge: type === DeploymentType.CUSTOM,
                 buildScript: buildScript ?? DefaultSettings.COMMANDS.build,
                 buildFlags: buildFlags ?? DefaultSettings.EDITOR_SETTINGS.buildFlags,
-                updateDeployment: (deployment) => updateDeployment(db, deploymentId, deployment),
+                updateDeployment: (deployment) => updateDeployment(db, deployment),
             });
 
-            const updateDeploymentResult3 = await updateDeployment(db, deploymentId, {
+            const updateDeploymentResult3 = await updateDeployment(db, {
+                id: deploymentId,
                 status: DeploymentStatus.IN_PROGRESS,
                 message: 'Deploying build...',
                 progress: 80,
@@ -89,7 +92,8 @@ export async function publish({ db, deployment }: { db: DrizzleDb; deployment: D
         }
     } catch (error) {
         console.error(error);
-        await updateDeployment(db, deploymentId, {
+        await updateDeployment(db, {
+            id: deploymentId,
             status: DeploymentStatus.FAILED,
             error: error instanceof Error ? error.message : 'Unknown error',
             progress: 100,

apps/web/client/src/server/api/routers/publish/helpers/unpublish.ts

@@ -14,7 +14,8 @@ export const unpublish = async (db: DrizzleDb, deployment: Deployment, urls: str
             message: 'Deployment not found',
         });
     }
-    updateDeployment(db, deployment.id, {
+    updateDeployment(db, {
+        id: deployment.id,
         status: DeploymentStatus.IN_PROGRESS,
         message: 'Unpublishing project...',
         progress: 20,
@@ -27,13 +28,15 @@ export const unpublish = async (db: DrizzleDb, deployment: Deployment, urls: str
             envVars: {},
         });
 
-        updateDeployment(db, deployment.id, {
+        updateDeployment(db, {
+            id: deployment.id,
             status: DeploymentStatus.COMPLETED,
             message: 'Project unpublished!',
             progress: 100,
         });
     } catch (error) {
-        updateDeployment(db, deployment.id, {
+        updateDeployment(db, {
+            id: deployment.id,
             status: DeploymentStatus.FAILED,
             error: error instanceof Error ? error.message : 'Unknown error',
             progress: 100,