chore(workspaces): fix graphql enum

packages/server/codegen.yml

@@ -9,7 +9,6 @@ generates:
       - 'typescript-resolvers'
     config:
       contextType: '@/modules/shared/helpers/typeHelper#GraphQLContext'
-      allowParentTypeOverride: true
       mappers:
         Stream: '@/modules/core/helpers/graphTypes#StreamGraphQLReturn'
         Commit: '@/modules/core/helpers/graphTypes#CommitGraphQLReturn'
@@ -107,8 +106,6 @@ config:
   scalars:
     JSONObject: Record<string, unknown>
     DateTime: Date
-  enumValues:
-    WorkspaceJoinRequestStatus: '@/modules/workspacesCore/helpers/graphTypes#WorkspaceJoinRequestStatusGraphQLReturn'
 require:
   - ts-node/register
   - tsconfig-paths/register

packages/server/modules/cross-server-sync/graph/generated/graphql.ts

@@ -1,4 +1,3 @@
-import { WorkspaceJoinRequestStatusGraphQLReturn as WorkspaceJoinRequestStatus } from '@/modules/workspacesCore/helpers/graphTypes';
 export type Maybe<T> = T | null;
 export type InputMaybe<T> = Maybe<T>;
 export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
@@ -4406,7 +4405,11 @@ export type WorkspaceJoinRequestCollection = {
   totalCount: Scalars['Int']['output'];
 };
 
-export { WorkspaceJoinRequestStatus };
+export enum WorkspaceJoinRequestStatus {
+  Accepted = 'accepted',
+  Denied = 'denied',
+  Pending = 'pending'
+}
 
 export type WorkspaceMutations = {
   __typename?: 'WorkspaceMutations';

packages/server/modules/workspaces/graph/resolvers/workspaceJoinRequests.ts

@@ -18,6 +18,7 @@ export default {
           limit: number
           cursor?: string
           filter: {
+            workspaceId: string
             userId: string
             status?: WorkspaceJoinRequestStatus | null
           }

packages/server/modules/workspaces/repositories/workspaceJoinRequests.ts

@@ -74,7 +74,7 @@ export const getAdminWorkspaceJoinRequestsFactory =
       query.andWhere(WorkspaceJoinRequests.col.createdAt, '<', cursor)
     }
     return await query
-      .select<WorkspaceJoinRequest>(WorkspaceJoinRequests.cols)
+      .select<WorkspaceJoinRequest[]>(WorkspaceJoinRequests.cols)
       .orderBy(WorkspaceJoinRequests.col.createdAt, 'desc')
       .limit(limit)
   }

packages/server/modules/workspacesCore/domain/types.ts

@@ -67,11 +67,7 @@ export type WorkspaceRegionAssignment = {
   createdAt: Date
 }
 
-export type WorkspaceJoinRequestStatus =
-  | 'pending'
-  | 'accepted'
-  | 'rejected'
-  | 'dismissed'
+export type WorkspaceJoinRequestStatus = 'pending' | 'accepted' | 'denied' | 'dismissed'
 
 export type WorkspaceJoinRequest = {
   workspaceId: string

packages/server/modules/workspacesCore/helpers/graphTypes.ts

@@ -1,20 +1,12 @@
 import { MutationsObjectGraphQLReturn } from '@/modules/core/helpers/graphTypes'
-import { LimitedUserRecord, UserRecord } from '@/modules/core/helpers/types'
+import { LimitedUserRecord } from '@/modules/core/helpers/types'
 import { WorkspaceSsoProviderRecord } from '@/modules/workspaces/domain/sso/types'
 import { WorkspaceTeamMember } from '@/modules/workspaces/domain/types'
-import {
-  Workspace,
-  WorkspaceJoinRequest,
-  WorkspaceJoinRequestStatus
-} from '@/modules/workspacesCore/domain/types'
+import { Workspace, WorkspaceJoinRequest } from '@/modules/workspacesCore/domain/types'
 import { WorkspaceRoles } from '@speckle/shared'
 
 export type WorkspaceGraphQLReturn = Workspace
-export type WorkspaceJoinRequestGraphQLReturn = WorkspaceJoinRequest & {
-  user: UserRecord
-  workspace: Workspace
-}
-export type WorkspaceJoinRequestStatusGraphQLReturn = WorkspaceJoinRequestStatus
+export type WorkspaceJoinRequestGraphQLReturn = WorkspaceJoinRequest
 export type WorkspaceBillingGraphQLReturn = { parent: Workspace }
 export type WorkspaceSsoGraphQLReturn = WorkspaceSsoProviderRecord
 export type WorkspaceMutationsGraphQLReturn = MutationsObjectGraphQLReturn

packages/server/test/graphql/generated/graphql.ts

@@ -1,4 +1,3 @@
-import { WorkspaceJoinRequestStatusGraphQLReturn as WorkspaceJoinRequestStatus } from '@/modules/workspacesCore/helpers/graphTypes';
 import { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/core';
 export type Maybe<T> = T | null;
 export type InputMaybe<T> = Maybe<T>;
@@ -4407,7 +4406,11 @@ export type WorkspaceJoinRequestCollection = {
   totalCount: Scalars['Int']['output'];
 };
 
-export { WorkspaceJoinRequestStatus };
+export enum WorkspaceJoinRequestStatus {
+  Accepted = 'accepted',
+  Denied = 'denied',
+  Pending = 'pending'
+}
 
 export type WorkspaceMutations = {
   __typename?: 'WorkspaceMutations';