Skip to content

πŸ“¨ The ultimate agentic social media scheduling tool πŸ€–

fix(accounts): optional-chain every nested access on API-shaped objects

Gilad Resisiec8ac6d2b554
diff --git a/apps/frontend/src/components/layout/impersonate.tsx b/apps/frontend/src/components/layout/impersonate.tsx
index 9d01dee8d..215a40e92 100644
--- a/apps/frontend/src/components/layout/impersonate.tsx
+++ b/apps/frontend/src/components/layout/impersonate.tsx
@@ -885,24 +885,24 @@ const SwitchUser = () => {
// one row per user-organization: dedupe by user id, drop the impersonated user
const seen = new Set<string>();
return (data || [])
- .filter((curr: any) => curr.user.id !== currentUser?.id)
+ .filter((curr: any) => curr?.user?.id !== currentUser?.id)
.filter((curr: any) => {
- if (seen.has(curr.user.id)) {
+ if (seen.has(curr?.user?.id)) {
return false;
}
- seen.add(curr.user.id);
+ seen.add(curr?.user?.id);
return true;
})
.map((curr: any) => ({
- id: curr.user.id,
- name: curr.user.name,
- email: curr.user.email,
+ id: curr?.user?.id,
+ name: curr?.user?.name,
+ email: curr?.user?.email,
orgs: (data || [])
- .filter((org: any) => org.user.id === curr.user.id)
+ .filter((org: any) => org?.user?.id === curr?.user?.id)
.map(
(org: any) =>
- `${org.organization?.name} (${org.role} / ${
- org.organization?.subscription?.subscriptionTier || 'FREE'
+ `${org?.organization?.name} (${org?.role} / ${
+ org?.organization?.subscription?.subscriptionTier || 'FREE'
})`
)
.join(', '),
@@ -993,14 +993,14 @@ const SwitchUser = () => {
{mapData.map((item: any) => (
<div
onClick={pick(item)}
- key={item.id}
+ key={item?.id}
className="p-[10px] border-b border-customColor6 hover:bg-tableBorder cursor-pointer whitespace-nowrap truncate"
>
{t('user_1', 'user:')}
- {item.id.split('-').at(-1)} -{' '}
- {item.name ? `${item.name} - ` : ''}
- {item.email}
- {item.orgs ? ` - ${item.orgs}` : ''}
+ {item?.id?.split('-')?.at(-1)} -{' '}
+ {item?.name ? `${item?.name} - ` : ''}
+ {item?.email}
+ {item?.orgs ? ` - ${item?.orgs}` : ''}
</div>
))}
</div>
@@ -1061,12 +1061,12 @@ export const Impersonate = () => {
const mapData = useMemo(() => {
return data?.map(
(curr: any) => ({
- id: curr.id,
- name: curr.user.name,
- email: curr.user.email,
- orgName: curr.organization?.name,
- role: curr.role,
- tier: curr.organization?.subscription?.subscriptionTier || 'FREE',
+ id: curr?.id,
+ name: curr?.user?.name,
+ email: curr?.user?.email,
+ orgName: curr?.organization?.name,
+ role: curr?.role,
+ tier: curr?.organization?.subscription?.subscriptionTier || 'FREE',
}),
[]
);
@@ -1128,13 +1128,13 @@ export const Impersonate = () => {
<div className="absolute top-[100%] w-max min-w-full max-w-[90vw] start-0 bg-sixth border border-customColor6 text-textColor z-[999]">
{mapData?.map((user: any) => (
<div
- onClick={setUser(user.id)}
- key={user.id}
+ onClick={setUser(user?.id)}
+ key={user?.id}
className="p-[10px] border-b border-customColor6 hover:bg-tableBorder cursor-pointer whitespace-nowrap truncate"
>
{t('user_1', 'user:')}
- {user.id.split('-').at(-1)} - {user.name} - {user.email} -{' '}
- {user.orgName} ({user.role} / {user.tier})
+ {user?.id?.split('-')?.at(-1)} - {user?.name} - {user?.email}{' '}
+ - {user?.orgName} ({user?.role} / {user?.tier})
</div>
))}
</div>
diff --git a/apps/frontend/src/components/layout/organization.selector.tsx b/apps/frontend/src/components/layout/organization.selector.tsx
index 209af5611..4f072f593 100644
--- a/apps/frontend/src/components/layout/organization.selector.tsx
+++ b/apps/frontend/src/components/layout/organization.selector.tsx
@@ -64,7 +64,7 @@ export const OrganizationSelector: FC<{ asOpenSelect?: boolean }> = ({
/>
</svg>
{!!current?.name && (
- <div className="max-w-[240px] truncate">{current.name}</div>
+ <div className="max-w-[240px] truncate">{current?.name}</div>
)}
</div>
)}
@@ -82,18 +82,18 @@ export const OrganizationSelector: FC<{ asOpenSelect?: boolean }> = ({
users: { role: 'SUPERADMIN' | 'ADMIN' | 'USER' }[];
}) => (
<div
- key={org.id}
+ key={org?.id}
onClick={changeOrg(org)}
className="whitespace-nowrap truncate"
>
- {org.name}
- {!!org.users?.[0]?.role && (
+ {org?.name}
+ {!!org?.users?.[0]?.role && (
<span className="text-customColor18">
{' '}
(
- {org.users[0].role === 'SUPERADMIN'
+ {org?.users?.[0]?.role === 'SUPERADMIN'
? 'Super-Admin'
- : org.users[0].role === 'ADMIN'
+ : org?.users?.[0]?.role === 'ADMIN'
? 'Admin'
: 'User'}
)
diff --git a/apps/frontend/src/components/public-api/public.component.tsx b/apps/frontend/src/components/public-api/public.component.tsx
index a466df78c..33c62d69a 100644
--- a/apps/frontend/src/components/public-api/public.component.tsx
+++ b/apps/frontend/src/components/public-api/public.component.tsx
@@ -723,7 +723,7 @@ export const PublicComponent = () => {
revalidateOnReconnect: false,
});
const currentOrg = useMemo(() => {
- return organizations?.find((org: any) => org.id === user?.orgId);
+ return organizations?.find((org: any) => org?.id === user?.orgId);
}, [organizations, user?.orgId]);
return (