π¨ The ultimate agentic social media scheduling tool π€
TypeScript nextjsopen-sourceopen-source-social-media-scheduling-toolosspostiz-cloudpostiz-hostedredisscheduling-toolsocial-media-scheduling-tooltypescript
feat(accounts): clarify which account/org is active for same-email users
Gilad Resisi5b39006cf084
diff --git a/apps/frontend/src/components/layout/impersonate.tsx b/apps/frontend/src/components/layout/impersonate.tsxindex 358e815b5..a817a55c5 100644--- a/apps/frontend/src/components/layout/impersonate.tsx+++ b/apps/frontend/src/components/layout/impersonate.tsx@@ -897,6 +897,15 @@ const SwitchUser = () => {id: curr.user.id,name: curr.user.name,email: curr.user.email,+ orgs: (data || [])+ .filter((org: any) => org.user.id === curr.user.id)+ .map(+ (org: any) =>+ `${org.organization?.name} (${org.role} / ${+ org.organization?.subscription?.subscriptionTier || 'FREE'+ })`+ )+ .join(', '),}));}, [data, currentUser?.id]);@@ -991,6 +1000,7 @@ const SwitchUser = () => {{item.id.split('-').at(-1)} -{' '}{item.name ? `${item.name} - ` : ''}{item.email}+ {item.orgs ? ` - ${item.orgs}` : ''}</div>))}</div>@@ -1054,6 +1064,9 @@ export const Impersonate = () => {id: curr.id,name: curr.user.name,email: curr.user.email,+ orgName: curr.organization?.name,+ role: curr.role,+ tier: curr.organization?.subscription?.subscriptionTier || 'FREE',}),[]);@@ -1120,7 +1133,8 @@ export const Impersonate = () => {className="p-[10px] border-b border-customColor6 hover:bg-tableBorder cursor-pointer">{t('user_1', 'user:')}- {user.id.split('-').at(-1)} - {user.name} - {user.email}+ {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.tsxindex a3e37ce6f..573f87af6 100644--- a/apps/frontend/src/components/layout/organization.selector.tsx+++ b/apps/frontend/src/components/layout/organization.selector.tsx@@ -49,7 +49,7 @@ export const OrganizationSelector: FC<{ asOpenSelect?: boolean }> = ({<div className="bg-btnPrimary !flex !relative max-w-[500px] mx-auto py-[12px] px-[12px]">Select Organization</div>)}{!asOpenSelect && (- <div className="flex items-center">+ <div className="flex items-center gap-[6px]"><svgclassName={user?.tier.current === 'FREE' ? 'animate-bounce drop-shadow-glow': ''}width="24"@@ -63,6 +63,9 @@ export const OrganizationSelector: FC<{ asOpenSelect?: boolean }> = ({fill="currentColor"/></svg>+ {!!current?.name && (+ <div className="max-w-[120px] truncate">{current.name}</div>+ )}</div>)}{data?.length > 1 && (@@ -72,7 +75,7 @@ export const OrganizationSelector: FC<{ asOpenSelect?: boolean }> = ({asOpenSelect ? '!flex !relative max-w-[500px] mx-auto mb-[10px]' : '',)}>- {data?.map((org: { name: string; id: string }) => (+ {withoutCurrent?.map((org: { name: string; id: string }) => (<div key={org.id} onClick={changeOrg(org)}>{org.name}</div>diff --git a/libraries/nestjs-libraries/src/database/prisma/organizations/organization.repository.ts b/libraries/nestjs-libraries/src/database/prisma/organizations/organization.repository.tsindex 177abde6b..1114051b9 100644--- a/libraries/nestjs-libraries/src/database/prisma/organizations/organization.repository.ts+++ b/libraries/nestjs-libraries/src/database/prisma/organizations/organization.repository.ts@@ -139,9 +139,16 @@ export class OrganizationRepository {},select: {id: true,+ role: true,organization: {select: {id: true,+ name: true,+ subscription: {+ select: {+ subscriptionTier: true,+ },+ },},},user: {