@messenger-box/platform-client 10.0.3-alpha.7 → 10.0.3-alpha.72

package/src/graphql/policies/post-thread-policies.ts

@@ -1,57 +1,177 @@
 import { TypePolicies } from '@apollo/client';
+import { gql } from '@apollo/client';
+
+// Define the fragment we'll use for cache operations
+const POST_THREAD_FRAGMENT = gql`
+    fragment PostThreadInfo on PostThread {
+        replies
+        replyCount
+        lastReplyAt
+        updatedAt
+    }
+`;
 
 export const postThreadPolicies: TypePolicies = {
     ThreadMessages: {
-        // keyFields: ['messagesRefId'],
-        //keyFields: [],
         keyFields: ['data', ['channel', ['id']]],
         fields: {
             data: {
-                // keyArgs: false,
-                // merge: (existing = [], incoming = [], { readField, mergeObjects }) => {
-                //     return existing ? [...existing, ...incoming] : incoming;
-                //     // console.log('existing', existing);
-                //     // console.log('incoming', incoming);
-                //     // const merged = [...incoming];
-                //     // const existingIds = existing.map((item) => readField<String>('id', item));
-                //     // merged.forEach((item, index) => {
-                //     //     const itemId = readField<String>('id', item);
-                //     //     const existingIndex = existingIds.findIndex((id) => id === itemId);
-                //     //     if (existingIndex !== -1) {
-                //     //         merged[index] = mergeObjects(existing[existingIndex], merged[index]);
-                //     //     }
-                //     // });
-                //     // return merged;
-                // },
+                merge: (existing = [], incoming = [], { readField }) => {
+                    // Create a map for efficient lookups
+                    const threadMap = new Map();
+
+                    // Store existing threads
+                    if (existing && existing.length > 0) {
+                        for (const item of existing) {
+                            const id = readField('id', item);
+                            if (id) threadMap.set(id, item);
+                        }
+                    }
+
+                    // Add or update with incoming threads
+                    if (incoming && incoming.length > 0) {
+                        for (const item of incoming) {
+                            const id = readField('id', item);
+                            if (id) threadMap.set(id, item);
+                        }
+                    }
+
+                    // Convert back to array
+                    return Array.from(threadMap.values());
+                },
             },
             totalCount: {
-                // keyArgs: false,
-                // merge(existing, incoming) {
-                //     return existing && existing > incoming ? existing : incoming;
-                // },
+                merge(existing, incoming) {
+                    // Take the higher of the two counts
+                    return incoming !== undefined ? Math.max(existing || 0, incoming) : existing;
+                },
             },
         },
     },
     Query: {
         fields: {
             threadMessages: {
-                // keyArgs: ['channelId', 'parentId', 'limit', 'skip'],
                 keyArgs: ['channelId'],
-                //keyArgs: false,
-                merge(existing, incoming) {
-                    //  debugger;
+                merge(existing, incoming, { readField }) {
+                    if (!existing) return incoming;
+                    if (!incoming) return existing;
+
                     return {
                         ...incoming,
-                        data: [...(existing?.data ?? []), ...(incoming.data ?? [])],
+                        data: [...(existing?.data || []), ...(incoming.data || [])].filter(
+                            (item, index, self) =>
+                                // Filter out duplicates
+                                index === self.findIndex((t) => readField('id', t) === readField('id', item)),
+                        ),
                     };
                 },
             },
             getPostThread: {
-                // keyArgs: ['channelId', 'parentId', 'limit', 'skip'],
-                keyArgs: ['channelId', 'postParentId', 'limit', 'skip', 'role'],
+                keyArgs: ['channelId', 'postParentId', 'role'],
                 merge(existing, incoming, { mergeObjects }) {
-                    //  debugger;
-                    return mergeObjects(existing, incoming);
+                    if (!existing) return incoming;
+                    if (!incoming) return existing;
+
+                    // Carefully merge the two objects
+                    const result = mergeObjects(existing, incoming);
+
+                    // Special handling for replies to avoid duplicates
+                    if (existing.replies && incoming.replies) {
+                        const uniqueReplies = new Map();
+
+                        // Add existing replies
+                        for (const reply of existing.replies) {
+                            uniqueReplies.set(reply.id, reply);
+                        }
+
+                        // Add incoming replies, overwriting existing ones
+                        for (const reply of incoming.replies) {
+                            uniqueReplies.set(reply.id, reply);
+                        }
+
+                        // Replace replies with deduplicated list
+                        result.replies = Array.from(uniqueReplies.values());
+                    }
+
+                    return result;
+                },
+            },
+        },
+    },
+    // Mutation: {
+    //     fields: {
+    //         createPostThread: {
+    //             merge(existing, incoming, { cache, args, readField }) {
+    //                 // Early return if not enough data
+    //                 if (!incoming?.lastMessage || !incoming?.data || !args?.channelId || !args?.postParentId) {
+    //                     return incoming;
+    //                 }
+
+    //                 try {
+    //                     // Use type policies to handle the cache update instead of direct manipulation
+    //                     const queryRef = cache.identify({
+    //                         __typename: 'Query',
+    //                         getPostThread: {
+    //                             channelId: args.channelId,
+    //                             postParentId: args.postParentId,
+    //                             role: args.threadMessageInput?.role
+    //                         }
+    //                     });
+
+    //                     // Use cache.modify which doesn't require fragments
+    //                     if (queryRef) {
+    //                         cache.modify({
+    //                             id: queryRef,
+    //                             fields: {
+    //                                 getPostThread(existingThread = {}) {
+    //                                     if (!existingThread) return existingThread;
+
+    //                                     // Create a new object with the updated properties
+    //                                     return {
+    //                                         ...existingThread,
+    //                                         replies: [incoming.lastMessage, ...(existingThread.replies || [])],
+    //                                         replyCount: (existingThread.replyCount || 0) + 1,
+    //                                         lastReplyAt: incoming.lastMessage.createdAt,
+    //                                         updatedAt: incoming.lastMessage.createdAt
+    //                                     };
+    //                                 }
+    //                             }
+    //                         });
+    //                     }
+    //                 } catch (error) {
+    //                     console.error('Error updating cache in createPostThread policy:', error);
+    //                 }
+
+    //                 return incoming;
+    //             },
+    //         },
+    //     },
+    // },
+    PostThread: {
+        fields: {
+            replies: {
+                merge(existing = [], incoming = [], { readField }) {
+                    // Use a map for fast deduplication
+                    const replyMap = new Map();
+
+                    // Add existing replies
+                    if (existing && existing.length > 0) {
+                        for (const reply of existing) {
+                            const id = readField('id', reply);
+                            if (id) replyMap.set(id, reply);
+                        }
+                    }
+
+                    // Add or update with incoming replies
+                    if (incoming && incoming.length > 0) {
+                        for (const reply of incoming) {
+                            const id = readField('id', reply);
+                            if (id) replyMap.set(id, reply);
+                        }
+                    }
+
+                    // Convert back to array
+                    return Array.from(replyMap.values());
                 },
             },
         },

package/src/graphql/policies/teams-policies.ts

@@ -2,6 +2,18 @@ import { TypePolicies } from '@apollo/client';
 
 export const teamPolicies: TypePolicies = {
     Query: {
-        fields: {},
+        fields: {
+            getOrganizationTeams: {
+                merge(existing = [], incoming) {
+                    return incoming;
+                },
+                read(existing) {
+                    return existing;
+                },
+            },
+        },
+    },
+    AccountTeam: {
+        keyFields: ['_id'],
     },
 };

package/src/graphql/queries/channels-by-user.gql

@@ -14,6 +14,32 @@ query GetChannelsByUser($role: String, $criteria: AnyObject, $limit: Int, $skip:
         creator {
             ...MessengerUser
         }
+        lastPostAt
+        createdAt
+        updatedAt
+    }
+}
+
+
+query GetChannelsByUserWithLastMessage($role: String, $criteria: AnyObject, $limit: Int, $skip: Int, $sort: Sort) {
+    channelsByUser(role: $role, criteria: $criteria, limit: $limit, skip: $skip, sort: $sort) {
+        id
+        title
+        description
+        type
+        displayName
+        members {
+            id
+            user {
+                ...MessengerUser
+            }
+        }
+        creator {
+            ...MessengerUser
+        }
+        lastMessage {
+            ...Post
+        }
         createdAt
         updatedAt
     }

package/src/graphql/queries/organization-query.gql

@@ -1,56 +1,99 @@
 query GetOrganizationDetail($where: OrgDetailWhere!) {
     getOrganizationDetail(where: $where) {
-        createdAt
-        description
         id
+        name
+        title
+        description
+        picture
+        orgUserCount
+        status
+        periodStart
+        periodStop
+        createdAt
+        updatedAt
+        billingEmail
+        stripeId
+        stripeSubscription
+        erpId
+        costCenter
+        legalEntityName
+        taxId
+        organizationType
+        organizationCategory
+        resources
+        settings
+        contributionRoles {
+            id
+            name
+            target
+            description
+        }
         invitations {
-            active
-            acceptedAt
-            createdAt
+            id
             email
+            roles
+            status
             fullName
-            id
-            invitedBy
-            teamId
-            updatedAt
-            tokenExpiration
-            role
             inviteCount
+            invitedBy {
+                id
+                email
+                username
+                givenName
+                familyName
+                picture
+            }
+            inviteLink
+            createdAt
+            updatedAt
+            acceptedAt
+            sent
+            expiresAt
+            team {
+                id
+                name
+                title
+            }
         }
-        name
-        orgMembers {
+        members {
+            id
+            email
+            displayName
+            roles
+            status
+            lastVisited
+            joinedAt
+            isBillingLeader
+            createdAt
+            updatedAt
             crossCheckEmail
-            inactive
-            orgName
             user {
+                id
                 email
+                username
+                givenName
+                familyName
+                picture
                 alias
                 emailVerified
-                id
-                username
             }
-            roles
-            userId
         }
-        orgUserCount
-        periodStart
-        periodStop
-        picture
-        status
-        title
-        updatedAt
     }
 }
 
-
-
-
-query GetOrganizationMembersWithChannels($orgName: String,$role: String, $channelCriteria: AnyObject,$offset: Int, $limit: Int, $sort: Sort) {
-     getOrganizationMembers(offset: $offset, limit: $limit, orgName: $orgName) {
+query GetOrganizationMembersWithChannels($orgId: ID, $orgName: String, $role: String, $channelCriteria: AnyObject, $offset: Int, $limit: Int, $sort: Sort) {
+    getOrganizationMembers(offset: $offset, limit: $limit, orgId: $orgId, orgName: $orgName) {
         totalCount
         data {
+            _id
             userId
             roles
+            inactive
+            orgName
+            crossCheckEmail
+            teamNames
+            lastVisited
+            isSelf
             user {
                 id
                 givenName
@@ -59,11 +102,11 @@ query GetOrganizationMembersWithChannels($orgName: String,$role: String, $channe
                 username
                 email
                 alias
+                emailVerified
             }
-            teamNames
         }
-     }
-     channelsByUser(role: $role, criteria: $channelCriteria, limit: $limit, skip: $offset, sort: $sort) {
+    }
+    channelsByUser(role: $role, criteria: $channelCriteria, limit: $limit, skip: $offset, sort: $sort) {
         id
         title
         description
@@ -85,6 +128,6 @@ query GetOrganizationMembersWithChannels($orgName: String,$role: String, $channe
 }
 
 query GetOrganizationSharableLink($teamId: String) {
-  getOrganizationSharableLink(teamId: $teamId)
+    getOrganizationSharableLink(teamId: $teamId)
 }
 

package/src/graphql/queries/post-thread-message.gql

@@ -18,3 +18,7 @@ query GetPostThread($postThreadId: ID, $channelId: ID, $postParentId: ID, $role:
     }
   }
 }
+
+query ThreadMessagesCount($channelId: ID, $postParentId: ID, $role: String, $participantsIds: [String], $selectedFields: String, $isServiceThreads: Boolean) {
+  threadMessagesCount(channelId: $channelId, postParentId: $postParentId, role: $role, participantsIds: $participantsIds, selectedFields: $selectedFields, isServiceThreads: $isServiceThreads)
+}

package/src/graphql/queries/teams-query.gql

@@ -1,32 +1,82 @@
 
 
-query GetOrganizationTeam($orgName: String!, $teamName: String!) {
-  getTeam(orgName: $orgName, teamName: $teamName) {
-    title
-    orgName
-    name
-    id
-    createdAt
-    updatedAt
-    _id
-    teamMembers:members {
-      id
-      name
-      email
-      username
-      userId
-      status
-      role
+query GetOrganizationTeam($orgName: String!, $teamId: ID!) {
+  getTeam(orgName: $orgName, teamId: $teamId) {
+        id
+        name
+        title
+        description
+        tags
+        status
+        visibility
+        joinMethod
+        inviteCode
+        isCommunity
+        verificationLevel
+        defaultNotifications
+        guidelines
+        welcomeMessage
+        connectionId
+        metadata
+        createdAt
+        updatedAt
+        updatedBy {
+            id
+            email
+            username
+            givenName
+            familyName
+            picture
+        }
+        organization {
+            id
+            name
+            title
+            description
+            picture
+        }
+        parentTeam {
+            id
+            name
+            title
+            description
+        }
+        teamMembers:members {
+            id
+            roles
+            status
+            joinedAt
+            lastActiveAt
+            memberOrigin
+            connectionId
+            user {
+                id
+                email
+                username
+                givenName
+                familyName
+                picture
+                alias
+                emailVerified
+            }
+            orgMember {
+                id
+                email
+                displayName
+                roles
+                status
+                lastVisited
+                joinedAt
+                isBillingLeader
+                crossCheckEmail
+            }
+            originOrg {
+                id
+                name
+                title
+                description
+                picture
+            }
+        }
     }
-    members {
-      id
-      name
-      email
-      username
-      userId
-      status
-      role
-    }
-  }
-}
-
+}

package/src/graphql/queries/user-account.gql

@@ -1,4 +1,4 @@
-query UserAccount($userId:String!){
+query UserAccount($userId:ID!){
     getUserAccount(userId:$userId ){
         ...MessengerUser
     }

package/src/graphql/queries/users.gql

@@ -4,7 +4,7 @@ query GetAllUsers {
     }
 }
 
-query GetUserById($userId: String!) {
+query GetUserById($userId: ID!) {
     getUserAccount(userId: $userId) {
         ...MinimalUser
     }

package/src/hooks/use-upload-file.hook.native.ts

@@ -1,8 +1,5 @@
 import { useUploadFile as useBaseUploadFile } from '@container-stack/file-info-client/lib/hooks/use-file-upload.native.js';
-import {
-    useAttachUploadedFileToMessageMutation,
-    useCreateMessageFileUploadLinkMutation,
-} from 'common/lib/generated/generated.js';
+import { useAttachUploadedFileToMessageMutation, useCreateMessageFileUploadLinkMutation } from 'common/graphql';
 
 export const useUploadFile = (): ReturnType<typeof useBaseUploadFile> =>
     useBaseUploadFile({

package/src/hooks/use-upload-file.hook.ts

@@ -1,8 +1,5 @@
 import { useUploadFile as useBaseUploadFile } from '@container-stack/file-info-client/lib/hooks/use-upload-file.js';
-import {
-    useAttachUploadedFileToMessageMutation,
-    useCreateMessageFileUploadLinkMutation,
-} from 'common/lib/generated/generated.js';
+import { useAttachUploadedFileToMessageMutation, useCreateMessageFileUploadLinkMutation } from 'common/graphql';
 
 export const useUploadFile = (): ReturnType<typeof useBaseUploadFile> =>
     useBaseUploadFile({

package/src/hooks/use-upload-files.hook.native.ts

@@ -1,8 +1,5 @@
 import { useUploadFile } from '@container-stack/file-info-client/lib/hooks/use-file-upload.native.js';
-import {
-    useAttachUploadedFilesToMessageMutation,
-    useCreateMessageFilesUploadLinkMutation,
-} from 'common/lib/generated/generated.js';
+import { useAttachUploadedFilesToMessageMutation, useCreateMessageFilesUploadLinkMutation } from 'common/graphql';
 
 export const useUploadFiles = (): ReturnType<typeof useUploadFile> =>
     useUploadFile({

package/src/hooks/use-upload-files.hook.ts

@@ -1,8 +1,5 @@
 import { useUploadFile } from '@container-stack/file-info-client/lib/hooks/use-upload-file.js';
-import {
-    useAttachUploadedFilesToMessageMutation,
-    useCreateMessageFilesUploadLinkMutation,
-} from 'common/lib/generated/generated.js';
+import { useAttachUploadedFilesToMessageMutation, useCreateMessageFilesUploadLinkMutation } from 'common/graphql';
 
 export const useUploadFiles = (): ReturnType<typeof useUploadFile> =>
     useUploadFile({