Browse Source

update invite/collborator update api endpoints

Mohammed Nafees 3 năm trước cách đây
mục cha
commit
e69f9627b0

+ 2 - 2
api/server/router/invite.go

@@ -138,11 +138,11 @@ func getInviteRoutes(
 		Router:   r,
 	})
 
-	// POST /api/projects/{project_id}/invites/{invite_id} -> invite.NewInviteUpdateRoleHandler
+	// PATCH /api/projects/{project_id}/invites/{invite_id} -> invite.NewInviteUpdateRoleHandler
 	updateRoleEndpoint := factory.NewAPIEndpoint(
 		&types.APIRequestMetadata{
 			Verb:   types.APIVerbUpdate,
-			Method: types.HTTPVerbPost,
+			Method: types.HTTPVerbPatch,
 			Path: &types.Path{
 				Parent:       basePath,
 				RelativePath: relPath,

+ 1 - 3
dashboard/src/main/home/modals/EditInviteOrCollaboratorModal.tsx

@@ -69,11 +69,9 @@ const EditCollaboratorModal = () => {
       await api.updateCollaborator(
         "<token>",
         {
-          kind: selectedRole,
-          user_id: user.id,
           roles: selectedRoles.map((role) => role.id),
         },
-        { project_id }
+        { project_id, user_id: user.id }
       );
       setStatus("successful");
       refetchCallerData().then(() => {

+ 19 - 26
dashboard/src/shared/api.tsx

@@ -542,11 +542,9 @@ const detectBuildpack = baseApi<
     branch: string;
   }
 >("GET", (pathParams) => {
-  return `/api/projects/${pathParams.project_id}/gitrepos/${
-    pathParams.git_repo_id
-  }/repos/${pathParams.kind}/${pathParams.owner}/${
-    pathParams.name
-  }/${encodeURIComponent(pathParams.branch)}/buildpack/detect`;
+  return `/api/projects/${pathParams.project_id}/gitrepos/${pathParams.git_repo_id
+    }/repos/${pathParams.kind}/${pathParams.owner}/${pathParams.name
+    }/${encodeURIComponent(pathParams.branch)}/buildpack/detect`;
 });
 
 const detectGitlabBuildpack = baseApi<
@@ -577,11 +575,9 @@ const getBranchContents = baseApi<
     branch: string;
   }
 >("GET", (pathParams) => {
-  return `/api/projects/${pathParams.project_id}/gitrepos/${
-    pathParams.git_repo_id
-  }/repos/${pathParams.kind}/${pathParams.owner}/${
-    pathParams.name
-  }/${encodeURIComponent(pathParams.branch)}/contents`;
+  return `/api/projects/${pathParams.project_id}/gitrepos/${pathParams.git_repo_id
+    }/repos/${pathParams.kind}/${pathParams.owner}/${pathParams.name
+    }/${encodeURIComponent(pathParams.branch)}/contents`;
 });
 
 const getProcfileContents = baseApi<
@@ -597,11 +593,9 @@ const getProcfileContents = baseApi<
     branch: string;
   }
 >("GET", (pathParams) => {
-  return `/api/projects/${pathParams.project_id}/gitrepos/${
-    pathParams.git_repo_id
-  }/repos/${pathParams.kind}/${pathParams.owner}/${
-    pathParams.name
-  }/${encodeURIComponent(pathParams.branch)}/procfile`;
+  return `/api/projects/${pathParams.project_id}/gitrepos/${pathParams.git_repo_id
+    }/repos/${pathParams.kind}/${pathParams.owner}/${pathParams.name
+    }/${encodeURIComponent(pathParams.branch)}/procfile`;
 });
 
 const getGitlabProcfileContents = baseApi<
@@ -1354,11 +1348,9 @@ const getEnvGroup = baseApi<
     version?: number;
   }
 >("GET", (pathParams) => {
-  return `/api/projects/${pathParams.id}/clusters/${
-    pathParams.cluster_id
-  }/namespaces/${pathParams.namespace}/envgroup?name=${pathParams.name}${
-    pathParams.version ? "&version=" + pathParams.version : ""
-  }`;
+  return `/api/projects/${pathParams.id}/clusters/${pathParams.cluster_id
+    }/namespaces/${pathParams.namespace}/envgroup?name=${pathParams.name}${pathParams.version ? "&version=" + pathParams.version : ""
+    }`;
 });
 
 const getConfigMap = baseApi<
@@ -1557,7 +1549,7 @@ const updateInvite = baseApi<
   { kind: string; roles: string[] },
   { project_id: number; invite_id: number }
 >(
-  "POST",
+  "PATCH",
   ({ project_id, invite_id }) =>
     `/api/projects/${project_id}/invites/${invite_id}`
 );
@@ -1569,12 +1561,13 @@ const getCollaborators = baseApi<{}, { project_id: number }>(
 
 const updateCollaborator = baseApi<
   {
-    kind: string;
-    user_id: number;
     roles: string[];
   },
-  { project_id: number }
->("POST", ({ project_id }) => `/api/projects/${project_id}/roles`);
+  {
+    project_id: number;
+    user_id: number;
+  }
+>("PATCH", ({ project_id, user_id }) => `/api/projects/${project_id}/collaborators/${user_id}`);
 
 const removeCollaborator = baseApi<{ user_id: number }, { project_id: number }>(
   "DELETE",
@@ -2168,7 +2161,7 @@ const removeStackEnvGroup = baseApi<
     `/api/v1/projects/${project_id}/clusters/${cluster_id}/namespaces/${namespace}/stacks/${stack_id}/remove_env_group/${env_group_name}`
 );
 
-const getGithubStatus = baseApi<{}, {}>("GET", ({}) => `/api/status/github`);
+const getGithubStatus = baseApi<{}, {}>("GET", ({ }) => `/api/status/github`);
 
 // ROLES