Merge pull request #1494 from stakwork/feature/add-base-branch-to-codespace-form-1749478861

Add Base Branch parameter to Code Space Management form

Author: tomsmith8

src/people/widgetViews/workspace/ManageCodeSpaceModal.tsx

@@ -74,6 +74,7 @@ interface CodeSpaceMap {
   codeSpaceURL: string;
   userPubkey: string;
   githubPat?: string;
+  baseBranch?: string;
 }
 
 interface CodeSpaceProps {
@@ -92,6 +93,7 @@ const ManageCodeSpaceModal: React.FC<CodeSpaceProps> = ({
   const { main, ui } = useStores();
   const [codeSpace, setCodeSpace] = useState<CodeSpaceMap | null>(null);
   const [githubPat, setGithubPat] = useState('');
+  const [baseBranch, setBaseBranch] = useState('');
   const [urlError, setUrlError] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
@@ -120,6 +122,7 @@ const ManageCodeSpaceModal: React.FC<CodeSpaceProps> = ({
           // Check if response is valid and has an ID
           setCodeSpace(response);
           setGithubPat(response.githubPat || ''); // Initialize PAT state
+          setBaseBranch(response.baseBranch || ''); // Initialize Base Branch state
           setUrlError(!isValidUrl(response.codeSpaceURL)); // Also validate fetched URL
         } else {
           // Initialize state for creating a new code space
@@ -180,15 +183,20 @@ const ManageCodeSpaceModal: React.FC<CodeSpaceProps> = ({
     setGithubPat(e.target.value);
   };
 
+  const handleBaseBranchChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    setBaseBranch(e.target.value);
+  };
+
   const handleSave = async () => {
     if (!codeSpace || !isValidUrl(codeSpace.codeSpaceURL)) return;
 
     setIsLoading(true);
     try {
-      // Prepare the payload including the githubPat
+      // Prepare the payload including the githubPat and baseBranch
       const payload = {
         ...codeSpace,
         githubPat: githubPat, // Add the PAT from state
+        baseBranch: baseBranch, // Add the Base Branch from state
         workspaceID: workspaceUUID, // Ensure workspaceID is always set
         userPubkey: ui.meInfo?.pubkey || '' // Ensure userPubkey is always set
       };
@@ -202,11 +210,13 @@ const ManageCodeSpaceModal: React.FC<CodeSpaceProps> = ({
         // Remove id, createdAt, updatedAt before creating
         const createPayload: Omit<CodeSpaceMap, 'id' | 'createdAt' | 'updatedAt'> & {
           githubPat?: string;
+          baseBranch?: string;
         } = {
           workspaceID: workspaceUUID,
           codeSpaceURL: codeSpace.codeSpaceURL,
           userPubkey: ui.meInfo?.pubkey || '',
-          githubPat: githubPat
+          githubPat: githubPat,
+          baseBranch: baseBranch
         };
         const newCodeSpace = await main.createCodeSpace(createPayload);
         if (newCodeSpace) {
@@ -257,6 +267,15 @@ const ManageCodeSpaceModal: React.FC<CodeSpaceProps> = ({
             onChange={handlePatChange}
           />
         </Wrapper>
+        <Wrapper>
+          <Label>Base Branch:</Label>
+          <TextInput
+            type="text"
+            placeholder="Enter Base Branch (e.g., main, master)"
+            value={baseBranch}
+            onChange={handleBaseBranchChange}
+          />
+        </Wrapper>
         {urlError && (
           <p style={{ color: 'red', fontSize: '12px', marginLeft: '33%' }}>
             Invalid URL. Ensure it starts with https://

src/store/interface.ts

@@ -875,6 +875,7 @@ export interface CodeSpaceMap {
   codeSpaceURL: string;
   userPubkey: string;
   githubPat?: string;
+  baseBranch?: string;
 }
 
 export type ChargeModel = 'Free' | 'PAYG';

src/store/main.ts

@@ -5074,7 +5074,10 @@ export class MainStore {
   }
   // Update body type to allow githubPat
   async createCodeSpace(
-    body: Omit<CodeSpaceMap, 'id' | 'createdAt' | 'updatedAt'> & { githubPat?: string }
+    body: Omit<CodeSpaceMap, 'id' | 'createdAt' | 'updatedAt'> & {
+      githubPat?: string;
+      baseBranch?: string;
+    }
   ): Promise<any> {
     try {
       if (!uiStore.meInfo) return null;