barsa-novin-ray-core 2.3.39 → 2.3.41

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

@@ -3020,10 +3020,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.0.6", ngImpor
         }] });
 
 class MultipleGroupByPipe {
-    /** Inserted by Angular inject() migration for backwards compatibility */
     constructor() {
         this.bbbPipe = inject(BbbTranslatePipe);
-        this.visibleValuePipe = inject(VisibleValuePipe);
     }
     transform(collection, sortSettings) {
         if (sortSettings.length === 0) {
@@ -3104,7 +3102,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.0.6", ngImpor
                     name: 'multipleGroupBy',
                     standalone: false
                 }]
-        }], ctorParameters: () => [] });
+        }] });
 
 class PictureFieldSourcePipe {
     constructor() { }
@@ -4942,7 +4940,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.0.6", ngImpor
 
 class AuthGuard {
     constructor() {
-        this.portalService = inject(PortalService);
+        this._portalService = inject(PortalService);
         this.router = inject(Router);
     }
     canActivate(activatedRouteSnapshot
@@ -4951,19 +4949,19 @@ class AuthGuard {
         const url = decodeURI(activatedRouteSnapshot._routerState.url);
         let url2 = url.split('/').find((c) => c && !c.startsWith('(')) ?? '';
         url2 = '/' + url2;
-        return this.portalService.getPageData(url2, false).pipe(map((pageData) => {
+        return this._portalService.getPageData(url2, false).pipe(map((pageData) => {
             const pageNeedAuthorize = pageData?.HasAuthorize || pageData == null ? true : false;
             const hasAuthorized = (!BarsaApi.LoginFormData.IsAnonymous && BarsaApi.LoginFormData.IsUserLoggedIn) ||
                 !pageNeedAuthorize;
             return { hasAuthorized, pageData };
-        }), withLatestFrom(this.portalService.loginRoute$), tap(([pageInfo, loginRoute]) => {
+        }), withLatestFrom(this._portalService.loginRoute$), tap(([pageInfo, loginRoute]) => {
             if (!pageInfo.hasAuthorized) {
                 this.router.navigate([loginRoute]);
             }
         }), tap(([pageInfo, _]) => {
             if (pageInfo.hasAuthorized) {
                 const needChangePassword = BarsaApi.Ul.ApplicationCtrlr.AdvancedSecurityLogin?.NeedChangePassword;
-                const changepasswordRoute = pageInfo.pageData?.ChildPageList.MoDataList.find((c) => c.IsChangePasswordRoute || c.IsChangePasswordRoute === 'True')?.Route || 'changepassword';
+                const changepasswordRoute = this._portalService.getListOfChildPage(pageInfo.pageData).find((c) => c.IsChangePasswordRoute || c.IsChangePasswordRoute === 'True')?.Route || 'changepassword';
                 const path = activatedRouteSnapshot.routeConfig?.path;
                 if (changepasswordRoute &&
                     path &&
@@ -5122,8 +5120,10 @@ class ApplicationCtrlrService {
     }
     selectedSystem(systemId) {
         this._selectedSystemId$.next(systemId);
-        this.selectNavGroup(this._selectedNavGroupId$.getValue()[systemId], false);
-        this.selectNavGroupItem(this._selectedNavGroupItemId$.getValue()[systemId]);
+        const selectedNavGroupId = this._selectedNavGroupId$.getValue()[systemId];
+        const selectedNavGroupItemId = this._selectedNavGroupItemId$.getValue()[systemId];
+        this.selectNavGroup(selectedNavGroupId, false);
+        this.selectNavGroupItem(selectedNavGroupItemId);
     }
     selectSystemCommand(command) {
         this.selectSystemCommandId(command.Key);
@@ -5170,6 +5170,13 @@ class ApplicationCtrlrService {
     sidebarToggled(value) {
         this._sidebarToggle$.next(value);
     }
+    selectedReportId(reportId) {
+        const selectedReport = this._selectedReportId$.getValue();
+        const selectedSystemId = this._selectedSystemId$.getValue();
+        const systemId = selectedSystemId;
+        selectedReport[systemId] = reportId;
+        this._selectedReportId$.next(selectedReport);
+    }
     loadSystem(id, resolve, reject) {
         BarsaApi.Ul.ApplicationCtrlr._loadSystem(id, true, (data) => {
             resolve(data);
@@ -5276,7 +5283,7 @@ class RedirectHomeGuard {
         return of(!BarsaApi.LoginFormData.IsAnonymous && BarsaApi.LoginFormData.IsUserLoggedIn).pipe(withLatestFrom(this._portalService.portalData$), tap(([hasAuthorized, portalData]) => {
             if (hasAuthorized) {
                 const homePage = this._portalService.DefaultPage ||
-                    portalData?.ChildPageList.MoDataList.find((c) => c.IsDefaultRoute === 'True');
+                    this._portalService.getListOfChildPage(portalData).find((c) => c.IsDefaultRoute === 'True');
                 const homeRoute = homePage?.Route || '/';
                 this.router.navigate([homeRoute]);
             }
@@ -5637,11 +5644,18 @@ class PortalService {
     setUserLoginStatus(status) {
         this._loggedInSource.next(status);
     }
+    getListOfChildPage(model) {
+        return !model
+            ? []
+            : model.ChildPageList2?.MoDataList.length
+                ? model.ChildPageList2.MoDataList
+                : model.ChildPageList?.MoDataList || [];
+    }
     extractAllPages(portalData) {
         if (!portalData) {
             return;
         }
-        portalData.ChildPageList.MoDataList.forEach((pageData) => {
+        this.getListOfChildPage(portalData).forEach((pageData) => {
             this.addChildPages(pageData);
         });
     }
@@ -5650,7 +5664,7 @@ class PortalService {
             return;
         }
         const config = this._router.config;
-        portalData.ChildPageList.MoDataList.forEach((pageData) => {
+        this.getListOfChildPage(portalData).forEach((pageData) => {
             const path = pageData.Route.replace('/', '');
             config.push(this.createRoute(pageData, path, pageData.HasAuthorize, pageData.PageModule?.$Caption, null, null));
             if (pageData.IsDefaultRoute || pageData.IsDefaultRoute === 'True') {
@@ -5682,10 +5696,10 @@ class PortalService {
     }
     addChildPages(pageData) {
         this.pages.push(pageData);
-        if (!pageData.ChildPageList?.MoDataList?.length) {
+        if (!this.getListOfChildPage(pageData).length) {
             return;
         }
-        pageData.ChildPageList.MoDataList.forEach((childPage) => {
+        this.getListOfChildPage(pageData).forEach((childPage) => {
             this.addChildPages(childPage);
         });
     }
@@ -5758,12 +5772,7 @@ class PortalService {
             return this.cachedPageData[url];
         }
         const pageData = this.findPageByRoute(url);
-        this.cachedPageData[url] = this.apiService
-            .loadPortalPageData(pageData?.Id, this.portalDataSource.getValue()?.ChildPageList.TypeDefId)
-            .pipe(map((pageMo) => pageMo.Data.Mo), tap((pageMo) => {
-            this.addChildRoute(pageMo, pageMo.ChildPageList);
-            this.addChildPages(pageMo);
-        }), publishReplay(1), refCount());
+        this._addToCachePageData(pageData, url);
         // this.cachedPageData[url] = this.portalData$.pipe(
         //   filter((portalData) => portalData != null),
         //   map((portalData) => ),
@@ -5784,12 +5793,7 @@ class PortalService {
         if (this.cachedPageData[id]) {
             return this.cachedPageData[id];
         }
-        this.cachedPageData[id] = this.apiService
-            .loadPortalPageData(id, this.portalDataSource.getValue()?.ChildPageList.TypeDefId)
-            .pipe(map((pageMo) => pageMo.Data.Mo), tap((pageMo) => {
-            this.addChildRoute(pageMo, pageMo.ChildPageList);
-            this.addChildPages(pageMo);
-        }), publishReplay(1), refCount());
+        this._addToCachePageData(pageData, id);
         // this.cachedPageData[url] = this.portalData$.pipe(
         //   filter((portalData) => portalData != null),
         //   map((portalData) => ),
@@ -5850,13 +5854,13 @@ class PortalService {
             if (x2) {
                 return;
             }
-            x2 = this._getDefaultPage(element.ChildPageList?.MoDataList);
+            x2 = this._getDefaultPage(this.getListOfChildPage(element));
         });
         return x2;
     }
     _addPage(routes, page) {
         const portalService = this;
-        function traverse(children, cpage) {
+        const traverse = (children, cpage) => {
             const path = cpage.RoutePath;
             const pageComponent = portalService.getComponentType(cpage.Module, cpage.ComponentName, cpage.ComponentSelector);
             const newRoute = {
@@ -5869,17 +5873,15 @@ class PortalService {
                 outlet: cpage.Outlet ? cpage.Outlet : undefined,
                 data: {
                     pageData: {
-                        Module: cpage.Module,
-                        HasAuthorize: cpage.HasAuthorize === 'True',
-                        Route: cpage.Route
+                        ...cpage
                     }
                 },
                 children: [formRoutes()]
             };
             children.push(newRoute);
             // Recursively process each MetaObjectModel inside MoDataList
-            cpage.ChildPageList.MoDataList.forEach((c) => traverse(newRoute.children, c));
-        }
+            this.getListOfChildPage(cpage).forEach((c) => traverse(newRoute.children, c));
+        };
         traverse(routes, page);
     }
     loadPortalDataSync() {
@@ -5890,21 +5892,21 @@ class PortalService {
         const portalSetting = BarsaApi.Ext.decode(portalSettingStr);
         const portalData = portalSetting;
         if (portalData) {
-            const defaultPage = this._getDefaultPage(portalData.ChildPageList.MoDataList);
+            const defaultPage = this._getDefaultPage(this.getListOfChildPage(portalData));
             const isdynamicroute = portalData.IsDynamicRoute === 'True';
             this.DefaultPage = defaultPage;
             let configRoute = this._router.config;
             const removePaged = [];
             configRoute.forEach((c, index) => {
                 const route = '/' + c.path;
-                if (c.path !== '' && portalData.ChildPageList.MoDataList.findIndex((d) => d.Route === route) === -1) {
+                if (c.path !== '' && this.getListOfChildPage(portalData).findIndex((d) => d.Route === route) === -1) {
                     removePaged.push(c);
                 }
             });
             const pathToRemove = removePaged.map((d) => d.path);
             configRoute = configRoute.filter((c) => pathToRemove.indexOf(c.path) === -1);
             const newConfigRoutes = [];
-            portalData.ChildPageList.MoDataList.forEach((c) => {
+            this.getListOfChildPage(portalData).forEach((c) => {
                 this._addPage(newConfigRoutes, c);
             });
             if (defaultPage != null) {
@@ -5945,7 +5947,7 @@ class PortalService {
     }
     get loginRoute$() {
         return this.portalData$.pipe(map((portalData) => {
-            const loginPage = portalData?.ChildPageList.MoDataList.find((c) => c.IsLoginRoute === 'True');
+            const loginPage = this.getListOfChildPage(portalData).find((c) => c.IsLoginRoute === 'True');
             return loginPage?.Route || 'login';
         }));
     }
@@ -6131,6 +6133,28 @@ class PortalService {
             }
         }
     }
+    loadSystem(id = 0) {
+        if (BarsaApi.LoginFormData?.error?.userMessage) {
+            return Promise.reject(BarsaApi.LoginFormData?.error?.userMessage);
+        }
+        if (id === 0) {
+            BarsaApi.Ul.ApplicationCtrlr.DefaultSystemId = null;
+        }
+        return new Promise((resolve, reject) => {
+            this._applicationCtrlrService.loadSystem(id, (data) => {
+                resolve(data);
+            }, (err) => {
+                reject(err);
+            });
+        });
+    }
+    _addToCachePageData(pageData, url) {
+        const x = this.portalDataSource.getValue();
+        const typedefIdX = x?.ChildPageList?.TypeDefId || x?.ChildPageList2?.TypeDefId;
+        this.cachedPageData[url] = this.apiService.loadPortalPageData(pageData?.Id, typedefIdX).pipe(map((pageMo) => pageMo.Data.Mo), tap((pageMo) => {
+            this.addChildPages(pageMo);
+        }), publishReplay(1), refCount());
+    }
     _getUlvParamsBy(reportName, reportId) {
         return {
             Flags: {
@@ -6154,21 +6178,6 @@ class PortalService {
             });
         });
     }
-    loadSystem(id = 0) {
-        if (BarsaApi.LoginFormData?.error?.userMessage) {
-            return Promise.reject(BarsaApi.LoginFormData?.error?.userMessage);
-        }
-        if (id === 0) {
-            BarsaApi.Ul.ApplicationCtrlr.DefaultSystemId = null;
-        }
-        return new Promise((resolve, reject) => {
-            this._applicationCtrlrService.loadSystem(id, (data) => {
-                resolve(data);
-            }, (err) => {
-                reject(err);
-            });
-        });
-    }
     _removePushAction() {
         const pushActionStr = this._localStorage.getItem('pushAction');
         if (pushActionStr) {
@@ -9422,7 +9431,9 @@ class PageBaseComponent extends ContainerComponent {
         return placeholders;
     }
     getModules(pageData) {
-        return BarsaApi.Common.Util.TryGetValue(pageData, 'ModuleList.MoDataList', []);
+        const x = BarsaApi.Common.Util.TryGetValue(pageData, 'ModuleList.MoDataList', []);
+        const x2 = BarsaApi.Common.Util.TryGetValue(pageData, 'ModuleList2.MoDataList', []);
+        return x2.length ? x2 : x;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.0.6", ngImport: i0, type: PageBaseComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.0.6", type: PageBaseComponent, isStandalone: false, selector: "bnrc-page-base", usesInheritance: true, ngImport: i0, template: '', isInline: true, changeDetection: i0.ChangeDetectionStrategy.OnPush }); }