oss etn change

Author: kartik-579

pkg/chart/ChartService.go

@@ -65,6 +65,7 @@ type ChartService interface {
 	CheckIfChartRefUserUploadedByAppId(id int) (bool, error)
 	PatchEnvOverrides(values json.RawMessage, oldChartType string, newChartType string) (json.RawMessage, error)
 
+	ChartRefAutocompleteGlobalData() (*chartRefBean.ChartRefAutocompleteResponse, error)
 	ChartRefAutocompleteForAppOrEnv(appId int, envId int) (*chartRefBean.ChartRefAutocompleteResponse, error)
 
 	ConfigureGitOpsRepoUrlForApp(appId int, repoUrl, chartLocation string, isCustomRepo bool, userId int32) (*bean2.DeploymentConfig, error)
@@ -814,22 +815,45 @@ func (impl *ChartServiceImpl) IsReadyToTrigger(appId int, envId int, pipelineId
 }
 
 func (impl *ChartServiceImpl) ChartRefAutocompleteForAppOrEnv(appId int, envId int) (*chartRefBean.ChartRefAutocompleteResponse, error) {
-	chartRefResponse := &chartRefBean.ChartRefAutocompleteResponse{}
-	var chartRefs []chartRefBean.ChartRefAutocompleteDto
+	chartRefResponse, err := impl.ChartRefAutocompleteGlobalData()
+	if err != nil {
+		impl.logger.Errorw("error, ChartRefAutocompleteGlobalData", "err", err)
+		return nil, err
+	}
+	chart, err := impl.chartRepository.FindLatestChartForAppByAppId(appId)
+	if err != nil && err != pg.ErrNoRows {
+		impl.logger.Errorw("error in fetching latest chart", "err", err)
+		return chartRefResponse, err
+	}
+	chartRefResponse.LatestAppChartRef = chart.ChartRefId
+	if envId > 0 {
+		envOverride, err := impl.envConfigOverrideReadService.FindLatestChartForAppByAppIdAndEnvId(appId, envId)
+		if err != nil && !errors.IsNotFound(err) {
+			impl.logger.Errorw("error in fetching latest chart", "err", err)
+			return chartRefResponse, err
+		}
+		if envOverride != nil && envOverride.Chart != nil {
+			chartRefResponse.LatestEnvChartRef = envOverride.Chart.ChartRefId
+		} else {
+			chartRefResponse.LatestEnvChartRef = chart.ChartRefId
+		}
+	}
+	return chartRefResponse, nil
+}
 
+func (impl *ChartServiceImpl) ChartRefAutocompleteGlobalData() (*chartRefBean.ChartRefAutocompleteResponse, error) {
 	results, err := impl.chartRefService.GetAll()
 	if err != nil {
 		impl.logger.Errorw("error in fetching chart ref", "err", err)
-		return chartRefResponse, err
+		return nil, err
 	}
-
 	resultsMetadataMap, err := impl.chartRefService.GetAllChartMetadata()
 	if err != nil {
 		impl.logger.Errorw("error in fetching chart metadata", "err", err)
-		return chartRefResponse, err
+		return nil, err
 	}
-	chartRefResponse.ChartsMetadata = resultsMetadataMap
-	var LatestAppChartRef int
+	var latestChartRef int
+	chartRefs := make([]chartRefBean.ChartRefAutocompleteDto, 0, len(results))
 	for _, result := range results {
 		chartRefs = append(chartRefs, chartRefBean.ChartRefAutocompleteDto{
 			Id:                    result.Id,
@@ -840,32 +864,14 @@ func (impl *ChartServiceImpl) ChartRefAutocompleteForAppOrEnv(appId int, envId i
 			IsAppMetricsSupported: result.IsAppMetricsSupported,
 		})
 		if result.Default == true {
-			LatestAppChartRef = result.Id
-		}
-	}
-
-	chart, err := impl.chartRepository.FindLatestChartForAppByAppId(appId)
-	if err != nil && err != pg.ErrNoRows {
-		impl.logger.Errorw("error in fetching latest chart", "err", err)
-		return chartRefResponse, err
-	}
-
-	if envId > 0 {
-		envOverride, err := impl.envConfigOverrideReadService.FindLatestChartForAppByAppIdAndEnvId(appId, envId)
-		if err != nil && !errors.IsNotFound(err) {
-			impl.logger.Errorw("error in fetching latest chart", "err", err)
-			return chartRefResponse, err
-		}
-		if envOverride != nil && envOverride.Chart != nil {
-			chartRefResponse.LatestEnvChartRef = envOverride.Chart.ChartRefId
-		} else {
-			chartRefResponse.LatestEnvChartRef = chart.ChartRefId
+			latestChartRef = result.Id
 		}
 	}
-	chartRefResponse.LatestAppChartRef = chart.ChartRefId
-	chartRefResponse.ChartRefs = chartRefs
-	chartRefResponse.LatestChartRef = LatestAppChartRef
-	return chartRefResponse, nil
+	return &chartRefBean.ChartRefAutocompleteResponse{
+		ChartsMetadata: resultsMetadataMap,
+		ChartRefs:      chartRefs,
+		LatestChartRef: latestChartRef,
+	}, nil
 }
 
 func (impl *ChartServiceImpl) FindPreviousChartByAppId(appId int) (chartTemplate *TemplateRequest, err error) {

pkg/config/configDiff/DeploymentConfigurationService.go

@@ -144,6 +144,12 @@ func (impl *DeploymentConfigurationServiceImpl) ConfigAutoComplete(appId int, en
 		impl.logger.Errorw("error in fetching CM and CS names at app or env level", "appId", appId, "envId", envId, "err", err)
 		return nil, err
 	}
+	combinedProperties := GetConfigAutoCompleteCombinedPropertiesDataWithoutDraft(cMCSNamesAppLevel, cMCSNamesEnvLevel, envId)
+	configDataResp := bean2.NewConfigDataResponse().WithResourceConfig(combinedProperties)
+	return configDataResp, nil
+}
+
+func GetConfigAutoCompleteCombinedPropertiesDataWithoutDraft(cMCSNamesAppLevel, cMCSNamesEnvLevel []bean.ConfigNameAndType, envId int) (combinedProperties []*bean2.ConfigProperty) {
 	cmcsKeyPropertyAppLevelMap, cmcsKeyPropertyEnvLevelMap := adaptor.GetCmCsAppAndEnvLevelMap(cMCSNamesAppLevel, cMCSNamesEnvLevel)
 	for key, configProperty := range cmcsKeyPropertyAppLevelMap {
 		if _, ok := cmcsKeyPropertyEnvLevelMap[key]; !ok {
@@ -161,11 +167,9 @@ func (impl *DeploymentConfigurationServiceImpl) ConfigAutoComplete(appId int, en
 			configProperty.ConfigStage = bean2.Env
 		}
 	}
-	combinedProperties := helper.GetCombinedPropertiesMap(cmcsKeyPropertyAppLevelMap, cmcsKeyPropertyEnvLevelMap)
+	combinedProperties = helper.GetCombinedPropertiesMap(cmcsKeyPropertyAppLevelMap, cmcsKeyPropertyEnvLevelMap)
 	combinedProperties = append(combinedProperties, adaptor.GetConfigProperty(0, "", bean.DeploymentTemplate, bean2.PublishedConfigState))
-
-	configDataResp := bean2.NewConfigDataResponse().WithResourceConfig(combinedProperties)
-	return configDataResp, nil
+	return combinedProperties
 }
 
 func (impl *DeploymentConfigurationServiceImpl) GetAllConfigData(ctx context.Context, configDataQueryParams *bean2.ConfigDataQueryParams, userHasAdminAccess bool) (*bean2.DeploymentAndCmCsConfigDto, error) {