@openui5/sap.ui.mdc 1.92.0 → 1.93.3

package/src/sap/ui/mdc/filterbar/vh/GenericFilterBarDelegate.js

@@ -22,8 +22,6 @@ sap.ui.define([
 	 * @alias sap.ui.mdc.filterbar.vh.GenericFilterBarDelegate
 	 */
 	var GenericFilterBarDelegate = Object.assign({}, FilterBarDelegate);
-	var _oObserver;
-	var _aProperties = [];
 
 	/**
 	 * Fetches the relevant metadata (from the FilterItems of the FiterBar) for the FilterBar and returns property info array
@@ -32,26 +30,26 @@ sap.ui.define([
 	 * @returns {Array} array of property info
 	 */
 	GenericFilterBarDelegate.fetchProperties = function(oFilterBar) {
-		if (!_oObserver) {
-			_oObserver = new ManagedObjectObserver(_observeChanges);
-			_oObserver.observe(oFilterBar, {
+		if (!oFilterBar.__oObserver) {
+			oFilterBar.__oObserver = new ManagedObjectObserver(_observeChanges);
+			oFilterBar.__oObserver.observe(oFilterBar, {
 				aggregations: ["filterItems"]
 			});
 		}
 
 		return new Promise(function(fResolve) {
 			var aFilterItems = oFilterBar.getFilterItems();
-			_aProperties = [];
+			oFilterBar.__aProperties = [];
 			aFilterItems.forEach(function(oFF){
-				addFilterField(oFF);
+				addFilterField(oFF, oFilterBar.__aProperties);
 			});
 
-			fResolve(_aProperties);
+			fResolve(oFilterBar.__aProperties);
 		});
 
 	};
 
-	function addFilterField(oFF) {
+	function addFilterField(oFF, aProperties) {
 		var sPath = oFF.getBindingPath("conditions");
 		if (!sPath) {
 			return;
@@ -59,7 +57,7 @@ sap.ui.define([
 		var aPathParts = sPath.split("/");
 		var sFieldPath = aPathParts[aPathParts.length - 1];
 
-		_aProperties.push({
+		aProperties.push({
 			name: sFieldPath,
 			label: oFF.getLabel() || sFieldPath,
 			type: oFF.getDataType(),
@@ -74,61 +72,79 @@ sap.ui.define([
 		});
 	}
 
-	function removeFilterField(oFF) {
+	function removeFilterField(oFF, aProperties) {
 		var sPath = oFF.getBindingPath("conditions");
 		if (!sPath) {
 			return;
 		}
-		var aPathParts = sPath.split("/");
-		var sFieldPath = aPathParts[aPathParts.length - 1];
-		if (_getProperty(sFieldPath)) {
-			_removeProperty(sFieldPath);
-		}
-	}
 
-	function _getProperty(sName) {
-		var oNamedProperty = null;
-		_aProperties.some(function(oProperty) {
-			if (oProperty.name === sName) {
-				oNamedProperty = oProperty;
-			}
-			return oNamedProperty !== null;
-		});
+		function _getProperty(sName) {
+			var oNamedProperty = null;
+			aProperties.some(function(oProperty) {
+				if (oProperty.name === sName) {
+					oNamedProperty = oProperty;
+				}
+				return oNamedProperty !== null;
+			});
 
-		return oNamedProperty;
-	}
+			return oNamedProperty;
+		}
+
+		function _removeProperty(sName) {
+			var nIdx = -1;
+			aProperties.some(function(oProperty, index) {
+				if (oProperty.name === sName) {
+					nIdx = index;
+				}
+				return nIdx !== -1;
+			});
 
-	function _removeProperty(sName) {
-		var nIdx = -1;
-		_aProperties.some(function(oProperty, index) {
-			if (oProperty.name === sName) {
-				nIdx = index;
+			if (nIdx >= 0) {
+				aProperties.splice(nIdx, 1);
 			}
-			return nIdx !== -1;
-		});
 
-		if (nIdx >= 0) {
-			_aProperties.splice(nIdx, 1);
+			return nIdx;
 		}
 
-		return nIdx;
+		var aPathParts = sPath.split("/");
+		var sFieldPath = aPathParts[aPathParts.length - 1];
+		if (_getProperty(sFieldPath)) {
+			_removeProperty(sFieldPath);
+		}
 	}
 
+
+
 	function _observeChanges(oChanges) {
+		var oFilterBar, aProperties;
 
 		if (oChanges.name === "filterItems") {
 			if (oChanges.mutation === "insert") {
 				var oNewFF = oChanges.child;
-				addFilterField(oNewFF);
+				oFilterBar = oNewFF.getParent();
+				aProperties = oFilterBar.__aProperties;
+				addFilterField(oNewFF, aProperties);
 				return;
 			}
 			if (oChanges.mutation === "remove") {
 				var oRemoveFF = oChanges.child;
-				removeFilterField(oRemoveFF);
+				oFilterBar = oRemoveFF.getParent();
+				aProperties = oFilterBar.__aProperties;
+				removeFilterField(oRemoveFF, aProperties);
 				return;
 			}
 		}
 	}
 
+	GenericFilterBarDelegate.cleanup = function(oFilterBar) {
+
+		if (oFilterBar.__oObserver) {
+			oFilterBar.__oObserver.disconnect();
+			delete oFilterBar.__oObserver;
+			delete oFilterBar.__aProperties;
+		}
+
+	};
+
 	return GenericFilterBarDelegate;
 });

package/src/sap/ui/mdc/flexibility/AggregateFlex.js

@@ -42,17 +42,21 @@ sap.ui.define(["sap/ui/fl/apply/api/FlexRuntimeInfoAPI"], function (FlexRuntimeI
 		return new Promise(function (resolve, reject) {
 			var oModifier = mPropertyBag.modifier;
 			var oChangeContent = bIsRevert ? oChange.getRevertData() : oChange.getContent();
-			var oAggregateConditions = oModifier.getProperty(oControl, "aggregateConditions");
-			var oAggregations = oAggregateConditions ? oAggregateConditions : {};
-			oAggregations[oChangeContent.name] = {};
-
-			var oAggregateContent = {
-				name: oChangeContent.name
-			};
-			oModifier.setProperty(oControl, "aggregateConditions", oAggregations);
-
-			fFinalizeAggregateChange(oChange, oControl, oAggregateContent, bIsRevert);
-			resolve();
+			Promise.resolve()
+				.then(oModifier.getProperty.bind(oModifier, oControl, "aggregateConditions"))
+				.then(function(oAggregateConditions) {
+					var oAggregations = oAggregateConditions ? oAggregateConditions : {};
+					oAggregations[oChangeContent.name] = {};
+					var oAggregateContent = {
+						name: oChangeContent.name
+					};
+					oModifier.setProperty(oControl, "aggregateConditions", oAggregations);
+					fFinalizeAggregateChange(oChange, oControl, oAggregateContent, bIsRevert);
+					resolve();
+				})
+				.catch(function(oError) {
+					reject(oError);
+				});
 		});
 	};
 
@@ -60,19 +64,24 @@ sap.ui.define(["sap/ui/fl/apply/api/FlexRuntimeInfoAPI"], function (FlexRuntimeI
 		return new Promise(function (resolve, reject) {
 			var oModifier = mPropertyBag.modifier;
 			var oChangeContent = bIsRevert ? oChange.getRevertData() : oChange.getContent();
-			var oAggregateConditions = oModifier.getProperty(oControl, "aggregateConditions");
-			var aValue = oAggregateConditions ? oAggregateConditions : {};
+			Promise.resolve()
+				.then(oModifier.getProperty.bind(oModifier, oControl, "aggregateConditions"))
+				.then(function(oAggregateConditions) {
+					var aValue = oAggregateConditions ? oAggregateConditions : {};
 
-			if (!aValue) {
-				// Nothing to remove
-				reject();
-			}
-
-			delete aValue[oChangeContent.name];
-			oModifier.setProperty(oControl, "aggregateConditions", aValue);
+					if (!aValue) {
+						// Nothing to remove
+						reject();
+					}
 
-			fFinalizeAggregateChange(oChange, oControl, oChangeContent, bIsRevert);
-			resolve();
+					delete aValue[oChangeContent.name];
+					oModifier.setProperty(oControl, "aggregateConditions", aValue);
+					fFinalizeAggregateChange(oChange, oControl, oChangeContent, bIsRevert);
+					resolve();
+				})
+				.catch(function(oError) {
+					reject(oError);
+				});
 		});
 	};
 

package/src/sap/ui/mdc/flexibility/AggregationConfigFlex.js

@@ -58,42 +58,45 @@ sap.ui.define([
             "changeHandler": {
                 applyChange: function (oChange, oControl, mPropertyBag) {
 
-                    var oPriorAggregationConfig = Engine.getInstance().readXConfig(oControl, {
+                    return Engine.getInstance().readXConfig(oControl, {
                         propertyBag: mPropertyBag
-                    });
-                    var sOldValue = null;
+                    })
+                    .then(function(oPriorAggregationConfig) {
+                        var sOldValue = null;
 
-                    if (oPriorAggregationConfig
-                        && oPriorAggregationConfig.aggregations
-                        && oPriorAggregationConfig.aggregations[sAffectedAggregation]
-                        && oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().name]
-                        && oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().name][sAffectedProperty]
-                        ){
-                            sOldValue = oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().name][sAffectedProperty];
-                    }
+                        if (oPriorAggregationConfig
+                            && oPriorAggregationConfig.aggregations
+                            && oPriorAggregationConfig.aggregations[sAffectedAggregation]
+                            && oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().name]
+                            && oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().name][sAffectedProperty]
+                            ){
+                                sOldValue = oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().name][sAffectedProperty];
+                        }
 
-                    oChange.setRevertData({
-                        name: oChange.getContent().name,
-                        value: sOldValue
-                    });
+                        oChange.setRevertData({
+                            name: oChange.getContent().name,
+                            value: sOldValue
+                        });
 
-                    Engine.getInstance().enhanceXConfig(oControl, {
-                        controlMeta: {
-                            aggregation: sAffectedAggregation,
-                            property: sAffectedProperty
-                        },
-                        name: oChange.getContent().name,
-                        value: oChange.getContent().value,
-                        propertyBag: mPropertyBag
+                        return Engine.getInstance().enhanceXConfig(oControl, {
+                            controlMeta: {
+                                aggregation: sAffectedAggregation,
+                                property: sAffectedProperty
+                            },
+                            name: oChange.getContent().name,
+                            value: oChange.getContent().value,
+                            propertyBag: mPropertyBag
+                        });
+                    })
+                    .then(function() {
+                        fConfigModified(oControl);
                     });
-                    fConfigModified(oControl);
-
                 },
                 completeChangeContent: function (oChange, mChangeSpecificInfo, mPropertyBag) {
                     // Not used, but needs to be there
                 },
                 revertChange: function (oChange, oControl, mPropertyBag) {
-                    Engine.getInstance().enhanceXConfig(oControl, {
+                    return Engine.getInstance().enhanceXConfig(oControl, {
                         controlMeta: {
                             aggregation: sAffectedAggregation,
                             property: sAffectedProperty
@@ -101,10 +104,11 @@ sap.ui.define([
                         name: oChange.getRevertData().name,
                         value: oChange.getRevertData().value,
                         propertyBag: mPropertyBag
+                    })
+                    .then(function() {
+                        oChange.resetRevertData();
+                        fConfigModified(oControl);
                     });
-
-                    oChange.resetRevertData();
-                    fConfigModified(oControl);
                 }
             },
             "layers": {

package/src/sap/ui/mdc/flexibility/Chart.flexibility.js

@@ -12,7 +12,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.mdc.flexibility.Chart
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 */
 	return {
 		addItem: ChartItemFlex.addItem,
@@ -40,10 +40,15 @@ sap.ui.define([
 				completeChangeContent: function(oChange, mSpecificChangeInfo) {
 				},
 				applyChange: function(oChange, oChart, mPropertyBag) {
-					// First store the old value for revert
-					oChange.setRevertData(mPropertyBag.modifier.getProperty(oChart, "chartType"));
-					// Then set the new value
-					mPropertyBag.modifier.setProperty(oChart, "chartType", oChange.getContent().chartType);
+					var oModifier = mPropertyBag.modifier;
+					return Promise.resolve()
+						.then(oModifier.getProperty.bind(oModifier, oChart, "chartType"))
+						.then(function(vOldValue) {
+							// First store the old value for revert
+							oChange.setRevertData(vOldValue);
+							// Then set the new value
+							oModifier.setProperty(oChart, "chartType", oChange.getContent().chartType);
+						});
 				},
 				revertChange: function(oChange, oChart, mPropertyBag) {
 					mPropertyBag.modifier.setProperty(oChart, "chartType", oChange.getRevertData());

package/src/sap/ui/mdc/flexibility/ChartItemFlex.js

@@ -16,11 +16,23 @@ sap.ui.define([
 	};
 
 	oChartItemFlex.findItem = function(oModifier, aItems, sName) {
-		return aItems.find(function(oItem) {
-			var sKey = oModifier.getProperty(oItem, "key");
-			var sKeyNew = oModifier.getProperty(oItem, "name"); // for chart remake
-			return (sKey === sName || sKeyNew === sName);
-		});
+		return aItems.reduce(function(oPreviousPromise, oItem) {
+			return oPreviousPromise
+				.then(function(oFoundItem) {
+					if (!oFoundItem) {
+						return Promise.all([
+							oModifier.getProperty(oItem, "key"),
+							oModifier.getProperty(oItem, "name") // for chart remake
+						])
+						.then(function(aProperties) {
+							if (aProperties[0] === sName || aProperties[1] === sName) {
+								return oItem;
+							}
+						});
+					}
+					return oFoundItem;
+				});
+		}, Promise.resolve());
 	};
 
 	oChartItemFlex.addItem = oChartItemFlex.createAddChangeHandler();
@@ -29,4 +41,4 @@ sap.ui.define([
 
 	return oChartItemFlex;
 
-});
+});

package/src/sap/ui/mdc/flexibility/ColumnFlex.js

@@ -26,10 +26,21 @@ sap.ui.define([
 	};
 
 	ColumnFlex.findItem = function(oModifier, aColumns, sName) {
-		return aColumns.find(function(oColumn) {
-			var sDataProperty = oModifier.getProperty(oColumn, "dataProperty");
-			return sDataProperty === sName;
-		});
+		return aColumns.reduce(function(oPreviousPromise, oColumn) {
+			return oPreviousPromise
+				.then(function(oFoundColumn) {
+					if (!oFoundColumn) {
+						return Promise.resolve()
+							.then(oModifier.getProperty.bind(oModifier, oColumn, "dataProperty"))
+							.then(function(sDataProperty) {
+								if (sDataProperty === sName) {
+									return oColumn;
+								}
+							});
+					}
+					return oFoundColumn;
+				});
+		}, Promise.resolve());
 	};
 
 	ColumnFlex.afterApply = function(sChangeType, oTable, bIsRevert) {

package/src/sap/ui/mdc/flexibility/ConditionFlex.js

@@ -21,52 +21,54 @@ sap.ui.define([
 			oFilterControl.applyConditionsAfterChangesApplied();
 		}
 
-		return new Promise(function(resolve) {
+		return new Promise(function(resolve, reject) {
 
 			var mConditionsData, aConditions = null, oModifier = mPropertyBag.modifier;
 
-			// 'filterConditions' property needs to be updated for change selector
-			mConditionsData = merge({}, oModifier.getProperty(oControl, "filterConditions"));
-			if (mConditionsData) {
-				for (var sFieldPath in mConditionsData) {
-					if (sFieldPath === oChangeContent.name) {
-						aConditions = mConditionsData[sFieldPath];
-						break;
+			Promise.resolve()
+				.then(oModifier.getProperty.bind(oModifier, oControl, "filterConditions"))
+				.then(function(mFilterConditions) {
+					// 'filterConditions' property needs to be updated for change selector
+					mConditionsData = merge({}, mFilterConditions);
+					if (mConditionsData) {
+						for (var sFieldPath in mConditionsData) {
+							if (sFieldPath === oChangeContent.name) {
+								aConditions = mConditionsData[sFieldPath];
+								break;
+							}
+						}
 					}
-				}
-			}
 
-			if (!aConditions) {
-				mConditionsData[oChangeContent.name] = [];
-				aConditions = mConditionsData[oChangeContent.name];
-			}
+					if (!aConditions) {
+						mConditionsData[oChangeContent.name] = [];
+						aConditions = mConditionsData[oChangeContent.name];
+					}
 
-			var nConditionIdx = FilterOperatorUtil.indexOfCondition(oChangeContent.condition, aConditions);
-			if (nConditionIdx < 0) {
-				aConditions.push(oChangeContent.condition);
-
-				// 'filterConditions' property needs to be updated for change selector
-				oModifier.setProperty(oControl, "filterConditions", mConditionsData);
-
-				if (!bIsRevert) {
-					// Set revert data on the change
-					oChange.setRevertData({
-						name: oChangeContent.name,
-						condition: oChangeContent.condition
-					});
-				}
-
-				// the control providing the filter functionality needs to be used to update the ConditionModel
-				if (oFilterControl && oFilterControl.addCondition) {
-					oFilterControl.addCondition(oChangeContent.name, oChangeContent.condition).then(function() {
-						resolve();
-					});
-				} else {
-					resolve();
-				}
-			} else {
-				resolve();
-			}
+					var nConditionIdx = FilterOperatorUtil.indexOfCondition(oChangeContent.condition, aConditions);
+					if (nConditionIdx < 0) {
+						aConditions.push(oChangeContent.condition);
+
+						// 'filterConditions' property needs to be updated for change selector
+						oModifier.setProperty(oControl, "filterConditions", mConditionsData);
+
+						if (!bIsRevert) {
+							// Set revert data on the change
+							oChange.setRevertData({
+								name: oChangeContent.name,
+								condition: oChangeContent.condition
+							});
+						}
+
+						// the control providing the filter functionality needs to be used to update the ConditionModel
+						if (oFilterControl && oFilterControl.addCondition) {
+							return oFilterControl.addCondition(oChangeContent.name, oChangeContent.condition);
+						}
+					}
+				})
+				.then(resolve)
+				.catch(function(oError) {
+					reject(oError);
+				});
 		});
 	};
 
@@ -78,54 +80,54 @@ sap.ui.define([
 			oFilterControl.applyConditionsAfterChangesApplied();
 		}
 
-		return new Promise(function(resolve) {
+		return new Promise(function(resolve, reject) {
 			var mConditionsData, aConditions, nDelIndex = -1, oModifier = mPropertyBag.modifier;
 
-			// 'filterConditions' property needs to be updated for change selector
-			mConditionsData = merge({}, oModifier.getProperty(oControl, "filterConditions"));
-			if (mConditionsData) {
-				for (var sFieldPath in mConditionsData) {
-					if (sFieldPath === oChangeContent.name) {
-						aConditions = mConditionsData[sFieldPath];
-						break;
-					}
-				}
-			}
-
-			if (aConditions && (aConditions.length > 0)) {
-
-				nDelIndex = FilterOperatorUtil.indexOfCondition(oChangeContent.condition, aConditions);
-				if (nDelIndex >= 0) {
-					aConditions.splice(nDelIndex, 1);
-					//					if (aConditions.length === 0) {
-					//						delete mConditionsData[oChangeContent.name];
-					//					}
+			Promise.resolve()
+				.then(oModifier.getProperty.bind(oModifier, oControl, "filterConditions"))
+				.then(function(mFilterConditions) {
 					// 'filterConditions' property needs to be updated for change selector
-					oModifier.setProperty(oControl, "filterConditions", mConditionsData);
-
-					if (!bIsRevert) {
-						// Set revert data on the change
-						oChange.setRevertData({
-							name: oChangeContent.name,
-							condition: oChangeContent.condition
-						});
+					mConditionsData = merge({}, mFilterConditions);
+
+					if (mConditionsData) {
+						for (var sFieldPath in mConditionsData) {
+							if (sFieldPath === oChangeContent.name) {
+								aConditions = mConditionsData[sFieldPath];
+								break;
+							}
+						}
 					}
 
-					// the control providing the filter functionality needs to be used to update the ConditionModel
-					if (oFilterControl && oFilterControl.removeCondition) {
-						oFilterControl.removeCondition(oChangeContent.name, oChangeContent.condition).then(function() {
-							resolve();
-						});
-					} else {
-						resolve();
+					if (aConditions && (aConditions.length > 0)) {
+
+						nDelIndex = FilterOperatorUtil.indexOfCondition(oChangeContent.condition, aConditions);
+						if (nDelIndex >= 0) {
+							aConditions.splice(nDelIndex, 1);
+							//					if (aConditions.length === 0) {
+							//						delete mConditionsData[oChangeContent.name];
+							//					}
+							// 'filterConditions' property needs to be updated for change selector
+							oModifier.setProperty(oControl, "filterConditions", mConditionsData);
+
+							if (!bIsRevert) {
+								// Set revert data on the change
+								oChange.setRevertData({
+									name: oChangeContent.name,
+									condition: oChangeContent.condition
+								});
+							}
+
+							// the control providing the filter functionality needs to be used to update the ConditionModel
+							if (oFilterControl && oFilterControl.removeCondition) {
+								return oFilterControl.removeCondition(oChangeContent.name, oChangeContent.condition);
+							}
+						}
 					}
-				} else {
-					resolve();
-				}
-			} else {
-				resolve();
-			}
-
+				})
+				.then(resolve)
+				.catch(function(oError) {
+					reject(oError);
+				});
 		});
 	};
 

package/src/sap/ui/mdc/flexibility/FilterBar.flexibility.js

@@ -12,7 +12,7 @@ sap.ui.define(['./FilterItemFlex', './ConditionFlex'], function(FilterItemFlex,
 	 *
 	 * @alias sap.ui.mdc.flexibility.FilterBar
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 */
 
 	return {

package/src/sap/ui/mdc/flexibility/FilterItemFlex.js

@@ -12,7 +12,7 @@ sap.ui.define(['./ItemBaseFlex'], function(ItemBaseFlex) {
 	 *
 	 * @alias sap.ui.mdc.flexibility.FilterBar
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 */
 
 	var oFilterItemFlex = Object.assign({}, ItemBaseFlex);