Make branch tracking optional

Author: myftija

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings/route.tsx

@@ -186,8 +186,8 @@ const ConnectGitHubRepoFormSchema = z.object({
 
 const UpdateGitSettingsFormSchema = z.object({
   action: z.literal("update-git-settings"),
-  productionBranch: z.string().min(1, "Production branch is required"),
-  stagingBranch: z.string().min(1, "Staging branch is required"),
+  productionBranch: z.string().optional(),
+  stagingBranch: z.string().optional(),
   previewDeploymentsEnabled: z
     .string()
     .optional()
@@ -344,8 +344,8 @@ export const action: ActionFunction = async ({ request, params }) => {
           },
           data: {
             branchTracking: {
-              production: { branch: productionBranch },
-              staging: { branch: stagingBranch },
+              production: productionBranch ? { branch: productionBranch } : {},
+              staging: stagingBranch ? { branch: stagingBranch } : {},
             } satisfies BranchTrackingConfig,
             previewDeploymentsEnabled: previewDeploymentsEnabled,
           },

apps/webapp/app/v3/github.ts

@@ -2,10 +2,10 @@ import { z } from "zod";
 
 export const BranchTrackingConfigSchema = z.object({
   production: z.object({
-    branch: z.string(),
+    branch: z.string().optional(),
   }),
   staging: z.object({
-    branch: z.string(),
+    branch: z.string().optional(),
   }),
 });