@sapui5/sap.fe.core 1.96.4 → 1.99.0

package/src/sap/fe/core/templating/UIFormatters.ts

@@ -1,4 +1,4 @@
-import { Context } from "sap/ui/model/odata/v4";
+import Context from "sap/ui/model/odata/v4/Context";
 import { convertMetaModelContext, getInvolvedDataModelObjects } from "sap/fe/core/converters/MetaModelConverter";
 import {
 	addTypeInformation,
@@ -37,9 +37,20 @@ import {
 	isPathUpdatable,
 	getPathRelativeLocation
 } from "sap/fe/core/templating/DataModelPathHelper";
-import { isReadOnlyExpression, isNonEditableExpression, isDisabledExpression } from "sap/fe/core/templating/FieldControlHelper";
+import {
+	isReadOnlyExpression,
+	isNonEditableExpression,
+	isDisabledExpression,
+	isRequiredExpression
+} from "sap/fe/core/templating/FieldControlHelper";
 import valueFormatters from "sap/fe/core/formatters/ValueFormatter";
 import { DataFieldAbstractTypes } from "@sap-ux/vocabularies-types";
+import * as DisplayModeFormatter from "sap/fe/core/templating/DisplayModeFormatter";
+
+// Import-export method used by the converter to use them in the templating through the UIFormatters.
+export type DisplayMode = DisplayModeFormatter.DisplayMode;
+export const getDisplayMode = DisplayModeFormatter.getDisplayMode;
+export const EDM_TYPE_MAPPING = DisplayModeFormatter.EDM_TYPE_MAPPING;
 
 export type PropertyOrPath<P> = string | P | PathAnnotationExpression<P>;
 export type MetaModelContext = {
@@ -73,52 +84,6 @@ export type configType = {
 	formatOptions: configTypeformatOptions;
 };
 
-export const EDM_TYPE_MAPPING: Record<string, any> = {
-	"Edm.Boolean": { type: "sap.ui.model.odata.type.Boolean" },
-	"Edm.Byte": { type: "sap.ui.model.odata.type.Byte" },
-	"Edm.Date": { type: "sap.ui.model.odata.type.Date" },
-	"Edm.DateTimeOffset": {
-		constraints: {
-			"$Precision": "precision"
-		},
-		type: "sap.ui.model.odata.type.DateTimeOffset"
-	},
-	"Edm.Decimal": {
-		constraints: {
-			"@Org.OData.Validation.V1.Minimum/$Decimal": "minimum",
-			"@Org.OData.Validation.V1.Minimum@Org.OData.Validation.V1.Exclusive": "minimumExclusive",
-			"@Org.OData.Validation.V1.Maximum/$Decimal": "maximum",
-			"@Org.OData.Validation.V1.Maximum@Org.OData.Validation.V1.Exclusive": "maximumExclusive",
-			"$Precision": "precision",
-			"$Scale": "scale"
-		},
-		type: "sap.ui.model.odata.type.Decimal"
-	},
-	"Edm.Double": { type: "sap.ui.model.odata.type.Double" },
-	"Edm.Guid": { type: "sap.ui.model.odata.type.Guid" },
-	"Edm.Int16": { type: "sap.ui.model.odata.type.Int16" },
-	"Edm.Int32": { type: "sap.ui.model.odata.type.Int32" },
-	"Edm.Int64": { type: "sap.ui.model.odata.type.Int64" },
-	"Edm.SByte": { type: "sap.ui.model.odata.type.SByte" },
-	"Edm.Single": { type: "sap.ui.model.odata.type.Single" },
-	"Edm.Stream": { type: "sap.ui.model.odata.type.Stream" },
-	"Edm.Binary": { type: "sap.ui.model.odata.type.Stream" },
-	"Edm.String": {
-		constraints: {
-			"@com.sap.vocabularies.Common.v1.IsDigitSequence": "isDigitSequence",
-			"$MaxLength": "maxLength",
-			"$Nullable": "nullable"
-		},
-		type: "sap.ui.model.odata.type.String"
-	},
-	"Edm.TimeOfDay": {
-		constraints: {
-			"$Precision": "precision"
-		},
-		type: "sap.ui.model.odata.type.TimeOfDay"
-	}
-};
-
 /**
  * Create the expression to generate an "editable" boolean value.
  *
@@ -290,34 +255,6 @@ export const ifUnitEditable = function(
 	return compileBinding(ifElse(editableExpression, sEditableValue, sNonEditableValue));
 };
 
-export type DisplayMode = "Value" | "Description" | "DescriptionValue" | "ValueDescription";
-export const getDisplayMode = function(oPropertyPath: PropertyOrPath<Property>, oDataModelObjectPath?: DataModelObjectPath): DisplayMode {
-	if (!oPropertyPath || typeof oPropertyPath === "string") {
-		return "Value";
-	}
-	const oProperty = (isPathExpression(oPropertyPath) && oPropertyPath.$target) || (oPropertyPath as Property);
-	const oEntityType = oDataModelObjectPath && oDataModelObjectPath.targetEntityType;
-	const oTextAnnotation = oProperty.annotations?.Common?.Text;
-	const oTextArrangementAnnotation =
-		(typeof oTextAnnotation !== "string" && oTextAnnotation?.annotations?.UI?.TextArrangement?.toString()) ||
-		oEntityType?.annotations?.UI?.TextArrangement?.toString();
-
-	let sDisplayValue = oTextAnnotation ? "DescriptionValue" : "Value";
-	if ((oTextAnnotation && oTextArrangementAnnotation) || oEntityType?.annotations?.UI?.TextArrangement?.toString()) {
-		if (oTextArrangementAnnotation === "UI.TextArrangementType/TextOnly") {
-			sDisplayValue = "Description";
-		} else if (oTextArrangementAnnotation === "UI.TextArrangementType/TextLast") {
-			sDisplayValue = "ValueDescription";
-		} else if (oTextArrangementAnnotation === "UI.TextArrangementType/TextSeparate") {
-			sDisplayValue = "Value";
-		} else {
-			//Default should be TextFirst if there is a Text annotation and neither TextOnly nor TextLast are set
-			sDisplayValue = "DescriptionValue";
-		}
-	}
-	return sDisplayValue as DisplayMode;
-};
-
 export const getFieldDisplay = function(
 	oPropertyPath: PropertyOrPath<Property>,
 	sTargetDisplayMode: string,
@@ -559,3 +496,29 @@ export const isCollectionField = function(oDataModelPath: DataModelObjectPath):
 	}
 	return false;
 };
+
+export const getRequiredExpression = function(
+	oPropertyPath: PropertyOrPath<Property>,
+	oDataFieldConverted?: any,
+	forceEditMode: boolean = false,
+	bAsObject: boolean = false
+): BindingExpression<boolean> | ExpressionOrPrimitive<boolean> {
+	if (!oPropertyPath || typeof oPropertyPath === "string") {
+		return compileBinding(false);
+	}
+
+	let dataFieldRequiredExpression: BindingExpression<boolean> | ExpressionOrPrimitive<boolean> = true;
+	if (oDataFieldConverted !== null) {
+		dataFieldRequiredExpression = isRequiredExpression(oDataFieldConverted);
+	}
+
+	const oProperty: Property = (isPathExpression(oPropertyPath) && oPropertyPath.$target) || (oPropertyPath as Property);
+	// Enablement depends on the field control expression
+	// If the Field control is statically in Inapplicable (disabled) -> not enabled
+	const requiredExpression = isRequiredExpression(oProperty);
+	const editMode = forceEditMode || UI.IsEditable;
+	if (bAsObject) {
+		return and(or(requiredExpression, dataFieldRequiredExpression), editMode);
+	}
+	return compileBinding(and(or(requiredExpression, dataFieldRequiredExpression), editMode));
+};

package/src/sap/fe/core/type/Email.js

@@ -17,4 +17,4 @@ sap.ui.define(["sap/ui/model/odata/type/String", "sap/ui/model/ValidateException
   });
   return EmailType;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkVtYWlsLnRzIl0sIm5hbWVzIjpbImVtYWlsVzNDUmVnZXhwIiwiRW1haWxUeXBlIiwiT0RhdGFTdHJpbmdUeXBlIiwiZXh0ZW5kIiwidmFsaWRhdGVWYWx1ZSIsInNWYWx1ZSIsInRlc3QiLCJWYWxpZGF0ZUV4Y2VwdGlvbiIsInNhcCIsInVpIiwiZ2V0Q29yZSIsImdldExpYnJhcnlSZXNvdXJjZUJ1bmRsZSIsImdldFRleHQiLCJwcm90b3R5cGUiLCJhcHBseSJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7OztBQUNBLE1BQU1BLGNBQWMsR0FBRyxxRUFBdkI7QUFDQSxNQUFNQyxTQUFTLEdBQUdDLGVBQWUsQ0FBQ0MsTUFBaEIsQ0FBdUIsd0JBQXZCLEVBQWlEO0FBQ2xFQyxJQUFBQSxhQURrRSxZQUNwREMsTUFEb0QsRUFDcEM7QUFDN0IsVUFBSSxDQUFDTCxjQUFjLENBQUNNLElBQWYsQ0FBb0JELE1BQXBCLENBQUwsRUFBa0M7QUFDakMsY0FBTSxJQUFJRSxpQkFBSixDQUNMQyxHQUFHLENBQUNDLEVBQUosQ0FDRUMsT0FERixHQUVFQyx3QkFGRixDQUUyQixhQUYzQixFQUdFQyxPQUhGLENBR1UsMkJBSFYsQ0FESyxDQUFOO0FBTUE7O0FBQ0RWLE1BQUFBLGVBQWUsQ0FBQ1csU0FBaEIsQ0FBMEJULGFBQTFCLENBQXdDVSxLQUF4QyxDQUE4QyxJQUE5QyxFQUFvRCxDQUFDVCxNQUFELENBQXBEO0FBQ0E7QUFYaUUsR0FBakQsQ0FBbEI7U0FhZUosUyIsInNvdXJjZVJvb3QiOiIuIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgU3RyaW5nIGFzIE9EYXRhU3RyaW5nVHlwZSB9IGZyb20gXCJzYXAvdWkvbW9kZWwvb2RhdGEvdHlwZVwiO1xuaW1wb3J0IHsgVmFsaWRhdGVFeGNlcHRpb24gfSBmcm9tIFwic2FwL3VpL21vZGVsXCI7XG5cbmNvbnN0IGVtYWlsVzNDUmVnZXhwID0gL15bYS16QS1aMC05LiEjJCUm4oCZKisvPT9eX2B7fH1+LV0rQFthLXpBLVowLTktXSsoPzouW2EtekEtWjAtOS1dKykqJC87XG5jb25zdCBFbWFpbFR5cGUgPSBPRGF0YVN0cmluZ1R5cGUuZXh0ZW5kKFwic2FwLmZlLmNvcmUudHlwZS5FbWFpbFwiLCB7XG5cdHZhbGlkYXRlVmFsdWUoc1ZhbHVlOiBzdHJpbmcpIHtcblx0XHRpZiAoIWVtYWlsVzNDUmVnZXhwLnRlc3Qoc1ZhbHVlKSkge1xuXHRcdFx0dGhyb3cgbmV3IFZhbGlkYXRlRXhjZXB0aW9uKFxuXHRcdFx0XHRzYXAudWlcblx0XHRcdFx0XHQuZ2V0Q29yZSgpXG5cdFx0XHRcdFx0LmdldExpYnJhcnlSZXNvdXJjZUJ1bmRsZShcInNhcC5mZS5jb3JlXCIpXG5cdFx0XHRcdFx0LmdldFRleHQoXCJUX0VNQUlMVFlQRV9JTlZBTElEX1ZBTFVFXCIpXG5cdFx0XHQpO1xuXHRcdH1cblx0XHRPRGF0YVN0cmluZ1R5cGUucHJvdG90eXBlLnZhbGlkYXRlVmFsdWUuYXBwbHkodGhpcywgW3NWYWx1ZV0pO1xuXHR9XG59KTtcbmV4cG9ydCBkZWZhdWx0IEVtYWlsVHlwZTtcbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkVtYWlsLnRzIl0sIm5hbWVzIjpbImVtYWlsVzNDUmVnZXhwIiwiRW1haWxUeXBlIiwiT0RhdGFTdHJpbmdUeXBlIiwiZXh0ZW5kIiwidmFsaWRhdGVWYWx1ZSIsInNWYWx1ZSIsInRlc3QiLCJWYWxpZGF0ZUV4Y2VwdGlvbiIsInNhcCIsInVpIiwiZ2V0Q29yZSIsImdldExpYnJhcnlSZXNvdXJjZUJ1bmRsZSIsImdldFRleHQiLCJwcm90b3R5cGUiLCJhcHBseSJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7OztBQUVBLE1BQU1BLGNBQWMsR0FBRyxxRUFBdkI7QUFDQSxNQUFNQyxTQUFTLEdBQUdDLGVBQWUsQ0FBQ0MsTUFBaEIsQ0FBdUIsd0JBQXZCLEVBQWlEO0FBQ2xFQyxJQUFBQSxhQURrRSxZQUNwREMsTUFEb0QsRUFDcEM7QUFDN0IsVUFBSSxDQUFDTCxjQUFjLENBQUNNLElBQWYsQ0FBb0JELE1BQXBCLENBQUwsRUFBa0M7QUFDakMsY0FBTSxJQUFJRSxpQkFBSixDQUNKQyxHQUFHLENBQUNDLEVBQUosQ0FBT0MsT0FBUCxHQUFpQkMsd0JBQWpCLENBQTBDLGFBQTFDLENBQUQsQ0FBNkVDLE9BQTdFLENBQXFGLDJCQUFyRixDQURLLENBQU47QUFHQTs7QUFDRFYsTUFBQUEsZUFBZSxDQUFDVyxTQUFoQixDQUEwQlQsYUFBMUIsQ0FBd0NVLEtBQXhDLENBQThDLElBQTlDLEVBQW9ELENBQUNULE1BQUQsQ0FBcEQ7QUFDQTtBQVJpRSxHQUFqRCxDQUFsQjtTQVVlSixTIiwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgUmVzb3VyY2VCdW5kbGUgZnJvbSBcInNhcC9iYXNlL2kxOG4vUmVzb3VyY2VCdW5kbGVcIjtcbmltcG9ydCBPRGF0YVN0cmluZ1R5cGUgZnJvbSBcInNhcC91aS9tb2RlbC9vZGF0YS90eXBlL1N0cmluZ1wiO1xuaW1wb3J0IFZhbGlkYXRlRXhjZXB0aW9uIGZyb20gXCJzYXAvdWkvbW9kZWwvVmFsaWRhdGVFeGNlcHRpb25cIjtcblxuY29uc3QgZW1haWxXM0NSZWdleHAgPSAvXlthLXpBLVowLTkuISMkJSbigJkqKy89P15fYHt8fX4tXStAW2EtekEtWjAtOS1dKyg/Oi5bYS16QS1aMC05LV0rKSokLztcbmNvbnN0IEVtYWlsVHlwZSA9IE9EYXRhU3RyaW5nVHlwZS5leHRlbmQoXCJzYXAuZmUuY29yZS50eXBlLkVtYWlsXCIsIHtcblx0dmFsaWRhdGVWYWx1ZShzVmFsdWU6IHN0cmluZykge1xuXHRcdGlmICghZW1haWxXM0NSZWdleHAudGVzdChzVmFsdWUpKSB7XG5cdFx0XHR0aHJvdyBuZXcgVmFsaWRhdGVFeGNlcHRpb24oXG5cdFx0XHRcdChzYXAudWkuZ2V0Q29yZSgpLmdldExpYnJhcnlSZXNvdXJjZUJ1bmRsZShcInNhcC5mZS5jb3JlXCIpIGFzIFJlc291cmNlQnVuZGxlKS5nZXRUZXh0KFwiVF9FTUFJTFRZUEVfSU5WQUxJRF9WQUxVRVwiKVxuXHRcdFx0KTtcblx0XHR9XG5cdFx0T0RhdGFTdHJpbmdUeXBlLnByb3RvdHlwZS52YWxpZGF0ZVZhbHVlLmFwcGx5KHRoaXMsIFtzVmFsdWVdKTtcblx0fVxufSk7XG5leHBvcnQgZGVmYXVsdCBFbWFpbFR5cGU7XG4iXX0=

package/src/sap/fe/core/type/Email.ts

@@ -1,15 +1,13 @@
-import { String as ODataStringType } from "sap/ui/model/odata/type";
-import { ValidateException } from "sap/ui/model";
+import ResourceBundle from "sap/base/i18n/ResourceBundle";
+import ODataStringType from "sap/ui/model/odata/type/String";
+import ValidateException from "sap/ui/model/ValidateException";
 
 const emailW3CRegexp = /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:.[a-zA-Z0-9-]+)*$/;
 const EmailType = ODataStringType.extend("sap.fe.core.type.Email", {
 	validateValue(sValue: string) {
 		if (!emailW3CRegexp.test(sValue)) {
 			throw new ValidateException(
-				sap.ui
-					.getCore()
-					.getLibraryResourceBundle("sap.fe.core")
-					.getText("T_EMAILTYPE_INVALID_VALUE")
+				(sap.ui.getCore().getLibraryResourceBundle("sap.fe.core") as ResourceBundle).getText("T_EMAILTYPE_INVALID_VALUE")
 			);
 		}
 		ODataStringType.prototype.validateValue.apply(this, [sValue]);

package/ui5.yaml

@@ -3,9 +3,6 @@ type: library
 metadata:
     sapInternal: true
     name: sap.fe.core
-    copyright: |-
-        SAPUI5
-         * (c) Copyright 2009-${currentYear} SAP SE. All rights reserved.
 framework:
     name: SAPUI5
     libraries: