@refinitiv-ui/efx-grid 6.0.32 → 6.0.33

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

@@ -217,6 +217,7 @@ MockSubscriptions.prototype.removeSubscription = function(subId) {
 			child["parent"] = null;
 		}
 		sub["children"] = null;
+		sub["ricList"] = null;
 	}
 };
 /** @public
@@ -283,9 +284,9 @@ MockSubscriptions.prototype.start = function() {
 /** @public */
 MockSubscriptions.prototype.stop = function() {
 	this._working = false;
-	if(this._timerId >= 0) {
+	if(this._timerId) {
 		window.clearTimeout(this._timerId);
-		this._timerId = -1;
+		this._timerId = 0;
 	}
 };
 
@@ -418,26 +419,55 @@ MockSubscriptions.prototype._addSymbol = function(ric, asChain, subId) {
 	sub["ric"] = ric;
 	sub["chain"] = asChain;
 	sub["id"] = subId;
-	sub["dataId"] = subId + sub["ric"];
+	sub["dataId"] = subId + ric;
 	this._subMap[subId] = sub; // Collect all user subscriptions
-	this._dataMap.addItem(sub["ric"], sub);
+	this._dataMap.addItem(ric, sub);
+	var subs = this._dataMap.getItems(ric);
+	var subCount = subs.length;
+
+	this._dispatch("subscriptionAdded", {"subs": [sub]});
+
+	var childSub = null;
+	var childCount = 0;
+	var i;
 	if(asChain) {
-		sub["children"] = [];
-		var childCount = MockSubscriptions.simpleDigest(ric) % 10 + 4;
-		for(var i = 0; i < childCount; ++i) {
-			// Note that constituents should have no subscription object. They should share the same subscription as their parent. Hence we does not register it to the _subMap
-			var childSub = {};
-			childSub["ric"] = "Child_" + String.fromCharCode(65 + i);
-			childSub["id"] = subId; // Child shares the same sub id as its chain parent
-			childSub["dataId"] = subId + childSub["ric"];
-			childSub["parent"] = sub; // This does not exist in real subscription
-			sub["children"].push(childSub);
-
-			this._dataMap.addItem(_joinSubKeys(sub, childSub), childSub);
+		// Note that constituents should have no subscription object. They should share the same subscription as their parent. Hence we does not register it to the _subMap
+		if(subCount === 1) { // The first chain detected
+			sub["children"] = [];
+			childCount = MockSubscriptions.simpleDigest(ric) % 10 + 4;
+			for(i = 0; i < childCount; ++i) {
+				childSub = {};
+				childSub["ric"] = "Child_" + String.fromCharCode(65 + i);
+				childSub["id"] = subId; // Child shares the same sub id as its chain parent
+				childSub["dataId"] = subId + childSub["ric"];
+				childSub["parent"] = sub; // This does not exist in real subscription
+				sub["children"].push(childSub);
+
+				this._dataMap.addItem(_joinSubKeys(sub, childSub), childSub);
+			}
+		} else {
+			var firstSub = subs[0];
+			var constituents = firstSub["children"];
+			childCount = constituents.length;
+			sub["children"] = new Array(childCount);
+
+			for(i = 0; i < childCount; ++i) {
+				childSub = {};
+				childSub["ric"] = constituents[i]["ric"];
+				childSub["id"] = subId; // Child shares the same sub id as its chain parent
+				childSub["dataId"] = subId + childSub["ric"];
+				childSub["parent"] = sub; // This does not exist in real subscription
+				sub["children"][i] = childSub;
+
+				this._dataMap.addItem(_joinSubKeys(sub, childSub), childSub);
+			}
+		}
+	}
+	if(subCount > 1) { // Duplicate RIC/CHAIN detected
+		if(this._working) {
+			setTimeout(this._updateDuplicateSymbol.bind(this, ric), 10);
 		}
 	}
-
-	this._dispatch("subscriptionAdded", {"subs": [sub]});
 
 	this._connect();
 	return subId;
@@ -457,14 +487,15 @@ MockSubscriptions.simpleDigest = function(str) {
 
 /** @private */
 MockSubscriptions.prototype._connect = function() {
-	if(!this._working || this._timerId >= 0) { return; }
-	var delay = this._dataGen.randInt(this._minInterval, this._maxInterval);
-	this._timerId = window.setTimeout(this._onSubscriptionResponse, delay);
+	if(this._working && !this._timerId) {
+		var delay = this._dataGen.randInt(this._minInterval, this._maxInterval);
+		this._timerId = window.setTimeout(this._onSubscriptionResponse, delay);
+	}
 };
 
 /** @private */
 MockSubscriptions.prototype._onSubscriptionResponse = function() {
-	this._timerId = -1;
+	this._timerId = 0;
 
 	var keys = this._dataMap.getAllKeys(); // list of all rics
 	var len = keys ? keys.length : 0;
@@ -478,34 +509,14 @@ MockSubscriptions.prototype._onSubscriptionResponse = function() {
 	var maxRow = (this._percentageDataUpdate + 0.02) * len;
 	maxRow = maxRow < len ? maxRow : len; // not more than all rows
 	var numRows = this._dataGen.randInt(minRow, maxRow);
+	var fields = this._fields;
 
 	for(var i = 0; i < numRows; i++) {
 		var key = keys[this._dataGen.randIndex(len)]; // WARNING: Same sub could be picked more than once
-		var subs = this._dataMap.getItems(key);
-
-		var sub = subs[0];
-		var ric = sub.ric;
-		var prevData = sub.prevData;
-
-		var values = {};
-		var options = {
-			text: ric,
-			prefix: sub["parent"] ? sub["parent"]["ric"] : ""
-		};
-		for(var field in this._fields){
-			var data = this._dataGen.generateQuoteData(field, options);
-			if(prevData) {
-				if(data.changeOnly) {
-					if(prevData[field] === data.value) {
-						continue;
-					}
-				}
-				prevData[field] = data.value;
-			}
+		var subs = this._dataMap.getItems(key); // Get all subs with the same RIC
 
-			values[field] = data.value;
-			values[field + "_FORMATTED"] = data.formattedValue;
-		}
+		var sub = subs[0]; // Only the first sub is need to generate data
+		var values = this._generateQuoteData(sub, fields);
 
 		var jLen = subs.length;
 		for(var j = 0; j < jLen; ++j) {
@@ -517,6 +528,109 @@ MockSubscriptions.prototype._onSubscriptionResponse = function() {
 };
 /** @private
 * @param {Object} sub
+* @param {Object} fields
+* @return {!Object}
+*/
+MockSubscriptions.prototype._generateQuoteData = function(sub, fields) {
+	var ric = sub.ric;
+	var prevData = sub.prevData;
+
+	var values = {};
+	var options = {
+		text: ric,
+		prefix: sub["parent"] ? sub["parent"]["ric"] : "" // prefix for constituents
+	};
+	for(var field in fields){
+		var data = this._dataGen.generateQuoteData(field, options);
+		var formattedField = field + "_FORMATTED";
+		if(prevData) {
+			if(data.changeOnly) {
+				if(prevData[field] === data.value) {
+					continue;
+				}
+			}
+			prevData[field] = data.value;
+			prevData[formattedField] = data.formattedValue;
+		}
+
+		values[field] = data.value;
+		values[formattedField] = data.formattedValue;
+	}
+	return values;
+};
+
+
+/** @private
+* @param {Object} parentSub
+* @param {string} ric
+* @return {Object}
+*/
+MockSubscriptions.prototype._getChildSubByRic = function(parentSub, ric) {
+	var children = parentSub["children"];
+	if(children) {
+		var childCount = children.length;
+		for(var i = 0; i < childCount; ++i) {
+			var child = children[i];
+			if(child["ric"] === ric) {
+				return child;
+			}
+		}
+	}
+	return null;
+};
+/** @private
+* @param {string} ric
+*/
+MockSubscriptions.prototype._updateDuplicateSymbol = function(ric) {
+	var subs = this._dataMap.getItems(ric);
+	if(!subs) {
+		return;
+	}
+	var subCount = subs.length;
+	if(subCount < 2) {
+		return;
+	}
+	var firstSub = subs[0];
+	var prevData = firstSub["prevData"];
+	var isChain = firstSub["chain"] ? true : false;
+	var i;
+	if(prevData) {
+		for(i = 1; i < subCount; ++i) {
+			var sub = subs[i];
+			if(!sub["prevData"]) {
+				this._dispatchDataChanged(sub, prevData);
+			}
+		}
+	}
+
+
+	if(!isChain) {
+		return;
+	}
+	var ricList = firstSub["ricList"];
+	if(!ricList) {
+		return;
+	}
+	var childCount = ricList.length;
+
+	for(i = 1; i < subCount; ++i) {
+		var sub2 = subs[i];
+		var ricList2 = sub2["ricList"];
+		var childCount2 = ricList2 ? ricList2.length : 0;
+		for(var j = childCount2; j < childCount; ++j) {
+			var childRic = ricList[j];
+			var childSub = this._getChildSubByRic(firstSub, childRic);
+			var childSub2 = this._getChildSubByRic(sub2, childRic);
+			if(childSub && childSub2) {
+				if(childSub["prevData"]) {
+					this._dispatchDataChanged(childSub2, childSub["prevData"]);
+				}
+			}
+		}
+	}
+};
+/** @private
+* @param {Object} sub
 * @param {Object} dataUpdates
 */
 MockSubscriptions.prototype._dispatchDataChanged = function(sub, dataUpdates) {
@@ -536,6 +650,15 @@ MockSubscriptions.prototype._dispatchDataChanged = function(sub, dataUpdates) {
 		values["STATUS_FORMATTED"] = this._statusMap["1"];
 		values["SUB_ID"] = sub["id"];
 		copyValues(values, prevData);
+
+		var parentSub = sub.parent;
+		if(parentSub) { // This is the first time constituent have the data
+			var ricList = parentSub["ricList"];
+			if(!ricList) {
+				ricList = parentSub["ricList"] = [];
+			}
+			parentSub["ricList"].push(sub["ric"]);
+		}
 	}
 	this._dispatch("dataChanged", evtArg);
 };
@@ -593,7 +716,7 @@ MockSubscriptions.prototype._working = false;
 /** @type {number}
 * @private
 */
-MockSubscriptions.prototype._timerId = -1;
+MockSubscriptions.prototype._timerId = 0;
 
 /** @type {number}
 * @private

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

@@ -37,6 +37,8 @@ declare class ColumnGroupingPlugin extends GridPlugin {
 
     public getConfigObject(gridOptions?: any): any;
 
+    public renderGroups(): void;
+
     public addColumnToGroup(column: any, groupId: string, colIndex: number): void;
 
     public addGroup(groupDef: ColumnGroupingPlugin.GroupDefinition|null): string;
@@ -55,6 +57,8 @@ declare class ColumnGroupingPlugin extends GridPlugin {
 
     public setGroupChildren(groupId: string, newChildList: (string)[]|null): boolean;
 
+    public setGroupName(groupId: string, groupName: string): void;
+
     public getGroupChildren(groupId: string): (string)[]|null;
 
     public getChildColumnIndices(groupId: string): (number)[]|null;

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

@@ -70,6 +70,8 @@ declare class ColumnSelectionPlugin extends GridPlugin {
 
     public getActiveGrid(): any;
 
+    public dispatchSelectionChanged(): void;
+
 }
 
 export default ColumnSelectionPlugin;

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

@@ -119,6 +119,8 @@ declare class ColumnStackPlugin extends GridPlugin {
 
     public getActiveColumnField(stackId: string): string;
 
+    public getActiveColumnIndex(stackId: string): number;
+
     public addStackChild(stackId: string, colRef: number|string|null): void;
 
     public removeStackChild(stackId: string, colRef: number|string|null): void;

package/lib/types/es6/Core/grid/util/SelectionList.d.ts

@@ -12,6 +12,8 @@ declare class SelectionList {
 
     public deselect(at: number): boolean;
 
+    public deselectFrom(at: number): boolean;
+
     public toggleSelection(at: number): void;
 
     public singularlySelect(at: number): boolean;
@@ -36,13 +38,15 @@ declare class SelectionList {
 
     public getLastSelectedIndex(): number;
 
-    public getAllSelections(): (number)[]|null;
+    public getAllSelections(): (number)[];
+
+    public getConnectedRanges(from?: number|null, to?: number|null): (number)[][];
 
     public getSelectionMap(): (boolean)[]|null;
 
     public clearAllSelections(): number;
 
-    public copyFrom(srcSelections: SelectionList|null, fromSrcIndex: number, offsetIndex: number, forLength: number): void;
+    public copyFrom(srcSelections: SelectionList|null, fromSrcIndex: number, offset: number, forLength: number): void;
 
 }
 

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

@@ -39,7 +39,7 @@ declare class RowDraggingPlugin extends GridPlugin {
 
     public getConfigObject(out_obj?: any): any;
 
-    public startDrag(startRef: any, opt_suppressEvent?: boolean|null): void;
+    public startDrag(startRef?: any): void;
 
     public stopDrag(): void;
 
@@ -53,6 +53,28 @@ declare class RowDraggingPlugin extends GridPlugin {
 
     public disableUIs(disabled?: boolean|null): void;
 
+    public allowDrag(allowed?: boolean|null): void;
+
+    public allowDrop(allowed?: boolean|null): void;
+
+    public setDragContent(content: any): void;
+
+    public getDragBox(): Element|null;
+
+    public getDragSource(): string;
+
+    public isDragging(): boolean;
+
+    public disableDragging(disabled?: boolean|null): void;
+
+    public enableJETDragAndDrop(enabled?: boolean|null): void;
+
+    public getJETDragContent(): any;
+
+    public setJETDragContent(content: any): void;
+
+    public setJETDragContent(content: any): void;
+
 }
 
 export default RowDraggingPlugin;

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

@@ -4,42 +4,42 @@ import { GridPlugin } from "../../tr-grid-util/es6/GridPlugin.js";
 declare namespace StatisticsRowPlugin {
 
     type Options = {
-        rows?: any[],
-        invalidText?: string,
-        noColoring?: boolean,
-        noFormatting?: boolean,
-        postCalculation?: ((...params: any[]) => any),
-        postRendering?: ((...params: any[]) => any)
+        rows?: any[]|null,
+        invalidText?: string|null,
+        noColoring?: boolean|null,
+        noFormatting?: boolean|null,
+        postCalculation?: ((...params: any[]) => any)|null,
+        postRendering?: ((...params: any[]) => any)|null
     };
 
     type ColumnOptions = {
-        statistics?: (boolean|string)
+        statistics?: (boolean|string)|null
     };
 
     type RowOptions = {
-        placement?: string,
-        statistic?: string,
-        label?: string,
-        id?: string
+        placement?: string|null,
+        statistic?: string|null,
+        label?: string|null,
+        id?: string|null
     };
 
-    type RowReference = string|number;
+    type RowReference = string|number|null;
 
     type Stats = {
-        field?: string,
-        label?: boolean,
-        count?: number,
-        sum?: number,
-        average?: number,
-        min?: number,
-        max?: number
+        field?: string|null,
+        label?: boolean|null,
+        count?: number|null,
+        sum?: number|null,
+        average?: number|null,
+        min?: number|null,
+        max?: number|null
     };
 
 }
 
 declare class StatisticsRowPlugin extends GridPlugin {
 
-    constructor(options?: StatisticsRowPlugin.Options);
+    constructor(options?: StatisticsRowPlugin.Options|null);
 
     public getName(): string;
 
@@ -51,15 +51,15 @@ declare class StatisticsRowPlugin extends GridPlugin {
 
     public getConfigObject(gridOptions?: any): any;
 
-    public setStatisticsRows(rows: (StatisticsRowPlugin.RowOptions)[]): void;
+    public setStatisticsRows(rows: (StatisticsRowPlugin.RowOptions)[]|null): void;
 
-    public getStatisticsRows(): (StatisticsRowPlugin.RowOptions)[];
+    public getStatisticsRows(): (StatisticsRowPlugin.RowOptions)[]|null;
 
-    public setStatisticsRow(rowRef: StatisticsRowPlugin.RowReference, options: StatisticsRowPlugin.RowOptions): boolean;
+    public setStatisticsRow(rowRef: StatisticsRowPlugin.RowReference|null, options: StatisticsRowPlugin.RowOptions|null): boolean;
 
-    public addStatisticsRow(options: StatisticsRowPlugin.RowOptions): void;
+    public addStatisticsRow(options: StatisticsRowPlugin.RowOptions|null): void;
 
-    public removeStatisticsRow(rowRef: StatisticsRowPlugin.RowReference): void;
+    public removeStatisticsRow(rowRef: StatisticsRowPlugin.RowReference|null): void;
 
 }
 

package/lib/versions.json

@@ -1,5 +1,5 @@
 {
-	"tr-grid-util": "1.3.92",
+	"tr-grid-util": "1.3.95",
 	"@grid/column-dragging": "1.0.11",
 	"@grid/row-segmenting": "1.0.23",
 	"@grid/statistics-row": "1.0.14",
@@ -9,10 +9,10 @@
 	"tr-grid-checkbox": "1.0.60",
 	"tr-grid-column-fitter": "1.0.39",
 	"tr-grid-column-formatting": "0.9.34",
-	"tr-grid-column-grouping": "1.0.46",
+	"tr-grid-column-grouping": "1.0.47",
 	"tr-grid-column-resizing": "1.0.28",
 	"tr-grid-column-selection": "1.0.27",
-	"tr-grid-column-stack": "1.0.54",
+	"tr-grid-column-stack": "1.0.55",
 	"tr-grid-conditional-coloring": "1.0.58",
 	"tr-grid-content-wrap": "1.0.20",
 	"tr-grid-contextmenu": "1.0.38",

package/package.json

@@ -66,5 +66,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.32"
+	"version": "6.0.33"
 }