@openui5/sap.ui.mdc 1.99.0 → 1.100.1

package/src/sap/ui/mdc/filterbar/FilterBarBase.js

@@ -54,7 +54,7 @@ sap.ui.define([
 	 * @class The <code>FilterBarBase</code> control is used as a faceless base class for common functionality of any MDC FilterBar derivation.
 	 * @extends sap.ui.mdc.Control
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -146,7 +146,7 @@ sap.ui.define([
 				/**
 				 * Specifies the filter metadata.<br>
 				 * <b>Note</b>: This property must not be bound.<br>
-				 * <b>Note</b>: This property is used exclusively for SAPUI5 flexibility. Do not use it otherwise.
+				 * <b>Note</b>: This property is used exclusively for SAPUI5 flexibility/ Fiori Elements. Do not use it otherwise.
 				 *
 				 * @since 1.97
 				 */
@@ -369,8 +369,15 @@ sap.ui.define([
 	};
 
 	FilterBarBase.prototype.applySettings = function(mSettings, oScope) {
+		this._setPropertyHelperClass(PropertyHelper);
+		this._setupPropertyInfoStore("propertyInfo");
 		this._applySettings(mSettings, oScope);
-		this._initControlDelegate();
+		//this._initControlDelegate();
+		Promise.all([this.awaitPropertyHelper()]).then(function() {
+			if (!this._bIsBeingDestroyed) {
+				this._applyInitialFilterConditions();
+			}
+		}.bind(this));
 	};
 
 	FilterBarBase.prototype._applySettings = function(mSettings, oScope) {
@@ -381,13 +388,13 @@ sap.ui.define([
 		this._oConditionModel.attachPropertyChange(this._handleConditionModelPropertyChange, this);
 	};
 
-	FilterBarBase.prototype._initControlDelegate = function() {
-		this.initControlDelegate().then(function() {
-			if (!this._bIsBeingDestroyed) {
-				this._applyInitialFilterConditions();
-			}
-		}.bind(this));
-	};
+//	FilterBarBase.prototype._initControlDelegate = function() {
+//		Promise.all([this.awaitPropertyHelper()]).then(function() {
+//			if (!this._bIsBeingDestroyed) {
+//				this._applyInitialFilterConditions();
+//			}
+//		}.bind(this));
+//	};
 
 	FilterBarBase.prototype._waitForMetadata = function() {
 		return this._retrieveMetadata().then(function() {
@@ -618,108 +625,18 @@ sap.ui.define([
 		return this.getEngine().isModificationSupported(this);
 	};
 
-	FilterBarBase.prototype._hasPropertyInfo = function(sFieldName) {
-		var aPropertyInfo = this.getPropertyInfo();
-		var nIdx = aPropertyInfo.findIndex(function(oEntry) {
-			return oEntry.name === sFieldName;
-		});
-
-		return (nIdx >= 0);
-	};
-
-	FilterBarBase.prototype._getPropertyByName = function(sName) {
-		return FilterUtil.getPropertyByKey(this.getPropertyInfoSet(), sName);
-	};
-
 	FilterBarBase.prototype.getPropertyInfoSet = function() {
-		var oTypeUtil, aProperties = [];
-
-		if (this._hasPropertyHelper()) {
-			return this.getPropertyHelper().getProperties();
-		}
-
-		var aPropertyInfo = this.getPropertyInfo();
-		if (aPropertyInfo && (aPropertyInfo.length > 0)) {
-			oTypeUtil = this.getTypeUtil();
-
-			for (var i = 0; i < aPropertyInfo.length; i++) {
-				var oPropertyInfo = aPropertyInfo[i];
-				if (oPropertyInfo) {
-					var oTypeConfig = oTypeUtil.getTypeConfig(oPropertyInfo.dataType, oPropertyInfo.formatOptions, oPropertyInfo.constraints);
-					aProperties.push({
-						name: oPropertyInfo.name,
-						typeConfig: oTypeConfig,
-						maxConditions: oPropertyInfo.maxConditions,
-						constraints: oPropertyInfo.constraints,
-						formatOptions: oPropertyInfo.formatOptions,
-						required: oPropertyInfo.required,
-						caseSensitive: oPropertyInfo.caseSensitive,
-						display: oPropertyInfo.display
-					});
-				}
-			}
-		}
-
-		return aProperties;
-	};
-
-	FilterBarBase.prototype._hasPropertyHelper = function() {
-		try {
-			this.getPropertyHelper();
-			return true;
-		} catch (ex) {
-			return false;
-		}
-	};
-
-
-	FilterBarBase.prototype._createPropertyInfoChange = function(oProperty) {
-		return {
-			changeSpecificData: {
-				changeType: "addPropertyInfo",
-				content: {
-					name: oProperty.name,
-					dataType: oProperty.typeConfig.className,
-					maxConditions: oProperty.maxConditions,
-					constraints: oProperty.constraints,
-					formatOption: oProperty.formatOptions,
-					required: oProperty.required,
-					caseSensitive: oProperty.caseSensitive,
-					display: oProperty.display
-				}
-			},
-			selectorElement: this
-		};
-	};
-
-	FilterBarBase.prototype.createPropertyInfoChanges = function(sFieldPath) {
-		var oProperty, oChange, aChanges = [];
-
-		if (!this._hasPropertyInfo(sFieldPath)) {
-			oProperty = this._getPropertyByName(sFieldPath);
-			if (oProperty) {
-				oChange = this._createPropertyInfoChange(oProperty);
-				aChanges.push(oChange);
-			}
-		}
-
-		return aChanges;
+		return this.getPropertyHelper() ? this.getPropertyHelper().getProperties() : [];
 	};
 
 
 	FilterBarBase.prototype._addConditionChange = function(mOrigConditions, sFieldPath) {
 
-		var oChangePromise = this.getEngine().createChanges({
+		this.getEngine().createChanges({
 			control: this,
 			key: "Filter",
-			//prependChanges: fCreateTypeInfoCallback,
 			state: mOrigConditions
 		});
-
-		if (!this._aCollectedChangePromises) {
-			this._aCollectedChangePromises = [];
-		}
-		this._aCollectedChangePromises.push(oChangePromise);
 	};
 
 	FilterBarBase.prototype._registerOnEngineOnModificationEnd = function() {
@@ -753,12 +670,13 @@ sap.ui.define([
 
 				if (this._bPersistValues && this._isPersistenceSupported()) {
 
+					this._registerOnEngineOnModificationEnd();
+
 					var aConditions = oEvent.getParameter("value");
 
-					if (this._hasPropertyHelper() || this._getPropertyByName(sFieldPath)) {
+					if (this._getPropertyByName(sFieldPath)) {
 						fAddConditionChange(sFieldPath, aConditions);
 					} else {
-						this._registerOnEngineOnModificationEnd();
 						this._retrieveMetadata().then(function() {
 							fAddConditionChange(sFieldPath, aConditions);
 						});
@@ -947,7 +865,7 @@ sap.ui.define([
 		}.bind(this);
 
 		return this.initialized().then(function() {
-			if (!this._hasMetadata()) {
+			if (!this.isPropertyHelperFinal()) {
 				return this._retrieveMetadata().then(function() {
 					return fValidateFc();
 				});
@@ -964,10 +882,6 @@ sap.ui.define([
 		}
 	};
 
-	FilterBarBase.prototype._hasMetadata = function() {
-		return (this._hasPropertyHelper() || (this.getPropertyInfo().length > 0));
-	};
-
 	FilterBarBase.prototype._getRequiredFieldsWithoutValues = function() {
 		var aReqFiltersWithoutValue = [];
 		this._getRequiredPropertyNames().forEach(function(sName) {
@@ -1032,19 +946,7 @@ sap.ui.define([
 		var oPromise = oEvent.getParameter("promise");
 		if (oPromise) {
 			oPromise.then(function() {
-
-				if (this._oConditionChangeStartedPromise) {
-					this._oConditionChangeStartedPromise.then(function() {
-						this.triggerSearch();
-					}.bind(this));
-				} else if (this._aCollectedChangePromises && this._aCollectedChangePromises.length > 0) {
-					var aChangePromises = this._aCollectedChangePromises.slice();
-					Promise.all(aChangePromises).then(function() {
-						this.triggerSearch();
-					}.bind(this));
-				} else {
-					this.triggerSearch();
-				}
+				this.triggerSearch();
 			}.bind(this)).catch(function(oEx) {
 				Log.error(oEx);
 			});
@@ -1128,18 +1030,6 @@ sap.ui.define([
 		}
 	};
 
-	FilterBarBase.prototype._waitForChangeAppliance = function(bFireSearch) {
-
-		var aChangePromises = this._aCollectedChangePromises.slice();
-		this._aCollectedChangePromises = null;
-
-		Promise.all(aChangePromises).then(function(aConditionsArray) {
-			this._validate(bFireSearch);
-		}.bind(this), function(aConditionsArray) {
-			this._validate(bFireSearch);
-		}.bind(this));
-	};
-
 	/**
 	 * Executes the search.
 	 * @private
@@ -1158,6 +1048,12 @@ sap.ui.define([
 			this._fResolvedSearchPromise = null;
 		}.bind(this);
 
+		var fnValidationSucceeds = function() {
+			fnCheckAndFireSearch();
+			this._fResolvedSearchPromise();
+			fnCleanup();
+		}.bind(this);
+
 		if (this.bIsDestroyed) {
 			fnCleanup();
 			return;
@@ -1171,22 +1067,13 @@ sap.ui.define([
 			return;
 		}
 
-		if (this._aCollectedChangePromises && (this._aCollectedChangePromises.length > 0)) {
-			this._waitForChangeAppliance(bFireSearch);
-			return;
-		}
-
 		if (vRetErrorState === ErrorState.NoError) {
-			if (this._isChangeApplying()) {
-				this._oFlexPromise.then(function() {
-					fnCheckAndFireSearch();
-					this._fResolvedSearchPromise();
-					fnCleanup();
-				}.bind(this));
+			if (this._oConditionChangeStartedPromise) {
+				this._oConditionChangeStartedPromise.then(function() {
+					fnValidationSucceeds();
+				});
 			} else {
-				fnCheckAndFireSearch();
-				this._fResolvedSearchPromise();
-				fnCleanup();
+				fnValidationSucceeds();
 			}
 		} else {
 			if (vRetErrorState === ErrorState.RequiredHasNoValue) {
@@ -1244,7 +1131,15 @@ sap.ui.define([
 		return Promise.all([this._oInitialFiltersAppliedPromise, this._oMetadataAppliedPromise]);
 	};
 
+	FilterBarBase.prototype._initialized = function() {
+		return this.waitForInitialization();
+	};
+
 	FilterBarBase.prototype.initialized = function() {
+
+		if (!this._oMetadataAppliedPromise) {
+			this._retrieveMetadata();
+		}
 		return this.waitForInitialization();
 	};
 
@@ -1284,6 +1179,22 @@ sap.ui.define([
 		}.bind(this) : undefined;
 	};
 
+	FilterBarBase.prototype._isPathKnownAsync = function(sFieldPath, oXCondition) {
+		var sName, sKey, aPromises = [];
+
+		aPromises.push(this._getPropertyByNameAsync(sFieldPath));
+		for (sKey in oXCondition["inParameters"]) {
+			sName = sKey.startsWith("conditions/") ? sKey.slice(11) : sKey; // just use field name
+			aPromises.push(this._getPropertyByNameAsync(sName));
+		}
+
+		for (sKey in oXCondition["outParameters"]) {
+			sName = sKey.startsWith("conditions/") ? sKey.slice(11) : sKey; // just use field name
+			aPromises.push(this._getPropertyByNameAsync(sName));
+		}
+
+		return Promise.all(aPromises);
+	};
 
 	FilterBarBase.prototype._isPathKnown = function(sFieldPath, oXCondition) {
 		var sKey, sName;
@@ -1319,16 +1230,12 @@ sap.ui.define([
 	};
 
 	FilterBarBase.prototype.removeCondition = function(sFieldPath, oXCondition) {
-		return this.initialized().then(function() {
+		return this._initialized().then(function() {
 			var oCM = this._getConditionModel();
 			if (oCM) {
-				if (!this._hasPropertyHelper() && !this._isPathKnown(sFieldPath, oXCondition)) {
-					return this._retrieveMetadata().then(function() {
-						this._removeCondition(sFieldPath, oXCondition, oCM);
-					}.bind(this));
-				} else {
+				this._isPathKnownAsync(sFieldPath, oXCondition).then(function() {
 					this._removeCondition(sFieldPath, oXCondition, oCM);
-				}
+				}.bind(this));
 			}
 		}.bind(this));
 	};
@@ -1351,17 +1258,12 @@ sap.ui.define([
 	};
 
 	FilterBarBase.prototype.addCondition = function(sFieldPath, oXCondition) {
-		return this.initialized().then(function() {
+		return this._initialized().then(function() {
 			var oCM = this._getConditionModel();
 			if (oCM) {
-
-				if (!this._hasPropertyHelper() && !this._isPathKnown(sFieldPath, oXCondition)) {
-					return this._retrieveMetadata().then(function() {
-						this._addCondition(sFieldPath, oXCondition, oCM);
-					}.bind(this));
-				} else {
+				this._isPathKnownAsync(sFieldPath, oXCondition).then(function() {
 					this._addCondition(sFieldPath, oXCondition, oCM);
-				}
+				}.bind(this));
 			}
 		}.bind(this));
 
@@ -1416,7 +1318,7 @@ sap.ui.define([
 				}
 			}
 
-			if (!bAllPropertiesKnown && !this._hasPropertyHelper()) {
+			if (!bAllPropertiesKnown) {
 				this._retrieveMetadata().then(function() {
 					fApplyConditions(mConditionsData);
 				});
@@ -1622,27 +1524,28 @@ sap.ui.define([
 		}
 
 		this._fResolveMetadataApplied = undefined;
-		this._oMetadataAppliedPromise = new Promise(function(resolve) {
+		this._oMetadataAppliedPromise = new Promise(function(resolve, reject) {
 			this._fResolveMetadataApplied = resolve;
+			this._fRejectMetadataApplied = reject;
 		}.bind(this));
 
 
 		this.initControlDelegate().then(function() {
 			if (!this._bIsBeingDestroyed) {
 
-				var fnResolveMetadata = function() {
-					this._fResolveMetadataApplied();
+				var fnResolveMetadata = function(bFlag) {
+					bFlag ? this._fResolveMetadataApplied() : this._fRejectMetadataApplied();
 					this._fResolveMetadataApplied = null;
+					this._fRejectMetadataApplied = null;
 				}.bind(this);
 
-				if (this.bDelegateInitialized && this.getControlDelegate().fetchProperties) {
-					this.initPropertyHelper(PropertyHelper).then(function(oPropertyHelper) {
-						//this._oPropertyHelper = oPropertyHelper;
-						fnResolveMetadata();
+				if (this.bDelegateInitialized) {
+					this.finalizePropertyHelper().then(function() {
+						fnResolveMetadata(true);
 					});
 				} else {
-					Log.error("Provided delegate '" + this.getDelegate().path + "' not valid.");
-					fnResolveMetadata();
+					Log.error("Delegate not initialized.");
+					fnResolveMetadata(false);
 				}
 			}
 		}.bind(this));
@@ -1752,40 +1655,6 @@ sap.ui.define([
 		}.bind(this));
 	};
 
-	FilterBarBase.prototype._getWaitForChangesPromise = function() {
-		return this.getEngine().waitForChanges(this);
-	};
-
-	FilterBarBase.prototype._suspendBinding = function(oFilterField) {
-
-		if (oFilterField) {
-			var oBinding = oFilterField.getBinding("conditions");
-			if (oBinding) {
-				if (!this._aBindings) {
-					this._aBindings = [];
-				}
-				oBinding.suspend();
-				this._aBindings.push(oFilterField);
-			}
-		}
-	};
-
-	FilterBarBase.prototype._resumeBindings = function() {
-		if (this._aBindings) {
-			this._aBindings.forEach(function(oFilterField) {
-				if (!oFilterField.bIsDestroyed) {
-					var oBinding = oFilterField.getBinding("conditions");
-					if (oBinding) {
-						oBinding.resume();
-					}
-				}
-			});
-
-			this._aBindings = null;
-		}
-	};
-
-
 	FilterBarBase.prototype._isChangeApplying = function() {
 		return  !!this._oFlexPromise;
 	};
@@ -1976,7 +1845,6 @@ sap.ui.define([
 		this._aBindings = null;
 
 		this._aFIChanges = null;
-		this._aCollectedChangePromises = null;
 
 		this._oConditionChangeStartedPromise = null;
 		this._fConditionChangeStartedPromiseResolve	= undefined;

package/src/sap/ui/mdc/filterbar/PropertyHelper.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @param {object[]} aProperties
 	 *     The properties to process in this helper
-	 * @param {object<string, object>} [mExtensions]
+	 * @param {Object<string, object>} [mExtensions]
 	 *     Key-value map, where the key is the name of the property and the value is the extension containing mode-specific information.
 	 *     The extension of a property is stored in a reserved <code>extension</code> attribute and its attributes must be specified with
 	 *     <code>mExtensionAttributeMetadata</code>.
@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.util.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 *
 	 * @private
 	 * @experimental
@@ -48,5 +48,30 @@ sap.ui.define([
 		}
 	});
 
+
+	/**
+	 * Applies defaults and resolves property references.
+	 *
+	 * @param {object} oProperty The property to prepare
+	 * @protected
+	 */
+	PropertyHelper.prototype.prepareProperty = function(oProperty) {
+
+		if (!oProperty.typeConfig) {
+
+			var oParent = this.getParent();
+			if (oParent && oParent._oDelegate) {
+				var oTypeUtil = oParent._oDelegate.getTypeUtil();
+				try {
+					oProperty.typeConfig = oTypeUtil.getTypeConfig(oProperty.dataType, oProperty.formatOptions, oProperty.constraints);
+				} catch (ex) {
+					//
+				}
+			}
+		}
+
+		PropertyHelperBase.prototype.prepareProperty.apply(this, arguments);
+	};
+
 	return PropertyHelper;
 });