barsa-novin-ray-core 2.3.1 → 2.3.3

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

@@ -2637,10 +2637,23 @@ 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';
+        if (!module) {
+            return;
+        }
+        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';
@@ -3599,8 +3612,8 @@ class PortalService {
         }
         this.setValueOnObject(path, index + 1, modules, object[prop]);
     }
-    getComponentType(moduleName, componentName, _selector) {
-        return this.dcm.getComponentType(componentName, moduleName);
+    getComponentType(moduleName, componentName, selector) {
+        return this.dcm.getComponentType(selector, componentName, moduleName);
     }
     getComponent(moduleName, _modulePath, _componentName, selector, parentInjector) {
         return this.dcm.getComponentBySelector(selector, moduleName, parentInjector);
@@ -3942,7 +3955,7 @@ class PortalService {
                 }
                 // const notFoundPath = configRoute.find((c) => c.path === '**');
                 // notFoundPath && (notFoundPath.redirectTo = defaultPage.Route.replace('/', ''));
-                this._router.resetConfig(portalData.IsDynamicRoute ? newConfigRoutes : configRoute);
+                this._router.resetConfig(portalData.IsDynamicRoute === 'True' ? newConfigRoutes : configRoute);
             }
         }
         this.extractAllPages(portalData);