@refinitiv-ui/efx-grid 6.0.52 → 6.0.54

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

@@ -10079,6 +10079,12 @@ Segment.prototype.getChildIds = function() {
 	return this._childCount ? Object.keys(this._children) : [];
 };
 /** @public
+* @return {!Object}
+*/
+Segment.prototype.getChildren = function() {
+	return this._children;
+};
+/** @public
 * @return {number}
 */
 Segment.prototype.getChildCount = function() {
@@ -12425,9 +12431,9 @@ DataTable.prototype.getSegmentChildIds = function(segmentId) {
 };
 /** Sort all of existing segments by multiple sort logics
 * @public
-* @param {Function|Array.<Function>} sortLogics
-* @param {Array.<number>} sortOrders
-* @param {Array.<string>} cids
+* @param {Function|Array.<Function>|Object} sortLogics
+* @param {Array.<number>=} sortOrders
+* @param {Array.<string>=} cids
 * @return {boolean}
 */
 DataTable.prototype.sortSeparators = function (sortLogics, sortOrders, cids) {
@@ -14466,9 +14472,9 @@ RowDefinition.dispose = function(rowDef) {
 * @const
 */
 var SYNAPSE_URL =
-	'/synapse/service/suggestions/suggest/?'
-	+ 'hits=1' // search only 1 result
-	+ '&profile=' + encodeURIComponent('Field Selector');
+	"/synapse/service/suggestions/suggest/?"
+	+ "hits=1" // search only 1 result
+	+ "&profile=" + encodeURIComponent("Field Selector");
 
 /* @namespace */
 var FieldDefinition = {};
@@ -14585,18 +14591,13 @@ FieldDefinition._timeSeriesChildren = {};
 * @private
 * @const
 */
-FieldDefinition._synapse = '';
+FieldDefinition._synapse = "";
 /**
 * @type {string}
 * @private
 * @const
 */
-FieldDefinition._lang = 'en';
-/**
-* @type {boolean}
-* @private
-*/
-FieldDefinition._caching = false;
+FieldDefinition._lang = "en";
 /**
 * @type {boolean}
 * @private
@@ -14623,17 +14624,22 @@ FieldDefinition.set = function(field, def) {
 		}
 	}
 };
-/** @public
+/** Get field definition object
+* @public
 * @function
 * @param {string} field
 * @return {Object}
 */
 FieldDefinition.get = function(field) {
-	if(this._caching) {
-		return FieldDefinition._defs[field];
-	}
-	return null;
+	return FieldDefinition._defs[field] || null;
 };
+/** Get field definition object
+* @public
+* @function
+* @param {string} field
+* @return {Object}
+*/
+FieldDefinition.getFieldInfo = FieldDefinition.get;
 
 /** @public
 * @function
@@ -14642,7 +14648,7 @@ FieldDefinition.get = function(field) {
 */
 FieldDefinition.hasFieldInfo = function(field) {
 	var val = FieldDefinition.get(field);
-	return val && val.field; // Already preventing an error caused by accessing a property on a null value
+	return (val && val.field) ? true : false; // Already preventing an error caused by accessing a property on a null value
 };
 
 /** @public
@@ -14678,15 +14684,6 @@ FieldDefinition.remove = function(field) {
 */
 FieldDefinition.setSynapseConfig = function (config) {
 	FieldDefinition._synapse = config;
-
-};
-
-/** @public
-* @function
-* @param {boolean} caching
-*/
-FieldDefinition.setFieldCaching = function (caching) {
-	FieldDefinition._caching = caching;
 };
 
 /** @public
@@ -14811,7 +14808,7 @@ FieldDefinition.getFieldProperty = function(field, propertyName) {
 	return null;
 };
 
-/** to get more info about field via synapse service
+/** To get more info about field via synapse service
 * @private
 * @param {string} field
 * @returns {Promise}
@@ -14843,12 +14840,12 @@ FieldDefinition.loadFieldInfo = function (field) {
 	// everything fine, call synapse service
 	else {
 		var queryUrl = SYNAPSE_URL
-			+ '&api-key=' + encodeURIComponent(synapse.apiKey)
-			+ '&contextApp=' + encodeURIComponent(synapse.contextApp)
-			+ '&language=' + encodeURIComponent(FieldDefinition._lang)
-			+ '&query=' + encodeURIComponent(field);
+			+ "&api-key=" + encodeURIComponent(synapse.apiKey)
+			+ "&contextApp=" + encodeURIComponent(synapse.contextApp)
+			+ "&language=" + encodeURIComponent(FieldDefinition._lang)
+			+ "&query=" + encodeURIComponent(field);
 		if (synapse.auth) {
-			queryUrl += '&auth=' + encodeURIComponent(synapse.auth);
+			queryUrl += "&auth=" + encodeURIComponent(synapse.auth);
 		}
 		// TODO: handle client timeout
 		var xmr = new XMLHttpRequest();
@@ -14857,9 +14854,9 @@ FieldDefinition.loadFieldInfo = function (field) {
 		FieldDefinition._loadingField[field] = defer;
 
 		// for now we care only successful case
-		xmr.addEventListener('loadend', onLoadEnd);
-		xmr.addEventListener('timeout', onError);
-		xmr.addEventListener('error', onError);
+		xmr.addEventListener("loadend", onLoadEnd);
+		xmr.addEventListener("timeout", onError);
+		xmr.addEventListener("error", onError);
 		xmr.open("GET", queryUrl, true); // true for asynchronous
 		xmr.send();
 	}
@@ -14887,7 +14884,7 @@ FieldDefinition._mockOnLoadEndData = function (field, defer) {
 	var fieldUpperCase = field.toUpperCase();
 	var fieldLowerCase = fieldUpperCase.toLowerCase();
 	var label;
-	if (fieldLowerCase.indexOf('_') === 2) { // transform XX_ABCD -> Abcd
+	if (fieldLowerCase.indexOf("_") === 2) { // transform XX_ABCD -> Abcd
 		label = fieldUpperCase[3] + fieldLowerCase.substring(4);
 	} else {
 		label = fieldUpperCase[0] + fieldLowerCase.substring(1);
@@ -14949,49 +14946,49 @@ FieldDefinition._mockOnLoadEndData = function (field, defer) {
 function onLoadEnd(e) {
 	var xmr = e.currentTarget;
 	var defer = xmr._defer;
-	var resolve = defer.resolve;
-	var reject = defer.reject;
+	var field = xmr._field;
 
-	delete FieldDefinition._loadingField[xmr._field];
+	delete FieldDefinition._loadingField[field];
 
 	if (xmr.status === 200) { // case success
-		var returnObj = {
-			field: xmr._field,
-			fieldDefinition: null
-		};
 		var res = JSON.parse(xmr.responseText);
+		var fieldDef = null;
 
 		var result = res.result && res.result[0];
 		if (result) {
 			var item = result.hits && result.hits[0];
 			if (item && item.p) {
 				var profile = item.p;
-				if (profile.fn.toUpperCase() === xmr._field.toUpperCase()) {
-					var fieldDef = FieldDefinition.get(xmr._field) || {};
+				if (profile.fn.toUpperCase() === field.toUpperCase()) {
+					fieldDef = FieldDefinition.get(field) || {};
 
 					fieldDef.field = profile.fn; // name
+					fieldDef.name = profile.fl; // label
 					fieldDef.rank = profile.Rank;
 					fieldDef.fieldDataType = profile.fdt; // data type
+					fieldDef.id = profile.fid;
 					fieldDef.IsMonitorOnlyField = profile.fimo;
 					fieldDef.IsRealtimePortfolioField = profile.firp;
 					fieldDef.IsRealtimeField = profile.firt;
-					fieldDef.name = profile.fl; // label
 					fieldDef.source = profile.fsrc;
 					fieldDef.sourceRank = profile.fsrnk;
 					fieldDef.description = item.title;
 
-					FieldDefinition.set(xmr._field, fieldDef);
-					returnObj.fieldDefinition = fieldDef;
+					FieldDefinition.set(field, fieldDef);
 				}
 			}
 		}
-		resolve(returnObj);
+		if(fieldDef) {
+			defer.resolve(fieldDef);
+		} else {
+			defer.reject("No definition for " + field);
+		}
 	} else if (xmr._error) { // case error && time out
-		xmr._error.field = xmr._field;
-		reject(xmr._error);
+		xmr._error.field = field;
+		defer.reject(xmr._error);
 	} else { // case status not 200
-		reject({
-			field: xmr._field,
+		defer.reject({
+			field: field,
 			status: xmr.status,
 			statusText: xmr.statusText,
 			request: xmr
@@ -28976,6 +28973,8 @@ var DataView = function(source) {
 	t._onRefreshTimeout = t._onRefreshTimeout.bind(t);
 	t._updateWrapCount = t._updateWrapCount.bind(t);
 
+	t._byRemovalMap = t._byRemovalMap.bind(t);
+
 	t._rids = [];
 	t._sortingDefs = [];
 	t._columnStats = {};
@@ -29029,6 +29028,15 @@ DataView.prototype._hiddenRids = null;
 * @type {Object.<string, boolean>}
 */
 DataView.prototype._collapsedRids = null; // for segmentation
+/** @private
+* @type {Object.<string, number>}
+*/
+DataView.prototype._excludedRids = null;
+/** @private
+* @type {boolean}
+*/
+DataView.prototype._emptySegmentFiltering = false;
+
 /** @private
 * @type {Object.<string, number>}
 */
@@ -29725,8 +29733,6 @@ DataView.prototype.hideRow = function(rId, hidden) {
  */
 DataView.prototype.hideRows = function(rowRefs, hidden) {
 	hidden = hidden !== false;
-	var dirty = false;
-	var rids = this._toRowIds(rowRefs);
 	var hiddenRids = this._hiddenRids;
 
 	if(hidden){
@@ -29737,11 +29743,19 @@ DataView.prototype.hideRows = function(rowRefs, hidden) {
 		return; // All rows are visible
 	}
 
+	var rids = this._toRowIds(rowRefs);
+	var dirty = false;
+
 	for(var i = rids.length; --i >= 0;) {
 		var rid = rids[i];
 		if(rid) { // undefined, null, and an empty string value are not a valid row id
-			if(!!hiddenRids[rid] !== hidden) {
-				hiddenRids[rid] = hidden;
+			if(hidden) {
+				if(!hiddenRids[rid]) {
+					hiddenRids[rid] = true;
+					dirty = true;
+				}
+			} else if(hiddenRids[rid]) {
+				delete hiddenRids[rid];
 				dirty = true;
 			}
 		}
@@ -29750,11 +29764,9 @@ DataView.prototype.hideRows = function(rowRefs, hidden) {
 	if(dirty) {
 		if(!hidden) {
 			var hasHiddenRow = false;
-			for(var key in hiddenRids) {
-				if(hiddenRids[key]) {
-					hasHiddenRow = true;
-					break;
-				}
+			for(var key in hiddenRids) { // eslint-disable-line
+				hasHiddenRow = true;
+				break;
 			}
 			if(!hasHiddenRow) {
 				hiddenRids = this._hiddenRids = null;
@@ -29762,6 +29774,7 @@ DataView.prototype.hideRows = function(rowRefs, hidden) {
 		}
 		this._refreshAndNotify(); // Very slow
 	}
+
 };
 /**
  * Show/hide rows in the data view
@@ -29843,23 +29856,14 @@ DataView.prototype.filterOut = function(cid, value) {
 */
 DataView.prototype.filterInOnce = function(cid, value, opt_filteringOut) {
 	var checker = this._getFilterLogic(cid, value);
-	if(!checker) { return; }
-
-	var filteringOut = (opt_filteringOut === true);
-	var rids = this._rids;
-	var dt = this._dt;
 	var removalMap = {};
-	var totalRem = 0;
-	var len = rids.length;
-	for(var i = len; --i >= 0;) {
-		var rid = rids[i];
-		var values = dt.getRowData(rid);
-		if (!values || checker(rid, values) === filteringOut) {
-			removalMap[rid] = true;
-			++totalRem;
-		}
+	if(!this._getRemovalMap(
+		removalMap,
+		checker,
+		(opt_filteringOut === true)
+	)) {
+		return;
 	}
-	if(totalRem <= 0) { return; }
 
 	var firstChange = this._removeRowIds(removalMap);
 
@@ -29882,13 +29886,13 @@ DataView.prototype.filterOutOnce = function(cid, value) {
 	this.filterInOnce(cid, value, true);
 };
 /** @private
-* @param {!Object.<string, *>} removalMap
+* @param {!Object} removalMap
 * @return {number}
 */
 DataView.prototype._removeRowIds = function(removalMap) {
-	var firstChange = this._removeArrayItems(this._rids, removalMap);
+	var firstChange = DataView._removeArrayItems(this._rids, removalMap);
 	if(this._groupView) {
-		firstChange = this._removeArrayItems(this._groupView, removalMap);
+		firstChange = DataView._removeArrayItems(this._groupView, removalMap);
 	}
 
 	if(this._groupMembers) {
@@ -29899,6 +29903,7 @@ DataView.prototype._removeRowIds = function(removalMap) {
 		}
 	}
 	return firstChange;
+
 };
 /** @public
 * @fires DataView#pageCountChanged
@@ -31452,9 +31457,9 @@ DataView.prototype.getSegmentChildIds = function(segmentRef) {
 };
 /** Sort all of existing segments by multiple sort logics
 * @public
-* @param {Array.<Function>} sortLogics
-* @param {Array.<number>} sortOrders
-* @param {Array.<string>} cids
+* @param {Function|Array.<Function>|Object} sortLogics
+* @param {Array.<number>=} sortOrders
+* @param {Array.<string>=} cids
 */
 DataView.prototype.sortSeparators = function (sortLogics, sortOrders, cids) {
 	this._dt.sortSeparators(sortLogics, sortOrders, cids);
@@ -31466,7 +31471,19 @@ DataView.prototype.sortSeparators = function (sortLogics, sortOrders, cids) {
 DataView.prototype.sortSegments = function (compare) {
 	this._dt.sortSegments(compare);
 };
-
+/** Automatically hide empty segment when all of its member are filtered out. An empty segment will not be hidden, if there is no active filter. Collapsed segment does not count as filtering.
+* @public
+* @param {boolean=} enabled
+*/
+DataView.prototype.enableEmptySegmentFiltering = function (enabled) {
+	enabled = enabled !== false;
+	if(this._emptySegmentFiltering !== enabled) {
+		this._emptySegmentFiltering = enabled;
+		if(this._userFilter) {
+			this._refreshAndNotify();
+		}
+	}
+};
 /**
 * @public
 * @param {string|number} segmentRef Row id or row index
@@ -31626,26 +31643,35 @@ DataView.prototype._updateRowIds = function(opt_rowIds) {
 	// Perform the following sequences: parent view cloning >> row hiding >> row filtering >> row grouping >> sorting >> paging
 	this._rids = opt_rowIds || this._parent.getAllRowIds(); // Get all data ids
 
-	if(this._hiddenRids) {
-		this._removeArrayItems(this._rids, this._hiddenRids);
-	}
+	this._dispatch("beforeFiltering", {});
+
+	this._excludedRids = {};
+	var exclusionCount = 0;
+	exclusionCount += DataView._copyObjectKeys(this._excludedRids, this._hiddenRids);
+
+	// Segment separators should not be filtered out (hidden)
 	var segments = this._dt._getSegmentSeparators();
+	var filterExceptions = segments ? segments.getSegments() : null;
+	var userRemoval = this._getRemovalMap(this._excludedRids, this._userFilter, this._filteringOut, filterExceptions);
+	exclusionCount += userRemoval;
+
 	this._collapsedRids = null;
-	var filterExceptions = null;
 	if(segments) {
-		filterExceptions = segments.getSegments(); // Segment separators should not be filtered out (hidden)
-		var collapsedRows = this._collapsedRids = segments.getCollapsedRows(); // Children of collapsed segments must be filtered out (hidden)
-		if(collapsedRows) {
-			this._removeArrayItems(this._rids, collapsedRows);
+		if(userRemoval && this._emptySegmentFiltering) {
+			exclusionCount += this._getEmptySegments(this._excludedRids, filterExceptions);
 		}
+		this._collapsedRids = segments.getCollapsedRows();
+		 // Children of collapsed segments must be filtered out (hidden)
+		exclusionCount += DataView._copyObjectKeys(this._excludedRids, this._collapsedRids);
 	}
 
-	this._dispatch("beforeFiltering", {});
-	this._quickFilter(this._userFilter, this._filteringOut, filterExceptions);
-
-	if(this._groupLevel > 0 && !opt_rowIds) {
-		this._quickFilter(this._groupFilterLogic, false); // Filter In
+	if(this._groupLevel > 0 && !opt_rowIds) { // WARNING: The line below is quite slow
+		exclusionCount += this._getRemovalMap(this._excludedRids, this._groupFilterLogic, false); // Filter In
+	}
+	if(exclusionCount) {
+		this._rids = this._rids.filter(this._byRemovalMap);
 	}
+	this._excludedRids = null;
 
 	if(this._groupMembers) { // Has grouping
 		this._populateGroups(); // View will be properly re-populate inside _populateGroups()
@@ -31917,9 +31943,9 @@ DataView.prototype._onRowUpdated = function(e) { // onUpdate
 
 		if(this._groupLevel > 0) {
 			if(processingFlag === 1) { // The row is moved to the other group
-				if(this._removeArrayItem(this._rids, rid) >= 0) {
+				if(DataView._removeArrayItem(this._rids, rid) >= 0) {
 					if(this._groupView) {
-						this._removeArrayItem(this._groupView, rid);
+						DataView._removeArrayItem(this._groupView, rid);
 					}
 				}
 				if(this._shared.multiGroupRow) {
@@ -32119,34 +32145,31 @@ DataView.prototype._getRowIndex = function(rids, opt_nextRid, opt_fallback) {
 * @returns {number}
 */
 DataView.prototype._removeDataRow = function(rid) {
-	var at = this._removeArrayItem(this._rids, rid);
+	var at = DataView._removeArrayItem(this._rids, rid);
 	if(this._groupView && at >= 0) {
-		at = this._removeArrayItem(this._groupView, rid);
+		at = DataView._removeArrayItem(this._groupView, rid);
 	}
 	return at;
 };
 /** @private
-* @param {Array} ary
+* @param {!Array} ary
 * @param {*} item
 * @return {number} Index of the removed item
 */
-DataView.prototype._removeArrayItem = function(ary, item) {
-	var len = ary.length;
-	for(var i = 0; i < len; ++i) {
-		if(ary[i] === item) {
-			ary.splice(i, 1);
-			return i;
-		}
+DataView._removeArrayItem = function(ary, item) {
+	var at = ary.indexOf(item);
+	if(at >= 0) {
+		ary.splice(at, 1);
 	}
-	return -1;
+	return at;
 };
 /** Remove multiple array items
 * @private
 * @param {Array.<string>} ary
-* @param {Object.<string, *>} items
+* @param {Object} items
 * @return {number} First item index that is being removed. NaN if no item is removed
 */
-DataView.prototype._removeArrayItems = function(ary, items) {
+DataView._removeArrayItems = function(ary, items) {
 	var f = NaN;
 	var c = 0;
 	for(var i = ary.length; --i >= 0;) {
@@ -32164,6 +32187,24 @@ DataView.prototype._removeArrayItems = function(ary, items) {
 	}
 	return f;
 };
+/** @private
+* @param {Object} baseObj
+* @param {Object} masterObj
+* @returns {number}
+*/
+DataView._copyObjectKeys = function(baseObj, masterObj) {
+	if(masterObj) {
+		var count = 0;
+
+		for(var key in masterObj) {
+			baseObj[key] = 1;
+			++count; // WARNING: duplicated key can be counted more than once
+		}
+		return count;
+	}
+	return 0;
+};
+
 /** @private
 * @param {string|null} rid
 * @param {Object} rowData
@@ -32198,9 +32239,6 @@ DataView.prototype.isRowFiltered = function(rid, rowData) {
 			return true;
 		}
 	}
-	if(this.isSegmentSeparator(rid)) {
-		return false; // Segment separator cannot be filtered
-	}
 	if(this._collapsedRids) {
 		if(this._collapsedRids[rid]) {
 			return true;
@@ -32242,41 +32280,92 @@ DataView.prototype._sort = function() {
 };
 
 /** @private
+* @param {string} rid
+* @returns {boolean}
+*/
+DataView.prototype._byRemovalMap = function(rid) {
+	return !this._excludedRids[rid];
+};
+/** @private
+* @param {Object} removalMap
 * @param {Function} checker
 * @param {boolean} filteringOut
 * @param {Object=} exceptions
+* @returns {number} Number of rids that would be filtered out
 */
-DataView.prototype._quickFilter = function(checker, filteringOut, exceptions) {
+DataView.prototype._getRemovalMap = function(removalMap, checker, filteringOut, exceptions) {
 	if(!checker) {
-		return;
+		return 0;
 	}
 
 	var rids = this._rids; // Make local variable to speed up the process
-	var len = rids.length;
 	var dt = this._dt;
-	var spliceCount = 0;
-	for(var i = len; --i >= 0;) {
-		var rid = rids[i];
-		var removed = false;
-		if(!exceptions || !exceptions[rid]) {
-			var values = dt.getRowData(rid);
+	var count = 0;
+	var rid, i, values;
+	var len = rids.length;
+
+	if(exceptions) {
+		for(i = len; --i >= 0;) {
+			rid = rids[i];
+			if(!exceptions[rid]) {
+				values = dt.getRowData(rid);
+				if (values) {
+					if(checker(rid, values) === filteringOut) {
+						removalMap[rid] = 1;
+						++count;
+					}
+				} else {
+					removalMap[rid] = 1;
+					++count;
+				}
+			}
+		}
+	} else {
+		for(i = len; --i >= 0;) {
+			rid = rids[i];
+			values = dt.getRowData(rid);
 			if (values) {
-				removed = checker(rid, values) === filteringOut;
+				if(checker(rid, values) === filteringOut) {
+					removalMap[rid] = 1;
+					++count;
+				}
 			} else {
-				removed = true;
+				removalMap[rid] = 1;
+				++count;
 			}
 		}
-		if(removed) {
-			++spliceCount;
-		} else if(spliceCount > 0) {
-			rids.splice(i + 1, spliceCount);
-			spliceCount = 0;
-		}
 	}
-	if(spliceCount > 0) {
-		rids.splice(0, spliceCount);
+	return count;
+};
+/** @private
+* @param {Object} removalMap
+* @param {Object} segmentRids
+* @returns {number} Number of rids that would be filtered out
+*/
+DataView.prototype._getEmptySegments = function(removalMap, segmentRids) {
+	var segments = this._dt._getSegmentSeparators();
+	var count = 0;
+	for(var segmentId in segmentRids) {
+		var segment = segments.getSegment(segmentId);
+		if(segment) {
+			var chdr = segment.getChildren();
+			var emptySegment = true;
+			for(var childId in chdr) {
+				if(!removalMap[childId]) {
+					emptySegment = false;
+					break;
+				}
+			}
+			if(emptySegment) {
+				removalMap[segmentId] = 1;
+				++count;
+			}
+		}
 	}
+
+	return count;
 };
+
 /** @private
 * @param {string|Function|undefined} cid
 * @param {*} value
@@ -32555,13 +32644,13 @@ DataView.prototype._removeGroupMember = function (groupIndex, groupId) {
 };
 /** @private
 * @param {string} cid
-* @param {Object.<string, *>} values
+* @param {Object} values
 * @return {Array.<string>}
 */
 DataView.prototype._defaultGroupCriteria = function(cid, values) {
 	var val = values[cid];
 	if(Array.isArray(val)) {
-		return val.map(function(data) {
+		return val.map(function(data) { // TODO: this is very slow
 			return data + "";
 		});
 	} else {
@@ -32570,11 +32659,11 @@ DataView.prototype._defaultGroupCriteria = function(cid, values) {
 };
 /** @private
 * @param {string|null} rid
-* @param {Object.<string, *>} values
+* @param {Object} values
 * @return {boolean}
 */
 DataView.prototype._groupFilterLogic = function(rid, values) {
-	var gids = this._groupCriteria[this._groupLevel - 1](values);
+	var gids = this._groupCriteria[this._groupLevel - 1](values); // TODO: this is very slow
 	return gids.indexOf(this._groupId) >= 0;
 };
 
@@ -36014,7 +36103,7 @@ Core.prototype._batches = null;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.67";
+	return "5.1.70";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -40408,13 +40497,10 @@ Core.prototype._onSectionDataChanged = function (e) {
 				for (var r = fromR; r < toR; ++r) {
 					if(hasDataView) {
 						var rowData = rowDataCollection[r];
-						if(!rowData) { // This is a header row
-							continue;
-						}
 
 						e["rowData"] = rowData;
 						e["rowId"] = rids[r];
-						e["dataValue"] = rowData[cid];
+						e["dataValue"] = rowData ? rowData[cid] : null;
 					}
 					e["rowIndex"] = r;
 					e["cell"] = section["getCell"](c, r, false); // Accessing cell by using bracket allows extenal object to mock Section
@@ -42955,7 +43041,7 @@ SortableTitlePlugin.prototype.sortColumns = function (sortOptions, opt_arg) {
 				opt["sortOrder"] || opt["order"]
 			);
 			if (state) {
-				states[i] = state;
+				states.push(state);
 			}
 		}
 		this._sortColumn(states, opt_arg);
@@ -43537,10 +43623,12 @@ SortableTitlePlugin.prototype.sortSeparators = function (comparer) {
 		var sortOrders = [];
 		var sortFields = [];
 		var sortStateCount = this._sortStates.length;
+		var rowDefField = SortableTitlePlugin._toRowDefField();
 		for(var i = 0; i < sortStateCount; i++){
 			var sortState =  this._sortStates[i];
+			var field = this._rowDefMode ? rowDefField : sortState["field"];
 			sortOrders.push(sortState["sortOrder"]);
-			sortFields.push(sortState["field"]);
+			sortFields.push(field);
 		}
 		dv.sortSeparators(sortLogics, sortOrders, sortFields);
 	}
@@ -44334,6 +44422,19 @@ var _hasFieldOrId = function(colDef, str) {
 	return (colDef.getField() === str) || (colDef.getId() === str);
 };
 
+/** Compare the difference in the 'id' property.
+ * @private
+ * @param {Object} obj1
+ * @param {Object} obj2
+ * @returns {boolean} If the id property of two objects is equal, the return will be true, otherwise it will be false.
+ */
+var _hasMatchingId = function(obj1, obj2) {
+	if(!obj1 || !obj2 || !obj1.id || !obj2.id) { // Handle nullable, if the object or id have null, it's means difference value
+		return false;
+	}
+	return obj1.id === obj2.id;
+};
+
 /** @constructor
 * @extends {EventDispatcher}
 * @param {(Element|null)=} placeholder
@@ -44883,7 +44984,6 @@ Grid.prototype.initialize = function(gridOption) {
 
 	if (gridOption["fieldCaching"]) {
 		t._fieldCaching = gridOption["fieldCaching"];
-		js_FieldDefinition.setFieldCaching(t._fieldCaching);
 	}
 
 	if(gridOption["timeSeriesExpansion"] != null) {
@@ -45633,8 +45733,8 @@ Grid.prototype.replaceColumn = function (columnOption, colRef) {
  * @param {Object} response
  */
 Grid.prototype._onFieldLoadedSuccess = function (field, colDef, response) {
-	if (response && response.fieldDefinition) {
-		var fieldDef = response.fieldDefinition;
+	if (response && response.id) {
+		var fieldDef = response;
 		if (colDef && colDef.getField() === field) {
 			if (colDef.isDefaultName() && fieldDef.name) {
 				colDef.setName(fieldDef.name);
@@ -45682,6 +45782,34 @@ Grid.prototype._setScrollbarParent = function (host) {
 	this._grid.getHScrollbar().attachToExternalElement(host);
 };
 
+/** Get stored field information. If field information has not been requested or no data has been received yet, null value is returned.
+* @public
+* @function
+* @param {string} field
+* @return {Object}
+*/
+Grid.prototype.getFieldInfo = function(field) {
+	return js_FieldDefinition.getFieldInfo(field);
+};
+/** Request field information from Synapse service. If field information already exists, a resolved promise is returned. Synapse config must be supplied before the request can be made.
+* @public
+* @function
+* @param {string} field
+* @return {Promise}
+* @example
+* var gridConfig = {
+*   synapse: { // define synapse configuration
+*     apiKey: "xxx",
+*     contextApp: "xxx",
+*     auth: "xxx" (optional)
+*   }
+* };
+* var promise = grid.loadFieldInfo("CF_LAST");
+*/
+Grid.prototype.loadFieldInfo = function(field) {
+	return js_FieldDefinition.loadFieldInfo(field);
+};
+
 /**
 * @private
 * @param {string} field
@@ -45740,8 +45868,9 @@ Grid.prototype.setColumns = function(columns) {
 /** Remove, add and keep column based on the given column data
 * @public
 * @param {Array.<Object>} columns Array of column options
+* @param {boolean=} byId=false, if enable it, this method will only check for differences in the 'id' property
 */
-Grid.prototype.restoreColumns = function(columns) {
+Grid.prototype.restoreColumns = function(columns, byId) {
 	var grid = this._grid;
 	grid.startBatch("reset");
 	var configObj = this.getConfigObject();
@@ -45750,6 +45879,7 @@ Grid.prototype.restoreColumns = function(columns) {
 	var preColLen = previousColumns.length;
 	var newColLen = columns.length;
 
+	var compareLogic = byId ? _hasMatchingId : deepEqual;
 	var removingFields = [];
 	var keepingColumns = [];
 	var columnOrdering = [];
@@ -45759,7 +45889,7 @@ Grid.prototype.restoreColumns = function(columns) {
 	for (i = 0; i < preColLen; i++) {
 		found = false;
 		for (j = 0; j < newColLen; j++) {
-			if (deepEqual(previousColumns[i], columns[j])) {
+			if(compareLogic(previousColumns[i], columns[j])) {
 				keepingColumns.push(previousColumns[i]);
 				found = true;
 				break;
@@ -45780,7 +45910,7 @@ Grid.prototype.restoreColumns = function(columns) {
 	for (i = 0; i < newColLen; i++) {
 		found = false;
 		for (j = 0; j < keepingLen; j++) { // loop only keeping column
-			if (deepEqual(columns[i], keepingColumns[j])) {
+			if(compareLogic(columns[i], keepingColumns[j])) {
 				found = true;
 				var colIndex = this.getColumnIndex(columns[i].field); // We cannot use 'i' (colIndex) in this case, as it will sort the columns. Instead, we need to obtain a new column index from the field.
 				columnOrdering.push(this.getColumnId(colIndex));
@@ -49674,7 +49804,11 @@ var _joinSubKeys = function(subA, subB) {
 */
 var _isDynamicChain = function(ric) {
 	// Dynamic chain will be 2 . (dot) for example .PG.PA
-	return ric.match(/\./g).length > 1;
+	var matching = ric.match(/\./g); // Can be null when doesn't found dot(.)
+	if(matching) {
+		return matching.length > 1;
+	}
+	return false;
 };
 
 /** @private