fix: Prompt to join org without organization feature flags (#9280)

When no organization feature flag was present, we would not show the prompt to join org notification.
ParabolInc · Dec 13, 2023 · 117cd57 · 117cd57
1 parent 42bde5e
commit 117cd57
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/server/utils/__tests__/isRequestToJoinDomainAllowed.test.ts b/packages/server/utils/__tests__/isRequestToJoinDomainAllowed.test.ts
@@ -52,7 +52,7 @@ const addOrg = async (
   const org = {
     id: orgId,
     activeDomain,
-    featureFlags: featureFlags ?? [],
+    featureFlags,
     tier: tier ?? 'starter'
   }
 

diff --git a/packages/server/utils/isRequestToJoinDomainAllowed.ts b/packages/server/utils/isRequestToJoinDomainAllowed.ts
@@ -22,7 +22,7 @@ export const getEligibleOrgIdsByDomain = async (
   const orgs = await r
     .table('Organization')
     .getAll(activeDomain, {index: 'activeDomain'})
-    .filter((org: RDatum) => org('featureFlags').contains('noPromptToJoinOrg').not())
+    .filter((org: RDatum) => org('featureFlags').default([]).contains('noPromptToJoinOrg').not())
     .merge((org: RDatum) => ({
       members: r
         .table('OrganizationUser')
@@ -33,7 +33,7 @@ export const getEligibleOrgIdsByDomain = async (
     .merge((org: RDatum) => ({
       founder: org('members').nth(0).default(null),
       billingLeads: org('members')
-        .filter({inactive: false})
+        .filter({inactive: false, removedAt: null})
         .filter((row: RDatum) => r.expr(['BILLING_LEADER', 'ORG_ADMIN']).contains(row('role'))),
       activeMembers: org('members').filter({inactive: false, removedAt: null}).count()
     }))