- {topUsers.map(user => {
+ {topUsers.map((user, i) => {
const initals = getInitials(user?.title || user.email);
return (
addMember(user?.id || '')}
+ data-test-id={`frontier-sdk-add-user-to-project-dropdown-item-${i}`}
>
{showTeam ? (
<>
diff --git a/sdks/js/packages/core/react/components/organization/project/project.tsx b/sdks/js/packages/core/react/components/organization/project/project.tsx
index 427f3be9f..75c0fa627 100644
--- a/sdks/js/packages/core/react/components/organization/project/project.tsx
+++ b/sdks/js/packages/core/react/components/organization/project/project.tsx
@@ -46,12 +46,11 @@ export const ProjectPage = () => {
if (!organization?.id || !projectId || isDeleteRoute) return;
try {
setIsTeamsLoading(true);
- const {
- // @ts-ignore
- data: { groups = [], role_pairs }
- } = await client?.frontierServiceListProjectGroups(projectId, {
- withRoles: true
+ const resp = await client?.frontierServiceListProjectGroups(projectId, {
+ with_roles: true
});
+ const groups = resp?.data?.groups || [];
+ const role_pairs = resp?.data?.role_pairs || [];
setTeams(groups);
setGroupRoles(
role_pairs.reduce((previous: any, gr: any) => {
@@ -71,13 +70,11 @@ export const ProjectPage = () => {
if (!organization?.id || !projectId || isDeleteRoute) return;
try {
setIsMembersLoading(true);
- const {
- // @ts-ignore
- data: { users, role_pairs }
- } = await client?.frontierServiceListProjectUsers(projectId, {
- withRoles: true
+ const resp = await client?.frontierServiceListProjectUsers(projectId, {
+ with_roles: true
});
-
+ const users = resp?.data?.users || [];
+ const role_pairs = resp?.data?.role_pairs || [];
setMembers(users);
setMemberRoles(
role_pairs.reduce((previous: any, mr: any) => {
@@ -97,10 +94,8 @@ export const ProjectPage = () => {
if (!organization?.id || !projectId || isDeleteRoute) return;
try {
setIsProjectLoading(true);
- const {
- // @ts-ignore
- data: { project }
- } = await client?.frontierServiceGetProject(projectId);
+ const resp = await client?.frontierServiceGetProject(projectId);
+ const project = resp?.data?.project;
setProject(project);
} catch (error: any) {
toast.error('Something went wrong', {
@@ -115,13 +110,11 @@ export const ProjectPage = () => {
if (!organization?.id || !projectId || isDeleteRoute) return;
try {
setIsProjectRoleLoading(true);
- const {
- // @ts-ignore
- data: { roles }
- } = await client?.frontierServiceListRoles({
+ const resp = await client?.frontierServiceListRoles({
state: 'enabled',
scopes: [PERMISSIONS.ProjectNamespace]
});
+ const roles = resp?.data?.roles || [];
setRoles(roles);
} catch (error: any) {
toast.error('Something went wrong', {
@@ -139,7 +132,11 @@ export const ProjectPage = () => {
getProjectRoles();
}, [getProjectDetails, getProjectMembers, getProjectTeams, getProjectRoles]);
- const isLoading = isProjectLoading || isTeamsLoading || isMembersLoading;
+ const isLoading =
+ isProjectLoading ||
+ isTeamsLoading ||
+ isMembersLoading ||
+ isProjectRoleLoading;
const refetchTeamAndMembers = useCallback(() => {
getProjectMembers();
@@ -155,6 +152,7 @@ export const ProjectPage = () => {
// @ts-ignore
src={backIcon}
onClick={() => navigate({ to: '/projects' })}
+ data-test-id="frontier-sdk-projects-page-back-link"
/>
Projects
diff --git a/sdks/js/packages/core/react/hooks/useOrganizationDomains.ts b/sdks/js/packages/core/react/hooks/useOrganizationDomains.ts
index a7f7b2844..55994e5d6 100644
--- a/sdks/js/packages/core/react/hooks/useOrganizationDomains.ts
+++ b/sdks/js/packages/core/react/hooks/useOrganizationDomains.ts
@@ -1,8 +1,9 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
import { useFrontier } from '../contexts/FrontierContext';
+import { V1Beta1Domain } from '~/src';
export const useOrganizationDomains = () => {
- const [domains, setDomains] = useState([]);
+ const [domains, setDomains] = useState
([]);
const [isDomainsLoading, setIsDomainsLoading] = useState(false);
const { client, activeOrganization: organization } = useFrontier();
@@ -10,13 +11,11 @@ export const useOrganizationDomains = () => {
try {
setIsDomainsLoading(true);
if (!organization?.id) return;
- const {
- // @ts-ignore
- data: { domains = [] }
- } = await client?.frontierServiceListOrganizationDomains(
+ const resp = await client?.frontierServiceListOrganizationDomains(
organization?.id
);
- setDomains(domains);
+ const data = resp?.data?.domains || [];
+ setDomains(data);
} catch (err) {
console.error(err);
} finally {
@@ -26,21 +25,11 @@ export const useOrganizationDomains = () => {
useEffect(() => {
getDomains();
- }, [client, getDomains, organization?.id]);
-
- const updatedDomains = useMemo(
- () =>
- isDomainsLoading
- ? ([{ id: 1 }, { id: 2 }, { id: 3 }] as any)
- : domains.length
- ? domains
- : [],
- [isDomainsLoading, domains]
- );
+ }, [getDomains]);
return {
isFetching: isDomainsLoading,
- domains: updatedDomains,
+ domains: domains,
refetch: getDomains
};
};