@refinitiv-ui/efx-grid 6.0.91 → 6.0.92

package/lib/tr-grid-util/es6/FieldFormatter.js

@@ -35,7 +35,7 @@ const DEFAULT_DATE_TIME_FORMAT = "MM/DD/YYYY";
 * @param {string} formatType
 * @return {string}
 */
-var toDateTimeType = function(formatType) {
+let toDateTimeType = function(formatType) {
 	if (formatType != null && DATE_TIME_TYPE[formatType.toUpperCase()]) {
 		return DATE_TIME;
 	}
@@ -45,11 +45,11 @@ var toDateTimeType = function(formatType) {
 /** @constructor
 * @param {FieldFormatter~Options=} options
 * @example
-* var ff = new FieldFormatter();
+* let ff = new FieldFormatter();
 * ff.format(anyValue);
 * ff.getOptions(); // For serialization
 */
-var FieldFormatter = function(options) {
+let FieldFormatter = function(options) {
 	this["format"] = this.format = this.format.bind(this); // Always export bound format method
 
 	FieldFormatter._startMidnightInterval();
@@ -126,8 +126,8 @@ FieldFormatter._updateMidnight = function() {
 FieldFormatter._startMidnightInterval = function() {
 	if(!FieldFormatter._lastMidnight) {
 		FieldFormatter._updateMidnight();
-		var currentMidnight = FieldFormatter._lastMidnight.valueOf();
-		var timeUntilNextUpdate = currentMidnight + 86405000 - (new Date().valueOf()); // delay to the next midnight + 5sec
+		let currentMidnight = FieldFormatter._lastMidnight.valueOf();
+		let timeUntilNextUpdate = currentMidnight + 86405000 - (new Date().valueOf()); // delay to the next midnight + 5sec
 		setTimeout(FieldFormatter._setMidnightInterval, timeUntilNextUpdate);
 	}
 };
@@ -148,15 +148,15 @@ FieldFormatter.prototype.init = function(options) { // deserialize
 		return;
 	}
 
-	var val = options["field"];
+	let val = options["field"];
 	if(val) {
 		// DateTime pairs come from the JET's user settings
 		// Datetime paired will have special column that suffix with "_COMBINED"
 		this.setField(val); // , (this._dateTimePairs[field]) ? field + "_COMBINED" : "");
 	}
 
-	var formatType = /** @type{string} */(options["formatType"] || options["type"]);
-	var fieldDataType = options["fieldDataType"]; // Keep backward compatibility
+	let formatType = /** @type{string} */(options["formatType"] || options["type"]);
+	let fieldDataType = options["fieldDataType"]; // Keep backward compatibility
 	this._userFormatType = formatType || fieldDataType;
 
 	formatType = toDateTimeType(this._userFormatType);
@@ -165,8 +165,8 @@ FieldFormatter.prototype.init = function(options) { // deserialize
 	if(val) {
 		this.setFormatType(val);
 	}
-	var dtf = options["dateTimeFormat"];
-	var utc = options["useUTCTime"];
+	let dtf = options["dateTimeFormat"];
+	let utc = options["useUTCTime"];
 	if(utc != null || dtf != null) {
 		this.setDateTimeMeta(
 			dtf,
@@ -211,7 +211,7 @@ FieldFormatter.prototype.getField = function() {
 * @return {FieldFormatter}
 */
 FieldFormatter.prototype.clone = function() {
-	var newFF = new FieldFormatter();
+	let newFF = new FieldFormatter();
 	newFF._field = this._field;
 	newFF._formattedField = this._formattedField;
 	newFF._combinedField = this._combinedField;
@@ -279,7 +279,7 @@ FieldFormatter.prototype.setNumberFormatter = function(formatter) {
 };
 
 FieldFormatter.prototype.getProperties = function() {
-	var obj = {
+	let obj = {
 		"field": this._field,
 		"formattedField": this._formattedField,
 		"combinedField": this._combinedField,
@@ -350,7 +350,7 @@ FieldFormatter.prototype._format = function(val, rowData) {
 
 	if(this._nf) { // Number formatter will override any default field format
 		if(typeof val != "number") { // string
-			var num = (+val); // Only convertible value will be formatted by the number formatter
+			let num = (+val); // Only convertible value will be formatted by the number formatter
 			return (num === num) ? this._nf(num) : val + "";
 		}
 
@@ -375,19 +375,19 @@ FieldFormatter.prototype._format = function(val, rowData) {
 FieldFormatter.prototype._formatDateTime = function(val, rowData) {
 	if(!this._df) { return ""; }
 	if(this._idnSource) { // IDN Source will send time in second instead of millisecond.
-		var sec = +val; // Date object can be converted to number
+		let sec = +val; // Date object can be converted to number
 		if(sec !== sec) { // NaN checking
 			return val; // WARNING: val could be number
 		}
 
-		var cmbValue = (rowData && this._combinedField) ? +rowData[this._combinedField] : NaN;
+		let cmbValue = (rowData && this._combinedField) ? +rowData[this._combinedField] : NaN;
 		if(cmbValue === cmbValue) { // Combined value is not NaN
 			sec = cmbValue;
 		} else if(sec < 86400) { // No paired date and sec < 24 hours -> this is a time within this day
 			sec += FieldFormatter._lastMidnight.valueOf() / 1000;
 		} else { // No paired sec. Date need to add for timezone
 			if((this._field !== "NEWS_TIME") && (this._timeZone === "LOCAL")) {
-				var d = new Date(sec * 1000); // Need to know the timezone of given date
+				let d = new Date(sec * 1000); // Need to know the timezone of given date
 				sec += d.getTimezoneOffset() * 60;
 			}
 		}
@@ -401,7 +401,7 @@ FieldFormatter.prototype._formatDateTime = function(val, rowData) {
 * @return {string}
 */
 FieldFormatter.prototype._formatNumber = function(val, rowData) {
-	var ff;
+	let ff;
 	if(rowData) {
 		ff = rowData[this._formattedField];
 		if(!ff) { // null, undefined, empty string, zero, or NaN

package/lib/tr-grid-util/es6/FilterBuilder.js

@@ -25,7 +25,7 @@ import { ExpressionParser } from "./ExpressionParser.js";
 * @type {Object.<string, number>}
 * @const
 */
-var connectorMap = {
+let connectorMap = {
 	"or": 1,
 	"OR": 1,
 	"Or": 1,
@@ -38,7 +38,7 @@ var connectorMap = {
 * @param {*} val
 * @return {number}
 */
-var convertToNumber = function(val) {
+let convertToNumber = function(val) {
 	if(typeof val === "number") {
 		return val;
 	}
@@ -56,17 +56,17 @@ var convertToNumber = function(val) {
 /** @private
 * @type {RegExp}
 */
-var _dateStringRule = /^\w{3} \w{3}/;
+let _dateStringRule = /^\w{3} \w{3}/;
 /** Convert default string natively generated from a Date object to a Date object. For instance, string "Sun Sep 09 2001 08:46:40 GMT+0700 (Indochina Time)" can be converted, while string "2001-09-09" cannot be converted.
 * @public
 * @function
 * @param {*} str
 * @return {*} Return Date object for successful conversion, otherwise the same input string
 */
-var stringToDateObject = function(str) {
+let stringToDateObject = function(str) {
 	if(typeof str === "string") {
-		var dateObj = new Date(str);
-		var t = dateObj.getTime();
+		let dateObj = new Date(str);
+		let t = dateObj.getTime();
 		if(t === t) {
 			if(_dateStringRule.test(str)) {
 				return dateObj;
@@ -80,7 +80,7 @@ var stringToDateObject = function(str) {
 * @param {*} val
 * @return {string}
 */
-var convertToString = function(val) {
+let convertToString = function(val) {
 	if(typeof val === "string") {
 		return val;
 	}
@@ -102,7 +102,7 @@ var convertToString = function(val) {
 * @param {boolean=} useUTCTime
 * @return {number}
 */
-var convertToDateValue = function(dateObj, useUTCTime) {
+let convertToDateValue = function(dateObj, useUTCTime) {
 	if(dateObj && dateObj.getTime) {
 		if(useUTCTime) {
 			return dateObj.getUTCFullYear() * 10000 + dateObj.getUTCMonth() * 100 + dateObj.getUTCDate();
@@ -118,26 +118,26 @@ var convertToDateValue = function(dateObj, useUTCTime) {
 * @param {Object} rowData
 * @return {boolean}
 */
-var _filterByConditions = function(ctx, rowData) {
-	var conds = ctx._conds;
-	var condCount = conds ? conds.length : 0;
+let _filterByConditions = function(ctx, rowData) {
+	let conds = ctx._conds;
+	let condCount = conds ? conds.length : 0;
 
 	if(!condCount) {
 		return true; // There is no filter condition
 	}
 
-	var fieldName = ctx._fieldName;
-	var fmtFieldName = ctx._formattedFieldName;
+	let fieldName = ctx._fieldName;
+	let fmtFieldName = ctx._formattedFieldName;
 
-	var val = rowData[fieldName];
+	let val = rowData[fieldName];
 	if(ctx._rawDataAccessor) {
 		val = ctx._rawDataAccessor(val);
 	}
-	var str, lowercasedStr, num, dateVal; // intentionally left undefined
-	var finalResult = false;
-	var result = false;
-	for(var i = 0; i < condCount; ++i) {
-		var orConnector = 0;
+	let str, lowercasedStr, num, dateVal; // intentionally left undefined
+	let finalResult = false;
+	let result = false;
+	for(let i = 0; i < condCount; ++i) {
+		let orConnector = 0;
 		if(i > 0) {
 			orConnector = connectorMap[conds[i - 1].connector];
 			// TODO: AND operator has higher precedence than OR operator
@@ -150,13 +150,13 @@ var _filterByConditions = function(ctx, rowData) {
 			}
 		}
 
-		var cond = conds[i];
-		var opDef = FilterOperators[cond.operatorId];
+		let cond = conds[i];
+		let opDef = FilterOperators[cond.operatorId];
 		result = false;
 
-		var opType = opDef.type;
-		var opId = opDef.id;
-		var opFunc = OperatorFunctions[opId];
+		let opType = opDef.type;
+		let opId = opDef.id;
+		let opFunc = OperatorFunctions[opId];
 		if(opType === "blank") {
 			result = opFunc(val);
 		} else if(opType === "number") {
@@ -215,8 +215,8 @@ var _filterByConditions = function(ctx, rowData) {
 * @param {Object} rowData
 * @return {boolean}
 */
-var _filterByObjectMap = function(ctx, rowData) {
-	var val = rowData[ctx._fieldName];
+let _filterByObjectMap = function(ctx, rowData) {
+	let val = rowData[ctx._fieldName];
 	if(ctx._rawDataAccessor) {
 		val = ctx._rawDataAccessor(val);
 	}
@@ -229,7 +229,7 @@ var _filterByObjectMap = function(ctx, rowData) {
 * @param {Object} cond Internal condition object
 * @return {FilterBuilder~Condition}
 */
-var conditionToArray = function(cond) {
+let conditionToArray = function(cond) {
 	return [
 		cond.operatorId,
 		cond.origValue,
@@ -241,7 +241,7 @@ var conditionToArray = function(cond) {
 * @constructor
 * @param {FilterBuilder~Options=} options
 */
-var FilterBuilder = function (options) {
+let FilterBuilder = function (options) {
 	this._initStaticVariables();
 
 	this._conditions = [];
@@ -255,7 +255,7 @@ FilterBuilder.prototype._initStaticVariables = function() {
 		FilterBuilder._initStatic = true;
 
 		FilterBuilder._updateTimezoneOffset();
-		var timeUntilNextDay = 86400000 - (new Date() % 86400000);
+		let timeUntilNextDay = 86400000 - (new Date() % 86400000);
 		setTimeout(FilterBuilder._setUpdateInterval, timeUntilNextDay);
 	}
 };
@@ -328,20 +328,20 @@ FilterBuilder.prototype.init = function(options) {
 	if(!options) {
 		return;
 	}
-	var field = options["field"];
+	let field = options["field"];
 	if(field) {
 		this.setFieldDefinition(field, options["formatter"], options["formattedField"]);
 	} else if(field != null) {
 		this.setFieldDefinition("");
 	}
 
-	var useUTCTime = options["useUTCTime"];
+	let useUTCTime = options["useUTCTime"];
 	if(useUTCTime != null) {
 		this._useUTCTime = useUTCTime ? true : false;
 	}
 
-	var rawDataAccessor = options["rawDataAccessor"];
-	var formattedDataAccessor = options["formattedDataAccessor"];
+	let rawDataAccessor = options["rawDataAccessor"];
+	let formattedDataAccessor = options["formattedDataAccessor"];
 	if(rawDataAccessor != null || formattedDataAccessor != null) {
 		this.setDataAccessors(rawDataAccessor, formattedDataAccessor);
 	}
@@ -381,8 +381,8 @@ FilterBuilder.prototype.setDataAccessors = function(rawDataAccessor, formattedDa
 * @return {boolean} Return true, if the new condition is added
 */
 FilterBuilder.prototype.addCondition = function (oper, value, connector, useUTCTime) {
-	var opId = oper ? oper.toUpperCase() : "";
-	var opDef = FilterOperators[opId];
+	let opId = oper ? oper.toUpperCase() : "";
+	let opDef = FilterOperators[opId];
 	if (!opDef) {
 		return false; // Unknown operation
 	}
@@ -395,7 +395,7 @@ FilterBuilder.prototype.addCondition = function (oper, value, connector, useUTCT
 			return false; // Invalid comparer value ("", null, undefined, NaN)
 		}
 	}
-	var cond = {
+	let cond = {
 		operatorId: opId,
 		origValue: value,
 		connector: connector || ""
@@ -412,11 +412,11 @@ FilterBuilder.prototype.addCondition = function (oper, value, connector, useUTCT
 * @return {number} Return number of conditions being added.
 */
 FilterBuilder.prototype.addConditions = function (conditions) {
-	var count = 0;
+	let count = 0;
 	if(Array.isArray(conditions)) {
-		var len = conditions.length;
-		for(var i = 0; i < len; ++i) {
-			var condition = conditions[i];
+		let len = conditions.length;
+		for(let i = 0; i < len; ++i) {
+			let condition = conditions[i];
 			if(Array.isArray(condition)) {
 				if(this.addCondition(condition[0], condition[1], condition[2], condition[3])) {
 					++count;
@@ -449,25 +449,25 @@ FilterBuilder.prototype.buildFilter = function() {
 	if (!this._fieldName) {
 		return null;
 	}
-	var condCount = this._conditions.length;
+	let condCount = this._conditions.length;
 	if(!condCount) {
 		return null;
 	}
 
 	// Prepare user value to be in ready to use form to boost performance
-	var formatter = this._formatter;
-	var conds = this._conditions.slice();
-	for(var i = 0; i < condCount; ++i) {
-		var cond = conds[i];
-		var opDef = FilterOperators[cond.operatorId];
-		var opType = opDef.type;
-		var value = cond.origValue;
+	let formatter = this._formatter;
+	let conds = this._conditions.slice();
+	for(let i = 0; i < condCount; ++i) {
+		let cond = conds[i];
+		let opDef = FilterOperators[cond.operatorId];
+		let opType = opDef.type;
+		let value = cond.origValue;
 
 		if(opType === "number") {
 			value = stringToDateObject(value);
 			value = convertToNumber(value);
 		} else if(opType === "date") {
-			var dateObj = null;
+			let dateObj = null;
 			if(value instanceof Date) {
 				dateObj = value;
 			} else if(typeof value === "number" || typeof value === "string") {
@@ -487,7 +487,7 @@ FilterBuilder.prototype.buildFilter = function() {
 		cond.value = value;
 	}
 
-	var ctx = {
+	let ctx = {
 		_conds: conds,
 		_fieldName: this._fieldName || "",
 		_formatter: formatter || null,
@@ -510,11 +510,11 @@ FilterBuilder.prototype.buildFilter = function() {
 */
 FilterBuilder.prototype.buildMonitorFilter = function(filterStr, field, formatter, formattedField) {
 	this.setFieldDefinition(field, formatter, formattedField);
-	var needConvertValue = (field.lastIndexOf("_LOCAL") === field.length - 6); // _LOCAL field is special monitor field which convert time value to local timezone (idn)
+	let needConvertValue = (field.lastIndexOf("_LOCAL") === field.length - 6); // _LOCAL field is special monitor field which convert time value to local timezone (idn)
 
-	var conds = filterStr.split("♣");
-	for (var i = 0; i < conds.length; i++) {
-		var tokens = conds[i].split("♦");
+	let conds = filterStr.split("♣");
+	for (let i = 0; i < conds.length; i++) {
+		let tokens = conds[i].split("♦");
 		if(needConvertValue) {
 			tokens[1] = ((tokens[1] - FilterBuilder._timezoneOffset) % 86400) + ""; // Convert to local timezone value for range filtering
 		}
@@ -530,11 +530,11 @@ FilterBuilder.prototype.buildMonitorFilter = function(filterStr, field, formatte
 * @param {Function=} rawDataAccessor Raw data getter for custom data type
 * @return {Function}
 */
-var buildFilterFromObjectMap = function(obj, field, rawDataAccessor) {
+let buildFilterFromObjectMap = function(obj, field, rawDataAccessor) {
 	if(!obj || !field) {
 		return null;
 	}
-	var ctx = {
+	let ctx = {
 		_fieldName: field,
 		_itemMap: obj
 	};
@@ -555,7 +555,7 @@ var buildFilterFromObjectMap = function(obj, field, rawDataAccessor) {
 * @return {Function} Filter function that takes rowData object
 */
 FilterBuilder.prototype.parse = function(condition, field, formatter, formattedField, rawDataAccessor, formattedDataAccessor) {
-	var type = typeof(condition);
+	let type = typeof(condition);
 	if(type === "string") {
 		if(condition.indexOf("♦") >= 0) {
 			return this.buildMonitorFilter(condition, field, formatter, formattedField);

package/lib/tr-grid-util/es6/FilterOperators.d.ts

@@ -3,6 +3,7 @@
 declare namespace FilterOperators {
 
     type Operator = {
+        id: string,
         name: string,
         type: string,
         positive: number,
@@ -32,7 +33,17 @@ declare namespace FilterOperators {
         DTB: FilterOperators.Operator,
         TXTEQ: FilterOperators.Operator,
         BLANK: FilterOperators.Operator,
-        NBLANK: FilterOperators.Operator
+        NBLANK: FilterOperators.Operator,
+        NEQ_BLANK: FilterOperators.Operator,
+        GREATER_THAN: FilterOperators.Operator,
+        GREATER_THAN_OR_EQUAL_TO: FilterOperators.Operator,
+        EQUAL_TO: FilterOperators.Operator,
+        LESS_THAN: FilterOperators.Operator,
+        LESS_THAN_OR_EQUAL_TO: FilterOperators.Operator,
+        TEXT_THAT_CONTAINS: FilterOperators.Operator,
+        TEXT_THAT_NOT_CONTAINS: FilterOperators.Operator,
+        TEXT_IS: FilterOperators.Operator,
+        NOT_BLANK: FilterOperators.Operator
     };
 
 }

package/lib/tr-grid-util/es6/FilterOperators.js

@@ -1,4 +1,5 @@
 /** @typedef {Object} FilterOperators~Operator
+* @property {string} id Short name of the operator
 * @property {string} name Full name of the operator
 * @property {string} type Data type of the  parameters required by the operator (e.g., number, string)
 * @property {number} positive The value indicates that the operator has positive connotation. The negative counterparts for EQ and BEGIN are NEQ and NBEGIN respectively.
@@ -29,13 +30,23 @@
 * @property {!FilterOperators~Operator} TXTEQ Alias to EQ
 * @property {!FilterOperators~Operator} BLANK Alias to EQ_BLANK
 * @property {!FilterOperators~Operator} NBLANK Alias to EQ_NBLANK
+* @property {!FilterOperators~Operator} NEQ_BLANK Alias to EQ_NBLANK
+* @property {!FilterOperators~Operator} GREATER_THAN Alias to GT
+* @property {!FilterOperators~Operator} GREATER_THAN_OR_EQUAL_TO Alias to GTE
+* @property {!FilterOperators~Operator} EQUAL_TO Alias to EQ
+* @property {!FilterOperators~Operator} LESS_THAN Alias to LT
+* @property {!FilterOperators~Operator} LESS_THAN_OR_EQUAL_TO Alias to LTE
+* @property {!FilterOperators~Operator} TEXT_THAT_CONTAINS Alias to CONT
+* @property {!FilterOperators~Operator} TEXT_THAT_NOT_CONTAINS Alias to NCONT
+* @property {!FilterOperators~Operator} TEXT_IS Alias to EQ
+* @property {!FilterOperators~Operator} NOT_BLANK Alias to EQ_NBLANK
 */
 
 /** @type {!FilterOperators~Operators}
 * @public
 * @const
 */
-var FilterOperators = {
+let FilterOperators = {
 	EQ: {
 		id: "EQ",
 		name: "Equal to",
@@ -214,7 +225,7 @@ FilterOperators.NOT_BLANK = FilterOperators.EQ_NBLANK;
 * @public
 * @const
 */
-var OperatorFunctions = {
+let OperatorFunctions = {
 	EQ: function(str, input) { return str == input; },
 	NEQ: function(str, input) { return str != input; },
 	NUMEQ: function(num, input) { return num == input; },