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

package/fesm2022/magic-xpa-engine.mjs

@@ -12485,7 +12485,7 @@ class Operation {
     /// </param>
     /// <param name = "returnedFromServer">true if the server returned the execution to this operation</param>
     /// <returns> boolean for verify and block operations</returns>
-    async execute(returnedFromServer) {
+    async execute(returnedFromServer, desiredRouteName = null) {
         let lastRtEvent = AccessHelper.eventsManager.getLastRtEvent();
         let mprgCreator = null;
         let flowMonitor = FlowMonitorQueue.Instance;
@@ -12561,8 +12561,14 @@ class Operation {
                                     let canRoute = false;
                                     let rtEvnt = AccessHelper.eventsManager.getLastRtEvent();
                                     if (rtEvnt !== null) {
-                                        this._routeParams = rtEvnt.getRouteParamList();
-                                        if ((await rtEvnt.getArgList().getArg(0).getValue(StorageAttribute.ALPHA, 0)).trim() === this._routerPath &&
+                                        // If we are here for default route path, set the routeParams as null because those are relevant only for the original route.
+                                        if (desiredRouteName == null) {
+                                            desiredRouteName = (await rtEvnt.getArgList().getArg(0).getValue(StorageAttribute.ALPHA, 0)).trim();
+                                            this._routeParams = rtEvnt.getRouteParamList();
+                                        }
+                                        else
+                                            this._routeParams = null;
+                                        if (desiredRouteName === this._routerPath &&
                                             ((rtEvnt.getArgList().getArg(1).skipArg() && destSubForm === this._task.getForm().DefaultRouterOutlet) ||
                                                 (!rtEvnt.getArgList().getArg(1).skipArg() && (await rtEvnt.getArgList().getArg(1).getValue(StorageAttribute.ALPHA, 0)).trim() === this._originalRouterOutletName)))
                                             canRoute = true;
@@ -28044,6 +28050,7 @@ class EventHandler {
     _scope = null; // Task|Subtask|Global
     _task = null;
     _taskMgdID = -1;
+    _defRouteName = null;
     /// <summary>
     ///   CTOR
     /// </summary>
@@ -28172,6 +28179,9 @@ class EventHandler {
                 case ConstInterface.MG_ATTR_HANDLER_ONFORM:
                     this._isHandlerOnForm = XmlParser.getBoolean(valueStr);
                     break;
+                case XMLConstants.MG_ATTR_DEF_ROUTER_NAME:
+                    this._defRouteName = XmlParser.unescape(valueStr);
+                    break;
                 default:
                     Logger.Instance.WriteExceptionToLogWithMsg("There is no such tag in EventHandler class. Insert case to EventHandler.initElements for " + attribute);
                     break;
@@ -28400,8 +28410,13 @@ class EventHandler {
                 await this.resetLocalVariables(args);
                 initialLoopStackSize = this._task.getLoopStackSize();
                 let retVals = null;
-                if (this._operationTab.getSize() > 0)
+                if (this._operationTab.getSize() > 0) {
                     retVals = await this.executeOperations(0, this._operationTab.getSize() - 1, taskEnd, mgdID, depth, isChangedCurrWndRef, false, false, -1);
+                    if (retVals == null && this.isRouteHandler() && this.getDefaultRouteName() != null) {
+                        // call again with an additional param Default Route Name
+                        retVals = await this.executeOperations(0, this._operationTab.getSize() - 1, taskEnd, mgdID, depth, isChangedCurrWndRef, false, false, -1, this.getDefaultRouteName());
+                    }
+                }
                 isChangedCurrWnd = isChangedCurrWndRef.value;
                 if (retVals !== null)
                     return retVals;
@@ -28484,7 +28499,7 @@ class EventHandler {
     /// <summary>
     ///   execute the operations starting from fromIdx and ending at endIdx.
     /// </summary>
-    async executeOperations(fromIdx, toIdx, taskEnd, mgdID, depth, isChangedCurrWndRef, inBlockIf, inReturnedFromServer, inNextOperIdx) {
+    async executeOperations(fromIdx, toIdx, taskEnd, mgdID, depth, isChangedCurrWndRef, inBlockIf, inReturnedFromServer, inNextOperIdx, desiredRouteName = null) {
         let oper;
         let operType;
         let nextOperIdx = -1;
@@ -28665,7 +28680,7 @@ class EventHandler {
                 case ConstInterface.MG_OPER_CALL:
                     this._task.setUseLoopStack(depth > 0);
                     // if false is returned, it means that a route operation was executed.
-                    routeOperationExecuted = await oper.execute(returnedFromServer);
+                    routeOperationExecuted = await oper.execute(returnedFromServer, desiredRouteName);
                     break;
                 default:
                     // the rest of the operations (those that do not affect the flow)
@@ -28820,6 +28835,12 @@ class EventHandler {
     getEvent() {
         return this._evt;
     }
+    isRouteHandler() {
+        return (this._evt.getType() == ConstInterface.EVENT_TYPE_INTERNAL && this._evt.getInternalCode() === InternalInterface.MG_ACT_WEBCLIENT_ROUTE);
+    }
+    getDefaultRouteName() {
+        return this._defRouteName;
+    }
     /// <summary>
     ///   get the Id of the event handler
     /// </summary>
@@ -39514,7 +39535,7 @@ class CommandsTable {
     }
 }
 
-let CurrentClientVersion = '4.1200.0-dev4120.155';
+let CurrentClientVersion = '4.1200.0-dev4120.158';
 
 // @dynamic
 class ClientManager {