@refinitiv-ui/efx-grid 6.0.72 → 6.0.73

package/lib/rt-grid/es6/Grid.d.ts

@@ -188,7 +188,7 @@ declare class Grid extends EventDispatcher {
 
     public addStaticDataRows(dataRows: any[]|null, fields?: (string)[]|null): void;
 
-    public updateDataSet(records: (any)[]|null, rowIdentifier: string): void;
+    public updateDataSet(records: (any)[]|null, rowIdentifier?: string|null): void;
 
     public removeRow(rowRef: Grid.RowReference|null): RowDefinition|null;
 

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

@@ -2402,7 +2402,7 @@ Grid.prototype.addStaticDataRows = function(dataRows, fields) {
 /** Insert, update, remove and reorder data based on the given array of records
 * @public
 * @param {Array.<Object>} records Array of records for insert, remove, update, reorder in one operation
-* @param {string} rowIdentifier Check difference data with the row identifier map property for operate record.
+* @param {string=} rowIdentifier Check difference data with the row identifier map property for operate record.
 * @example
 * // Grid data set will be updated to 3 records. All rows in the grid will be cleared and new rows will be inserted
 * grid.updateDataSet([
@@ -2454,14 +2454,25 @@ Grid.prototype.updateDataSet = function(records, rowIdentifier) {
 	var rowDef, id, record, i;
 	var rowDefs = this.getAllRowDefinitions(); // Include the filter/hidden rows
 	var rowDefCount = rowDefs.length;
-	for (i = 0; i < rowDefCount; i++) {
-		rowDef = rowDefs[i];
-		if(rowDef) {
-			id = rowDef.getRowData()[rowIdentifier];
-			if(id || id === 0) {
-				oldDataMap[id] = rowDef;
-			} else { // Any existing rowDef without row identifier should be removed
-				this.removeRow(rowDef); // Slow
+	if(rowIdentifier) {
+		for (i = 0; i < rowDefCount; i++) {
+			rowDef = rowDefs[i];
+			if(rowDef) {
+				id = rowDef.getRowData()[rowIdentifier];
+				if(id || id === 0) {
+					oldDataMap[id] = rowDef;
+				} else { // Any existing rowDef without row identifier should be removed
+					this.removeRow(rowDef); // Slow
+				}
+			}
+		}
+	} else {
+		for (i = 0; i < rowDefCount; i++) {
+			record = records[i];
+			if(record) {
+				oldDataMap[i] = rowDefs[i]; // Use index instead of rowIdentifier
+			} else {
+				this.removeRow(rowDefs[i]); // Need to use rowRef, can't use index in view
 			}
 		}
 	}
@@ -2471,7 +2482,7 @@ Grid.prototype.updateDataSet = function(records, rowIdentifier) {
 	var newDataMap = {};
 	for (i = recordCount - 1; i >= 0; i--) {
 		record = records[i];
-		id = record[rowIdentifier];
+		id = rowIdentifier ? record[rowIdentifier] : i;
 		rowDef = oldDataMap[id];
 		newDataMap[id] = record; // Assign a new data map to compare to the previous data
 		record[fieldSorting] = i;
@@ -2493,8 +2504,9 @@ Grid.prototype.updateDataSet = function(records, rowIdentifier) {
 		}
 	}
 
-	// Sorting
-	this._dt.sortOnce(ROW_DEF, "a", compareNumber, fieldSorting);
+	if(rowIdentifier) {
+		this._dt.sortOnce(ROW_DEF, "a", compareNumber, fieldSorting);
+	}
 };
 /** @private
 * @param {Array|Object} item

package/lib/tr-grid-conditional-coloring/es6/ConditionalColoring.js

@@ -1156,8 +1156,8 @@ ConditionalColoringPlugin.prototype._onSectionBinding = function (e) {
 		return; // dataRows could be empty in case of no column is presented
 	}
 
-	var c, r, cell, painter, changedCols, rowDef, rid, changedRow, changedRows, allowBlinking, insertedRow;
-	var dataRow, insertedId, colData, blinking, bgBlinking, cachedValues, updatePrev;
+	var c, r, cell, painter, changedCols, rowDef, rid, changedRow, changedRows;
+	var dataRow, insertedId, colData, cachedValues, updatePrev;
 	var section = e["section"];
 	var colCount = section.getColumnCount();
 	var fromR = /** @type{number} */(e["fromRowIndex"]);
@@ -1182,27 +1182,28 @@ ConditionalColoringPlugin.prototype._onSectionBinding = function (e) {
 		if (!dataRow) continue; // prevent from null value access when using with RowGroupingExtension
 
 		changedCols = null;
+		var allowBlinking = false;
+		var insertedRow = null;
 		if (blinkingEnabled) {
 			if (this._realTimeGrid) {
 				// TODO: check rid from e.rids
 				rowDef = /** @type{RowDefinition} */(dataRow["ROW_DEF"]);
-				rid = rowDef ? rowDef.getRowId() : "";
-				insertedRow = insertedId[rid];
-				allowBlinking = !insertedRow || this._insertionBlinking;
-				if (rid && allowBlinking) {
+				if(rowDef){
+					rid = rowDef.getRowId();
 					changedCols = rowDef.getUpdates();
 				}
 			} else { // composite grid
 				changedRow = changedRows[r];
 				if (changedRow) {
 					rid = changedRow.rid;
-					insertedRow = insertedId[rid];
-					allowBlinking = !insertedRow || this._insertionBlinking;
-					if (allowBlinking) {
-						changedCols = changedRow.changed;
-					}
+					changedCols = changedRow.changed;
 				}
 			}
+			insertedRow = rid ? insertedId[rid] : null;
+			allowBlinking = !insertedRow || this._insertionBlinking;
+			if (!allowBlinking) {
+				changedCols = null;
+			}
 		}
 
 		if (!rid) {
@@ -1225,24 +1226,26 @@ ConditionalColoringPlugin.prototype._onSectionBinding = function (e) {
 			painter = this.getColumnPainter(c);
 			if (painter) {
 				colData = this._getColumnData(c);
-				bgBlinking = false;
-				blinking = false;
-				if (colData["blinking"] && actualUpdate && allowBlinking) { // blinking
+				var bgBlinking = false;
+				if (colData["blinking"] && actualUpdate) {
+					var blinking = false;
 					var field = colData["blinkingField"] || this._getField(c);
 					var newValue = dataRow[field];
-					if (prevDataRow) {
-						var prevValue = prevDataRow[field];
-						if (prevValue != null) {
-							if (changedCols && changedCols[field]) {
+					if(allowBlinking){
+						if (prevDataRow) {
+							var prevValue = prevDataRow[field];
+							if (prevValue != null) {
+								if (changedCols && changedCols[field]) {
+									blinking = true;
+									bgBlinking = painter.blinkCell(cell, newValue, prevValue, dataRow, dataRow);
+								}
+							}
+						} else {
+							if(prevRowCount && insertedRow){
 								blinking = true;
-								bgBlinking = painter.blinkCell(cell, newValue, prevValue, dataRow, dataRow);
+								bgBlinking = painter.blinkCell(cell, newValue, newValue, dataRow, dataRow);
 							}
 						}
-					} else {
-						if(prevRowCount && insertedRow){
-							blinking = true;
-							bgBlinking = painter.blinkCell(cell, newValue, newValue, dataRow, dataRow);
-						}
 					}
 
 					if (!blinking) {

package/lib/tr-grid-filter-input/es6/FilterInput.d.ts

@@ -48,6 +48,8 @@ declare class FilterInputPlugin extends GridPlugin {
 
     public removeColumnFilter(colIndex?: (null|number)|null): void;
 
+    public setInputValue(colIndex: number, value: any): void;
+
     public refresh(delayMs?: number|null): void;
 
     public setFilterLogic(colIndex: number, func: ((...params: any[]) => any)|null, ctx?: any): void;

package/lib/tr-grid-filter-input/es6/FilterInput.js

@@ -837,11 +837,44 @@ FilterInputPlugin.prototype.removeColumnFilters = function (colIndex) {
 
 
 FilterInputPlugin.prototype.removeColumnFilter = FilterInputPlugin.prototype.removeColumnFilters;
+/** @public
+* @param {number} colIndex
+* @param {*} value
+*/
+
+FilterInputPlugin.prototype.setInputValue = function (colIndex, value) {
+  var inputElem = this.getColumnInput(colIndex);
+
+  if (!inputElem) {
+    return;
+  }
+
+  var colOpt = this._getExtColumnOption(colIndex);
+
+  var type = colOpt.type ? colOpt.type.toLowerCase() : "";
+
+  if (type == "date") {
+    var dateObj = ElfDate.from(value);
+    value = dateObj ? dateObj.toDateString().substr(4) : "";
+  }
+
+  if (type == "multiselect") {
+    inputElem.values = value;
+
+    var textMap = FilterInputPlugin._createMapObject(value);
+
+    this.filterColumn(colIndex, "", textMap);
+  } else {
+    inputElem.value = value;
+    this.filterColumn(colIndex, value);
+  }
+};
 /** Force filtering for every column
 * @public
 * @param {number=} delayMs=0 Set delay in millisecond to avoid repeatedly filtering
 */
 
+
 FilterInputPlugin.prototype.refresh = function (delayMs) {
   if (delayMs) {
     if (!this._refreshTimer) {

package/lib/tr-grid-row-filtering/es6/RowFiltering.js

@@ -209,7 +209,7 @@ RowFilteringPlugin.prototype._uiTimerId = 0;
 * @private
 */
 
-RowFilteringPlugin.prototype._dvTimerId = 0;
+RowFilteringPlugin.prototype._filterTimerId = 0;
 /** @type {Function}
 * @private
 */
@@ -315,6 +315,16 @@ RowFilteringPlugin.prototype.unload = function (host) {
   host.unlisten("columnRemoved", this._onColumnRemoved);
 
   if (!this._hosts.length) {
+    if (this._uiTimerId) {
+      clearTimeout(this._uiTimerId);
+      this._uiTimerId = 0;
+    }
+
+    if (this._filterTimerId) {
+      clearTimeout(this._filterTimerId);
+      this._filterTimerId = 0;
+    }
+
     this._hasPendingFilter = false;
 
     if (this._filterDialog) {
@@ -688,6 +698,18 @@ RowFilteringPlugin.prototype._parseFilter = function (exp, colIndex, ctx) {
 
 
 RowFilteringPlugin.prototype.addColumnFilter = function (colIndex, exp, ctx) {
+  if (colIndex < 0 || colIndex >= this.getColumnCount()) {
+    return false;
+  }
+
+  var cfo = this._getColumnFilterOption(colIndex);
+
+  if (cfo) {
+    if (cfo._expressions[0] === exp) {
+      return false; // The same expression is getting added on the same column twice
+    }
+  }
+
   var func = null;
 
   if (typeof exp === "function") {
@@ -706,10 +728,6 @@ RowFilteringPlugin.prototype.addColumnFilter = function (colIndex, exp, ctx) {
     return false;
   }
 
-  if (colIndex < 0 || colIndex >= this.getColumnCount()) {
-    return false;
-  }
-
   var colSettings = this._getUserColumnSettings(colIndex);
 
   colSettings.expression = exp; // WARNING: Only the last expression are saved (previous one is overwritten)
@@ -728,8 +746,7 @@ RowFilteringPlugin.prototype.addColumnFilter = function (colIndex, exp, ctx) {
     ctx["field"] = field;
   }
 
-  var cfo = this._initColumnFilterOption(colIndex);
-
+  cfo = this._initColumnFilterOption(colIndex);
   cfo._field = field; // TODO: Handle fieldDataType
 
   cfo._filters.push(func);
@@ -811,6 +828,7 @@ RowFilteringPlugin.prototype._getColumnExpression = function (colIndex) {
 * @private
 * @param {number} colIndex
 * @param {RowFilteringPlugin~ColumnOptions} userObj
+* @returns {boolean} Returns true if there is an active filter in the column options
 * @example
 * var colDef1 = {
 *   "field": "PCTCHNG",
@@ -861,6 +879,8 @@ RowFilteringPlugin.prototype._setColumnOptions = function (colIndex, userObj) {
   if (iconActivation == "always" || iconActivation == "onHover") {
     this._updateColumnIcon(colIndex);
   }
+
+  return exp != null;
 };
 /** @private
  * @param {number} colIndex
@@ -1374,8 +1394,8 @@ RowFilteringPlugin.prototype._filterLogic = function (rid, rowData) {
 
 
 RowFilteringPlugin.prototype._requestFilterRefresh = function () {
-  if (!this._dvTimerId) {
-    this._dvTimerId = setTimeout(this.refresh, 10);
+  if (!this._filterTimerId) {
+    this._filterTimerId = setTimeout(this.refresh, 10);
   }
 };
 /** @private */
@@ -1398,7 +1418,7 @@ RowFilteringPlugin.prototype._setTimerForUpdatingIcons = function () {
 
 
 RowFilteringPlugin.prototype.refresh = function () {
-  this._dvTimerId = 0;
+  this._filterTimerId = 0;
   this._activeColFilters = this._columnFilters; //check cstp
 
   var cstkp = this._getPlugin("ColumnStackPlugin");
@@ -2292,7 +2312,11 @@ RowFilteringPlugin.prototype._onDialogSortChanged = function (e) {
 
 RowFilteringPlugin.prototype._onColumnAdded = function (e) {
   if (e["context"]) {
-    this._setColumnOptions(e["colIndex"], e["context"]);
+    var hasFilter = this._setColumnOptions(e["colIndex"], e["context"]);
+
+    if (hasFilter) {
+      this._applyPendingFilter();
+    }
   }
 };
 /** @private

package/lib/types/es6/FilterInput.d.ts

@@ -48,6 +48,8 @@ declare class FilterInputPlugin extends GridPlugin {
 
     public removeColumnFilter(colIndex?: (null|number)|null): void;
 
+    public setInputValue(colIndex: number, value: any): void;
+
     public refresh(delayMs?: number|null): void;
 
     public setFilterLogic(colIndex: number, func: ((...params: any[]) => any)|null, ctx?: any): void;

package/lib/types/es6/RealtimeGrid/Grid.d.ts

@@ -190,7 +190,7 @@ declare class Grid extends EventDispatcher {
 
     public addStaticDataRows(dataRows: any[]|null, fields?: (string)[]|null): void;
 
-    public updateDataSet(records: (any)[]|null, rowIdentifier: string): void;
+    public updateDataSet(records: (any)[]|null, rowIdentifier?: string|null): void;
 
     public removeRow(rowRef: Grid.RowReference|null): RowDefinition|null;
 

package/lib/versions.json

@@ -14,24 +14,24 @@
 	"tr-grid-column-resizing": "1.0.28",
 	"tr-grid-column-selection": "1.0.31",
 	"tr-grid-column-stack": "1.0.73",
-	"tr-grid-conditional-coloring": "1.0.66",
+	"tr-grid-conditional-coloring": "1.0.67",
 	"tr-grid-content-wrap": "1.0.20",
 	"tr-grid-contextmenu": "1.0.40",
-	"tr-grid-filter-input": "0.9.36",
+	"tr-grid-filter-input": "0.9.37",
 	"tr-grid-heat-map": "1.0.29",
 	"tr-grid-in-cell-editing": "1.0.81",
 	"tr-grid-pagination": "1.0.24",
 	"tr-grid-percent-bar": "1.0.22",
 	"tr-grid-range-bar": "2.0.5",
 	"tr-grid-row-dragging": "1.0.31",
-	"tr-grid-row-filtering": "1.0.64",
+	"tr-grid-row-filtering": "1.0.65",
 	"tr-grid-row-grouping": "1.0.82",
 	"tr-grid-row-selection": "1.0.25",
 	"tr-grid-rowcoloring": "1.0.25",
 	"tr-grid-textformatting": "1.0.46",
 	"tr-grid-titlewrap": "1.0.20",
 	"@grid/formatters": "1.0.50",
-	"@grid/column-selection-dialog": "4.0.54",
+	"@grid/column-selection-dialog": "4.0.55",
 	"@grid/filter-dialog": "4.0.60",
 	"@grid/column-format-dialog": "4.0.44"
 }

package/package.json

@@ -66,5 +66,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.72"
+	"version": "6.0.73"
 }