fix: optional git status

Signed-off-by: Toma Puljak <[email protected]>
daytonaio · Dec 13, 2024 · ba751d3 · ba751d3
1 parent 934854b
commit ba751d3
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 26 deletions.
diff --git a/internal/util/apiclient/conversion/project.go b/internal/util/apiclient/conversion/project.go
@@ -69,7 +69,11 @@ func ToProject(projectDTO *apiclient.Project) *project.Project {
 	return project
 }
 
-func ToGitStatus(gitStatusDTO apiclient.GitStatus) *project.GitStatus {
+func ToGitStatus(gitStatusDTO *apiclient.GitStatus) *project.GitStatus {
+	if gitStatusDTO == nil {
+		return nil
+	}
+
 	files := []*project.FileStatus{}
 	for _, fileDTO := range gitStatusDTO.FileStatus {
 		staging := project.Status(string(fileDTO.Staging))

diff --git a/pkg/api/docs/docs.go b/pkg/api/docs/docs.go
@@ -4533,7 +4533,6 @@ const docTemplate = `{
         "ProjectState": {
             "type": "object",
             "required": [
-                "gitStatus",
                 "updatedAt",
                 "uptime"
             ],

diff --git a/pkg/api/docs/swagger.json b/pkg/api/docs/swagger.json
@@ -4530,7 +4530,6 @@
         "ProjectState": {
             "type": "object",
             "required": [
-                "gitStatus",
                 "updatedAt",
                 "uptime"
             ],

diff --git a/pkg/api/docs/swagger.yaml b/pkg/api/docs/swagger.yaml
@@ -895,7 +895,6 @@ definitions:
       uptime:
         type: integer
     required:
-    - gitStatus
     - updatedAt
     - uptime
     type: object

diff --git a/pkg/apiclient/api/openapi.yaml b/pkg/apiclient/api/openapi.yaml
@@ -3779,7 +3779,6 @@ components:
         uptime:
           type: integer
       required:
-      - gitStatus
       - updatedAt
       - uptime
       type: object

diff --git a/pkg/apiclient/docs/ProjectState.md b/pkg/apiclient/docs/ProjectState.md
@@ -4,15 +4,15 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**GitStatus** | [**GitStatus**](GitStatus.md) |  | 
+**GitStatus** | Pointer to [**GitStatus**](GitStatus.md) |  | [optional] 
 **UpdatedAt** | **string** |  | 
 **Uptime** | **int32** |  | 
 
 ## Methods
 
 ### NewProjectState
 
-`func NewProjectState(gitStatus GitStatus, updatedAt string, uptime int32, ) *ProjectState`
+`func NewProjectState(updatedAt string, uptime int32, ) *ProjectState`
 
 NewProjectState instantiates a new ProjectState object
 This constructor will assign default values to properties that have it defined,
@@ -46,6 +46,11 @@ and a boolean to check if the value has been set.
 
 SetGitStatus sets GitStatus field to given value.
 
+### HasGitStatus
+
+`func (o *ProjectState) HasGitStatus() bool`
+
+HasGitStatus returns a boolean if a field has been set.
 
 ### GetUpdatedAt
 

diff --git a/pkg/apiclient/model_project_state.go b/pkg/apiclient/model_project_state.go
diff --git a/pkg/views/workspace/info/view.go b/pkg/views/workspace/info/view.go
@@ -96,7 +96,7 @@ func getSingleProjectOutput(project *apiclient.Project, isCreationView bool) str
 
 	if project.State != nil {
 		output += getInfoLineState("State", project.State) + "\n"
-		output += getInfoLineGitStatus("Branch", &project.State.GitStatus) + "\n"
+		output += getInfoLineGitStatus("Branch", project.State.GitStatus) + "\n"
 	}
 
 	output += getInfoLinePrNumber(project.Repository.PrNumber, project.Repository, project.State)
@@ -120,7 +120,7 @@ func getProjectsOutputs(projects []apiclient.Project, isCreationView bool) strin
 		output += getInfoLine(fmt.Sprintf("Project #%d", i+1), project.Name)
 		output += getInfoLineState("State", project.State)
 		if project.State != nil {
-			output += getInfoLineGitStatus("Branch", &project.State.GitStatus)
+			output += getInfoLineGitStatus("Branch", project.State.GitStatus)
 		}
 		output += getInfoLinePrNumber(project.Repository.PrNumber, project.Repository, project.State)
 
@@ -159,6 +159,10 @@ func getInfoLineState(key string, state *apiclient.ProjectState) string {
 }
 
 func getInfoLineGitStatus(key string, status *apiclient.GitStatus) string {
+	if status == nil {
+		return ""
+	}
+
 	output := propertyNameStyle.Render(fmt.Sprintf("%-*s", propertyNameWidth, key))
 	output += propertyNameStyle.Foreground(views.Gray).Render(fmt.Sprintf("%-*s", propertyNameWidth, status.CurrentBranch))
 

diff --git a/pkg/workspace/project/project.go b/pkg/workspace/project/project.go
@@ -36,7 +36,7 @@ type ProjectInfo struct {
 type ProjectState struct {
 	UpdatedAt string     `json:"updatedAt" validate:"required"`
 	Uptime    uint64     `json:"uptime" validate:"required"`
-	GitStatus *GitStatus `json:"gitStatus" validate:"required"`
+	GitStatus *GitStatus `json:"gitStatus" validate:"optional"`
 } // @name ProjectState
 
 type GitStatus struct {