@refinitiv-ui/efx-grid 6.0.14 → 6.0.16

package/lib/rt-grid/dist/rt-grid.js

@@ -11363,7 +11363,7 @@ DataTable.prototype.setRowData = function(rid, values, eventArg) { // Data chang
 			this._prevData[rid] = {};
 			if(eventArg) {
 				var nextRid = /** @type{string} */(eventArg["nextRid"]); // Used for insertion only
-				var rowIndex = (nextRid != null) ? this.getRowIndex(nextRid) : -1;
+				var rowIndex = (nextRid) ? this.getRowIndex(nextRid) : -1;
 				if(rowIndex < 0) {
 					rowIndex = /** @type{number} */(eventArg["fallback"]);
 				}
@@ -11625,7 +11625,7 @@ DataTable.prototype.unshiftRow = function(opt_values, opt_rid) {
 	return this.insertRow(0, opt_values, opt_rid);
 };
 /** @public
-* @param {string|number|null=} rowRef
+* @param {(string|number|null)=} rowRef
 * @param {Object.<string, *>=} values Key/value pair object map
 * @param {string|null=} rid If the given row Id already exists, data is updated and no new row is added. Leave blank or null to let DataTable generate unique row Id
 * @return {string} Return Row id that has been inserted or changed
@@ -11634,11 +11634,13 @@ DataTable.prototype.unshiftRow = function(opt_values, opt_rid) {
 * @see {@link DataTable#removeRow}
 */
 DataTable.prototype.insertRow = function(rowRef, values, rid) {
-	var arg = {};
+	var arg = null;
 	if(typeof rowRef === "number") {
+		arg = {};
 		arg["nextRid"] = this._rids[rowRef];
 		arg["fallback"] = rowRef; // Fallback index in case of no nextRid found
-	} else {
+	} else if(rowRef) {
+		arg = {};
 		arg["nextRid"] = /** @type{string} */(rowRef);
 	}
 
@@ -13784,6 +13786,63 @@ RowDefinition.prototype.addConstituent = function(ric) {
 
 	return newChild ? childDef : null;
 };
+
+/** Used to convert autogenerated row to regular real-time row
+* @public
+*/
+RowDefinition.prototype._toRealTimeRow = function() {
+	if(!this._ric) { // Empty row
+		return;
+	}
+	if(this.isRowHeader()) {
+		return;
+	}
+
+	this._realTimeField = true;
+	this._dataId = this._rowId + this._ric; // JET/RTK will generate data id to be rowId (given from this rowDef) + ric;
+
+	this._autoGenerated = false;
+	this._parent = null;
+	this._depthLevel = 0;
+
+	this.subscribeForUpdates();
+};
+
+/** @public
+*/
+RowDefinition.prototype.unlinkChain = function() {
+	if(!this._isChain) {
+		return;
+	}
+
+	if(this.isChainExpanded()) {
+		var rowDefs = this.getDescendants();
+		var len = rowDefs.length;
+		for(var i = 0; i < len; i++) {
+			rowDefs[i]._toRealTimeRow();
+		}
+	}
+
+	this.unsubscribeForUpdates();
+
+	var view = this._view;
+	if(view) {
+		var rid = this.getRowId();
+		var segment = view.getSegment(rid);
+		if(segment) {
+			segment.setClassification(null);
+		}
+		view.setSegmentSeparator(rid, false);
+	}
+
+	this._isChain = this._expanded = false;
+	this._chainRic = "";
+	this._userInput = this._ric;
+	this._children = null;
+
+	this.subscribeForUpdates();
+};
+
 /** @public
 * @return {boolean} Returns true if there is a change in view
 */
@@ -14137,6 +14196,12 @@ FieldDefinition._defs = {
 		description: "The latest Ask price."
 	}
 };
+
+/** @type {Object.<string, Object>}
+* @private
+*/
+FieldDefinition._timeSeriesChildren = {};
+
 /** api-key to call synapse service
 * @type {string}
 * @private
@@ -14183,6 +14248,25 @@ FieldDefinition.get = function(field) {
 /** @public
 * @function
 * @param {string} field
+* @return {Object}
+*/
+FieldDefinition.getTimeSeriesChildren = function(field) {
+	return FieldDefinition._timeSeriesChildren[field];
+};
+/** @public
+* @function
+* @param {string} tsDef
+* @param {Object} childDef
+*/
+FieldDefinition.addTimeSeriesChild = function(tsDef, childDef) {
+	if(!FieldDefinition._timeSeriesChildren[tsDef]) {
+		FieldDefinition._timeSeriesChildren[tsDef] = [];
+	}
+	FieldDefinition._timeSeriesChildren[tsDef].push(childDef);
+};
+/** @public
+* @function
+* @param {string} field
 */
 FieldDefinition.remove = function(field) {
 	delete FieldDefinition._defs[field];
@@ -14205,6 +14289,24 @@ FieldDefinition.setFieldCaching = function (caching) {
 	FieldDefinition._caching = caching;
 };
 
+/** @public
+* @param {string} field
+* @return {boolean}=true if field is time series field
+*/
+FieldDefinition.isTimeSeriesField = function (field) {
+	/*
+		^TR.                    => start with TR.
+		[\w]+                   => any field with string and value
+		[\(]                    => open bucket (
+		[\w\-\=\,]*             => any property name and follow by = EX. SDATE=2011-11-11, PRIOD=123123
+		EDATE\=+                => EDATE in bucket
+		[\w\-\=\,]+             => another propertie param
+		[\)]$                   => end with only )
+	*/
+
+	return !!field.toUpperCase().match(/^TR.[\w]+[\(][\w\-\=\,]*EDATE\=+[\w\-\=\,]+[\)]$/g);
+};
+
 /** to get more info about field via synapse service
 * @private
 * @param {string} field
@@ -14563,8 +14665,17 @@ var ColumnDefinition = function(columnOption, hostGrid) {
 
 	this._classes = [];
 	this._requiredFields = [];
+	this._children = [];
+	this._parent = [];
+
+	if(columnOption) {
+		if(columnOption["parent"]) { // WARNING: This assume time series child, when have a parent
+			this._initializeTimeSeriesChild(columnOption);
+		} else {
+			this.initialize(columnOption);
+		}
+	}
 
-	this.initialize(columnOption);
 };
 //#region Private Members
 /** @type {string}
@@ -14645,6 +14756,10 @@ ColumnDefinition.prototype._eventArg;
 * @private
 */
 ColumnDefinition.prototype._realTimeField = false;
+/** @type {boolean}
+* @private
+*/
+ColumnDefinition.prototype._autoGenerated = false;
 
 /** @type {!Array.<string>}
 * @private
@@ -14681,6 +14796,19 @@ ColumnDefinition.prototype._textSelect = false;
 * @private
 */
 ColumnDefinition.prototype._userModel = null;
+
+/** @type {Grid~ColumnDefinition}
+* @private
+*/
+ColumnDefinition.prototype._parent = null;
+/** @type {Array<ColumnDefinition>}
+* @private
+*/
+ColumnDefinition.prototype._children = null;
+/** @type {boolean}
+* @private
+*/
+ColumnDefinition.prototype._timeSeriesField = false;
 /** @type {Object}
 * @private
 */
@@ -14696,8 +14824,20 @@ ColumnDefinition.prototype.dispose = function() {
 	this.setRenderer(null); // this._userRenderers are removed
 	this.setSorter(null);
 	this._userModel = null;
+	this._parent = null;
+	this._children = null;
 	// TODO: Remove any related reference from this._fnEngine
 };
+
+/** @public
+* @param {ColumnDefinition~Options|string=} columnOption
+*/
+ColumnDefinition.prototype._initializeTimeSeriesChild = function(columnOption) {
+	this._autoGenerated = true;
+	var parentDef = /** @type{ColumnDefinition} */(columnOption["parent"]);
+	this._setParent(parentDef);
+	this.initialize(columnOption);
+};
 /** @public
 * @param {ColumnDefinition~Options|string=} columnOption
 */
@@ -14996,6 +15136,12 @@ ColumnDefinition.prototype.isRealTimeField = function() {
 /** @public
 * @return {boolean}
 */
+ColumnDefinition.prototype.isTimeSeriesField = function() {
+	return this._timeSeriesField;
+};
+/** @public
+* @return {boolean}
+*/
 ColumnDefinition.prototype.isFormulaField = function() {
 	return this._formula ? true : false;
 };
@@ -15181,6 +15327,10 @@ ColumnDefinition.prototype.getConfigObject = function(colOptions) {
 		obj["headerAlignment"] = this._headerAlignment;
 	}
 
+	if(this._autoGenerated) {
+		obj["autoGenerated"] = this._autoGenerated;
+	}
+
 	var core = this._eventArg["core"];
 	var grid = this._eventArg["grid"];
 	var colIndex = grid.getColumnIndex(this);
@@ -15258,6 +15408,53 @@ ColumnDefinition.prototype.setRenderer = function(func) {
 		this._userRenderers = null;
 	}
 };
+
+
+/** @public
+* @return {ColumnDefinition}
+*/
+ColumnDefinition.prototype.getParent = function() {
+	return this._parent;
+};
+
+
+/**
+* @private
+* @param {ColumnDefinition} parentDef
+* @return {boolean}=true if have any change
+*/
+ColumnDefinition.prototype._setParent = function(parentDef) {
+	if(this._parent === parentDef || parentDef === this) { // The same parent is given
+		return false;
+	}
+
+	if(parentDef) {
+		this._parent = parentDef;
+		this._parent._addChild(this); // sync child and parent
+	}
+	return false;
+};
+
+
+/**
+* @public
+* @return {Array.<ColumnDefinition>}
+*/
+ColumnDefinition.prototype.getChildren = function() {
+	return this._children;
+};
+
+/**
+* @private
+* @param {string} colDef Child column definition
+*/
+ColumnDefinition.prototype._addChild = function(colDef) {
+	if(this === colDef || this._children.indexOf(colDef) > -1) {
+		return;
+	}
+	this._children.push(colDef);
+};
+
 /** Add more renderer to the existing list
 * @public
 * @param {Function} func
@@ -15324,6 +15521,13 @@ ColumnDefinition.prototype.isRowSorting = function() {
 	return this._rowSorting ? true : false;
 };
 
+/** @public
+* @return {boolean}
+*/
+ColumnDefinition.prototype.isAutoGenerated = function() {
+	return this._autoGenerated;
+};
+
 /** To allow user change column name in run-time (language change or localization)
 * @public
 * @param {string} str
@@ -15374,6 +15578,13 @@ ColumnDefinition.prototype._setField = function(field, formulaStr) {
 		this._emptyField = false;
 		this._realTimeField = field ? true : false;
 	}
+
+	if(js_FieldDefinition.isTimeSeriesField(field)) {
+		// children will be clone the config from parent too
+		this._realTimeField = false;
+		this._timeSeriesField = true;
+	}
+
 	this._isDefaultName = true;
 	this._updateContext("field", field);
 	if(this.isRealTimeField()) { // Only realtime field will have a formatted field
@@ -15490,6 +15701,7 @@ ColumnDefinition.prototype.getColumnInfo = function() {
 
 
 
+
 /** @private
 * @param {Object} obj
 * @return {boolean}
@@ -15676,10 +15888,19 @@ SnapshotFiller.prototype._onRequest = function () {
 	var instruments = Object.keys(this._rics);
 
 	var i;
-	var fields = Object.keys(this._fields);
+	var fields = [];
+	var timeSeriesFields = [];
+	for (var field in this._fields) {
+		if(!FieldDefinition.isTimeSeriesField(field)) {
+			fields.push(field);
+		} else {
+			timeSeriesFields.push(field);
+		}
+	}
 	var fieldLen = fields.length;
+	var timeSeriesFieldLen = timeSeriesFields.length;
 
-	if (!fieldLen || !instruments.length) { // No ADC field or real-time RIC
+	if ( (!fieldLen && !timeSeriesFieldLen ) || !instruments.length) { // No ADC field or real-time RIC
 		return;
 	}
 
@@ -15689,21 +15910,47 @@ SnapshotFiller.prototype._onRequest = function () {
 
 	var onSuccess, payload;
 	if (this._rtk) {
-		var strFields = fields.join(',');
-		payload = {
-			"method": "select",
-			"formula": strFields,
-			"identifiers": instruments,
-			"productId": this._adcOptions.productId,
-			"output": "Col,In,va,T,NoEmptyTickers" // For customize output server, for more information please visit "https://confluence.refinitiv.com/display/ADC/Data+Cloud+Output+Format"
-		};
-		onSuccess = this._onRTKSuccess.bind(this, fields);
-		this._rtk.Data.Adc
-			.request(payload)
-			.then(onSuccess)
-			.catch(function (err) {
-				console.log(err);
-			});
+		var strFields;
+		// Request time serie fields
+		if(timeSeriesFields.length > 0) {
+			// request time series field
+			var strtTimeSeriesFields = timeSeriesFields.join(',');
+			payload = {
+				"method": "select",
+				"formula": strtTimeSeriesFields,
+				"identifiers": instruments,
+				"productId": this._adcOptions.productId,
+				"output": "Col,date|,Row,In|,va,T,NoEmptyTickers" // For customize output server, for more information please visit "https://confluence.refinitiv.com/display/ADC/Data+Cloud+Output+Format"
+			};
+			onSuccess = this._onRTKTimeSeriesSuccess.bind(this, timeSeriesFields);
+			this._rtk.Data.Adc
+				.request(payload)
+				.then(onSuccess)
+				.catch(function (err) {
+					console.log(err);
+				});
+		}
+
+		// Request normal adc field
+		if(fields.length > 0) {
+			strFields = fields.join(',');
+			payload = {
+				"method": "select",
+				"formula": strFields,
+				"identifiers": instruments,
+				"productId": this._adcOptions.productId,
+				"output": "Col,In,va,T,NoEmptyTickers" // For customize output server, for more information please visit "https://confluence.refinitiv.com/display/ADC/Data+Cloud+Output+Format"
+			};
+			onSuccess = this._onRTKSuccess.bind(this, fields);
+			this._rtk.Data.Adc
+				.request(payload)
+				.then(onSuccess)
+				.catch(function (err) {
+					console.log(err);
+				});
+		}
+
+
 	} else {
 		var reqFields = [];
 		for(i = 0; i < fieldLen; i++) {
@@ -15865,6 +16112,78 @@ SnapshotFiller.prototype._onRTKSuccess = function (fields, serverResult) {
 };
 
 
+/** @private
+* @function
+* @param {Array.<string>} fields
+* @param {string} serverResult
+*/
+SnapshotFiller.prototype._onRTKTimeSeriesSuccess = function (fields, serverResult) {
+
+	// TODO: noti the user for change structure
+	this._dispatch("adcDataReceived", serverResult);
+	var data2D = serverResult["rows"];
+	var svHeaders = serverResult["rows"] && serverResult["rows"][0];
+	if (!Array.isArray(data2D) || !Array.isArray(svHeaders)) {
+		return; // TODO: Return Promise.reject(errMsg);
+	}
+
+	var headerLen = svHeaders.length;
+
+	var headerDates = [];
+	var i, j;
+
+	for (i = 2; i < headerLen; i++) { // Start with 2 (Skip instrunment and date header)
+		headerDates.push(svHeaders[i].v);
+	}
+
+	var ric, j, field;
+	var len = data2D.length;
+	var ricMap = {};
+	var childrenFieldToParent = {};
+
+	var fileNameToTSField = {};
+	var count = 0;
+	for (let i = 1; i < len; i++) {
+		var dataRow = data2D[i];
+		var fieldName = dataRow[1];
+		if(!fileNameToTSField[fieldName]) {
+			fileNameToTSField[fieldName] = fields[count++];
+		}   	
+	}
+
+	// TODO: Freeze the data view before setting multiple data
+	for (i = 1; i < len; i++) { // to skip column header index, use i = 1
+		var dataRow = data2D[i];
+		ric = dataRow[0];
+		var fieldName = dataRow[1]; // ex. PRICECLOSE
+		if(!ricMap[ric]) {
+			ricMap[ric] = {};
+		}
+		var snapData = ricMap[ric];
+		for (var k = 0; k < headerDates.length; k++) {
+			field = fileNameToTSField[fieldName].replace("TR.", "") + "_"  + headerDates[k]; // TODO: make support time series field definition cache
+			childrenFieldToParent[field] = fileNameToTSField[fieldName];
+			snapData[field] = dataRow[2 + k]; // Start with field value
+		}
+	}
+
+	// return result only ric that has update data
+	var dataMapping = {};
+	for (ric in ricMap) {
+		var obj = ricMap[ric];
+		if (!isEmptyObject(obj)) {
+			dataMapping[ric] = obj;
+		}
+	}
+
+	this._dispatch("dataChanged", {
+		data: dataMapping,
+		timeSeries: true,
+		childrenFieldToParent: childrenFieldToParent
+	});
+};
+
+
 /* harmony default export */ var js_SnapshotFiller = (SnapshotFiller);
 
 // CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/components/ElementWrapper.js
@@ -34196,7 +34515,7 @@ Core.prototype._rowHeightTimerId = 0;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.25";
+	return "5.1.26";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -41708,6 +42027,13 @@ var excludeAutoGenerated = function (rowDef) {
 	return !rowDef.isAutoGenerated();
 };
 
+/** @private
+* @param {Object} colConfig column config
+* @return {boolean}
+*/
+var _byNonAutoGeneratedColumn = function (colConfig) {
+	return !colConfig.autoGenerated;
+};
 /** @private
 * @param {string} rowDefA
 * @param {string} rowDefB
@@ -41733,6 +42059,8 @@ var Grid = function(placeholder, config) {
 	t._recalculateFormulas = t._recalculateFormulas.bind(t);
 	t._updateStreamingData = t._updateStreamingData.bind(t);
 	t.updateColumnTitle = t.updateColumnTitle.bind(t);
+	t._insertTimeSeriesChildren = t._insertTimeSeriesChildren.bind(t);
+
 
 	t._onPostSectionDataBinding = t._onPostSectionDataBinding.bind(t);
 	t._asyncClearDataUpdates = t._asyncClearDataUpdates.bind(t);
@@ -41756,6 +42084,8 @@ var Grid = function(placeholder, config) {
 	t._formulaConflator = new Conflator(300, t._onFormulaDataChanged);
 	t._chainConflator = new Conflator(100, t._addMemberOfChain);
 	t._columnTitleConflator = new Conflator(0, t.updateColumnTitle);
+	t._timeSeriesChildConflator = new Conflator(0, t._insertTimeSeriesChildren);
+
 
 	t._defaultColumnOptions = {};
 
@@ -42502,8 +42832,8 @@ Grid.prototype.getConfigObject = function (gridOptions) {
 		grid.getConfigObject(obj);
 	}
 
-	var i;
-	var len = this.getColumnCount();
+	var i, len;
+	len = this.getColumnCount();
 	for (i = 0; i < len; ++i) {
 		var column = columns[i];
 		if(!column) {
@@ -42514,6 +42844,8 @@ Grid.prototype.getConfigObject = function (gridOptions) {
 		colDef.getConfigObject(column);
 	}
 
+	obj.columns = columns = columns.filter(_byNonAutoGeneratedColumn);
+
 	if(this._topNode.style.overflow === "") {
 		obj["scrollbar"] = false;
 	}
@@ -42754,6 +43086,116 @@ Grid.prototype.insertColumn = function (columnOption, idx) {
 	this._grid.insertColumn(idx, configObj); // columnAdded is fired
 };
 
+/** @private
+* @param {Object} e snapshort change event object
+*/
+Grid.prototype._updateTimeSeriesFields = function (e) {
+	var snapShortData = e.data;
+	var childFields;
+	for (var ric in snapShortData) {
+		childFields = snapShortData[ric];
+		this.setRicData(ric, snapShortData[ric]);
+	}
+	var parentField, field, colIndex, parentColDef, childColIndex;
+
+	var firstField;
+	for (field in childFields) {
+		firstField = field;
+		break;
+	}
+
+	parentField = e.childrenFieldToParent[firstField];
+	colIndex = this.getColumnIndex(parentField);
+	this._grid.setColumnVisibility(colIndex);
+	parentColDef = this._getColumnDefinition(colIndex);
+
+
+	var children = parentColDef.getChildren();
+	var i, len, childDef, childField;
+	len = children.length;
+	if(len > 0){
+		for (i = 0; i < len; i++) {
+			childDef = children[i];
+			childField = childDef.getField();
+			if(!childFields[childField]) {
+				this.removeColumn(childField);
+			}
+		}
+	}
+
+	for (childField in childFields) {
+		parentField = e.childrenFieldToParent[childField];
+		colIndex = this.getColumnIndex(parentField);
+		parentColDef = this._getColumnDefinition(colIndex);
+		childColIndex = this.getColumnIndex(childField);
+		if(childColIndex < 0) { // not found column index in view tried to clone from parent
+			this._cloneTimeSeriesColumn(parentColDef, childField, colIndex);
+			js_FieldDefinition.addTimeSeriesChild(parentField, childField);
+		}
+	}
+
+};
+
+
+/** @private
+* @param {ColumnDefinition} colDef
+*/
+Grid.prototype._insertTimeSeriesChildren = function (colDef) {
+	if(this._timeSeriesChildConflator.conflate(colDef) ) {
+		return;
+	}
+
+	var colDefs  = this._timeSeriesChildConflator.popAllData();
+	var i, j, len, childField, idx;
+
+	for (i = 0; i < colDefs.length; i++) {
+		colDef = colDefs[i];
+		idx = this.getColumnIndex(colDef);
+		this._grid.setColumnVisibility(idx); // hide parent field
+
+		if(!colDef) {
+			continue;
+		}
+		var childFields = js_FieldDefinition.getTimeSeriesChildren(colDef.getField());
+		if(!childFields) { // not found time series field
+			return;
+		}
+
+		len = childFields.length;
+		if(len < 1) {
+			return; // normal field
+		}
+
+		for (j = 0; j < len; j++) {
+			idx = this.getColumnIndex(colDef);
+			childField = childFields[j];
+			this._cloneTimeSeriesColumn(colDef, childField, idx);
+		}
+	}
+
+};
+
+/** @private
+* @param {ColumnDefinition} parentColDef Parent definition
+* @param {string} childField field
+* @param {number} idx index of insertion column
+*/
+Grid.prototype._cloneTimeSeriesColumn = function (parentColDef, childField, idx) {
+	var parentConfig, columnOption, obj, key;
+	parentConfig = parentColDef.getConfigObject();
+	obj = {};
+	for (key in parentConfig) {
+		if(key !== "hidden") {
+			obj[key] = parentConfig[key];
+		}
+	}
+	columnOption = Object(Util["b" /* cloneObject */])(obj);
+	columnOption["field"] = childField.replace("TR.", "");
+	columnOption["name"] = childField.split("_")[1].split("T")[0]; // Currently, response server format utc date ex "2022-11-23T00:00:00"
+	columnOption["parent"] = parentColDef;
+	this.insertColumn(columnOption, idx++);
+
+};
 
 /** @public
 * @param {ColumnDefinition~Options|string} columnOption String will be treated as field, while object is treated as the column options
@@ -42815,6 +43257,10 @@ Grid.prototype.replaceColumn = function (columnOption, colRef) {
 		colConfig["width"] = 1;
 	}
 
+	var colDef = this.getColumnDefinition(colIndex);
+	if(colDef.getChildren()) { // Parent time series field doesn't provide hidden property
+		colConfig["hidden"] = false;
+	}
 	this.insertColumn(colConfig, colIndex);
 	this.removeColumn(colIndex + 1); // remove existing column after insert
 };
@@ -42851,7 +43297,15 @@ Grid.prototype._onFieldLoadedError = function (err) {
  * @param {string} referrer
  */
 Grid.prototype._onFieldLoaded = function (field, referrer) {
-	this._connector.addFields(field, referrer);
+	// async process, the field can be remove before column added
+	var colIndex = this.getColumnIndex(field);
+	if(colIndex > -1) {
+		var colDef = this._getColumnDefinition(field);
+		if(colDef.isTimeSeriesField()) {
+			this._insertTimeSeriesChildren(colDef);
+		}
+		this._connector.addFields(field, referrer);
+	}
 };
 
 /**
@@ -42880,8 +43334,8 @@ Grid.prototype._shouldLoadFieldInfo = function (field, isRealTime) {
 	var fieldDef = js_FieldDefinition.get(field);
 	if (!fieldDef &&
 		field !== 'X_RIC_NAME' && // ignore X_RIC_NAME
-		(isRealTime || ColumnDefinition.isAdcField(field)) &&
-		(this._RTK || window["JET"])
+		(isRealTime || ColumnDefinition.isAdcField(field)) && // realtime field or adc field (Without static field)
+		(this._RTK || window["JET"]) // have rtk instance or window jet sub
 	) {
 		return true;
 	}
@@ -43007,9 +43461,15 @@ Grid.prototype._onColumnAdded = function(e) {
 				onLoaded = this._onFieldLoaded.bind(this, field, referrer);
 				prom = prom.then(onLoaded).catch(onLoaded);
 			} else {
+				if(colDef.isTimeSeriesField()) {
+					this._insertTimeSeriesChildren(colDef);
+				}
 				this._connector.addFields(field, referrer);
 			}
 		} else {
+			if(colDef.isTimeSeriesField()) {
+				this._insertTimeSeriesChildren(colDef);
+			}
 			this._connector.addFields(field, referrer);
 		}
 	}
@@ -43027,6 +43487,19 @@ Grid.prototype.removeColumn = function(colRef) {
 	}
 
 	var colDef = this.getColumnDefinition(colIndex);
+	var children = colDef.getChildren();
+	if(children) {
+		var len = children.length;
+		if(len > 0) { // remove time series child
+			var i, childDef;
+			for (i = 0; i < len; i++) {
+				childDef = children[i];
+				this.removeColumn(childDef);
+			}
+			colIndex = this.getColumnIndex(colRef); // children in parent will be remove the parent should be get new index
+		}
+	}
+
 	if(!colDef.isRealTimeField()) {
 		if(this._dc) {
 			this._dc.removeStaticFields([colDef.getField()]);
@@ -43099,6 +43572,7 @@ Grid.prototype.removeAllColumns = function() {
 	// TODO: Remove fields that are related to the column (e.g. fields for coloring)
 
 	this._columnTitleConflator.reset();
+	this._timeSeriesChildConflator.reset();
 
 	this._connector.removeAllFields();
 	this._grid.setColumnCount(0);
@@ -43127,7 +43601,22 @@ Grid.prototype.moveColumn = function (fromColIndex, toColIndex) {
 */
 Grid.prototype.hideColumn = function(colRef, hidden) {
 	var colIndex = this.getColumnIndex(colRef);
-	this._grid.hideColumn(colIndex, hidden);
+	if(colIndex < 0) { // not found
+		return;
+	}
+	var colDef = this.getColumnDefinition(colIndex);
+	var children = colDef.getChildren();
+	var len = children.length;
+	if(len > 0) { // remove time series child, and parent shouldn't unHide
+		var i, childDef;
+		for (i = 0; i < len; i++) {
+			childDef = children[i];
+			this.hideColumn(childDef, hidden);
+		}
+	} else {
+		this._grid.hideColumn(colIndex, hidden);
+	}
+
 };
 /** Hide multiple columns at once. The hidden columns still occupy the same index.
 * @public
@@ -43744,6 +44233,28 @@ Grid.prototype.setRic = function(rowRef, str) {
 		}
 	}
 };
+/** Unlink the chain and its constituents. When the chain is expanded,
+ * the chain row and its members are converted from autogenerated to
+ * regular real-time rows. Only the chain row will be transformed to
+ * a conventional real-time row if the chain is collapsed.
+ * All converted rows will continue to have their data updated.
+ *
+ * @public
+ * @param {Grid~RowReference} rowRef
+ */
+Grid.prototype.unlinkChain = function(rowRef) {
+	var rowDef = this._getRowDefinition(rowRef);
+	if(!rowDef) {
+		return;
+	}
+
+	if(!rowDef.isChain()) {
+		return;
+	}
+
+	rowDef.unlinkChain();
+};
+
 /** Alias to setRic
 * @public
 * @function
@@ -43907,6 +44418,7 @@ Grid.prototype._getAllColumnDefinitions = function() {
 	}
 	return colDefs;
 };
+
 /** @public
 * @param {number|string} rowRef Row index as shown in the view or row id (string)
 * @return {RowDefinition}
@@ -44662,9 +45174,14 @@ Grid.prototype._snapshotFillerDataChanged = function (e) {
 	if (!this._dt) return;
 
 	var data = e.data;
-	for (var ric in data) {
-		this.setRicData(ric, data[ric]);
+	if(e.timeSeries) {
+		this._updateTimeSeriesFields(e); // Increase or decrease time series field
+	} else {
+		for (var ric in data) {
+			this.setRicData(ric, data[ric]);
+		}
 	}
+
 	if(!this._lastPollingRequest) { // This is the first time we receive successful ADC response
 		this._lastPollingRequest = 1; // Allow polling to be started
 	}
@@ -47020,6 +47537,7 @@ MockArchive.prototype.filter = function(func) {
 // CONCATENATED MODULE: ./node_modules/tr-grid-util/es6/jet/mockDataAPI.js
 
 
+
 /**
 * @private
 * @type {object}
@@ -47044,6 +47562,7 @@ function setInvalidFields(fields) {
 	}
 }
 
+
 var dataGen = new DataGenerator();
 
 /** @private
@@ -47145,70 +47664,207 @@ Adc.request = function (payload, mockResponse) {
 		return Promise.resolve(JSON.stringify(mockResponse));
 	}
 
-	var i, f, len, row;
-	var identifiers = payload.identifiers;
-	var formula = payload.formula.split(",");
-	var fields = [];
+	// build row header
+	var rows = [];
+	var i, f, len, row, j;
+	var identifiers, formula, fields, invalidDict;
+	if(payload.output === "Col,date|,Row,In|,va,T,NoEmptyTickers") {
+
+		identifiers = payload.identifiers;
+		formula =  payload.formula.trim().split(/(?=,TR.)/);// TODO: check each field with another way, this doesn't work when user use some comma (,) formula
+		fields = [];
+
+		// _invalidFieldDict is a dictionary of non exist field
+		// so we must remove invalid field to make "mocking api" return result more like a "real api".
+		invalidDict = _invalidFieldDict;
+		for (i = 0; i < formula.length; i++) {
+			f = formula[i];
+			if (!invalidDict[f]) {
+				fields.push(f);
+			}
+		}
+
+		var fieldCount = fields.length;
+		// formula = payload.formula.trim().split(",TR"); // TODO: split wit
+
+		rows.push([
+			{
+				"h": true,
+				"i": "instrument",
+				"v": "Instrument"
+			},
+			{
+				"h": true,
+				"i": "date",
+				"v": "Date"
+			}
+		]);
+
+		for (var index = 0; index < fieldCount; index++) {
+			var timeSeriesField = fields[index];
+
+			var regex = /TR.(.*)(?=\()/;
+			var result = timeSeriesField.match(regex);
+			var field = result[0].replace("TR.", "");
+			var phrase = timeSeriesField.toLowerCase();
+			var startDateRegex = /sdate=(.*)[,]/;
+			var endDateRegex = /edate=(.*)[)]/;
+			var startDateMatch = phrase.match(startDateRegex);
+			var endDateMatch = phrase.match(endDateRegex);
+
+			var startDate = startDateMatch ? startDateMatch[1] : DateTime.format(new Date(), "YYYY-MM-DD");
+			var endDate = endDateMatch[1];
+
+			var swapDateTmp;
+			if(startDate > endDate) {
+				swapDateTmp = startDate;
+				startDate = endDate;
+				endDate = swapDateTmp;
+			}
+
+			var msBetweenDate = (+new Date(endDate)) - (+new Date(startDate));
+
+			var msInDay = 1000 * 60 * 60 * 24;
+			var betweenDay = msBetweenDate / msInDay;
+			// var betweenDay = Math.floor(Math.random() * 10); // For random length
+
+
+			for (i = 0; i <= betweenDay; i++) {
+				var date = new Date(new Date(startDate).setDate(new Date(startDate).getDate() + i));
+				var fieldValue = {
+					"h": true,
+					"v": DateTime.format(date, "YYYY-MM-DDT00:00:00")
+				};
+				if(index === 0) { // add header 1 time
+					rows[0].push(fieldValue);
+				}
+			}
 
-	// _invalidFieldDict is a dictionary of non exist field
-	// so we must remove invalid field to make "mocking api" return result more like a "real api".
-	var invalidDict = _invalidFieldDict;
-	for (i = 0; i < formula.length; i++) {
-		f = formula[i];
-		if (!invalidDict[f]) {
-			fields.push(f);
+			var rics = identifiers;
+			for (i = 0; i < rics.length; i++) {
+
+				var ric = rics[i];
+				var rowValue = [
+					ric,
+					field
+				];
+				for (j = 1; j <= betweenDay + 1; j++) {
+					var generatedValue = DataGenerator.generateRecord(field);
+					rowValue.push(generatedValue[field]);
+
+				}
+				rows.push(rowValue);
+			}
+			// The example rows should be look like
+			/*
+			[
+				[
+				{
+					"h": true,
+					"i": "instrument",
+					"v": "Instrument"
+				},
+				{
+					"h": true,
+					"i": "date",
+					"v": "Date"
+				},
+				{
+					"h": true,
+					"v": "2011-08-11T00:00:00"
+				},
+				{
+					"h": true,
+					"v": "2011-08-12T00:00:00"
+				},
+				{
+					"h": true,
+					"v": "2011-08-15T00:00:00"
+				}
+				],
+				[
+				"IBM",
+				"Price Close", // NOTE: this cannot be detech we join it with space Ex. PriceClose
+				159.25449372,
+				160.6585848,
+				165.23382036
+				],
+				[
+				"GOOGL.O",
+				"Price Close",
+				14.066881653,
+				14.107921423,
+				13.944262828
+				]
+			]
+			*/
 		}
-	}
 
-	// build row header
-	var rows = [];
-	rows[0] = [{
-		"h": true,
-		"i": "instrument",
-		"v": "Instrument"
-	}];
-	for (i = 0; i < fields.length; i++) {
-		f = fields[i];
-		rows[0].push({
-			"h": true,
-			"r": f.toUpperCase()
-			// "v": "Price Close", // Doesn't use
-			// "p": "I_TRP_PH_PriceClose" // Doesn't use this property
-		});
-	}
+	} else {
 
-	// build data
-	var rowMap = {};
+		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
+		fields = [];
 
-	len = identifiers.length;
-	var rowData = dataGen.generate(fields, len);
-	for (i = 0; i < len; ++i) {
-		var inst = identifiers[i];
-		row = rowMap[inst];
-		if (!row) {
-			row = rowMap[inst] = rowData[i];
-			row.unshift(inst); // prepend instrument on each row
+		// _invalidFieldDict is a dictionary of non exist field
+		// so we must remove invalid field to make "mocking api" return result more like a "real api".
+		invalidDict = _invalidFieldDict;
+		for (i = 0; i < formula.length; i++) {
+			f = formula[i];
+			if (!invalidDict[f]) {
+				fields.push(f);
+			}
 		}
-		rows.push(row);
-	}
 
-	// There is a chance that rtk will return multiple row data per instrument
-	// so we must create mock up for this case
-	if (rows.length > 0) {
-		var chance = dataGen.randInt(1, 10);
-		if (chance <= 3) { // chance 30%
-			var pos = dataGen.randInt(0, rows.length - 1); // random row pos
-			row = rows[pos];
-			len = row.length;
-			var mockupRow = new Array(len);
-			mockupRow[0] = row[0]; // 1st index is for instrument
-			for (i = 1; i < len; i++) {
-				mockupRow[i] = ''; // real case will return null or empty string
+		rows[0] = [{
+			"h": true,
+			"i": "instrument",
+			"v": "Instrument"
+		}];
+		for (i = 0; i < fields.length; i++) {
+			f = fields[i];
+			rows[0].push({
+				"h": true,
+				"r": f.toUpperCase().trim()
+				// "v": "Price Close", // Doesn't use
+				// "p": "I_TRP_PH_PriceClose" // Doesn't use this property
+			});
+		}
+
+		// build data
+		var rowMap = {};
+
+		len = identifiers.length;
+		var rowData = dataGen.generate(fields, len);
+		for (i = 0; i < len; ++i) {
+			var inst = identifiers[i];
+			row = rowMap[inst];
+			if (!row) {
+				row = rowMap[inst] = rowData[i];
+				row.unshift(inst); // prepend instrument on each row
+			}
+			rows.push(row);
+		}
+
+		// There is a chance that rtk will return multiple row data per instrument
+		// so we must create mock up for this case
+		if (rows.length > 0) {
+			var chance = dataGen.randInt(1, 10);
+			if (chance <= 3) { // chance 30%
+				var pos = dataGen.randInt(0, rows.length - 1); // random row pos
+				row = rows[pos];
+				len = row.length;
+				var mockupRow = new Array(len);
+				mockupRow[0] = row[0]; // 1st index is for instrument
+				for (i = 1; i < len; i++) {
+					mockupRow[i] = ''; // real case will return null or empty string
+				}
+				rows.splice(pos + 1, 0, mockupRow);
 			}
-			rows.splice(pos + 1, 0, mockupRow);
 		}
 	}
 
+
 	/*
 	response type is :
 	{