@refinitiv-ui/efx-grid 6.0.101 → 6.0.103

package/lib/core/es6/data/DataCache.d.ts

@@ -45,8 +45,6 @@ declare class DataCache extends EventDispatcher {
 
     public setData(rid: string, cid: string, value: any): boolean;
 
-    public hasDataCloudData(rid: string): boolean;
-
     public setRowData(rid: string, values?: { [key: string]:  any }|null, opt_eventArg?: any): boolean;
 
     public cloneRowData(rid: string): any;
@@ -63,19 +61,9 @@ declare class DataCache extends EventDispatcher {
 
     public log(opt_options?: any): void;
 
-    public setDataCloudSettings(userId: string, productId: string, url: string, opt_lang?: string|null): void;
-
-    public getDataCloudFields(): (string)[]|null;
-
-    public addDataCloudFields(fields: (string)[]|string|null): boolean;
-
-    public removeDataCloudField(field: string): boolean;
-
 }
 
 declare function cid(rid: string, cid: string): any;
 
-declare function ricMap(field: string): boolean;
-
 export default DataCache;
 export { DataCache };

package/lib/core/es6/data/DataCache.js

@@ -28,9 +28,6 @@ let DataCache = function () {
 	_t._onInsert = _t._onInsert.bind(_t);
 	_t._onUpdate = _t._onUpdate.bind(_t);
 	_t._onDelete = _t._onDelete.bind(_t);
-	_t._onBatchRequestADCData = _t._onBatchRequestADCData.bind(_t);
-	_t._onADCUpdate = _t._onADCUpdate.bind(_t);
-	_t._onADCError = _t._onADCError.bind(_t);
 	_t._onQ2DataChanged = _t._onQ2DataChanged.bind(_t);
 	_t._onQ2SubAdded = _t._onQ2SubAdded.bind(_t);
 	_t._onQ2SubRemoved = _t._onQ2SubRemoved.bind(_t);
@@ -205,13 +202,6 @@ DataCache.prototype.clearAllData = function (opt_suppressEvent) { // All subscri
 	this._subs = {};
 	this._rows = {};
 
-	if (this._adcTimerId >= 0) {
-		clearTimeout(this._adcTimerId);
-		this._adcTimerId = -1;
-	}
-
-	this._adcRicMap = null;
-
 	if (!opt_suppressEvent) {
 		this._dispatchDataChange({"globalChange": true});
 	}
@@ -388,30 +378,10 @@ DataCache.prototype.setData = function (rid, cid, value) { // Data changed event
 
 /**
  * @public
+ * @ignore
  * @param {string} rid
- * @return {boolean}
  */
-DataCache.prototype.hasDataCloudData = function (rid) {
-	if (!this._adcFields) {
-		return false;
-	}
-
-	let row = this.getRowData(rid);
-
-	if (!row) {
-		return false;
-	}
-
-	for (let i = this._adcFields.length; --i >= 0;) {
-		let data = row[this._adcFields[i]];
-
-		if (data != null) {
-			return true;
-		}
-	}
-
-	return false;
-};
+DataCache.prototype.hasDataCloudData = function (rid) {};
 
 /**
  * @public
@@ -587,97 +557,36 @@ DataCache.prototype.log = function (opt_options) {
 //#region ADC
 /** Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
+ * @ignore
  * @param {string} userId
  * @param {string} productId
  * @param {string} url
  * @param {string=} opt_lang
  */
-DataCache.prototype.setDataCloudSettings = function (userId, productId, url, opt_lang) {
-	if (userId != null) {
-		this._userId = userId;
-	}
-
-	if (productId != null) {
-		this._productId = productId;
-	}
-
-	if (url != null) {
-		this._adcUrl = url;
-	}
-
-	if (opt_lang) {
-		this._lang = opt_lang;
-	}
-};
+DataCache.prototype.setDataCloudSettings = function (userId, productId, url, opt_lang) {};
 
 /**
  * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
- * @return {Array.<string>}
+ * @ignore
  */
-DataCache.prototype.getDataCloudFields = function () {
-	return this._adcFields; // Return private members
-};
+DataCache.prototype.getDataCloudFields = function () {};
 
 /**
  * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
+ * @ignore
  * @param {Array.<string>|string} fields
- * @return {boolean} Return true if success, and false otherwise
  */
-DataCache.prototype.addDataCloudFields = function (fields) {
-	if (!this._adcFields) {
-		this._adcFields = [];
-		this._adcRefMap = {};
-	}
-
-	let newFields = [];
-
-	if (fields instanceof Array) {
-		for (let i = fields.length; --i >= 0;) {
-			this._addDataCloudField(fields[i], newFields);
-		}
-	} else {
-		this._addDataCloudField(/** @type {string} */(fields), newFields);
-	}
-
-	if (newFields.length <= 0) {
-		return false;
-	}
-
-	let ricMap = this.getAllRics();
-
-	this._batchRequestDataCloud(ricMap, newFields);
-
-	return true;
-};
+DataCache.prototype.addDataCloudFields = function (fields) {};
 
 /**
  * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
+ * @ignore
  * @param {string} field
- * @return {boolean} Return true if success, and false otherwise
  */
-DataCache.prototype.removeDataCloudField = function (field) {
-	if (!this._adcFields) {
-		return false;
-	}
-
-	if (!this._adcRefMap[field]) {
-		return false;
-	}
-
-	--this._adcRefMap[field];
-
-	if (!this._adcRefMap[field]) {
-		let foundAt = this._adcFields.indexOf(field);
-
-		this._adcFields.splice(foundAt, 1);
-		this.clearColumnData(field);
-	}
-
-	return true;
-};
+DataCache.prototype.removeDataCloudField = function (field) {};
 //#endregion ADC
 //#endregion Public
 
@@ -829,9 +738,6 @@ DataCache.prototype._insertRic = function (subId, ric, values) {
 
 	let rid = subId + ric;
 
-	// We cannot cache event arguments because user may want to collect all the updates
-	this._onADCForNewRic(subId, ric);
-
 	let rowData = this.getRowData(rid);
 	if (!rowData) { // Ensure that we have subscription id and ric from Quotes2
 		let tmp = values;
@@ -926,36 +832,6 @@ DataCache.prototype._onQ2SubRemoved = function (e) {
 	}
 };
 
-/**
- * @private
- * @param {string} subId Subscription id
- * @param {string} ric
- */
-DataCache.prototype._onADCForNewRic = function (subId, ric) {
-	let sub = this._subs[subId];
-
-	if (!sub) {
-		return;
-	}
-
-	if (this._adcFields) {
-		if (!sub["rics"][ric]) { // First time insertion
-			if (this._adcTimerId < 0) {
-				this._adcRicMap = {};
-				this._adcTimerId = setTimeout(this._onBatchRequestADCData, 100);
-			}
-
-			if (!this._adcRicMap[ric]) {
-				this._adcRicMap[ric] = [];
-			}
-
-			this._adcRicMap[ric].push(subId);
-		}
-	}
-
-	sub["rics"][ric] = true;
-};
-
 /**
  * @private
  * @param {string} subId
@@ -989,7 +865,7 @@ DataCache.prototype._onDuplicateRic = function (subId, dupData) {
 			ric = children[i];
 			values = this._cloneRowData(dupSubId, ric, subId);
 
-			this._onInsert(sub, ric, values); // TODO: This makes a lot of ADC request
+			this._onInsert(sub, ric, values);
 		}
 	}
 };
@@ -1006,7 +882,6 @@ DataCache.prototype._onInsert = function (sub, ric, values/*, rowN*/) {
 	if (this._quotes2) {
 		this._insertRic(subId, ric, values);
 	} else {
-		this._onADCForNewRic(subId, ric);
 		this.setRowData(subId + ric, values, {"subscription": sub, "ric": ric});
 	}
 };
@@ -1031,191 +906,6 @@ DataCache.prototype._onDelete = function (sub, ric, values/*, rowN*/) {
 	this.setRowData(sub["id"] + ric, null, {"subscription": sub, "ric": ric});
 };
 
-/**
- * @private
- * @param {string} field
- * @param {Array.<string>} ary_out
- */
-DataCache.prototype._addDataCloudField = function (field, ary_out) {
-	if (!this._adcRefMap[field]) {
-		this._adcFields.push(field);
-
-		ary_out.push(field);
-
-		this._adcRefMap[field] = 1;
-	} else {
-		++this._adcRefMap[field];
-	}
-};
-
-/**
- * @private
- * @param {Object} e
- * @suppress {missingProperties}
- */
-DataCache.prototype._onADCUpdate = function (e) {
-	let xhr = e["currentTarget"]; // XMLHttpRequest
-	let resp = null;
-
-	try {
-		resp = JSON.parse(xhr.responseText);
-		// window.console.log("Successfully parse: " + resp.rows);
-	} catch (err) {
-		return;
-	}
-
-	if (resp["status"] !== "Ok") {
-		return;
-	}
-
-	let colCount = resp["cols"];
-	let rows = resp["rows"];
-	let colDefs = rows[0]; // The first row is always the column definition
-	let ricIndex = -1;
-	let fieldIndices = {};
-
-	for (let i = 0; i < colCount; ++i) {
-		let colDef = colDefs[i];
-
-		if (colDef["i"] === "instrument") {
-			ricIndex = i;
-		} else if (colDef["r"]) {
-			fieldIndices[colDef["r"]] = i;
-		}
-	}
-
-	let rowCount = rows.length;
-
-	for (let j = 1; j < rowCount; ++j) { // Start from 1
-		let row = rows[j];
-		let ric = row[ricIndex];
-		let values = {};
-
-		for (let field in fieldIndices) {
-			let value = row[fieldIndices[field]];
-
-			if (value != null) {
-				// Data should be merged from the backend.
-				// Don't override data with null value.
-				// TODO: Merge all the row into one single row
-				if (value !== null && value["f"] == null) {
-					if (this._quotes2) {
-						values[field] = value;
-						values[field + "_FORMATTED"] = value;
-					} else {
-						values[field] = {"formatted": value + "", "raw": value};
-					}
-				}
-			}
-		}
-
-		let subIds = xhr.ricMap[ric];
-
-		if (subIds) { // Only ric within the subscription can be updated
-			for (i = subIds.length; --i >= 0;) {
-				let subId = subIds[i];
-
-				if (this._subs[subId]) { // Only update the existing subscription
-					// window.console.log("ADC update " + subId + ric + " with " + JSON.stringify(values));
-					this.setRowData(subId + ric, values); // Event is fired
-				}
-			}
-		}
-	}
-};
-
-/**
- * @private
- * @param {Object} e
- */
-DataCache.prototype._onADCError = function (e) {
-	window.console.log(e);
-};
-
-/**
- * @private
- * @param {Object} e
- */
-DataCache.prototype._onBatchRequestADCData = function (e) {
-	if (this._adcTimerId <= 0) {
-		return;
-	}
-
-	this._adcTimerId = -1;
-	this._batchRequestDataCloud(this._adcRicMap, this._adcFields);
-	this._adcRicMap = null;
-};
-
-/**
- * @private
- * @param {Object.<string, Array.<string>>} ricMap of Array of subscription object
- * @param {Array.<string>} fields
- * @return {XMLHttpRequest}
- */
-DataCache.prototype._batchRequestDataCloud = function (ricMap, fields) {
-	if (!this._adcUrl) {
-		return null;
-	}
-
-	let rics = [];
-
-	for (let ric in ricMap) {
-		rics.push(ric);
-	}
-
-	// Request data cloud in small multiple batches because the service cannot handle a long request
-	while (rics.length > 30) {
-		this._requestDataCloud(ricMap, fields, rics.splice(0, 30));
-	}
-
-	return this._requestDataCloud(ricMap, fields, rics);
-};
-
-/**
- * @private
- * @param {Object.<string, Array.<string>>} ricMap of Array of subscription object
- * @param {Array.<string>} fields
- * @param {Array.<string>} rics
- * @return {XMLHttpRequest}
- */
-DataCache.prototype._requestDataCloud = function (ricMap, fields, rics) { // Small batch
-	if (!rics || rics.length <= 0) {
-		return null;
-	}
-
-	if (!fields || fields.length <= 0) {
-		return null;
-	}
-
-	let xhr = new XMLHttpRequest();
-
-	xhr.onload = this._onADCUpdate;
-	xhr.onerror = this._onADCError;
-	xhr.ricMap = ricMap;
-
-	xhr.open("POST", this._adcUrl, true);
-	xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
-
-	let body = 'formula=' + fields + '&identifiers=' + rics;
-
-	// window.console.log("ADC is requested with " + body);
-	if (this._productId) {
-		body += '&productid=' + this._productId;
-	}
-
-	if (this._userId) {
-		body += '&uuid=' + this._userId;
-	}
-
-	if (this._lang) {
-		body += '&lang=' + this._lang;
-	}
-
-	xhr.send(body);
-
-	return xhr;
-};
-
 /**
  * @private
  * @param {string|Object.<string, *>} obj
@@ -1272,62 +962,12 @@ DataCache.prototype._quotes2 = null;
  */
 DataCache.prototype._staticFields = null;
 
-//#region ADC
-/**
- * @private
- * @type {Array.<string>}
- */
-DataCache.prototype._adcFields = null;
-
-/**
- * @private
- * @type {Object.<string, number>}
- */
-DataCache.prototype._adcRefMap = null;
-
-/**
- * @private
- * @type {number}
- */
-DataCache.prototype._adcTimerId = -1;
-
-/**
- * @private
- * @description ricMap of Array of subscription object
- * @type {Object.<string, Array.<string>>}
- */
-DataCache.prototype._adcRicMap = null;
-
-/**
- * @private
- * @type {string}
- */
-DataCache.prototype._adcUrl = "/datacloud/rest/select";
-
-/**
- * @private
- * @type {string}
- */
-DataCache.prototype._userId = "";
-
-/**
- * @private
- * @type {string}
- */
-DataCache.prototype._productId = "";
-
 /** @protected
  * @ignore
  * @type {boolean}
  */
 DataCache.prototype._composing = false;
 
-/** @protected
- * @ignore
- * @type {string}
- */
-DataCache.prototype._lang = "";
-//#endregion ADC
 //#endregion Private
 
 DataCache._proto = DataCache.prototype;

package/lib/core/es6/data/WrappedView.d.ts

@@ -2,6 +2,7 @@ import Ext from "../../../tr-grid-util/es6/Ext.js";
 import EventDispatcher from "../grid/event/EventDispatcher.js";
 import DataView from "./DataView.js"; // eslint-disable-line
 import DataTable from "./DataTable.js"; // eslint-disable-line
+import DataCache from "./DataCache.js"; // eslint-disable-line
 import ColumnStats from "./ColumnStats.js"; // eslint-disable-line
 
 declare namespace WrappedView {

package/lib/core/es6/data/WrappedView.js

@@ -2,6 +2,7 @@ import Ext from "../../../tr-grid-util/es6/Ext.js";
 import EventDispatcher from "../grid/event/EventDispatcher.js";
 import DataView from "./DataView.js"; // eslint-disable-line
 import DataTable from "./DataTable.js"; // eslint-disable-line
+import DataCache from "./DataCache.js"; // eslint-disable-line
 import ColumnStats from "./ColumnStats.js"; // eslint-disable-line
 
 /** @event WrappedView#dataChanged

package/lib/core/es6/grid/Core.js

@@ -574,7 +574,7 @@ Core.prototype._hasPendingRowChange = false;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.103";
+	return "5.1.105";
 };
 /** {@link ElementWrapper#dispose}
 * @override

package/lib/core/es6/grid/LayoutGrid.d.ts

@@ -11,6 +11,7 @@ import SelectionList from "./util/SelectionList.js";
 import ILayoutGrid from "./ILayoutGrid.js";
 import ElementWrapper from "./components/ElementWrapper.js";
 import HScrollbar from "./components/HScrollbar.js";
+import CellBoundPainter from "./util/CellBoundPainter.js";
 
 declare class LayoutGrid extends ElementWrapper {
 

package/lib/core/es6/grid/LayoutGrid.js

@@ -12,6 +12,7 @@ import SelectionList from "./util/SelectionList.js";
 import ILayoutGrid from "./ILayoutGrid.js";
 import ElementWrapper from "./components/ElementWrapper.js";
 import HScrollbar from "./components/HScrollbar.js";
+import CellBoundPainter from "./util/CellBoundPainter.js";
 /* eslint-enable */
 
 //#region Events
@@ -277,7 +278,10 @@ LayoutGrid.prototype._leftColumnSeparator = null;
 * @private
 */
 LayoutGrid.prototype._rightColumnSeparator = null;
-
+/** @type {Element}
+* @private
+*/
+LayoutGrid.prototype._cellBoundPainter = null;
 /**
  * {@link ElementWrapper#dispose}
  * @override
@@ -302,6 +306,10 @@ LayoutGrid.prototype.dispose = function () {
 	this._ctx = null;
 	this._hscrollbar = null;
 
+	if(this._cellBoundPainter) {
+		this._cellBoundPainter.dispose();
+	}
+
 	this._dispose();
 };
 /**
@@ -2272,7 +2280,22 @@ LayoutGrid.prototype.selectCell = function (colIndex, rowIndex, selected) {
 * @param {number} width
 * @param {number} height
 */
-LayoutGrid.prototype.setCellBounds = function (colIndex, rowIndex, width, height) {};
+LayoutGrid.prototype.setCellBounds = function (colIndex, rowIndex, width, height) {
+	let boundLayer = this._initBoundLayer();
+	let cellBoundPainter = this._cellBoundPainter;
+	if(!cellBoundPainter) {
+		cellBoundPainter = this._cellBoundPainter = new CellBoundPainter({
+			boundLayer: boundLayer,
+			layoutX: this._trackX,
+			layoutY: this._trackY,
+			hscrollbar: this._hscrollbar,
+			calculateColumnBounds: this.calculateColumnBounds.bind(this)
+		});
+	}
+
+	let colCount = this.getColumnCount();
+	cellBoundPainter.setCellBounds(colIndex, rowIndex, width, height, colCount);
+};
 /** @public
 * @ignore
 * @return {!TrackLayout}

package/lib/core/es6/grid/VirtualizedLayoutGrid.d.ts

@@ -6,6 +6,7 @@ import ILayoutGrid from "./ILayoutGrid.js";
 import LayoutGrid from "./LayoutGrid.js";
 import ElementWrapper from "./components/ElementWrapper.js";
 import HScrollbar from "./components/HScrollbar.js";
+import CellBoundPainter from "./util/CellBoundPainter.js";
 
 declare class VirtualizedLayoutGrid extends ElementWrapper {