chore: refactor teams query in organization (#11085)

nickoferrall · web-flow · commit 7134bbbe1404 · 2025-04-08T13:15:34.000+01:00
diff --git a/packages/client/components/DashNavList/DashNavList.tsx b/packages/client/components/DashNavList/DashNavList.tsx
@@ -30,8 +30,9 @@ const DashNavList = (props: Props) => {
         id
         name
         tier
-        viewerTeams {
+        teams {
           id
+          isViewerOnTeam
         }
       }
     `,
@@ -63,7 +64,7 @@ const DashNavList = (props: Props) => {
             </Tooltip>
           </div>
           <DashNavListTeams onClick={onClick} organizationRef={org} />
-          {org.viewerTeams.length === 0 && <EmptyTeams organizationRef={org} />}
+          {!org.teams.some((team) => team.isViewerOnTeam) && <EmptyTeams organizationRef={org} />}
         </div>
       ))}
     </div>
diff --git a/packages/client/components/DashNavList/DashNavListTeams.tsx b/packages/client/components/DashNavList/DashNavListTeams.tsx
@@ -29,18 +29,19 @@ const DashNavListTeams = (props: Props) => {
         id
         name
         tier
-        viewerTeams {
+        teams {
           ...DashNavListTeam @relay(mask: false)
-        }
-        publicTeams {
           ...PublicTeamsModal_team
+          isViewerOnTeam
         }
       }
     `,
     organizationRef
   )
   const [showModal, setShowModal] = useState(false)
-  const {publicTeams, viewerTeams} = organization
+  const allTeams = organization.teams
+  const viewerTeams = allTeams.filter((team) => team.isViewerOnTeam)
+  const publicTeams = allTeams.filter((team) => !team.isViewerOnTeam)
   const publicTeamsCount = publicTeams.length
 
   const handleClose = () => {
diff --git a/packages/client/components/DashNavList/EmptyTeams.tsx b/packages/client/components/DashNavList/EmptyTeams.tsx
@@ -19,15 +19,17 @@ const EmptyTeams = (props: Props) => {
       fragment EmptyTeams_organization on Organization {
         id
         name
-        publicTeams {
+        teams {
           id
+          isViewerOnTeam
           ...PublicTeamsModal_team
         }
       }
     `,
     organizationRef
   )
-  const {id: orgId, publicTeams} = organization
+  const {id: orgId, teams} = organization
+  const publicTeams = teams.filter((team) => !team.isViewerOnTeam)
   const hasPublicTeams = publicTeams.length > 0
 
   const viewer = useClientQuery<EmptyTeamsQuery>(
@@ -90,4 +92,5 @@ const EmptyTeams = (props: Props) => {
     </>
   )
 }
+
 export default EmptyTeams
diff --git a/packages/client/components/DashNavList/PublicTeamsModal.tsx b/packages/client/components/DashNavList/PublicTeamsModal.tsx
@@ -24,13 +24,20 @@ const PublicTeamsModal = (props: Props) => {
     graphql`
       fragment PublicTeamsModal_team on Team @relay(plural: true) {
         id
+        lastMetAt
         ...PublicTeamItem_team
       }
     `,
     teamsRef
   )
   const publicTeamsCount = publicTeams.length
 
+  const sortedTeams = [...publicTeams].sort((a, b) => {
+    if (!a.lastMetAt) return 1
+    if (!b.lastMetAt) return -1
+    return new Date(b.lastMetAt).getTime() - new Date(a.lastMetAt).getTime()
+  })
+
   return (
     <Dialog isOpen={isOpen} onClose={onClose}>
       <DialogContent className='z-10 flex flex-col pr-0'>
@@ -40,7 +47,7 @@ const PublicTeamsModal = (props: Props) => {
           <span className='font-semibold'>{orgName}</span>
         </DialogDescription>
         <div className='overflow-auto pr-6'>
-          {publicTeams.map((team) => (
+          {sortedTeams.map((team) => (
             <Fragment key={team.id}>
               <hr className='my-2 border-t border-slate-300' />
               <PublicTeamItem teamRef={team} />
diff --git a/packages/client/modules/newTeam/components/NewTeamForm/NewTeamForm.tsx b/packages/client/modules/newTeam/components/NewTeamForm/NewTeamForm.tsx
@@ -125,7 +125,7 @@ const NewTeamForm = (props: Props) => {
         lockedAt
         name
         tier
-        allTeams {
+        teams {
           name
           ...NewTeamForm_teams @relay(mask: false)
         }
@@ -143,7 +143,7 @@ const NewTeamForm = (props: Props) => {
   const [inviteAll, setInviteAll] = useState(false)
   const disableFields = !!lockedSelectedOrg && !isNewOrg
   const selectedOrg = organizations.find((org) => org.id === orgId)
-  const selectedOrgTeamMemberEmails = selectedOrg?.allTeams.flatMap(({teamMembers}) =>
+  const selectedOrgTeamMemberEmails = selectedOrg?.teams.flatMap(({teamMembers}) =>
     teamMembers.filter(({isSelf}) => !isSelf).map(({user}) => user.email)
   )
   const uniqueEmailsFromSelectedOrg = Array.from(new Set(selectedOrgTeamMemberEmails))
@@ -164,7 +164,7 @@ const NewTeamForm = (props: Props) => {
     let teamNames: string[] = []
     if (!isNewOrg) {
       if (selectedOrg) {
-        teamNames = selectedOrg.allTeams.map((team) => team.name)
+        teamNames = selectedOrg.teams.map((team) => team.name)
       }
     }
     return teamNameValidation(teamName, teamNames)
diff --git a/packages/client/modules/teamDashboard/components/EditTeamName/EditableTeamName.tsx b/packages/client/modules/teamDashboard/components/EditTeamName/EditableTeamName.tsx
@@ -28,7 +28,7 @@ const EditableTeamName = (props: Props) => {
         teamId: id
         teamName: name
         organization {
-          allTeams {
+          teams {
             id
             name
           }
@@ -38,7 +38,7 @@ const EditableTeamName = (props: Props) => {
     teamRef
   )
   const {teamName, teamId, organization} = team
-  const {allTeams: teams} = organization
+  const {teams} = organization
 
   const handleSubmit = (rawName: string) => {
     if (submitting) return
diff --git a/packages/client/modules/userDashboard/components/OrgTeams/OrgTeams.tsx b/packages/client/modules/userDashboard/components/OrgTeams/OrgTeams.tsx
@@ -22,18 +22,16 @@ const OrgTeams = (props: Props) => {
       fragment OrgTeams_organization on Organization {
         id
         tier
-        allTeams {
+        teams {
           id
           name
           lastMetAt
           teamMembers {
             id
           }
+          isViewerOnTeam
           ...OrgTeamsRow_team
         }
-        viewerTeams {
-          id
-        }
         allTeamsCount
       }
     `,
@@ -48,10 +46,9 @@ const OrgTeams = (props: Props) => {
 
   const [sortBy, setSortBy] = useState<SortField>('lastMetAt')
   const [sortDirection, setSortDirection] = useState<SortDirection>('desc')
-
-  const {allTeams, tier, viewerTeams, allTeamsCount} = organization
-  const showingAllTeams = allTeams.length === allTeamsCount
-  const viewerTeamCount = viewerTeams.length
+  const {teams, allTeamsCount, tier} = organization
+  const showingAllTeams = teams.length === allTeamsCount
+  const viewerTeamCount = teams.length
 
   const handleSort = (field: SortField) => {
     if (sortBy === field) {
@@ -62,7 +59,7 @@ const OrgTeams = (props: Props) => {
     }
   }
 
-  const sortedTeams = [...allTeams].sort((a, b) => {
+  const sortedTeams = [...teams].sort((a, b) => {
     const direction = sortDirection === 'asc' ? 1 : -1
     if (sortBy === 'name') {
       return direction * a.name.localeCompare(b.name)
diff --git a/packages/client/mutations/ArchiveTeamMutation.ts b/packages/client/mutations/ArchiveTeamMutation.ts
@@ -31,10 +31,7 @@ graphql`
         id
       }
       organization {
-        allTeams {
-          id
-        }
-        viewerTeams {
+        teams {
           id
         }
       }
@@ -106,7 +103,6 @@ export const archiveTeamTeamUpdater: SharedUpdater<ArchiveTeamMutation_team$data
   const orgs = viewer.getLinkedRecords('organizations')!
   orgs.forEach((org) => {
     safeRemoveNodeFromArray(teamId, org, 'teams')
-    safeRemoveNodeFromArray(teamId, org, 'allTeams')
   })
 
   const notification = payload.getLinkedRecord('notification')
diff --git a/packages/client/mutations/DowngradeToStarterMutation.ts b/packages/client/mutations/DowngradeToStarterMutation.ts
@@ -8,7 +8,7 @@ graphql`
     organization {
       tier
       billingTier
-      viewerTeams {
+      teams {
         isPaid
         tier
       }
diff --git a/packages/client/mutations/fragments/PublicTeamsFrag.ts b/packages/client/mutations/fragments/PublicTeamsFrag.ts
@@ -7,14 +7,9 @@ graphql`
       id
     }
     organization {
-      allTeams {
-        id
-      }
-      viewerTeams {
-        id
-      }
-      publicTeams {
+      teams {
         id
+        isViewerOnTeam
       }
     }
   }
diff --git a/packages/client/mutations/fragments/UpgradeToTeamTierFrag.ts b/packages/client/mutations/fragments/UpgradeToTeamTierFrag.ts
@@ -19,7 +19,7 @@ graphql`
       periodStart
       updatedAt
       lockedAt
-      viewerTeams {
+      teams {
         isPaid
         tier
       }
diff --git a/packages/server/graphql/public/typeDefs/Organization.graphql b/packages/server/graphql/public/typeDefs/Organization.graphql
@@ -48,25 +48,17 @@ type Organization {
   activeTeamCount: Int!
 
   """
-  All the teams in the organization. If the viewer is not a billing lead, org admin, super user, or they do not have the publicTeams flag, return the teams they are a member of.
+  Teams in the organization that the viewer has access to.
+  For org admins/super users: all teams in the org (viewer's teams first).
+  For regular users: teams the viewer is on plus public teams.
   """
-  allTeams: [Team!]!
+  teams: [Team!]!
 
   """
   The count of all teams in the organization
   """
   allTeamsCount: Int!
 
-  """
-  all the teams the viewer is on in the organization
-  """
-  viewerTeams: [Team!]!
-
-  """
-  all the teams that the viewer does not belong to that are in the organization. Only visible if the org has the publicTeams flag set to true.
-  """
-  publicTeams: [Team!]!
-
   """
   THe datetime the current billing cycle ends
   """
diff --git a/packages/server/graphql/public/types/Organization.ts b/packages/server/graphql/public/types/Organization.ts
@@ -1,7 +1,6 @@
 import {
   getUserId,
   isSuperUser,
-  isTeamMember,
   isUserBillingLeader,
   isUserOrgAdmin
 } from '../../../utils/authorization'
@@ -53,20 +52,20 @@ const Organization: OrganizationResolvers = {
     return getActiveTeamCountByOrgIds(orgId)
   },
 
-  allTeams: async ({id: orgId}, _args, {dataLoader, authToken}) => {
+  teams: async ({id: orgId}, _args, {dataLoader, authToken}) => {
     const viewerId = getUserId(authToken)
-    const [allTeamsOnOrg, isOrgAdmin] = await Promise.all([
+    const [teamsInOrg, isOrgAdmin] = await Promise.all([
       dataLoader.get('teamsByOrgIds').load(orgId),
-      dataLoader.get('organizations').loadNonNull(orgId),
       isUserOrgAdmin(viewerId, orgId, dataLoader)
     ])
-    const sortedTeamsOnOrg = allTeamsOnOrg.sort((a, b) => a.name.localeCompare(b.name))
+    const sortedTeams = teamsInOrg.sort((a, b) => a.name.localeCompare(b.name))
+
     if (isOrgAdmin || isSuperUser(authToken)) {
-      const viewerTeams = sortedTeamsOnOrg.filter((team) => authToken.tms.includes(team.id))
-      const otherTeams = sortedTeamsOnOrg.filter((team) => !authToken.tms.includes(team.id))
-      return [...viewerTeams, ...otherTeams]
+      // Org admins and super users can see all teams
+      return sortedTeams
     } else {
-      return sortedTeamsOnOrg.filter((team) => authToken.tms.includes(team.id))
+      // Regular users can see teams they're on plus public teams
+      return sortedTeams.filter((team) => team.isPublic || authToken.tms.includes(team.id))
     }
   },
 
@@ -75,52 +74,6 @@ const Organization: OrganizationResolvers = {
     return allTeamsOnOrg?.length ?? 0
   },
 
-  viewerTeams: async ({id: orgId}, _args, {dataLoader, authToken}) => {
-    const allTeamsOnOrg = await dataLoader.get('teamsByOrgIds').load(orgId)
-    return allTeamsOnOrg
-      .filter((team) => authToken.tms.includes(team.id))
-      .sort((a, b) => a.name.localeCompare(b.name))
-  },
-
-  publicTeams: async ({id: orgId}, _args, {dataLoader, authToken}) => {
-    const allTeamsOnOrg = await dataLoader.get('teamsByOrgIds').load(orgId)
-    const publicTeams = allTeamsOnOrg.filter(
-      (team) => (team.isPublic || isSuperUser(authToken)) && !isTeamMember(authToken, team.id)
-    )
-
-    const teamsWithMeetingData = await Promise.all(
-      publicTeams.map(async (team) => {
-        const [completedMeetings, activeMeetings] = await Promise.all([
-          dataLoader.get('completedMeetingsByTeamId').load(team.id),
-          dataLoader.get('activeMeetingsByTeamId').load(team.id)
-        ])
-
-        const allMeetingDates = [
-          ...completedMeetings.map((meeting) => new Date(meeting.endedAt || meeting.createdAt)),
-          ...activeMeetings.map((meeting) => new Date(meeting.createdAt))
-        ]
-
-        const lastMetAt =
-          allMeetingDates.length > 0
-            ? new Date(Math.max(...allMeetingDates.map((date) => date.getTime())))
-            : null
-
-        return {
-          ...team,
-          lastMetAt
-        }
-      })
-    )
-
-    // Show teams who met most recently first
-    return teamsWithMeetingData.sort((a, b) => {
-      if (!a.lastMetAt && !b.lastMetAt) return 0
-      if (!a.lastMetAt) return 1
-      if (!b.lastMetAt) return -1
-      return b.lastMetAt.getTime() - a.lastMetAt.getTime()
-    })
-  },
-
   viewerOrganizationUser: async ({id: orgId}, _args, {dataLoader, authToken}) => {
     const viewerId = getUserId(authToken)
     return dataLoader.get('organizationUsersByUserIdOrgId').load({userId: viewerId, orgId})

Original file line number	Diff line number	Diff line change
`@@ -19,15 +19,17 @@ const EmptyTeams = (props: Props) => {`
`19`	`19`	`fragment EmptyTeams_organization on Organization {`
`20`	`20`	`id`
`21`	`21`	`name`
`22`		`- publicTeams {`
	`22`	`+ teams {`
`23`	`23`	`id`
	`24`	`+ isViewerOnTeam`
`24`	`25`	`...PublicTeamsModal_team`
`25`	`26`	`}`
`26`	`27`	`}`
`27`	`28`	`,
`28`	`29`	`organizationRef`
`29`	`30`	`)`
`30`		`- const {id: orgId, publicTeams} = organization`
	`31`	`+ const {id: orgId, teams} = organization`
	`32`	`+ const publicTeams = teams.filter((team) => !team.isViewerOnTeam)`
`31`	`33`	`const hasPublicTeams = publicTeams.length > 0`
`32`	`34`
`33`	`35`	`const viewer = useClientQuery<EmptyTeamsQuery>(`
`@@ -90,4 +92,5 @@ const EmptyTeams = (props: Props) => {`
`90`	`92`	`</>`
`91`	`93`	`)`
`92`	`94`	`}`
	`95`	`+`
`93`	`96`	`export default EmptyTeams`
Original file line number	Diff line number	Diff line change
@@ -31,10 +31,7 @@ graphql`
`31`	`31`	`id`
`32`	`32`	`}`
`33`	`33`	`organization {`
`34`		`- allTeams {`
`35`		`- id`
`36`		`- }`
`37`		`- viewerTeams {`
	`34`	`+ teams {`
`38`	`35`	`id`
`39`	`36`	`}`
`40`	`37`	`}`
`@@ -106,7 +103,6 @@ export const archiveTeamTeamUpdater: SharedUpdater<ArchiveTeamMutation_team$data`
`106`	`103`	`const orgs = viewer.getLinkedRecords('organizations')!`
`107`	`104`	`orgs.forEach((org) => {`
`108`	`105`	`safeRemoveNodeFromArray(teamId, org, 'teams')`
`109`		`- safeRemoveNodeFromArray(teamId, org, 'allTeams')`
`110`	`106`	`})`
`111`	`107`
`112`	`108`	`const notification = payload.getLinkedRecord('notification')`
Original file line number	Diff line number	Diff line change
@@ -8,7 +8,7 @@ graphql`
`8`	`8`	`organization {`
`9`	`9`	`tier`
`10`	`10`	`billingTier`
`11`		`- viewerTeams {`
	`11`	`+ teams {`
`12`	`12`	`isPaid`
`13`	`13`	`tier`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
@@ -7,14 +7,9 @@ graphql`
`7`	`7`	`id`
`8`	`8`	`}`
`9`	`9`	`organization {`
`10`		`- allTeams {`
`11`		`- id`
`12`		`- }`
`13`		`- viewerTeams {`
`14`		`- id`
`15`		`- }`
`16`		`- publicTeams {`
	`10`	`+ teams {`
`17`	`11`	`id`
	`12`	`+ isViewerOnTeam`
`18`	`13`	`}`
`19`	`14`	`}`
`20`	`15`	`}`