Преглед изворни кода

update endpoints for pod deletion

Alexander Belanger пре 5 година
родитељ
комит
095fe324ee
3 измењених фајлова са 3 додато и 3 уклоњено
  1. 1 1
      dashboard/src/shared/api.tsx
  2. 1 1
      dashboard/src/shared/baseApi.tsx
  3. 1 1
      server/router/router.go

+ 1 - 1
dashboard/src/shared/api.tsx

@@ -226,7 +226,7 @@ const deletePod = baseApi<
 },
 },
 { name: string; namespace: string; id: number }
 { name: string; namespace: string; id: number }
 >("DELETE", pathParams => {
 >("DELETE", pathParams => {
-  return `/api/projects/${pathParams.id}/k8s/pods`;
+  return `/api/projects/${pathParams.id}/k8s/pods/${pathParams.namespace}/${pathParams.name}`;
 });
 });
 
 
 const deleteProject = baseApi<{}, { id: number }>("DELETE", pathParams => {
 const deleteProject = baseApi<{}, { id: number }>("DELETE", pathParams => {

+ 1 - 1
dashboard/src/shared/baseApi.tsx

@@ -31,7 +31,7 @@ export const baseApi = <T extends {}, S = {}>(
         }
         }
       });
       });
     } else if (requestType === "DELETE") {
     } else if (requestType === "DELETE") {
-      return axios.delete(endpointString, params);
+      return axios.delete(endpointString + "?" + qs.stringify(params, { arrayFormat: "repeat" }));
     } else {
     } else {
       return axios.get(endpointString, {
       return axios.get(endpointString, {
         params,
         params,

+ 1 - 1
server/router/router.go

@@ -1184,7 +1184,7 @@ func New(a *api.App) *chi.Mux {
 
 
 		r.Method(
 		r.Method(
 			"DELETE",
 			"DELETE",
-			"/projects/{project_id}/k8s/pods",
+			"/projects/{project_id}/k8s/pods/{namespace}/{name}",
 			auth.DoesUserHaveProjectAccess(
 			auth.DoesUserHaveProjectAccess(
 				auth.DoesUserHaveClusterAccess(
 				auth.DoesUserHaveClusterAccess(
 					requestlog.NewHandler(a.HandleDeletePod, l),
 					requestlog.NewHandler(a.HandleDeletePod, l),