@openui5/sap.ui.mdc 1.110.0 → 1.111.0

package/src/sap/ui/mdc/field/FieldBaseDelegate.js

@@ -69,39 +69,6 @@ sap.ui.define([
 		return oNextCondition;
 	};
 
-	/**
-	 * Maps the Edm type names to real type names
-	 *
-	 * If a real type has already been defined, this type is returned.
-	 *
-	 * @param {object} oPayload Payload for delegate
-	 * @param {string} sType Given EDM type
-	 * @returns {string} Data type name
-	 * @private
-	 * @deprecated please use sap.ui.mdc.util.TypeUtil.getDataTypeClass instead
-	 */
-	FieldBaseDelegate.getDataTypeClass = function(oPayload, sType) {
-		return TypeUtil.getDataTypeClassName(sType);
-	};
-
-	/**
-	 * To know what control is rendered the <code>Field</code> or </code>FilterField</code>
-	 * needs to know if the type represents a date, a number or something else in a normalized way.
-	 *
-	 * As default <code>string</code> is returned.
-	 *
-	 * @param {object} oPayload Payload for delegate
-	 * @param {string} sType Given type
-	 * @param {object} oFormatOptions Used <code>FormatOptions</code>
-	 * @param {object} oConstraints Used <code>Constraints</code>
-	 * @returns {sap.ui.mdc.condition.BaseType} output <code>Date</code>, <code>DateTime</code> or <code>Time</code>...
-	 * @private
-	 * @deprecated please use sap.ui.mdc.util.TypeUtil.getBaseType instead
-	 */
-	FieldBaseDelegate.getBaseType = function(oPayload, sType, oFormatOptions, oConstraints) {
-		return TypeUtil.getBaseType(sType, oFormatOptions, oConstraints);
-	};
-
 	/**
 	 * If the <code>Field</code> control is used, the used data type might come from the binding.
 	 * In V4-unit or currency case it might need to be formatted once.
@@ -157,15 +124,15 @@ sap.ui.define([
 	 * checked to determine the key and description.
 	 *
 	 * @param {object} oPayload Payload for delegate
-	 * @param {sap.ui.mdc.field.FieldHelpBase} oFieldHelp Field help assigned to the <code>Field</code> or <code>FilterField</code> control
+	 * @param {sap.ui.mdc.ValueHelp} oValueHelp Field help assigned to the <code>Field</code> or <code>FilterField</code> control
 	 * @returns {boolean} If <code>true</code>, the input is checked
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.field.FieldBase
 	 * @since: 1.78.0
 	 */
-	FieldBaseDelegate.isInputValidationEnabled = function(oPayload, oFieldHelp) {
+	FieldBaseDelegate.isInputValidationEnabled = function(oPayload, oValueHelp) {
 
-		if (oFieldHelp && oFieldHelp.isValidationSupported()) {
+		if (oValueHelp && oValueHelp.isValidationSupported()) {
 			return true;
 		} else {
 			return false;
@@ -178,16 +145,16 @@ sap.ui.define([
 	 * is not found in the field help or custom logic is accepted.
 	 *
 	 * @param {object} oPayload Payload for delegate
-	 * @param {sap.ui.mdc.field.FieldHelpBase} oFieldHelp Field help assigned to the <code>Field</code> or <code>FilterField</code> control
+	 * @param {sap.ui.mdc.ValueHelp} oValueHelp Field help assigned to the <code>Field</code> or <code>FilterField</code> control
 	 * @returns {boolean} If <code>true</code>, invalid input is accepted
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.field.FieldBase
 	 * @since: 1.78.0
 	 */
-	FieldBaseDelegate.isInvalidInputAllowed = function(oPayload, oFieldHelp) {
+	FieldBaseDelegate.isInvalidInputAllowed = function(oPayload, oValueHelp) {
 
-		if (oFieldHelp) {
-			return !oFieldHelp.getValidateInput();
+		if (oValueHelp) {
+			return !oValueHelp.getValidateInput();
 		} else {
 			return true;
 		}
@@ -210,15 +177,13 @@ sap.ui.define([
 	 * If the item cannot be determined, a corresponding <code>ParseException<code> is thrown.
 	 *
 	 * @param {object} oPayload Payload for delegate
-	 * @param {sap.ui.mdc.field.FieldHelpBase} oFieldHelp Field help assigned to the <code>Field</code> or <code>FilterField</code> control
+	 * @param {sap.ui.mdc.ValueHelp} oValueHelp Field help assigned to the <code>Field</code> or <code>FilterField</code> control
 	 * @param {object} [oConfig] Configuration
 	 * @param {any} oConfig.value Value as entered by user
 	 * @param {any} oConfig.parsedValue Value parsed by data type to fit the data type of the key
 	 * @param {sap.ui.model.Context} oConfig.bindingContext <code>BindingContext</code> of the checked field. Inside a table the <code>FieldHelp</code> element might be connected to a different row.
 	 * @param {boolean} oConfig.checkKey If set, it should be checked if there is an item with the given key. This is set to <code>false</code> if the value cannot be a valid key because of type validation.
 	 * @param {boolean} oConfig.checkDescription If set, it should be checked if there is an item with the given description. This is set to <code>false</code> if only the key is used in the field.
-	 * @param {sap.ui.mdc.condition.ConditionModel} [oConfig.conditionModel] <code>ConditionModel</code>, if bound to one
-	 * @param {string} [oConfig.conditionModelName] Name of the <code>ConditionModel</code>, if bound to one
 	 * @param {sap.ui.core.Control} oConfig.control Instance if the calling control
 	 * @returns {object|Promise} Object containing description, key, in and out parameters. If it is not available right now (must be requested), a <code>Promise</code> is returned.
 	 * @throws {sap.ui.model.ParseException} if item cannot be determined
@@ -227,10 +192,10 @@ sap.ui.define([
 	 * @ui5-restricted sap.fe
 	 * @MDC_PUBLIC_CANDIDATE
 	 */
-	FieldBaseDelegate.getItemForValue = function(oPayload, oFieldHelp, oConfig) {
+	FieldBaseDelegate.getItemForValue = function(oPayload, oValueHelp, oConfig) {
 
-		if (oFieldHelp) {
-			return oFieldHelp.getItemForValue(oConfig);
+		if (oValueHelp) {
+			return oValueHelp.getItemForValue(oConfig);
 		}
 
 	};
@@ -248,13 +213,13 @@ sap.ui.define([
 	 * If the description cannot be determined, a corresponding <code>FormatException<code> is thrown.
 	 *
 	 * @param {object} oPayload Payload for delegate
-	 * @param {sap.ui.mdc.field.FieldHelpBase} oFieldHelp Field help assigned to the <code>Field</code> or <code>FilterField</code> control
+	 * @param {sap.ui.mdc.ValueHelp} oValueHelp Field help assigned to the <code>Field</code> or <code>FilterField</code> control
 	 * @param {any} vKey Key
 	 * @param {object} oInParameters In parameters for the key (as a key must not be unique.)
 	 * @param {object} oOutParameters Out parameters for the key (as a key must not be unique.)
 	 * @param {sap.ui.model.Context} oBindingContext <code>BindingContext</code> of the checked field. Inside a table the <code>FieldHelp</code> element might be connected to a different row.
-	 * @param {sap.ui.mdc.condition.ConditionModel} [oConditionModel] <code>ConditionModel</code>, if bound to one
-	 * @param {string} [sConditionModelName] Name of the <code>ConditionModel</code>, if bound to one
+	 * @param {sap.ui.mdc.condition.ConditionModel} [oConditionModel] <code>ConditionModel</code>, if bound to one - NOT LONGER USED
+	 * @param {string} [sConditionModelName] Name of the <code>ConditionModel</code>, if bound to one - NOT LONGER USED
 	 * @param {object} oConditionPayload Additional context information for this key
 	 * @param {sap.ui.core.Control} [oControl] Instance if the calling control
 	 * @param {sap.ui.model.Type} oType Type of the value
@@ -265,26 +230,20 @@ sap.ui.define([
 	 * @ui5-restricted sap.fe
 	 * @MDC_PUBLIC_CANDIDATE
 	 */
-	FieldBaseDelegate.getDescription = function(oPayload, oFieldHelp, vKey, oInParameters, oOutParameters, oBindingContext, oConditionModel, sConditionModelName, oConditionPayload, oControl, oType) {
-		if (oFieldHelp && oFieldHelp.isA("sap.ui.mdc.ValueHelp")) {
-			var oConfig = {
-				value: vKey,
-				parsedValue: vKey,
-				dataType: oType,
-				context: {inParameters: oInParameters, outParameters: oOutParameters, payload: oConditionPayload},
-				bindingContext: oBindingContext,
-				conditionModel: oConditionModel,
-				conditionModelName: sConditionModelName,
-				checkKey: true,
-				checkDescription: false,
-				caseSensitive: true, // case sensitive as used to get description for known key
-				exception: FormatException,
-				control: oControl
-			};
-			return oFieldHelp.getItemForValue(oConfig);
-		} else if (oFieldHelp) {
-			return oFieldHelp.getTextForKey(vKey, oInParameters, oOutParameters, oBindingContext, oConditionModel, sConditionModelName);
-		}
+	FieldBaseDelegate.getDescription = function(oPayload, oValueHelp, vKey, oInParameters, oOutParameters, oBindingContext, oConditionModel, sConditionModelName, oConditionPayload, oControl, oType) {
+		var oConfig = {
+			value: vKey,
+			parsedValue: vKey,
+			dataType: oType,
+			context: {inParameters: oInParameters, outParameters: oOutParameters, payload: oConditionPayload},
+			bindingContext: oBindingContext,
+			checkKey: true,
+			checkDescription: false,
+			caseSensitive: true, // case sensitive as used to get description for known key
+			exception: FormatException,
+			control: oControl
+		};
+		return oValueHelp && oValueHelp.getItemForValue(oConfig);
 
 	};
 

package/src/sap/ui/mdc/field/FieldInfoBase.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A <code>FieldInfoBase</code> element is a base class that shows any kind of information related to the <code>Field</code> control, for example, navigation targets or contact details.
 	 * @extends sap.ui.mdc.Element
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @constructor
 	 * @private
 	 * @since 1.54.0

package/src/sap/ui/mdc/field/FieldInput.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class The <code>FieldInput</code> control is used to render an input field inside a control based on {@link sap.ui.mdc.field.FieldBase FieldBase}.
 	 * @extends sap.m.Input
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/field/FieldInputRenderUtil.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @class Functions uses in <code>FieldInputRenderer</code> and <code>FieldMultiInputRenderer</code> to adjust aria attributes.
 	 *
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @since 1.86.0
 	 * @alias sap.ui.mdc.field.FieldInputRenderUtil
 	 *

package/src/sap/ui/mdc/field/FieldMultiInput.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class The <code>FieldMultiInput</code> control is used to render a multi-input field inside a control based on {@link sap.ui.mdc.field.FieldBase FieldBase}.
 	 * @extends sap.m.MultiInput
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/field/ListFieldHelpItem.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.ListItem
 	 *
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.fe

package/src/sap/ui/mdc/field/MultiValueFieldItem.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Base type for <code>MultiValueFieldItem</code> control.
 	 * @extends sap.ui.core.Element
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/field/TokenDisplay.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class The <code>TokenDisplay</code> control is used to render a field inside a control based on {@link sap.ui.mdc.field.FieldBase FieldBase}.
 	 * @extends sap.m.Token
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/field/TokenizerDisplay.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class The <code>TokenizerDisplay</code> control is used to render a Tokenizer inside a control based on {@link sap.ui.mdc.field.FieldBase FieldBase}.
 	 * @extends sap.m.Tokenizer
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/field/content/ContentFactory.js

@@ -38,6 +38,7 @@ sap.ui.define([
 			library: "sap.ui.mdc"
 		},
 		constructor: function(sId, mSettings) {
+			this.init();
 			this._oField = mSettings ? mSettings.field : null;
 			this._fnHandleTokenUpdate = mSettings ? mSettings.handleTokenUpdate : null;
 			this._fnHandleContentChange = mSettings ? mSettings.handleContentChange : null;
@@ -61,9 +62,10 @@ sap.ui.define([
 	};
 
 	ContentFactory.prototype.init = function() {
-		this._oContentTypeClass;
-		this._sOperator;
+		this._oContentTypeClass = undefined;
+		this._sOperator = undefined;
 		this._bNoFormatting = false;
+		this._bHideOperator = false;
 	};
 
 	ContentFactory.prototype.exit = function() {
@@ -93,7 +95,7 @@ sap.ui.define([
 	 * @param {sap.ui.mdc.field.content.DefaultContent} oContentType The content type object
 	 * @param {sap.ui.mdc.enum.ContentMode} sContentMode A given content mode
 	 * @param {string} sId ID of the {@link sap.ui.mdc.field.FieldBase}
-	 * @returns {sap.ui.core.Control[]} Array containing the created controls
+	 * @returns {Promise<sap.ui.core.Control[]>} Array containing the created controls
 	 */
 	ContentFactory.prototype.createContent = function(oContentType, sContentMode, sId) {
 		var aControlNames = oContentType.getControlNames(sContentMode, this._sOperator);
@@ -108,10 +110,19 @@ sap.ui.define([
 			return Promise.resolve([]);
 		}
 
+		if (!this.getDataType()) {
+			// DataType instance not already set, make sure to load module before creating control and corresponding ConditionType (In Field case Instance is set in Binding.)
+			var sDataType = this.getField().getDataType();
+			if (sDataType) {
+				sDataType = this.getField().getTypeUtil().getDataTypeClassName(sDataType); // map EDM-Types
+				aControlNames.push(sDataType.replaceAll(".", "/"));
+			}
+		}
+
 		try {
 			oLoadModulesPromise = loadModules(aControlNames)
 				.catch(function(oError) {
-					throw new Error("loadModules promise rejected in sap.ui.mdc.field.content.ContentFactory:createContent function call - could not load controls " + JSON.stringify(aControlNames));
+					throw new Error("loadModules promise rejected in sap.ui.mdc.field.content.ContentFactory:createContent function call - could not load data type " + JSON.stringify(aControlNames));
 				})
 				.then(function(aControls) {
 					if (this.getField() && !this.getField()._bIsBeingDestroyed) {
@@ -315,7 +326,7 @@ sap.ui.define([
 		this._oContentConditionTypes = oContentConditionTypes;
 	};
 
-	ContentFactory.prototype._setUsedConditionType = function(oContent, sEditMode) {
+	ContentFactory.prototype._setUsedConditionType = function(oContent, oContentEdit, oContentDisplay, sEditMode) {
 
 		// remove external types
 		if (this._oConditionType && !this._oConditionType._bCreatedByField) {
@@ -334,12 +345,12 @@ sap.ui.define([
 				oConditionType = this._oContentConditionTypes.content.oConditionType;
 				oConditionsType = this._oContentConditionTypes.content.oConditionsType;
 			}
-		} else if (sEditMode === EditMode.Display && this.getField().getContentDisplay()) {
+		} else if (sEditMode === EditMode.Display && oContentDisplay) {
 			if (this._oContentConditionTypes.contentDisplay) {
 				oConditionType = this._oContentConditionTypes.contentDisplay.oConditionType;
 				oConditionsType = this._oContentConditionTypes.contentDisplay.oConditionsType;
 			}
-		} else if (sEditMode !== EditMode.Display && this.getField().getContentEdit()) {
+		} else if (sEditMode !== EditMode.Display && oContentEdit) {
 			if (this._oContentConditionTypes.contentEdit) {
 				oConditionType = this._oContentConditionTypes.contentEdit.oConditionType;
 				oConditionsType = this._oContentConditionTypes.contentEdit.oConditionsType;
@@ -359,7 +370,35 @@ sap.ui.define([
 			this._oConditionsType = oConditionsType;
 		}
 
-		this.updateConditionType();
+		if (oConditionType || oConditionsType) {
+			// as data type module might not be loaded, load it now
+			if (!this.getDataType()) {
+				// DataType instance not already set, make sure to load module before creating control and corresponding ConditionType (In Field case Instance is set in Binding.)
+				var sDataType = this.getField().getDataType();
+				if (sDataType) {
+					sDataType = this.getField().getTypeUtil().getDataTypeClassName(sDataType); // map EDM-Types
+					sDataType = sDataType.replaceAll(".", "/");
+					try {
+						loadModules([sDataType])
+							.catch(function(oError) {
+								throw new Error("loadModules promise rejected in sap.ui.mdc.field.content.ContentFactory:_setUsedConditionType function call - could not load controls " + sDataType);
+							})
+							.then(function(aModules) {
+								if (this.getField() && !this.getField()._bIsBeingDestroyed) {
+									this.updateConditionType();
+								}
+							}.bind(this))
+							.unwrap();
+					} catch (oError) {
+						throw new Error("Error in sap.ui.mdc.field.content.ContentFactory:_setUsedConditionType function call ErrorMessage: '" + oError.message + "'");
+					}
+				}
+			} else {
+				this.updateConditionType();
+			}
+
+		}
+
 	};
 
 	ContentFactory.prototype.getDataType = function() {
@@ -370,7 +409,25 @@ sap.ui.define([
 		this._oDataType = oDataType;
 	};
 
-	ContentFactory.prototype.retrieveDataType = function() {
+	ContentFactory.prototype.checkDataTypeChanged = function(sDataType) {
+		sDataType = this.getField().getTypeUtil().getDataTypeClassName(sDataType); // map EDM-Types
+
+		try {
+			// check data-type after we can be sure it's loaded to perform depending actions later
+			return loadModules([sDataType.replaceAll(".", "/")])
+				.catch(function(oError) {
+					throw new Error("loadModules promise rejected in sap.ui.mdc.field.content.ContentFactory:checkDataTypeChanged function call - could not load data type " + sDataType);
+				})
+				.then(function(aModules) {
+					// TODO: also compare FormatOptions and Constraints
+					return !this._oDataType || this._oDataType.getMetadata().getName() !== sDataType;
+				}.bind(this));
+		} catch (oError) {
+			throw new Error("Error in sap.ui.mdc.field.content.ContentFactory:checkDataTypeChanged function call ErrorMessage: '" + oError.message + "'");
+		}
+	};
+
+	ContentFactory.prototype.retrieveDataType = function() { // make sure that data type module is loaded before
 		if (!this._oDataType) {
 			var sDataType = this.getField().getDataType();
 			if (typeof sDataType === "string") {

package/src/sap/ui/mdc/field/content/DateContent.js

@@ -41,7 +41,7 @@ sap.ui.define([
 			return [null];
 		},
 		getEdit: function() {
-			return ["sap/m/DynamicDateRange", "sap/ui/mdc/condition/OperatorDynamicDateOption", "sap/ui/mdc/field/DynamicDateRangeConditionsType", "sap/m/StandardDynamicDateRangeKeys", "sap/m/DynamicDateUtil", "sap/m/DynamicDateFormat"];
+			return ["sap/m/DynamicDateRange", "sap/ui/mdc/condition/OperatorDynamicDateOption", "sap/ui/mdc/field/DynamicDateRangeConditionsType", "sap/m/library", "sap/m/DynamicDateUtil", "sap/m/DynamicDateFormat"];
 		},
 		getEditOperator: function() {
 			return {
@@ -186,9 +186,10 @@ sap.ui.define([
 			var DynamicDateRange = aControlClasses[0];
 			var OperatorDynamicDateOption = aControlClasses[1];
 			var DynamicDateRangeConditionsType = aControlClasses[2];
+			var mLibrary = aControlClasses[3];
 
 			if (!StandardDynamicDateRangeKeys || !DynamicDateUtil || !DynamicDateFormat) {
-				StandardDynamicDateRangeKeys = aControlClasses[3];
+				StandardDynamicDateRangeKeys = mLibrary.StandardDynamicDateRangeKeys;
 				DynamicDateUtil = aControlClasses[4];
 				DynamicDateFormat = aControlClasses[5];
 			}