@refinitiv-ui/efx-grid 6.0.29 → 6.0.30

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

@@ -91,6 +91,8 @@ declare class ColumnDefinition {
 
     public isTimeSeries(): boolean;
 
+    public isTimeSeriesChild(): boolean;
+
     public isFormulaField(): boolean;
 
     public static isFormulaField(field: string): boolean;

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

@@ -590,6 +590,12 @@ ColumnDefinition.prototype.isTimeSeries = function() {
 /** @public
 * @return {boolean}
 */
+ColumnDefinition.prototype.isTimeSeriesChild = function() {
+	return FieldDefinition.isTimeSeriesChild(this.getField());
+};
+/** @public
+* @return {boolean}
+*/
 ColumnDefinition.prototype.isFormulaField = function() {
 	return this._formula ? true : false;
 };

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

@@ -20,12 +20,16 @@ declare namespace FieldDefinition {
 
     function setFieldCaching(caching: boolean): void;
 
+    function disableTimeSeriesExpansion(disabled: boolean): void;
+
     function isFormula(field: string): boolean;
 
     function isAdc(field: string): boolean;
 
     function isRealTimeField(field: string): boolean;
 
+    function isTimeSeriesChild(field: string): boolean;
+
     function isTimeSeries(field: string): boolean;
 
 }

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

@@ -182,6 +182,11 @@ FieldDefinition._lang = 'en';
 * @private
 */
 FieldDefinition._caching = false;
+/**
+* @type {boolean}
+* @private
+*/
+FieldDefinition._timeSeriesExpansion = true;
 
 /**
  * @type {Object.<string, boolean>}
@@ -269,6 +274,14 @@ FieldDefinition.setFieldCaching = function (caching) {
 	FieldDefinition._caching = caching;
 };
 
+/** @public
+* @function
+* @param {boolean} disabled=true if disable it, time series will not be expand
+*/
+FieldDefinition.disableTimeSeriesExpansion = function(disabled) {
+	FieldDefinition._timeSeriesExpansion = disabled != false ? false : true;
+};
+
 /** @public
 * @param {string} field
 * @return {boolean}
@@ -301,7 +314,7 @@ FieldDefinition.isRealTimeField = function(field) {
 		return false;
 	}
 
-	if(FieldDefinition.getFieldProperty(field, "timeSeriesChild")) {
+	if(FieldDefinition.isTimeSeriesChild(field)) {
 		return false;
 	}
 
@@ -312,6 +325,14 @@ FieldDefinition.isRealTimeField = function(field) {
 	return FieldDefinition.getFieldProperty(field, "IsRealtimeField") !== false;
 };
 
+/** @public
+* @param {string} field
+* @return {boolean}
+*/
+FieldDefinition.isTimeSeriesChild = function(field) {
+	return FieldDefinition.getFieldProperty(field, "timeSeriesChild") ? true : false;
+};
+
 /** @public
 * @param {string} field
 * @return {boolean}=true if field is time series field
@@ -321,6 +342,11 @@ FieldDefinition.isTimeSeries = function (field) {
 		return false;
 	}
 
+	// If we disable time series expansion, the grid won't have a time series field.
+	if(!FieldDefinition._timeSeriesExpansion) {
+		return false;
+	}
+
 	// We can check time series using a cache to avoid duplicating checks in regular expressions.
 	var timeSeriesField = FieldDefinition.getFieldProperty(field, "timeSeries");
 	if (timeSeriesField != null) {

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

@@ -81,6 +81,7 @@ declare namespace Grid {
         formulaEngine?: boolean|null,
         adcPollingInterval?: number|null,
         fieldCaching?: boolean|null,
+        timeSeriesExpansion?: boolean|null,
         childDataField?: string|null,
         topSection?: boolean|null
     };

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

@@ -84,6 +84,7 @@ import { ElementWrapper } from "../../core/es6/grid/components/ElementWrapper.js
 * @property {boolean=} formulaEngine=false If enabled, field with leading equal sign will be treated as a formula and rows will be filled with the calculated values.
 * @property {number=} adcPollingInterval=0 Length of polling interval for refreshing ADC data in milliseconds. The default value (0) means no polling.
 * @property {boolean=} fieldCaching=false If enabled, field definition will be caching internal mechanism
+* @property {boolean=} timeSeriesExpansion=true If disabled, the time series field will be treated as a normal field and not expanded.
 * @property {string=} childDataField=CHILD_VALUES The given field will be used to store children's static data, such as row color assignment.
 * @property {boolean=} topSection=true If disabled, title section will not be rendered
 */
@@ -530,6 +531,11 @@ Grid.prototype._pollingEnabled = true;
 * @private
 */
 Grid.prototype._fieldCaching = false;
+/** @type {boolean}
+* @private
+*/
+Grid.prototype._timeSeriesExpansion = true;
+
 /** @type {string}
 * @private
 */
@@ -790,6 +796,11 @@ Grid.prototype.initialize = function(gridOption) {
 		FieldDefinition.setFieldCaching(t._fieldCaching);
 	}
 
+	if(gridOption["timeSeriesExpansion"] != null) {
+		t._timeSeriesExpansion = gridOption["timeSeriesExpansion"];
+		FieldDefinition.disableTimeSeriesExpansion(!t._timeSeriesExpansion);
+	}
+
 	if (gridOption["icons"] && gridOption["icons"]["rowGrouping"] && gridOption["icons"]["rowGrouping"]["expander"]) {
 		StyleLoader.chainIcon = gridOption["icons"]["rowGrouping"]["expander"];
 	}
@@ -1112,6 +1123,9 @@ Grid.prototype.getConfigObject = function (gridOptions) {
 	if(this._fieldCaching) {
 		obj["fieldCaching"] = this._fieldCaching;
 	}
+	if(this._timeSeriesExpansion != true) {
+		obj["timeSeriesExpansion"] = this._timeSeriesExpansion;
+	}
 
 	if(this._childDataField) {
 		obj["childDataField"] = this._childDataField;

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

@@ -136,7 +136,7 @@ declare class RowDefinition {
 
 declare const ROW_DEF: string;
 
-declare const ROW_TYPES: RowDefinition.RowTypes|null;
+declare const ROW_TYPES: RowDefinition.RowTypes;
 
 declare function rowData(userInput: string): boolean;
 

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

@@ -17,12 +17,12 @@ import { DataTable } from "../../core/es6/data/DataTable.js";
 */
 
 /** @typedef {Object} RowDefinition~RowTypes
-* @property {string} CONTENT="CONTENT"
-* @property {string} CHAIN="CHAIN"
-* @property {string} CONSTITUENT="CONSTITUENT"
-* @property {string} GROUP_HEADER="GROUP_HEADER"
-* @property {string} SUBGROUP_HEADER="SUBGROUP_HEADER"
-* @property {string} GROUP_MEMBER="GROUP_MEMBER"
+* @property {string} CONTENT="CONTENT" Regular row
+* @property {string} CHAIN="CHAIN" Chain RIC row
+* @property {string} CONSTITUENT="CONSTITUENT" Constituent row
+* @property {string} GROUP_HEADER="GROUP_HEADER" Row of segment separator at the very top
+* @property {string} SUBGROUP_HEADER="SUBGROUP_HEADER" Row of nested segment separator
+* @property {string} GROUP_MEMBER="GROUP_MEMBER" Child row displayed under segment separator
 */
 
 /** @type {string}
@@ -31,7 +31,7 @@ import { DataTable } from "../../core/es6/data/DataTable.js";
 */
 var ROW_DEF = "ROW_DEF";
 
-/** @type {RowDefinition~RowTypes}
+/** @type {!RowDefinition~RowTypes}
 * @public
 * @const
 */

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

@@ -381,6 +381,9 @@ SnapshotFiller.prototype._onRTKSuccess = function (fields, serverResult) {
 		var dataRow = data2D[i];
 		ric = dataRow[0];
 
+		if (ricMap[ric]) {
+			continue; // we interested only first row of ric
+		}
 		var snapData = ricMap[ric] = {};
 
 		// loop for create rowData for update

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

@@ -1311,6 +1311,10 @@ ColumnStackPlugin.prototype._onColumnRemoved = function (e) {
 				} else {
 					stackOpt.activeColumn = stackOpt.stackRefs[0];
 				}
+
+				// TODO: Add a proper way to set visibility to activeColumn when activeColumn is changed
+				var activeColIndex = this._getColumnIndex(stackOpt.activeColumn);
+				this._setColumnVisibility(activeColIndex, true);
 				this._updateUI();
 			}
 		}

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

@@ -266,7 +266,7 @@ Adc.request = function (payload, mockResponse) {
 	} else {
 
 		identifiers = payload.identifiers;
-		formula = payload.formula.trim().split(","); // TODO: check each field with another way, this doesn't work when user use some comma (,) formula
+		formula = Adc.splitFields(payload.formula);
 		fields = [];
 
 		// _invalidFieldDict is a dictionary of non exist field
@@ -344,6 +344,34 @@ Adc.request = function (payload, mockResponse) {
 	}));
 };
 
+/**
+ * Splits a string of comma-separated fields into an array of individual field names with optional parentheses and contents.
+ *
+ * @param {string} strFields - The string of comma-separated fields to split.
+ * @returns {Array<string>} - An array of individual field names with optional parentheses and contents.
+ */
+Adc.splitFields = function(strFields) {
+	 if(!strFields) {
+		return [];
+	 }
+
+	// Split the input string using the regular expression
+	// regex is match commas that are not inside parentheses
+	/*
+		,          		- matches a comma
+		(?![^()]*\) 	- negative lookahead assertion that matches if the comma is not followed by:
+			[^()]*   	- any characters that are not opening or closing parentheses
+			\)			- a closing parenthesis
+		)          		- ending delimiter of the regular expression
+	*/
+	var fields = strFields.split(/,(?![^()]*\))/);
+	fields = fields.map(function(field) {
+		return field.trim();
+	});
+
+	return fields;
+};
+
 /** @public
 * @function
 * @param {string} dataType

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

@@ -1,39 +1,44 @@
 import {Ext} from '../../tr-grid-util/es6/Ext.js';
-import { GridPlugin } from '../../tr-grid-util/es6/GridPlugin.js';
-import { extendObject } from '../../tr-grid-util/es6/Util.js';
+import {GridPlugin} from '../../tr-grid-util/es6/GridPlugin.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';
 
 declare namespace ConditionalColoringPlugin {
 
+    type Options = {
+        predefinedColors?: any
+    };
+
     type ColumnOptions = {
-        conditions?: (ConditionalColoringPlugin.Condition)[],
-        colorText?: (string|boolean),
-        tickColor?: (string|boolean),
-        blinking?: (ConditionalColoringPlugin.Blinking|boolean),
-        field?: string
+        conditions?: (ConditionalColoringPlugin.Condition)[]|null,
+        colorText?: (string|boolean)|null,
+        tickColor?: (string|boolean)|null,
+        blinking?: (ConditionalColoringPlugin.Blinking|boolean)|null,
+        field?: string|null
     };
 
     type ConditionalColoringOptions = {
-        conditions?: (ConditionalColoringPlugin.Condition)[],
-        colorText?: (string|boolean),
-        tickColor?: (string|boolean),
-        field?: string
+        conditions?: (ConditionalColoringPlugin.Condition)[]|null,
+        colorText?: (string|boolean)|null,
+        tickColor?: (string|boolean)|null,
+        field?: string|null
     };
 
     type Condition = {
-        expression?: (string|((...params: any[]) => any)),
-        backgroundColor?: string,
-        color?: string
+        expression?: (string|((...params: any[]) => any))|null,
+        backgroundColor?: string|null,
+        color?: string|null,
+        cssClass?: string|null
     };
 
     type Blinking = {
-        border?: boolean,
-        field?: string,
-        up?: string,
-        down?: string,
-        level?: (string|boolean)
+        border?: boolean|null,
+        field?: string|null,
+        up?: string|null,
+        down?: string|null,
+        level?: (string|boolean)|null
     };
 
 }
@@ -56,21 +61,23 @@ declare class ConditionalColoringPlugin extends GridPlugin {
 
     public getColumnColoring(colIndex: number, options?: any): ConditionalColoringPlugin.ColumnOptions;
 
-    public setColumnColoring(colIndex: number, columnOptions?: (ConditionalColoringPlugin.ColumnOptions|null)): void;
+    public setColumnColoring(colIndex: number, columnOptions?: (ConditionalColoringPlugin.ColumnOptions|null)|null): void;
 
-    public setConditionalColoring(colIndex: number, coloringOptions?: (ConditionalColoringPlugin.ConditionalColoringOptions|null)): void;
+    public setConditionalColoring(colIndex: number, coloringOptions?: (ConditionalColoringPlugin.ConditionalColoringOptions|null)|null): void;
 
-    public setColumnBlinking(colIndex: number, blinkingOptions?: (boolean|ConditionalColoringPlugin.Blinking), field?: string): void;
+    public setColumnBlinking(colIndex: number, blinkingOptions?: (boolean|ConditionalColoringPlugin.Blinking)|null, field?: string|null): void;
 
     public blinkRow(rowIndex: number, blinkSignal: number, host?: any): void;
 
+    public setPredefinedColors(predefinedColors: any): void;
+
     public getColumnPainter(colIndex: number): CellPainter|null;
 
     public applyColor(colIndex: number, cell: any, rowData?: any): void;
 
     public static cleanUpPrevRows(): void;
 
-    public static setThemeColors(colors: { [key: string]:  string }): void;
+    public static setThemeColors(colors: { [key: string]:  string }|null): void;
 
     public reloadThemeColors(): Promise<any>|null;
 

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

@@ -9,6 +9,7 @@ import ColumnGrouping from "../../tr-grid-column-grouping/es6/ColumnGrouping.js"
 import ColumnResizing from "../../tr-grid-column-resizing/es6/ColumnResizing.js";
 import ColumnSelection from "../../tr-grid-column-selection/es6/ColumnSelection.js";
 import ColumnStack from "../../tr-grid-column-stack/es6/ColumnStack.js";
+import ConditionalColoring from "../../tr-grid-conditional-coloring/es6/ConditionalColoring.js";
 import ContentWrap from "../../tr-grid-content-wrap/es6/ContentWrap.js";
 import ContextMenu from "../../tr-grid-contextmenu/es6/ContextMenu.js";
 import FilterInput from "../../tr-grid-filter-input/es6/FilterInput.js";
@@ -34,6 +35,7 @@ type ExtensionOptions = {
     columnResizing?: ColumnResizing.Options,
     columnSelection?: ColumnSelection.Options,
     columnStack?: ColumnStack.Options,
+    conditionalColoring?: ConditionalColoring.Options,
     contentWrap?: ContentWrap.Options,
     contextMenu?: ContextMenu.Options,
     filterInput?: FilterInput.Options,

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

@@ -136,7 +136,7 @@ declare class RowDefinition {
 
 declare const ROW_DEF: string;
 
-declare const ROW_TYPES: RowDefinition.RowTypes|null;
+declare const ROW_TYPES: RowDefinition.RowTypes;
 
 declare function rowData(userInput: string): boolean;
 

package/lib/versions.json

@@ -1,5 +1,5 @@
 {
-	"tr-grid-util": "1.3.88",
+	"tr-grid-util": "1.3.89",
 	"@grid/column-dragging": "1.0.11",
 	"@grid/row-segmenting": "1.0.23",
 	"@grid/statistics-row": "1.0.13",
@@ -12,7 +12,7 @@
 	"tr-grid-column-grouping": "1.0.46",
 	"tr-grid-column-resizing": "1.0.28",
 	"tr-grid-column-selection": "1.0.26",
-	"tr-grid-column-stack": "1.0.53",
+	"tr-grid-column-stack": "1.0.54",
 	"tr-grid-conditional-coloring": "1.0.58",
 	"tr-grid-content-wrap": "1.0.19",
 	"tr-grid-contextmenu": "1.0.38",

package/package.json

@@ -66,5 +66,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.29"
+	"version": "6.0.30"
 }