Merge pull request #30 from diggerhq/feat/branch-project

Add branch to project screen

Author: ZIJ

src/app/(dynamic-pages)/(authenticated-pages)/(application-pages)/project/[projectSlug]/(specific-project-pages)/layout.tsx

@@ -4,16 +4,16 @@ import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { getProjectTitleById, getSlimProjectBySlug } from "@/data/user/projects";
 import { isLocalEnvironment } from "@/lib/utils";
 import { projectSlugParamSchema } from "@/utils/zod-schemas/params";
-import { AlertCircleIcon } from "lucide-react";
+import { AlertCircleIcon, GitBranch } from "lucide-react";
 import { Suspense } from "react";
 
 
-async function ProjectPageHeading({ projectId }: { projectId: string }) {
+async function ProjectPageHeading({ projectId, branch }: { projectId: string, branch: string | null }) {
   const projectTitle = await getProjectTitleById(projectId);
   return (
     <PageHeading
       title={projectTitle}
-      subTitle="Manage your project here"
+      subTitle={<p className="flex items-center"><GitBranch /> {branch || 'main'}</p>}
     />
   );
 }
@@ -54,7 +54,7 @@ export default async function ProjectPagesLayout({ params, children }: { params:
       )}
 
       <Suspense>
-        <ProjectPageHeading projectId={project.id} />
+        <ProjectPageHeading projectId={project.id} branch={project.branch} />
       </Suspense>
       <Suspense>
         <TabsNavigationV2 tabs={tabs} />

src/components/CreateProjectForm.tsx

@@ -27,7 +27,7 @@ const createProjectFormSchema = z.object({
     name: z.string().min(1, "Project name is required"),
     repository: z.number().int().positive("Please select a repository"),
     terraformDir: z.string().min(1, "Terraform working directory is required"),
-    branch: z.string().optional(),
+    branch: z.string().min(1, "Branch is required").default("main"),
     labels: z.array(z.string()),
     managedState: z.boolean().default(true),
     teamId: z.number().int().positive().nullable(),

src/components/PageHeading/PageHeading.tsx

@@ -4,7 +4,7 @@ import Link from 'next/link';
 
 type PageHeadingProps = {
   title: string;
-  subTitle?: string;
+  subTitle?: React.ReactNode;
   actions?: React.ReactNode;
   titleHref?: string;
   titleClassName?: string;

src/data/user/projects.tsx

@@ -29,7 +29,7 @@ export const getSlimProjectBySlug = async (projectSlug: string) => {
   const supabaseClient = createSupabaseUserServerComponentClient();
   const { data, error } = await supabaseClient
     .from("projects")
-    .select("id, slug, name, organization_id")
+    .select("id, slug, name, organization_id, branch")
     .eq("slug", projectSlug)
     .single();
   if (error) {