awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): sending group users without orgid

Browse Source
This commit is contained in:
Akhil Mohan
2024-04-01 17:15:57 +05:30
parent 0c2e566184
commit 9fddcea3db
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
frontend/src/hooks/api/groups/queries.tsx
View File

@@ -3,8 +3,8 @@ import { useQuery } from "@tanstack/react-query";
import { apiRequest } from "@app/config/request"; import { apiRequest } from "@app/config/request";
export const groupKeys = { export const groupKeys = {
getGroupUserMembership: (slug: string) => [{ slug }, "group-user-memberships"] as const getGroupUserMembership: (slug: string) => [{ slug }, "group-user-memberships"] as const
} };
type TUser = { type TUser = {
id: string; id: string;
@@ -13,17 +13,16 @@ type TUser = {
firstName: string; firstName: string;
lastName: string; lastName: string;
isPartOfGroup: boolean; isPartOfGroup: boolean;
} };
export const useListGroupUsers = (groupSlug: string) => { export const useListGroupUsers = (groupSlug: string) => {
return useQuery({ return useQuery({
queryKey: groupKeys.getGroupUserMembership(groupSlug), queryKey: groupKeys.getGroupUserMembership(groupSlug),
enabled: Boolean(groupSlug),
queryFn: async () => { queryFn: async () => {
const { const { data: users } = await apiRequest.get<TUser[]>(`/api/v1/groups/${groupSlug}/users`);
data: users
} = await apiRequest.get<TUser[]>(`/api/v1/groups/${groupSlug}/users`);
return users; return users;
} }
}); });
}; };

12
frontend/src/hooks/api/organization/queries.tsx
View File

@@ -28,7 +28,8 @@ export const organizationKeys = {
getOrgTaxIds: (orgId: string) => [{ orgId }, "organization-tax-ids"] as const, getOrgTaxIds: (orgId: string) => [{ orgId }, "organization-tax-ids"] as const,
getOrgInvoices: (orgId: string) => [{ orgId }, "organization-invoices"] as const, getOrgInvoices: (orgId: string) => [{ orgId }, "organization-invoices"] as const,
getOrgLicenses: (orgId: string) => [{ orgId }, "organization-licenses"] as const, getOrgLicenses: (orgId: string) => [{ orgId }, "organization-licenses"] as const,
getOrgIdentityMemberships: (orgId: string) => [{ orgId }, "organization-identity-memberships"] as const, getOrgIdentityMemberships: (orgId: string) =>
[{ orgId }, "organization-identity-memberships"] as const,
getOrgGroups: (orgId: string) => [{ orgId }, "organization-groups"] as const getOrgGroups: (orgId: string) => [{ orgId }, "organization-groups"] as const
}; };
@@ -409,12 +410,15 @@ export const useDeleteOrgById = () => {
export const useGetOrganizationGroups = (organizationId: string) => { export const useGetOrganizationGroups = (organizationId: string) => {
return useQuery({ return useQuery({
queryKey: organizationKeys.getOrgGroups(organizationId), queryKey: organizationKeys.getOrgGroups(organizationId),
enabled: Boolean(organizationId),
queryFn: async () => { queryFn: async () => {
const { const {
data: { groups } data: { groups }
} = await apiRequest.get<{ groups: TGroupOrgMembership[] }>(`/api/v1/organization/${organizationId}/groups`); } = await apiRequest.get<{ groups: TGroupOrgMembership[] }>(
`/api/v1/organization/${organizationId}/groups`
);
return groups; return groups;
} }
}); });
}; };