@refinitiv-ui/efx-grid 6.0.145 → 6.0.147

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

@@ -2354,7 +2354,7 @@ Grid.prototype._cloneChain = function(newRowDef) {
 		"subId": subId
 	};
 	for (let i = 0; i < count; i++) {
-		let childRowDef = constituents[i]; // TODO: the constituents should be sorted by CHILD_ORDER first
+		let childRowDef = constituents[i];
 		evtArg["ric"] = childRowDef.getRic();
 		evtArg["values"] = childRowDef.cloneRowData();
 		evtArg["values"]["SUB_ID"] = subId; // Imitate real-time service responses

package/lib/tr-grid-util/es6/jet/DataGenerator.js

@@ -61,6 +61,7 @@ let _fieldInfo = {
 	"PRCTCK_1": {type: "set", members: ["\u21e7", "B\u21e7", "\u2191", "B\u2191", "26", "1", "\"1\"", "-1", "\u21e9", "B\u21e9", "\u2193", "B\u2193", "27", "2", "\"2\""] },
 	"CF_NETCHNG": {type: "number", min: -100, max: 100},
 	"CF_VOLUME": {type: "number", min: 0, max: 1e7},
+	"CHILD_ORDER": {type: "set", ignore: true, members: [undefined]}, // eslint-disable-line
 	"RI_FLAG": {type: "set", members: ["R", "Q", "I", "_", ""]},
 	"RI_CODE": {type: "number", min: 0, max: 2},
 	"STATUS": {type: "number", min: 0, max: 6},
@@ -225,8 +226,12 @@ let randBoolean = function(seed) {
 * @return {*}
 */
 let randMember = function(set, seed) {
-	if(set) {
-		let index = randIndex(set.length, seed);
+	var len = set ? (set.length || 0) : 0;
+	if(len) {
+		if(len === 1) {
+			return set[0];
+		}
+		let index = randIndex(len, seed);
 		return set[index];
 	}
 	return String.fromCharCode(randInt(65, 90, seed));

package/lib/tr-grid-util/es6/jet/MockQuotes2.js

@@ -588,48 +588,44 @@ MockSubscriptions.prototype._onSubscriptionResponse = function() {
 		// find key to random subs (key is subId)
 		let key = keys[this._dataGen.randIndex(len)]; // WARNING: Same sub could be picked more than once
 		let subs = this._dataMap.getItems(key); // Get all subs with the same RIC
+		let subCount = subs.length;
 
-		let sub = subs[0]; // Only the first sub is need to generate data
-		let values, j, jLen;
-		let subParent = sub.parent;
+		let j;
+		let firstSub = subs[0]; // Only the first sub is need to generate data
+		let subParent = firstSub.parent;
 		let updatePosition = this._dataGen.randInt(0, 100) < this._percentageOrderChange * 100 ? true : false; // Random chance to change dynamic chain position (2% to change)
 
-		if(_isDynamicChain(key) && subParent && updatePosition) { // subParent in header of dynamic chain is behavior like a normal ric
+		let values = this._generateQuoteData(firstSub, fields);
+		if(_isDynamicChain(key) && subParent && updatePosition) { // subParent in header of dynamic chain behaves like a normal ric
 			let children = subParent.children;
+			let childCount = children.length;
 
 			children = _shuffleArray(children); // Random swap children in array
-			let childrenLen = children.length;
-			let subIndex = children.indexOf(sub);
-			sub["CHILD_ORDER"] = subIndex;
-
-			values = this._generateQuoteData(sub, fields);
-
-			jLen = subs.length;
-			for(j = 0; j < jLen; ++j) { // It could be same ric and it need to dispatch with same ric number
-				for (let k = 0; k < childrenLen; k++) {
-					let child = children[k];
-					if(subs[j] === child) {
-						values["CHILD_ORDER"] = child["CHILD_ORDER"];
-						this._dispatchDataChanged(subs[j], values);
-					} else {
-						let currentChild = child["CHILD_ORDER"];
-						this._dispatchDataChanged(child, {
-							X_RIC_NAME: child.ric,
-							CHILD_ORDER: currentChild
+			let newOrder = children.indexOf(firstSub);
+			firstSub["CHILD_ORDER"] = newOrder; // This is bad
+			values["CHILD_ORDER"] = newOrder;
+
+			childOrderChange = true;
+			for(j = 0; j < subCount; ++j) { // It could be same ric and it need to dispatch with same ric number
+				this._dispatchDataChanged(subs[j], values);
+				// Update child order for all children with the same parent
+				for (let k = 0; k < childCount; k++) { // This is not correct, if there is a duplicate dynamic chain
+					if(k !== newOrder) {
+						this._dispatchDataChanged(children[k], {
+							X_RIC_NAME: children[k].ric,
+							CHILD_ORDER: k
 						});
 					}
 				}
-				childOrderChange = true;
 			}
-
 		} else {
-			values = this._generateQuoteData(sub, fields);
-			jLen = subs.length; // Duplicate ric or chain
-			for(j = 0; j < jLen; ++j) { // It could be same ric and it need to dispatch with same ric number
-				let childOrder = subs[j]["CHILD_ORDER"];
+			if(subCount > 1) { // Duplicate CHILD_ORDER from the first sub for other sub with the same RIC (not entirely correct)
+				let childOrder = firstSub["CHILD_ORDER"];
 				if(childOrder != null) { // Children of chain will have a CHILD_ORDER
 					values["CHILD_ORDER"] = childOrder;
 				}
+			}
+			for(j = 0; j < subCount; ++j) { // It could be same ric and it need to dispatch with same ric number
 				this._dispatchDataChanged(subs[j], values);
 				updateCount++;
 			}
@@ -672,20 +668,24 @@ MockSubscriptions.prototype._generateQuoteData = function(sub, fields) {
 		prefix: sub["parent"] ? sub["parent"]["ric"] : "" // prefix for constituents
 	};
 	for(let field in fields){
-		let data = this._dataGen.generateQuoteData(field, options);
+		let fInfo = this._dataGen.generateQuoteData(field, options);
+		if(fInfo.ignore) {
+			continue;
+		}
+
 		let formattedField = field + "_FORMATTED";
 		if(prevData) {
-			if(data.changeOnly) {
-				if(prevData[field] === data.value) {
+			if(fInfo.changeOnly) {
+				if(prevData[field] === fInfo.value) {
 					continue;
 				}
 			}
-			prevData[field] = data.value;
-			prevData[formattedField] = data.formattedValue;
+			prevData[field] = fInfo.value;
+			prevData[formattedField] = fInfo.formattedValue;
 		}
 
-		values[field] = data.value;
-		values[formattedField] = data.formattedValue;
+		values[field] = fInfo.value;
+		values[formattedField] = fInfo.formattedValue;
 	}
 
 	// The delay symbol for X_RIC_NAME will depend on the INDICATOR field.

package/lib/versions.json

@@ -1,5 +1,5 @@
 {
-	"tr-grid-util": "1.3.173",
+	"tr-grid-util": "1.3.174",
 	"tr-grid-printer": "1.0.18",
 	"@grid/column-dragging": "1.0.21",
 	"@grid/row-segmenting": "2.0.1",

package/package.json

@@ -69,5 +69,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.145"
+	"version": "6.0.147"
 }