cm cs handling for inheriting data type (#4189)

api/restHandler/CoreAppRestHandler.go

@@ -887,6 +887,10 @@ func (handler CoreAppRestHandlerImpl) buildAppConfigMaps(appId int, envId int, c
 
 			//set data
 			data := configMap.Data
+			if configMap.Data == nil {
+				//it means env cm is inheriting from base cm
+				data = configMap.DefaultData
+			}
 			var dataObj map[string]interface{}
 			if data != nil {
 				err := json.Unmarshal([]byte(data), &dataObj)
@@ -973,9 +977,6 @@ func (handler CoreAppRestHandlerImpl) buildAppEnvironmentSecrets(appId int, envI
 				handler.logger.Errorw("service err, CSEnvironmentFetchForEdit in GetAppAllDetail", "err", err, "appId", appId, "envId", envId)
 				return nil, err, http.StatusInternalServerError
 			}
-			if secretConfig.Data == nil {
-				secretDataWithData.ConfigData[0].Data = secretConfig.Data
-			}
 			secretDataWithData.ConfigData[0].DefaultData = secretConfig.DefaultData
 
 			secretRes, err, statusCode := handler.buildAppSecrets(appId, envId, secretDataWithData)