@magic-xpa/engine 4.1200.0-dev4120.180 → 4.1200.0-dev4120.182

package/fesm2022/magic-xpa-engine.mjs

@@ -12589,12 +12589,14 @@ class Operation {
                                     let rtEvnt = AccessHelper.eventsManager.getLastRtEvent();
                                     if (rtEvnt !== null) {
                                         // 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) {
+                                        if (!this._evtHandler.isExecutingDefaultRoute()) {
                                             desiredRouteName = (await rtEvnt.getArgList().getArg(0).getValue(StorageAttribute.ALPHA, 0)).trim();
                                             this._routeParams = rtEvnt.getRouteParamList();
                                         }
-                                        else
+                                        else {
+                                            desiredRouteName = this._evtHandler.getDefaultRouteName();
                                             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)))
@@ -13103,7 +13105,18 @@ class Operation {
     /// </summary>
     /// <returns></returns>
     async canExecute() {
-        return await this.getCondVal();
+        return (this.isOperationAllowedWhileExecutingDefaultRoute() && await this.getCondVal());
+    }
+    isOperationAllowedWhileExecutingDefaultRoute() {
+        let isAllowed = true;
+        if (this._evtHandler.isExecutingDefaultRoute()) {
+            if (this._type == ConstInterface.MG_OPER_BLOCK || this._type == ConstInterface.MG_OPER_ELSE ||
+                (this._type == ConstInterface.MG_OPER_CALL && this._isRoute))
+                return true;
+            else
+                return false;
+        }
+        return isAllowed;
     }
     /// <summary>
     /// </summary>
@@ -28118,6 +28131,7 @@ class EventHandler {
     _task = null;
     _taskMgdID = -1;
     _defRouteName = null;
+    _isExecutingDefaultRoute = false;
     /// <summary>
     ///   CTOR
     /// </summary>
@@ -28480,8 +28494,10 @@ class EventHandler {
                 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) {
+                        this._isExecutingDefaultRoute = true;
                         // 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());
+                        retVals = await this.executeOperations(0, this._operationTab.getSize() - 1, taskEnd, mgdID, depth, isChangedCurrWndRef, false, false, -1);
+                        this._isExecutingDefaultRoute = false;
                     }
                 }
                 isChangedCurrWnd = isChangedCurrWndRef.value;
@@ -28563,10 +28579,13 @@ class EventHandler {
         }
         return new RetVals(retVal, true);
     }
+    isExecutingDefaultRoute() {
+        return this._isExecutingDefaultRoute;
+    }
     /// <summary>
     ///   execute the operations starting from fromIdx and ending at endIdx.
     /// </summary>
-    async executeOperations(fromIdx, toIdx, taskEnd, mgdID, depth, isChangedCurrWndRef, inBlockIf, inReturnedFromServer, inNextOperIdx, desiredRouteName = null) {
+    async executeOperations(fromIdx, toIdx, taskEnd, mgdID, depth, isChangedCurrWndRef, inBlockIf, inReturnedFromServer, inNextOperIdx) {
         let oper;
         let operType;
         let nextOperIdx = -1;
@@ -28747,7 +28766,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, desiredRouteName);
+                    routeOperationExecuted = await oper.execute(returnedFromServer);
                     break;
                 default:
                     // the rest of the operations (those that do not affect the flow)
@@ -39609,7 +39628,7 @@ class CommandsTable {
     }
 }
 
-let CurrentClientVersion = '4.1200.0-dev4120.180';
+let CurrentClientVersion = '4.1200.0-dev4120.182';
 
 // @dynamic
 class ClientManager {