fix for chart version

Author: prakash100198

pkg/generateManifest/DeploymentTemplateService.go

@@ -335,7 +335,7 @@ func (impl DeploymentTemplateServiceImpl) fetchResolvedTemplateForPublishedEnvs(
 		impl.Logger.Errorw("error in getting overridden values", "err", err)
 		return nil, err
 	}
-	_, _, version, _, err := impl.chartRefService.GetRefChart(request.ChartRefId)
+	_, _, version, _, err := impl.chartRefService.GetRefChart(override.EnvironmentConfig.ChartRefId)
 	if err != nil {
 		impl.Logger.Errorw("error in getting chart ref by chartRefId ", "chartRefId", request.ChartRefId, "err", err)
 		return nil, err

pkg/pipeline/PropertiesConfig.go

@@ -129,6 +129,9 @@ func (impl PropertiesConfigServiceImpl) GetEnvironmentProperties(appId, environm
 			IsBasicViewLocked: envOverride.IsBasicViewLocked,
 			CurrentViewEditor: envOverride.CurrentViewEditor,
 		}
+		if chartRefId == 0 && envOverride.Chart != nil {
+			environmentProperties.ChartRefId = envOverride.Chart.ChartRefId
+		}
 
 		if environmentPropertiesResponse.Namespace == "" {
 			environmentPropertiesResponse.Namespace = envOverride.Namespace
@@ -140,8 +143,10 @@ func (impl PropertiesConfigServiceImpl) GetEnvironmentProperties(appId, environm
 	}
 	if errors.IsNotFound(err) {
 		environmentProperties.Id = 0
-		environmentProperties.ChartRefId = chartRefId
 		environmentProperties.IsOverride = false
+		if chartRefId > 0 {
+			environmentProperties.ChartRefId = chartRefId
+		}
 	} else {
 		environmentProperties.Id = ecOverride.Id
 		environmentProperties.Latest = ecOverride.Latest
@@ -153,6 +158,9 @@ func (impl PropertiesConfigServiceImpl) GetEnvironmentProperties(appId, environm
 		environmentProperties.Active = ecOverride.Active
 		environmentProperties.IsBasicViewLocked = ecOverride.IsBasicViewLocked
 		environmentProperties.CurrentViewEditor = ecOverride.CurrentViewEditor
+		if chartRefId == 0 && ecOverride.Chart != nil {
+			environmentProperties.ChartRefId = ecOverride.Chart.ChartRefId
+		}
 	}
 	environmentPropertiesResponse.ChartRefId = chartRefId
 	environmentPropertiesResponse.EnvironmentConfig = *environmentProperties