@magic-xpa/engine 4.1000.0-dev4100.1 → 4.1000.0-dev4100.100

package/esm2020/src/util/PrmMap.mjs

@@ -99,7 +99,7 @@ export 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)) {
         }
@@ -148,4 +148,4 @@ export class MirrorPrmMap extends PrmMap {
         }
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PrmMap.js","sourceRoot":"","sources":["../../../../../../projects/engine/src/util/PrmMap.ts"],"names":[],"mappings":"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","sourcesContent":["import { Dictionary, List, StringBuilder } from '@magic-xpa/mscorelib';\r\nimport { Logger, XMLConstants, XmlParser } from '@magic-xpa/utils';\r\nimport { ConstInterface } from '../ConstInterface';\r\nimport { IMirrorXML } from './IMirrorXML';\r\nimport {ParamParseResult} from \"./ParamParseResult\";\r\n\r\n\r\n/// <summary> This class manages a dictionary of variables. then name of the variable is the key\r\n/// </summary>\r\nexport class PrmMap<TValue extends IMirrorXML>{\r\n  values: Dictionary<TValue> = null;\r\n\r\n  /// <summary> get the value\r\n  ///\r\n  /// </summary>\r\n  /// <param name=\"s\"></param>\r\n  /// <returns></returns>\r\n  protected getvalue(s: string): TValue {\r\n    if (this.values.ContainsKey(s))\r\n      return this.values.get_Item(s);\r\n    else\r\n      return null;\r\n  }\r\n\r\n  /// <summary> set\r\n  /// </summary>\r\n  setValue(s: string, v: TValue): void {\r\n    this.values.set_Item(s, v);\r\n  }\r\n\r\n  /// <summary> remove an entry\r\n  /// </summary>\r\n  remove(s: string): void {\r\n    this.values.Remove(s);\r\n  }\r\n\r\n  /// <summary> CTOR\r\n  /// </summary>\r\n  constructor() {\r\n      this.values = new Dictionary<TValue>();\r\n  }\r\n}\r\n\r\n/// <summary> This class manages the mirroring. It holds a list of changed values that need to be\r\n/// mirrored, and manages the writing of those values to an XML buffer\r\n/// </summary>\r\nexport class MirrorPrmMap<TValue extends IMirrorXML> extends PrmMap<TValue> {\r\n\r\n  // List of changed variables\r\n  protected changes: List<string> = null;\r\n\r\n  // Type of variables in the table - use as an id in the XML buffer\r\n  protected  mirroredID: string = null;\r\n\r\n  private type ;\r\n\r\n  /// <summary> CTOR\r\n  /// </summary>\r\n  constructor(type: new () => TValue) {\r\n    super();\r\n    this.type = type;\r\n    this.changes = new List<string>();\r\n  }\r\n\r\n  /// <summary>\r\n  /// create new instance of specified type\r\n  /// </summary>\r\n  private new(): TValue {\r\n    return new this.type();\r\n  }\r\n\r\n\r\n  setValue(s: string, v: TValue, addToChanges?: boolean): void {\r\n    if (arguments.length === 3)\r\n      this.setValue_0(s, v, addToChanges);\r\n    else\r\n      this.setValue_1(s, v);\r\n  }\r\n\r\n  /// <summary> set\r\n  /// </summary>\r\n  private setValue_0(s: string, v: TValue, addToChanges: boolean): void {\r\n    if (addToChanges && !this.changes.Contains(s))\r\n      this.changes.push(s);\r\n    super.setValue(s, v);\r\n  }\r\n\r\n  /// <summary> set\r\n  /// </summary>\r\n  private setValue_1(s: string, v: TValue): void {\r\n    if (!this.changes.Contains(s))\r\n      this.changes.push(s);\r\n    super.setValue(s, v);\r\n  }\r\n\r\n  /// <summary> remove\r\n  /// </summary>\r\n  remove(s: string): void {\r\n    if (!this.changes.Contains(s)) {\r\n      this.changes.push(s);\r\n    }\r\n    super.remove(s);\r\n  }\r\n\r\n  /// <summary>\r\n  /// write to an XML buff: write the ID and call each variable to write itself\r\n  /// </summary>\r\n  mirrorAllToXML(): string {\r\n    let xml: StringBuilder = new StringBuilder();\r\n\r\n\r\n    if (this.values != null) {\r\n\r\n      // write the id\r\n      xml.Append(\"<\" + this.mirroredID + \">\");\r\n\r\n      // loop on all variables\r\n      for (let key of this.values.Keys) {\r\n\r\n        if (this.CheckIfSystemReservedParam(key))\r\n          continue;\r\n        xml.Append(\"<\" + ConstInterface.MG_TAG_PARAM + \" \" +\r\n          XMLConstants.MG_ATTR_NAME + \"=\\\"\" + XmlParser.escape(key) + \"\\\" \");\r\n\r\n        // call the variable to write it's own data\r\n          xml.Append(this.values.get_Item(key).mirrorToXML());\r\n\r\n        xml.Append(XMLConstants.TAG_TERM);\r\n      }\r\n\r\n      xml.Append(\"</\" + this.mirroredID + \">\");\r\n    }\r\n    return xml.ToString();\r\n  }\r\n\r\n  /// <summary>\r\n  /// If system reserved param, then do not serialize for re-initialize session\r\n  /// </summary>\r\n  CheckIfSystemReservedParam(key: any): boolean\r\n  {\r\n    if (key == \"UTF8TRANS\" || key === \"REMOTE_HOST\" || key === \"REMOTE_ADDR\" ||\r\n      key === \"CTX\" || key === \"MGARG0\" || key === \"DATA\" || key === \"MGCURRENTREQUESTID\" ||\r\n      key === \"HTTP_MGXPARIAGLOBALUNIQUESESSIONID\" || key === \"MG_POST_BODY\")\r\n      return true;\r\n    else\r\n      return false;\r\n  }\r\n\r\n  /// <summary>\r\n  /// write to an XML buff: write the ID and call each changed variable to write itself\r\n  /// </summary>\r\n  mirrorToXML(): string {\r\n    let xml: StringBuilder = new StringBuilder();\r\n\r\n    if (this.changes.length > 0) {\r\n\r\n      // write the id\r\n      xml.Append(\"<\" + this.mirroredID + \">\");\r\n\r\n      // loop on all changed variables\r\n\r\n\r\n      this.changes.forEach(change => {\r\n\r\n        xml.Append(\"<\" + ConstInterface.MG_TAG_PARAM + \" \" +\r\n          XMLConstants.MG_ATTR_NAME + \"=\\\"\" + XmlParser.escape(change) + \"\\\" \");\r\n\r\n        if (this.values.ContainsKey(change))\r\n        // call the variable to write it's own data\r\n          xml.Append(this.values.get_Item(change).mirrorToXML());\r\n        else\r\n          xml.Append(\"removed=\\\"Y\\\"\");\r\n        xml.Append(\">\");\r\n      });\r\n\r\n      xml.Append(\"</\" + this.mirroredID + \">\");\r\n    }\r\n    this.changes.Clear();\r\n    return xml.ToString();\r\n  }\r\n\r\n  /// <summary> parse the XML and fill the data\r\n  /// </summary>\r\n  fillData(parser: XmlParser): void {\r\n    while (this.mirrorFromXML(parser.getNextTag(), parser)) {\r\n    }\r\n  }\r\n\r\n  RestoreGlobalParams (xml: string )\r\n  {\r\n    let parser: XmlParser = new XmlParser(xml);\r\n    while (this.mirrorFromXML(parser.getNextTag(), parser)) {\r\n    }\r\n  }\r\n\r\n  /// <summary> fill from XML\r\n  /// </summary>\r\n  /// <param name=\"foundTagName\"></param>\r\n  /// <param name=\"xmlParser\"></param>\r\n  /// <returns></returns>\r\n  mirrorFromXML(foundTagName: string, xmlParser: XmlParser): boolean {\r\n    if (foundTagName === null)\r\n      return false;\r\n\r\n    if (foundTagName === this.mirroredID) {\r\n      xmlParser.setCurrIndex2EndOfTag();\r\n      this.fillDataEntry(xmlParser);\r\n      return true;\r\n    }\r\n    else if (foundTagName === (\"/\" + this.mirroredID)) {\r\n      // After updating from the server, clear the changes list so they won't be sent again\r\n      this.changes.Clear();\r\n      xmlParser.setCurrIndex2EndOfTag();\r\n      return false;\r\n    }\r\n    else {\r\n      Logger.Instance.WriteExceptionToLogWithMsg(\"There is no such tag in MirrorPrmMap.mirrorFromXML(): \" + foundTagName);\r\n      return false;\r\n    }\r\n  }\r\n\r\n\r\n  /// <summary>\r\n  /// parse and fill the params, until the section ends\r\n  /// </summary>\r\n  fillDataEntry(xmlParser: XmlParser): void {\r\n    let nextTag: string = xmlParser.getNextTag();\r\n\r\n    while (nextTag === ConstInterface.MG_TAG_PARAM) {\r\n      let nameStart: number = xmlParser.getXMLdata().indexOf(XMLConstants.MG_ATTR_NAME + \"=\\\"\", xmlParser.getCurrIndex()) +\r\n        XMLConstants.MG_ATTR_NAME.length + 2;\r\n\r\n      xmlParser.setCurrIndex(nameStart);\r\n      let nameEnd: number = xmlParser.getXMLdata().indexOf(\"\\\"\", nameStart);\r\n\r\n      // get the variables data\r\n      let name: string = xmlParser.getXMLsubstring(nameEnd).trim();\r\n      xmlParser.setCurrIndex(nameEnd);\r\n\r\n      // create and init the new value\r\n      let newVal: TValue = this.new();\r\n\r\n      switch (newVal.init(name, xmlParser)) {\r\n        case ParamParseResult.OK:\r\n          this.values.set_Item(name, newVal);\r\n          break;\r\n        case ParamParseResult.TOUPPER:\r\n          this.values.set_Item(name.toUpperCase(), newVal);\r\n          break;\r\n        case ParamParseResult.DELETE:\r\n          this.values.Remove(name);\r\n          break;\r\n      }\r\n\r\n      // move to next tag\r\n      xmlParser.setCurrIndex2EndOfTag();\r\n      nextTag = xmlParser.getNextTag();\r\n    }\r\n  }\r\n}\r\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PrmMap.js","sourceRoot":"","sources":["../../../../../../projects/engine/src/util/PrmMap.ts"],"names":[],"mappings":"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","sourcesContent":["import { Dictionary, List, StringBuilder } from '@magic-xpa/mscorelib';\r\nimport { Logger, XMLConstants, XmlParser } from '@magic-xpa/utils';\r\nimport { ConstInterface } from '../ConstInterface';\r\nimport { IMirrorXML } from './IMirrorXML';\r\nimport {ParamParseResult} from \"./ParamParseResult\";\r\n\r\n\r\n/// <summary> This class manages a dictionary of variables. then name of the variable is the key\r\n/// </summary>\r\nexport class PrmMap<TValue extends IMirrorXML>{\r\n  values: Dictionary<TValue> = null;\r\n\r\n  /// <summary> get the value\r\n  ///\r\n  /// </summary>\r\n  /// <param name=\"s\"></param>\r\n  /// <returns></returns>\r\n  protected getvalue(s: string): TValue {\r\n    if (this.values.ContainsKey(s))\r\n      return this.values.get_Item(s);\r\n    else\r\n      return null;\r\n  }\r\n\r\n  /// <summary> set\r\n  /// </summary>\r\n  setValue(s: string, v: TValue): void {\r\n    this.values.set_Item(s, v);\r\n  }\r\n\r\n  /// <summary> remove an entry\r\n  /// </summary>\r\n  remove(s: string): void {\r\n    this.values.Remove(s);\r\n  }\r\n\r\n  /// <summary> CTOR\r\n  /// </summary>\r\n  constructor() {\r\n      this.values = new Dictionary<TValue>();\r\n  }\r\n}\r\n\r\n/// <summary> This class manages the mirroring. It holds a list of changed values that need to be\r\n/// mirrored, and manages the writing of those values to an XML buffer\r\n/// </summary>\r\nexport class MirrorPrmMap<TValue extends IMirrorXML> extends PrmMap<TValue> {\r\n\r\n  // List of changed variables\r\n  protected changes: List<string> = null;\r\n\r\n  // Type of variables in the table - use as an id in the XML buffer\r\n  protected  mirroredID: string = null;\r\n\r\n  private type ;\r\n\r\n  /// <summary> CTOR\r\n  /// </summary>\r\n  constructor(type: new () => TValue) {\r\n    super();\r\n    this.type = type;\r\n    this.changes = new List<string>();\r\n  }\r\n\r\n  /// <summary>\r\n  /// create new instance of specified type\r\n  /// </summary>\r\n  private new(): TValue {\r\n    return new this.type();\r\n  }\r\n\r\n\r\n  setValue(s: string, v: TValue, addToChanges?: boolean): void {\r\n    if (arguments.length === 3)\r\n      this.setValue_0(s, v, addToChanges);\r\n    else\r\n      this.setValue_1(s, v);\r\n  }\r\n\r\n  /// <summary> set\r\n  /// </summary>\r\n  private setValue_0(s: string, v: TValue, addToChanges: boolean): void {\r\n    if (addToChanges && !this.changes.Contains(s))\r\n      this.changes.push(s);\r\n    super.setValue(s, v);\r\n  }\r\n\r\n  /// <summary> set\r\n  /// </summary>\r\n  private setValue_1(s: string, v: TValue): void {\r\n    if (!this.changes.Contains(s))\r\n      this.changes.push(s);\r\n    super.setValue(s, v);\r\n  }\r\n\r\n  /// <summary> remove\r\n  /// </summary>\r\n  remove(s: string): void {\r\n    if (!this.changes.Contains(s)) {\r\n      this.changes.push(s);\r\n    }\r\n    super.remove(s);\r\n  }\r\n\r\n  /// <summary>\r\n  /// write to an XML buff: write the ID and call each variable to write itself\r\n  /// </summary>\r\n  mirrorAllToXML(): string {\r\n    let xml: StringBuilder = new StringBuilder();\r\n\r\n\r\n    if (this.values != null) {\r\n\r\n      // write the id\r\n      xml.Append(\"<\" + this.mirroredID + \">\");\r\n\r\n      // loop on all variables\r\n      for (let key of this.values.Keys) {\r\n\r\n        if (this.CheckIfSystemReservedParam(key))\r\n          continue;\r\n        xml.Append(\"<\" + ConstInterface.MG_TAG_PARAM + \" \" +\r\n          XMLConstants.MG_ATTR_NAME + \"=\\\"\" + XmlParser.escape(key) + \"\\\" \");\r\n\r\n        // call the variable to write it's own data\r\n          xml.Append(this.values.get_Item(key).mirrorToXML());\r\n\r\n        xml.Append(XMLConstants.TAG_TERM);\r\n      }\r\n\r\n      xml.Append(\"</\" + this.mirroredID + \">\");\r\n    }\r\n    return xml.ToString();\r\n  }\r\n\r\n  /// <summary>\r\n  /// If system reserved param, then do not serialize for re-initialize session\r\n  /// </summary>\r\n  CheckIfSystemReservedParam(key: any): boolean\r\n  {\r\n    if (key == \"UTF8TRANS\" || key === \"REMOTE_HOST\" || key === \"REMOTE_ADDR\" ||\r\n      key === \"CTX\" || key === \"MGARG0\" || key === \"DATA\" || key === \"MGCURRENTREQUESTID\" ||\r\n      key === \"HTTP_MGXPARIAGLOBALUNIQUESESSIONID\" || key === \"MG_POST_BODY\")\r\n      return true;\r\n    else\r\n      return false;\r\n  }\r\n\r\n  /// <summary>\r\n  /// write to an XML buff: write the ID and call each changed variable to write itself\r\n  /// </summary>\r\n  mirrorToXML(): string {\r\n    let xml: StringBuilder = new StringBuilder();\r\n\r\n    if (this.changes.length > 0) {\r\n\r\n      // write the id\r\n      xml.Append(\"<\" + this.mirroredID + \">\");\r\n\r\n      // loop on all changed variables\r\n\r\n\r\n      this.changes.forEach(change => {\r\n\r\n        xml.Append(\"<\" + ConstInterface.MG_TAG_PARAM + \" \" +\r\n          XMLConstants.MG_ATTR_NAME + \"=\\\"\" + XmlParser.escape(change) + \"\\\" \");\r\n\r\n        if (this.values.ContainsKey(change))\r\n        // call the variable to write it's own data\r\n          xml.Append(this.values.get_Item(change).mirrorToXML());\r\n        else\r\n          xml.Append(\"removed=\\\"Y\\\"\");\r\n        xml.Append(\">\");\r\n      });\r\n\r\n      xml.Append(\"</\" + this.mirroredID + \">\");\r\n    }\r\n    this.changes.Clear();\r\n    return xml.ToString();\r\n  }\r\n\r\n  /// <summary> parse the XML and fill the data\r\n  /// </summary>\r\n  fillData(parser: XmlParser): void {\r\n    while (this.mirrorFromXML(parser.getNextTag(), parser)) {\r\n    }\r\n  }\r\n\r\n  RestoreParams (xml: string )\r\n  {\r\n    let parser: XmlParser = new XmlParser(xml);\r\n    while (this.mirrorFromXML(parser.getNextTag(), parser)) {\r\n    }\r\n  }\r\n\r\n  /// <summary> fill from XML\r\n  /// </summary>\r\n  /// <param name=\"foundTagName\"></param>\r\n  /// <param name=\"xmlParser\"></param>\r\n  /// <returns></returns>\r\n  mirrorFromXML(foundTagName: string, xmlParser: XmlParser): boolean {\r\n    if (foundTagName === null)\r\n      return false;\r\n\r\n    if (foundTagName === this.mirroredID) {\r\n      xmlParser.setCurrIndex2EndOfTag();\r\n      this.fillDataEntry(xmlParser);\r\n      return true;\r\n    }\r\n    else if (foundTagName === (\"/\" + this.mirroredID)) {\r\n      // After updating from the server, clear the changes list so they won't be sent again\r\n      this.changes.Clear();\r\n      xmlParser.setCurrIndex2EndOfTag();\r\n      return false;\r\n    }\r\n    else {\r\n      Logger.Instance.WriteExceptionToLogWithMsg(\"There is no such tag in MirrorPrmMap.mirrorFromXML(): \" + foundTagName);\r\n      return false;\r\n    }\r\n  }\r\n\r\n\r\n  /// <summary>\r\n  /// parse and fill the params, until the section ends\r\n  /// </summary>\r\n  fillDataEntry(xmlParser: XmlParser): void {\r\n    let nextTag: string = xmlParser.getNextTag();\r\n\r\n    while (nextTag === ConstInterface.MG_TAG_PARAM) {\r\n      let nameStart: number = xmlParser.getXMLdata().indexOf(XMLConstants.MG_ATTR_NAME + \"=\\\"\", xmlParser.getCurrIndex()) +\r\n        XMLConstants.MG_ATTR_NAME.length + 2;\r\n\r\n      xmlParser.setCurrIndex(nameStart);\r\n      let nameEnd: number = xmlParser.getXMLdata().indexOf(\"\\\"\", nameStart);\r\n\r\n      // get the variables data\r\n      let name: string = xmlParser.getXMLsubstring(nameEnd).trim();\r\n      xmlParser.setCurrIndex(nameEnd);\r\n\r\n      // create and init the new value\r\n      let newVal: TValue = this.new();\r\n\r\n      switch (newVal.init(name, xmlParser)) {\r\n        case ParamParseResult.OK:\r\n          this.values.set_Item(name, newVal);\r\n          break;\r\n        case ParamParseResult.TOUPPER:\r\n          this.values.set_Item(name.toUpperCase(), newVal);\r\n          break;\r\n        case ParamParseResult.DELETE:\r\n          this.values.Remove(name);\r\n          break;\r\n      }\r\n\r\n      // move to next tag\r\n      xmlParser.setCurrIndex2EndOfTag();\r\n      nextTag = xmlParser.getNextTag();\r\n    }\r\n  }\r\n}\r\n"]}

package/fesm2015/magic-xpa-engine.mjs

@@ -39,7 +39,6 @@ var ClientTargetedCommandType;
 })(ClientTargetedCommandType || (ClientTargetedCommandType = {}));
 
 class ConstInterface {
-    ;
 }
 ConstInterface.MG_TAG_CONTEXT = "context";
 ConstInterface.MG_TAG_ENV = "env";
@@ -477,6 +476,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";
@@ -5275,10 +5275,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");
@@ -5515,6 +5517,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)
@@ -5540,12 +5543,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 + ">");
@@ -5584,13 +5591,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") {
@@ -6919,7 +6928,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,
@@ -7368,12 +7377,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,
@@ -7460,48 +7469,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;
@@ -7698,6 +7665,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 {
+    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 AddUserRangeDataviewCommand extends DataviewCommand {
     constructor() {
         super();
@@ -8096,6 +8105,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);
@@ -8114,6 +8130,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;
@@ -8323,13 +8346,6 @@ class CommandFactory {
     }
 }
 
-class Sort {
-    constructor() {
-        this.fldIdx = 0;
-        this.dir = false;
-    }
-}
-
 var ParamParseResult;
 (function (ParamParseResult) {
     ParamParseResult[ParamParseResult["OK"] = 0] = "OK";
@@ -8435,7 +8451,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)) {
         }
@@ -9907,8 +9923,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;
@@ -11091,6 +11106,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);
@@ -11479,11 +11499,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();
@@ -11848,41 +11863,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);
@@ -13235,6 +13215,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) {
@@ -13529,14 +13531,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;
@@ -14097,75 +14091,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();
@@ -14179,88 +14104,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);
@@ -19596,6 +19439,13 @@ class DataviewManager extends DataviewManagerBase {
     }
 }
 
+class Sort {
+    constructor() {
+        this.fldIdx = 0;
+        this.dir = false;
+    }
+}
+
 class SortCollection {
     constructor() {
         this._sortTab = null;
@@ -19871,6 +19721,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) {
                                             }
@@ -30388,7 +30239,7 @@ class CommandsTable {
     }
 }
 
-let CurrentClientVersion = '4.1000.0-dev4100.1';
+let CurrentClientVersion = '4.1000.0-dev4100.100';
 
 class ClientManager {
     constructor() {
@@ -30829,13 +30680,6 @@ class MagicBridge {
     }
 }
 
-class ControlItemsRefreshCommand extends DataviewCommand {
-    constructor() {
-        super();
-        this.Control = null;
-    }
-}
-
 class DataViewOutputCommand extends DataviewCommand {
     constructor(OutputCommandType) {
         super();