the branch name is now optional, but still always defaults to 'main' …

…for now
concrete-utopia · Jan 5, 2024 · 81a87f9 · 81a87f9
1 parent f3bb532
commit 81a87f9
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/editor/src/components/editor/persistence/generic/persistence-machine.ts b/editor/src/components/editor/persistence/generic/persistence-machine.ts
@@ -37,14 +37,14 @@ interface LoadFromGithubEvent {
   workers: UtopiaTsWorkers
   githubOwner: string
   githubRepo: string
-  githubBranch: string
+  githubBranch: string | null
 }
 
 export function loadFromGithubEvent(
   workers: UtopiaTsWorkers,
   githubOwner: string,
   githubRepo: string,
-  githubBranch: string,
+  githubBranch: string | null,
 ): LoadFromGithubEvent {
   return {
     type: 'LOAD_FROM_GITHUB',

diff --git a/editor/src/components/editor/persistence/generic/persistence-types.ts b/editor/src/components/editor/persistence/generic/persistence-types.ts
@@ -30,7 +30,7 @@ export interface PersistenceContext<ModelType> {
   githubRepo?: {
     owner: string
     repository: string
-    branch: string
+    branch: string | null
   }
   githubBranchContent?: BranchContent
 }

diff --git a/editor/src/components/editor/persistence/persistence.ts b/editor/src/components/editor/persistence/persistence.ts
@@ -205,7 +205,7 @@ export class PersistenceMachine {
     workers: UtopiaTsWorkers,
     githubOwner: string,
     githubRepo: string,
-    githubBranch: string,
+    githubBranch: string | null,
   ): void => {
     this.interpreter.send(loadFromGithubEvent(workers, githubOwner, githubRepo, githubBranch))
   }

diff --git a/editor/src/core/shared/github/operations/load-branch.ts b/editor/src/core/shared/github/operations/load-branch.ts
@@ -112,11 +112,19 @@ export const cloneProjectFromGithubLoadAssetsAndRefreshDependencies =
     workers: UtopiaTsWorkers,
     onUpdate: (update: UpdateGithubOperations | AddToast) => void,
     githubRepo: GithubRepo,
-    branchName: string,
+    branchName: string | null,
     resetBranches: boolean,
   ): Promise<LoadFromGithubResult> => {
+    const resolvedBranchName: string = await (async () => {
+      if (branchName != null) {
+        return branchName
+      }
+      // TODO load the default branch name from the server
+      return 'main'
+    })()
+
     const loadBranchResult = await loadBranchFromGithub(
-      branchName,
+      resolvedBranchName,
       githubRepo,
       onUpdate,
       operationContext,
@@ -127,7 +135,7 @@ export const cloneProjectFromGithubLoadAssetsAndRefreshDependencies =
     }
 
     const parseDownloadedProjectResult = await parseDownloadedProject(
-      branchName,
+      resolvedBranchName,
       githubRepo,
       onUpdate,
       loadBranchResult,

diff --git a/editor/src/templates/editor.tsx b/editor/src/templates/editor.tsx
@@ -370,7 +370,7 @@ export class Editor {
                 this.storedState.workers,
                 githubOwner,
                 githubRepo,
-                githubBranch ?? 'main',
+                githubBranch, // if omitted, figure out the default branch!
               )
             } else if (importURL != null) {
               this.createNewProjectFromImportURL(importURL)