barsa-novin-ray-core 2.3.94 → 2.3.95

package/fesm2022/barsa-novin-ray-core.mjs

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
 import { Injectable, inject, ElementRef, Input, ChangeDetectionStrategy, Component, Pipe, ComponentFactoryResolver, Injector, ApplicationRef, Compiler, DOCUMENT, NgModuleFactory, InjectionToken, NgZone, EventEmitter, ChangeDetectorRef, Renderer2, HostBinding, Output, HostListener, ViewContainerRef, ViewChild, signal, Directive, TemplateRef, input, NgModule, NO_ERRORS_SCHEMA, CUSTOM_ELEMENTS_SCHEMA, provideAppInitializer, ErrorHandler } from '@angular/core';
-import { Subject, from, BehaviorSubject, of, exhaustMap, map as map$1, combineLatest, withLatestFrom as withLatestFrom$1, fromEvent, forkJoin, takeUntil as takeUntil$1, filter as filter$1, throwError, merge, interval, tap as tap$1, concatMap as concatMap$1, catchError as catchError$1, finalize as finalize$1, take, debounceTime as debounceTime$1, skip, Observable, timer, mergeWith, Subscription } from 'rxjs';
+import { Subject, from, BehaviorSubject, of, exhaustMap, map as map$1, combineLatest, withLatestFrom as withLatestFrom$1, fromEvent, forkJoin, takeUntil as takeUntil$1, filter as filter$1, throwError, merge, interval, concatMap as concatMap$1, catchError as catchError$1, finalize as finalize$1, take, debounceTime as debounceTime$1, skip, Observable, tap as tap$1, timer, mergeWith, Subscription } from 'rxjs';
 import * as i1 from '@angular/router';
 import { Router, NavigationEnd, ActivatedRoute, RouterEvent, NavigationStart, RouterModule } from '@angular/router';
 import { DomSanitizer, Title } from '@angular/platform-browser';
@@ -6250,7 +6250,9 @@ class ContainerService {
         this.oldActiveSystem = null;
         this.detachParent = true;
         this.masterDetails = false;
+        this.state = 'attach';
         this.isMobile = getDeviceIsMobile();
+        this.addModules = new Subject();
         this._activatedRoute = inject(ActivatedRoute);
         this._router = inject(Router);
         this._portalService = inject(PortalService);
@@ -6271,6 +6273,7 @@ class ContainerService {
     }
     setViewContainerRef(viewContainerRef) {
         this._viewContainerRef = viewContainerRef;
+        this.state = 'attach';
         if (this._parentService && this.detachParent) {
             this._parentService.detach();
         }
@@ -6310,6 +6313,7 @@ class ContainerService {
     }
     detach() {
         this._setScrollPosition();
+        this.state = 'detach';
         this._viewRef = this._viewContainerRef.detach();
     }
     _setScrollPosition() {
@@ -6341,6 +6345,9 @@ class ContainerService {
             this._viewContainerRef.insert(this._viewRef);
             this._restoreScrollPostion();
         }
+        else {
+            this.addModules.next();
+        }
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.0.6", ngImport: i0, type: ContainerService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.0.6", ngImport: i0, type: ContainerService }); }
@@ -7795,35 +7802,16 @@ const NOTIFICATION_WEBWORKER_FACTORY = new InjectionToken('notificaion-worker');
 
 class ServiceWorkerNotificationService {
     constructor() {
-        this.hasRegistration = false;
         this._logService = inject(LogService);
         this._swPush = inject(SwPush);
         this._portalService = inject(PortalService);
-        this._notificationPermissionAllowed = true;
-        const _logService = this._logService;
-        const _swPush = this._swPush;
-        _logService.info(`swPush enable ${_swPush.isEnabled}`);
-        _swPush.notificationClicks.pipe(tap$1((c) => console.log(c))).subscribe((e) => {
-            if (!e.notification.tag) {
-                return;
-            }
-            this.closeNotifications([e.notification.tag]);
-            let actionTitle = e.action;
-            if (actionTitle === '') {
-                actionTitle = 'show';
-            }
-            if (!BarsaApi?.LoginFormData?.IsUserLoggedIn) {
-                return;
-            }
-            this._portalService.ExecuteNotificationAction(e.notification.tag, actionTitle);
-            // TODO:exeucte action
-            // not handled!!
-        });
-        this.getSw().then((c) => (this.hasRegistration = !!c));
-        this.handlePermission();
+        this._notificationPermissionAllowed = false;
+        this._hasRegistration = false;
+        this.init();
     }
+    // بررسی وضعیت فعلی
     get isEnabled() {
-        return this._swPush.isEnabled && this.hasRegistration && this._notificationPermissionAllowed;
+        return this._swPush.isEnabled && this._hasRegistration && this._notificationPermissionAllowed;
     }
     async closeNotifications(tags) {
         const sw = await this.getSw();
@@ -7837,6 +7825,7 @@ class ServiceWorkerNotificationService {
             }
         });
     }
+    // نمایش دستی نوتیفیکیشن (برای تست)
     async showNotification(payload) {
         const sw = await this.getSw();
         if (!sw) {
@@ -7876,43 +7865,40 @@ class ServiceWorkerNotificationService {
             data
         });
     }
-    handlePermission() {
-        if (!navigator?.permissions?.query) {
-            return;
-        }
-        return navigator.permissions
-            .query({ name: 'notifications' })
-            .then(this.permissionQuery.bind(this))
-            .catch(this.permissionError.bind(this));
+    async init() {
+        this._logService.info(`SwPush enabled: ${this._swPush.isEnabled}`);
+        // مدیریت کلیک روی نوتیفیکیشن‌ها
+        this._swPush.notificationClicks.subscribe((e) => {
+            if (!e.notification.tag) {
+                return;
+            }
+            const actionTitle = e.action || 'show';
+            if (!BarsaApi?.LoginFormData?.IsUserLoggedIn) {
+                return;
+            }
+            this._portalService.ExecuteNotificationAction(e.notification.tag, actionTitle);
+        });
+        // بررسی مجوز و ثبت سرویس‌ورکر
+        await this.registerServiceWorker();
+        await this.requestPermission();
     }
-    permissionQuery(result) {
-        let newPrompt;
-        if (result.state === 'granted') {
-            // notifications allowed, go wild
-        }
-        else if (result.state === 'prompt') {
-            // we can ask the user
-            newPrompt = Notification.requestPermission();
+    async requestPermission() {
+        if (Notification.permission === 'default') {
+            await Notification.requestPermission();
         }
-        else if (result.state === 'denied') {
-            // notifications were disabled
-            this._notificationPermissionAllowed = false;
-        }
-        result.onchange = () => console.log({ updatedPermission: result });
-        return newPrompt || result;
+        this._notificationPermissionAllowed = Notification.permission === 'granted';
     }
-    permissionError(error) {
-        this._notificationPermissionAllowed = false;
-        console.error(error);
+    async registerServiceWorker() {
+        if (!('serviceWorker' in navigator)) {
+            return;
+        }
+        const reg = await navigator.serviceWorker.getRegistration();
+        this._hasRegistration = !!reg;
     }
     async getSw() {
-        if (!navigator.serviceWorker) {
-            this.hasRegistration = false;
-            return undefined;
-        }
-        const x = await navigator.serviceWorker.getRegistration('custom-ngsw-worker.js');
-        this.hasRegistration = !!x;
-        return x;
+        const reg = await navigator.serviceWorker.getRegistration();
+        this._hasRegistration = !!reg;
+        return reg;
     }
     _isSupported() {
         if (!('serviceWorker' in navigator)) {
@@ -9329,6 +9315,7 @@ class ContainerComponent extends BaseComponent {
         this._renderer2 = inject(Renderer2);
         this._dialogService = inject(DIALOG_SERVICE, { optional: true });
         this._containerServiceParent = inject(ContainerService, { self: true, optional: true });
+        this._containerService = inject(ContainerService);
         this._formDialogComponent = inject(FORM_DIALOG_COMPONENT, { optional: true });
         this.oldContainerContainer = this._barsaDialogService.containerComponent;
         this._barsaDialogService.containerComponent = this;
@@ -9351,9 +9338,7 @@ class ContainerComponent extends BaseComponent {
             this._containerServiceParent?.navigate(navigation, isRelative, queryParams, data);
         };
         super.ngOnInit();
-        if (this._containerServiceParent) {
-            this._containerServiceParent.setViewContainerRef(this._vcr);
-        }
+        this._containerService?.setViewContainerRef(this.containerRef);
     }
     ngOnDestroy() {
         BarsaApi.Bw.FormHandler = this.parentContainer;
@@ -9392,10 +9377,12 @@ class PageBaseComponent extends ContainerComponent {
         super(...arguments);
         this.hasRoute = true;
         this.fullscreen = true;
+        this.componentsAddedToPage = false;
     }
     ngAfterViewInit() {
         super.ngAfterViewInit();
-        this.addModulesToDom();
+        this._containerService.state === 'attach' && this.addModulesToDom();
+        this._containerService?.addModules.pipe(takeUntil(this._onDestroy$)).subscribe(() => this.addModulesToDom());
     }
     addModulesToDom() {
         this.getData$()
@@ -9442,6 +9429,9 @@ class PageBaseComponent extends ContainerComponent {
         return controlUi;
     }
     addModulesToPage(modules) {
+        if (this.componentsAddedToPage) {
+            return;
+        }
         modules = modules.sort((a, b) => (Number(a.OrderNumber) > Number(b.OrderNumber) ? 1 : -1));
         from(modules)
             .pipe(takeUntil(this._onDestroy$), concatMap((module) => this.getComponentFactory(module.Component).pipe(tap((controlUi) => {
@@ -9454,7 +9444,10 @@ class PageBaseComponent extends ContainerComponent {
                 this._vcr.insert(controlUi.hostView);
             }
         }))))
-            .subscribe(() => this._cdr.detectChanges());
+            .subscribe(() => {
+            this.componentsAddedToPage = true;
+            this._cdr.detectChanges();
+        });
     }
     getComponentFactory(uiComponent) {
         return this._portalService.getComponent(uiComponent.Module, uiComponent.ModuleFileName, uiComponent.Name, uiComponent.Selector, this._injector);
@@ -13004,7 +12997,7 @@ class RootPortalComponent extends PageBaseComponent {
         }
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.0.6", ngImport: i0, type: RootPortalComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.0.6", type: RootPortalComponent, isStandalone: false, selector: "bnrc-root-portal", host: { properties: { "attr.dir": "this._dir", "attr.devicesize": "this._deviceSize" } }, viewQueries: [{ propertyName: "sectionRef", first: true, predicate: ["sectionRef"], descendants: true }, { propertyName: "footerRefVcr", first: true, predicate: ["footerRef"], descendants: true, read: ViewContainerRef }], usesInheritance: true, ngImport: i0, template: `
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.0.6", type: RootPortalComponent, isStandalone: false, selector: "bnrc-root-portal", host: { properties: { "attr.dir": "this._dir", "attr.devicesize": "this._deviceSize" } }, providers: [ContainerService], viewQueries: [{ propertyName: "sectionRef", first: true, predicate: ["sectionRef"], descendants: true }, { propertyName: "footerRefVcr", first: true, predicate: ["footerRef"], descendants: true, read: ViewContainerRef }], usesInheritance: true, ngImport: i0, template: `
         <div
             class="tw-hidden grid-cols-0 tw-grid-cols-1 tw-grid-cols-2 tw-grid-cols-3 tw-grid-cols-4 tw-grid-cols-5 
             tw-grid-cols-6 tw-grid-cols-7 tw-grid-cols-8 tw-grid-cols-9 tw-grid-cols-10 tw-grid-cols-11 tw-grid-cols-12"
@@ -13144,6 +13137,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.0.6", ngImpor
         }
     `,
                     changeDetection: ChangeDetectionStrategy.OnPush,
+                    providers: [ContainerService],
                     standalone: false
                 }]
         }], propDecorators: { sectionRef: [{