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

package/conversation/index.d.ts

@@ -225,6 +225,7 @@ declare class AXMChatManagementService {
     private readonly sessionService;
     private readonly usersService;
     private readonly realtimeService;
+    private readonly notificationConnectorService;
     private getCurrentUser;
     private getUserInfo;
     private formatMessage;

package/customer-management/index.d.ts

@@ -0,0 +1,167 @@
+import * as i0 from '@angular/core';
+
+declare const RootConfig: {
+    config: {
+        i18n: string;
+        module: string;
+    };
+    module: {
+        route: string;
+        name: string;
+        title: string;
+        icon: string;
+    };
+    entities: {
+        customer: {
+            name: string;
+            source: string;
+            title: string;
+            titlePlural: string;
+            icon: string;
+        };
+        customerType: {
+            name: string;
+            source: string;
+            title: string;
+            titlePlural: string;
+            icon: string;
+        };
+        customerSegment: {
+            name: string;
+            source: string;
+            title: string;
+            titlePlural: string;
+            icon: string;
+        };
+        lead: {
+            name: string;
+            source: string;
+            title: string;
+            titlePlural: string;
+            icon: string;
+        };
+        opportunity: {
+            name: string;
+            source: string;
+            title: string;
+            titlePlural: string;
+            icon: string;
+        };
+        opportunityStage: {
+            name: string;
+            source: string;
+            title: string;
+            titlePlural: string;
+            icon: string;
+        };
+        salesPipeline: {
+            name: string;
+            source: string;
+            title: string;
+            titlePlural: string;
+            icon: string;
+        };
+        activity: {
+            name: string;
+            source: string;
+            title: string;
+            titlePlural: string;
+            icon: string;
+        };
+        dealContactRole: {
+            name: string;
+            source: string;
+            title: string;
+            titlePlural: string;
+            icon: string;
+        };
+        lifecycleStage: {
+            name: string;
+            source: string;
+            title: string;
+            titlePlural: string;
+            icon: string;
+        };
+        salesTerritory: {
+            name: string;
+            source: string;
+            title: string;
+            titlePlural: string;
+            icon: string;
+        };
+    };
+};
+
+declare class AXMCustomerManagementCustomerEntityModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<AXMCustomerManagementCustomerEntityModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AXMCustomerManagementCustomerEntityModule, never, never, never>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<AXMCustomerManagementCustomerEntityModule>;
+}
+
+declare class AXMCustomerManagementCustomerTypeEntityModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<AXMCustomerManagementCustomerTypeEntityModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AXMCustomerManagementCustomerTypeEntityModule, never, never, never>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<AXMCustomerManagementCustomerTypeEntityModule>;
+}
+
+declare class AXMCustomerManagementCustomerSegmentEntityModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<AXMCustomerManagementCustomerSegmentEntityModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AXMCustomerManagementCustomerSegmentEntityModule, never, never, never>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<AXMCustomerManagementCustomerSegmentEntityModule>;
+}
+
+declare class AXMCustomerManagementLeadEntityModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<AXMCustomerManagementLeadEntityModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AXMCustomerManagementLeadEntityModule, never, never, never>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<AXMCustomerManagementLeadEntityModule>;
+}
+
+declare class AXMCustomerManagementOpportunityStageEntityModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<AXMCustomerManagementOpportunityStageEntityModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AXMCustomerManagementOpportunityStageEntityModule, never, never, never>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<AXMCustomerManagementOpportunityStageEntityModule>;
+}
+
+declare class AXMCustomerManagementSalesPipelineEntityModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<AXMCustomerManagementSalesPipelineEntityModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AXMCustomerManagementSalesPipelineEntityModule, never, never, never>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<AXMCustomerManagementSalesPipelineEntityModule>;
+}
+
+declare class AXMCustomerManagementLifecycleStageEntityModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<AXMCustomerManagementLifecycleStageEntityModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AXMCustomerManagementLifecycleStageEntityModule, never, never, never>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<AXMCustomerManagementLifecycleStageEntityModule>;
+}
+
+declare class AXMCustomerManagementSalesTerritoryEntityModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<AXMCustomerManagementSalesTerritoryEntityModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AXMCustomerManagementSalesTerritoryEntityModule, never, never, never>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<AXMCustomerManagementSalesTerritoryEntityModule>;
+}
+
+declare class AXMCustomerManagementOpportunityEntityModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<AXMCustomerManagementOpportunityEntityModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AXMCustomerManagementOpportunityEntityModule, never, never, never>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<AXMCustomerManagementOpportunityEntityModule>;
+}
+
+declare class AXMCustomerManagementActivityEntityModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<AXMCustomerManagementActivityEntityModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AXMCustomerManagementActivityEntityModule, never, never, never>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<AXMCustomerManagementActivityEntityModule>;
+}
+
+declare class AXMCustomerManagementDealContactRoleEntityModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<AXMCustomerManagementDealContactRoleEntityModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AXMCustomerManagementDealContactRoleEntityModule, never, never, never>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<AXMCustomerManagementDealContactRoleEntityModule>;
+}
+
+declare class AXMCustomerManagementModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<AXMCustomerManagementModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AXMCustomerManagementModule, never, [typeof AXMCustomerManagementCustomerEntityModule, typeof AXMCustomerManagementCustomerTypeEntityModule, typeof AXMCustomerManagementCustomerSegmentEntityModule, typeof AXMCustomerManagementLeadEntityModule, typeof AXMCustomerManagementOpportunityStageEntityModule, typeof AXMCustomerManagementSalesPipelineEntityModule, typeof AXMCustomerManagementLifecycleStageEntityModule, typeof AXMCustomerManagementSalesTerritoryEntityModule, typeof AXMCustomerManagementOpportunityEntityModule, typeof AXMCustomerManagementActivityEntityModule, typeof AXMCustomerManagementDealContactRoleEntityModule], never>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<AXMCustomerManagementModule>;
+}
+
+export { AXMCustomerManagementModule, RootConfig };

package/document-management/index.d.ts

@@ -1,13 +1,15 @@
 import * as i0 from '@angular/core';
 import { Injector } from '@angular/core';
 import * as i1 from '@acorex/platform/layout/components';
+import { AXPDynamicFormDefinition } from '@acorex/platform/layout/components';
 import * as i7 from '@acorex/platform/layout/builder';
-import { AXPMetaDataDefinition } from '@acorex/platform/layout/builder';
+import { AXPMetaDataDefinition, AXPWidgetConfig, AXPValueWidgetComponent, AXPWidgetNode, AXPColumnWidgetComponent } from '@acorex/platform/layout/builder';
 import * as i9 from '@acorex/components/media-viewer';
 import * as i10 from '@acorex/platform/workflow';
 import { AXPEntity, AXPMenuProvider, AXPMenuProviderContext, AXPSearchCommandProvider, AXPSearchResult, AXPSettingDefinitionProvider, AXPSettingDefinitionProviderContext } from '@acorex/platform/common';
 import { AXPEntityModel, AXMEntityCrudServiceImpl, AXPEntityDefinitionLoader, AXPEntityDefinitionPreloader, AXPEntityPreloadEntity } from '@acorex/platform/layout/entity';
-import { AXPApplicationUserReference, AXPFileListItem } from '@acorex/platform/core';
+import { AXPApplicationUserReference, AXPFileListItem, AXPExpression, AXPRequiredValidationRule, AXPContextData, AXPContextChangeEvent } from '@acorex/platform/core';
+import { AXFileService } from '@acorex/core/file';
 
 declare class AXMDriveChooseModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<AXMDriveChooseModule, never>;
@@ -68,6 +70,12 @@ declare const RootConfig: {
         icon: string;
     };
     entities: {
+        documentRelated: {
+            name: string;
+            title: string;
+            titlePlural: string;
+            icon: string;
+        };
         distributionInteraction: {
             name: string;
             title: string;
@@ -188,12 +196,17 @@ declare class AXMReviewServiceImpl extends AXMReviewService {
 }
 
 type AXMDocumentWorkflowPhase = 'Draft' | 'PendingReview' | 'Rejected' | 'Reviewed' | 'Distributed' | 'Completed';
+interface AXMDocumentMeta {
+    name: string;
+    title: string;
+    value: string;
+}
 interface AXMDocumentManagementDocumentEntityModel extends AXPEntityModel<string> {
     name: string;
     title: string;
     documentType: AXMDocumentManagementDocumentTypeEntityModel;
     parentId: string;
-    fileId: string;
+    fileId: string | AXPFileListItem | any;
     refRecordId?: string;
     refEntity?: string;
     description?: string;
@@ -202,15 +215,9 @@ interface AXMDocumentManagementDocumentEntityModel extends AXPEntityModel<string
     reviewRecordId?: string;
     expirationDate?: Date;
     fileData?: AXPFileListItem[];
-    status: AXMDocumentWorkflowPhase;
+    status?: AXMDocumentWorkflowPhase;
     documentReview?: AXMDocumentManagementReviewEntityModel;
-    meta?: {
-        [key: string]: {
-            name: string;
-            title: string;
-            value: string;
-        };
-    };
+    meta?: Record<string, AXMDocumentMeta>;
 }
 interface GetNextStatusOptions {
     current: AXMDocumentWorkflowPhase;
@@ -384,6 +391,8 @@ declare class AXMDistributionInteractionServiceImpl extends AXMDistributionInter
     static ɵprov: i0.ɵɵInjectableDeclaration<AXMDistributionInteractionServiceImpl>;
 }
 
+declare function documentRelatedFactory(injector: Injector): Promise<AXPEntity | null>;
+
 declare class AXMEntityProvider implements AXPEntityDefinitionLoader, AXPEntityDefinitionPreloader {
     private injector;
     preload(): AXPEntityPreloadEntity[];
@@ -406,5 +415,82 @@ declare class AXMSettingProvider implements AXPSettingDefinitionProvider {
     provide(context: AXPSettingDefinitionProviderContext): Promise<void>;
 }
 
-export { AXMDistributionInteractionService, AXMDistributionInteractionServiceImpl, AXMDistributionService, AXMDistributionServiceImpl, AXMDocumentManagementDocumentEntityModule, AXMDocumentManagementDocumentTypeEntityModule, AXMDocumentManagementDocumentTypeMetaDefinitionEntityModule, AXMDocumentManagementDocumentTypeMetaDefinitionEntityService, AXMDocumentManagementDocumentTypeMetaDefinitionEntityServiceImpl, AXMDocumentManagementDocumentTypeMetaValueEntityModule, AXMDocumentManagementDocumentTypeMetaValueEntityService, AXMDocumentManagementDocumentTypeMetaValueEntityServiceImpl, AXMDocumentManagementDocumentTypeStatusDefinitionEntityModule, AXMDocumentManagementDocumentTypeStatusDefinitionEntityService, AXMDocumentManagementDocumentTypeStatusDefinitionEntityServiceImpl, AXMDocumentManagementModule, AXMDocumentService, AXMDocumentServiceImpl, AXMDocumentTypeService, AXMDocumentTypeServiceImpl, AXMEntityProvider, AXMFolderService, AXMFolderServiceImpl, AXMMenuProvider, AXMReviewService, AXMReviewServiceImpl, AXMSearchCommandProvider, AXMSettingProvider, RootConfig, canTransition, distributionFactory, distributionInteractionFactory, documentFactory, documentTypeFactory, documentTypeMetaDefinitionfactory, documentTypeMetaValueFactory, documentTypeStatusDefinitionFactory, folderFactory, getNextStatus, reviewFactory };
-export type { AXMDistributionInteractionSummary, AXMDocumentInheritanceType, AXMDocumentManagementDistributionEntityModel, AXMDocumentManagementDistributionInteractionEntityModel, AXMDocumentManagementDocumentEntityModel, AXMDocumentManagementDocumentTypeEntityModel, AXMDocumentManagementDocumentTypeMetaDefinitionEntityModel, AXMDocumentManagementDocumentTypeMetaValueEntityModel, AXMDocumentManagementDocumentTypeStatusDefinitionEntityModel, AXMDocumentManagementFolderCreateDto, AXMDocumentManagementFolderEntityModel, AXMDocumentManagementFolderGetDto, AXMDocumentManagementReviewEntityModel, AXMDocumentWorkflowPhase, DocumentTypeFileOutput };
+declare const AXPDocumentUploaderWidget: AXPWidgetConfig;
+declare module '@acorex/platform/layout/builder' {
+    interface AXPWidgetTypesMap {
+        documentUploader: 'document-uploader';
+    }
+}
+interface AXPDocumentUploaderWidgetOptions {
+    disabled?: boolean | AXPExpression;
+    readonly?: boolean | AXPExpression;
+    multiple?: boolean;
+    downloadable?: boolean;
+    accept?: string;
+    fileEditable?: boolean;
+    validations?: AXPRequiredValidationRule[];
+}
+
+declare class AXPDocumentUploaderWidgetDesignerComponent extends AXPValueWidgetComponent<AXPFileListItem[]> {
+    protected placeholder: i0.Signal<string>;
+    protected disabled: i0.Signal<boolean>;
+    protected readonly: i0.Signal<boolean>;
+    protected hasClearButton: i0.Signal<boolean>;
+    protected fileCount: i0.Signal<number>;
+    protected hasFiles: i0.Signal<boolean>;
+    private get __class();
+    static ɵfac: i0.ɵɵFactoryDeclaration<AXPDocumentUploaderWidgetDesignerComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<AXPDocumentUploaderWidgetDesignerComponent, "axp-document-uploader-widget-designer", never, {}, {}, never, never, true, never>;
+}
+
+declare class AXPDocumentUploaderWidgetEditComponent extends AXPValueWidgetComponent<AXMDocumentManagementDocumentEntityModel[]> {
+    protected readonly fileService: AXFileService;
+    protected readonly: i0.Signal<boolean>;
+    protected formDefinition: i0.WritableSignal<AXPDynamicFormDefinition>;
+    protected formContext: i0.WritableSignal<AXPContextData>;
+    protected defaultLayout: i0.Signal<{
+        positions: {
+            default: {
+                colSpan: number;
+            };
+        };
+    }>;
+    ngOnInit(): void;
+    private renderForm;
+    protected handleContextChange(event: AXPContextChangeEvent): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<AXPDocumentUploaderWidgetEditComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<AXPDocumentUploaderWidgetEditComponent, "axp-document-uploader-widget-edit", never, {}, {}, never, never, true, never>;
+}
+
+declare class AXPDocumentUploaderWidgetViewComponent extends AXPValueWidgetComponent<AXMDocumentManagementDocumentEntityModel[]> {
+    protected fileUploaderNode: i0.Signal<AXPWidgetNode>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<AXPDocumentUploaderWidgetViewComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<AXPDocumentUploaderWidgetViewComponent, "axp-document-uploader-widget-view", never, {}, {}, never, never, true, never>;
+}
+
+declare class AXPDocumentUploaderWidgetFilterComponent extends AXPValueWidgetComponent<AXPFileListItem[]> {
+    protected hasFiles: i0.Signal<boolean>;
+    protected noFiles: i0.Signal<boolean>;
+    protected toggleHasFiles(): void;
+    protected toggleNoFiles(): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<AXPDocumentUploaderWidgetFilterComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<AXPDocumentUploaderWidgetFilterComponent, "ng-component", never, {}, {}, never, never, true, never>;
+}
+
+declare class AXPDocumentUploaderWidgetColumnComponent extends AXPColumnWidgetComponent<AXPFileListItem[]> {
+    protected count: i0.Signal<number>;
+    private fileService;
+    openFileList(): Promise<void>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<AXPDocumentUploaderWidgetColumnComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<AXPDocumentUploaderWidgetColumnComponent, "ng-component", never, { "rawValue": { "alias": "rawValue"; "required": false; }; "rowData": { "alias": "rowData"; "required": false; }; }, {}, never, never, true, never>;
+}
+
+declare class AXPDocumentUploaderWidgetPrintComponent extends AXPValueWidgetComponent<AXPFileListItem[]> {
+    protected hasFiles: i0.Signal<boolean>;
+    protected formatFileSize(bytes?: number): string;
+    static ɵfac: i0.ɵɵFactoryDeclaration<AXPDocumentUploaderWidgetPrintComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<AXPDocumentUploaderWidgetPrintComponent, "ng-component", never, {}, {}, never, never, true, never>;
+}
+
+export { AXMDistributionInteractionService, AXMDistributionInteractionServiceImpl, AXMDistributionService, AXMDistributionServiceImpl, AXMDocumentManagementDocumentEntityModule, AXMDocumentManagementDocumentTypeEntityModule, AXMDocumentManagementDocumentTypeMetaDefinitionEntityModule, AXMDocumentManagementDocumentTypeMetaDefinitionEntityService, AXMDocumentManagementDocumentTypeMetaDefinitionEntityServiceImpl, AXMDocumentManagementDocumentTypeMetaValueEntityModule, AXMDocumentManagementDocumentTypeMetaValueEntityService, AXMDocumentManagementDocumentTypeMetaValueEntityServiceImpl, AXMDocumentManagementDocumentTypeStatusDefinitionEntityModule, AXMDocumentManagementDocumentTypeStatusDefinitionEntityService, AXMDocumentManagementDocumentTypeStatusDefinitionEntityServiceImpl, AXMDocumentManagementModule, AXMDocumentService, AXMDocumentServiceImpl, AXMDocumentTypeService, AXMDocumentTypeServiceImpl, AXMEntityProvider, AXMFolderService, AXMFolderServiceImpl, AXMMenuProvider, AXMReviewService, AXMReviewServiceImpl, AXMSearchCommandProvider, AXMSettingProvider, AXPDocumentUploaderWidget, AXPDocumentUploaderWidgetColumnComponent, AXPDocumentUploaderWidgetDesignerComponent, AXPDocumentUploaderWidgetEditComponent, AXPDocumentUploaderWidgetFilterComponent, AXPDocumentUploaderWidgetPrintComponent, AXPDocumentUploaderWidgetViewComponent, RootConfig, canTransition, distributionFactory, distributionInteractionFactory, documentFactory, documentRelatedFactory, documentTypeFactory, documentTypeMetaDefinitionfactory, documentTypeMetaValueFactory, documentTypeStatusDefinitionFactory, folderFactory, getNextStatus, reviewFactory };
+export type { AXMDistributionInteractionSummary, AXMDocumentInheritanceType, AXMDocumentManagementDistributionEntityModel, AXMDocumentManagementDistributionInteractionEntityModel, AXMDocumentManagementDocumentEntityModel, AXMDocumentManagementDocumentTypeEntityModel, AXMDocumentManagementDocumentTypeMetaDefinitionEntityModel, AXMDocumentManagementDocumentTypeMetaValueEntityModel, AXMDocumentManagementDocumentTypeStatusDefinitionEntityModel, AXMDocumentManagementFolderCreateDto, AXMDocumentManagementFolderEntityModel, AXMDocumentManagementFolderGetDto, AXMDocumentManagementReviewEntityModel, AXMDocumentMeta, AXMDocumentWorkflowPhase, AXPDocumentUploaderWidgetOptions, DocumentTypeFileOutput };

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;
@@ -1138,7 +1161,7 @@ class AXMChatManagementService {
             return {
                 id: user.id,
                 type: 'user',
-                fullName: `${user.firstName} ${user.lastName}`.trim(),
+                fullName: `${user.displayName}`.trim(),
                 username: user.username?.trim(),
             };
         }
@@ -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) {
@@ -1637,7 +1678,7 @@ class AXMCommentManagementService {
     async getUserInfo(userId) {
         try {
             const user = await this.usersService.getOne(userId);
-            return { id: userId, type: 'user', fullName: user.firstName + ' ' + user.lastName, username: user.username };
+            return { id: userId, type: 'user', fullName: user.displayName, username: user.username };
         }
         catch {
             throw new Error(`User with ID ${userId} not found`);
@@ -2203,7 +2244,7 @@ class AXMCommentComponent {
         }
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMCommentComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.1.6", type: AXMCommentComponent, isStandalone: true, selector: "axm-comment", inputs: { refrenceType: { classPropertyName: "refrenceType", publicName: "refrenceType", isSignal: true, isRequired: true, transformFunction: null }, refrenceId: { classPropertyName: "refrenceId", publicName: "refrenceId", isSignal: true, isRequired: true, transformFunction: null }, subject: { classPropertyName: "subject", publicName: "subject", isSignal: true, isRequired: true, transformFunction: null } }, viewQueries: [{ propertyName: "wysiwygEditor", first: true, predicate: ["w"], descendants: true, isSignal: true }], ngImport: i0, template: "<div class=\"ax-size-full ax-flex ax-flex-col ax-justify-between ax-p-4 ax-overflow-hidden\">\n  <ax-comment-container class=\"ax-overflow-auto\">\n    @if (isLoading()) {\n    <div class=\"ax-flex ax-items-center ax-py-12 ax-bg-lightest ax-px-5\">\n      <ax-skeleton class=\"ax-min-w-16 ax-h-16 ax-rounded-full ax-me-4\"></ax-skeleton>\n      <div class=\"ax-flex ax-flex-col ax-gap-2 ax-w-full\">\n        <ax-skeleton class=\"ax-w-full ax-h-6 ax-rounded\"></ax-skeleton>\n        <ax-skeleton class=\"ax-w-full ax-h-2 ax-rounded-full\"></ax-skeleton>\n        <ax-skeleton class=\"ax-w-full ax-h-2 ax-rounded-full\"></ax-skeleton>\n        <ax-skeleton class=\"ax-w-8/12 ax-h-2 ax-rounded-full\"></ax-skeleton>\n      </div>\n    </div>\n    } @else if (!isLoading() && comments().length > 0) {\n    <ax-comment-view class=\"ax-bg-lightest\">\n      @for (comment of comments(); track comment.id) {\n      <ax-comment-item [id]=\"comment.id!\" [replyCount]=\"comment.replyCount\"\n        [class.highlighted]=\"highlightedCommentId() === comment.id\" [@fadeIn]>\n        <axp-user-avatar #user [size]=\"48\" [userId]=\"comment.author.id\" ngProjectAs=\"'ax-avatar'\"></axp-user-avatar>\n        <ax-title>{{ user.firstName() + ' ' + user.lastName() }}</ax-title>\n        <ax-comment-date>{{ comment.createdAt | format: 'timeleft' | async }} </ax-comment-date>\n        <ax-comment-menu-options>\n          <ax-button class=\"ax-sm\" look=\"blank\" color=\"neutral\">\n            <ax-icon icon=\"ax-icon ax-icon-solid ax-icon-more-horizontal\"></ax-icon>\n          </ax-button>\n\n          <ax-dropdown-panel>\n            <ax-button-item-list>\n              <ax-button-item text=\"Edit\" color=\"neutral\"\n                (click)=\"editMessage(comment, undefined, user.firstName() + ' ' + user.lastName())\">\n                <ax-prefix>\n                  <ax-icon icon=\"fa-solid fa-edit\"></ax-icon>\n                </ax-prefix>\n              </ax-button-item>\n\n              <ax-button-item text=\"Delete\" color=\"danger\" (click)=\"deleteComment(comment.id!)\">\n                <ax-prefix>\n                  <ax-icon icon=\"fa-solid fa-trash-can\"></ax-icon>\n                </ax-prefix>\n              </ax-button-item>\n            </ax-button-item-list>\n          </ax-dropdown-panel>\n        </ax-comment-menu-options>\n        <ax-content [innerHTML]=\"sanitizeHtml(comment.message.content)\"></ax-content>\n        <ax-comment-like (click)=\"toggleLike(comment)\" [liked]=\"isLikedByUser(comment)\">\n          {{ getReactionsCount(comment) }}\n        </ax-comment-like>\n        <ax-comment-reply-text\n          (click)=\"replyMessage(comment, undefined, user.firstName() + ' ' + user.lastName())\"></ax-comment-reply-text>\n        @for (reply of comment.replies; track reply.id) {\n        <ax-comment-item [id]=\"reply.id\" [class.highlighted]=\"highlightedCommentId() === reply.id\" [@fadeIn]>\n          <axp-user-avatar #user2 [size]=\"48\" [userId]=\"reply.author.id\" ngProjectAs=\"'ax-avatar'\"></axp-user-avatar>\n          <ax-title>{{ user2.firstName() + ' ' + user2.lastName() }}</ax-title>\n          <ax-comment-date>{{ reply.createdAt | format: 'timeleft' | async }} </ax-comment-date>\n          <ax-comment-menu-options>\n            <ax-button class=\"ax-sm\" look=\"blank\" color=\"neutral\">\n              <ax-icon icon=\"ax-icon ax-icon-solid ax-icon-more-horizontal\"></ax-icon>\n            </ax-button>\n\n            <ax-dropdown-panel>\n              <ax-button-item-list>\n                <ax-button-item text=\"Edit\" color=\"neutral\"\n                  (click)=\"editMessage(comment, reply, user2.firstName() + ' ' + user2.lastName())\">\n                  <ax-prefix>\n                    <ax-icon icon=\"fa-solid fa-edit\"></ax-icon>\n                  </ax-prefix>\n                </ax-button-item>\n                <ax-button-item text=\"Delete\" color=\"danger\" (click)=\"deleteComment(reply.id!)\">\n                  <ax-prefix>\n                    <ax-icon icon=\"fa-solid fa-trash-can\"></ax-icon>\n                  </ax-prefix>\n                </ax-button-item>\n              </ax-button-item-list>\n            </ax-dropdown-panel>\n          </ax-comment-menu-options>\n          <ax-content [innerHTML]=\"sanitizeHtml(reply.message.content)\"></ax-content>\n          <ax-comment-like (click)=\"toggleLike(reply)\" [liked]=\"isLikedByUser(reply)\">\n            {{ getReactionsCount(reply) }}\n          </ax-comment-like>\n          <ax-comment-reply-text\n            (click)=\"replyMessage(comment, reply, user2.firstName() + ' ' + user2.lastName())\"></ax-comment-reply-text>\n        </ax-comment-item>\n        }\n      </ax-comment-item>\n      }\n    </ax-comment-view>\n    } @else {\n    <div>\n      <div class=\"ax-flex ax-flex-col ax-gap-4 ax-justify-center ax-items-center ax-p-10\">\n        <svg class=\"ax-mx-auto\" xmlns=\"http://www.w3.org/2000/svg\" width=\"154\" height=\"161\" viewBox=\"0 0 154 161\"\n          fill=\"none\">\n          <path\n            d=\"M0.0616455 84.4268C0.0616455 42.0213 34.435 7.83765 76.6507 7.83765C118.803 7.83765 153.224 42.0055 153.224 84.4268C153.224 102.42 147.026 118.974 136.622 132.034C122.282 150.138 100.367 161 76.6507 161C52.7759 161 30.9882 150.059 16.6633 132.034C6.25961 118.974 0.0616455 102.42 0.0616455 84.4268Z\"\n            fill=\"#EEF2FF\" />\n          <path\n            d=\"M96.8189 0.632498L96.8189 0.632384L96.8083 0.630954C96.2034 0.549581 95.5931 0.5 94.9787 0.5H29.338C22.7112 0.5 17.3394 5.84455 17.3394 12.4473V142.715C17.3394 149.318 22.7112 154.662 29.338 154.662H123.948C130.591 154.662 135.946 149.317 135.946 142.715V38.9309C135.946 38.0244 135.847 37.1334 135.648 36.2586L135.648 36.2584C135.117 33.9309 133.874 31.7686 132.066 30.1333C132.066 30.1331 132.065 30.1329 132.065 30.1327L103.068 3.65203C103.068 3.6519 103.067 3.65177 103.067 3.65164C101.311 2.03526 99.1396 0.995552 96.8189 0.632498Z\"\n            fill=\"white\" stroke=\"#E5E7EB\" />\n          <ellipse cx=\"80.0618\" cy=\"81\" rx=\"28.0342\" ry=\"28.0342\" fill=\"#EEF2FF\" />\n          <path\n            d=\"M99.2393 61.3061L99.2391 61.3058C88.498 50.5808 71.1092 50.5804 60.3835 61.3061C49.6423 72.0316 49.6422 89.4361 60.3832 100.162C71.109 110.903 88.4982 110.903 99.2393 100.162C109.965 89.4363 109.965 72.0317 99.2393 61.3061ZM105.863 54.6832C120.249 69.0695 120.249 92.3985 105.863 106.785C91.4605 121.171 68.1468 121.171 53.7446 106.785C39.3582 92.3987 39.3582 69.0693 53.7446 54.683C68.1468 40.2965 91.4605 40.2966 105.863 54.6832Z\"\n            stroke=\"#E5E7EB\" />\n          <path\n            d=\"M110.782 119.267L102.016 110.492C104.888 108.267 107.476 105.651 109.564 102.955L118.329 111.729L110.782 119.267Z\"\n            stroke=\"#E5E7EB\" />\n          <path\n            d=\"M139.122 125.781L139.122 125.78L123.313 109.988C123.313 109.987 123.313 109.987 123.312 109.986C121.996 108.653 119.849 108.657 118.521 109.985L118.871 110.335L118.521 109.985L109.047 119.459C107.731 120.775 107.735 122.918 109.044 124.247L109.047 124.249L124.858 140.06C128.789 143.992 135.191 143.992 139.122 140.06C143.069 136.113 143.069 129.728 139.122 125.781Z\"\n            fill=\"#A5B4FC\" stroke=\"#818CF8\" />\n          <path\n            d=\"M83.185 87.2285C82.5387 87.2285 82.0027 86.6926 82.0027 86.0305C82.0027 83.3821 77.9987 83.3821 77.9987 86.0305C77.9987 86.6926 77.4627 87.2285 76.8006 87.2285C76.1543 87.2285 75.6183 86.6926 75.6183 86.0305C75.6183 80.2294 84.3831 80.2451 84.3831 86.0305C84.3831 86.6926 83.8471 87.2285 83.185 87.2285Z\"\n            fill=\"#4F46E5\" />\n          <path\n            d=\"M93.3528 77.0926H88.403C87.7409 77.0926 87.2049 76.5567 87.2049 75.8946C87.2049 75.2483 87.7409 74.7123 88.403 74.7123H93.3528C94.0149 74.7123 94.5509 75.2483 94.5509 75.8946C94.5509 76.5567 94.0149 77.0926 93.3528 77.0926Z\"\n            fill=\"#4F46E5\" />\n          <path\n            d=\"M71.5987 77.0925H66.6488C65.9867 77.0925 65.4507 76.5565 65.4507 75.8945C65.4507 75.2481 65.9867 74.7122 66.6488 74.7122H71.5987C72.245 74.7122 72.781 75.2481 72.781 75.8945C72.781 76.5565 72.245 77.0925 71.5987 77.0925Z\"\n            fill=\"#4F46E5\" />\n          <rect x=\"38.3522\" y=\"21.5128\" width=\"41.0256\" height=\"2.73504\" rx=\"1.36752\" fill=\"#4F46E5\" />\n          <rect x=\"38.3522\" y=\"133.65\" width=\"54.7009\" height=\"5.47009\" rx=\"2.73504\" fill=\"#A5B4FC\" />\n          <rect x=\"38.3522\" y=\"29.7179\" width=\"13.6752\" height=\"2.73504\" rx=\"1.36752\" fill=\"#4F46E5\" />\n          <circle cx=\"56.13\" cy=\"31.0854\" r=\"1.36752\" fill=\"#4F46E5\" />\n          <circle cx=\"61.6001\" cy=\"31.0854\" r=\"1.36752\" fill=\"#4F46E5\" />\n          <circle cx=\"67.0702\" cy=\"31.0854\" r=\"1.36752\" fill=\"#4F46E5\" />\n        </svg>\n        <div>\n          <h2 class=\"ax-text-center ax-text-neutral-600 ax-font-semibold ax-leading-loose ax-pb-2\">\n            There is no Comment!\n          </h2>\n        </div>\n      </div>\n    </div>\n    }\n  </ax-comment-container>\n  <ax-form [updateOn]=\"'submit'\">\n    <ax-form-field>\n      <div>\n        @if (isReplyingMode() || isEditingMode()) {\n        <div\n          class=\"ax-flex ax-justify-between ax-rounded-b-none ax-border ax-border-b-0 ax-rounded-lg ax-px-6 ax-py-3 ax-w-full ax-items-center ax-overflow-hidden ax-text-sm ax-leading-none\">\n          <div (click)=\"scrollMain()\" class=\"ax-flex ax-justify-start ax-items-center ax-cursor-pointer\">\n            <i [class]=\"isReplyingMode() ? 'fa-reply' : 'fa-pen'\"\n              class=\"fa-solid ax-text-primary-500 dark:ax-text-primary-300 ax-text-2xl ax-me-4\"></i>\n            <div\n              class=\"ax-flex ax-flex-col ax-gap-2 ax-justify-between ax-align-middle ax-leading-4 ax-overflow-hidden\">\n              <p class=\"ax-text-primary-500 dark:ax-text-primary-300\">\n                {{ isReplyingMode() ? 'Reply to ' : 'Edit Message' }}\n                <span class=\"ax-font-bold\">\n                  {{ isReplyingMode() ? activeReplyComment()?.userName : '' }}\n                </span>\n              </p>\n              <div class=\"ax-truncate\" [innerHTML]=\"\n                    isReplyingMode()\n                      ? sanitizeHtml(activeReplyComment()?.message?.content ?? '')\n                      : sanitizeHtml(activeEditComment()?.message?.content ?? '')\n                  \"></div>\n            </div>\n          </div>\n          <div><i (click)=\"resetReplyEditState()\" class=\"fa-solid ax-text-2xl fa-xmark ax-cursor-pointer\"></i></div>\n        </div>\n        }\n        <ax-wysiwyg-container #w [look]=\"wysiwygOptions().look\" [(ngModel)]=\"commentContent\">\n          <ax-wysiwyg-view class=\"ax-min-h-28\"></ax-wysiwyg-view>\n          <ax-toolbar>\n            <ax-content>\n              <ax-wysiwyg-history></ax-wysiwyg-history>\n              <ax-wysiwyg-font-style></ax-wysiwyg-font-style>\n              <ax-wysiwyg-colors></ax-wysiwyg-colors>\n              <ax-wysiwyg-list></ax-wysiwyg-list>\n              <ax-wysiwyg-alignment></ax-wysiwyg-alignment>\n            </ax-content>\n            <ax-suffix>\n              <ax-dropdown-button [disabled]=\"hasCooldown() || !this.commentContent()\" type=\"submit\" color=\"primary\"\n                mode=\"split\" text=\"Send\" (onClick)=\"submitComment()\">\n                @if (isSubmitting()) {\n                <ax-loading></ax-loading>\n                }\n                <!-- <ax-button-item-list>\n                  <ax-button-item (click)=\"submitComment()\" text=\"Send Private ...\" name=\"private\" data=\"private\">\n                    <ax-prefix>\n                      <ax-icon icon=\"fa-regular fa-user-secret\"></ax-icon>\n                    </ax-prefix>\n                  </ax-button-item>\n                </ax-button-item-list> -->\n              </ax-dropdown-button>\n            </ax-suffix>\n          </ax-toolbar>\n          <ax-validation-rule rule=\"callback\" [options]=\"{ validate: validateContent }\"></ax-validation-rule>\n        </ax-wysiwyg-container>\n      </div>\n    </ax-form-field>\n  </ax-form>\n</div>", styles: [":host{display:block;width:100%;height:100%}ax-wysiwyg-container .ax-editor-container{border-top-left-radius:0!important;border-top-right-radius:0!important}ax-wysiwyg-container .ax-error-message{padding-left:.5rem}ax-wysiwyg-container .highlighted{background:var(--ax-color-primary-050)!important;border-radius:.25rem;transition:background 1s ease-in-out}\n"], dependencies: [{ kind: "ngmodule", type: AXWysiwygModule }, { kind: "component", type: i1.AXWysiwygContainerComponent, selector: "ax-wysiwyg-container", inputs: ["look", "placeHolder"], outputs: ["onValueChanged"] }, { kind: "component", type: i1.AXWysiwygViewComponent, selector: "ax-wysiwyg-view", inputs: ["class"] }, { kind: "component", type: i1.AXWysiwygAlignmentComponent, selector: "ax-wysiwyg-alignment" }, { kind: "component", type: i1.AXWysiwygColorsComponent, selector: "ax-wysiwyg-colors" }, { kind: "component", type: i1.AXWysiwygFontStyleComponent, selector: "ax-wysiwyg-font-style" }, { kind: "component", type: i1.AXWysiwygHistoryComponent, selector: "ax-wysiwyg-history" }, { kind: "component", type: i1.AXWysiwygListComponent, selector: "ax-wysiwyg-list" }, { kind: "ngmodule", type: AXConversationModule }, { kind: "ngmodule", type: AXSkeletonModule }, { kind: "component", type: i2.AXSkeletonComponent, selector: "ax-skeleton", inputs: ["animated"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i1$1.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i1$1.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXCommentModule }, { kind: "component", type: i4.AXCommentViewComponent, selector: "ax-comment-view" }, { kind: "component", type: i4.AXCommentContainerComponent, selector: "ax-comment-container" }, { kind: "component", type: i4.AxCommentItemComponent, selector: "ax-comment-item", inputs: ["replyCount"] }, { kind: "component", type: i4.AXCommentLikeComponent, selector: "ax-comment-like", inputs: ["liked"], outputs: ["likedChange", "onLiked"] }, { kind: "component", type: i4.AXMenuOptionsComponent, selector: "ax-comment-menu-options" }, { kind: "component", type: i4.AXCommentReplyTextComponent, selector: "ax-comment-reply-text" }, { kind: "component", type: i4.AXCommentDateComponent, selector: "ax-comment-date" }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i5.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "component", type: i5.AXButtonItemComponent, selector: "ax-button-item", inputs: ["color", "disabled", "text", "selected", "divided", "data", "name"], outputs: ["onClick", "onFocus", "onBlur", "disabledChange"] }, { kind: "component", type: i5.AXButtonItemListComponent, selector: "ax-button-item-list", inputs: ["items"], outputs: ["onItemClick"] }, { kind: "ngmodule", type: AXAvatarModule }, { kind: "ngmodule", type: AXImageModule }, { kind: "ngmodule", type: AXLoadingModule }, { kind: "component", type: i6.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "ngmodule", type: AXDropdownModule }, { kind: "component", type: i7.AXDropdownPanelComponent, selector: "ax-dropdown-panel", inputs: ["isOpen", "fitParent", "dropdownWidth", "position", "placement", "_target", "adaptivityEnabled"], outputs: ["onOpened", "onClosed"] }, { kind: "ngmodule", type: AXFormatModule }, { kind: "ngmodule", type: AXFormModule }, { kind: "component", type: i8.AXFormFieldComponent, selector: "ax-form-field", inputs: ["labelMode"] }, { kind: "component", type: i8.AXFormComponent, selector: "ax-form", inputs: ["labelMode", "look", "messageStyle", "updateOn"], outputs: ["onValidate", "updateOnChange"] }, { kind: "directive", type: i8.AXValidationRuleDirective, selector: "ax-validation-rule", inputs: ["rule", "options", "message", "disabled"] }, { kind: "ngmodule", type: AXToolBarModule }, { kind: "component", type: i9.AXToolBarComponent, selector: "ax-toolbar" }, { kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i10.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i10.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "ngmodule", type: AXDropdownButtonModule }, { kind: "component", type: i11.AXDropdownButtonComponent, selector: "ax-dropdown-button", inputs: ["disabled", "size", "color", "look", "text", "type", "mode"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "lookChange", "colorChange", "disabledChange"] }, { kind: "component", type: AXPUserAvatarComponent, selector: "axp-user-avatar", inputs: ["size", "userId"] }, { kind: "pipe", type: i12.AXFormatPipe, name: "format" }, { kind: "pipe", type: AsyncPipe, name: "async" }], animations: [
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.1.6", type: AXMCommentComponent, isStandalone: true, selector: "axm-comment", inputs: { refrenceType: { classPropertyName: "refrenceType", publicName: "refrenceType", isSignal: true, isRequired: true, transformFunction: null }, refrenceId: { classPropertyName: "refrenceId", publicName: "refrenceId", isSignal: true, isRequired: true, transformFunction: null }, subject: { classPropertyName: "subject", publicName: "subject", isSignal: true, isRequired: true, transformFunction: null } }, viewQueries: [{ propertyName: "wysiwygEditor", first: true, predicate: ["w"], descendants: true, isSignal: true }], ngImport: i0, template: "<div class=\"ax-size-full ax-flex ax-flex-col ax-justify-between ax-p-4 ax-overflow-hidden\">\n  <ax-comment-container class=\"ax-overflow-auto\">\n    @if (isLoading()) {\n    <div class=\"ax-flex ax-items-center ax-py-12 ax-bg-lightest ax-px-5\">\n      <ax-skeleton class=\"ax-min-w-16 ax-h-16 ax-rounded-full ax-me-4\"></ax-skeleton>\n      <div class=\"ax-flex ax-flex-col ax-gap-2 ax-w-full\">\n        <ax-skeleton class=\"ax-w-full ax-h-6 ax-rounded\"></ax-skeleton>\n        <ax-skeleton class=\"ax-w-full ax-h-2 ax-rounded-full\"></ax-skeleton>\n        <ax-skeleton class=\"ax-w-full ax-h-2 ax-rounded-full\"></ax-skeleton>\n        <ax-skeleton class=\"ax-w-8/12 ax-h-2 ax-rounded-full\"></ax-skeleton>\n      </div>\n    </div>\n    } @else if (!isLoading() && comments().length > 0) {\n    <ax-comment-view class=\"ax-bg-lightest\">\n      @for (comment of comments(); track comment.id) {\n      <ax-comment-item [id]=\"comment.id!\" [replyCount]=\"comment.replyCount\"\n        [class.highlighted]=\"highlightedCommentId() === comment.id\" [@fadeIn]>\n        <axp-user-avatar #user [size]=\"48\" [userId]=\"comment.author.id\" ngProjectAs=\"'ax-avatar'\"></axp-user-avatar>\n        <ax-title>{{ user.firstName() + ' ' + user.lastName() }}</ax-title>\n        <ax-comment-date>{{ comment.createdAt | format: 'timeleft' | async }} </ax-comment-date>\n        <ax-comment-menu-options>\n          <ax-button class=\"ax-sm\" look=\"blank\" color=\"neutral\">\n            <ax-icon icon=\"ax-icon ax-icon-solid ax-icon-more-horizontal\"></ax-icon>\n          </ax-button>\n\n          <ax-dropdown-panel>\n            <ax-button-item-list>\n              <ax-button-item text=\"Edit\" color=\"neutral\"\n                (click)=\"editMessage(comment, undefined, user.firstName() + ' ' + user.lastName())\">\n                <ax-prefix>\n                  <ax-icon icon=\"fa-solid fa-edit\"></ax-icon>\n                </ax-prefix>\n              </ax-button-item>\n\n              <ax-button-item text=\"Delete\" color=\"danger\" (click)=\"deleteComment(comment.id!)\">\n                <ax-prefix>\n                  <ax-icon icon=\"fa-solid fa-trash-can\"></ax-icon>\n                </ax-prefix>\n              </ax-button-item>\n            </ax-button-item-list>\n          </ax-dropdown-panel>\n        </ax-comment-menu-options>\n        <ax-content [innerHTML]=\"sanitizeHtml(comment.message.content)\"></ax-content>\n        <ax-comment-like (click)=\"toggleLike(comment)\" [liked]=\"isLikedByUser(comment)\">\n          {{ getReactionsCount(comment) }}\n        </ax-comment-like>\n        <ax-comment-reply-text\n          (click)=\"replyMessage(comment, undefined, user.firstName() + ' ' + user.lastName())\"></ax-comment-reply-text>\n        @for (reply of comment.replies; track reply.id) {\n        <ax-comment-item [id]=\"reply.id\" [class.highlighted]=\"highlightedCommentId() === reply.id\" [@fadeIn]>\n          <axp-user-avatar #user2 [size]=\"48\" [userId]=\"reply.author.id\" ngProjectAs=\"'ax-avatar'\"></axp-user-avatar>\n          <ax-title>{{ user2.firstName() + ' ' + user2.lastName() }}</ax-title>\n          <ax-comment-date>{{ reply.createdAt | format: 'timeleft' | async }} </ax-comment-date>\n          <ax-comment-menu-options>\n            <ax-button class=\"ax-sm\" look=\"blank\" color=\"neutral\">\n              <ax-icon icon=\"ax-icon ax-icon-solid ax-icon-more-horizontal\"></ax-icon>\n            </ax-button>\n\n            <ax-dropdown-panel>\n              <ax-button-item-list>\n                <ax-button-item text=\"Edit\" color=\"neutral\"\n                  (click)=\"editMessage(comment, reply, user2.firstName() + ' ' + user2.lastName())\">\n                  <ax-prefix>\n                    <ax-icon icon=\"fa-solid fa-edit\"></ax-icon>\n                  </ax-prefix>\n                </ax-button-item>\n                <ax-button-item text=\"Delete\" color=\"danger\" (click)=\"deleteComment(reply.id!)\">\n                  <ax-prefix>\n                    <ax-icon icon=\"fa-solid fa-trash-can\"></ax-icon>\n                  </ax-prefix>\n                </ax-button-item>\n              </ax-button-item-list>\n            </ax-dropdown-panel>\n          </ax-comment-menu-options>\n          <ax-content [innerHTML]=\"sanitizeHtml(reply.message.content)\"></ax-content>\n          <ax-comment-like (click)=\"toggleLike(reply)\" [liked]=\"isLikedByUser(reply)\">\n            {{ getReactionsCount(reply) }}\n          </ax-comment-like>\n          <ax-comment-reply-text\n            (click)=\"replyMessage(comment, reply, user2.firstName() + ' ' + user2.lastName())\"></ax-comment-reply-text>\n        </ax-comment-item>\n        }\n      </ax-comment-item>\n      }\n    </ax-comment-view>\n    } @else {\n    <div>\n      <div class=\"ax-flex ax-flex-col ax-gap-4 ax-justify-center ax-items-center ax-p-10\">\n        <svg class=\"ax-mx-auto\" xmlns=\"http://www.w3.org/2000/svg\" width=\"154\" height=\"161\" viewBox=\"0 0 154 161\"\n          fill=\"none\">\n          <path\n            d=\"M0.0616455 84.4268C0.0616455 42.0213 34.435 7.83765 76.6507 7.83765C118.803 7.83765 153.224 42.0055 153.224 84.4268C153.224 102.42 147.026 118.974 136.622 132.034C122.282 150.138 100.367 161 76.6507 161C52.7759 161 30.9882 150.059 16.6633 132.034C6.25961 118.974 0.0616455 102.42 0.0616455 84.4268Z\"\n            fill=\"#EEF2FF\" />\n          <path\n            d=\"M96.8189 0.632498L96.8189 0.632384L96.8083 0.630954C96.2034 0.549581 95.5931 0.5 94.9787 0.5H29.338C22.7112 0.5 17.3394 5.84455 17.3394 12.4473V142.715C17.3394 149.318 22.7112 154.662 29.338 154.662H123.948C130.591 154.662 135.946 149.317 135.946 142.715V38.9309C135.946 38.0244 135.847 37.1334 135.648 36.2586L135.648 36.2584C135.117 33.9309 133.874 31.7686 132.066 30.1333C132.066 30.1331 132.065 30.1329 132.065 30.1327L103.068 3.65203C103.068 3.6519 103.067 3.65177 103.067 3.65164C101.311 2.03526 99.1396 0.995552 96.8189 0.632498Z\"\n            fill=\"white\" stroke=\"#E5E7EB\" />\n          <ellipse cx=\"80.0618\" cy=\"81\" rx=\"28.0342\" ry=\"28.0342\" fill=\"#EEF2FF\" />\n          <path\n            d=\"M99.2393 61.3061L99.2391 61.3058C88.498 50.5808 71.1092 50.5804 60.3835 61.3061C49.6423 72.0316 49.6422 89.4361 60.3832 100.162C71.109 110.903 88.4982 110.903 99.2393 100.162C109.965 89.4363 109.965 72.0317 99.2393 61.3061ZM105.863 54.6832C120.249 69.0695 120.249 92.3985 105.863 106.785C91.4605 121.171 68.1468 121.171 53.7446 106.785C39.3582 92.3987 39.3582 69.0693 53.7446 54.683C68.1468 40.2965 91.4605 40.2966 105.863 54.6832Z\"\n            stroke=\"#E5E7EB\" />\n          <path\n            d=\"M110.782 119.267L102.016 110.492C104.888 108.267 107.476 105.651 109.564 102.955L118.329 111.729L110.782 119.267Z\"\n            stroke=\"#E5E7EB\" />\n          <path\n            d=\"M139.122 125.781L139.122 125.78L123.313 109.988C123.313 109.987 123.313 109.987 123.312 109.986C121.996 108.653 119.849 108.657 118.521 109.985L118.871 110.335L118.521 109.985L109.047 119.459C107.731 120.775 107.735 122.918 109.044 124.247L109.047 124.249L124.858 140.06C128.789 143.992 135.191 143.992 139.122 140.06C143.069 136.113 143.069 129.728 139.122 125.781Z\"\n            fill=\"#A5B4FC\" stroke=\"#818CF8\" />\n          <path\n            d=\"M83.185 87.2285C82.5387 87.2285 82.0027 86.6926 82.0027 86.0305C82.0027 83.3821 77.9987 83.3821 77.9987 86.0305C77.9987 86.6926 77.4627 87.2285 76.8006 87.2285C76.1543 87.2285 75.6183 86.6926 75.6183 86.0305C75.6183 80.2294 84.3831 80.2451 84.3831 86.0305C84.3831 86.6926 83.8471 87.2285 83.185 87.2285Z\"\n            fill=\"#4F46E5\" />\n          <path\n            d=\"M93.3528 77.0926H88.403C87.7409 77.0926 87.2049 76.5567 87.2049 75.8946C87.2049 75.2483 87.7409 74.7123 88.403 74.7123H93.3528C94.0149 74.7123 94.5509 75.2483 94.5509 75.8946C94.5509 76.5567 94.0149 77.0926 93.3528 77.0926Z\"\n            fill=\"#4F46E5\" />\n          <path\n            d=\"M71.5987 77.0925H66.6488C65.9867 77.0925 65.4507 76.5565 65.4507 75.8945C65.4507 75.2481 65.9867 74.7122 66.6488 74.7122H71.5987C72.245 74.7122 72.781 75.2481 72.781 75.8945C72.781 76.5565 72.245 77.0925 71.5987 77.0925Z\"\n            fill=\"#4F46E5\" />\n          <rect x=\"38.3522\" y=\"21.5128\" width=\"41.0256\" height=\"2.73504\" rx=\"1.36752\" fill=\"#4F46E5\" />\n          <rect x=\"38.3522\" y=\"133.65\" width=\"54.7009\" height=\"5.47009\" rx=\"2.73504\" fill=\"#A5B4FC\" />\n          <rect x=\"38.3522\" y=\"29.7179\" width=\"13.6752\" height=\"2.73504\" rx=\"1.36752\" fill=\"#4F46E5\" />\n          <circle cx=\"56.13\" cy=\"31.0854\" r=\"1.36752\" fill=\"#4F46E5\" />\n          <circle cx=\"61.6001\" cy=\"31.0854\" r=\"1.36752\" fill=\"#4F46E5\" />\n          <circle cx=\"67.0702\" cy=\"31.0854\" r=\"1.36752\" fill=\"#4F46E5\" />\n        </svg>\n        <div>\n          <h2 class=\"ax-text-center ax-text-neutral-600 ax-font-semibold ax-leading-loose ax-pb-2\">\n            There is no Comment!\n          </h2>\n        </div>\n      </div>\n    </div>\n    }\n  </ax-comment-container>\n  <ax-form [updateOn]=\"'submit'\">\n    <ax-form-field>\n      <div>\n        @if (isReplyingMode() || isEditingMode()) {\n        <div\n          class=\"ax-flex ax-justify-between ax-rounded-b-none ax-border ax-border-b-0 ax-rounded-lg ax-px-6 ax-py-3 ax-w-full ax-items-center ax-overflow-hidden ax-text-sm ax-leading-none\">\n          <div (click)=\"scrollMain()\" class=\"ax-flex ax-justify-start ax-items-center ax-cursor-pointer\">\n            <i [class]=\"isReplyingMode() ? 'fa-reply' : 'fa-pen'\"\n              class=\"fa-solid ax-text-primary-500 dark:ax-text-primary-300 ax-text-2xl ax-me-4\"></i>\n            <div\n              class=\"ax-flex ax-flex-col ax-gap-2 ax-justify-between ax-align-middle ax-leading-4 ax-overflow-hidden\">\n              <p class=\"ax-text-primary-500 dark:ax-text-primary-300\">\n                {{ isReplyingMode() ? 'Reply to ' : 'Edit Message' }}\n                <span class=\"ax-font-bold\">\n                  {{ isReplyingMode() ? activeReplyComment()?.userName : '' }}\n                </span>\n              </p>\n              <div class=\"ax-truncate\" [innerHTML]=\"\n                    isReplyingMode()\n                      ? sanitizeHtml(activeReplyComment()?.message?.content ?? '')\n                      : sanitizeHtml(activeEditComment()?.message?.content ?? '')\n                  \"></div>\n            </div>\n          </div>\n          <div><i (click)=\"resetReplyEditState()\" class=\"fa-solid ax-text-2xl fa-xmark ax-cursor-pointer\"></i></div>\n        </div>\n        }\n        <ax-wysiwyg-container #w [look]=\"wysiwygOptions().look\" [(ngModel)]=\"commentContent\">\n          <ax-wysiwyg-view class=\"ax-min-h-28\"></ax-wysiwyg-view>\n          <ax-toolbar>\n            <ax-content>\n              <ax-wysiwyg-history></ax-wysiwyg-history>\n              <ax-wysiwyg-font-style></ax-wysiwyg-font-style>\n              <ax-wysiwyg-colors></ax-wysiwyg-colors>\n              <ax-wysiwyg-list></ax-wysiwyg-list>\n              <ax-wysiwyg-alignment></ax-wysiwyg-alignment>\n            </ax-content>\n            <ax-suffix>\n              <ax-dropdown-button [disabled]=\"hasCooldown() || !this.commentContent()\" type=\"submit\" color=\"primary\"\n                mode=\"split\" text=\"Send\" (onClick)=\"submitComment()\">\n                @if (isSubmitting()) {\n                <ax-loading></ax-loading>\n                }\n                <!-- <ax-button-item-list>\n                  <ax-button-item (click)=\"submitComment()\" text=\"Send Private ...\" name=\"private\" data=\"private\">\n                    <ax-prefix>\n                      <ax-icon icon=\"fa-regular fa-user-secret\"></ax-icon>\n                    </ax-prefix>\n                  </ax-button-item>\n                </ax-button-item-list> -->\n              </ax-dropdown-button>\n            </ax-suffix>\n          </ax-toolbar>\n          <ax-validation-rule rule=\"callback\" [options]=\"{ validate: validateContent }\"></ax-validation-rule>\n        </ax-wysiwyg-container>\n      </div>\n    </ax-form-field>\n  </ax-form>\n</div>", styles: [":host{display:block;width:100%;height:100%}ax-wysiwyg-container .ax-editor-container{border-top-left-radius:0!important;border-top-right-radius:0!important}ax-wysiwyg-container .ax-error-message{padding-left:.5rem}ax-wysiwyg-container .highlighted{background:var(--ax-color-primary-050)!important;border-radius:.25rem;transition:background 1s ease-in-out}\n"], dependencies: [{ kind: "ngmodule", type: AXWysiwygModule }, { kind: "component", type: i1.AXWysiwygContainerComponent, selector: "ax-wysiwyg-container", inputs: ["look", "placeHolder"], outputs: ["onValueChanged"] }, { kind: "component", type: i1.AXWysiwygViewComponent, selector: "ax-wysiwyg-view", inputs: ["class"] }, { kind: "component", type: i1.AXWysiwygAlignmentComponent, selector: "ax-wysiwyg-alignment" }, { kind: "component", type: i1.AXWysiwygColorsComponent, selector: "ax-wysiwyg-colors" }, { kind: "component", type: i1.AXWysiwygFontStyleComponent, selector: "ax-wysiwyg-font-style" }, { kind: "component", type: i1.AXWysiwygHistoryComponent, selector: "ax-wysiwyg-history" }, { kind: "component", type: i1.AXWysiwygListComponent, selector: "ax-wysiwyg-list" }, { kind: "ngmodule", type: AXConversationModule }, { kind: "ngmodule", type: AXSkeletonModule }, { kind: "component", type: i2.AXSkeletonComponent, selector: "ax-skeleton", inputs: ["animated"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i1$1.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i1$1.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXCommentModule }, { kind: "component", type: i4.AXCommentViewComponent, selector: "ax-comment-view" }, { kind: "component", type: i4.AXCommentContainerComponent, selector: "ax-comment-container" }, { kind: "component", type: i4.AXCommentItemComponent, selector: "ax-comment-item", inputs: ["replyCount"] }, { kind: "component", type: i4.AXCommentLikeComponent, selector: "ax-comment-like", inputs: ["liked"], outputs: ["likedChange", "onLiked"] }, { kind: "component", type: i4.AXMenuOptionsComponent, selector: "ax-comment-menu-options" }, { kind: "component", type: i4.AXCommentReplyTextComponent, selector: "ax-comment-reply-text" }, { kind: "component", type: i4.AXCommentDateComponent, selector: "ax-comment-date" }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i5.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "component", type: i5.AXButtonItemComponent, selector: "ax-button-item", inputs: ["color", "disabled", "text", "selected", "divided", "data", "name"], outputs: ["onClick", "onFocus", "onBlur", "disabledChange"] }, { kind: "component", type: i5.AXButtonItemListComponent, selector: "ax-button-item-list", inputs: ["items"], outputs: ["onItemClick"] }, { kind: "ngmodule", type: AXAvatarModule }, { kind: "ngmodule", type: AXImageModule }, { kind: "ngmodule", type: AXLoadingModule }, { kind: "component", type: i6.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "ngmodule", type: AXDropdownModule }, { kind: "component", type: i7.AXDropdownPanelComponent, selector: "ax-dropdown-panel", inputs: ["isOpen", "fitParent", "dropdownWidth", "position", "placement", "_target", "adaptivityEnabled"], outputs: ["onOpened", "onClosed"] }, { kind: "ngmodule", type: AXFormatModule }, { kind: "ngmodule", type: AXFormModule }, { kind: "component", type: i8.AXFormFieldComponent, selector: "ax-form-field", inputs: ["labelMode"] }, { kind: "component", type: i8.AXFormComponent, selector: "ax-form", inputs: ["labelMode", "look", "messageStyle", "updateOn"], outputs: ["onValidate", "updateOnChange"] }, { kind: "directive", type: i8.AXValidationRuleDirective, selector: "ax-validation-rule", inputs: ["rule", "options", "message", "disabled"] }, { kind: "ngmodule", type: AXToolBarModule }, { kind: "component", type: i9.AXToolBarComponent, selector: "ax-toolbar" }, { kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i10.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i10.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "ngmodule", type: AXDropdownButtonModule }, { kind: "component", type: i11.AXDropdownButtonComponent, selector: "ax-dropdown-button", inputs: ["disabled", "size", "color", "look", "text", "type", "mode"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "lookChange", "colorChange", "disabledChange"] }, { kind: "component", type: AXPUserAvatarComponent, selector: "axp-user-avatar", inputs: ["size", "userId"] }, { kind: "pipe", type: i12.AXFormatPipe, name: "format" }, { kind: "pipe", type: AsyncPipe, name: "async" }], animations: [
             trigger('fadeIn', [
                 transition(':enter', [
                     style({ opacity: 0, transform: 'translateY(10px)' }),
@@ -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 = [