barsa-novin-ray-core 2.2.93 → 2.3.2

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

@@ -2637,10 +2637,20 @@ class DynamicComponentService {
             };
         }
     }
-    getComponentType(componentName, moduleName) {
+    getComponentType(componentSelector, componentName, moduleName) {
         const moName = moduleName + 'Module';
         const module = this._dynamicModuleWithComponents[moName];
-        return module.ngModuleRef.dynamicComponents.find((c) => c.name === componentName + 'Component');
+        const cmpName = componentName + 'Component';
+        let x = module.ngModuleRef.dynamicComponents.find((c) => c.name.includes(cmpName));
+        if (!x) {
+            module.ngModuleRef.dynamicComponents.forEach((c) => {
+                if (!x) {
+                    const cmp = c['ɵcmp'];
+                    cmp?.selectors?.length && (x = cmp.selectors[0].includes(componentSelector) ? c : null);
+                }
+            });
+        }
+        return x;
     }
     getComponentBySelector(selector, moduleName, injector) {
         const moName = moduleName + 'Module';
@@ -3270,6 +3280,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.10", ngImpo
             type: Injectable
         }], ctorParameters: () => [{ type: i1.Router }, { type: PortalService }] });
 
+function formRoutes(authGuard = false) {
+    return {
+        path: 'form',
+        canActivate: authGuard ? [AuthGuard] : [],
+        loadChildren: () => Promise.resolve().then(function () { return barsaSapUiFormPage_module; }).then((m) => m.BarsaSapUiFormPageModule)
+    };
+}
+
 class LocalStorageService {
     constructor() {
         this.localstorage = false;
@@ -3591,6 +3609,9 @@ class PortalService {
         }
         this.setValueOnObject(path, index + 1, modules, object[prop]);
     }
+    getComponentType(moduleName, componentName, selector) {
+        return this.dcm.getComponentType(selector, componentName, moduleName);
+    }
     getComponent(moduleName, _modulePath, _componentName, selector, parentInjector) {
         return this.dcm.getComponentBySelector(selector, moduleName, parentInjector);
     }
@@ -3865,6 +3886,34 @@ class PortalService {
         });
         return x2;
     }
+    _addPage(routes, page) {
+        const portalService = this;
+        function traverse(children, cpage) {
+            const path = cpage.RoutePath;
+            const pageComponent = portalService.getComponentType(cpage.Module, cpage.ComponentName, cpage.ComponentSelector);
+            const newRoute = {
+                path: (cpage.IsDefaultRoute === 'True' && path === '') || (path !== '' && typeof path !== 'undefined')
+                    ? path
+                    : cpage.Route.replace('/', ''),
+                canActivate: cpage.HasAuthorize !== 'True' ? [] : [AuthGuard],
+                resolve: { pageData: PortalPageResolver },
+                component: pageComponent,
+                outlet: cpage.Outlet,
+                data: {
+                    pageData: {
+                        Module: cpage.Module,
+                        HasAuthorize: cpage.HasAuthorize === 'True',
+                        Route: cpage.Route
+                    }
+                },
+                children: [formRoutes()]
+            };
+            children.push(newRoute);
+            // Recursively process each MetaObjectModel inside MoDataList
+            cpage.ChildPageList.MoDataList.forEach((c) => traverse(newRoute.children, c));
+        }
+        traverse(routes, page);
+    }
     loadPortalDataSync() {
         if (BarsaApi.LoginFormData?.error?.userMessage) {
             return;
@@ -3885,14 +3934,25 @@ class PortalService {
             });
             const pathToRemove = removePaged.map((d) => d.path);
             configRoute = configRoute.filter((c) => pathToRemove.indexOf(c.path) === -1);
+            const newConfigRoutes = [];
+            portalData.ChildPageList.MoDataList.forEach((c) => {
+                this._addPage(newConfigRoutes, c);
+            });
             if (defaultPage != null) {
                 const defaultPageRoute = defaultPage.Route.replace('/', '');
-                const defaultPath = configRoute.find((c) => c.path === '');
-                defaultPath && (defaultPath.redirectTo = defaultPageRoute);
-                configRoute.push({ path: '**', redirectTo: defaultPageRoute });
+                if (portalData.IsDynamicRoute) {
+                    const defaultPath = newConfigRoutes.find((c) => c.path === '');
+                    defaultPath && (defaultPath.redirectTo = defaultPageRoute);
+                    newConfigRoutes.push({ path: '**', redirectTo: defaultPageRoute });
+                }
+                else {
+                    const defaultPath = configRoute.find((c) => c.path === '');
+                    defaultPath && (defaultPath.redirectTo = defaultPageRoute);
+                    configRoute.push({ path: '**', redirectTo: defaultPageRoute });
+                }
                 // const notFoundPath = configRoute.find((c) => c.path === '**');
                 // notFoundPath && (notFoundPath.redirectTo = defaultPage.Route.replace('/', ''));
-                this._router.resetConfig(configRoute);
+                this._router.resetConfig(portalData.IsDynamicRoute ? newConfigRoutes : configRoute);
             }
         }
         this.extractAllPages(portalData);
@@ -14567,14 +14627,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.10", ngImpo
                 args: ['placeholder', { read: ViewContainerRef, static: true }]
             }] } });
 
-function formRoutes(authGuard = false) {
-    return {
-        path: 'form',
-        canActivate: authGuard ? [AuthGuard] : [],
-        loadChildren: () => Promise.resolve().then(function () { return barsaSapUiFormPage_module; }).then((m) => m.BarsaSapUiFormPageModule)
-    };
-}
-
 const children = [
     {
         path: 'popup',