Use a different GraphQL field for the list of workspaces. (#2055)

This new field returns `TeamType` objects and different behaviors for super-admins and non-super-admins. References: CV2-4938 and CV2-4704.
meedan · Aug 14, 2024 · 0cf0d20 · 0cf0d20
1 parent 39ea649
commit 0cf0d20
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/src/app/components/user/UserWorkspaces/PaginatedUserWorkspaces.js b/src/app/components/user/UserWorkspaces/PaginatedUserWorkspaces.js
@@ -218,28 +218,26 @@ const PaginatedUserWorkspaces = createPaginationContainer(
   props => (
     <UserWorkspacesComponent
       currentTeam={props.root.current_team_id}
-      numberOfTeams={props.root.team_users_count}
+      numberOfTeams={props.root.accessible_teams_count}
       pageSize={props.pageSize}
       relay={props.relay}
-      teams={props.root.team_users.edges.map(n => n.node.team) || []}
-      totalCount={props.root.team_users?.totalCount}
+      teams={props.root.accessible_teams.edges.map(edge => edge.node) || []}
+      totalCount={props.root.accessible_teams?.totalCount}
     />
   ),
   {
     root: graphql`
       fragment PaginatedUserWorkspaces_root on Me {
         current_team_id
-        team_users_count(status: "member")
-        team_users(first: $pageSize, after: $after, status: "member") @connection(key: "PaginatedUserWorkspaces_team_users"){
+        accessible_teams_count
+        accessible_teams(first: $pageSize, after: $after) @connection(key: "PaginatedUserWorkspaces_accessible_teams") {
           edges {
             node {
-              team {
-                dbid
-                name
-                avatar
-                slug
-                members_count
-              }
+              dbid
+              name
+              avatar
+              slug
+              members_count
             }
           }
           pageInfo {
@@ -254,7 +252,7 @@ const PaginatedUserWorkspaces = createPaginationContainer(
   {
     direction: 'forward',
     query: userWorkspacesQuery,
-    getConnectionFromProps: props => props.root.team_users,
+    getConnectionFromProps: props => props.root.accessible_teams,
     getFragmentVariables: (previousVars, pageSize) => ({
       ...previousVars,
       pageSize,