fix: deployment template editor view support in create app api (#2697)

* fix for deployment template editor view in create app api

* removed validate tag for bool type

* updated spec

Author: kartik-579

api/appbean/AppDetail.go

@@ -1,6 +1,7 @@
 package appbean
 
 import (
+	"github.com/devtron-labs/devtron/internal/sql/models"
 	"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
 	"github.com/devtron-labs/devtron/pkg/pipeline/bean"
 )
@@ -58,10 +59,12 @@ type DockerBuildConfig struct {
 }
 
 type DeploymentTemplate struct {
-	ChartRefId     int                    `json:"chartRefId,notnull" validate:"required"`
-	Template       map[string]interface{} `json:"template,notnull" validate:"required"`
-	ShowAppMetrics bool                   `json:"showAppMetrics"`
-	IsOverride     bool                   `json:"isOverride"`
+	ChartRefId        int                         `json:"chartRefId,notnull" validate:"required"`
+	Template          map[string]interface{}      `json:"template,notnull" validate:"required"`
+	ShowAppMetrics    bool                        `json:"showAppMetrics"`
+	IsOverride        bool                        `json:"isOverride"`
+	IsBasicViewLocked bool                        `json:"isBasicViewLocked"`
+	CurrentViewEditor models.ChartsViewEditorType `json:"currentViewEditor" validate:"required"`
 }
 
 type AppWorkflow struct {

api/restHandler/CoreAppRestHandler.go

@@ -555,6 +555,8 @@ func (handler CoreAppRestHandlerImpl) buildAppEnvironmentDeploymentTemplate(appI
 	var deploymentTemplateRaw json.RawMessage
 	var chartRefId int
 	var isOverride bool
+	var isBasicViewLocked bool
+	var currentViewEditor models.ChartsViewEditorType
 	if envId > 0 {
 		//on env level
 		env, err := handler.propertiesConfigService.GetEnvironmentProperties(appId, envId, chartRefData.LatestEnvChartRef)
@@ -567,15 +569,21 @@ func (handler CoreAppRestHandlerImpl) buildAppEnvironmentDeploymentTemplate(appI
 			deploymentTemplateRaw = env.EnvironmentConfig.EnvOverrideValues
 			showAppMetrics = *env.AppMetrics
 			isOverride = true
+			isBasicViewLocked = env.EnvironmentConfig.IsBasicViewLocked
+			currentViewEditor = env.EnvironmentConfig.CurrentViewEditor
 		} else {
 			showAppMetrics = appDeploymentTemplate.IsAppMetricsEnabled
 			deploymentTemplateRaw = appDeploymentTemplate.DefaultAppOverride
+			isBasicViewLocked = appDeploymentTemplate.IsBasicViewLocked
+			currentViewEditor = appDeploymentTemplate.CurrentViewEditor
 		}
 	} else {
 		//on app level
 		showAppMetrics = appDeploymentTemplate.IsAppMetricsEnabled
 		deploymentTemplateRaw = appDeploymentTemplate.DefaultAppOverride
 		chartRefId = chartRefData.LatestAppChartRef
+		isBasicViewLocked = appDeploymentTemplate.IsBasicViewLocked
+		currentViewEditor = appDeploymentTemplate.CurrentViewEditor
 	}
 
 	var deploymentTemplateObj map[string]interface{}
@@ -588,10 +596,12 @@ func (handler CoreAppRestHandlerImpl) buildAppEnvironmentDeploymentTemplate(appI
 	}
 
 	deploymentTemplateResp := &appBean.DeploymentTemplate{
-		ChartRefId:     chartRefId,
-		Template:       deploymentTemplateObj,
-		ShowAppMetrics: showAppMetrics,
-		IsOverride:     isOverride,
+		ChartRefId:        chartRefId,
+		Template:          deploymentTemplateObj,
+		ShowAppMetrics:    showAppMetrics,
+		IsOverride:        isOverride,
+		IsBasicViewLocked: isBasicViewLocked,
+		CurrentViewEditor: currentViewEditor,
 	}
 
 	return deploymentTemplateResp, nil, http.StatusOK
@@ -1294,6 +1304,8 @@ func (handler CoreAppRestHandlerImpl) createDeploymentTemplate(ctx context.Conte
 		ChartRefId:          deploymentTemplate.ChartRefId,
 		IsAppMetricsEnabled: deploymentTemplate.ShowAppMetrics,
 		UserId:              userId,
+		IsBasicViewLocked:   deploymentTemplate.IsBasicViewLocked,
+		CurrentViewEditor:   deploymentTemplate.CurrentViewEditor,
 	}
 
 	//marshalling template
@@ -1733,6 +1745,8 @@ func (handler CoreAppRestHandlerImpl) createEnvDeploymentTemplate(appId int, use
 		Namespace:         env.Namespace,
 		Status:            models.CHARTSTATUS_NEW,
 		EnvOverrideValues: template,
+		IsBasicViewLocked: deploymentTemplateOverride.IsBasicViewLocked,
+		CurrentViewEditor: deploymentTemplateOverride.CurrentViewEditor,
 	}
 	_, err = handler.propertiesConfigService.UpdateEnvironmentProperties(appId, envConfigProperties, userId)
 	if err != nil {

pkg/chart/ChartService.go

@@ -76,7 +76,7 @@ type TemplateRequest struct {
 	Schema                  json.RawMessage             `json:"schema"`
 	Readme                  string                      `json:"readme"`
 	IsBasicViewLocked       bool                        `json:"isBasicViewLocked"`
-	CurrentViewEditor       models.ChartsViewEditorType `json:"currentViewEditor"`
+	CurrentViewEditor       models.ChartsViewEditorType `json:"currentViewEditor" validate:"required"`
 	UserId                  int32                       `json:"-"`
 }
 

pkg/pipeline/PropertiesConfig.go

@@ -54,7 +54,7 @@ type EnvironmentProperties struct {
 	ChartRefId        int                         `json:"chartRefId,omitempty"  validate:"number"`
 	IsOverride        bool                        `sql:"isOverride"`
 	IsBasicViewLocked bool                        `json:"isBasicViewLocked"`
-	CurrentViewEditor models.ChartsViewEditorType `json:"currentViewEditor"`
+	CurrentViewEditor models.ChartsViewEditorType `json:"currentViewEditor" validate:"required"`
 }
 
 type EnvironmentPropertiesResponse struct {

specs/app_create_api.yaml

@@ -461,6 +461,13 @@ components:
                 type: object
                 description: interface{}
             description: map of template fields and values
+        isBasicViewLocked:
+          type: boolean
+        currentViewEditor:
+          type: string
+          enum:
+            - "BASIC"
+            - "ADVANCED"
     AppWorkflow:
       type: object
       properties: