From 2719f3ed815daa3b017dc2f76087478a1dfd475d Mon Sep 17 00:00:00 2001 From: Adam Coffman Date: Thu, 25 Apr 2024 18:21:41 -0500 Subject: [PATCH] match query shape to fix pagination --- .../variants-menu/variants-menu.component.ts | 3 +-- .../variants/variants-menu/variants-menu.gql | 7 ++++-- client/src/app/generated/civic.apollo.ts | 23 +++++++++++-------- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/client/src/app/components/variants/variants-menu/variants-menu.component.ts b/client/src/app/components/variants/variants-menu/variants-menu.component.ts index 016225b7e..2fdf78169 100644 --- a/client/src/app/components/variants/variants-menu/variants-menu.component.ts +++ b/client/src/app/components/variants/variants-menu/variants-menu.component.ts @@ -86,8 +86,7 @@ export class CvcVariantsMenuComponent implements OnInit { ) this.menuVariants$ = connection$.pipe( - map((c) => c.nodes), - filter(isNonNulled) + map((c) => c.edges.map((e) => e.node), filter(isNonNulled)) ) this.totalVariants$ = connection$.pipe(map((c) => c.totalCount)) diff --git a/client/src/app/components/variants/variants-menu/variants-menu.gql b/client/src/app/components/variants/variants-menu/variants-menu.gql index 90aaed734..86108f911 100644 --- a/client/src/app/components/variants/variants-menu/variants-menu.gql +++ b/client/src/app/components/variants/variants-menu/variants-menu.gql @@ -27,8 +27,11 @@ query VariantsMenu( hasPreviousPage hasNextPage } - nodes { - ...menuVariant + edges{ + cursor + node { + ...menuVariant + } } } } diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts index fddac1228..6115ff425 100644 --- a/client/src/app/generated/civic.apollo.ts +++ b/client/src/app/generated/civic.apollo.ts @@ -90,7 +90,7 @@ export type ActivityInterface = { /** The connection type for ActivityInterface. */ export type ActivityInterfaceConnection = { __typename: 'ActivityInterfaceConnection'; - /** List of activity types that have occured on this entity. */ + /** List of activity types that have occurred on this entity. */ activityTypes: Array; /** A list of edges. */ edges: Array; @@ -1594,7 +1594,7 @@ export type EventConnection = { __typename: 'EventConnection'; /** A list of edges. */ edges: Array; - /** List of event types that have occured on this entity. */ + /** List of event types that have occurred on this entity. */ eventTypes: Array; /** A list of nodes. */ nodes: Array; @@ -3305,7 +3305,7 @@ export enum MolecularProfileDisplayFilter { WithAccepted = 'WITH_ACCEPTED', /** Display only molecular profiles which have evidence in either an accepted or submitted state. */ WithAcceptedOrSubmitted = 'WITH_ACCEPTED_OR_SUBMITTED', - /** Display molecular profiles which have at least one submited evidence item. */ + /** Display molecular profiles which have at least one submitted evidence item. */ WithSubmitted = 'WITH_SUBMITTED' } @@ -3415,7 +3415,7 @@ export type Mutation = { */ rejectRevisions?: Maybe; /** - * Resolve a flag on a CIViC entity indicating that it was either erronously flagged or the issue has been resolved. + * Resolve a flag on a CIViC entity indicating that it was either erroneously flagged or the issue has been resolved. * Any user may resolve their own flag however only editors with valid conflict * of interest statements can resolve other flags. */ @@ -3448,7 +3448,7 @@ export type Mutation = { suggestVariantGroupRevision?: Maybe; /** Unsubscribe from a CIViC entity to stop receiving notifications about it. */ unsubscribe?: Maybe; - /** Update the currentlly logged in User's Conflict of Interest statement */ + /** Update the currently logged in User's Conflict of Interest statement */ updateCoi?: Maybe; /** Mark one or more notifications as read/unread. The notification IDs provided must belong to the requesting user. */ updateNotificationStatus?: Maybe; @@ -3765,7 +3765,7 @@ export type NotificationConnection = { __typename: 'NotificationConnection'; /** A list of edges. */ edges: Array; - /** List of event types that have occured on this entity. */ + /** List of event types that have occurred on this entity. */ eventTypes: Array; /** Users who have mentioned you. */ mentioningUsers: Array; @@ -4265,6 +4265,8 @@ export type QueryActivitiesArgs = { first?: InputMaybe; last?: InputMaybe; mode?: InputMaybe; + occuredAfter?: InputMaybe; + occuredBefore?: InputMaybe; organizationId?: InputMaybe>; sortBy?: InputMaybe; subject?: InputMaybe>; @@ -7590,7 +7592,7 @@ export type VariantsMenuQueryVariables = Exact<{ }>; -export type VariantsMenuQuery = { __typename: 'Query', variants: { __typename: 'VariantInterfaceConnection', totalCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasPreviousPage: boolean, hasNextPage: boolean }, nodes: Array<{ __typename: 'FactorVariant', id: number, name: string, link: string, flagged: boolean } | { __typename: 'GeneVariant', id: number, name: string, link: string, flagged: boolean } | { __typename: 'Variant', id: number, name: string, link: string, flagged: boolean }> } }; +export type VariantsMenuQuery = { __typename: 'Query', variants: { __typename: 'VariantInterfaceConnection', totalCount: number, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasPreviousPage: boolean, hasNextPage: boolean }, edges: Array<{ __typename: 'VariantInterfaceEdge', cursor: string, node?: { __typename: 'FactorVariant', id: number, name: string, link: string, flagged: boolean } | { __typename: 'GeneVariant', id: number, name: string, link: string, flagged: boolean } | { __typename: 'Variant', id: number, name: string, link: string, flagged: boolean } | undefined }> } }; export type VariantTypesForFeatureQueryVariables = Exact<{ featureId?: InputMaybe; @@ -13347,8 +13349,11 @@ export const VariantsMenuDocument = gql` hasPreviousPage hasNextPage } - nodes { - ...menuVariant + edges { + cursor + node { + ...menuVariant + } } } }