@refinitiv-ui/efx-grid 6.0.15 → 6.0.17

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

@@ -2,6 +2,7 @@
 import Grid from "./Grid.js";
 import {Ext} from "../../tr-grid-util/es6/Ext.js";
 import {EventDispatcher} from "../../tr-grid-util/es6/EventDispatcher.js";
+import {FieldDefinition} from "./FieldDefinition.js";
 
 /** @private
 * @param {Object} obj
@@ -189,10 +190,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;
 	}
 
@@ -202,21 +212,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++) {
@@ -377,5 +413,77 @@ 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
+	});
+};
+
 export { SnapshotFiller };
 export default SnapshotFiller;

package/lib/tr-grid-column-grouping/es6/ColumnGrouping.d.ts

@@ -24,12 +24,12 @@ declare class ColumnGroupingPlugin extends GridPlugin {
 
     constructor(options?: ColumnGroupingPlugin.Options|null);
 
-    public beforeProcessOption(optionName: string, optionValue: any): any;
-
     public getName(): string;
 
     public initialize(host: any, options?: any): void;
 
+    public beforeProcessOption(optionName: string, optionValue: any): any;
+
     public unload(host: any): void;
 
     public config(options: any): void;
@@ -66,9 +66,9 @@ declare class ColumnGroupingPlugin extends GridPlugin {
 
     public getCellInfo(e: Element|Event|MouseEvent|null): any;
 
-    public moveColumnIntoGroup(from: number|string|null, to: number, groupId: string): void;
+    public moveColumnIntoGroup(colRef: number|string|null, to: number, groupId: string): void;
 
-    public setColumnParent(columnIndex: number|string|null, groupId: string): void;
+    public setColumnParent(colRef: number|string|null, groupId: string): void;
 
 }