Fix removing __typename when cursor is undefined

cerc-io · Sep 21, 2023 · 9f8b98a · 9f8b98a
1 parent 48b6488
commit 9f8b98a
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/packages/core/src/event-aggregator/gql-service.ts b/packages/core/src/event-aggregator/gql-service.ts
@@ -305,11 +305,12 @@ export class GqlEventAggregatorService extends EventAggregatorService {
       variables,
     });
 
-    const {
-      __typename,
-      cursor: { __typename: cursorTypename, ...cursor },
-      ...metadata
-    } = getLogEvents.metadata;
+    // Remove __typename from GQL query result
+    const { __typename, cursor, ...metadata } = getLogEvents.metadata;
+
+    if (cursor) {
+      delete cursor.__typename;
+    }
 
     return {
       events: getLogEvents.events.map((event: any) => ({