Merge branch 'main' into env-gen-change

kartik-579 · web-flow · commit 942951141515 · 2025-01-21T19:50:33.000+05:30
diff --git a/api/restHandler/app/appList/AppListingRestHandler.go b/api/restHandler/app/appList/AppListingRestHandler.go
@@ -493,7 +493,7 @@ func (handler AppListingRestHandlerImpl) FetchAppDetailsV2(w http.ResponseWriter
 		return
 	}
 
-	err = handler.updateApprovalConfigDataInAppDetailResp(appDetail, appId, envId)
+	appDetail, err = handler.updateApprovalConfigDataInAppDetailResp(appDetail, appId, envId)
 	if err != nil {
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 		return
diff --git a/api/restHandler/app/appList/AppListingRestHandler_ent.go b/api/restHandler/app/appList/AppListingRestHandler_ent.go
@@ -14,6 +14,6 @@ func (handler AppListingRestHandlerImpl) FetchAutocompleteJobCiPipelines(w http.
 func (handler AppListingRestHandlerImpl) GetAllAppEnvsFromResourceNames(w http.ResponseWriter, r *http.Request) {
 }
 
-func (handler AppListingRestHandlerImpl) updateApprovalConfigDataInAppDetailResp(appDetail AppView.AppDetailContainer, appId, envId int) error {
-	return nil
+func (handler AppListingRestHandlerImpl) updateApprovalConfigDataInAppDetailResp(appDetail AppView.AppDetailContainer, appId, envId int) (AppView.AppDetailContainer, error) {
+	return AppView.AppDetailContainer{}, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,7 @@ func (handler AppListingRestHandlerImpl) FetchAppDetailsV2(w http.ResponseWriter`
`493`	`493`	`return`
`494`	`494`	`}`
`495`	`495`
`496`		`- err = handler.updateApprovalConfigDataInAppDetailResp(appDetail, appId, envId)`
	`496`	`+ appDetail, err = handler.updateApprovalConfigDataInAppDetailResp(appDetail, appId, envId)`
`497`	`497`	`if err != nil {`
`498`	`498`	`common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)`
`499`	`499`	`return`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@ func (handler AppListingRestHandlerImpl) FetchAutocompleteJobCiPipelines(w http.`
`14`	`14`	`func (handler AppListingRestHandlerImpl) GetAllAppEnvsFromResourceNames(w http.ResponseWriter, r *http.Request) {`
`15`	`15`	`}`
`16`	`16`
`17`		`-func (handler AppListingRestHandlerImpl) updateApprovalConfigDataInAppDetailResp(appDetail AppView.AppDetailContainer, appId, envId int) error {`
`18`		`- return nil`
	`17`	`+func (handler AppListingRestHandlerImpl) updateApprovalConfigDataInAppDetailResp(appDetail AppView.AppDetailContainer, appId, envId int) (AppView.AppDetailContainer, error) {`
	`18`	`+ return AppView.AppDetailContainer{}, nil`
`19`	`19`	`}`