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

Add branch field to project create form

Author: ZIJ

src/components/CreateProjectForm.tsx

@@ -27,6 +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(),
     labels: z.array(z.string()),
     managedState: z.boolean().default(true),
     teamId: z.number().int().positive().nullable(),
@@ -83,6 +84,7 @@ export default function CreateProjectForm({ organizationId, repositories, teams,
                 repoId: data.repository,
                 managedState: data.managedState,
                 terraformWorkingDir: data.terraformDir,
+                branch: data.branch || '',
                 labels: data.labels,
                 is_drift_detection_enabled: data.is_drift_detection_enabled,
                 drift_crontab: data.drift_crontab || '',
@@ -308,8 +310,8 @@ export default function CreateProjectForm({ organizationId, repositories, teams,
                 >
                     <CardHeader>
                         <div className="flex flex-col">
-                            <CardTitle className="text-lg ">Terraform Configuration</CardTitle>
-                            <CardDescription className="text-sm text-muted-foreground">Specify the working directory for Terraform</CardDescription>
+                            <CardTitle className="text-lg ">Configuration</CardTitle>
+                            <CardDescription className="text-sm text-muted-foreground">Specify branch and working directory for Terraform</CardDescription>
                         </div>
                     </CardHeader>
                     <CardContent>
@@ -322,7 +324,7 @@ export default function CreateProjectForm({ organizationId, repositories, teams,
                                     <div className="relative">
                                         <Input
                                             id="terraformDir"
-                                            placeholder="Enter directory path"
+                                            placeholder="e.g. ./"
                                             className={`mt-1 ${errors.terraformDir ? 'border-destructive' : ''}`}
                                             {...field}
                                         />
@@ -335,6 +337,27 @@ export default function CreateProjectForm({ organizationId, repositories, teams,
                                     </div>
                                 )}
                             />
+                            <Label htmlFor="branch">Branch</Label>
+                            <Controller
+                                name="branch"
+                                control={control}
+                                render={({ field }) => (
+                                    <div className="relative">
+                                        <Input
+                                            id="branch"
+                                            placeholder="if not specified, main branch will be used"
+                                            className={`mt-1 ${errors.branch ? 'border-destructive' : ''}`}
+                                            {...field}
+                                        />
+                                        {errors.branch && (
+                                            <div className="flex items-center mt-1 text-destructive">
+                                                <AlertCircle className="h-4 w-4 mr-1" />
+                                                <span className="text-sm">{errors.branch.message}</span>
+                                            </div>
+                                        )}
+                                    </div>
+                                )}
+                            />
                         </div>
                     </CardContent>
                 </MotionCard>

src/data/user/projects.tsx

@@ -70,6 +70,7 @@ export const createProjectAction = async ({
   slug,
   repoId,
   terraformWorkingDir,
+  branch,
   managedState,
   labels,
   teamId,
@@ -81,6 +82,7 @@ export const createProjectAction = async ({
   slug: string;
   repoId: number;
   terraformWorkingDir: string;
+  branch: string;
   managedState: boolean;
   labels: string[];
   teamId: number | null;
@@ -98,6 +100,7 @@ export const createProjectAction = async ({
       team_id: teamId,
       repo_id: repoId,
       terraform_working_dir: terraformWorkingDir,
+      branch: branch,
       is_managing_state: managedState,
       is_in_main_branch: true,
       is_generated: true,
@@ -106,7 +109,6 @@ export const createProjectAction = async ({
       labels,
       is_drift_detection_enabled,
       drift_crontab,
-
     })
     .select("*")
     .single();

supabase/migrations/20240903161840_add_branch_to_project.sql

@@ -0,0 +1,2 @@
+ALTER TABLE public.projects
+ADD COLUMN IF NOT EXISTS branch TEXT;