@magic-xpa/angular 4.1200.0-dev4120.155 → 4.1200.0-dev4120.158

package/fesm2022/magic-xpa-angular.mjs

@@ -682,7 +682,23 @@ class SubformMagicService {
             if (SubformMagicService.routerContainers.length > 0) {
                 let routeContainer = SubformMagicService.routerContainers[0];
                 SubformMagicService.routerContainers.shift();
-                routeContainer.initializeComponent();
+                // If the route path is not same, it means that the original route is not available
+                // and the default route is invoked.
+                if (routeContainer.getRouterPath() === routeCommand.routeParams[0])
+                    routeContainer.initializeComponent();
+                else {
+                    // If the specified router outlet id referring to a different route path, then first clear
+                    // the outlet (passing null route params, clears the outlet) and then navigate again.
+                    currentSubformMagicService.router.navigate([{ outlets: { [routeCommand.routerOutletName]: null } }], { relativeTo: relativeRoute })
+                        .then((result) => {
+                        SubformMagicService.currentCallerMgSubformServiceRef = currentSubformMagicService;
+                        currentSubformMagicService.currentRouteDefinition = {
+                            formName: routeCommand.formName,
+                            parameters: routeCommand.parameters
+                        };
+                        currentSubformMagicService.PerformRouterNavigate(routeCommand.routerOutletName, routeCommand.routeParams);
+                    });
+                }
             }
             else {
                 currentSubformMagicService.PerformRouterNavigate(routeCommand.routerOutletName, routeCommand.routeParams);
@@ -755,6 +771,7 @@ class RouterContainerMagicComponent {
     componentRef = null;
     parentMgSubformService = null;
     static lastRoute = "/";
+    routePath = null;
     static get LastRoute() {
         return RouterContainerMagicComponent.lastRoute;
     }
@@ -805,7 +822,7 @@ class RouterContainerMagicComponent {
         if (calcRouterPath.length > 0) {
             let routerPath = calcRouterPath;
             let tokens = StrUtil.tokenize(routerPath, "/:");
-            guiEvent.RouterPath = tokens[0];
+            this.routePath = guiEvent.RouterPath = tokens[0];
             guiEvent.RouterParams = new List();
             for (let i = 1; i < tokens.length; i++) {
                 guiEvent.RouterParams.push(currentActiveRoute.snapshot.params[tokens[i]]);
@@ -852,6 +869,9 @@ class RouterContainerMagicComponent {
             RouterContainerMagicComponent.lastRoute = this.router.url;
         }
     }
+    getRouterPath() {
+        return this.routePath;
+    }
     /** @nocollapse */ static ɵfac = function RouterContainerMagicComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || RouterContainerMagicComponent)(i0.ɵɵdirectiveInject(i2.ActivatedRoute), i0.ɵɵdirectiveInject(i2.Router), i0.ɵɵdirectiveInject(EngineMagicService), i0.ɵɵdirectiveInject(TaskMagicService), i0.ɵɵdirectiveInject(i0.ViewContainerRef), i0.ɵɵdirectiveInject(ComponentListMagicService), i0.ɵɵdirectiveInject(CommandsCollectorMagicService), i0.ɵɵdirectiveInject(RouterCommandsMagicService)); };
     /** @nocollapse */ static ɵcmp = /** @pureOrBreakMyCode */ i0.ɵɵdefineComponent({ type: RouterContainerMagicComponent, selectors: [["magic-route-outlet"]], standalone: false, decls: 0, vars: 0, template: function RouterContainerMagicComponent_Template(rf, ctx) { }, encapsulation: 2 });
 }