@refinitiv-ui/efx-grid 6.0.140 → 6.0.141

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

@@ -617,6 +617,10 @@ Grid.prototype._topSection = true;
 * @private
 */
 Grid.prototype._focusingArgs = null;
+/** @type {boolean}
+* @private
+*/
+Grid.prototype._hasNewUpdates = false;
 
 /** @public
 */
@@ -2381,8 +2385,12 @@ Grid.prototype.insertRow = function(rowOption, rowRef) {
 		}
 	}
 	let rowDef = new RowDefinition(rowOption);
+
+	if(rowDef.setDataSource(this._dc, this._subs)) { // This could also subscribe chain index/ric to JET/RTK
+		this._hasNewUpdates = true; // Mark data table for cleaning it up later
+	}
 	rowDef.registerToView(this._dv, this._getRowId(rowRef));
-	rowDef.setDataSource(this._dc, this._subs); // This could also subscribe chain index/ric to JET/RTK
+
 	this._initDuplicateRicData(rowDef);
 
 	if(rowOption && rowOption["hidden"]) {
@@ -3763,11 +3771,21 @@ Grid.prototype._registerConstituents = function(rowDef) {
 * @param {Object} e
 */
 Grid.prototype._onDataChanged = function(e) {
-	if(this._dt && e && e["rid"] && e["changes"]) {
-		let rowDef = this._getRowDefinitionById(e["rid"]);
-		if(rowDef) {
-			if(rowDef.addUpdate(e["changes"])) { // This is the only place that update array can grow. It is used for blinking data.
-				this._dt._hasNewUpdates = true; // Mark data table for cleaning it up later
+	if(!this._dt) {
+		return;
+	}
+	if(e) {
+		if(e["initialChanges"] && !this._dt.hasSegmentClassification()) {
+			return;
+		}
+
+		// TODO: Insertion should also be addressed here.
+		if(e["rid"] && e["changes"]) {
+			let rowDef = this._getRowDefinitionById(e["rid"]);
+			if(rowDef) {
+				if(rowDef.addUpdate(e["changes"])) { // This is the only place that update array can grow. It is used for blinking data.
+					this._hasNewUpdates = true; // Mark data table for cleaning it up later
+				}
 			}
 		}
 	}
@@ -3776,10 +3794,8 @@ Grid.prototype._onDataChanged = function(e) {
 		return;
 	}
 
-	if(this._dt) {
-		this._dt.classifySegments();
-		this._dt.dispatchGlobalChange();
-	}
+	this._dt.classifySegments();
+	this._dt.dispatchGlobalChange();
 };
 
 /** @private
@@ -3841,9 +3857,10 @@ Grid.prototype._asyncClearDataUpdates = function() {
 /** @private
 */
 Grid.prototype._clearDataUpdates = function() {
-	if(!this._dt || !this._dt._hasNewUpdates) {
+	if(!this._dt || !this._hasNewUpdates) {
 		return;
 	}
+	this._hasNewUpdates = false;
 	let rowIds = this._dt.getAllRowIds(true); // Use shallow copy for speed
 	for(let i = rowIds.length; --i >= 0;) {
 		let rowData = this._dt.getRowData(rowIds[i]);
@@ -4001,7 +4018,11 @@ Grid.prototype._onFormulaDataRequired = function(e) {
 Grid.prototype._onDataComposed = function(e) {
 	let values = e["changes"];
 	if(!values) {
-		return; // Cannot do data composition if there is no change in data
+		if(e["initialChanges"]) {
+			values = e["changes"] = e["initialChanges"]; // Need to keep e["changes"] for backward compatibility.
+		} else {
+			return; // Cannot do data composition if there is no change in data
+		}
 	}
 
 	if(!e["rowData"]) {
@@ -4009,7 +4030,7 @@ Grid.prototype._onDataComposed = function(e) {
 	}
 
 	let rowId = e["rid"];
-	let rowDef = this._getRowDefinitionById(rowId);
+	let rowDef = e["rowDef"] || this._getRowDefinitionById(rowId);
 	if(!rowDef) {
 		rowDef = this._constituentMap ? this._constituentMap[rowId] : null; // Row def could be in pending for adding to view
 		if(!rowDef) {
@@ -4079,8 +4100,10 @@ Grid.prototype._onSubSegmentChanged = function(e) {
 		rowDef = new RowDefinition({
 			"segmentId": segmentId // WARNING: This could cause row id duplication
 		});
+		if(rowDef.setDataSource(this._dc)) { // auto generated row does not require a subscription
+			this._hasNewUpdates = true; // Mark data table for cleaning it up later
+		}
 		rowDef.registerToView(this._dv);
-		rowDef.setDataSource(this._dc); // auto generated row does not require a subscription
 	}
 };
 

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

@@ -48,7 +48,7 @@ declare class RowDefinition {
 
     public getType(): string;
 
-    public setDataSource(dataSource: DataCache|null, subs?: any): void;
+    public setDataSource(dataSource: DataCache|null, subs?: any): boolean;
 
     public getDataSource(): DataCache|null;
 

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

@@ -603,20 +603,28 @@ RowDefinition.prototype.getType = function() {
 * @public
 * @param {DataCache} dataSource
 * @param {Object=} subs Quotes2 subscription object
+* @return {boolean} Returns true if there is an data update
 */
 RowDefinition.prototype.setDataSource = function(dataSource, subs) {
 	this._dc = dataSource || null;
-
+	let dataUpdated = false;
 	if(this._dc) {
-		this.setRowData({}); // Trigger data change
 		if(this._staticValues) {
-			this.setRowData(this._staticValues); // Trigger dataComposed and add updates
+			let rowData = _cloneObject(this._staticValues);
+			dataUpdated = this.addUpdate(rowData);
+			this._dc.setRowData(this._rowId, rowData, {
+				"rowDef": this, // The _onDataChanged and _onDataComposed handlers cannot get rowDef from DT because row does not register to view yet.
+				"initialChanges": this.getUpdates() // Used by _onDataComposed to keep backward compatibility.
+			}); // Trigger dataComposed and add updates
+		} else {
+			this._dc.setRowData(this._rowId, {});
 		}
 	}
 
 	this._subs = subs || null;
 	// This will work for runtime row insertion, but not for first initilization.
 	this.subscribeForUpdates();
+	return dataUpdated;
 };
 /** @public
 * @return {DataCache} dataSource

package/lib/tr-grid-conditional-coloring/es6/ConditionalColoring.d.ts

@@ -1,6 +1,6 @@
 import {Ext} from '../../tr-grid-util/es6/Ext.js';
 import {GridPlugin} from '../../tr-grid-util/es6/GridPlugin.js';
-import {extendObject, injectCss, prettifyCss, isEmptyObject} from '../../tr-grid-util/es6/Util.js';
+import {extendObject, injectCss, prettifyCss} from '../../tr-grid-util/es6/Util.js';
 import {CellPainter} from '../../tr-grid-util/es6/CellPainter.js';
 import {FilterBuilder} from '../../tr-grid-util/es6/FilterBuilder.js';
 import {ElfUtil} from '../../tr-grid-util/es6/ElfUtil.js';

package/lib/tr-grid-conditional-coloring/es6/ConditionalColoring.js

@@ -1,6 +1,6 @@
 import {Ext} from '../../tr-grid-util/es6/Ext.js';
 import {GridPlugin} from '../../tr-grid-util/es6/GridPlugin.js';
-import {extendObject, injectCss, prettifyCss, isEmptyObject} from '../../tr-grid-util/es6/Util.js';
+import {extendObject, injectCss, prettifyCss} from '../../tr-grid-util/es6/Util.js';
 import {CellPainter} from '../../tr-grid-util/es6/CellPainter.js';
 import {FilterBuilder} from '../../tr-grid-util/es6/FilterBuilder.js';
 import {ElfUtil} from '../../tr-grid-util/es6/ElfUtil.js';
@@ -1200,7 +1200,6 @@ ConditionalColoringPlugin.prototype._onSectionBinding = function (e) {
 	}
 
 	let prevDataRow, prevDataRows = host._prevDataRows;
-	let isPrevRowExisted = !isEmptyObject(prevDataRows);
 	let api = this.getGridApi();
 	for (r = fromR; r < toR; ++r) {
 		rid = dv.getRowId(r);
@@ -1260,7 +1259,7 @@ ConditionalColoringPlugin.prototype._onSectionBinding = function (e) {
 								}
 							}
 						} else {
-							if(isPrevRowExisted && insertedRow){
+							if(insertedRow){
 								blinking = true;
 								bgBlinking = painter.flash(cell, this._insertionBlinking, dataRow);
 							}

package/lib/tr-grid-util/es6/jet/MockQuotes2.d.ts

@@ -29,6 +29,8 @@ declare class MockSubscriptions {
 
     public setPercentageDataUpdate(percent?: number|null): void;
 
+    public setPercentageOrderChanged(percent?: number|null): void;
+
     public setSeed(seed: number): void;
 
     public addRic(ric: string, subId?: string|null): string|null|null;

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

@@ -152,6 +152,10 @@ MockSubscriptions.prototype._maxInterval = 850;
 */
 MockSubscriptions.prototype._percentageDataUpdate = 0.1; // 10% by default
 /** @private
+* @type {number}
+*/
+MockSubscriptions.prototype._percentageOrderChange = 1; // 100%
+/** @private
 * @type {boolean}
 */
 MockSubscriptions.prototype._constituentCache = false;
@@ -184,6 +188,11 @@ MockSubscriptions.prototype.config = function(options) {
 		this._percentageDataUpdate = num / 100;
 	}
 
+	num = options.percentageOrderChange;
+	if(typeof num === "number") {
+		this._percentageOrderChange = num / 100;
+	}
+
 	let value = options.constituentCache;
 	if(value != null) {
 		this._constituentCache = value;
@@ -212,6 +221,15 @@ MockSubscriptions.prototype.setPercentageDataUpdate = function(percent) {
 	}
 };
 
+/** @public
+* @param {number=} percent
+*/
+MockSubscriptions.prototype.setPercentageOrderChanged = function(percent) {
+	if(typeof percent === "number") {
+		this._percentageOrderChange = Math.round(percent / 100);
+	}
+};
+
 /** @public
 * @param {number} seed
 */
@@ -499,7 +517,7 @@ MockSubscriptions.prototype._addSymbol = function(ric, asChain, subId) {
 				childSub["CHILD_ORDER"] = i;
 				this._dataMap.addItem(_joinSubKeys(sub, childSub), childSub);
 			}
-		} else {
+		} else { // Duplicate chain
 			let firstSub = subs[0];
 			let constituents = firstSub["children"];
 			childCount = constituents.length;
@@ -547,7 +565,6 @@ MockSubscriptions.prototype._connect = function() {
 	}
 };
 
-/** @private */
 MockSubscriptions.prototype._onSubscriptionResponse = function() {
 	this._timerId = 0;
 
@@ -565,20 +582,22 @@ MockSubscriptions.prototype._onSubscriptionResponse = function() {
 	let numRows = this._dataGen.randInt(minRow, maxRow);
 	let fields = this._fields;
 
+	let updateCount = 0;
+	let childOrderChange;
 	for(let i = 0; i < numRows; i++) {
+		// 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 sub = subs[0]; // Only the first sub is need to generate data
+		let values, j, jLen;
 		let subParent = sub.parent;
-		let updatePosition = this._dataGen.randBoolean(); // Flag for change CHILD_ORDER position
+		let updatePosition = this._dataGen.randInt(0, 100) < this._percentageOrderChange * 100 ? true : false; // Random chance to change dynamic chain position (2% to change)
 
-		let values, j, jLen;
 		if(_isDynamicChain(key) && subParent && updatePosition) { // subParent in header of dynamic chain is behavior like a normal ric
-			// TODO: support rate of ordering is changed
 			let children = subParent.children;
 
-			children = _shuffleArray(children);
+			children = _shuffleArray(children); // Random swap children in array
 			let childrenLen = children.length;
 			let subIndex = children.indexOf(sub);
 			sub["CHILD_ORDER"] = subIndex;
@@ -600,22 +619,33 @@ MockSubscriptions.prototype._onSubscriptionResponse = function() {
 						});
 					}
 				}
-				this._dispatchPostUpdate({ childOrderChange: true });
+				childOrderChange = true;
 			}
 
 		} else {
 			values = this._generateQuoteData(sub, fields);
-			jLen = subs.length;
+			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(childOrder != null) { // Children of chain will have a CHILD_ORDER
 					values["CHILD_ORDER"] = childOrder;
 				}
 				this._dispatchDataChanged(subs[j], values);
+				updateCount++;
 			}
 		}
 	}
 
+	let postObj = {};
+	if(childOrderChange != null) {
+		postObj["childOrderChange"] = childOrderChange;
+	}
+	if(updateCount != null) {
+		postObj["updateCount"] = updateCount;
+	}
+
+	this._dispatchPostUpdate(postObj);
+
 	this._connect();
 };
 

package/lib/types/es6/ConditionalColoring.d.ts

@@ -1,6 +1,6 @@
 import {Ext} from '../../tr-grid-util/es6/Ext.js';
 import {GridPlugin} from '../../tr-grid-util/es6/GridPlugin.js';
-import {extendObject, injectCss, prettifyCss, isEmptyObject} from '../../tr-grid-util/es6/Util.js';
+import {extendObject, injectCss, prettifyCss} from '../../tr-grid-util/es6/Util.js';
 import {CellPainter} from '../../tr-grid-util/es6/CellPainter.js';
 import {FilterBuilder} from '../../tr-grid-util/es6/FilterBuilder.js';
 import {ElfUtil} from '../../tr-grid-util/es6/ElfUtil.js';

package/lib/types/es6/Core/data/DataTable.d.ts

@@ -88,6 +88,8 @@ declare class DataTable extends DataCache {
 
     public hasSegmentation(): boolean;
 
+    public hasSegmentClassification(): boolean;
+
     public isSegmentSeparator(rid: string): boolean;
 
     public getSegment(rid: string): Segment|null;
@@ -132,6 +134,8 @@ declare class DataTable extends DataCache {
 
     public requestClassifying(): void;
 
+    public setSegmentDefaultCollapsing(bool: boolean): boolean;
+
     public dispatchGlobalChange(suppressEvent?: boolean|null): void;
 
     public static getSortingDefinitions(): void;
@@ -144,7 +148,7 @@ declare function prevFrozen(ary: (any)[][], opt_cidList?: (string)[]|null, opt_r
 
 declare function cid(): null;
 
-declare function removalList(sortingDefs: (any[])[]|null): boolean;
+declare function removalList(bool: boolean): boolean;
 
 declare function logic(a: number, b: number, order: number, sortingDefs: (any[])[]|null): number;
 

package/lib/types/es6/Core/data/DataView.d.ts

@@ -304,6 +304,8 @@ declare class DataView extends EventDispatcher {
 
     public setSegmentClassification(segmentRef: string|number|null, fields: string|(string)[]|null): boolean;
 
+    public setSegmentDefaultCollapsing(bool: boolean): boolean;
+
     public getWrapSize(): number;
 
     public getWrappedViews(): (WrappedView)[]|null;

package/lib/types/es6/Core/data/Segment.d.ts

@@ -65,7 +65,7 @@ declare class Segment extends EventDispatcher {
 
     public setOrder(val: number): void;
 
-    public log(lines: (string)[]|null): (string)[]|null;
+    public log(lines?: (string)[]|null): (string)[];
 
 }
 

package/lib/types/es6/Core/data/SegmentCollection.d.ts

@@ -70,6 +70,8 @@ declare class SegmentCollection extends EventDispatcher {
 
     public classify(rows: { [key: string]:  any }|null): boolean;
 
+    public setDefaultCollapsing(bool: boolean): boolean;
+
 }
 
 export default SegmentCollection;

package/lib/types/es6/Core/grid/components/ElementWrapper.d.ts

@@ -51,6 +51,8 @@ declare class ElementWrapper extends EventDispatcher {
 
     public getAttribute(str: string): string;
 
+    public hasAttribute(str: string): boolean;
+
     public setAttribute(str: string, val: string): void;
 
     public setAttributes(json: any): void;

package/lib/versions.json

@@ -1,8 +1,8 @@
 {
-	"tr-grid-util": "1.3.168",
+	"tr-grid-util": "1.3.169",
 	"tr-grid-printer": "1.0.18",
 	"@grid/column-dragging": "1.0.21",
-	"@grid/row-segmenting": "2.0.0",
+	"@grid/row-segmenting": "2.0.1",
 	"@grid/statistics-row": "1.0.17",
 	"@grid/zoom": "1.0.13",
 	"tr-grid-auto-tooltip": "1.1.9",
@@ -14,7 +14,7 @@
 	"tr-grid-column-resizing": "1.0.29",
 	"tr-grid-column-selection": "1.0.33",
 	"tr-grid-column-stack": "1.0.76",
-	"tr-grid-conditional-coloring": "1.0.73",
+	"tr-grid-conditional-coloring": "1.0.74",
 	"tr-grid-content-wrap": "1.0.20",
 	"tr-grid-contextmenu": "1.0.44",
 	"tr-grid-filter-input": "0.9.43",

package/package.json

@@ -69,5 +69,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.140"
+	"version": "6.0.141"
 }