@refinitiv-ui/efx-grid 6.0.90 → 6.0.92

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

@@ -6,7 +6,7 @@ import EventDispatcher from "../../../tr-grid-util/es6/EventDispatcher.js";
 * @param {string} rid
 * @param {!Object} sharedObj
 */
-var Segment = function(rid, sharedObj) {
+let Segment = function(rid, sharedObj) {
 	this._rid = rid;
 	this._children = {};
 	this._shared = sharedObj;
@@ -114,11 +114,11 @@ Segment.prototype.dispose = function() {
 	this._disposed = true;
 
 	this.removeAllEventListeners();
-	var segmentNames = this._subSegNames;
+	let segmentNames = this._subSegNames;
 	if(segmentNames) {
-		var segmentCount = segmentNames.length;
-		var segmentMap = this._subSegMap;
-		for(var i = 0; i < segmentCount; ++i) {
+		let segmentCount = segmentNames.length;
+		let segmentMap = this._subSegMap;
+		for(let i = 0; i < segmentCount; ++i) {
 			segmentMap[segmentNames[i]].dispose();
 		}
 		this._subSegMap = this._subSegNames = null;
@@ -150,16 +150,16 @@ Segment.prototype.getParentId = function() {
 * @return {Array.<string>}
 */
 Segment.prototype.getSubSegmentIds = function(out_ary) {
-	var segmentNames = this._subSegNames;
+	let segmentNames = this._subSegNames;
 	if(segmentNames) {
 		if(!out_ary) {
 			out_ary = [];
 		}
-		var segmentCount = segmentNames.length;
-		var segmentMap = this._subSegMap;
-		for(var i = 0; i < segmentCount; ++i) {
-			var segmentName = segmentNames[i];
-			var segment = segmentMap[segmentName];
+		let segmentCount = segmentNames.length;
+		let segmentMap = this._subSegMap;
+		for(let i = 0; i < segmentCount; ++i) {
+			let segmentName = segmentNames[i];
+			let segment = segmentMap[segmentName];
 			out_ary.push(segment.getId());
 			segment.getSubSegmentIds(out_ary);
 		}
@@ -176,10 +176,12 @@ Segment.prototype.getSubSegmentIds = function(out_ary) {
 Segment.prototype.addChild = function(rid, dataId) {
 	if(rid) {
 		this._shared.childToSegment[rid] = this._rid;
-		if(this._collapsed) {
-			this._shared.dirtyCollapsingState = true; // TODO: Check if we need to update this only when new child is added
-		}
-		if(!this._children[rid]) {
+		if(this._children[rid]) {
+			this._children[rid] = dataId || rid; // Update data id
+		} else {
+			if(this._collapsed) {
+				this._shared.dirtyCollapsingState = true; // TODO: Check if we need to update this only when new child is added
+			}
 			this._children[rid] = dataId || rid;
 			++this._childCount;
 			return true;
@@ -193,10 +195,10 @@ Segment.prototype.addChild = function(rid, dataId) {
 * @return {boolean}
 */
 Segment.prototype.addChildren = function(rids, dataIds) {
-	var rowIds = Array.isArray(rids) ? rids : [rids];
-	var rowCount = rowIds.length;
-	var dirty = 0;
-	var i;
+	let rowIds = Array.isArray(rids) ? rids : [rids];
+	let rowCount = rowIds.length;
+	let dirty = 0;
+	let i;
 	if(dataIds != null) {
 		dataIds = Array.isArray(dataIds) ? dataIds : [dataIds];
 		for(i = 0; i < rowCount; ++i) {
@@ -231,7 +233,7 @@ Segment.prototype.removeChild = function(rid) {
 		return false; // The specified rid is not a child of this segment
 	}
 
-	var objMap = this._shared.childToSegment;
+	let objMap = this._shared.childToSegment;
 	delete objMap[rid];
 	delete this._children[rid]; // Slow
 	--this._childCount;
@@ -252,10 +254,10 @@ Segment.prototype.removeChildren = function(rids) {
 	if(!this._childCount) {
 		return false;
 	}
-	var rowIds = Array.isArray(rids) ? rids : [rids];
-	var rowCount = rowIds.length;
-	var dirty = 0;
-	for(var i = 0; i < rowCount; ++i) {
+	let rowIds = Array.isArray(rids) ? rids : [rids];
+	let rowCount = rowIds.length;
+	let dirty = 0;
+	for(let i = 0; i < rowCount; ++i) {
 		dirty |= this.removeChild(rowIds[i]);
 	}
 	return dirty ? true : false;
@@ -270,9 +272,9 @@ Segment.prototype.removeAllChildren = function() {
 	if(!this._childCount) {
 		return false;
 	}
-	var objMap = this._shared.childToSegment;
-	var chdr = this._children;
-	for(var rid in chdr) {
+	let objMap = this._shared.childToSegment;
+	let chdr = this._children;
+	for(let rid in chdr) {
 		if(objMap[rid]) {
 			delete objMap[rid]; // TODO: Check if we need to do this
 		}
@@ -322,12 +324,12 @@ Segment.prototype.setClassification = function(fields) {
 	if(this._subSegLevel) {
 		return false; // non-root segment cannot be classified
 	}
-	var classifiers = null;
+	let classifiers = null;
 	if(this._subSegDef) {
 		classifiers = this._subSegDef.classifiers;
 	}
 
-	var newClassifiers = null;
+	let newClassifiers = null;
 	if(fields) {
 		if(typeof fields === "string") {
 			newClassifiers = [fields];
@@ -335,11 +337,11 @@ Segment.prototype.setClassification = function(fields) {
 			newClassifiers = fields;
 		}
 	}
-	var i;
-	var fieldCount = newClassifiers ? newClassifiers.length : 0;
+	let i;
+	let fieldCount = newClassifiers ? newClassifiers.length : 0;
 
 	if(fieldCount) {
-		var curCount = classifiers ? classifiers.length : 0;
+		let curCount = classifiers ? classifiers.length : 0;
 		if(curCount === fieldCount) { // Check duplication
 			for(i = 0; i < fieldCount; ++i) {
 				if(newClassifiers[i] !== classifiers[i]) {
@@ -375,11 +377,11 @@ Segment.prototype.setClassification = function(fields) {
 * @return {boolean}
 */
 Segment.prototype.classify = function(rows) {
-	var classifiers = this._subSegDef ? this._subSegDef.classifiers : null;
-	var classifierCount = classifiers ? classifiers.length : 0;
+	let classifiers = this._subSegDef ? this._subSegDef.classifiers : null;
+	let classifierCount = classifiers ? classifiers.length : 0;
 
-	var segmentNames = this._subSegNames;
-	var segmentCount = segmentNames ? segmentNames.length : 0;
+	let segmentNames = this._subSegNames;
+	let segmentCount = segmentNames ? segmentNames.length : 0;
 
 	if(!segmentCount) {
 		if(this._subSegLevel >= classifierCount) {
@@ -387,18 +389,18 @@ Segment.prototype.classify = function(rows) {
 		}
 	}
 
-	var sharedObj = this._shared;
+	let sharedObj = this._shared;
 	if(this._collapsed) {
 		sharedObj.dirtyCollapsingState = true;
 	}
 
 	// Prepare existing sub segments for checking change in its members
-	var i;
-	var segmentName = "";
-	var nonExistenceGroups = {};
-	var removalCount = 0;
-	var segmentMap = this._subSegMap;
-	var segment = null;
+	let i;
+	let segmentName = "";
+	let nonExistenceGroups = {};
+	let removalCount = 0;
+	let segmentMap = this._subSegMap;
+	let segment = null;
 	if(segmentCount) {
 		removalCount = segmentCount;
 		for(i = 0; i < removalCount; ++i) {
@@ -417,21 +419,21 @@ Segment.prototype.classify = function(rows) {
 	}
 
 	// Loop through row children and assign them to their corresponding sub segment
-	var isRootSegment = !this._subSegLevel;
-	var rid;
-	var children = this._children;
+	let isRootSegment = !this._subSegLevel;
+	let rid;
+	let children = this._children;
 	if(this._subSegLevel < classifierCount && rows) {
 		if(!segmentMap) {
 			segmentMap = this._subSegMap = {};
 			segmentNames = this._subSegNames = [];
 		}
 
-		var classifier = classifiers[this._subSegLevel];
+		let classifier = classifiers[this._subSegLevel];
 
 		for(rid in children) {
-			var dataId = children[rid];
-			var record = rows[dataId];
-			var val = record ? record[classifier] : null; // WARNING: row could already be removed
+			let dataId = children[rid];
+			let record = rows[dataId];
+			let val = record ? record[classifier] : null; // WARNING: row could already be removed
 
 			sharedObj.childToSegment[rid] = this._rid; // Relocate child in case of it has been moved to a non existence group
 
@@ -480,7 +482,7 @@ Segment.prototype.classify = function(rows) {
 				segment = segmentMap[segmentName];
 				delete segmentMap[segmentName];
 				// TODO: Slow
-				var at = segmentNames.indexOf(segmentName);
+				let at = segmentNames.indexOf(segmentName);
 				if(at >= 0) {
 					segmentNames.splice(at, 1);
 				}
@@ -512,7 +514,7 @@ Segment.prototype.classify = function(rows) {
 	if(isRootSegment) { // If this is a root segment
 		if(this._subSegDef) {
 			if(segmentCount) {
-				var subSegments = this._subSegDef.subSegments = [];
+				let subSegments = this._subSegDef.subSegments = [];
 				this.getAllSubSegments(subSegments);
 				subSegments.forEach(Segment._assignSubSegmentOrder);
 			} else {
@@ -543,7 +545,7 @@ Segment.prototype.isSubSegment = function() {
 */
 Segment.prototype.getFirstAncestor = function() {
 	if(this._subSegLevel && this._subSegDef) {
-		var ancestor = this._subSegDef.root;
+		let ancestor = this._subSegDef.root;
 		return /** @type{Segment} */(ancestor) || null;
 	}
 	return null;
@@ -553,15 +555,15 @@ Segment.prototype.getFirstAncestor = function() {
 * @return {Array.<Segment>}
 */
 Segment.prototype.getAllSubSegments = function(out_ary) {
-	var segmentNames = this._subSegNames;
+	let segmentNames = this._subSegNames;
 	if(segmentNames) {
 		if(!out_ary) {
 			out_ary = [];
 		}
-		var segmentMap = this._subSegMap;
-		var segmentCount = segmentNames.length;
-		for(var i = 0; i < segmentCount; ++i) {
-			var segment = segmentMap[segmentNames[i]];
+		let segmentMap = this._subSegMap;
+		let segmentCount = segmentNames.length;
+		for(let i = 0; i < segmentCount; ++i) {
+			let segment = segmentMap[segmentNames[i]];
 			out_ary.push(segment);
 			segment.getAllSubSegments(out_ary);
 		}
@@ -583,7 +585,7 @@ Segment.prototype.setRowData = function(rows, clsSource) {
 	if(!rows) {
 		return;
 	}
-	var row = rows[this._rid];
+	let row = rows[this._rid];
 	if(!row) {
 		row = rows[this._rid] = {};
 	}
@@ -596,7 +598,7 @@ Segment.prototype.setRowData = function(rows, clsSource) {
 		row = clsSource[this._rid] = {};
 	}
 
-	var segment = this;
+	let segment = this;
 	while(segment && segment.isSubSegment()) {
 		segment.getSubSegmentName(row);
 		segment = segment._subSegParent;
@@ -608,8 +610,8 @@ Segment.prototype.setRowData = function(rows, clsSource) {
 */
 Segment.prototype.getSubSegmentName = function(row) {
 	if(row && this._subSegLevel) {
-		var classifiers = this.getClassification();
-		var field = classifiers[this._subSegLevel - 1];
+		let classifiers = this.getClassification();
+		let field = classifiers[this._subSegLevel - 1];
 		if(field) {
 			row[field] = this._subSegName;
 		}
@@ -649,7 +651,7 @@ Segment.prototype.isCollapsed = function() {
 * @return {boolean}
 */
 Segment.prototype.getCollapsingStates = function(objMap, parentState) {
-	var segmentNames = this._subSegNames;
+	let segmentNames = this._subSegNames;
 	if(!this._subSegLevel) { // Only root segment
 		if(!segmentNames) { // No sub segment
 			if(!this._collapsed) {
@@ -661,7 +663,7 @@ Segment.prototype.getCollapsingStates = function(objMap, parentState) {
 	if(!objMap) {
 		objMap = {};
 	}
-	var dirty = false;
+	let dirty = false;
 	if(this._subSegLevel) { // Sub segments are also subjected to collapsing
 		if(parentState) {
 			objMap[this._rid] = true;
@@ -669,20 +671,20 @@ Segment.prototype.getCollapsingStates = function(objMap, parentState) {
 		}
 	}
 	if(this._childCount) {
-		var collapsed = parentState || this._collapsed;
+		let collapsed = parentState || this._collapsed;
 		if(segmentNames) {
-			var segmentMap = this._subSegMap;
-			var segmentCount = segmentNames.length;
-			for(var i = 0; i < segmentCount; ++i) {
-				var segment = segmentMap[segmentNames[i]];
+			let segmentMap = this._subSegMap;
+			let segmentCount = segmentNames.length;
+			for(let i = 0; i < segmentCount; ++i) {
+				let segment = segmentMap[segmentNames[i]];
 				objMap[segment.getId()] = !!parentState;
 				if(segment.getCollapsingStates(objMap, collapsed)) {
 					dirty = true;
 				}
 			}
 		} else if(collapsed) {
-			var chdr = this._children;
-			for(var rid in chdr) {
+			let chdr = this._children;
+			for(let rid in chdr) {
 				objMap[rid] = collapsed;
 			}
 			dirty = true;
@@ -696,7 +698,7 @@ Segment.prototype.getCollapsingStates = function(objMap, parentState) {
 */
 Segment.prototype.getOrder = function() {
 	if(this._subSegLevel) {
-		var ancestor = this.getFirstAncestor();
+		let ancestor = this.getFirstAncestor();
 		if(ancestor) {
 			// WARNING: this._order cannot be greater than 9999
 			return ancestor.getOrder() + this._order;
@@ -710,9 +712,9 @@ Segment.prototype.getOrder = function() {
 */
 Segment.prototype.getLastOrder = function() {
 	if(this._subSegDef) {
-		var subSegments = this._subSegDef.subSegments;
+		let subSegments = this._subSegDef.subSegments;
 		if(subSegments) {
-			var lastSegment = subSegments[subSegments.length - 1];
+			let lastSegment = subSegments[subSegments.length - 1];
 			if(lastSegment) {
 				return lastSegment.getOrder();
 			}
@@ -736,29 +738,29 @@ Segment._tabs = null;
 * @return {Array.<string>} lines
 */
 Segment.prototype.log = function(lines) {
-	var i;
-	var tabs = Segment._tabs;
+	let i;
+	let tabs = Segment._tabs;
 	if(!tabs) {
 		tabs = Segment._tabs = [];
-		var tabCh = "";
+		let tabCh = "";
 		for(i = 0; i < 11; ++i) {
 			tabs[i] = tabCh;
 			tabCh += "  ";
 		}
 	}
-	var collapsedCh = this._collapsed ? "+ " : "- ";
+	let collapsedCh = this._collapsed ? "+ " : "- ";
 	lines.push(tabs[this._subSegLevel] + collapsedCh + this._rid);
 
-	var segmentNames = this._subSegNames;
+	let segmentNames = this._subSegNames;
 	if(segmentNames) {
-		var segmentCount = segmentNames.length;
-		var segmentMap = this._subSegMap;
+		let segmentCount = segmentNames.length;
+		let segmentMap = this._subSegMap;
 		for(i = 0; i < segmentCount; ++i) {
 			segmentMap[segmentNames[i]].log(lines);
 		}
 	} else if(this._childCount) {
-		var indent = tabs[this._subSegLevel + 1];
-		for(var rid in this._children) {
+		let indent = tabs[this._subSegLevel + 1];
+		for(let rid in this._children) {
 			lines.push(indent + "- " + rid);
 		}
 	}

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

@@ -24,6 +24,8 @@ declare class SegmentCollection extends EventDispatcher {
 
     public getSegment(rid: string): Segment|null;
 
+    public getSegmentParent(rid: string): Segment|null;
+
     public getSegments(): { [key: string]:  Segment }|null;
 
     public getSegmentIds(): (string)[];