@acorex/modules 20.2.4-next.2 → 20.2.4-next.3

package/fesm2022/acorex-modules-conversation.mjs

@@ -17,6 +17,7 @@ import * as i2$5 from '@acorex/platform/workflow';
 import { AXPWorkflowAction, AXPWorkflowModule } from '@acorex/platform/workflow';
 import { AXMUsersEntityService } from '@acorex/modules/security-management';
 import { Subject, filter, startWith, debounceTime } from 'rxjs';
+import { AXMNotificationConnectorService, AXP_NOTIFICATION_DEFINITION_PROVIDER } from '@acorex/modules/notification-management';
 import * as i3 from '@acorex/components/avatar';
 import { AXAvatarModule } from '@acorex/components/avatar';
 import * as i2$2 from '@acorex/components/badge';
@@ -59,7 +60,6 @@ import { AXFormatModule } from '@acorex/core/format';
 import * as i4$1 from '@acorex/core/translation';
 import { AXTranslationModule, AXTranslationService } from '@acorex/core/translation';
 import { AXUnsubscriber } from '@acorex/core/utils';
-import { AXMNotificationConnectorService, AXP_NOTIFICATION_DEFINITION_PROVIDER } from '@acorex/modules/notification-management';
 import { AXPPageLayoutBaseComponent, AXPPageLayoutComponent, AXPPageLayoutBase } from '@acorex/platform/layout/views';
 import { trigger, transition, style, animate } from '@angular/animations';
 import * as i10 from '@angular/forms';
@@ -982,6 +982,28 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImpor
                 }]
         }] });
 
+function convertChatMessageToNotification(room, message, currentUser) {
+    return {
+        channel: 'InApp',
+        template: {
+            category: 'Inbox',
+            prority: 'Notice',
+            icon: 'fa-light fa-comment',
+            isPinned: false,
+        },
+        title: room.title || 'New Message',
+        body: message.message.content,
+        sender: message.author,
+        receiver: currentUser,
+        content: message.message,
+        readAt: null,
+        type: 'Chat',
+        data: {
+            roomId: room.id,
+        },
+    };
+}
+
 class AXMChatService {
 }
 class AXMChatServiceImpl {
@@ -1119,6 +1141,7 @@ class AXMChatManagementService {
         this.sessionService = inject(AXPSessionService);
         this.usersService = inject(AXMUsersEntityService);
         this.realtimeService = inject(AXMChatRealtimeService);
+        this.notificationConnectorService = inject(AXMNotificationConnectorService);
     }
     getCurrentUser() {
         const user = this.sessionService.user;
@@ -1329,6 +1352,24 @@ class AXMChatManagementService {
         const newMessage = await this.chatImplService.sendMessage(roomId, content, author, contentType, replyId);
         const formattedMessage = await this.formatMessage(newMessage);
         this.realtimeService.notifyMessage({ type: 'add', payload: formattedMessage });
+        // Create a notification when a new message is sent by someone else
+        try {
+            const currentUser = this.getCurrentUser();
+            if (formattedMessage.author.id !== currentUser.id) {
+                const room = await this.getRoom(formattedMessage.roomId);
+                const notification = convertChatMessageToNotification(room, formattedMessage, currentUser);
+                await this.notificationConnectorService.create({
+                    ...notification,
+                    id: formattedMessage.id,
+                    entityName: 'notifications',
+                    createAt: new Date(),
+                });
+            }
+        }
+        catch (error) {
+            // Non-blocking: log and continue
+            console.error('Failed to create notification for new message', error);
+        }
         return formattedMessage;
     }
     async getMessages(roomId, skip, take) {
@@ -2295,7 +2336,7 @@ class AXMUserLookupPopup extends AXBasePageComponent {
                     path: 'lookup',
                     type: 'lookup-editor',
                     options: {
-                        entity: 'SecurityManagement.users',
+                        entity: 'SecurityManagement.User',
                         multiple: true,
                     },
                 },
@@ -2458,28 +2499,6 @@ const AXMCommentPopupWorkflow = {
     },
 };
 
-function convertChatMessageToNotification(room, message, currentUser) {
-    return {
-        channel: 'InApp',
-        template: {
-            category: 'Inbox',
-            prority: 'Notice',
-            icon: 'fa-light fa-comment',
-            isPinned: false,
-        },
-        title: room.title || 'New Message',
-        body: message.message.content,
-        sender: message.author,
-        receiver: currentUser,
-        content: message.message,
-        readAt: null,
-        type: 'Chat',
-        data: {
-            roomId: room.id,
-        },
-    };
-}
-
 class AXMChatItemComponent {
     constructor() {
         // Input
@@ -2881,14 +2900,12 @@ class AXMChatComponent extends AXPPageLayoutBaseComponent {
     // Methods
     getRoomCountForTab(tab) {
         const allRooms = this.allRooms();
-        if (tab.name === 'all') {
-            return allRooms.length;
-        }
-        if (tab.name === 'unread') {
+        // For all tab types, only count rooms that have unread messages
+        if (tab.name === 'all' || tab.name === 'unread') {
             return allRooms.filter((room) => room.unreadCount > 0).length;
         }
         const includedIds = new Set(tab.includeRooms.map((r) => r.id));
-        return allRooms.filter((room) => includedIds.has(room.id)).length;
+        return allRooms.filter((room) => includedIds.has(room.id) && room.unreadCount > 0).length;
     }
     async loadTabs() {
         const localTabs = [