barsa-sap-ui 1.0.341 → 1.0.342

package/esm2020/lib/execute-push-notification-command/execute-push-notification-command.component.mjs

@@ -1,19 +1,19 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { BaseComponent } from 'barsa-novin-ray-core';
-import { filter, tap } from 'rxjs';
+import { filter, withLatestFrom } from 'rxjs';
 import * as i0 from "@angular/core";
-import * as i1 from "@angular/router";
-import * as i2 from "barsa-novin-ray-core";
+import * as i1 from "barsa-novin-ray-core";
 export class ExecutePushNotificationCommandComponent extends BaseComponent {
-    constructor(_activatedRoute, _portalService, _localStorage) {
+    constructor(_portalService, _localStorage) {
         super();
-        this._activatedRoute = _activatedRoute;
         this._portalService = _portalService;
         this._localStorage = _localStorage;
     }
     ngOnInit() {
         super.ngOnInit();
-        this._portalService.userLoggedIn$.pipe(filter((userLoggedin) => userLoggedin)).subscribe((_) => {
+        this._portalService.pushAction$
+            .pipe(withLatestFrom(this._portalService.userLoggedIn$), filter(([action, userLoggedin]) => userLoggedin))
+            .subscribe((_) => {
             const pushActionStr = this._localStorage.getItem('pushAction');
             if (pushActionStr) {
                 this._localStorage.remove('pushAction');
@@ -21,22 +21,12 @@ export class ExecutePushNotificationCommandComponent extends BaseComponent {
                 this._portalService.ExecuteNotificationAction(pushAction.notificationTag, pushAction.action);
             }
         });
-        this._activatedRoute.queryParams.pipe(tap((params) => this._handle(params))).subscribe();
-    }
-    _handle(params) {
-        const { notificationTag, action } = params;
-        if (notificationTag && action) {
-            this._localStorage.setItem('pushAction', JSON.stringify({
-                notificationTag,
-                action
-            }));
-        }
     }
 }
-ExecutePushNotificationCommandComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.7", ngImport: i0, type: ExecutePushNotificationCommandComponent, deps: [{ token: i1.ActivatedRoute }, { token: i2.PortalService }, { token: i2.LocalStorageService }], target: i0.ɵɵFactoryTarget.Component });
+ExecutePushNotificationCommandComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.7", ngImport: i0, type: ExecutePushNotificationCommandComponent, deps: [{ token: i1.PortalService }, { token: i1.LocalStorageService }], target: i0.ɵɵFactoryTarget.Component });
 ExecutePushNotificationCommandComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.2.7", type: ExecutePushNotificationCommandComponent, selector: "bsu-execute-push-notification-command", usesInheritance: true, ngImport: i0, template: '', isInline: true, changeDetection: i0.ChangeDetectionStrategy.OnPush });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.7", ngImport: i0, type: ExecutePushNotificationCommandComponent, decorators: [{
             type: Component,
             args: [{ selector: 'bsu-execute-push-notification-command', template: '', changeDetection: ChangeDetectionStrategy.OnPush }]
-        }], ctorParameters: function () { return [{ type: i1.ActivatedRoute }, { type: i2.PortalService }, { type: i2.LocalStorageService }]; } });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0ZS1wdXNoLW5vdGlmaWNhdGlvbi1jb21tYW5kLmNvbXBvbmVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2JhcnNhLXNhcC11aS9zcmMvbGliL2V4ZWN1dGUtcHVzaC1ub3RpZmljYXRpb24tY29tbWFuZC9leGVjdXRlLXB1c2gtbm90aWZpY2F0aW9uLWNvbW1hbmQuY29tcG9uZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxTQUFTLEVBQVUsTUFBTSxlQUFlLENBQUM7QUFFM0UsT0FBTyxFQUF1QixhQUFhLEVBQWlCLE1BQU0sc0JBQXNCLENBQUM7QUFDekYsT0FBTyxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsTUFBTSxNQUFNLENBQUM7Ozs7QUFRbkMsTUFBTSxPQUFPLHVDQUF3QyxTQUFRLGFBQWE7SUFDdEUsWUFDWSxlQUErQixFQUMvQixjQUE2QixFQUM3QixhQUFrQztRQUUxQyxLQUFLLEVBQUUsQ0FBQztRQUpBLG9CQUFlLEdBQWYsZUFBZSxDQUFnQjtRQUMvQixtQkFBYyxHQUFkLGNBQWMsQ0FBZTtRQUM3QixrQkFBYSxHQUFiLGFBQWEsQ0FBcUI7SUFHOUMsQ0FBQztJQUNELFFBQVE7UUFDSixLQUFLLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDakIsSUFBSSxDQUFDLGNBQWMsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLFlBQVksRUFBRSxFQUFFLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtZQUMzRixNQUFNLGFBQWEsR0FBRyxJQUFJLENBQUMsYUFBYSxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQztZQUMvRCxJQUFJLGFBQWEsRUFBRTtnQkFDZixJQUFJLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsQ0FBQztnQkFDeEMsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQztnQkFDN0MsSUFBSSxDQUFDLGNBQWMsQ0FBQyx5QkFBeUIsQ0FBQyxVQUFVLENBQUMsZUFBZSxFQUFFLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQzthQUNoRztRQUNMLENBQUMsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLGVBQWUsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLE1BQWMsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUyxFQUFFLENBQUM7SUFDckcsQ0FBQztJQUNPLE9BQU8sQ0FBQyxNQUFjO1FBQzFCLE1BQU0sRUFBRSxlQUFlLEVBQUUsTUFBTSxFQUFFLEdBQUcsTUFBTSxDQUFDO1FBQzNDLElBQUksZUFBZSxJQUFJLE1BQU0sRUFBRTtZQUMzQixJQUFJLENBQUMsYUFBYSxDQUFDLE9BQU8sQ0FDdEIsWUFBWSxFQUNaLElBQUksQ0FBQyxTQUFTLENBQUM7Z0JBQ1gsZUFBZTtnQkFDZixNQUFNO2FBQ1QsQ0FBQyxDQUNMLENBQUM7U0FDTDtJQUNMLENBQUM7O29JQS9CUSx1Q0FBdUM7d0hBQXZDLHVDQUF1QyxvR0FKdEMsRUFBRTsyRkFJSCx1Q0FBdUM7a0JBTm5ELFNBQVM7K0JBQ0ksdUNBQXVDLFlBQ3ZDLEVBQUUsbUJBRUssdUJBQXVCLENBQUMsTUFBTSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENoYW5nZURldGVjdGlvblN0cmF0ZWd5LCBDb21wb25lbnQsIE9uSW5pdCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5pbXBvcnQgeyBBY3RpdmF0ZWRSb3V0ZSwgUGFyYW1zIH0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcclxuaW1wb3J0IHsgTG9jYWxTdG9yYWdlU2VydmljZSwgQmFzZUNvbXBvbmVudCwgUG9ydGFsU2VydmljZSB9IGZyb20gJ2JhcnNhLW5vdmluLXJheS1jb3JlJztcclxuaW1wb3J0IHsgZmlsdGVyLCB0YXAgfSBmcm9tICdyeGpzJztcclxuXHJcbkBDb21wb25lbnQoe1xyXG4gICAgc2VsZWN0b3I6ICdic3UtZXhlY3V0ZS1wdXNoLW5vdGlmaWNhdGlvbi1jb21tYW5kJyxcclxuICAgIHRlbXBsYXRlOiAnJyxcclxuICAgIHN0eWxlczogW10sXHJcbiAgICBjaGFuZ2VEZXRlY3Rpb246IENoYW5nZURldGVjdGlvblN0cmF0ZWd5Lk9uUHVzaFxyXG59KVxyXG5leHBvcnQgY2xhc3MgRXhlY3V0ZVB1c2hOb3RpZmljYXRpb25Db21tYW5kQ29tcG9uZW50IGV4dGVuZHMgQmFzZUNvbXBvbmVudCBpbXBsZW1lbnRzIE9uSW5pdCB7XHJcbiAgICBjb25zdHJ1Y3RvcihcclxuICAgICAgICBwcml2YXRlIF9hY3RpdmF0ZWRSb3V0ZTogQWN0aXZhdGVkUm91dGUsXHJcbiAgICAgICAgcHJpdmF0ZSBfcG9ydGFsU2VydmljZTogUG9ydGFsU2VydmljZSxcclxuICAgICAgICBwcml2YXRlIF9sb2NhbFN0b3JhZ2U6IExvY2FsU3RvcmFnZVNlcnZpY2VcclxuICAgICkge1xyXG4gICAgICAgIHN1cGVyKCk7XHJcbiAgICB9XHJcbiAgICBuZ09uSW5pdCgpOiB2b2lkIHtcclxuICAgICAgICBzdXBlci5uZ09uSW5pdCgpO1xyXG4gICAgICAgIHRoaXMuX3BvcnRhbFNlcnZpY2UudXNlckxvZ2dlZEluJC5waXBlKGZpbHRlcigodXNlckxvZ2dlZGluKSA9PiB1c2VyTG9nZ2VkaW4pKS5zdWJzY3JpYmUoKF8pID0+IHtcclxuICAgICAgICAgICAgY29uc3QgcHVzaEFjdGlvblN0ciA9IHRoaXMuX2xvY2FsU3RvcmFnZS5nZXRJdGVtKCdwdXNoQWN0aW9uJyk7XHJcbiAgICAgICAgICAgIGlmIChwdXNoQWN0aW9uU3RyKSB7XHJcbiAgICAgICAgICAgICAgICB0aGlzLl9sb2NhbFN0b3JhZ2UucmVtb3ZlKCdwdXNoQWN0aW9uJyk7XHJcbiAgICAgICAgICAgICAgICBjb25zdCBwdXNoQWN0aW9uID0gSlNPTi5wYXJzZShwdXNoQWN0aW9uU3RyKTtcclxuICAgICAgICAgICAgICAgIHRoaXMuX3BvcnRhbFNlcnZpY2UuRXhlY3V0ZU5vdGlmaWNhdGlvbkFjdGlvbihwdXNoQWN0aW9uLm5vdGlmaWNhdGlvblRhZywgcHVzaEFjdGlvbi5hY3Rpb24pO1xyXG4gICAgICAgICAgICB9XHJcbiAgICAgICAgfSk7XHJcbiAgICAgICAgdGhpcy5fYWN0aXZhdGVkUm91dGUucXVlcnlQYXJhbXMucGlwZSh0YXAoKHBhcmFtczogUGFyYW1zKSA9PiB0aGlzLl9oYW5kbGUocGFyYW1zKSkpLnN1YnNjcmliZSgpO1xyXG4gICAgfVxyXG4gICAgcHJpdmF0ZSBfaGFuZGxlKHBhcmFtczogUGFyYW1zKTogdm9pZCB7XHJcbiAgICAgICAgY29uc3QgeyBub3RpZmljYXRpb25UYWcsIGFjdGlvbiB9ID0gcGFyYW1zO1xyXG4gICAgICAgIGlmIChub3RpZmljYXRpb25UYWcgJiYgYWN0aW9uKSB7XHJcbiAgICAgICAgICAgIHRoaXMuX2xvY2FsU3RvcmFnZS5zZXRJdGVtKFxyXG4gICAgICAgICAgICAgICAgJ3B1c2hBY3Rpb24nLFxyXG4gICAgICAgICAgICAgICAgSlNPTi5zdHJpbmdpZnkoe1xyXG4gICAgICAgICAgICAgICAgICAgIG5vdGlmaWNhdGlvblRhZyxcclxuICAgICAgICAgICAgICAgICAgICBhY3Rpb25cclxuICAgICAgICAgICAgICAgIH0pXHJcbiAgICAgICAgICAgICk7XHJcbiAgICAgICAgfVxyXG4gICAgfVxyXG59XHJcbiJdfQ==
+        }], ctorParameters: function () { return [{ type: i1.PortalService }, { type: i1.LocalStorageService }]; } });
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0ZS1wdXNoLW5vdGlmaWNhdGlvbi1jb21tYW5kLmNvbXBvbmVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2JhcnNhLXNhcC11aS9zcmMvbGliL2V4ZWN1dGUtcHVzaC1ub3RpZmljYXRpb24tY29tbWFuZC9leGVjdXRlLXB1c2gtbm90aWZpY2F0aW9uLWNvbW1hbmQuY29tcG9uZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxTQUFTLEVBQVUsTUFBTSxlQUFlLENBQUM7QUFDM0UsT0FBTyxFQUF1QixhQUFhLEVBQWlCLE1BQU0sc0JBQXNCLENBQUM7QUFDekYsT0FBTyxFQUFFLE1BQU0sRUFBRSxjQUFjLEVBQUUsTUFBTSxNQUFNLENBQUM7OztBQVE5QyxNQUFNLE9BQU8sdUNBQXdDLFNBQVEsYUFBYTtJQUN0RSxZQUFvQixjQUE2QixFQUFVLGFBQWtDO1FBQ3pGLEtBQUssRUFBRSxDQUFDO1FBRFEsbUJBQWMsR0FBZCxjQUFjLENBQWU7UUFBVSxrQkFBYSxHQUFiLGFBQWEsQ0FBcUI7SUFFN0YsQ0FBQztJQUNELFFBQVE7UUFDSixLQUFLLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDakIsSUFBSSxDQUFDLGNBQWMsQ0FBQyxXQUFXO2FBQzFCLElBQUksQ0FDRCxjQUFjLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxhQUFhLENBQUMsRUFDakQsTUFBTSxDQUFDLENBQUMsQ0FBQyxNQUFNLEVBQUUsWUFBWSxDQUFDLEVBQUUsRUFBRSxDQUFDLFlBQVksQ0FBQyxDQUNuRDthQUNBLFNBQVMsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFO1lBQ2IsTUFBTSxhQUFhLEdBQUcsSUFBSSxDQUFDLGFBQWEsQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLENBQUM7WUFDL0QsSUFBSSxhQUFhLEVBQUU7Z0JBQ2YsSUFBSSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDLENBQUM7Z0JBQ3hDLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLENBQUM7Z0JBRTdDLElBQUksQ0FBQyxjQUFjLENBQUMseUJBQXlCLENBQUMsVUFBVSxDQUFDLGVBQWUsRUFBRSxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUM7YUFDaEc7UUFDTCxDQUFDLENBQUMsQ0FBQztJQUNYLENBQUM7O29JQXBCUSx1Q0FBdUM7d0hBQXZDLHVDQUF1QyxvR0FKdEMsRUFBRTsyRkFJSCx1Q0FBdUM7a0JBTm5ELFNBQVM7K0JBQ0ksdUNBQXVDLFlBQ3ZDLEVBQUUsbUJBRUssdUJBQXVCLENBQUMsTUFBTSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENoYW5nZURldGVjdGlvblN0cmF0ZWd5LCBDb21wb25lbnQsIE9uSW5pdCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgTG9jYWxTdG9yYWdlU2VydmljZSwgQmFzZUNvbXBvbmVudCwgUG9ydGFsU2VydmljZSB9IGZyb20gJ2JhcnNhLW5vdmluLXJheS1jb3JlJztcbmltcG9ydCB7IGZpbHRlciwgd2l0aExhdGVzdEZyb20gfSBmcm9tICdyeGpzJztcblxuQENvbXBvbmVudCh7XG4gICAgc2VsZWN0b3I6ICdic3UtZXhlY3V0ZS1wdXNoLW5vdGlmaWNhdGlvbi1jb21tYW5kJyxcbiAgICB0ZW1wbGF0ZTogJycsXG4gICAgc3R5bGVzOiBbXSxcbiAgICBjaGFuZ2VEZXRlY3Rpb246IENoYW5nZURldGVjdGlvblN0cmF0ZWd5Lk9uUHVzaFxufSlcbmV4cG9ydCBjbGFzcyBFeGVjdXRlUHVzaE5vdGlmaWNhdGlvbkNvbW1hbmRDb21wb25lbnQgZXh0ZW5kcyBCYXNlQ29tcG9uZW50IGltcGxlbWVudHMgT25Jbml0IHtcbiAgICBjb25zdHJ1Y3Rvcihwcml2YXRlIF9wb3J0YWxTZXJ2aWNlOiBQb3J0YWxTZXJ2aWNlLCBwcml2YXRlIF9sb2NhbFN0b3JhZ2U6IExvY2FsU3RvcmFnZVNlcnZpY2UpIHtcbiAgICAgICAgc3VwZXIoKTtcbiAgICB9XG4gICAgbmdPbkluaXQoKTogdm9pZCB7XG4gICAgICAgIHN1cGVyLm5nT25Jbml0KCk7XG4gICAgICAgIHRoaXMuX3BvcnRhbFNlcnZpY2UucHVzaEFjdGlvbiRcbiAgICAgICAgICAgIC5waXBlKFxuICAgICAgICAgICAgICAgIHdpdGhMYXRlc3RGcm9tKHRoaXMuX3BvcnRhbFNlcnZpY2UudXNlckxvZ2dlZEluJCksXG4gICAgICAgICAgICAgICAgZmlsdGVyKChbYWN0aW9uLCB1c2VyTG9nZ2VkaW5dKSA9PiB1c2VyTG9nZ2VkaW4pXG4gICAgICAgICAgICApXG4gICAgICAgICAgICAuc3Vic2NyaWJlKChfKSA9PiB7XG4gICAgICAgICAgICAgICAgY29uc3QgcHVzaEFjdGlvblN0ciA9IHRoaXMuX2xvY2FsU3RvcmFnZS5nZXRJdGVtKCdwdXNoQWN0aW9uJyk7XG4gICAgICAgICAgICAgICAgaWYgKHB1c2hBY3Rpb25TdHIpIHtcbiAgICAgICAgICAgICAgICAgICAgdGhpcy5fbG9jYWxTdG9yYWdlLnJlbW92ZSgncHVzaEFjdGlvbicpO1xuICAgICAgICAgICAgICAgICAgICBjb25zdCBwdXNoQWN0aW9uID0gSlNPTi5wYXJzZShwdXNoQWN0aW9uU3RyKTtcblxuICAgICAgICAgICAgICAgICAgICB0aGlzLl9wb3J0YWxTZXJ2aWNlLkV4ZWN1dGVOb3RpZmljYXRpb25BY3Rpb24ocHVzaEFjdGlvbi5ub3RpZmljYXRpb25UYWcsIHB1c2hBY3Rpb24uYWN0aW9uKTtcbiAgICAgICAgICAgICAgICB9XG4gICAgICAgICAgICB9KTtcbiAgICB9XG59XG4iXX0=

package/fesm2015/barsa-sap-ui.mjs

@@ -4,7 +4,7 @@ import * as i2 from 'barsa-novin-ray-core';
 import { BaseComponent, ReportViewBaseComponent, getUniqueId, BarsaApi, LayoutItemBaseComponent, getDeviceIsMobile, LayoutService, BaseUlvSettingComponent, FormComponent, createFormPanelMetaConditions, ReportBaseComponent, GetAllColumnsSorted, measureText, getParentHeight, getControlSizeMode, getGridSettings, FieldBaseComponent, DateService, getDateService as getDateService$1, DateMiladiService, DateHijriService, DateShamsiService, BaseDirective, EllipsifyDirective, createGridEditorFormPanel, FormPanelService, BaseViewItemPropsComponent, isImage, getIcon, LayoutPanelBaseComponent, BaseViewContentPropsComponent, enumValueToStringSize, PreventDefaulEvent, BaseColumnPropsComponent, ColumnService, DateRanges, LogService, UlvMainService, isFunction, FilesValidationHelper, getValidExtension, getImagePath, UploadService, LinearListHelper, FormToolbarBaseComponent, isFirefox, FormBaseComponent, PageWithFormHandlerBaseComponent, getHeaderValue, getFieldValue, ContainerComponent, FORM_DIALOG_COMPONENT, ContainerService, FormPropsBaseComponent, NumberBaseComponent, ImageMimeType, BaseFormToolbaritemPropsComponent, executeUlvCommandHandler, getDeviceIsPhone, getDeviceIsTablet, PortalService, NOTIFICATAION_POPUP_SERVER, TOAST_SERVICE, BaseModule, BarsaNovinRayCoreModule, DIALOG_SERVICE } from 'barsa-novin-ray-core';
 import moment from 'moment';
 import jmoment from 'moment-jalaali';
-import { merge, of, BehaviorSubject, Subject, combineLatest, takeUntil as takeUntil$1, fromEvent, filter as filter$1, tap as tap$1 } from 'rxjs';
+import { merge, of, BehaviorSubject, Subject, combineLatest, takeUntil as takeUntil$1, fromEvent, filter as filter$1, withLatestFrom as withLatestFrom$1 } from 'rxjs';
 import { tap, filter, map, debounceTime, distinctUntilChanged, withLatestFrom, takeUntil, exhaustMap, finalize, switchMap, delay, concatMap, catchError } from 'rxjs/operators';
 import * as i1$1 from '@fundamental-ngx/core';
 import { TableComponent, ToolbarComponent, RadioButtonComponent, DynamicPageComponent, FileUploaderComponent, MultiInputComponent, TabPanelComponent, WizardComponent, WizardStepComponent, ComboboxComponent, InlineHelpDirective, ContentDensityMode, GlobalContentDensityService, ThemesService, NotificationRef, RtlService, MessageToastService, FundamentalNgxCoreModule, FacetModule, WizardModule, PipeModule, DialogService, ContentDensityModule } from '@fundamental-ngx/core';
@@ -11574,15 +11574,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.7", ngImpor
             }] } });
 
 class ExecutePushNotificationCommandComponent extends BaseComponent {
-    constructor(_activatedRoute, _portalService, _localStorage) {
+    constructor(_portalService, _localStorage) {
         super();
-        this._activatedRoute = _activatedRoute;
         this._portalService = _portalService;
         this._localStorage = _localStorage;
     }
     ngOnInit() {
         super.ngOnInit();
-        this._portalService.userLoggedIn$.pipe(filter$1((userLoggedin) => userLoggedin)).subscribe((_) => {
+        this._portalService.pushAction$
+            .pipe(withLatestFrom$1(this._portalService.userLoggedIn$), filter$1(([action, userLoggedin]) => userLoggedin))
+            .subscribe((_) => {
             const pushActionStr = this._localStorage.getItem('pushAction');
             if (pushActionStr) {
                 this._localStorage.remove('pushAction');
@@ -11590,24 +11591,14 @@ class ExecutePushNotificationCommandComponent extends BaseComponent {
                 this._portalService.ExecuteNotificationAction(pushAction.notificationTag, pushAction.action);
             }
         });
-        this._activatedRoute.queryParams.pipe(tap$1((params) => this._handle(params))).subscribe();
-    }
-    _handle(params) {
-        const { notificationTag, action } = params;
-        if (notificationTag && action) {
-            this._localStorage.setItem('pushAction', JSON.stringify({
-                notificationTag,
-                action
-            }));
-        }
     }
 }
-ExecutePushNotificationCommandComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.7", ngImport: i0, type: ExecutePushNotificationCommandComponent, deps: [{ token: i2$4.ActivatedRoute }, { token: i2.PortalService }, { token: i2.LocalStorageService }], target: i0.ɵɵFactoryTarget.Component });
+ExecutePushNotificationCommandComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.7", ngImport: i0, type: ExecutePushNotificationCommandComponent, deps: [{ token: i2.PortalService }, { token: i2.LocalStorageService }], target: i0.ɵɵFactoryTarget.Component });
 ExecutePushNotificationCommandComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.2.7", type: ExecutePushNotificationCommandComponent, selector: "bsu-execute-push-notification-command", usesInheritance: true, ngImport: i0, template: '', isInline: true, changeDetection: i0.ChangeDetectionStrategy.OnPush });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.7", ngImport: i0, type: ExecutePushNotificationCommandComponent, decorators: [{
             type: Component,
             args: [{ selector: 'bsu-execute-push-notification-command', template: '', changeDetection: ChangeDetectionStrategy.OnPush }]
-        }], ctorParameters: function () { return [{ type: i2$4.ActivatedRoute }, { type: i2.PortalService }, { type: i2.LocalStorageService }]; } });
+        }], ctorParameters: function () { return [{ type: i2.PortalService }, { type: i2.LocalStorageService }]; } });
 
 class BarsaCartableTemplateComponent extends RichTextStaticComponent {
     ngOnInit() {