awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-15 20:25:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Continue progress on role ui update

Browse Source
This commit is contained in:
Tuan Dang
2024-07-22 12:41:26 +07:00
parent 3731459e99
commit bd860e6c5a
13 changed files with 779 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/hooks/api/roles/mutation.tsx
+15 -5
View File
@@ -68,13 +68,22 @@ export const useUpdateOrgRole = () => {
const queryClient = useQueryClient();
return useMutation({
mutationFn: ({ id, orgId, permissions, ...dto }: TUpdateOrgRoleDTO) =>
apiRequest.patch(`/api/v1/organization/${orgId}/roles/${id}`, {
mutationFn: ({ id, orgId, permissions, ...dto }: TUpdateOrgRoleDTO) => {
console.log("update args: ", {
id,
orgId,
permissions,
...dto,
pack: permissions?.length ? packRules(permissions) : []
});
return apiRequest.patch(`/api/v1/organization/${orgId}/roles/${id}`, {
...dto,
permissions: permissions?.length ? packRules(permissions) : []
}),
onSuccess: (_, { orgId }) => {
});
},
onSuccess: (_, { id, orgId }) => {
queryClient.invalidateQueries(roleQueryKeys.getOrgRoles(orgId));
queryClient.invalidateQueries(roleQueryKeys.getOrgRole(orgId, id));
}
});
};
@@ -87,8 +96,9 @@ export const useDeleteOrgRole = () => {
apiRequest.delete(`/api/v1/organization/${orgId}/roles/${id}`, {
data: { orgId }
}),
onSuccess: (_, { orgId }) => {
onSuccess: (_, { id, orgId }) => {
queryClient.invalidateQueries(roleQueryKeys.getOrgRoles(orgId));
queryClient.invalidateQueries(roleQueryKeys.getOrgRole(orgId, id));
}
});
};
frontend/src/hooks/api/roles/queries.tsx
+7 -4
View File
@@ -94,10 +94,13 @@ export const useGetOrgRole = (orgId: string, roleId: string) =>
useQuery({
queryKey: roleQueryKeys.getOrgRole(orgId, roleId),
queryFn: async () => {
const { data } = await apiRequest.get<{ role: TProjectRole }>(
`/api/v1/organization/${orgId}/roles/${roleId}` // TODO: implement
);
return data.role;
const { data } = await apiRequest.get<{
role: Omit<TOrgRole, "permissions"> & { permissions: unknown };
}>(`/api/v1/organization/${orgId}/roles/${roleId}`);
return {
...data.role,
permissions: unpackRules(data.role.permissions as PackRule<TPermission>[])
};
},
enabled: Boolean(orgId && roleId)
});