@refinitiv-ui/efx-grid 6.0.128 → 6.0.130

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

@@ -31,7 +31,7 @@ DataConnector.prototype._fieldChangedConflator = null;
 * @private
 */
 DataConnector.prototype._ricChangedConflator = null;
-/** @type {Object.<string, RowDefinition>}
+/** @type {Object.<string, Array.<RowDefinition>>}
 * @private
 */
 DataConnector.prototype._rowDefMap = null;

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

@@ -258,6 +258,8 @@ declare class Grid extends EventDispatcher {
 
     public hasRic(): boolean;
 
+    public getRic(rowRef?: (string|number)|null): string;
+
     public setRowData(rowRef: Grid.RowReference|null, values: any): void;
 
     public setStaticRowData(rowRef: Grid.RowReference|null, values: any): void;

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

@@ -175,6 +175,14 @@ import { ElementWrapper } from "../../core/es6/grid/components/ElementWrapper.js
 * @description Fired only when a row will be removed through Grid's API and before occurring of the actual removal
 */
 
+/** @event Grid#beforeUnlinked
+* @description Trigger before unlinking a chain row.
+* @type {Object}
+* @property {RowDefinition} chain An row definition object of a chain row.
+* @property {boolean} collapsed Collapsing state of a chain row.
+* @property {Object} ridMap A map of constituent rics and row ids used to customize row ids.
+*/
+
 /** @private
 * @param {RowDefinition} rowDef
 * @return {Object}
@@ -524,6 +532,10 @@ Grid.prototype._formulaConflator = null;
 */
 Grid.prototype._chainConflator = null;
 /** @private
+* @type {Object}
+*/
+Grid.prototype._constituentMap = null;
+/** @private
 * @type {number}
 */
 Grid.prototype._clientWidth = NaN;
@@ -605,11 +617,6 @@ Grid.prototype._topSection = true;
 * @private
 */
 Grid.prototype._focusingArgs = null;
-/** @type {boolean}
-* @private
-*/
-Grid.prototype._unlinking = false;
-
 
 /** @public
 */
@@ -2694,6 +2701,7 @@ Grid.prototype.removeAllRows = function() {
 	this._dcConflator.reset();
 	this._formulaConflator.reset();
 	this._chainConflator.reset();
+	this._constituentMap = null;
 	this._connector.removeAllRics();
 
 	// TODO: This logic should also be in the core grid
@@ -2837,13 +2845,41 @@ Grid.prototype.unlinkChain = function(rowRef) {
 		return;
 	}
 
-	this._unlinking = true;
-
 	let childRowDefs = rowDef.getDescendants(); // TODO: Support nested child
 	if(childRowDefs) {
-		if(rowDef.isChainExpanded()) {
-			for(let i = 0; i < childRowDefs.length; i++) {
-				childRowDefs[i].toRealTimeRow();
+		let len = childRowDefs.length;
+		let ridMap = {};
+		for(let i = 0; i < len; i++) {
+			ridMap[childRowDefs[i].getRic()] = "";
+		}
+		let collapsed = rowDef.isChainCollapsed();
+		let args = {
+			chain: rowDef,
+			collapsed: collapsed,
+			ridMap: ridMap
+		};
+		this._dispatch("beforeUnlinked", args);
+
+		if(!collapsed) {
+			let rowIdChanged = false;
+			let ridPair = {};
+			for(let i = 0; i < len; i++) {
+				let childRowDef = childRowDefs[i];
+				let mappedRowId = ridMap[childRowDef.getRic()];
+				if(mappedRowId) {
+					if(mappedRowId.match(RowDefinition.ROW_ID_PATTERN)) {
+						console.warn("Please change the rowId format to avoid duplicated rows' id causing unexpected behavior.");
+						mappedRowId = "";
+					} else {
+						rowIdChanged = true;
+						ridPair[childRowDef.getRowId()] = mappedRowId;
+					}
+				}
+				childRowDef.toRealTimeRow(mappedRowId);
+			}
+			if(rowIdChanged) {
+				this._dc.replaceRowIds(ridPair);
+				this._dt.replaceRowIds(ridPair);
 			}
 		} else {
 			this._removeConstituentRows(childRowDefs);
@@ -2851,8 +2887,6 @@ Grid.prototype.unlinkChain = function(rowRef) {
 	}
 
 	rowDef.unlinkChain();
-
-	this._unlinking = false;
 };
 
 /** Alias to setRic
@@ -3166,6 +3200,15 @@ Grid.prototype.getAllRics = function() {
 Grid.prototype.hasRic = function() {
 	return this._connector.hasRic();
 };
+/** Returns RIC of given row reference.
+* @public
+* @param {(string|number)=} rowRef
+* @return {string}
+*/
+Grid.prototype.getRic = function(rowRef) {
+	let rowDef = this.getRowDefinition(rowRef);
+	return rowDef.getRic();
+};
 /** A shorthand to set row data based on index of the specified row. It is better to keep rowDefinition object for updating data directly as row index can be changed by sorting and filtering.
 * @public
 * @param {Grid~RowReference} rowRef
@@ -3593,15 +3636,15 @@ Grid.prototype._onQuote2PostUpdate = function (e) {
 * @param {Object} e
  */
 Grid.prototype._onQ2DataChanged = function (e) {
-	let subId = e["subId"];
-	let rowDef = this._getRowDefinitionById(subId);
+	let rowDef = this._getRowDefinitionById(e["subId"]);
 	if(!rowDef) {
 		return; // WARNING: This should not be happened because row has been removed but the data is still received
 	}
 
+	let ric = e["ric"];
 	let values = e["values"];
 	if (values) {
-		let ric = e["ric"];
+		let duplicateRics = null;
 		if(rowDef.verifyConstituent(ric)) {
 			let parentDef = rowDef;
 			let childDef = parentDef.getConstituent(ric);
@@ -3612,15 +3655,28 @@ Grid.prototype._onQ2DataChanged = function (e) {
 				if(!childDef) {
 					return; // Parent chain is not alive
 				}
+				duplicateRics = this._connector.getRowDefByRic(ric);
 				this._connector.addRic(childDef); // TODO: JET/RTK should not re-subscribe this
+				if(!this._constituentMap) {
+					this._constituentMap = {};
+				}
+				this._constituentMap[childDef.getRowId()] = childDef;
 				this._registerConstituents(childDef);
 			}
 		}
 
+		if(duplicateRics && duplicateRics.length) {
+			let duplicateRic = duplicateRics[0];
+			duplicateRic.cloneRowData(values, values);
+		}
+
 		rowDef.setRowData(values); // Trigger data changes
-	} else if(rowDef.isConstituent()) { // Subscription and its parent has been removed by Real-time provider
-		rowDef.setParent(null); // Manually remove child reference from its parent
-		this._removeRow(rowDef);
+	} else { // The constituent is requested to be removed by the real-time data provider
+		let childDef = rowDef.getConstituent(ric); // WARNING: normal ric and its delayed version must match with the one first given
+		if(childDef) {
+			childDef.setParent(null); // Manually remove child reference from its parent
+			this._removeRow(childDef);
+		}
 	}
 };
 
@@ -3631,6 +3687,9 @@ Grid.prototype._registerConstituents = function(rowDef) {
 	if(this._chainConflator.conflate(rowDef)) {
 		return;
 	}
+
+	this._constituentMap = null;
+
 	let view = this._dv;
 	let dt = view ? view.getDataSource() : null;
 	if(!dt) {
@@ -3940,14 +3999,21 @@ Grid.prototype._onDataComposed = function(e) {
 		return; // Cannot do data composition if there is no change in data
 	}
 
-	let rowData = e["rowData"];
-	if(!rowData) {
+	if(!e["rowData"]) {
 		return; // Row could already be removed or global change event is sent
 	}
 
-	let rowDef = this._getRowDefinitionById(e["rid"]);
+	let rowId = e["rid"];
+	let rowDef = this._getRowDefinitionById(rowId);
 	if(!rowDef) {
-		return; // Somehow the given row id is invalid
+		rowDef = this._constituentMap ? this._constituentMap[rowId] : null; // Row def could be in pending for adding to view
+		if(!rowDef) {
+			return; // Somehow the given row id is invalid
+		}
+		if(rowDef.isDisposed()) {
+			this._constituentMap[rowId] = null;
+			return;
+		}
 	}
 
 	if(this._autoDateConversion) { // auto data conversion
@@ -4521,7 +4587,8 @@ Grid.prototype._onTabNavigation = function(e) {
 */
 Grid.prototype._getEventHandlers = function() {
 	return {
-		"tabNavigation": this._onTabNavigation
+		"tabNavigation": this._onTabNavigation,
+		"q2DataChanged": this._onQ2DataChanged
 	};
 };
 

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

@@ -102,7 +102,7 @@ declare class RowDefinition {
 
     public subscribeForUpdates(subs?: any): boolean;
 
-    public unsubscribeForUpdates(): null;
+    public unsubscribeForUpdates(keepData?: boolean|null): null;
 
     public isSubscribing(): boolean;
 

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

@@ -48,12 +48,6 @@ const ROW_TYPES = {
 	GROUP_MEMBER: "GROUP_MEMBER"
 };
 
-/** @type {RegExp}
-* @private
-* @const
-*/
-const ROW_ID_PATTERN = /^_[^_]+_$/;
-
 /** @private
 * @function
 * @param {Object} obj
@@ -98,6 +92,11 @@ RowDefinition._runningId = 0;
 * @private
 */
 RowDefinition._childDataField = "CHILD_VALUES";
+/** @type {RegExp}
+* @private
+* @const
+*/
+RowDefinition.ROW_ID_PATTERN = /^_[^_]+_$/;
 //#region Private Members
 /** @type {string}
 * @private
@@ -253,7 +252,7 @@ RowDefinition.prototype.initialize = function(rowOptions) {
 	if(!this._autoGenerated) {
 		let userRowId = rowOptions["rowId"];
 		if(userRowId && typeof userRowId === "string") {
-			if(userRowId.match(ROW_ID_PATTERN)) {
+			if(userRowId.match(RowDefinition.ROW_ID_PATTERN)) {
 				console.warn("Please change the rowId format to avoid duplicated rows' id causing unexpected behavior.");
 			} else {
 				this._rowId = userRowId;
@@ -904,12 +903,7 @@ RowDefinition.prototype.isRealTimeRow = function() {
 * @return {boolean} If a subscription is made, return true.
 */
 RowDefinition.prototype.subscribeForUpdates = function(subs) {
-	if(subs) {
-		this._subs = subs;
-	} else {
-		subs = this._subs;
-	}
-	if(!subs) {
+	if(!(subs  || this._subs)) {
 		return false;
 	}
 	if(!this.isRealTimeRow() && !this.getPermId()) {
@@ -917,7 +911,11 @@ RowDefinition.prototype.subscribeForUpdates = function(subs) {
 	}
 	// TODO: Check if the same subscription is being made.
 	this.unsubscribeForUpdates();
-
+	if(subs) {
+		this._subs = subs;
+	} else {
+		subs = this._subs;
+	}
 	if(this.isChain()) {
 		let symbol = this._chainRic;
 		if(!symbol){
@@ -941,14 +939,17 @@ RowDefinition.prototype.subscribeForUpdates = function(subs) {
 };
 /** Unsubscribe existing real-time data service. Static data is maintained
 * @public
+* @param {boolean=} keepData
 * @returns {null} Always return null
 */
-RowDefinition.prototype.unsubscribeForUpdates = function() {
+RowDefinition.prototype.unsubscribeForUpdates = function(keepData) {
 	if(this.isSubscribing()) { // Only normal real-time rows and chains have both subId and subscription object
 		this._subs["removeSubscription"](this._subId);
 		this._subId = "";
-		this.resetUpdates();
-		this.resetRowData(); // Real-time data is removed while static data is maintained
+		if(!keepData) {
+			this.resetUpdates();
+			this.resetRowData(); // Real-time data is removed while static data is maintained
+		}
 	}
 	return null;
 };
@@ -1167,8 +1168,9 @@ RowDefinition.prototype.addConstituent = function(ric) {
 /** Used to convert autogenerated row to regular real-time row
 * @public
 * @ignore
+* @param {string=} userRowId
 */
-RowDefinition.prototype.toRealTimeRow = function() {
+RowDefinition.prototype.toRealTimeRow = function(userRowId) {
 	if(!this.isConstituent()) {
 		return; // Only a constituent can be converted to a real-time row
 	}
@@ -1179,7 +1181,11 @@ RowDefinition.prototype.toRealTimeRow = function() {
 	this._parent = null;
 	this._depthLevel = 0;
 
-	this.resetRowData(); // WARNING: existing real-time data is lost after this line
+	if(userRowId) {
+		this._rowId = userRowId;
+		this._userId = true;
+	}
+
 	this.subscribeForUpdates(subs); // Static data remains intact
 };
 
@@ -1190,7 +1196,7 @@ RowDefinition.prototype.unlinkChain = function() {
 		return;
 	}
 
-	this.unsubscribeForUpdates(); // Static data remains intact
+	this.unsubscribeForUpdates(true); // Static data remains intact
 
 	let view = this._view;
 	if(view) {

package/lib/tr-grid-cell-selection/es6/CellSelection.d.ts

@@ -2,7 +2,7 @@ import { Ext } from "../../tr-grid-util/es6/Ext.js";
 import { GridPlugin } from "../../tr-grid-util/es6/GridPlugin.js";
 import { MouseDownTrait } from "../../tr-grid-util/es6/MouseDownTrait.js";
 import { EventDispatcher } from "../../tr-grid-util/es6/EventDispatcher.js";
-import { isIE, cloneObject, prepareTSVContent } from "../../tr-grid-util/es6/Util.js";
+import { cloneObject, prepareTSVContent } from "../../tr-grid-util/es6/Util.js";
 import { ElfUtil } from "../../tr-grid-util/es6/ElfUtil.js";
 import { injectCss, prettifyCss } from "../../tr-grid-util/es6/Util.js";
 
@@ -16,7 +16,8 @@ declare namespace CellSelectionPlugin {
         selectionChanged?: ((...params: any[]) => any)|null,
         copy?: ((...params: any[]) => any)|null,
         beforeMouseDown?: ((...params: any[]) => any)|null,
-        selectableSections?: any[]|null
+        selectableSections?: any[]|null,
+        copyDisabled?: boolean|null
     };
 
 }