@refinitiv-ui/efx-grid 6.0.102 → 6.0.104

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

@@ -49,14 +49,6 @@ declare class DataCache extends EventDispatcher {
 
     public cloneRowData(rid: string): any;
 
-    public addStaticFields(fields: (string)[]|null): void;
-
-    public removeStaticFields(fields: (string)[]|null): void;
-
-    public resetStaticFields(): void;
-
-    public getStaticFields(): { [key: string]:  number }|null;
-
     public dump(options?: any): (any)[];
 
     public log(opt_options?: any): void;

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

@@ -24,7 +24,6 @@ let DataCache = function () {
 
 	_t._rows = {};
 	_t._subs = {};
-	_t._staticFields = {};
 	_t._onInsert = _t._onInsert.bind(_t);
 	_t._onUpdate = _t._onUpdate.bind(_t);
 	_t._onDelete = _t._onDelete.bind(_t);
@@ -460,64 +459,34 @@ DataCache.prototype.cloneRowData = function (rid) {
 	return values;
 };
 
-/**
- * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
+/** Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
- * @param {Array.<string>} fields
+ * @ignore
  * @suppress {checkTypes}
  */
-DataCache.prototype.addStaticFields = function (fields) {
-	if (!Array.isArray(fields)) {
-		return;
-	}
-
-	for (let i in fields) {
-		if (!this._staticFields[fields[i]]) {
-			this._staticFields[fields[i]] = 1;
-		} else {
-			this._staticFields[fields[i]]++;
-		}
-	}
-};
+DataCache.prototype.addStaticFields = function () {};
 
 /**
  * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
- * @param {Array.<string>} fields
+ * @ignore
  * @suppress {checkTypes}
  */
-DataCache.prototype.removeStaticFields = function (fields) {
-	if (!Array.isArray(fields)) {
-		return;
-	}
-
-	for (let i in fields) {
-		if (this._staticFields[fields[i]]) {
-			this._staticFields[fields[i]]--;
-
-			if (this._staticFields[fields[i]] === 0) {
-				delete this._staticFields[fields[i]];
-			}
-		}
-	}
-};
+DataCache.prototype.removeStaticFields = function () {};
 
 /**
  * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
+ * @ignore
  */
-DataCache.prototype.resetStaticFields = function () {
-	this._staticFields = {};
-};
+DataCache.prototype.resetStaticFields = function () {};
 
 /**
  * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
- * @return {Object.<string, number>}
+ * @ignore
  */
-DataCache.prototype.getStaticFields = function () {
-	return this._staticFields;
-};
+DataCache.prototype.getStaticFields = function () {};
 
 /**
  * Construct a JSON object that is compatible with console.table()
@@ -784,29 +753,15 @@ DataCache.prototype._onQ2DataChanged = function (e) {
  */
 DataCache.prototype._onQ2SubAdded = function (e) {
 	let subs = e["subs"];
-	let duplicateSubIds = e["duplicateSubIds"];
 	let len = subs.length;
 
 	for (let i = 0; i < len; ++i) {
 		let sub = subs[i];
-		let ric = sub["ric"];
 
 		// chain subId fires twice, one with "_ci_" and one without "_ci_"
 		// the subId with "_ci_" should be ignore
-		if(sub["id"].indexOf("_ci_") >= 0){
-			continue;
-		}
-
-		this.addSubscription(sub, ric);
-
-		if (duplicateSubIds) { // There will be no network request for duplicate subs, and hence we need to update the data from our cache
-			let dupSubId = duplicateSubIds[i];
-
-			if (dupSubId) {
-				window.setTimeout(
-					this._onDuplicateRic.bind(this, sub["id"], this.getRowData(dupSubId + ric)),
-					10);
-			}
+		if(sub["id"].indexOf("_ci_") < 0){
+			this.addSubscription(sub, sub["ric"]);
 		}
 	}
 };
@@ -824,48 +779,8 @@ DataCache.prototype._onQ2SubRemoved = function (e) {
 
 		// chain subId fires twice, one with "_ci_" and one without "_ci_"
 		// the subId with "_ci_" should be ignore
-		if(sub["id"].indexOf("_ci_") >= 0){
-			continue;
-		}
-
-		this.removeSubscription(sub);
-	}
-};
-
-/**
- * @private
- * @param {string} subId
- * @param {Object.<string, *>} dupData
- */
-DataCache.prototype._onDuplicateRic = function (subId, dupData) {
-	let sub = this._subs[subId];
-
-	if (!sub) {
-		return;
-	}
-
-	sub = sub["s"]; // Quotes2' subscription
-
-	let ric = sub["ric"];
-	let dupSubId = /** @type{string} */(dupData["SUB_ID"]);
-	let values = this._cloneRowData(dupData, ric, subId);
-
-	if (!values) {
-		return;
-	}
-
-	this._onInsert(sub, ric, values);
-
-	let children = sub["children"];
-
-	if (children) {
-		let childCount = children.length;
-
-		for (let i = 0; i < childCount; ++i) {
-			ric = children[i];
-			values = this._cloneRowData(dupSubId, ric, subId);
-
-			this._onInsert(sub, ric, values);
+		if(sub["id"].indexOf("_ci_") < 0){
+			this.removeSubscription(sub);
 		}
 	}
 };
@@ -906,38 +821,6 @@ DataCache.prototype._onDelete = function (sub, ric, values/*, rowN*/) {
 	this.setRowData(sub["id"] + ric, null, {"subscription": sub, "ric": ric});
 };
 
-/**
- * @private
- * @param {string|Object.<string, *>} obj
- * @param {string} ric
- * @param {string} newSubId
- * @return {Object}
- */
-DataCache.prototype._cloneRowData = function (obj, ric, newSubId) {
-	let subId = (typeof obj === "string") ? obj : obj["SUB_ID"];
-	let fields = this._rows[subId + ric];
-
-	if (!fields) { // The specified row has been removed
-		if (typeof obj === "object") {
-			fields = obj;
-		} else {
-			return null;
-		}
-	}
-
-	let values = {};
-
-	for (let key in fields) {
-		if (this._staticFields[key] == null) { // Static field must not be cloned
-			values[key] = fields[key];
-		}
-	}
-
-	values["SUB_ID"] = newSubId;
-
-	return values;
-};
-
 /** @protected
  * @ignore
  * @type {!Object.<string, Object>}
@@ -956,12 +839,6 @@ DataCache.prototype._subs;
  */
 DataCache.prototype._quotes2 = null;
 
-/**
- * @private
- * @type {Object.<string, number>}
- */
-DataCache.prototype._staticFields = null;
-
 /** @protected
  * @ignore
  * @type {boolean}

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

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

package/lib/grid/index.js

@@ -1,3 +1,3 @@
 import {Grid} from "./lib/efx-grid.js";
 export {Grid}
-window.EFX_GRID = { version: "6.0.102" };
+window.EFX_GRID = { version: "6.0.104" };

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

@@ -14670,13 +14670,28 @@ RowDefinition.dispose = function(rowDef) {
 
 /** @type {string}
 * @private
-* @const
+* @constant
 */
 const SYNAPSE_URL =
 	"/synapse/service/suggestions/suggest/?"
 	+ "hits=1" // search only 1 result
 	+ "&profile=" + encodeURIComponent("Field Selector");
 
+/** @type {!RegExp}
+* @private
+* @constant
+* @description
+* ^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|SDATE)	=> non-capturing group match EDATE or SDATE
+* [\w\-\=\,]+ 		=> another propertie param
+* [\)]$						=> end with only )
+* i								=> for match both upper and lower cases
+*/
+const TimeSeriesRegEx = /^TR\.[\w]+\([\w\-\=\,]*(?:EDATE|SDATE)\=+[\w\-\=\,]*[ \w]*\)$/i;
+
 /* @namespace */
 let FieldDefinition = {};
 
@@ -14855,10 +14870,10 @@ FieldDefinition.hasFieldInfo = function(field) {
 /** @public
 * @function
 * @param {string} field
-* @return {Object}
+* @return {Array}
 */
 FieldDefinition.getTimeSeriesChildren = function(field) {
-	return FieldDefinition._timeSeriesChildren[field];
+	return FieldDefinition._timeSeriesChildren[field] || null;
 };
 /** @public
 * @function
@@ -14919,7 +14934,7 @@ FieldDefinition.isRealTimeField = function(field) {
 		return false;
 	}
 
-	if(FieldDefinition.isAdc(field)) {
+	if(FieldDefinition.isAdc(field)) { // Note that all TimeSeries fields are ADC field
 		return false;
 	}
 
@@ -14931,10 +14946,6 @@ FieldDefinition.isRealTimeField = function(field) {
 		return false;
 	}
 
-	if(FieldDefinition.isTimeSeries(field)) {
-		return false;
-	}
-
 	return FieldDefinition.getFieldProperty(field, "IsRealtimeField") !== false;
 };
 
@@ -14963,21 +14974,10 @@ FieldDefinition.isTimeSeries = function (field) {
 	// We can check time series using a cache to avoid duplicating checks in regular expressions.
 	let timeSeriesField = FieldDefinition.getFieldProperty(field, "timeSeries");
 	if (timeSeriesField != null) {
-		return timeSeriesField;
+		return timeSeriesField ? true : false;
 	}
 
-	/*
-		^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|SDATE )		=> non-capturing group match EDATE or SDATE
-		[\w\-\=\,]+             => another propertie param
-		[\)]$                   => end with only )
-		i						=> for match both upper and lower cases
-	*/
-	let timeSeriesRegex = /^TR\.[\w]+\([\w\-\=\,]*(?:EDATE|SDATE)\=+[\w\-\=\,]*[ \w]*\)$/i;
-	return timeSeriesRegex.test(field);
+	return TimeSeriesRegEx.test(field);
 };
 
 /**