Merge pull request #1943 from streamr-dev/front-1926-update-hub-streamr-sdk

FRONT-1926: Post-SDK-update adjustments

Author: mondoreale

src/generated/gql/network.ts

@@ -4306,8 +4306,10 @@ export type StreamPermission = {
   stream?: Maybe<Stream>;
   /** subscribeExpires timestamp tells until what time this address may subscribe to the stream */
   subscribeExpiration?: Maybe<Scalars['BigInt']['output']>;
-  /** Ethereum address, owner of this permission */
-  userAddress: Scalars['Bytes']['output'];
+  /** [DEPRECATED] Ethereum address, owner of this permission; only if permission granting didn't use *forUserId functions */
+  userAddress?: Maybe<Scalars['Bytes']['output']>;
+  /** Ethereum address or other ID, owner of this permission */
+  userId: Scalars['Bytes']['output'];
 };
 
 export type StreamPermission_Filter = {
@@ -4382,6 +4384,16 @@ export type StreamPermission_Filter = {
   userAddress_not?: InputMaybe<Scalars['Bytes']['input']>;
   userAddress_not_contains?: InputMaybe<Scalars['Bytes']['input']>;
   userAddress_not_in?: InputMaybe<Array<Scalars['Bytes']['input']>>;
+  userId?: InputMaybe<Scalars['Bytes']['input']>;
+  userId_contains?: InputMaybe<Scalars['Bytes']['input']>;
+  userId_gt?: InputMaybe<Scalars['Bytes']['input']>;
+  userId_gte?: InputMaybe<Scalars['Bytes']['input']>;
+  userId_in?: InputMaybe<Array<Scalars['Bytes']['input']>>;
+  userId_lt?: InputMaybe<Scalars['Bytes']['input']>;
+  userId_lte?: InputMaybe<Scalars['Bytes']['input']>;
+  userId_not?: InputMaybe<Scalars['Bytes']['input']>;
+  userId_not_contains?: InputMaybe<Scalars['Bytes']['input']>;
+  userId_not_in?: InputMaybe<Array<Scalars['Bytes']['input']>>;
 };
 
 export enum StreamPermission_OrderBy {
@@ -4396,7 +4408,8 @@ export enum StreamPermission_OrderBy {
   StreamMetadata = 'stream__metadata',
   StreamUpdatedAt = 'stream__updatedAt',
   SubscribeExpiration = 'subscribeExpiration',
-  UserAddress = 'userAddress'
+  UserAddress = 'userAddress',
+  UserId = 'userId'
 }
 
 export type Stream_Filter = {
@@ -5311,14 +5324,14 @@ export type GetProjectSubscriptionsQueryVariables = Exact<{
 
 export type GetProjectSubscriptionsQuery = { __typename?: 'Query', project?: { __typename?: 'Project', subscriptions: Array<{ __typename?: 'ProjectSubscription', userAddress: any, endTimestamp?: any | null }> } | null };
 
-export type StreamFieldsFragment = { __typename?: 'Stream', id: string, metadata: string, permissions?: Array<{ __typename?: 'StreamPermission', id: string, canGrant?: boolean | null, canEdit?: boolean | null, canDelete?: boolean | null, userAddress: any, subscribeExpiration?: any | null, publishExpiration?: any | null }> | null };
+export type StreamFieldsFragment = { __typename?: 'Stream', id: string, metadata: string, permissions?: Array<{ __typename?: 'StreamPermission', id: string, canGrant?: boolean | null, canEdit?: boolean | null, canDelete?: boolean | null, userId: any, subscribeExpiration?: any | null, publishExpiration?: any | null }> | null };
 
 export type GetStreamByIdQueryVariables = Exact<{
   streamId: Scalars['ID']['input'];
 }>;
 
 
-export type GetStreamByIdQuery = { __typename?: 'Query', stream?: { __typename?: 'Stream', id: string, metadata: string, permissions?: Array<{ __typename?: 'StreamPermission', id: string, canGrant?: boolean | null, canEdit?: boolean | null, canDelete?: boolean | null, userAddress: any, subscribeExpiration?: any | null, publishExpiration?: any | null }> | null } | null };
+export type GetStreamByIdQuery = { __typename?: 'Query', stream?: { __typename?: 'Stream', id: string, metadata: string, permissions?: Array<{ __typename?: 'StreamPermission', id: string, canGrant?: boolean | null, canEdit?: boolean | null, canDelete?: boolean | null, userId: any, subscribeExpiration?: any | null, publishExpiration?: any | null }> | null } | null };
 
 export type GetPagedStreamsQueryVariables = Exact<{
   first?: InputMaybe<Scalars['Int']['input']>;
@@ -5328,7 +5341,7 @@ export type GetPagedStreamsQueryVariables = Exact<{
 }>;
 
 
-export type GetPagedStreamsQuery = { __typename?: 'Query', streams: Array<{ __typename?: 'Stream', id: string, metadata: string, permissions?: Array<{ __typename?: 'StreamPermission', id: string, canGrant?: boolean | null, canEdit?: boolean | null, canDelete?: boolean | null, userAddress: any, subscribeExpiration?: any | null, publishExpiration?: any | null }> | null }> };
+export type GetPagedStreamsQuery = { __typename?: 'Query', streams: Array<{ __typename?: 'Stream', id: string, metadata: string, permissions?: Array<{ __typename?: 'StreamPermission', id: string, canGrant?: boolean | null, canEdit?: boolean | null, canDelete?: boolean | null, userId: any, subscribeExpiration?: any | null, publishExpiration?: any | null }> | null }> };
 
 export type SponsorshipDailyBucketFieldsFragment = { __typename?: 'SponsorshipDailyBucket', id: string, operatorCount: number, projectedInsolvency?: any | null, spotAPY: any, totalStakedWei: any, remainingWei: any, date: any, sponsorship: { __typename?: 'Sponsorship', id: string } };
 
@@ -5521,7 +5534,7 @@ export const StreamFieldsFragmentDoc = gql`
     canGrant
     canEdit
     canDelete
-    userAddress
+    userId
     subscribeExpiration
     publishExpiration
   }

src/hooks/streams.tsx

@@ -117,7 +117,7 @@ export async function getStreamsFromIndexer(
                       const where: Stream_Filter = {
                           permissions_: {
                               stream_contains_nocase: search,
-                              userAddress: owner,
+                              userId: owner,
                           },
                       }
 
@@ -221,7 +221,7 @@ async function getStreamsFromGraph(
     const where: Stream_Filter = {
         permissions_: {
             stream_contains_nocase: search,
-            userAddress: owner,
+            userId: owner,
         },
         [`id_${orderOperator}`]: lastId,
         id_in: streamIds,
@@ -231,8 +231,8 @@ async function getStreamsFromGraph(
         delete where.permissions_?.stream_contains_nocase
     }
 
-    if (!where.permissions_?.userAddress) {
-        delete where.permissions_?.userAddress
+    if (!where.permissions_?.userId) {
+        delete where.permissions_?.userId
     }
 
     if (Object.keys(where.permissions_ || {}).length === 0) {
@@ -369,7 +369,7 @@ function getStatsFromPermissions(
     let publisherCount: number | undefined = 0
 
     permissions.forEach((perm) => {
-        if (perm.userAddress === address0) {
+        if (perm.userId === address0) {
             /**
              * If stream has public permissions (zero address), return `undefined`
              * for counts. It means anyone can publish and subscribe.

src/queries/network.ts

@@ -394,7 +394,7 @@ gql`
             canGrant
             canEdit
             canDelete
-            userAddress
+            userId
             subscribeExpiration
             publishExpiration
         }

src/services/streams.ts

@@ -18,7 +18,7 @@ import { getGraphClient } from '~/getters/getGraphClient'
 import { OrderDirection } from '~/types'
 
 export type TheGraphStreamPermission = {
-    userAddress: string
+    userId: string
     canEdit: boolean
     canGrant: boolean
     canDelete: boolean
@@ -51,7 +51,7 @@ const calculatePubSubCount = (permissions: StreamPermission[]) => {
     permissions.forEach((perm) => {
         // If stream has public permissions (zero address), return null for counts which means that anyone can
         // publish or subscribe
-        if (perm.userAddress === address0) {
+        if (perm.userId === address0) {
             if (perm.subscribeExpiration >= Math.round(Date.now() / 1000)) {
                 subscriberCount = null
             }
@@ -145,7 +145,7 @@ export const getPagedStreams = async (
     let where: Stream_Filter = {
         permissions_: {
             stream_contains_nocase: search,
-            userAddress: owner,
+            userId: owner,
         },
         [`id_${orderOperator}`]: lastId,
     }
@@ -219,7 +219,7 @@ export const getStreamsOwnedBy = async (
         result = result.filter(
             (s) =>
                 s.permissions.find(
-                    (p) => p.userAddress.toLowerCase() === address0.toLowerCase(),
+                    (p) => p.userId.toLowerCase() === address0.toLowerCase(),
                 ) != null,
         )
     }