Fix removing __typename when cursor is undefined

cerc-io · Sep 21, 2023 · 0b7d3d1 · 0b7d3d1
1 parent 48b6488
commit 0b7d3d1
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/packages/core/src/event-aggregator/gql-service.ts b/packages/core/src/event-aggregator/gql-service.ts
@@ -305,11 +305,18 @@ export class GqlEventAggregatorService extends EventAggregatorService {
       variables,
     });
 
+    // Remove __typename from GQL query result
     const {
       __typename,
-      cursor: { __typename: cursorTypename, ...cursor },
+      cursor: gqlCursor,
       ...metadata
     } = getLogEvents.metadata;
+    let cursor: Cursor | undefined;
+
+    if (gqlCursor) {
+      const { __typename, ...cursorData } = gqlCursor;
+      cursor = cursorData;
+    }
 
     return {
       events: getLogEvents.events.map((event: any) => ({
@@ -360,7 +367,7 @@ export class GqlEventAggregatorService extends EventAggregatorService {
       metadata: {
         pageEndsAtTimestamp: number;
         counts: any[];
-        cursor: Cursor;
+        cursor?: Cursor;
         isLastPage: boolean;
       };
     };