@refinitiv-ui/efx-grid 6.0.36 → 6.0.37

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

@@ -14,40 +14,6 @@ var SYNAPSE_URL =
 	+ 'hits=1' // search only 1 result
 	+ '&profile=' + encodeURIComponent('Field Selector');
 
-/** @function
-* @private
-* @param {Object} e
-*/
-function xRicNameRenderer(e) {
-	e.cell.setContent(e.rowDef.getDisplayText());
-}
-/** @function
-* @private
-* @param {RowDefinition} rowA
-* @param {RowDefinition} rowB
-* @param {number} order
-* @returns {number}
-*/
-function xRicNameSorter(rowA, rowB, order) {
-	var A = rowA.getDisplayText();
-	var B = rowB.getDisplayText();
-	if(A === B) {
-		return 0;
-	}
-	if(!A) {
-		return 1;
-	}
-	if(!B) {
-		return -1;
-	}
-	if(A < B) {
-		return -order;
-	}
-
-	return order;
-}
-
-
 /* @namespace */
 var FieldDefinition = {};
 
@@ -55,13 +21,6 @@ var FieldDefinition = {};
 * @private
 */
 FieldDefinition._defs = {
-	"X_RIC_NAME": {
-		name: "RIC",
-		IsRealtimeField: false,
-		width: 100,
-		binding: xRicNameRenderer,
-		sortLogic: xRicNameSorter
-	},
 	"CF_NAME": {
 		name: "Name",
 		rank: 2800003,

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

@@ -37,7 +37,7 @@ declare class RowDefinition {
 
     public initialize(rowOptions?: RowDefinition.Options|null): void;
 
-    public setContent(userInput: string, permId?: string|null): boolean;
+    public setContent(userInput: string, permId?: string|null, asChain?: boolean|null, expanded?: boolean|null, realTime?: boolean|null): boolean;
 
     public getRowId(): string;
 
@@ -143,7 +143,7 @@ declare const ROW_DEF: string;
 
 declare const ROW_TYPES: RowDefinition.RowTypes;
 
-declare function rowData(userInput: string, permId?: string|null): boolean;
+declare function rowData(userInput: string, permId?: string|null, asChain?: boolean|null, expanded?: boolean|null, realTime?: boolean|null): boolean;
 
 export {RowDefinition, ROW_DEF, ROW_TYPES};
 export default RowDefinition;

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

@@ -12,9 +12,10 @@ import { DataTable } from "../../core/es6/data/DataTable.js";
 * @property {Array.<string>=} fields=null Field that corresponds to the given static values
 * @property {boolean=} asChain=false The given ric will be treated as a chain
 * @property {string=} chainRic="" RIC to be used for chain request (overiding ric property)
-* @property {boolean=} collapsed=false Chain is expanded by default
+* @property {boolean=} collapsed=true Chain is collapsed by default
 * @property {(string|null)=} label=null
 * @property {boolean=} hidden=true When this row is hidden
+* @pro // realTime
 */
 
 /** @typedef {Object} RowDefinition~RowTypes
@@ -90,18 +91,18 @@ RowDefinition.prototype._ric = ""; // Contains no 0#
 * @private
 */
 RowDefinition.prototype._permId = "";
-/** @type {string}
-* @private
-*/
-RowDefinition.prototype._displayText = "";
 /** @type {string|null}
 * @private
 */
 RowDefinition.prototype._label = null; // Label overrides _ric and _displayText
+/** @type {boolean|null}
+* @private
+*/
+RowDefinition.prototype._isChain = null;
 /** @type {boolean}
 * @private
 */
-RowDefinition.prototype._isChain = false;
+RowDefinition.prototype._realTime = true;
 
 /** @type {string}
 * @private
@@ -125,10 +126,10 @@ RowDefinition.prototype._view = null;
 */
 RowDefinition.prototype._subId = "";
 
-/** @type {boolean}
+/** @type {boolean|null}
 * @private
 */
-RowDefinition.prototype._expanded = false;
+RowDefinition.prototype._expanded = null;
 /** @type {boolean}
 * @private
 */
@@ -216,18 +217,19 @@ RowDefinition.prototype.initialize = function(rowOptions) {
 		return;
 	}
 
-	var val = rowOptions["ric"];
+	var val = rowOptions["permId"];
 	if(val != null) {
-		this._ric = val;
+		this._permId = val;
 	}
-	val = rowOptions["permId"];
+	val = rowOptions["ric"];
 	if(val != null) {
-		this._permId = val;
+		this._ric = val;
 	}
-	if(this._ric || this._permId){
-		this.setContent(this._ric, this._permId); // this._dataId is modified
+	val = rowOptions["label"];
+	// eslint-disable-next-line no-undefined
+	if(val !== undefined) { // Empty string and null are allowed
+		this._label = val;
 	}
-
 	val = rowOptions["chainRic"];
 	if(val != null) {
 		this._chainRic = val;
@@ -239,26 +241,40 @@ RowDefinition.prototype.initialize = function(rowOptions) {
 	}
 
 	val = rowOptions["asChain"];
-	if(val) {
-		this._isChain = true;
-		this._expanded = !rowOptions["collapsed"];
-	} else if(this._isChain) {
-		var collapsed = rowOptions["collapsed"];
-		if(collapsed != null) {
-			this._expanded = !collapsed;
-		}
+	if(val !== null) {
+		this._isChain = val;
 	}
 
-	val = rowOptions["label"];
-	// eslint-disable-next-line no-undefined
-	if(val !== undefined) { // Empty string and null are allowed
-		this._label = val;
+	val = rowOptions["realTime"];
+	if(val != null) {
+		this._realTime = val;
 	}
 
+	val = rowOptions["collapsed"];
+	if(val != null){
+		this._expanded = !val;
+	}
 	val = rowOptions["keepModel"];
 	if(val) {
 		this._userModel = rowOptions;
 	}
+
+	var expanded = this._expanded;
+	var symbol = this._ric || this._chainRic;
+	var asChain = rowOptions["asChain"] || !!this._chainRic;
+	if(this._ric && this._ric.indexOf("0#") >= 0){
+		asChain = true;
+		expanded = true;
+	}
+	if(rowOptions["asChain"] === false){
+		asChain = false;
+	}
+	if(rowOptions["collapsed"] === true){
+		expanded = false;
+	}
+	if(symbol || this._permId){
+		this.setContent(symbol, this._permId, asChain, expanded); // this._dataId is modified
+	}
 };
 /** @private
 * @param {!Object} rowOptions
@@ -268,7 +284,6 @@ RowDefinition.prototype._initializeAsConstituent = function(rowOptions) {
 	var parentDef = /** @type{RowDefinition} */(rowOptions["parent"]);
 	if(this.setParent(parentDef)) {
 		this._dataId = /** @type{string} */(rowOptions["dataId"]); // Constituent will have the same subId as its parent but with different ric
-		this._displayText = this._ric = /** @type{string} */(rowOptions["ric"]);
 
 		this._dc = parentDef._dc; // Parent chain must have data cache
 		if(this._dc) {
@@ -287,9 +302,12 @@ RowDefinition.prototype._initializeAsConstituent = function(rowOptions) {
 /** @public
 * @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 {boolean=} realTime
 * @return {boolean} True if there is any change otherwise false
 */
-RowDefinition.prototype.setContent = function(userInput, permId) {
+RowDefinition.prototype.setContent = function(userInput, permId, asChain, expanded) {
 	if(this._autoGenerated) { // AutoGenerated RowDefinition cannot be changed by user input
 		return false;
 	}
@@ -303,10 +321,7 @@ RowDefinition.prototype.setContent = function(userInput, permId) {
 	var dirty = (this._userInput !== userInput);
 	if(this._permId !== permId){
 		this._permId = permId || "";
-		if(!userInput){
-			this._displayText = this._permId;
-			dirty = true;
-		}
+		dirty = true;
 	}
 	if(!dirty) {
 		return false;
@@ -315,34 +330,44 @@ RowDefinition.prototype.setContent = function(userInput, permId) {
 	this.unsubscribeForUpdates();
 	this.resetUpdates(); // Remove all previous data updates because a new content is just entered
 
+	// TODO: handle changing between chain and ric row
 	this._userInput = userInput;
 	if(this._userInput.charAt(0) === "'") { // This is a row header
-		this._displayText = this._userInput.substr(1);
 		this._ric = this._chainRic = ""; // No ric for realtime request
 	} else {
 		if(this._userInput.indexOf("0#") >= 0) {
-			this._ric = this._userInput.replace("0#", "");
-			this._isChain = this._expanded = true; // Only chain can be expanded by 0# TODO: RIC with 0# is not necessarily a chain
-			this._chainRic = this._userInput;
-			if(this._view) {
-				this._view.setSegmentSeparator(this._rowId);
-				this.expandChain();
+			if(asChain === false){
+				this._ric = this._userInput;
+			} else {
+				this._ric = expanded ? this._userInput.replace("0#", "") : this._userInput;
+				this._expanded = expanded;
+				this._isChain = true; // Only chain can be expanded by 0#
+				this._chainRic = this._userInput;
+				if(this._view) {
+					this._view.setSegmentSeparator(this._rowId);
+					this.expandChain();
+				}
 			}
 		} else {
 			this._ric = this._userInput;
-			this._chainRic = "";
+			if(asChain){
+				this._isChain = true;
+			}
 		}
-		this._displayText = this._ric; // No 0#
 	}
 
 	this._dataId = this._rowId + this.getSymbol(); // JET/RTK will generate data id to be rowId (given from this rowDef) + ric;
 
-	// This will work for runtime ric modification, but not for first initilization.
+
 	if(!this.subscribeForUpdates()) {
-		// Avoid losing the ROW_DEF pointer.
-		var rowData = {};
-		rowData[ROW_DEF] = this; // Enable tracking back and updating data
-		this.setRowData(rowData);
+		if(this._dc) {
+			// This will work for runtime ric modification, but not for first initilization.
+			// Avoid losing the ROW_DEF pointer.
+			var rowData = {};
+			rowData[ROW_DEF] = this; // Enable tracking back and updating data
+			rowData["X_RIC_NAME"] = this.getDisplayText();
+			this.setRowData(rowData);
+		}
 	}
 	return true;
 };
@@ -363,6 +388,16 @@ RowDefinition.prototype.getConfigObject = function(rowOptions) {
 		obj["ric"] = val;
 	}
 
+	// The user passed a single quote (') case
+	if(!this._ric && this._userInput.charAt(0) === "'") {
+		obj["ric"] = this._userInput;
+	}
+
+	val = this._realTime;
+	if(val !== true) {
+		obj["realTime"] = val;
+	}
+
 	val = this._permId;
 	if(val) {
 		obj["permId"] = val;
@@ -384,12 +419,12 @@ RowDefinition.prototype.getConfigObject = function(rowOptions) {
 	}
 
 	val = this._isChain;
-	if(val) {
+	if(val != null) {
 		obj["asChain"] = val;
 	}
 
 	val = this._expanded;
-	if(val) {
+	if(val != null) {
 		obj["collapsed"] = !val;
 	}
 
@@ -487,6 +522,7 @@ RowDefinition.prototype.setDataSource = function(dataSource) {
 	if(!rowData) {
 		rowData = {};
 		rowData[ROW_DEF] = this; // Enable tracking back and updating data
+		rowData["X_RIC_NAME"] = this.getDisplayText();
 		this.setRowData(rowData); // TODO: This will dispatch dataChanged event and caused update to be added, which should not happen
 	}
 
@@ -629,7 +665,16 @@ RowDefinition.prototype.getDisplayText = function() {
 	if(this._label != null) { // Empty string is allowed
 		return this._label;
 	}
-	return this._displayText;
+
+	if(this._ric) {
+		return this._ric;
+	}
+
+	if(this._permId) {
+		return this._permId;
+	}
+
+	return this._userInput;
 };
 /** @public
 * @return {string|null}
@@ -693,13 +738,18 @@ RowDefinition.prototype.isRealTimeRow = function() {
 	if(!this.getRic()) { // Empty row
 		return false;
 	}
-	if(this.isRowHeader()) {
+	if(!this._realTime) {
 		return false;
 	}
+
 	if(this._autoGenerated) { // Constituents in chain are not real-time row
 		return false;
 	}
 
+	if(this.isRowHeader()) {
+		return false;
+	}
+
 	return true;
 };
 
@@ -728,7 +778,7 @@ RowDefinition.prototype.subscribeForUpdates = function() {
 	if(prevRowData) {
 		this._dc.setRowData(this._dataId, prevRowData); // TODO: We may need to create a new object instead of prevRowData for data correctness
 	} else {
-		this._dc.setRowData(this._dataId, {"X_RIC_NAME": this.getSymbol(), "ROW_DEF": this}); // Trigger data update immediately
+		this._dc.setRowData(this._dataId, {"X_RIC_NAME": this.getDisplayText(), "ROW_DEF": this}); // Trigger data update immediately
 	}
 	return true;
 };

package/lib/tr-grid-column-stack/es6/ColumnStack.js

@@ -44,7 +44,7 @@ import { preventDefault } from "../../tr-grid-util/es6/EventDispatcher.js";
 * @description Available options describing grouped column displaying
 * @property {boolean=} spreading=false If specified true, this group will be running in collapsing mode
 * @property {boolean=} collapsed=true If disabled, this group will be expanded at the first time
-* @property {string=} activeColumn="" Column index or field for set as active column
+* @property {string=} activeColumn="" Column index, column id, or field for set as active column
 */
 
 /** @event ColumnStackPlugin#clicked
@@ -95,6 +95,7 @@ var _resolveActiveColumn = function(stackOpt) {
 		var children = stackOpt.children;
 		if(children && children.length) {
 			var activeColumn = stackOpt.activeColumn;
+			// TODO: If columns are stored as column id and activeColumn is a field, active index could not be found
 			if(!activeColumn || children.indexOf(activeColumn) < 0) {
 				stackOpt.activeColumn = stackOpt.spreading ? children[children.length - 1] : children[0];
 				return true;
@@ -547,6 +548,34 @@ ColumnStackPlugin.prototype._getSelectedColumns = function() {
 	var csp = this._getPlugin("ColumnSelectionPlugin");
 	return (csp && csp.isEnabled()) ? csp.getSelectedColumns() : [];
 };
+/** Hide the specified column to prevent it from flashing when it is added as a member of the stack
+* @private
+* @param {Object} stack
+* @param {(number|Array.<number>)=} colRefs
+* @param {number=} activeRef
+*/
+ColumnStackPlugin.prototype._hideStackedColumns = function(stack, colRefs, activeRef) {
+	if(stack.spreading && !stack.collapsed) {
+		return; // In spreading mode, columns in an expanded stack don't need to be hiden
+	}
+	// WARNING: activeIndex may not be valid
+	var activeIndex = (typeof activeRef === "number") ? activeRef : this.getColumnIndex(stack.activeColumn);
+	var colIndices = null;
+	if(typeof colRefs === "number") {
+		colIndices = [colRefs];
+	} else if(colIndices == null) {
+		colIndices = this.getColumnIndices(stack.children);
+	} else {
+		colIndices = colRefs;
+	}
+	var validCount = colIndices.length;
+	for(var i = 0; i < validCount; ++i) {
+		var colIndex = colIndices[i];
+		if(colIndex !== activeIndex) {
+			this._setColumnVisibility(colIndex, false); // Hide a column
+		}
+	}
+};
 /** @private
 * @param {number} colIndex
 * @param {boolean} shown
@@ -1009,20 +1038,28 @@ ColumnStackPlugin.prototype.stackColumns = function(colRefs, stackId, options) {
 		return false;
 	}
 
+	// TODO: If columns are stored as column id and activeColumn is a field, active index could not be found
 	stack.children = children;
-	_resolveActiveColumn(stack); // stack.activeColumn may be modified here
-	var activeIndex = this.getColumnIndex(stack.activeColumn);
-
-	// Hide the column to prevent it from flashing in stack mode
-	if(!isSpreading || !isCollapsed) {
-		for(i = 0; i < validCount; ++i) {
-			var colIndex = colIndices[i];
-			if(colIndex !== activeIndex) {
-				this._setColumnVisibility(colIndex, false); // Hide a column
+	var activeIndex = -1;
+	if(activeColumn && typeof activeColumn === "string") {
+		activeIndex = this.getColumnIndex(activeColumn);
+		if(children.indexOf(activeColumn) < 0) { // children and activeColumn may have different type
+			var field = this._getField(activeIndex);
+			if(field === activeColumn) {
+				stack.activeColumn = activeColumn = this.getColumnId(activeIndex);
 			}
 		}
+	} else if(typeof activeColumn === "number"){
+		activeIndex = activeColumn;
 	}
 
+	if(_resolveActiveColumn(stack)) {
+		activeColumn = stack.activeColumn;
+		activeIndex = this.getColumnIndex(activeColumn);
+	}
+
+	this._hideStackedColumns(stack, colIndices, activeIndex);
+
 	// Make sure that all columns stay packed together
 	this.reorderColumns(colIndices, colIndices[0]);
 
@@ -1376,11 +1413,14 @@ ColumnStackPlugin.prototype._onBeforeBatchOperation = function (e) {
 ColumnStackPlugin.prototype._onAfterBatchOperation = function (e) {
 	if(e.batchType === "reset") {
 		this._inResetting = false;
-		// TODO: Re-packing each stack
+		// TODO: Revalidate members in stacks
+		// TODO: Reposition members and stacks
 		var groups = this._groupDefs.getGroups();
 		var groupCount = groups.length;
 		for(var i = 0; i < groupCount; ++i) {
-			this._updateActiveColumn(groups[i]);
+			var group = groups[i];
+			this._updateActiveColumn(group);
+			this._hideStackedColumns(group);
 		}
 	} else if(e.batchType === "move") {
 		this._inReordering = false;
@@ -1410,13 +1450,7 @@ ColumnStackPlugin.prototype._isWithinStack = function (colIndex) {
 ColumnStackPlugin.prototype._addRefToStack = function (stackOption, colIndex) {
 	var colId = this._toIdOrField(colIndex);
 
-	// Hide the column to prevent it from flashing in stack mode
-	if(!stackOption.spreading || !stackOption.collapsed) {
-		var activeIndex = this.getColumnIndex(stackOption.activeColumn);
-		if(colIndex >= 0 && colIndex !== activeIndex) {
-			this._setColumnVisibility(colIndex, false); // Hide a column
-		}
-	}
+	this._hideStackedColumns(stackOption, colIndex);
 
 	// Find a position to be placed in the stack
 	var rightColRef = this._toIdOrField(colIndex + 1);
@@ -1631,14 +1665,7 @@ ColumnStackPlugin.prototype.addColumnToStack = function(colRef, stackId) {
 		return;
 	}
 
-	// Hide the column to prevent it from flashing in stack mode
-	if(!stack.spreading || !stack.collapsed) {
-		var activeIndex = this.getColumnIndex(stack.activeColumn);
-		var colIndex = this.getColumnIndex(colId);
-		if(colIndex >= 0 && colIndex !== activeIndex) {
-			this._setColumnVisibility(colIndex, false); // Hide a column
-		}
-	}
+	this._hideStackedColumns(stack, this.getColumnIndex(colId));
 
 	// apply stacking
 	this._groupDefs.addGroupChild(stackId, colId);

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

@@ -556,6 +556,13 @@ MockSubscriptions.prototype._generateQuoteData = function(sub, fields) {
 		values[field] = data.value;
 		values[formattedField] = data.formattedValue;
 	}
+
+	// The delay symbol for X_RIC_NAME will depend on the INDICATOR field.
+	if(values["X_RIC_NAME"] != null && values["INDICATOR"] != null) {
+		if(values["INDICATOR"] > 0) {
+			values["X_RIC_NAME"] = "/" + values["X_RIC_NAME"];
+		}
+	}
 	return values;
 };
 

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

@@ -3,6 +3,7 @@ import { GridPlugin } from "../../tr-grid-util/es6/GridPlugin.js";
 import { Conflator } from "../../tr-grid-util/es6/Conflator.js";
 import { Icon } from "../../tr-grid-util/es6/Icon.js";
 import { ElfUtil } from "../../tr-grid-util/es6/ElfUtil.js";
+import { GroupDefinitions } from "../../tr-grid-util/es6/GroupDefinitions.js";
 import { Dom } from "../../tr-grid-util/es6/Dom.js";
 import { injectCss, prettifyCss } from "../../tr-grid-util/es6/Util.js";
 import { preventDefault } from "../../tr-grid-util/es6/EventDispatcher.js";

package/lib/types/es6/Core/grid/LayoutGrid.d.ts

@@ -26,7 +26,11 @@ declare class LayoutGrid extends ElementWrapper {
 
     public setCellBounds(colIndex: number, rowIndex: number, width: number, height: number): void;
 
+    public updateColumnSeparators(): void;
+
 }
 
+declare function rgtPx(): void;
+
 export default LayoutGrid;
 export { LayoutGrid };

package/lib/types/es6/RealtimeGrid/RowDefinition.d.ts

@@ -37,7 +37,7 @@ declare class RowDefinition {
 
     public initialize(rowOptions?: RowDefinition.Options|null): void;
 
-    public setContent(userInput: string, permId?: string|null): boolean;
+    public setContent(userInput: string, permId?: string|null, asChain?: boolean|null, expanded?: boolean|null): boolean;
 
     public getRowId(): string;
 
@@ -143,7 +143,7 @@ declare const ROW_DEF: string;
 
 declare const ROW_TYPES: RowDefinition.RowTypes;
 
-declare function rowData(userInput: string, permId?: string|null): boolean;
+declare function rowData(userInput: string, permId?: string|null, asChain?: boolean|null, expanded?: boolean|null): boolean;
 
 export {RowDefinition, ROW_DEF, ROW_TYPES};
 export default RowDefinition;

package/lib/versions.json

@@ -1,5 +1,5 @@
 {
-	"tr-grid-util": "1.3.103",
+	"tr-grid-util": "1.3.104",
 	"@grid/column-dragging": "1.0.13",
 	"@grid/row-segmenting": "1.0.23",
 	"@grid/statistics-row": "1.0.14",
@@ -12,7 +12,7 @@
 	"tr-grid-column-grouping": "1.0.47",
 	"tr-grid-column-resizing": "1.0.28",
 	"tr-grid-column-selection": "1.0.28",
-	"tr-grid-column-stack": "1.0.58",
+	"tr-grid-column-stack": "1.0.59",
 	"tr-grid-conditional-coloring": "1.0.61",
 	"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.36"
+	"version": "6.0.37"
 }