@magic-xpa/engine 4.1000.0-dev4100.20 → 4.1000.0-dev4100.201

package/fesm2015/magic-xpa-engine.mjs

@@ -1,7 +1,7 @@
 import { __awaiter } from 'tslib';
 import { StringBuilder, Int32, NString, ApplicationException, NNumber, List, Debug, Char, RefParam, NumberStyles, HashUtils, DateTime, Dictionary, Stack, NChar, isNullOrUndefined, WebException, Thread, Encoding, Exception, isUndefined, Hashtable, NotImplementedException, Array_Enumerator, ISO_8859_1_Encoding, Int64 } from '@magic-xpa/mscorelib';
 import { XMLConstants, StorageAttribute, ViewRefreshMode, InternalInterface, Logger, StorageAttributeCheck, StrUtil, SubformType, TableBehaviour, MgControlType, ScrollBarThumbType, ForceExit, XmlParser, Misc, Base64, Priority, SyncExecutionHelper, Queue, Constants, DateTimeUtils, Logger_LogLevels, Logger_MessageDirection, MsgInterface, RequestInfo, OSEnvironment, JSON_Utils, UtilDateJpn, UtilStrByteMode, PICInterface, WindowType, BrkScope, RaiseAt, CtrlButtonTypeGui } from '@magic-xpa/utils';
-import { RecordUtils, GuiFieldBase, ExpVal, BlobType, FieldDef, GuiTaskBase, MgControlBase, PropInterface, GuiDataCollection, CommandType, Commands, HtmlProperties, ControlTable, Modifiers, KeyboardItem, TaskDefinitionIdTableSaxHandler, DisplayConvertor, MgTimer, GuiConstants, RuntimeContextBase, UsernamePasswordCredentials, Styles, Manager, NUM_TYPE, VectorType, GuiExpressionEvaluator, ExpressionInterface, PIC, DataModificationTypes, GuiDataViewBase, ObjectReferencesCollection, EMPTY_DCREF, ObjectReferenceBase, PropTable, FieldsTable as FieldsTable$1, DcValuesBuilderBase, MgFormBase, GuiEnvironment, TaskDefinitionId, Events, Helps, FocusManager, EventsProcessor, UIBridge } from '@magic-xpa/gui';
+import { RecordUtils, GuiFieldBase, ExpVal, BlobType, FieldDef, GuiTaskBase, MgControlBase, PropInterface, GuiDataCollection, CommandType, Commands, HtmlProperties, ControlTable, Modifiers, KeyboardItem, TaskDefinitionIdTableSaxHandler, DisplayConvertor, VectorType, PIC, MgTimer, GuiConstants, RuntimeContextBase, UsernamePasswordCredentials, Styles, Manager, NUM_TYPE, GuiExpressionEvaluator, ExpressionInterface, DataModificationTypes, GuiDataViewBase, ObjectReferencesCollection, EMPTY_DCREF, ObjectReferenceBase, PropTable, FieldsTable as FieldsTable$1, DcValuesBuilderBase, MgFormBase, GuiEnvironment, TaskDefinitionId, Events, Helps, FocusManager, EventsProcessor, UIBridge } from '@magic-xpa/gui';
 import { HttpHeaders, HttpErrorResponse } from '@angular/common/http';
 import { timer, Subject } from 'rxjs';
 
@@ -272,6 +272,7 @@ ConstInterface.MG_ATTR_LOCAL_AS400SET = "local_as400set";
 ConstInterface.MG_ATTR_LOCAL_EXTRA_GENGO = "local_extraGengo";
 ConstInterface.MG_ATTR_LOCAL_FLAGS = "local_flags";
 ConstInterface.MG_ATTR_SPEACIAL_ANSI_EXP = "SpecialAnsiExpression";
+ConstInterface.MG_ATTR_SPECIAL_IMMEDIATE_HANDLER_END = "SpecialImmediateHandlerEnd";
 ConstInterface.MG_ATTR_SPECIAL_SHOW_STATUSBAR_PANES = "SpecialShowStatusBarPanes";
 ConstInterface.MG_ATTR_SPECIAL_ROUTE_TO_ROOT_PROG_ON_CONTEXT_RECREATION = "SpecialRouteToRootProgramOnContextRecreation";
 ConstInterface.MG_ATTR_SPECIAL_SPECIAL_EDIT_LEFT_ALIGN = "SpecialEditLeftAlign";
@@ -476,6 +477,7 @@ ConstInterface.RC_TOKEN_DATA = "DATA=";
 ConstInterface.WEBCLIENT_REINITIALIZE_REQUEST = "WCREINITIALIZEREQUEST=Y";
 ConstInterface.MAIN_PROG_VIEW = "MainProgramsDataView";
 ConstInterface.GLOBAL_PARAM_LIST = "GlobalParamList";
+ConstInterface.ENV_VAR_LIST = "EnvVarList";
 ConstInterface.LAST_EXCEPTION = "LastException";
 ConstInterface.CTX_REMOVED_FROM_SRVR = "CtxRemovedFromSrvr";
 ConstInterface.LAST_ROUTE_EVENT = "LastRouteEvent";
@@ -641,13 +643,6 @@ class CommandSerializationHelper {
 }
 
 class EventCommand extends ClientOriginatedCommandTaskTag {
-    constructor(magicEvent) {
-        super();
-        this.TaskTag = null;
-        this.MagicEvent = 0;
-        this.ClientRecId = 0;
-        this.MagicEvent = magicEvent;
-    }
     get CommandTypeAttribute() {
         return ConstInterface.MG_ATTR_VAL_EVENT;
     }
@@ -663,6 +658,13 @@ class EventCommand extends ClientOriginatedCommandTaskTag {
             return false;
         return true;
     }
+    constructor(magicEvent) {
+        super();
+        this.TaskTag = null;
+        this.MagicEvent = 0;
+        this.ClientRecId = 0;
+        this.MagicEvent = magicEvent;
+    }
     SerializeCommandData() {
         let helper = new CommandSerializationHelper();
         helper.SerializeTaskTag(this.TaskTag);
@@ -1202,15 +1204,6 @@ class OpeningTaskDetails {
 }
 
 class MgControl extends MgControlBase {
-    constructor(type, taskOrParentMgForm, parentControlOrParentControlIdx) {
-        if (arguments.length === 0)
-            super();
-        else if (arguments.length === 3 && (type === null || type.constructor === Number) && (taskOrParentMgForm === null || taskOrParentMgForm instanceof TaskBase) && (parentControlOrParentControlIdx === null || parentControlOrParentControlIdx.constructor === Number))
-            super(type, taskOrParentMgForm.getForm(), parentControlOrParentControlIdx);
-        else
-            super(type, taskOrParentMgForm, parentControlOrParentControlIdx);
-        this.initialize();
-    }
     initialize() {
         this._focusedStopExecution = false;
         this._inControlSuffix = false;
@@ -1223,6 +1216,15 @@ class MgControl extends MgControlBase {
         this.HasZoomHandler = false;
         this.ArgList = null;
     }
+    constructor(type, taskOrParentMgForm, parentControlOrParentControlIdx) {
+        if (arguments.length === 0)
+            super();
+        else if (arguments.length === 3 && (type === null || type.constructor === Number) && (taskOrParentMgForm === null || taskOrParentMgForm instanceof TaskBase) && (parentControlOrParentControlIdx === null || parentControlOrParentControlIdx.constructor === Number))
+            super(type, taskOrParentMgForm.getForm(), parentControlOrParentControlIdx);
+        else
+            super(type, taskOrParentMgForm, parentControlOrParentControlIdx);
+        this.initialize();
+    }
     GetVarIndex() {
         return super.getForm().getTask().DataView.Dvcount + this.veeIndx;
     }
@@ -3232,6 +3234,21 @@ class MgPriorityBlockingQueue {
 }
 
 class RunTimeEvent extends RunTimeEventBase {
+    set Control(value) {
+        this._ctrl = value;
+    }
+    set DisplayLine(value) {
+        this._displayLine = value;
+    }
+    get Control() {
+        return this._ctrl;
+    }
+    get ControlsList() {
+        return this._controlsList;
+    }
+    get Direction() {
+        return this._direction;
+    }
     constructor(taskRefOrCtrlRefOrTaskrefOrFldRefOrEvt, ctrlRefOrGuiTriggeredEventOrLineOrControlsListOrDirectionOrColumnHeaderOrRtEvtOrCurrentTask, ignoreSpecifiedControlOrGuiTriggeredEventOrLineOrXOrControlOrActivatedFromMDIFrame, yOrCtlIdx, width, height) {
         super();
         this._controlsList = null;
@@ -3293,21 +3310,6 @@ class RunTimeEvent extends RunTimeEventBase {
         else if (arguments.length === 1 && taskRefOrCtrlRefOrTaskrefOrFldRefOrEvt instanceof RunTimeEvent)
             Object.assign(this, taskRefOrCtrlRefOrTaskrefOrFldRefOrEvt);
     }
-    set Control(value) {
-        this._ctrl = value;
-    }
-    set DisplayLine(value) {
-        this._displayLine = value;
-    }
-    get Control() {
-        return this._ctrl;
-    }
-    get ControlsList() {
-        return this._controlsList;
-    }
-    get Direction() {
-        return this._direction;
-    }
     constructor_5(taskRef) {
         this.init(taskRef);
     }
@@ -3637,7 +3639,17 @@ class FlowMonitorQueue {
         this._isRecompute = false;
         this._isTask = false;
         this._isTaskFlow = false;
+        this._isDataView = false;
         this.ShouldSerialize = false;
+        this.padRight = (string, length, character = ' ') => {
+            let result = "";
+            let totalLength = length - string.length;
+            for (let i = 0; i < totalLength; i++) {
+                result = character + result;
+            }
+            result = result + string;
+            return result;
+        };
     }
     static get Instance() {
         if (FlowMonitorQueue._instance === null)
@@ -3695,6 +3707,9 @@ class FlowMonitorQueue {
                 case ConstInterface.MG_ATTR_TASKFLW:
                     this._isTaskFlow = XmlParser.getBoolean(valueStr);
                     break;
+                case ConstInterface.MG_TAG_DATAVIEW:
+                    this._isDataView = XmlParser.getBoolean(valueStr);
+                    break;
                 case ConstInterface.MG_ATTR_RECOMP:
                     this._isRecompute = XmlParser.getBoolean(valueStr);
                     break;
@@ -3752,6 +3767,96 @@ class FlowMonitorQueue {
             Logger.Instance.WriteSupportToLog(taskInfo + ": " + info, true);
         }
     }
+    appendVirtualsAndParameters(currentValues) {
+        let act = new ActivityItem(this, FlowMonitorQueue.ACT_TASK_FLW, InternalInterface.MG_ACT_REC_PREFIX);
+        act.setInfo(currentValues);
+        this._queue.put(act);
+    }
+    addDataViewFlow(task) {
+        if (this._isDataView) {
+            let fldTab = task.DataView.GetFieldsTab();
+            let preparedDisplayString = "";
+            let finaldisplayData = "\n";
+            let fldValue;
+            let data = "";
+            for (let i = 0; i < fldTab.getSize(); i++) {
+                let fldDef = fldTab.getField(i);
+                if (!fldDef.IsEventHandlerField && (fldDef.IsVirtual && !fldDef.VirAsReal) || fldDef.isParam()) {
+                    fldValue = fldDef.isNull() ? fldDef.getNullValue() : fldDef.getValue(true);
+                    data = this.getFieldData(fldDef.getType(), fldValue, fldDef.getPicture(), fldDef.getCellsType(), task);
+                    preparedDisplayString = this.PrepareDisplayString(fldDef.isParam(), fldDef.getVarName(), data, true);
+                    finaldisplayData = finaldisplayData + preparedDisplayString + "\n";
+                }
+            }
+            this.appendVirtualsAndParameters(finaldisplayData);
+        }
+    }
+    getFieldData(Storagetype, data, picture, vecCellType, task) {
+        switch (Storagetype) {
+            case StorageAttribute.DOTNET:
+                data = FlowMonitorQueue.UNPRINTABLE_STR_LOG;
+                break;
+            case StorageAttribute.BLOB:
+                {
+                    if (BlobType.isValidBlob(data)) {
+                        let contentType = BlobType.getContentType(data);
+                        if (contentType == BlobType.CONTENT_TYPE_ANSI || contentType == BlobType.CONTENT_TYPE_UNICODE)
+                            data = data != null ? BlobType.getString(data) : "";
+                        else
+                            data = FlowMonitorQueue.UNPRINTABLE_STR_LOG;
+                    }
+                    else
+                        data = "";
+                }
+                break;
+            case StorageAttribute.NUMERIC:
+            case StorageAttribute.DATE:
+            case StorageAttribute.TIME:
+                let conv = DisplayConvertor.Instance;
+                data = conv.mg2disp(data, " ", new PIC(picture, Storagetype, task.getCompIdx()), false, task.getCompIdx(), false);
+                break;
+            case StorageAttribute.BLOB_VECTOR:
+                let vecOutData;
+                if (data == null) {
+                    vecOutData = "[]";
+                }
+                else {
+                    let cellAtt = vecCellType;
+                    let vector = new VectorType(data);
+                    if (cellAtt == StorageAttribute.BLOB && !VectorType.validateBlobContents(data))
+                        vecOutData = "[]";
+                    else {
+                        let vecSize = VectorType.getVecSize(data);
+                        let cellPicture = (cellAtt == StorageAttribute.NUMERIC || cellAtt == StorageAttribute.DATE || cellAtt == StorageAttribute.TIME) ? PIC.buildPicture(cellAtt, vector.getVecCell(1), task.getCompIdx(), true).getFormat() : picture;
+                        vecOutData = "[";
+                        for (let i = 0; i < vecSize; i++) {
+                            vecOutData += this.getFieldData(cellAtt, vector.getVecCell(i + 1), cellPicture, vecCellType, task);
+                            vecOutData += i < vecSize - 1 ? "," : "]";
+                        }
+                    }
+                }
+                data = vecOutData;
+                break;
+            case StorageAttribute.BOOLEAN:
+                data = data == "1" ? "TRUE" : "FALSE";
+                break;
+        }
+        return data;
+    }
+    PrepareDisplayString(mode, name, valueContent, addDoubleQuotes) {
+        let str = "";
+        let finalStringToDisplay = "";
+        if (addDoubleQuotes)
+            finalStringToDisplay = finalStringToDisplay + "\"";
+        finalStringToDisplay = finalStringToDisplay + name;
+        if (addDoubleQuotes)
+            finalStringToDisplay = finalStringToDisplay + "\"";
+        let paddedName = this.padRight(name, 34);
+        let formatOfStringVirtual = `Virtual`;
+        let formatOfStringParameter = `Parameter`;
+        str = (mode ? formatOfStringParameter : formatOfStringVirtual) + " : " + `${paddedName}` + " : " + `${valueContent.trim()}`;
+        return str;
+    }
     addTaskFlowRec(id, state, taskInfo) {
         if (this._enabled && this._isTaskFlow) {
             let info;
@@ -3918,6 +4023,7 @@ class FlowMonitorQueue {
     }
 }
 FlowMonitorQueue._instance = null;
+FlowMonitorQueue.UNPRINTABLE_STR_LOG = "#UNPRINTABLE#";
 FlowMonitorQueue.S_EVENT_STR1 = ">>Starts ";
 FlowMonitorQueue.S_EVENT_STR2 = " Event";
 FlowMonitorQueue.S_EVENT_PROPAGATED = "Event was propagated";
@@ -3979,6 +4085,15 @@ class TimerObjectCollection {
 }
 TimerObjectCollection.MgDataToTimerObjList = new Dictionary();
 class RCTimer extends MgTimer {
+    get TimerIntervalMiliSeconds() {
+        return this._timerIntervalMilliSeconds;
+    }
+    set IsIdleTimer(value) {
+        this._isIdle = value;
+    }
+    get IsIdleTimer() {
+        return this._isIdle;
+    }
     constructor(mgData, milliseconds, isIdle) {
         super(milliseconds);
         this._mgData = null;
@@ -3990,15 +4105,6 @@ class RCTimer extends MgTimer {
             TimerObjectCollection.MgDataToTimerObjList.Add(mgDataId, new List());
         TimerObjectCollection.MgDataToTimerObjList.get_Item(mgDataId).push(this);
     }
-    get TimerIntervalMiliSeconds() {
-        return this._timerIntervalMilliSeconds;
-    }
-    set IsIdleTimer(value) {
-        this._isIdle = value;
-    }
-    get IsIdleTimer() {
-        return this._isIdle;
-    }
     GetMgdata() {
         return this._mgData;
     }
@@ -4144,6 +4250,9 @@ class ExecutionStack {
 }
 
 class ExecOperCommand extends ClientOriginatedCommandTaskTag {
+    get CommandTypeAttribute() {
+        return ConstInterface.MG_ATTR_VAL_EXEC_OPER;
+    }
     constructor() {
         super();
         this.ExecutionStack = null;
@@ -4157,9 +4266,6 @@ class ExecOperCommand extends ClientOriginatedCommandTaskTag {
         this.CheckOnly = false;
         this.DitIdx = Int32.MinValue;
     }
-    get CommandTypeAttribute() {
-        return ConstInterface.MG_ATTR_VAL_EXEC_OPER;
-    }
     SerializeCommandData() {
         let helper = new CommandSerializationHelper();
         let execStackExists = this.ExecutionStack !== null && !this.ExecutionStack.empty();
@@ -4640,13 +4746,6 @@ class HttpClientAsync extends HttpClientBase {
 }
 
 class HttpManager {
-    constructor() {
-        this._httpCommunicationTimeoutMS = HttpManager.DEFAULT_HTTP_COMMUNICATION_TIMEOUT;
-        this._httpClientAsync = null;
-        this._isAbortingMagicEngine = false;
-        this._httpClientAsync = new HttpClientAsync(HttpManager._nativeHttpClient);
-        this.RegisterBasicDelegates();
-    }
     getHttpClient() {
         if (this.IsAbortingMagicEngine)
             return new HttpClientSync();
@@ -4666,6 +4765,13 @@ class HttpManager {
     }
     get IsAbortingMagicEngine() { return this._isAbortingMagicEngine; }
     set IsAbortingMagicEngine(isAbortingMagicEngine) { this._isAbortingMagicEngine = isAbortingMagicEngine; }
+    constructor() {
+        this._httpCommunicationTimeoutMS = HttpManager.DEFAULT_HTTP_COMMUNICATION_TIMEOUT;
+        this._httpClientAsync = null;
+        this._isAbortingMagicEngine = false;
+        this._httpClientAsync = new HttpClientAsync(HttpManager._nativeHttpClient);
+        this.RegisterBasicDelegates();
+    }
     RegisterBasicDelegates() {
         HttpClientEvents.GetHttpCommunicationTimeout_Event = this.GetHttpCommunicationTimeoutMS.bind(this);
     }
@@ -5223,6 +5329,12 @@ var RequestStatus;
     RequestStatus[RequestStatus["Abort"] = 2] = "Abort";
 })(RequestStatus || (RequestStatus = {}));
 class RemoteCommandsProcessor extends CommandsProcessorBase {
+    static GetInstance() {
+        if (RemoteCommandsProcessor._instance === null) {
+            RemoteCommandsProcessor._instance = new RemoteCommandsProcessor();
+        }
+        return RemoteCommandsProcessor._instance;
+    }
     constructor() {
         super();
         this._lastRequestTime = 0;
@@ -5233,12 +5345,6 @@ class RemoteCommandsProcessor extends CommandsProcessorBase {
         HttpManager.GetInstance();
         this.RegisterDelegates();
     }
-    static GetInstance() {
-        if (RemoteCommandsProcessor._instance === null) {
-            RemoteCommandsProcessor._instance = new RemoteCommandsProcessor();
-        }
-        return RemoteCommandsProcessor._instance;
-    }
     CheckAndSetSessionCounter(newSessionCounter) {
         if (newSessionCounter === ConstInterface.SESSION_COUNTER_CLOSE_CTX_INDICATION) {
             Debug.Assert(this.GetSessionCounter() === ConstInterface.SESSION_COUNTER_CLOSE_CTX_INDICATION);
@@ -5274,10 +5380,12 @@ class RemoteCommandsProcessor extends CommandsProcessorBase {
         return __awaiter(this, void 0, void 0, function* () {
             let mainPrgViewStringForServer = yield this.BuildXMLForMainProgramDataView();
             let globalParamsString = AccessHelper.globalParams.mirrorAllToXML();
+            let changedEnvVarList = AccessHelper.envParamsTable.mirrorAllToXML();
             let dataStorage = window.localStorage;
             dataStorage.setItem(ConstInterface.IS_SESSION_REINITIALIZING, "true");
             dataStorage.setItem(ConstInterface.MAIN_PROG_VIEW, mainPrgViewStringForServer.toString());
             dataStorage.setItem(ConstInterface.GLOBAL_PARAM_LIST, globalParamsString);
+            dataStorage.setItem(ConstInterface.ENV_VAR_LIST, changedEnvVarList);
             dataStorage.setItem(ConstInterface.LAST_EXCEPTION, RemoteCommandsProcessor.lastExceptionMessage);
             if (RuntimeContextBase.Instance.RemovedContextFromServer)
                 dataStorage.setItem(ConstInterface.CTX_REMOVED_FROM_SRVR, "1");
@@ -5514,6 +5622,7 @@ class RemoteCommandsProcessor extends CommandsProcessorBase {
             let reqBuf;
             let isInitialCall = sessionStage === CommandsProcessorBase_SessionStage.INITIAL;
             let globalParamsString = null;
+            let envVarsString = null;
             if (this.DelayCommandExecution)
                 return;
             if (Logger.Instance.LogLevel == Logger_LogLevels.RequestInfo && !isInitialCall)
@@ -5539,12 +5648,16 @@ class RemoteCommandsProcessor extends CommandsProcessorBase {
                     let buffer = new StringBuilder();
                     if (!RemoteCommandsProcessor.IsSessionReInitializing)
                         buffer.Append(reqBuf);
-                    if (RemoteCommandsProcessor.IsSessionReInitializing)
+                    if (RemoteCommandsProcessor.IsSessionReInitializing) {
                         globalParamsString = this.RestoreSessionReInitializingDataFromLocalStorage(ConstInterface.GLOBAL_PARAM_LIST);
-                    else
+                        envVarsString = this.RestoreSessionReInitializingDataFromLocalStorage(ConstInterface.ENV_VAR_LIST);
+                    }
+                    else {
                         globalParamsString = AccessHelper.globalParams.mirrorToXML();
+                        envVarsString = AccessHelper.envParamsTable.mirrorToXML();
+                    }
                     changes.Append(globalParamsString);
-                    changes.Append(AccessHelper.envParamsTable.mirrorToXML());
+                    changes.Append(envVarsString);
                     if (changes.Length > 0) {
                         changes.Insert(0, "<" + ConstInterface.MG_TAG_ENV_CHANGES + ">");
                         changes.Append("</" + ConstInterface.MG_TAG_ENV_CHANGES + ">");
@@ -5583,13 +5696,15 @@ class RemoteCommandsProcessor extends CommandsProcessorBase {
                     dataStorage.removeItem(ConstInterface.IS_SESSION_REINITIALIZING);
                     dataStorage.removeItem(ConstInterface.MAIN_PROG_VIEW);
                     dataStorage.removeItem(ConstInterface.GLOBAL_PARAM_LIST);
+                    dataStorage.removeItem(ConstInterface.ENV_VAR_LIST);
                     dataStorage.removeItem(ConstInterface.LAST_EXCEPTION);
                 }
             }
             FlowMonitorQueue.Instance.enable(false);
             yield this.ProcessResponse(respBuf, AccessHelper.mgDataTable.currMgdID, null, res);
             if (RemoteCommandsProcessor.IsSessionReInitializing) {
-                AccessHelper.globalParams.RestoreGlobalParams(globalParamsString);
+                AccessHelper.globalParams.RestoreParams(globalParamsString);
+                AccessHelper.envParamsTable.RestoreParams(envVarsString);
                 let dataStorage = window.localStorage;
                 let ctxRemoved = dataStorage.getItem(ConstInterface.CTX_REMOVED_FROM_SRVR);
                 if (ctxRemoved === "1") {
@@ -5906,21 +6021,6 @@ RemoteCommandsProcessor.InitialUrl = null;
 RemoteCommandsProcessor.WEB_COMMUNICATION_PROTOCOL_VERSION = "14002";
 RemoteCommandsProcessor._shouldScrambleAndUnscrambleMessages = false;
 class HandshakeResponse {
-    constructor(responseXML) {
-        this._scrambleMessages = true;
-        this._contextId = null;
-        this._privateSessionId = null;
-        this._inputPassword = false;
-        this._httpTimeout = 0;
-        this._systemLogin = null;
-        this._maxInternalLogLevel = null;
-        try {
-            JSON_Utils.JSONFromXML(responseXML, this.FillFromJSON.bind(this));
-        }
-        catch (ex) {
-            Logger.Instance.WriteExceptionToLog(ex, responseXML);
-        }
-    }
     get ScrambleMessages() {
         return this._scrambleMessages;
     }
@@ -5942,6 +6042,21 @@ class HandshakeResponse {
     get MaxInternalLogLevel() {
         return this._maxInternalLogLevel;
     }
+    constructor(responseXML) {
+        this._scrambleMessages = true;
+        this._contextId = null;
+        this._privateSessionId = null;
+        this._inputPassword = false;
+        this._httpTimeout = 0;
+        this._systemLogin = null;
+        this._maxInternalLogLevel = null;
+        try {
+            JSON_Utils.JSONFromXML(responseXML, this.FillFromJSON.bind(this));
+        }
+        catch (ex) {
+            Logger.Instance.WriteExceptionToLog(ex, responseXML);
+        }
+    }
     FillFromJSON(error, result) {
         if (error != null) {
             throw error;
@@ -6918,7 +7033,7 @@ ExpressionDict.expDesc = [
     null,
     new ExpDesc('N', 0, 0, 0, "", false),
     null,
-    new ExpDesc('B', 0, 2, 2, "BN", false),
+    null,
     new ExpDesc('B', 0, 2, 2, "V ", false),
     null,
     null,
@@ -7367,12 +7482,12 @@ ExpressionDict.expDesc = [
     null,
     new ExpDesc('A', 0, 1, 1, "A", false),
     new ExpDesc('N', 0, 2, 2, "AA", false),
-    new ExpDesc('B', 0, -2, -2, "V  ", false),
-    new ExpDesc('B', 0, 1, 1, "N", false),
-    new ExpDesc('B', 0, -2, -2, "V  ", false),
-    new ExpDesc('B', 0, 1, 1, "N", false),
-    new ExpDesc('B', 0, 2, 2, "VB", false),
-    new ExpDesc('B', 0, 1, 1, "N", false),
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
     new ExpDesc('N', 0, 1, 1, "N", false),
     null,
     null,
@@ -7459,48 +7574,6 @@ ExpressionDict.expDesc = [
     new ExpDesc('U', 0, 0, 0, '', false),
 ];
 
-var DataViewCommandType;
-(function (DataViewCommandType) {
-    DataViewCommandType[DataViewCommandType["Init"] = 0] = "Init";
-    DataViewCommandType[DataViewCommandType["Clear"] = 1] = "Clear";
-    DataViewCommandType[DataViewCommandType["Prepare"] = 2] = "Prepare";
-    DataViewCommandType[DataViewCommandType["FirstChunk"] = 3] = "FirstChunk";
-    DataViewCommandType[DataViewCommandType["RecomputeUnit"] = 4] = "RecomputeUnit";
-    DataViewCommandType[DataViewCommandType["ExecuteLocalUpdates"] = 5] = "ExecuteLocalUpdates";
-    DataViewCommandType[DataViewCommandType["InitDataControlViews"] = 6] = "InitDataControlViews";
-    DataViewCommandType[DataViewCommandType["OpenTransaction"] = 7] = "OpenTransaction";
-    DataViewCommandType[DataViewCommandType["CloseTransaction"] = 8] = "CloseTransaction";
-    DataViewCommandType[DataViewCommandType["SetTransactionState"] = 9] = "SetTransactionState";
-    DataViewCommandType[DataViewCommandType["AddUserRange"] = 10] = "AddUserRange";
-    DataViewCommandType[DataViewCommandType["ResetUserRange"] = 11] = "ResetUserRange";
-    DataViewCommandType[DataViewCommandType["DbDisconnect"] = 12] = "DbDisconnect";
-    DataViewCommandType[DataViewCommandType["AddUserLocate"] = 13] = "AddUserLocate";
-    DataViewCommandType[DataViewCommandType["ResetUserLocate"] = 14] = "ResetUserLocate";
-    DataViewCommandType[DataViewCommandType["AddUserSort"] = 15] = "AddUserSort";
-    DataViewCommandType[DataViewCommandType["ResetUserSort"] = 16] = "ResetUserSort";
-    DataViewCommandType[DataViewCommandType["DataViewToDataSource"] = 17] = "DataViewToDataSource";
-    DataViewCommandType[DataViewCommandType["DbDelete"] = 18] = "DbDelete";
-    DataViewCommandType[DataViewCommandType["ControlItemsRefresh"] = 19] = "ControlItemsRefresh";
-    DataViewCommandType[DataViewCommandType["SQLExecute"] = 20] = "SQLExecute";
-})(DataViewCommandType || (DataViewCommandType = {}));
-class DataviewCommand extends ClientOriginatedCommandTaskTag {
-    constructor() {
-        super();
-        this.CommandType = 0;
-        this.TaskTag = null;
-    }
-    get CommandTypeAttribute() {
-        throw new NotImplementedException();
-    }
-    SerializeCommandData() {
-        Debug.Assert(false, "Dataview commands need not be serialized");
-        return null;
-    }
-    get ShouldSerialize() {
-        return false;
-    }
-}
-
 class EventHandlerPosition {
     constructor() {
         this._handlerIdx = 0;
@@ -7557,6 +7630,9 @@ class EventHandlerPosition {
                 case InternalInterface.MG_ACT_REC_SUFFIX:
                 case InternalInterface.MG_ACT_CTRL_PREFIX:
                 case InternalInterface.MG_ACT_CTRL_SUFFIX: {
+                    if (this._rtEvt.getInternalCode() == InternalInterface.MG_ACT_REC_PREFIX) {
+                        FlowMonitorQueue.Instance.addDataViewFlow(this._task);
+                    }
                     if (this._handlerIdx === -1) {
                         for (this._handlerIdx = this._handlersTab.getSize() - 1; this._handlerIdx >= 0; this._handlerIdx--) {
                             let handler = this._handlersTab.getHandler(this._handlerIdx);
@@ -7697,6 +7773,48 @@ EventHandlerPosition.PHASE_CONTROL_NON_SPECIFIC = 2;
 EventHandlerPosition.PHASE_GLOBAL = 3;
 EventHandlerPosition.PHASE_GLOBAL_SPECIFIC = 4;
 
+var DataViewCommandType;
+(function (DataViewCommandType) {
+    DataViewCommandType[DataViewCommandType["Init"] = 0] = "Init";
+    DataViewCommandType[DataViewCommandType["Clear"] = 1] = "Clear";
+    DataViewCommandType[DataViewCommandType["Prepare"] = 2] = "Prepare";
+    DataViewCommandType[DataViewCommandType["FirstChunk"] = 3] = "FirstChunk";
+    DataViewCommandType[DataViewCommandType["RecomputeUnit"] = 4] = "RecomputeUnit";
+    DataViewCommandType[DataViewCommandType["ExecuteLocalUpdates"] = 5] = "ExecuteLocalUpdates";
+    DataViewCommandType[DataViewCommandType["InitDataControlViews"] = 6] = "InitDataControlViews";
+    DataViewCommandType[DataViewCommandType["OpenTransaction"] = 7] = "OpenTransaction";
+    DataViewCommandType[DataViewCommandType["CloseTransaction"] = 8] = "CloseTransaction";
+    DataViewCommandType[DataViewCommandType["SetTransactionState"] = 9] = "SetTransactionState";
+    DataViewCommandType[DataViewCommandType["AddUserRange"] = 10] = "AddUserRange";
+    DataViewCommandType[DataViewCommandType["ResetUserRange"] = 11] = "ResetUserRange";
+    DataViewCommandType[DataViewCommandType["DbDisconnect"] = 12] = "DbDisconnect";
+    DataViewCommandType[DataViewCommandType["AddUserLocate"] = 13] = "AddUserLocate";
+    DataViewCommandType[DataViewCommandType["ResetUserLocate"] = 14] = "ResetUserLocate";
+    DataViewCommandType[DataViewCommandType["AddUserSort"] = 15] = "AddUserSort";
+    DataViewCommandType[DataViewCommandType["ResetUserSort"] = 16] = "ResetUserSort";
+    DataViewCommandType[DataViewCommandType["DataViewToDataSource"] = 17] = "DataViewToDataSource";
+    DataViewCommandType[DataViewCommandType["DbDelete"] = 18] = "DbDelete";
+    DataViewCommandType[DataViewCommandType["ControlItemsRefresh"] = 19] = "ControlItemsRefresh";
+    DataViewCommandType[DataViewCommandType["SQLExecute"] = 20] = "SQLExecute";
+})(DataViewCommandType || (DataViewCommandType = {}));
+class DataviewCommand extends ClientOriginatedCommandTaskTag {
+    get CommandTypeAttribute() {
+        throw new NotImplementedException();
+    }
+    SerializeCommandData() {
+        Debug.Assert(false, "Dataview commands need not be serialized");
+        return null;
+    }
+    get ShouldSerialize() {
+        return false;
+    }
+    constructor() {
+        super();
+        this.CommandType = 0;
+        this.TaskTag = null;
+    }
+}
+
 class AddUserRangeDataviewCommand extends DataviewCommand {
     constructor() {
         super();
@@ -7916,12 +8034,6 @@ class NonReversibleExitEventCommand extends EventCommand {
 }
 
 class RecomputeCommand extends ClientOriginatedCommandTaskTag {
-    constructor() {
-        super();
-        this.TaskTag = null;
-        this.FldId = 0;
-        this.IgnoreSubformRecompute = false;
-    }
     get CommandTypeAttribute() {
         return ConstInterface.MG_ATTR_VAL_RECOMP;
     }
@@ -7933,17 +8045,18 @@ class RecomputeCommand extends ClientOriginatedCommandTaskTag {
             helper.SerializeAttribute(ConstInterface.MG_ATTR_IGNORE_SUBFORM_RECOMPUTE, '1');
         return helper.GetString();
     }
+    constructor() {
+        super();
+        this.TaskTag = null;
+        this.FldId = 0;
+        this.IgnoreSubformRecompute = false;
+    }
     getCommandInfo() {
         return NString.Format('[{0} in {1} for Field {2}]', this.CommandTypeAttribute.charAt(0).toUpperCase() + this.CommandTypeAttribute.substr(1, this.CommandTypeAttribute.length), this.Task.getTaskInfo(), this.Task.getFieldDef(this.FldId).getName());
     }
 }
 
 class TransactionCommand extends ClientOriginatedCommandTaskTag {
-    constructor() {
-        super();
-        this.TaskTag = null;
-        this.ReversibleExit = false;
-    }
     get CommandTypeAttribute() {
         return ConstInterface.MG_ATTR_VAL_TRANS;
     }
@@ -7957,6 +8070,11 @@ class TransactionCommand extends ClientOriginatedCommandTaskTag {
             helper.SerializeAttribute(ConstInterface.MG_ATTR_TRANS_LEVEL, this.Level);
         return helper.GetString();
     }
+    constructor() {
+        super();
+        this.TaskTag = null;
+        this.ReversibleExit = false;
+    }
     getCommandInfo() {
         return NString.Format('[{0} in {1}]', this.Oper === 'C' ? 'Commit Transaction' : 'Abort Transaction', this.Task.getTaskInfo());
     }
@@ -7975,6 +8093,9 @@ class UnloadCommand extends ClientOriginatedCommand {
 }
 
 class EvaluateCommand extends ClientOriginatedCommandTaskTag {
+    get CommandTypeAttribute() {
+        return ConstInterface.MG_ATTR_VAL_EVAL;
+    }
     constructor() {
         super();
         this.TaskTag = null;
@@ -7983,9 +8104,6 @@ class EvaluateCommand extends ClientOriginatedCommandTaskTag {
         this.MprgCreator = null;
         this.LengthExpVal = Int32.MinValue;
     }
-    get CommandTypeAttribute() {
-        return ConstInterface.MG_ATTR_VAL_EVAL;
-    }
     SerializeCommandData() {
         let helper = new CommandSerializationHelper();
         helper.SerializeTaskTag(this.TaskTag);
@@ -8032,11 +8150,7 @@ class GlobalParamsQueryCommand extends QueryCommand {
     }
 }
 
-class IniputForceWriteCommand extends ClientOriginatedCommand {
-    constructor() {
-        super();
-        this.Text = null;
-    }
+class IniputForceWriteCommand extends ClientOriginatedCommand {
     get CommandTypeAttribute() {
         return ConstInterface.MG_ATTR_VAL_INIPUT_FORCE_WRITE;
     }
@@ -8046,6 +8160,10 @@ class IniputForceWriteCommand extends ClientOriginatedCommand {
     SerializeCommandData() {
         return " " + ConstInterface.MG_ATTR_VAL_INIPUT_PARAM + "=\"" + XmlParser.escape(this.Text) + "\"";
     }
+    constructor() {
+        super();
+        this.Text = null;
+    }
     getCommandInfo() {
         return NString.Format('[{0} with {1}] ', this.CommandTypeAttribute, this.Text);
     }
@@ -8095,6 +8213,13 @@ class SelectProgramCommand extends ExecOperCommand {
     }
 }
 
+class ControlItemsRefreshCommand extends DataviewCommand {
+    constructor() {
+        super();
+        this.Control = null;
+    }
+}
+
 class CommandFactory {
     static CreateEventCommand(taskTag, magicEvent) {
         let eventCommand = new EventCommand(magicEvent);
@@ -8113,6 +8238,13 @@ class CommandFactory {
         dataviewCommand.TaskTag = taskId;
         return dataviewCommand;
     }
+    static CreateControlItemsRefreshCommand(taskId, control) {
+        let command = new ControlItemsRefreshCommand();
+        command.CommandType = DataViewCommandType.ControlItemsRefresh;
+        command.TaskTag = taskId;
+        command.Control = control;
+        return command;
+    }
     static CreateAddUserRangeDataviewCommand(taskId, userRange) {
         let addUserRangeDataviewCommand = new AddUserRangeDataviewCommand();
         addUserRangeDataviewCommand.TaskTag = taskId;
@@ -8322,13 +8454,6 @@ class CommandFactory {
     }
 }
 
-class Sort {
-    constructor() {
-        this.fldIdx = 0;
-        this.dir = false;
-    }
-}
-
 var ParamParseResult;
 (function (ParamParseResult) {
     ParamParseResult[ParamParseResult["OK"] = 0] = "OK";
@@ -8338,10 +8463,6 @@ var ParamParseResult;
 })(ParamParseResult || (ParamParseResult = {}));
 
 class PrmMap {
-    constructor() {
-        this.values = null;
-        this.values = new Dictionary();
-    }
     getvalue(s) {
         if (this.values.ContainsKey(s))
             return this.values.get_Item(s);
@@ -8354,6 +8475,10 @@ class PrmMap {
     remove(s) {
         this.values.Remove(s);
     }
+    constructor() {
+        this.values = null;
+        this.values = new Dictionary();
+    }
 }
 class MirrorPrmMap extends PrmMap {
     constructor(type) {
@@ -8434,7 +8559,7 @@ class MirrorPrmMap extends PrmMap {
         while (this.mirrorFromXML(parser.getNextTag(), parser)) {
         }
     }
-    RestoreGlobalParams(xml) {
+    RestoreParams(xml) {
         let parser = new XmlParser(xml);
         while (this.mirrorFromXML(parser.getNextTag(), parser)) {
         }
@@ -8509,6 +8634,7 @@ class Environment {
         this._debugMode = 0;
         this._significantNumSize = 0;
         this._specialAnsiExpression = false;
+        this._specialImmediatehandlerEnd = false;
         this._specialShowStatusBarPanes = false;
         this._specialRouteToRootProgOnContextRecreation = false;
         this._specialCancelOnCreate = false;
@@ -8662,6 +8788,9 @@ class Environment {
                 case ConstInterface.MG_ATTR_LOCAL_FLAGS:
                     this._localFlags = valueStr;
                     break;
+                case ConstInterface.MG_ATTR_SPECIAL_IMMEDIATE_HANDLER_END:
+                    this._specialImmediatehandlerEnd = XmlParser.getBoolean(valueStr);
+                    break;
                 case ConstInterface.MG_ATTR_SPEACIAL_ANSI_EXP:
                     this._specialAnsiExpression = XmlParser.getBoolean(valueStr);
                     break;
@@ -8868,6 +8997,9 @@ class Environment {
     GetLocalFlag(f) {
         return this._localFlags !== null && this._localFlags.indexOf(f) >= 0;
     }
+    getSpecialImmediateHandlerEnd() {
+        return this._specialImmediatehandlerEnd;
+    }
     getSpecialAnsiExpression() {
         return this._specialAnsiExpression;
     }
@@ -8937,6 +9069,12 @@ class Environment {
 }
 Environment.Instance = new Environment();
 class EnvironmentDetails {
+    set UpdateInQueryMode(value) {
+        this._updateInQueryMode = value;
+    }
+    set CreateInModifyMode(value) {
+        this._createInModifyMode = value;
+    }
     constructor() {
         this._createInModifyMode = false;
         this._updateInQueryMode = false;
@@ -8947,12 +9085,6 @@ class EnvironmentDetails {
         this.ProjDir = null;
         this.CompIdx = 0;
     }
-    set UpdateInQueryMode(value) {
-        this._updateInQueryMode = value;
-    }
-    set CreateInModifyMode(value) {
-        this._createInModifyMode = value;
-    }
     allowUpdateInQueryMode() {
         return this._updateInQueryMode;
     }
@@ -9040,17 +9172,6 @@ class GlobalParams extends MirrorPrmMap {
 GlobalParams.Instance = new GlobalParams();
 
 class UserDetails {
-    constructor() {
-        this.UserName = null;
-        this.UserID = null;
-        this.UserInfo = null;
-        this.Password = null;
-        this.IsLoggedIn = false;
-        this.UserName = NString.Empty;
-        this.UserInfo = NString.Empty;
-        this.IsLoggedIn = false;
-        this.setUserID(NString.Empty);
-    }
     setIsLoggedIn(value) {
         this.IsLoggedIn = value;
     }
@@ -9070,6 +9191,17 @@ class UserDetails {
             UserDetails._instance = new UserDetails();
         return UserDetails._instance;
     }
+    constructor() {
+        this.UserName = null;
+        this.UserID = null;
+        this.UserInfo = null;
+        this.Password = null;
+        this.IsLoggedIn = false;
+        this.UserName = NString.Empty;
+        this.UserInfo = NString.Empty;
+        this.IsLoggedIn = false;
+        this.setUserID(NString.Empty);
+    }
     fillData(parser) {
         let tokensVector;
         let endContext = parser.getXMLdata().indexOf(XMLConstants.TAG_TERM, parser.getCurrIndex());
@@ -9906,8 +10038,7 @@ class MirrorString {
         this._reserved = false;
     }
     mirrorToXML() {
-        return ConstInterface.MG_ATTR_ENV_VALUE + "=\"" + XmlParser.escape(this._value) + "\" " +
-            ConstInterface.MG_ATTR_ENV_WRITEINI + "=F";
+        return ConstInterface.MG_ATTR_ENV_VALUE + "=\"" + XmlParser.escape(this._value) + "\"";
     }
     init(name, xmlParser) {
         let valueStart, valueEnd, reserveStart, paramEnd;
@@ -11090,6 +11221,11 @@ class ExpressionEvaluator extends GuiExpressionEvaluator {
                     this.eval_op_VarDisplayName(resVal, val1);
                     expStrTracker.resetNullResult();
                     break;
+                case ExpressionInterface.EXP_OP_CONTROL_ITEMS_REFRESH:
+                    val2 = valStack.pop();
+                    val1 = valStack.pop();
+                    yield this.eval_op_controlItemRefresh(val1, val2, resVal);
+                    break;
                 case ExpressionInterface.EXP_OP_VARCONTROLID:
                     val1 = valStack.pop();
                     this.eval_op_VarControlID(resVal, val1);
@@ -11478,11 +11614,6 @@ class ExpressionEvaluator extends GuiExpressionEvaluator {
                     val1 = valStack.pop();
                     this.eval_op_eoy(resVal, val1);
                     break;
-                case ExpressionInterface.EXP_OP_ROLLBACK:
-                    val2 = valStack.pop();
-                    val1 = valStack.pop();
-                    yield this.eval_op_rollback(resVal);
-                    break;
                 case ExpressionInterface.EXP_OP_VARSET:
                     val2 = valStack.pop();
                     val1 = valStack.pop();
@@ -11847,41 +11978,6 @@ class ExpressionEvaluator extends GuiExpressionEvaluator {
                     val1 = valStack.pop();
                     this.eval_op_taskType(resVal, val1);
                     break;
-                case ExpressionInterface.EXP_OP_RANGE_ADD:
-                    nArgs = valStack.pop();
-                    if (nArgs > 0) {
-                        Exp_params = new Array(nArgs);
-                        for (j = 0; j < nArgs; j++)
-                            Exp_params[nArgs - 1 - j] = valStack.pop();
-                        yield this.eval_op_range_add(resVal, Exp_params);
-                    }
-                    break;
-                case ExpressionInterface.EXP_OP_RANGE_RESET:
-                    val1 = valStack.pop();
-                    yield this.eval_op_range_reset(resVal, val1);
-                    break;
-                case ExpressionInterface.EXP_OP_LOCATE_ADD:
-                    nArgs = valStack.pop();
-                    if (nArgs > 0) {
-                        Exp_params = new Array(nArgs);
-                        for (j = 0; j < nArgs; j++)
-                            Exp_params[nArgs - 1 - j] = valStack.pop();
-                        yield this.eval_op_locate_add(resVal, Exp_params);
-                    }
-                    break;
-                case ExpressionInterface.EXP_OP_LOCATE_RESET:
-                    val1 = valStack.pop();
-                    yield this.eval_op_locate_reset(resVal, val1);
-                    break;
-                case ExpressionInterface.EXP_OP_SORT_ADD:
-                    val2 = valStack.pop();
-                    val1 = valStack.pop();
-                    yield this.eval_op_sort_add(resVal, val1, val2);
-                    break;
-                case ExpressionInterface.EXP_OP_SORT_RESET:
-                    val1 = valStack.pop();
-                    yield this.eval_op_sort_reset(resVal, val1);
-                    break;
                 case ExpressionInterface.EXP_OP_TSK_INSTANCE:
                     val1 = valStack.pop();
                     this.eval_op_tsk_instance(resVal, val1);
@@ -13234,6 +13330,28 @@ class ExpressionEvaluator extends GuiExpressionEvaluator {
                 resVal.StrVal = fld.VarDisplayName;
         }
     }
+    eval_op_controlItemRefresh(val1, val2, resVal) {
+        const _super = Object.create(null, {
+            GetContextTask: { get: () => super.GetContextTask }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            let success = false;
+            let parent = val2.MgNumVal.NUM_2_LONG();
+            resVal.Attr = StorageAttribute.BOOLEAN;
+            if ((parent >= 0 && parent < (this.ExpTask.getTaskDepth(false))) || parent === ExpressionEvaluator.TRIGGER_TASK) {
+                let tsk = _super.GetContextTask.call(this, parent);
+                if (tsk != null && tsk.getForm() != null) {
+                    let control = tsk.getForm().GetCtrl(val1.StrVal);
+                    if (control != null && control.isChoiceControl() && control.isDataCtrl()) {
+                        let command = CommandFactory.CreateControlItemsRefreshCommand(tsk.getTaskTag(), control);
+                        yield tsk.DataviewManager.CurrentDataviewManager.Execute(command);
+                        success = true;
+                    }
+                }
+            }
+            resVal.BoolVal = success;
+        });
+    }
     eval_op_VarControlID(resVal, val1) {
         let ret = 0;
         if (val1.MgNumVal !== null) {
@@ -13528,14 +13646,6 @@ class ExpressionEvaluator extends GuiExpressionEvaluator {
             yield fld.updateDisplay();
         });
     }
-    eval_op_rollback(resVal) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let task = this.ExpTask.GetContextTask() || this.ExpTask;
-            yield AccessHelper.eventsManager.handleInternalEventWithTask(task, InternalInterface.MG_ACT_ROLLBACK);
-            resVal.Attr = StorageAttribute.BOOLEAN;
-            resVal.BoolVal = true;
-        });
-    }
     eval_op_like(source, maskOrg, resVal) {
         let i;
         let j;
@@ -14096,75 +14206,6 @@ class ExpressionEvaluator extends GuiExpressionEvaluator {
         resultStr.Replace('\\@', '@');
         resVal.StrVal = resultStr.ToString();
     }
-    eval_op_range_add(resVal, Exp_params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            resVal.Attr = StorageAttribute.BOOLEAN;
-            resVal.BoolVal = yield this.add_rt_ranges(Exp_params, false);
-        });
-    }
-    eval_op_range_reset(resVal, parent) {
-        const _super = Object.create(null, {
-            GetContextTask: { get: () => super.GetContextTask }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            resVal.Attr = StorageAttribute.BOOLEAN;
-            let iParent = parent.MgNumVal.NUM_2_LONG();
-            if ((iParent >= 0 && iParent < (this.ExpTask.getTaskDepth(false))) || iParent === ExpressionEvaluator.TRIGGER_TASK) {
-                let task = _super.GetContextTask.call(this, iParent);
-                if (task !== null) {
-                    let command = CommandFactory.CreateDataViewCommand(task.getTaskTag(), DataViewCommandType.ResetUserRange);
-                    yield task.DataviewManager.Execute(command);
-                    resVal.BoolVal = true;
-                }
-            }
-        });
-    }
-    eval_op_locate_add(resVal, Exp_params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            resVal.Attr = StorageAttribute.BOOLEAN;
-            resVal.BoolVal = yield this.add_rt_ranges(Exp_params, true);
-        });
-    }
-    eval_op_locate_reset(resVal, parent) {
-        const _super = Object.create(null, {
-            GetContextTask: { get: () => super.GetContextTask }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            resVal.Attr = StorageAttribute.BOOLEAN;
-            let iParent = parent.MgNumVal.NUM_2_LONG();
-            if ((iParent >= 0 && iParent < (this.ExpTask.getTaskDepth(false))) || iParent === ExpressionEvaluator.TRIGGER_TASK) {
-                let task = _super.GetContextTask.call(this, iParent);
-                if (task !== null) {
-                    let command = CommandFactory.CreateDataViewCommand(task.getTaskTag(), DataViewCommandType.ResetUserLocate);
-                    yield task.DataviewManager.Execute(command);
-                    resVal.BoolVal = true;
-                }
-            }
-        });
-    }
-    eval_op_sort_add(resVal, varnum, dir) {
-        return __awaiter(this, void 0, void 0, function* () {
-            resVal.Attr = StorageAttribute.BOOLEAN;
-            resVal.BoolVal = yield this.add_sort(varnum, dir);
-        });
-    }
-    eval_op_sort_reset(resVal, parent) {
-        const _super = Object.create(null, {
-            GetContextTask: { get: () => super.GetContextTask }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            resVal.Attr = StorageAttribute.BOOLEAN;
-            let iParent = parent.MgNumVal.NUM_2_LONG();
-            if ((iParent >= 0 && iParent < (this.ExpTask.getTaskDepth(false))) || iParent === ExpressionEvaluator.TRIGGER_TASK) {
-                let task = _super.GetContextTask.call(this, iParent);
-                if (task !== null) {
-                    let command = CommandFactory.CreateDataViewCommand(task.getTaskTag(), DataViewCommandType.ResetUserSort);
-                    yield task.DataviewManager.Execute(command);
-                    resVal.BoolVal = true;
-                }
-            }
-        });
-    }
     eval_op_tsk_instance(resVal, Parent) {
         let tag = 0;
         let iParent = Parent.MgNumVal.NUM_2_LONG();
@@ -14178,88 +14219,6 @@ class ExpressionEvaluator extends GuiExpressionEvaluator {
         resVal.MgNumVal = new NUM_TYPE();
         resVal.MgNumVal.NUM_4_LONG(tag);
     }
-    add_sort(varnum, dir) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (varnum.MgNumVal === null)
-                return false;
-            let itm = varnum.MgNumVal.NUM_2_LONG();
-            if (itm === 0)
-                return false;
-            let fld = this.GetFieldOfContextTask(itm);
-            if (fld === null)
-                return false;
-            let task = fld.getTask();
-            let vee_idx = fld.getId() + 1;
-            let expr_64 = new Sort();
-            expr_64.fldIdx = vee_idx;
-            expr_64.dir = dir.BoolVal;
-            let sort = expr_64;
-            let command = CommandFactory.CreateAddUserSortDataviewCommand(task.getTaskTag(), sort);
-            yield task.DataviewManager.Execute(command);
-            return true;
-        });
-    }
-    add_rt_ranges(Exp_params, locate) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let varnum = Exp_params[0];
-            let min = Exp_params[1];
-            if (varnum.MgNumVal === null)
-                return false;
-            let itm = varnum.MgNumVal.NUM_2_LONG();
-            if (itm === 0)
-                return false;
-            let fld = this.GetFieldOfContextTask(itm);
-            if (fld === null)
-                return false;
-            let task = fld.getTask();
-            let vee_idx = fld.getId() + 1;
-            let expr_78 = new UserRange();
-            expr_78.veeIdx = vee_idx;
-            let rng = expr_78;
-            if (min.IsNull)
-                rng.nullMin = true;
-            if (!rng.nullMin && (min.Attr === StorageAttribute.ALPHA || min.Attr === StorageAttribute.UNICODE) && min.StrVal.length === 0)
-                rng.discardMin = true;
-            else {
-                if (!rng.nullMin) {
-                    if (!StorageAttributeCheck.isTheSameType(fld.getType(), min.Attr))
-                        return false;
-                    if (StorageAttributeCheck.StorageFldAlphaUnicodeOrBlob(fld.getType(), min.Attr))
-                        this.ConvertExpVal(min, fld.getType());
-                    rng.min = min.ToMgVal();
-                }
-            }
-            if (Exp_params.length === 3) {
-                let max = Exp_params[2];
-                if (max.IsNull)
-                    rng.nullMax = true;
-                if (!rng.nullMax && (max.Attr === StorageAttribute.ALPHA || max.Attr === StorageAttribute.UNICODE) && max.StrVal.length === 0)
-                    rng.discardMax = true;
-                else {
-                    if (!rng.nullMax) {
-                        if (!StorageAttributeCheck.isTheSameType(fld.getType(), max.Attr))
-                            return false;
-                        if (StorageAttributeCheck.StorageFldAlphaUnicodeOrBlob(fld.getType(), max.Attr))
-                            this.ConvertExpVal(max, fld.getType());
-                        rng.max = max.ToMgVal();
-                    }
-                }
-            }
-            else
-                rng.discardMax = true;
-            if (!rng.discardMin || !rng.discardMax) {
-                if (locate) {
-                    let command = CommandFactory.CreateAddUserLocateDataviewCommand(task.getTaskTag(), rng);
-                    yield task.DataviewManager.Execute(command);
-                }
-                else {
-                    let command2 = CommandFactory.CreateAddUserRangeDataviewCommand(task.getTaskTag(), rng);
-                    yield task.DataviewManager.Execute(command2);
-                }
-            }
-            return true;
-        });
-    }
     eval_op_getParam(resVal, name) {
         Debug.Assert(!name.IsNull && name.StrVal !== null);
         let expVal = GlobalParams.Instance.get(name.StrVal);
@@ -14783,6 +14742,12 @@ class DataViewBase extends GuiDataViewBase {
 }
 
 class Record {
+    get InCompute() {
+        return this._inCompute;
+    }
+    get InRecompute() {
+        return this._inRecompute;
+    }
     constructor(dvOrTableCacheOrCIdOrRecord, dataview) {
         this._id = Int32.MinValue;
         this.dbViewRowIdx = 0;
@@ -14800,12 +14765,6 @@ class Record {
         else
             this.constructor_1(dvOrTableCacheOrCIdOrRecord, dataview);
     }
-    get InCompute() {
-        return this._inCompute;
-    }
-    get InRecompute() {
-        return this._inRecompute;
-    }
     constructor_0(dvOrTableCache) {
         if (dvOrTableCache instanceof DataViewBase)
             this._dataview = dvOrTableCache;
@@ -15601,14 +15560,14 @@ Record.FLAG_MODIFIED_ATLEAST_ONCE = (0x40);
 Record.INCREASE = true;
 Record.DECREASE = false;
 class DcValuesReference extends ObjectReferenceBase {
+    get DcValues() {
+        return this.Referent;
+    }
     constructor(controlId, referencedDcValues) {
         super(referencedDcValues);
         this.ditIdx = 0;
         this.ditIdx = controlId;
     }
-    get DcValues() {
-        return this.Referent;
-    }
     Clone() {
         return new DcValuesReference(this.ditIdx, this.Referent);
     }
@@ -15884,21 +15843,6 @@ class RecordsTable {
 RecordsTable.REC_NOT_FOUND = -1;
 
 class DataviewHeaderBase {
-    constructor(task) {
-        this._cond = null;
-        this._task = null;
-        this.Loc = null;
-        this._dir = '\0';
-        this._id = 0;
-        this._keyIdx = 0;
-        this._retVal = null;
-        this.returnfield = null;
-        this.LinkStartAfterField = 0;
-        this.KeyExpression = 0;
-        this._task = task;
-        this._keyIdx = -1;
-        this._cond = new YesNoExp(true);
-    }
     get ReturnField() {
         if (this.returnfield === null && this._retVal !== null)
             this.returnfield = this.Task.getFieldByValueStr(this._retVal);
@@ -15919,6 +15863,21 @@ class DataviewHeaderBase {
     get LinkEvaluateCondition() {
         return this._linkEvalCondition;
     }
+    constructor(task) {
+        this._cond = null;
+        this._task = null;
+        this.Loc = null;
+        this._dir = '\0';
+        this._id = 0;
+        this._keyIdx = 0;
+        this._retVal = null;
+        this.returnfield = null;
+        this.LinkStartAfterField = 0;
+        this.KeyExpression = 0;
+        this._task = task;
+        this._keyIdx = -1;
+        this._cond = new YesNoExp(true);
+    }
     SetAttributes(attributes) {
         let keys = attributes.Keys;
         keys.forEach((text) => {
@@ -17256,16 +17215,16 @@ class RecordOutOfDataViewException extends ApplicationException {
 }
 
 class XMLBasedDcValuesBuilder extends DcValuesBuilderBase {
+    set SerializedDCVals(value) {
+        this.parser.setXMLdata(value);
+        this.parser.setCurrIndex(0);
+    }
     constructor() {
         super();
         this.dcv = null;
         this.parser = null;
         this.parser = new XmlParser();
     }
-    set SerializedDCVals(value) {
-        this.parser.setXMLdata(value);
-        this.parser.setCurrIndex(0);
-    }
     Build() {
         this.dcv = null;
         let endContext = this.parser.getXMLdata().indexOf(XMLConstants.TAG_TERM, this.parser.getCurrIndex());
@@ -17345,6 +17304,39 @@ const RECOVERY_ACT_NONE = 'N';
 const TRANS_STAT_CLOSED = 'C';
 const TRANS_STAT_OPENED = 'O';
 class DataView extends DataViewBase {
+    set InsertAt(value) {
+        this._insertAt = value;
+    }
+    get InsertAt() {
+        return this._insertAt;
+    }
+    get CurrRec() {
+        return this._currRec_DO_NOT_USE_DIRECTLY_USE_SETTER_GETTER;
+    }
+    set CurrRec(value) {
+        if (this._currRec_DO_NOT_USE_DIRECTLY_USE_SETTER_GETTER !== null && value === null) {
+            this._currRec_DO_NOT_USE_DIRECTLY_USE_SETTER_GETTER.resetDcValueId();
+        }
+        this._currRec_DO_NOT_USE_DIRECTLY_USE_SETTER_GETTER = value;
+        if (this._currRec_DO_NOT_USE_DIRECTLY_USE_SETTER_GETTER !== null) {
+            this._currRec_DO_NOT_USE_DIRECTLY_USE_SETTER_GETTER.SetDcValueId();
+        }
+    }
+    get FlushUpdates() {
+        return this._flushUpdates;
+    }
+    get HasMainTable() {
+        return this._hasMainTable;
+    }
+    get CurrentRecId() {
+        return this._currRecId;
+    }
+    get FirstRecord() {
+        return this._recordsTab.getRecByIdx(0);
+    }
+    get LastRecord() {
+        return this._recordsTab.getRecByIdx(this._recordsTab.getSize() - 1);
+    }
     constructor(taskOrDataView) {
         super();
         this._cacheLruTimeStamp = 0;
@@ -17396,39 +17388,6 @@ class DataView extends DataViewBase {
             Object.assign(this, taskOrDataView);
         }
     }
-    set InsertAt(value) {
-        this._insertAt = value;
-    }
-    get InsertAt() {
-        return this._insertAt;
-    }
-    get CurrRec() {
-        return this._currRec_DO_NOT_USE_DIRECTLY_USE_SETTER_GETTER;
-    }
-    set CurrRec(value) {
-        if (this._currRec_DO_NOT_USE_DIRECTLY_USE_SETTER_GETTER !== null && value === null) {
-            this._currRec_DO_NOT_USE_DIRECTLY_USE_SETTER_GETTER.resetDcValueId();
-        }
-        this._currRec_DO_NOT_USE_DIRECTLY_USE_SETTER_GETTER = value;
-        if (this._currRec_DO_NOT_USE_DIRECTLY_USE_SETTER_GETTER !== null) {
-            this._currRec_DO_NOT_USE_DIRECTLY_USE_SETTER_GETTER.SetDcValueId();
-        }
-    }
-    get FlushUpdates() {
-        return this._flushUpdates;
-    }
-    get HasMainTable() {
-        return this._hasMainTable;
-    }
-    get CurrentRecId() {
-        return this._currRecId;
-    }
-    get FirstRecord() {
-        return this._recordsTab.getRecByIdx(0);
-    }
-    get LastRecord() {
-        return this._recordsTab.getRecByIdx(this._recordsTab.getSize() - 1);
-    }
     Init() {
         this.init();
     }
@@ -19058,6 +19017,12 @@ class ReturnResultBase {
 }
 
 class ReturnResult extends ReturnResultBase {
+    get Success() {
+        return this.success;
+    }
+    get ErrorDescription() {
+        return this.errorDescription;
+    }
     constructor(errorDescriptionCodeOrErrorDescriptionOrInnerResult, innerResult) {
         super();
         this.errorDescription = null;
@@ -19072,12 +19037,6 @@ class ReturnResult extends ReturnResultBase {
         else
             this.constructor_03(errorDescriptionCodeOrErrorDescriptionOrInnerResult);
     }
-    get Success() {
-        return this.success;
-    }
-    get ErrorDescription() {
-        return this.errorDescription;
-    }
     constructor_00(errorDescriptionCode) {
         this.success = false;
         this.ErrorId = errorDescriptionCode;
@@ -19181,13 +19140,13 @@ class Transaction {
 }
 
 class TaskTransactionManager {
+    get isClosingTopmostTask() {
+        return MGDataCollection.Instance.StartupMgData.getFirstTask().InEndTask;
+    }
     constructor(task) {
         this.task = null;
         this.task = task;
     }
-    get isClosingTopmostTask() {
-        return MGDataCollection.Instance.StartupMgData.getFirstTask().InEndTask;
-    }
     AllowTransaction(transBegin, forLocal) {
         let result;
         if (forLocal)
@@ -19568,12 +19527,6 @@ class RemoteDataviewManager extends DataviewManagerBase {
 }
 
 class DataviewManager extends DataviewManagerBase {
-    constructor(task) {
-        super(task);
-        this.RemoteDataviewManager = null;
-        this.HasRemoteData = true;
-        this.RemoteDataviewManager = new RemoteDataviewManager(task);
-    }
     get TaskService() {
         return this.Task.TaskService;
     }
@@ -19588,6 +19541,12 @@ class DataviewManager extends DataviewManagerBase {
     get VirtualDataviewManager() {
         return this.TaskService.GetDataviewManagerForVirtuals(this.Task);
     }
+    constructor(task) {
+        super(task);
+        this.RemoteDataviewManager = null;
+        this.HasRemoteData = true;
+        this.RemoteDataviewManager = new RemoteDataviewManager(task);
+    }
     Execute(command) {
         return __awaiter(this, void 0, void 0, function* () {
             return yield this.CurrentDataviewManager.Execute(command);
@@ -19595,6 +19554,13 @@ class DataviewManager extends DataviewManagerBase {
     }
 }
 
+class Sort {
+    constructor() {
+        this.fldIdx = 0;
+        this.dir = false;
+    }
+}
+
 class SortCollection {
     constructor() {
         this._sortTab = null;
@@ -19723,23 +19689,9 @@ class MgForm extends MgFormBase {
             dv = this._task.DataView;
         return (dv);
     }
-    moveInView(unit, direction, returnToCtrl) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (isNullOrUndefined(returnToCtrl))
-                yield this.moveInView_0(unit, direction);
-            else
-                yield this.moveInView_1(unit, direction, returnToCtrl);
-        });
-    }
-    moveInView_0(unit, direction) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.moveInView(unit, direction, true);
-        });
-    }
-    moveInView_1(unit, direction, returnToCtrl) {
+    moveInView(unit, direction) {
         return __awaiter(this, void 0, void 0, function* () {
             let oldRecId = Int32.MinValue;
-            let lastParkedCtrl;
             let currRec = this.GetDataview().getCurrRec();
             let oldTaskMode = ' ';
             let returnToVisibleLine = false;
@@ -19870,6 +19822,7 @@ class MgForm extends MgFormBase {
                                             try {
                                                 yield this.RefreshDisplay(Constants.TASK_REFRESH_FORM);
                                                 yield this.setCurrRowByDisplayLine(this.GetDataview().getTopRecIdx() + this.getLastValidRow(), false, true);
+                                                visibleLine = this.getLastValidRow();
                                             }
                                             catch (Exception) {
                                             }
@@ -19993,15 +19946,6 @@ class MgForm extends MgFormBase {
                 else
                     this.SetTableTopIndex();
                 yield AccessHelper.eventsManager.handleInternalEventWithTask(this._task, InternalInterface.MG_ACT_REC_PREFIX);
-                if (returnToCtrl) {
-                    lastParkedCtrl = this._task.getLastParkedCtrl();
-                    if (lastParkedCtrl != null) {
-                        let cursorMoved = yield lastParkedCtrl.invoke();
-                        if (!cursorMoved) {
-                            yield AccessHelper.eventsManager.HandleNonParkableControls(this._task);
-                        }
-                    }
-                }
             }
             catch (e) {
                 if (e instanceof RecordOutOfDataViewException) {
@@ -22049,8 +21993,12 @@ class EventHandler {
                         continue;
                     else if (this._operationTab.getOperation(oper.getBlockEnd()).getServerId() < nextOperIdx)
                         continue;
-                if (!taskEnd)
-                    yield this._task.evalEndCond(ConstInterface.END_COND_EVAL_IMMIDIATE);
+                if (!taskEnd) {
+                    let mainLevel = this._task.getMainLevel().toLowerCase();
+                    if ((yield this._task.evalEndCond(ConstInterface.END_COND_EVAL_IMMIDIATE)) && Environment.Instance.getSpecialImmediateHandlerEnd() &&
+                        mainLevel != "RP".toLowerCase() && mainLevel != "TP".toLowerCase() && mainLevel != "RS".toLowerCase() && mainLevel != "TS".toLowerCase())
+                        break;
+                }
                 if (this._taskMgdID !== mgdID)
                     isChangedCurrWndRef.value = true;
                 if (!this._task.isMainProg() && this._task.isOpenWin())
@@ -22861,13 +22809,6 @@ class UserEventsTable {
 }
 
 class FormsTable {
-    constructor(task, parentForm) {
-        this._task = null;
-        this._parentForm = null;
-        this._formsStringXml = null;
-        this._task = task;
-        this._parentForm = parentForm;
-    }
     get Count() {
         return this._formsStringXml.length;
     }
@@ -22876,6 +22817,13 @@ class FormsTable {
             return this._formsStringXml.get_Item(formDisplayIndex - 1);
         return null;
     }
+    constructor(task, parentForm) {
+        this._task = null;
+        this._parentForm = null;
+        this._formsStringXml = null;
+        this._task = task;
+        this._parentForm = parentForm;
+    }
     fillData() {
         return __awaiter(this, void 0, void 0, function* () {
             this._formsStringXml = new List();
@@ -23071,6 +23019,47 @@ var Task_Direction;
     Task_Direction[Task_Direction["FORE"] = 1] = "FORE";
 })(Task_Direction || (Task_Direction = {}));
 class Task extends TaskBase {
+    get ParentTask() {
+        return this._parentTask;
+    }
+    set TryingToCommit(value) {
+        this._tryingToCommit = value;
+    }
+    get TryingToCommit() {
+        return this._tryingToCommit;
+    }
+    get TaskService() {
+        if (this._taskService == null)
+            this._taskService = new RemoteTaskService();
+        return this._taskService;
+    }
+    static get CommandsProcessor() {
+        return CommandsProcessorManager.GetCommandsProcessor();
+    }
+    get LogicalStudioParentTask() {
+        if (this.StudioParentTask === null && !super.isMainProg()) {
+            return GuiDataCollection.MGDataTable.GetMainProgByCtlIdx(this.ContextID, this._ctlIdx);
+        }
+        return this.StudioParentTask;
+    }
+    get KnownToServer() {
+        return this._knownToServer;
+    }
+    set Transaction(value) {
+        this.DataviewManager.CurrentDataviewManager.Transaction = value;
+    }
+    get Transaction() {
+        return this.DataviewManager.CurrentDataviewManager.Transaction;
+    }
+    get TaskDefinitionId() {
+        if (this.taskDefinitionId === null) {
+            this.taskDefinitionId = new TaskDefinitionId(this._ctlIdx, this.ProgramIsn, this.TaskIsn, this._isPrg);
+        }
+        return this.taskDefinitionId;
+    }
+    static get IsBlockingBatch() {
+        return false;
+    }
     constructor(parent) {
         super();
         this._dvCache = null;
@@ -23139,47 +23128,6 @@ class Task extends TaskBase {
         }
         this.constructor_1(parent);
     }
-    get ParentTask() {
-        return this._parentTask;
-    }
-    set TryingToCommit(value) {
-        this._tryingToCommit = value;
-    }
-    get TryingToCommit() {
-        return this._tryingToCommit;
-    }
-    get TaskService() {
-        if (this._taskService == null)
-            this._taskService = new RemoteTaskService();
-        return this._taskService;
-    }
-    static get CommandsProcessor() {
-        return CommandsProcessorManager.GetCommandsProcessor();
-    }
-    get LogicalStudioParentTask() {
-        if (this.StudioParentTask === null && !super.isMainProg()) {
-            return GuiDataCollection.MGDataTable.GetMainProgByCtlIdx(this.ContextID, this._ctlIdx);
-        }
-        return this.StudioParentTask;
-    }
-    get KnownToServer() {
-        return this._knownToServer;
-    }
-    set Transaction(value) {
-        this.DataviewManager.CurrentDataviewManager.Transaction = value;
-    }
-    get Transaction() {
-        return this.DataviewManager.CurrentDataviewManager.Transaction;
-    }
-    get TaskDefinitionId() {
-        if (this.taskDefinitionId === null) {
-            this.taskDefinitionId = new TaskDefinitionId(this._ctlIdx, this.ProgramIsn, this.TaskIsn, this._isPrg);
-        }
-        return this.taskDefinitionId;
-    }
-    static get IsBlockingBatch() {
-        return false;
-    }
     constructor_0() {
         this.ActionManager = new ActionManager();
         this.DataView = new DataView(this);
@@ -25677,6 +25625,9 @@ class CompMainPrgTable {
 }
 
 class MGData {
+    get ForceModal() {
+        return this.forceModal;
+    }
     constructor(toClient, toServer, id, parent, isModal, forceModal) {
         this._expHandlers = null;
         this._id = 0;
@@ -25697,9 +25648,6 @@ class MGData {
         else
             this.constructor_1(id, parent, isModal, forceModal);
     }
-    get ForceModal() {
-        return this.forceModal;
-    }
     constructor_0(id, parent, isModal) {
         this._timerHandlers = new HandlersTable();
         this._expHandlers = new HandlersTable();
@@ -29841,13 +29789,6 @@ class VerifyCommand extends ClientTargetedCommandBase {
 }
 
 class EnhancedVerifyCommand extends VerifyCommand {
-    constructor() {
-        super();
-        this._buttonsID = '\0';
-        this._image = '\0';
-        this._returnValStr = null;
-        this._returnVal = null;
-    }
     ProcessMessageBoxResponse(task, returnValue) {
         return __awaiter(this, void 0, void 0, function* () {
             if (task !== null)
@@ -29880,6 +29821,13 @@ class EnhancedVerifyCommand extends VerifyCommand {
                 break;
         }
     }
+    constructor() {
+        super();
+        this._buttonsID = '\0';
+        this._image = '\0';
+        this._returnValStr = null;
+        this._returnVal = null;
+    }
 }
 
 class ResetRangeCommand extends ClientTargetedCommandBase {
@@ -29984,12 +29932,6 @@ class ResetLocateCommand extends ClientTargetedCommandBase {
 }
 
 class ResultCommand extends ClientTargetedCommandBase {
-    constructor() {
-        super();
-        this._isNull = false;
-        this._attr = StorageAttribute.NONE;
-        this._val = null;
-    }
     Execute(res) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this._isNull)
@@ -30017,6 +29959,12 @@ class ResultCommand extends ClientTargetedCommandBase {
                 break;
         }
     }
+    constructor() {
+        super();
+        this._isNull = false;
+        this._attr = StorageAttribute.NONE;
+        this._val = null;
+    }
 }
 
 class AddSortCommand extends ClientTargetedCommandBase {
@@ -30387,19 +30335,9 @@ class CommandsTable {
     }
 }
 
-let CurrentClientVersion = '4.1000.0-dev4100.20';
+let CurrentClientVersion = '4.1000.0-dev4100.201';
 
 class ClientManager {
-    constructor() {
-        this._globalUniqueSessionId = null;
-        this._buttonIsClicked = false;
-        RuntimeContextBase.Instance.Init(RemoteCommandsProcessor.RC_NO_CONTEXT_ID);
-        LastFocusedManager.Instance.Init(MGDataCollection.Instance);
-        LastFocusedManager.Instance.LastActionTime = Misc.getSystemMilliseconds();
-        RemoteCommandsProcessor.ShouldScrambleAndUnscrambleMessages = true;
-        this._globalUniqueSessionId = UniqueIDUtils.GetUniqueMachineID() + "_";
-        this.RegisterDelegates();
-    }
     static get Instance() {
         if (ClientManager._instance === null)
             ClientManager._instance = new ClientManager();
@@ -30601,6 +30539,16 @@ class ClientManager {
             Logger.Instance.WriteToLog("-----------------------------------------------------------------------------", true);
         }
     }
+    constructor() {
+        this._globalUniqueSessionId = null;
+        this._buttonIsClicked = false;
+        RuntimeContextBase.Instance.Init(RemoteCommandsProcessor.RC_NO_CONTEXT_ID);
+        LastFocusedManager.Instance.Init(MGDataCollection.Instance);
+        LastFocusedManager.Instance.LastActionTime = Misc.getSystemMilliseconds();
+        RemoteCommandsProcessor.ShouldScrambleAndUnscrambleMessages = true;
+        this._globalUniqueSessionId = UniqueIDUtils.GetUniqueMachineID() + "_";
+        this.RegisterDelegates();
+    }
     InitGuiManager() {
         Manager.EventsManager = EventsManager.Instance;
         Manager.DefaultServerName = ServerConfig.Instance.getServer();
@@ -30828,13 +30776,6 @@ class MagicBridge {
     }
 }
 
-class ControlItemsRefreshCommand extends DataviewCommand {
-    constructor() {
-        super();
-        this.Control = null;
-    }
-}
-
 class DataViewOutputCommand extends DataviewCommand {
     constructor(OutputCommandType) {
         super();