address pr comments

api/client/template.go

@@ -35,7 +35,7 @@ func (c *Client) GetTemplate(
 
 	err := c.getRequest(
 		fmt.Sprintf(
-			"/v1/projects/%d/templates/%s/%s",
+			"/v1/projects/%d/templates/%s/versions/%s",
 			projectID,
 			name, version,
 		),

api/server/handlers/v1/template/get.go

@@ -42,6 +42,10 @@ func (t *TemplateGetHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	if request.RepoURL == "" {
+		request.RepoURL = t.Config().ServerConf.DefaultApplicationHelmRepoURL
+	}
+
 	hrs, err := t.Repo().HelmRepo().ListHelmReposByProjectID(project.ID)
 
 	if err != nil {
@@ -61,6 +65,16 @@ func (t *TemplateGetHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	name, _ := requestutils.GetURLParamString(r, types.URLParamTemplateName)
+
+	if name == "" {
+		t.HandleAPIError(w, r, apierrors.NewErrPassThroughToClient(
+			fmt.Errorf("template name is required"),
+			http.StatusBadRequest,
+		))
+
+		return
+	}
+
 	version, _ := requestutils.GetURLParamString(r, types.URLParamTemplateVersion)
 
 	// if version passed as latest, pass empty string to loader to get latest
@@ -68,10 +82,6 @@ func (t *TemplateGetHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		version = ""
 	}
 
-	if request.RepoURL == "" {
-		request.RepoURL = t.Config().ServerConf.DefaultApplicationHelmRepoURL
-	}
-
 	chart, err := loader.LoadChartPublic(request.RepoURL, name, version)
 
 	if err != nil {
@@ -86,6 +96,7 @@ func (t *TemplateGetHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	res := &types.GetTemplateResponse{}
 	res.Metadata = chart.Metadata
 	res.Values = chart.Values
+	res.RepoURL = request.RepoURL
 
 	for _, file := range chart.Files {
 		if strings.Contains(file.Name, "form.yaml") {

api/server/handlers/v1/template/get_upgrade_notes.go

@@ -61,6 +61,16 @@ func (t *TemplateGetUpgradeNotesHandler) ServeHTTP(w http.ResponseWriter, r *htt
 	}
 
 	name, _ := requestutils.GetURLParamString(r, types.URLParamTemplateName)
+
+	if name == "" {
+		t.HandleAPIError(w, r, apierrors.NewErrPassThroughToClient(
+			fmt.Errorf("template name is required"),
+			http.StatusBadRequest,
+		))
+
+		return
+	}
+
 	version, _ := requestutils.GetURLParamString(r, types.URLParamTemplateVersion)
 
 	// if version passed as latest, pass empty string to loader to get latest

api/server/router/v1/project.go

@@ -140,8 +140,8 @@ func getV1ProjectRoutes(
 		Router:   r,
 	})
 
-	// GET /api/v1/projects/{project_id}/templates/{name}/{version} -> v1Template.NewTemplateGetHandler
-	// swagger:operation GET /api/v1/projects/{project_id}/templates/{name}/{version} getTemplate
+	// GET /api/v1/projects/{project_id}/templates/{name}/versions/{version} -> v1Template.NewTemplateGetHandler
+	// swagger:operation GET /api/v1/projects/{project_id}/templates/{name}/versions/{version} getTemplate
 	//
 	// Retrieves a given template by a `name` and a `version`
 	//
@@ -176,7 +176,7 @@ func getV1ProjectRoutes(
 			Path: &types.Path{
 				Parent: basePath,
 				RelativePath: fmt.Sprintf(
-					"%s/templates/{%s}/{%s}",
+					"%s/templates/{%s}/versions/{%s}",
 					relPath,
 					types.URLParamTemplateName,
 					types.URLParamTemplateVersion,
@@ -201,8 +201,8 @@ func getV1ProjectRoutes(
 		Router:   r,
 	})
 
-	// GET /api/v1/projects/{project_id}/templates/{name}/{version}/upgrade_notes -> v1Template.NewTemplateGetUpgradeNotesHandler
-	// swagger:operation GET /api/v1/projects/{project_id}/templates/{name}/{version}/upgrade_notes getTemplateUpgradeNotes
+	// GET /api/v1/projects/{project_id}/templates/{name}/versions/{version}/upgrade_notes -> v1Template.NewTemplateGetUpgradeNotesHandler
+	// swagger:operation GET /api/v1/projects/{project_id}/templates/{name}/versions/{version}/upgrade_notes getTemplateUpgradeNotes
 	//
 	// Retrieves a given template by a `name` and a `version`
 	//
@@ -242,7 +242,7 @@ func getV1ProjectRoutes(
 			Path: &types.Path{
 				Parent: basePath,
 				RelativePath: fmt.Sprintf(
-					"/templates/{%s}/{%s}/upgrade_notes",
+					"/templates/{%s}/versions/{%s}/upgrade_notes",
 					types.URLParamTemplateName,
 					types.URLParamTemplateVersion,
 				),

dashboard/src/shared/api.tsx

@@ -1179,7 +1179,7 @@ const getTemplateInfo = baseApi<
   },
   { project_id: number; name: string; version: string }
 >("GET", (pathParams) => {
-  return `/api/v1/projects/${pathParams.project_id}/templates/${pathParams.name}/${pathParams.version}`;
+  return `/api/v1/projects/${pathParams.project_id}/templates/${pathParams.name}/versions/${pathParams.version}`;
 });
 
 const getTemplateUpgradeNotes = baseApi<
@@ -1189,7 +1189,7 @@ const getTemplateUpgradeNotes = baseApi<
   },
   { project_id: number; name: string; version: string }
 >("GET", (pathParams) => {
-  return `/api/v1/projects/${pathParams.project_id}/templates/${pathParams.name}/${pathParams.version}/upgrade_notes`;
+  return `/api/v1/projects/${pathParams.project_id}/templates/${pathParams.name}/versions/${pathParams.version}/upgrade_notes`;
 });
 
 const getTemplates = baseApi<