@refinitiv-ui/efx-grid 6.0.40 → 6.0.41

package/lib/rt-grid/es6/Grid.js

@@ -230,6 +230,45 @@ var compareNumber = function(rowDefA, rowDefB, sortOrder, fieldName) { // edit n
 	return (rowDefA.getData(fieldName) - rowDefB.getData(fieldName)) * sortOrder; // for numeric comparison
 };
 
+/**
+ * @private
+* @param {string} rowDefA
+* @param {string} rowDefB
+* @param {string} sortOrder
+* @return {number} The outcome of the value comparison
+*/
+var _sortChildrenOfChain =  function (rowDefA, rowDefB, sortOrder) {
+	var parentA = rowDefA.getParent();
+
+	if (!parentA) {
+	  return 0;
+	}
+
+	var parentB = rowDefB.getParent();
+
+	if (!parentB) {
+	  return 0;
+	}
+
+	if (parentA !== parentB) {
+	  return 0;
+	}
+
+	var a = rowDefA.getData('CHILD_ORDER');
+
+	if (a == null) {
+	  return 0;
+	}
+
+	var b = rowDefB.getData('CHILD_ORDER');
+
+	if (b == null) {
+	  return 0;
+	}
+
+	return ( a - b ) * sortOrder;
+};
+
 /** @private
 * @param {ColumnDefinition} colDef
 * @return {string}
@@ -258,6 +297,7 @@ var Grid = function(placeholder, config) {
 	var t = this; // This is to primarily reduce file size
 
 	t._onDataChanged = t._onDataChanged.bind(t);
+	t._onQuote2PostUpdate = t._onQuote2PostUpdate.bind(t);
 	t._onDataComposed = t._onDataComposed.bind(t);
 	t._onSubSegmentChanged = t._onSubSegmentChanged.bind(t);
 	t._recalculateFormulas = t._recalculateFormulas.bind(t);
@@ -616,6 +656,7 @@ Grid.prototype.initSubscription = function() {
 	this._subs = s;
 	this._subs["start"]();
 	this._dc.setSubscriptions(s);
+	this._subs.addEventListener("postUpdate", this._onQuote2PostUpdate);
 
 	// TODO: Subscriptions should be registered per row.
 	// However, chain subscription cannot be integrated with DataConnector in this current implementation.
@@ -2608,13 +2649,7 @@ Grid.prototype.setRic = function(rowRef, str, options) {
 		options["ric"] = str;
 		var extractedOptions = RowDefinition.extractRowOptions(options);
 		var oldRic = rowDef.getSymbol();
-		var permId = options["permId"];
-		var expanded = null;
-		var collapsed = options["collapsed"];
-		if(collapsed != null){
-			expanded = !extractedOptions["collapsed"];
-		}
-		if(rowDef.setContent(str, permId, extractedOptions["asChain"], expanded)) { // The given string may not be a RIC
+		if(rowDef.setContent(str, extractedOptions)) { // The given string may not be a RIC
 			this._connector.removeRic(rowDef, oldRic);
 			this._initDuplicateRicData(rowDef);
 			this._connector.addRic(rowDef);
@@ -3328,6 +3363,19 @@ Grid.prototype.clearSort = function() {
 	this._stp.clearSortState(); // WARNING: No event is dispatched
 };
 
+/**
+* @private
+* @param {Object} e Event object from quote2
+*/
+Grid.prototype._onQuote2PostUpdate = function (e) {
+	if(e.childOrderChange) { // For dynamic chain when CHILD_ORDER from the server change, it will be call sort children
+		if(!this.isSorting()) {
+			// Use rowDef for get CHILD_ORDER to sort
+			this._dt.sortOnce("ROW_DEF", "a", _sortChildrenOfChain);
+		}
+	}
+};
+
 /** @private
 * @param {!Object} e
 */

package/lib/rt-grid/es6/RowDefinition.d.ts

@@ -104,7 +104,7 @@ declare class RowDefinition {
 
     public resetUpdates(): void;
 
-    public registerToView(view: DataTable|null, rowId?: string|null): void;
+    public registerToView(view: DataView|null, rowId?: string|null): void;
 
     public static deregisterFromView(rowIds: (string)[]|null, rowDef: RowDefinition|null): (string)[]|null;
 
@@ -142,7 +142,7 @@ declare const ROW_DEF: string;
 
 declare const ROW_TYPES: RowDefinition.RowTypes;
 
-declare function rowData(userInput: string, permId?: string|null, asChain?: boolean|null, expanded?: boolean|null): boolean;
+declare function rowData(userInput: string, extractedOptions: any): boolean;
 
 export {RowDefinition, ROW_DEF, ROW_TYPES};
 export default RowDefinition;

package/lib/rt-grid/es6/RowDefinition.js

@@ -248,8 +248,9 @@ RowDefinition.prototype.initialize = function(rowOptions) {
 	}
 
 	val = rowOptions["collapsed"];
-	if(val != null){
-		this._expanded = extractedOptions["collapsed"];
+	var collapsed = extractedOptions["collapsed"];
+	if(val != null || !collapsed){
+		this._expanded = !collapsed;
 	}
 	val = rowOptions["keepModel"];
 	if(val) {
@@ -258,7 +259,7 @@ RowDefinition.prototype.initialize = function(rowOptions) {
 
 	var symbol = this._ric || this._chainRic;
 	if(symbol || this._permId){
-		this.setContent(symbol, this._permId, this._isChain, this._expanded); // this._dataId is modified
+		this.setContent(symbol, extractedOptions); // this._dataId is modified
 	}
 
 	val = rowOptions["values"];
@@ -293,12 +294,10 @@ RowDefinition.prototype._initializeAsConstituent = function(rowOptions) {
 /** @public
 * @ignore
 * @param {string} userInput RIC
-* @param {string=} permId=null Organization PermId, which use for getting ADC data for private  company
-* @param {boolean=} asChain
-* @param {boolean=} expanded
+* @param {Object} extractedOptions
 * @return {boolean} True if there is any change otherwise false
 */
-RowDefinition.prototype.setContent = function(userInput, permId, asChain, expanded) {
+RowDefinition.prototype.setContent = function(userInput, extractedOptions) {
 	if(this._autoGenerated) { // AutoGenerated RowDefinition cannot be changed by user input
 		return false;
 	}
@@ -310,6 +309,7 @@ RowDefinition.prototype.setContent = function(userInput, permId, asChain, expand
 	}
 
 	var dirty = (this._userInput !== userInput);
+	var permId = extractedOptions["permId"];
 	if(this._permId !== permId){
 		this._permId = permId || "";
 		dirty = true;
@@ -327,15 +327,17 @@ RowDefinition.prototype.setContent = function(userInput, permId, asChain, expand
 	if(this._userInput.charAt(0) === "'") { // This is a row header
 		this._ric = this._chainRic = ""; // No ric for realtime request
 	} else {
+		var asChain = extractedOptions["asChain"];
+		var expanded = !extractedOptions["collapsed"];
+		var chainRic = extractedOptions["chainRic"];
 		if(asChain === true){
 			this._ric = expanded === false ? this._userInput : this._userInput.replace("0#", "");
-			this._expanded = expanded;
-			this._isChain = true; // Only chain can be expanded by 0#
-			this._chainRic = this._userInput;
+			this._expanded = expanded; // Only chain can be expanded by 0#
 		} else {
 			this._ric = this._userInput;
-			this._isChain = asChain;
 		}
+		this._isChain = asChain;
+		this._chainRic = chainRic || "";
 	}
 
 	if(this._view) {
@@ -767,8 +769,17 @@ RowDefinition.prototype.subscribeForUpdates = function() {
 	var prevRowData = this.unsubscribeForUpdates();
 
 	if(this.isChain()) {
-		this._subId = subs["addChain"](this._chainRic || this._ric, this._rowId); // Some chain require 0# symbol to populate its constituents
-		// TODO: Handle Dynamic chain such as .PG.PA
+		var symbol = this._chainRic;
+		if(!symbol){
+			symbol = this._ric;
+			if(symbol.indexOf("0#") < 0){
+				var count = (symbol.match(/\./g) || []).length;
+				if(count < 2){
+					symbol = "0#" + symbol;
+				}
+			}
+		}
+		this._subId = subs["addChain"](symbol, this._rowId); // Some chain require 0# symbol to populate its constituents
 	} else if(this._ric) {
 		this._subId = subs["addRic"](this._ric, this._rowId);
 	}
@@ -845,7 +856,7 @@ RowDefinition.prototype.resetUpdates = function() {
 };
 
 /** @public
-* @param {DataTable} view
+* @param {DataView} view
 * @param {string=} rowId
 */
 RowDefinition.prototype.registerToView = function(view, rowId) {
@@ -962,11 +973,17 @@ RowDefinition.prototype.addConstituent = function(ric) {
 	}
 
 	if(this._view) {
-		// WARNING: ChildCount may not be enough to determine proper inserting position
-		// TODO: Handle nested children
 		var rowId = this.getRowId();
-		var rowIndex = this._view.getRowIndex(rowId) + this.getChildCount(); // Children must be directly under its parent
-		childDef.registerToView(this._view, this._view.getRowId(rowIndex));
+		// WARNING: insert position, we prioritize using CHILD_ORDER (From server) in dc first. If it does not exist, the last row of the segment will be pushed
+		var childOrder = childDef.getData("CHILD_ORDER");
+		var parentIndex =  this._view.getRowIndex(rowId);
+		var position =  parentIndex + this.getChildCount(); // push the last position
+		if(childOrder != null) {
+			// Warning: We need to carry a value of 1 because the CHILD_ORDER starts with 0, and it will be added to the parentIndex. In case the parent rowIndex is not included.
+			position = parentIndex + childOrder + 1; // insert between segment
+		} // else {} it will be push in the last row of segment
+		childDef.registerToView(this._view, this._view.getRowId(position));
+		// TODO: Handle nested children
 		this._view.addSegmentChild(rowId, childDef.getRowId(), childDef.getDataId());
 	}
 
@@ -1217,6 +1234,7 @@ RowDefinition.toRowId = function(rowDef) {
 */
 RowDefinition.extractRowOptions = function(rowOptions) {
 	var ric = rowOptions["ric"];
+	var permId = rowOptions["permId"];
 	var chainRic = rowOptions["chainRic"];
 	var collapsed = rowOptions["collapsed"];
 	var asChain = rowOptions["asChain"];
@@ -1238,6 +1256,7 @@ RowDefinition.extractRowOptions = function(rowOptions) {
 		extractedOptions["collapsed"] = collapsed;
 	}
 	extractedOptions["ric"] = ric;
+	extractedOptions["permId"] = permId;
 	extractedOptions["chainRic"] = chainRic;
 	extractedOptions["asChain"] = asChain;
 	return extractedOptions;

package/lib/tr-grid-column-grouping/es6/ColumnGrouping.js

@@ -64,10 +64,6 @@ ColumnGroupingPlugin.prototype._maxDepth = 0;
 * @private
 */
 ColumnGroupingPlugin.prototype._restructuring = false;
-/** @type {boolean}
-* @private
-*/
-ColumnGroupingPlugin.prototype._autoGrouping = true;
 /** @type {number}
 * @private
 */
@@ -894,9 +890,11 @@ ColumnGroupingPlugin.prototype._applyTimeSeries = function (e) {
 * @param {Object} e dispatching of columnAdded event object
 */
 ColumnGroupingPlugin.prototype._onColumnAdded = function (e) {
-  var colIndex = e.colIndex;
-  this._requestApplyAddChildGroup(e);
-  this._applyNearestGrouping(colIndex);
+  var batches = e["batches"];
+  if (!(batches && batches["reset"])) {
+    this._requestApplyAddChildGroup(e);
+    this._applyNearestGrouping(e.colIndex);
+  }
   this._requestApplyGrouping();
 };
 /** @private
@@ -908,7 +906,8 @@ ColumnGroupingPlugin.prototype._onColumnChanged = function () {
 * @param {Object} e dispatching of columnMoved event object
 */
 ColumnGroupingPlugin.prototype._onColumnMoved = function (e) {
-  if (this._autoGrouping) {
+  var batches = e["batches"];
+  if (!(batches && batches["move"])) {
     this._applyNearestGrouping(e.toColIndex);
   }
   this._requestApplyGrouping();
@@ -917,11 +916,16 @@ ColumnGroupingPlugin.prototype._onColumnMoved = function (e) {
 * @param {Object} e
 */
 ColumnGroupingPlugin.prototype._onColumnRemoved = function (e) {
-  var colId = e.colId;
-  if (colId) {
-    if (this._groupDefs.unsetParent(colId)) {
-      this._requestApplyGrouping();
+  var batches = e["batches"];
+  if (!(batches && batches["reset"])) {
+    var colId = e.colId;
+    if (colId) {
+      if (this._groupDefs.unsetParent(colId)) {
+        this._requestApplyGrouping();
+      }
     }
+  } else {
+    this._requestApplyGrouping();
   }
 };
 /** @private
@@ -1028,29 +1032,22 @@ ColumnGroupingPlugin.prototype._onBeforeColumnBoundUpdate = function (e) {
 */
 ColumnGroupingPlugin.prototype.addColumnToGroup = function (column, groupId, colIndex) {
   if (!column) return;
-  var columnIndex = -1;
-  if (colIndex == null) {
+  var destIndex = this.getColumnCount();
+  if (colIndex != null) {
     var groupDef = this._groupDefs.getGroup(groupId);
     if (groupDef) {
-      var childIndices = this.getChildColumnIndices(groupId);
-      if (childIndices && childIndices.length) {
-        // Child indices need to be sorted here
-        columnIndex = childIndices[childIndices.length - 1] + 1; // Put new column next to the last child in the group
-      }
-
       this._groupDefs.addGroupChild(groupId, column.id);
     }
-  } else {
-    columnIndex = colIndex;
-  }
-  if (columnIndex < 0) {
-    columnIndex = this.getColumnCount();
+    destIndex = colIndex;
   }
   if (this._realTimeGrid) {
     // TODO: Support multi-table feature
-    this._realTimeGrid.insertColumn(column, columnIndex);
+    this._realTimeGrid.insertColumn(column, destIndex);
   } else if (this._compositeGrid) {
-    this._compositeGrid.insertColumn(columnIndex, column);
+    this._compositeGrid.insertColumn(destIndex, column);
+  }
+  if (colIndex == null) {
+    this.setColumnParent(column.id || destColIndex, groupId);
   }
 };
 
@@ -1622,13 +1619,7 @@ ColumnGroupingPlugin.prototype.moveGroup = function (id, destCol) {
 * @return {boolean}
 */
 ColumnGroupingPlugin.prototype.reorderColumns = function (colList, destCol) {
-  var dirty = false;
-  // TODO: create method for toggling autoGrouping flag
-  this._autoGrouping = false; // Prevent re-grouping in columnMoved event
-
-  this._reorderColumns(colList, destCol);
-  this._autoGrouping = true;
-  return dirty;
+  return this._reorderColumns(colList, destCol);
 };
 /** Move the specified column to position before the destination
 * @public
@@ -1637,12 +1628,7 @@ ColumnGroupingPlugin.prototype.reorderColumns = function (colList, destCol) {
 * @return {boolean}
 */
 ColumnGroupingPlugin.prototype.moveColumnById = function (srcCol, destCol) {
-  var dirty = false;
-  this._autoGrouping = false; // Prevent re-grouping in columnMoved event
-
-  this._moveColumnById(srcCol, destCol);
-  this._autoGrouping = true;
-  return dirty;
+  return this._moveColumnById(srcCol, destCol);
 };
 /** @public
 * @param {string} groupId

package/lib/tr-grid-util/es6/CellPainter.d.ts

@@ -1,6 +1,7 @@
 import { TickCodes, TickFields } from "./TickCodes.js";
-import { parseCondition, rgb2Hex } from "./Util.js";
+import { rgb2Hex } from "./Util.js";
 import { ElfUtil } from "./ElfUtil.js";
+import { ExpressionParser } from "./ExpressionParser.js";
 
 declare namespace CellPainter {
 

package/lib/tr-grid-util/es6/CellPainter.js

@@ -1,6 +1,7 @@
 import { TickCodes, TickFields } from "./TickCodes.js";
-import { parseCondition, rgb2Hex } from "./Util.js";
+import { rgb2Hex } from "./Util.js";
 import { ElfUtil } from "./ElfUtil.js";
+import { ExpressionParser } from "./ExpressionParser.js";
 
 /** @typedef {Object} CellPainter~Expression
 * @property {string=} name
@@ -131,7 +132,8 @@ CellPainter.supportedStyles = CellPainter.bgStyles.concat(CellPainter.nonBgStyle
 */
 CellPainter.themeReady = null;
 
-/** @public
+/** Deprecated in favor of ExpressionParser
+* @public
 * @function
 * @param {string|Function} expression
 * @return {Function}
@@ -139,7 +141,7 @@ CellPainter.themeReady = null;
 * var fn = CellPainter.parse("[CF_BID] >= 10 && [CF_BID] <= 100");
 * window.console.log(fn(25));
 */
-CellPainter.parse = parseCondition;
+CellPainter.parse = ExpressionParser.parse;
 
 
 /** @public */
@@ -311,7 +313,7 @@ CellPainter.prototype.getColumnStats = function() {
 CellPainter.prototype._addCondition = function(condition) {
 	var exp = condition["expression"];
 	if(exp) {
-		condition._fn = CellPainter.parse(exp["text"] || exp);
+		condition._fn = ExpressionParser.parse(exp["text"] || exp);
 		this._conditions.push(condition);
 	}
 };

package/lib/tr-grid-util/es6/ExpressionParser.d.ts

@@ -0,0 +1,10 @@
+
+
+declare namespace ExpressionParser {
+
+    function parse(expression: string|((...params: any[]) => any)|null): ((...params: any[]) => any)|null;
+
+}
+
+export default ExpressionParser;
+export {ExpressionParser};