@sapui5/sap.fe.core 1.100.0 → 1.102.0

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

@@ -1,5 +1,10 @@
-import Context from "sap/ui/model/odata/v4/Context";
+import { NavigationProperty, Property } from "@sap-ux/annotation-converter";
+import { DataFieldAbstractTypes } from "@sap-ux/vocabularies-types";
+import { PathAnnotationExpression } from "@sap-ux/vocabularies-types/types/Edm";
+import { UIAnnotationTypes } from "@sap-ux/vocabularies-types/types/generated/UI";
+import { singletonPathVisitor, UI } from "sap/fe/core/converters/helpers/BindingHelper";
 import { convertMetaModelContext, getInvolvedDataModelObjects } from "sap/fe/core/converters/MetaModelConverter";
+import valueFormatters from "sap/fe/core/formatters/ValueFormatter";
 import {
 	addTypeInformation,
 	and,
@@ -19,10 +24,22 @@ import {
 	not,
 	or
 } from "sap/fe/core/helpers/BindingExpression";
-import { singletonPathVisitor, UI } from "sap/fe/core/converters/helpers/BindingHelper";
 import {
-	getAssociatedUnitProperty,
+	DataModelObjectPath,
+	getPathRelativeLocation,
+	getTargetObjectPath,
+	isPathUpdatable
+} from "sap/fe/core/templating/DataModelPathHelper";
+import * as DisplayModeFormatter from "sap/fe/core/templating/DisplayModeFormatter";
+import {
+	isDisabledExpression,
+	isNonEditableExpression,
+	isReadOnlyExpression,
+	isRequiredExpression
+} from "sap/fe/core/templating/FieldControlHelper";
+import {
 	getAssociatedCurrencyProperty,
+	getAssociatedUnitProperty,
 	hasValueHelp,
 	isComputed,
 	isImmutable,
@@ -30,27 +47,11 @@ import {
 	isPathExpression,
 	isProperty
 } from "sap/fe/core/templating/PropertyHelper";
-import { NavigationProperty, Property } from "@sap-ux/annotation-converter";
-import { PathAnnotationExpression } from "@sap-ux/vocabularies-types/types/Edm";
-import {
-	DataModelObjectPath,
-	isPathUpdatable,
-	getPathRelativeLocation,
-	getTargetObjectPath
-} from "sap/fe/core/templating/DataModelPathHelper";
-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 Context from "sap/ui/model/odata/v4/Context";
 
 // 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>;
@@ -59,8 +60,8 @@ export type MetaModelContext = {
 };
 export type ComputedAnnotationInterface = {
 	context: Context;
-	arguments: any[];
-	$$valueAsPromise: boolean;
+	arguments?: any[];
+	$$valueAsPromise?: boolean;
 };
 
 export type configTypeConstraints = {
@@ -71,6 +72,7 @@ export type configTypeConstraints = {
 	minimum?: string;
 	maximum?: string;
 	isDigitSequence?: boolean;
+	V4?: boolean;
 };
 
 export type configTypeformatOptions = {
@@ -85,6 +87,10 @@ export type configType = {
 	formatOptions: configTypeformatOptions;
 };
 
+export const getDisplayMode = function (oDataModelObjectPath: DataModelObjectPath): DisplayMode {
+	return DisplayModeFormatter.getDisplayMode(oDataModelObjectPath.targetObject, oDataModelObjectPath);
+};
+
 /**
  * Create the expression to generate an "editable" boolean value.
  *
@@ -92,20 +98,22 @@ export type configType = {
  * @param {object} oDataFieldConverted The DataFieldConverted object to read the fieldControl annotation
  * @param {DataModelObjectPath} oDataModelObjectPath The path to this property object
  * @param {boolean} bAsObject Whether or not this should be returned as an object or a binding string
+ * @param {boolean} isEditable Whether or not UI.IsEditable be considered.
  * @returns {string} The binding expression used to determine if a property is editable or not
  */
-export const getEditableExpression = function(
+export const getEditableExpression = function (
 	oPropertyPath: PropertyOrPath<Property>,
 	oDataFieldConverted: any = null,
 	oDataModelObjectPath: DataModelObjectPath,
-	bAsObject: boolean = false
+	bAsObject: boolean = false,
+	isEditable: ExpressionOrPrimitive<boolean> = UI.IsEditable
 ): BindingExpression<boolean> | ExpressionOrPrimitive<boolean> {
 	if (!oPropertyPath || typeof oPropertyPath === "string") {
 		return compileBinding(false);
 	}
 	let dataFieldEditableExpression: BindingExpression<boolean> | ExpressionOrPrimitive<boolean> = true;
 	if (oDataFieldConverted !== null) {
-		dataFieldEditableExpression = ifElse(isNonEditableExpression(oDataFieldConverted), false, UI.IsEditable);
+		dataFieldEditableExpression = ifElse(isNonEditableExpression(oDataFieldConverted), false, isEditable);
 	}
 
 	const oProperty: Property = (isPathExpression(oPropertyPath) && oPropertyPath.$target) || (oPropertyPath as Property);
@@ -133,7 +141,7 @@ export const getEditableExpression = function(
 			isNonEditableExpression(oProperty)
 		),
 		ifElse(or(isComputed(oProperty), isNonEditableExpression(oProperty)), false, UI.IsTransientBinding),
-		UI.IsEditable
+		isEditable
 	);
 	if (bAsObject) {
 		return and(editableExpression, dataFieldEditableExpression);
@@ -141,12 +149,12 @@ export const getEditableExpression = function(
 	return compileBinding(and(editableExpression, dataFieldEditableExpression));
 };
 
-export const getCollaborationExpression = function(dataModelObjectPath: DataModelObjectPath, formatter: any): BindingExpression<any> {
+export const getCollaborationExpression = function (dataModelObjectPath: DataModelObjectPath, formatter: any): BindingExpression<any> {
 	const objectPath = getTargetObjectPath(dataModelObjectPath);
 	const activityExpression = bindingExpression("/collaboration/activities" + objectPath, "internal");
 	const keys = dataModelObjectPath?.targetEntityType?.keys;
 	const keysExpressions: BindingExpressionExpression<any>[] = [];
-	keys?.forEach(function(key) {
+	keys?.forEach(function (key) {
 		const keyExpression = bindingExpression(key.name) as BindingExpressionExpression<any>;
 		keysExpressions.push(keyExpression);
 	});
@@ -161,7 +169,7 @@ export const getCollaborationExpression = function(dataModelObjectPath: DataMode
  * @param {boolean} bAsObject Whether or not this should be returned as an object or a binding string
  * @returns {string} The binding expression to determine if a property is enabled or not
  */
-export const getEnabledExpression = function(
+export const getEnabledExpression = function (
 	oPropertyPath: PropertyOrPath<Property>,
 	oDataFieldConverted?: any,
 	bAsObject: boolean = false
@@ -192,14 +200,16 @@ export const getEnabledExpression = function(
  * @param {boolean} bMeasureReadOnly Whether we should set UoM / currency field mode to read only
  * @param {boolean} bAsObject Whether we should return this as an expression or as a string
  * @param {object} oDataFieldConverted The dataField object
+ * @param {boolean} isEditable Whether or not UI.IsEditable be considered.
  * @returns {BindingExpression<string> | ExpressionOrPrimitive<string>} The binding expression representing the current property edit mode, compliant with the MDC Field definition of editMode.
  */
-export const getEditMode = function(
+export const getEditMode = function (
 	oPropertyPath: PropertyOrPath<Property>,
 	oDataModelObjectPath: DataModelObjectPath,
 	bMeasureReadOnly: boolean = false,
 	bAsObject: boolean = false,
-	oDataFieldConverted: any = null
+	oDataFieldConverted: any = null,
+	isEditable: ExpressionOrPrimitive<boolean> = UI.IsEditable
 ): BindingExpression<string> | ExpressionOrPrimitive<string> {
 	if (!oPropertyPath || typeof oPropertyPath === "string") {
 		return "Display";
@@ -215,7 +225,8 @@ export const getEditMode = function(
 		oPropertyPath,
 		oDataFieldConverted,
 		oDataModelObjectPath,
-		true
+		true,
+		isEditable
 	) as ExpressionOrPrimitive<boolean>;
 
 	const enabledExpression = getEnabledExpression(oPropertyPath, oDataFieldConverted, true) as ExpressionOrPrimitive<boolean>;
@@ -238,9 +249,9 @@ export const getEditMode = function(
 		ifElse(
 			editableExpression,
 			resultExpression,
-			ifElse(and(!isConstant(readOnlyExpression) && readOnlyExpression, UI.IsEditable), "ReadOnly", "Display")
+			ifElse(and(!isConstant(readOnlyExpression) && readOnlyExpression, isEditable), "ReadOnly", "Display")
 		),
-		ifElse(UI.IsEditable, "Disabled", "Display")
+		ifElse(isEditable, "Disabled", "Display")
 	);
 	if (bAsObject) {
 		return editModeExpression;
@@ -248,7 +259,7 @@ export const getEditMode = function(
 	return compileBinding(editModeExpression);
 };
 
-export const hasValidAnalyticalCurrencyOrUnit = function(oPropertyDataModelObjectPath: DataModelObjectPath): BindingExpression<string> {
+export const hasValidAnalyticalCurrencyOrUnit = function (oPropertyDataModelObjectPath: DataModelObjectPath): BindingExpression<string> {
 	const oPropertyDefinition = oPropertyDataModelObjectPath.targetObject as Property;
 	const currency = oPropertyDefinition.annotations?.Measures?.ISOCurrency;
 	const measure = currency ? currency : oPropertyDefinition.annotations?.Measures?.Unit;
@@ -259,7 +270,7 @@ export const hasValidAnalyticalCurrencyOrUnit = function(oPropertyDataModelObjec
 	}
 };
 
-export const ifUnitEditable = function(
+export const ifUnitEditable = function (
 	oPropertyPath: PropertyOrPath<Property>,
 	sEditableValue: ExpressionOrPrimitive<string>,
 	sNonEditableValue: ExpressionOrPrimitive<string>
@@ -273,7 +284,7 @@ export const ifUnitEditable = function(
 	return compileBinding(ifElse(editableExpression, sEditableValue, sNonEditableValue));
 };
 
-export const getFieldDisplay = function(
+export const getFieldDisplay = function (
 	oPropertyPath: PropertyOrPath<Property>,
 	sTargetDisplayMode: string,
 	oComputedEditMode: ExpressionOrPrimitive<string>
@@ -285,7 +296,7 @@ export const getFieldDisplay = function(
 		: compileBinding(ifElse(equal(oComputedEditMode, "Editable"), "Value", sTargetDisplayMode));
 };
 
-export const formatWithTypeInformation = function(
+export const formatWithTypeInformation = function (
 	oProperty: Property,
 	propertyBindingExpression: Expression<string>,
 	ignoreConstraints?: boolean
@@ -306,7 +317,7 @@ export const formatWithTypeInformation = function(
 				if (oTargetMapping.constraints.$MaxLength && oProperty.maxLength !== undefined) {
 					outExpression.constraints.maxLength = oProperty.maxLength;
 				}
-				if (oTargetMapping.constraints.$Nullable && oProperty.nullable === false) {
+				if (oProperty.nullable === false) {
 					outExpression.constraints.nullable = oProperty.nullable;
 				}
 				if (
@@ -323,6 +334,9 @@ export const formatWithTypeInformation = function(
 				) {
 					outExpression.constraints.maximum = `${oProperty.annotations.Validation.Maximum}`;
 				}
+			} else if (oProperty.nullable === false) {
+				outExpression.constraints = {};
+				outExpression.constraints.nullable = oProperty.nullable;
 			}
 			if (outExpression?.type?.indexOf("sap.ui.model.odata.type.Int") === 0) {
 				if (!outExpression.formatOptions) {
@@ -355,12 +369,15 @@ export const formatWithTypeInformation = function(
 					emptyString: ""
 				});
 			}
+			if (outExpression?.type?.indexOf("sap.ui.model.odata.type.DateTimeOffset") === 0) {
+				outExpression.constraints.V4 = true;
+			}
 		}
 	}
 	return outExpression;
 };
 
-export const getTypeConfig = function(oProperty: Property | DataFieldAbstractTypes, dataType: string | undefined): any {
+export const getTypeConfig = function (oProperty: Property | DataFieldAbstractTypes, dataType: string | undefined): any {
 	const oTargetMapping = EDM_TYPE_MAPPING[(oProperty as Property)?.type] || (dataType ? EDM_TYPE_MAPPING[dataType] : undefined);
 	const propertyTypeConfig: configType = {
 		type: oTargetMapping.type,
@@ -388,7 +405,8 @@ export const getTypeConfig = function(oProperty: Property | DataFieldAbstractTyp
 				oTargetMapping.constraints?.["@com.sap.vocabularies.Common.v1.IsDigitSequence"] &&
 				(oProperty as Property).annotations?.Common?.IsDigitSequence
 					? true
-					: undefined
+					: undefined,
+			V4: oTargetMapping.constraints?.$V4 ? true : undefined
 		};
 	}
 	propertyTypeConfig.formatOptions = {
@@ -407,7 +425,7 @@ export const getTypeConfig = function(oProperty: Property | DataFieldAbstractTyp
 	return propertyTypeConfig;
 };
 
-export const getBindingWithUnitOrCurrency = function(
+export const getBindingWithUnitOrCurrency = function (
 	oPropertyDataModelPath: DataModelObjectPath,
 	propertyBindingExpression: Expression<string>,
 	ignoreUnitConstraint?: boolean
@@ -417,7 +435,7 @@ export const getBindingWithUnitOrCurrency = function(
 	const relativeLocation = getPathRelativeLocation(
 		oPropertyDataModelPath.contextLocation,
 		oPropertyDataModelPath.navigationProperties
-	).map(np => np.name);
+	).map((np) => np.name);
 	propertyBindingExpression = formatWithTypeInformation(oPropertyDefinition, propertyBindingExpression);
 	if (unit?.toString() === "%") {
 		return formatResult([propertyBindingExpression], valueFormatters.formatWithPercentage);
@@ -435,7 +453,38 @@ export const getBindingWithUnitOrCurrency = function(
 	return addTypeInformation([propertyBindingExpression, unitBindingExpression], complexType);
 };
 
-export const getAlignmentExpression = function(
+export const getBindingWithTimezone = function (
+	oPropertyDataModelPath: DataModelObjectPath,
+	propertyBindingExpression: Expression<string>,
+	ignoreUnitConstraint?: boolean,
+	hideTimezoneForEmptyValues?: boolean
+): Expression<string> {
+	const oPropertyDefinition = oPropertyDataModelPath.targetObject as Property;
+	const timezone = oPropertyDefinition.annotations?.Common?.Timezone;
+	const relativeLocation = getPathRelativeLocation(
+		oPropertyDataModelPath.contextLocation,
+		oPropertyDataModelPath.navigationProperties
+	).map((np) => np.name);
+	propertyBindingExpression = formatWithTypeInformation(oPropertyDefinition, propertyBindingExpression);
+
+	const complexType = "sap.fe.core.type.DateTimeWithTimezone";
+	const unitBindingExpression = (timezone as any).$target
+		? formatWithTypeInformation(
+				(timezone as any).$target,
+				annotationExpression(timezone, relativeLocation) as Expression<string>,
+				ignoreUnitConstraint
+		  )
+		: (annotationExpression(timezone, relativeLocation) as Expression<string>);
+	let formatOptions;
+	if (hideTimezoneForEmptyValues) {
+		formatOptions = {
+			showTimezoneForEmptyValues: false
+		};
+	}
+	return addTypeInformation([propertyBindingExpression, unitBindingExpression], complexType, undefined, formatOptions);
+};
+
+export const getAlignmentExpression = function (
 	oComputedEditMode: Expression<string>,
 	sAlignDisplay: string = "Begin",
 	sAlignEdit: string = "Begin"
@@ -450,7 +499,7 @@ export const getAlignmentExpression = function(
  * @param {ComputedAnnotationInterface} oInterface The current templating context
  * @returns {object} The ConverterContext representing that object
  */
-export const getConverterContext = function(oContext: MetaModelContext, oInterface: ComputedAnnotationInterface): object | null {
+export const getConverterContext = function (oContext: MetaModelContext, oInterface: ComputedAnnotationInterface): object | null {
 	if (oInterface && oInterface.context) {
 		return convertMetaModelContext(oInterface.context);
 	}
@@ -465,7 +514,7 @@ getConverterContext.requiresIContext = true;
  * @param {ComputedAnnotationInterface} oInterface The current templating context
  * @returns {object[]} An array of entitysets and navproperties that are involved to get to a specific object in the metamodel
  */
-export const getDataModelObjectPath = function(
+export const getDataModelObjectPath = function (
 	oContext: MetaModelContext,
 	oInterface: ComputedAnnotationInterface
 ): DataModelObjectPath | null {
@@ -482,11 +531,11 @@ getDataModelObjectPath.requiresIContext = true;
  * @param {Expression<any>} expression The expression which needs to be compiled
  * @returns {BindingExpression<string>} The expression-binding string
  */
-export const getExpressionBinding = function(expression: Expression<any>): BindingExpression<string> {
+export const getExpressionBinding = function (expression: Expression<any>): BindingExpression<string> {
 	return compileBinding(expression);
 };
 
-export const isCollectionField = function(oDataModelPath: DataModelObjectPath): boolean {
+export const isCollectionField = function (oDataModelPath: DataModelObjectPath): boolean {
 	if (oDataModelPath.navigationProperties?.length) {
 		const hasOneToManyNavigation =
 			oDataModelPath?.navigationProperties.findIndex((oNav: NavigationProperty) => {
@@ -510,7 +559,7 @@ export const isCollectionField = function(oDataModelPath: DataModelObjectPath):
 	return false;
 };
 
-export const getRequiredExpression = function(
+export const getRequiredExpression = function (
 	oPropertyPath: PropertyOrPath<Property>,
 	oDataFieldConverted?: any,
 	forceEditMode: boolean = false,
@@ -535,3 +584,48 @@ export const getRequiredExpression = function(
 	}
 	return compileBinding(and(or(requiredExpression, dataFieldRequiredExpression), editMode));
 };
+
+export const getRequiredExpressionForConnectedDataField = function (dataFieldObjectPath: DataModelObjectPath): BindingExpression<string> {
+	const data = dataFieldObjectPath?.targetObject?.$target?.Data;
+	const keys: Array<string> = Object.keys(data);
+	const dataFields = [];
+	let propertyPath;
+	const isRequiredExpressions: (BindingExpression<boolean> | ExpressionOrPrimitive<boolean>)[] | undefined = [];
+	for (const key of keys) {
+		if (data[key]["$Type"] && data[key]["$Type"].indexOf("DataField") > -1) {
+			dataFields.push(data[key]);
+		}
+	}
+	for (const dataField of dataFields) {
+		switch (dataField.$Type) {
+			case UIAnnotationTypes.DataField:
+			case UIAnnotationTypes.DataFieldWithNavigationPath:
+			case UIAnnotationTypes.DataFieldWithUrl:
+			case UIAnnotationTypes.DataFieldWithIntentBasedNavigation:
+			case UIAnnotationTypes.DataFieldWithAction:
+				if (typeof dataField.Value === "object") {
+					propertyPath = dataField.Value.$target;
+				}
+				break;
+			case UIAnnotationTypes.DataFieldForAnnotation:
+				if (dataField.Target.$target) {
+					if (
+						dataField.Target.$target.$Type === UIAnnotationTypes.DataField ||
+						dataField.Target.$target.$Type === UIAnnotationTypes.DataPointType
+					) {
+						if (typeof dataField.Target.$target.Value === "object") {
+							propertyPath = dataField.Target.$target.Value.$target;
+						}
+					} else {
+						if (typeof dataField.Target === "object") {
+							propertyPath = dataField.Target.$target;
+						}
+						break;
+					}
+				}
+				break;
+		}
+		isRequiredExpressions.push(getRequiredExpression(propertyPath, dataField, false, true));
+	}
+	return compileBinding(or(...(isRequiredExpressions as ExpressionOrPrimitive<boolean>[])));
+};

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

@@ -0,0 +1,47 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+ *      (c) Copyright 2009-2021 SAP SE. All rights reserved
+ */
+sap.ui.define(["sap/fe/core/helpers/ClassSupport", "sap/ui/model/odata/type/DateTimeWithTimezone"], function (ClassSupport, _DateTimeWithTimezone) {
+  "use strict";
+
+  var _dec, _class;
+
+  var defineUI5Class = ClassSupport.defineUI5Class;
+
+  function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
+
+  function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+  var DateTimeWithTimezone = (_dec = defineUI5Class("sap.fe.core.type.DateTimeWithTimezone"), _dec(_class = /*#__PURE__*/function (_DateTimeWithTimezone2) {
+    _inheritsLoose(DateTimeWithTimezone, _DateTimeWithTimezone2);
+
+    function DateTimeWithTimezone(oFormatOptions, oConstraints) {
+      var _oFormatOptions$showT;
+
+      var _this;
+
+      _this = _DateTimeWithTimezone2.call(this, oFormatOptions, oConstraints) || this;
+      _this.bShowTimezoneForEmptyValues = (_oFormatOptions$showT = oFormatOptions === null || oFormatOptions === void 0 ? void 0 : oFormatOptions.showTimezoneForEmptyValues) !== null && _oFormatOptions$showT !== void 0 ? _oFormatOptions$showT : true;
+      return _this;
+    }
+
+    var _proto = DateTimeWithTimezone.prototype;
+
+    _proto.formatValue = function formatValue(aValues, sTargetType) {
+      var oTimestamp = aValues && aValues[0];
+
+      if (oTimestamp === undefined || // data is not yet available
+      // if time zone is not shown falsy timestamps cannot be formatted -> return null
+      !oTimestamp && !this.bShowTimezoneForEmptyValues) {
+        return null;
+      }
+
+      return _DateTimeWithTimezone2.prototype.formatValue.call(this, aValues, sTargetType);
+    };
+
+    return DateTimeWithTimezone;
+  }(_DateTimeWithTimezone)) || _class);
+  return DateTimeWithTimezone;
+}, false);
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkRhdGVUaW1lV2l0aFRpbWV6b25lLnRzIl0sIm5hbWVzIjpbIkRhdGVUaW1lV2l0aFRpbWV6b25lIiwiZGVmaW5lVUk1Q2xhc3MiLCJvRm9ybWF0T3B0aW9ucyIsIm9Db25zdHJhaW50cyIsImJTaG93VGltZXpvbmVGb3JFbXB0eVZhbHVlcyIsInNob3dUaW1lem9uZUZvckVtcHR5VmFsdWVzIiwiZm9ybWF0VmFsdWUiLCJhVmFsdWVzIiwic1RhcmdldFR5cGUiLCJvVGltZXN0YW1wIiwidW5kZWZpbmVkIiwiX0RhdGVUaW1lV2l0aFRpbWV6b25lIl0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7Ozs7Ozs7Ozs7TUFFTUEsb0IsV0FETEMsY0FBYyxDQUFDLHVDQUFELEM7OztBQUdkLGtDQUFZQyxjQUFaLEVBQWtDQyxZQUFsQyxFQUFzRDtBQUFBOztBQUFBOztBQUNyRCxnREFBTUQsY0FBTixFQUFzQkMsWUFBdEI7QUFDQSxZQUFLQywyQkFBTCw0QkFBbUNGLGNBQW5DLGFBQW1DQSxjQUFuQyx1QkFBbUNBLGNBQWMsQ0FBRUcsMEJBQW5ELHlFQUFpRixJQUFqRjtBQUZxRDtBQUdyRDs7OztXQUNEQyxXLEdBQUEscUJBQVlDLE9BQVosRUFBNEJDLFdBQTVCLEVBQWlEO0FBQ2hELFVBQU1DLFVBQVUsR0FBR0YsT0FBTyxJQUFJQSxPQUFPLENBQUMsQ0FBRCxDQUFyQzs7QUFDQSxVQUNDRSxVQUFVLEtBQUtDLFNBQWYsSUFBNEI7QUFDNUI7QUFDQyxPQUFDRCxVQUFELElBQWUsQ0FBQyxLQUFLTCwyQkFIdkIsRUFJRTtBQUNELGVBQU8sSUFBUDtBQUNBOztBQUNELDhDQUFhRSxXQUFiLFlBQXlCQyxPQUF6QixFQUFrQ0MsV0FBbEM7QUFDQSxLOzs7SUFoQmlDRyxxQjtTQWtCcEJYLG9CIiwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBkZWZpbmVVSTVDbGFzcyB9IGZyb20gXCJzYXAvZmUvY29yZS9oZWxwZXJzL0NsYXNzU3VwcG9ydFwiO1xuaW1wb3J0IF9EYXRlVGltZVdpdGhUaW1lem9uZSBmcm9tIFwic2FwL3VpL21vZGVsL29kYXRhL3R5cGUvRGF0ZVRpbWVXaXRoVGltZXpvbmVcIjtcblxuQGRlZmluZVVJNUNsYXNzKFwic2FwLmZlLmNvcmUudHlwZS5EYXRlVGltZVdpdGhUaW1lem9uZVwiKVxuY2xhc3MgRGF0ZVRpbWVXaXRoVGltZXpvbmUgZXh0ZW5kcyBfRGF0ZVRpbWVXaXRoVGltZXpvbmUge1xuXHRwcml2YXRlIGJTaG93VGltZXpvbmVGb3JFbXB0eVZhbHVlczogYm9vbGVhbjtcblx0Y29uc3RydWN0b3Iob0Zvcm1hdE9wdGlvbnM/OiBhbnksIG9Db25zdHJhaW50cz86IGFueSkge1xuXHRcdHN1cGVyKG9Gb3JtYXRPcHRpb25zLCBvQ29uc3RyYWludHMpO1xuXHRcdHRoaXMuYlNob3dUaW1lem9uZUZvckVtcHR5VmFsdWVzID0gb0Zvcm1hdE9wdGlvbnM/LnNob3dUaW1lem9uZUZvckVtcHR5VmFsdWVzID8/IHRydWU7XG5cdH1cblx0Zm9ybWF0VmFsdWUoYVZhbHVlczogYW55W10sIHNUYXJnZXRUeXBlOiBzdHJpbmcpIHtcblx0XHRjb25zdCBvVGltZXN0YW1wID0gYVZhbHVlcyAmJiBhVmFsdWVzWzBdO1xuXHRcdGlmIChcblx0XHRcdG9UaW1lc3RhbXAgPT09IHVuZGVmaW5lZCB8fCAvLyBkYXRhIGlzIG5vdCB5ZXQgYXZhaWxhYmxlXG5cdFx0XHQvLyBpZiB0aW1lIHpvbmUgaXMgbm90IHNob3duIGZhbHN5IHRpbWVzdGFtcHMgY2Fubm90IGJlIGZvcm1hdHRlZCAtPiByZXR1cm4gbnVsbFxuXHRcdFx0KCFvVGltZXN0YW1wICYmICF0aGlzLmJTaG93VGltZXpvbmVGb3JFbXB0eVZhbHVlcylcblx0XHQpIHtcblx0XHRcdHJldHVybiBudWxsO1xuXHRcdH1cblx0XHRyZXR1cm4gc3VwZXIuZm9ybWF0VmFsdWUoYVZhbHVlcywgc1RhcmdldFR5cGUpO1xuXHR9XG59XG5leHBvcnQgZGVmYXVsdCBEYXRlVGltZVdpdGhUaW1lem9uZTtcbiJdfQ==

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

@@ -0,0 +1,23 @@
+import { defineUI5Class } from "sap/fe/core/helpers/ClassSupport";
+import _DateTimeWithTimezone from "sap/ui/model/odata/type/DateTimeWithTimezone";
+
+@defineUI5Class("sap.fe.core.type.DateTimeWithTimezone")
+class DateTimeWithTimezone extends _DateTimeWithTimezone {
+	private bShowTimezoneForEmptyValues: boolean;
+	constructor(oFormatOptions?: any, oConstraints?: any) {
+		super(oFormatOptions, oConstraints);
+		this.bShowTimezoneForEmptyValues = oFormatOptions?.showTimezoneForEmptyValues ?? true;
+	}
+	formatValue(aValues: any[], sTargetType: string) {
+		const oTimestamp = aValues && aValues[0];
+		if (
+			oTimestamp === undefined || // data is not yet available
+			// if time zone is not shown falsy timestamps cannot be formatted -> return null
+			(!oTimestamp && !this.bShowTimezoneForEmptyValues)
+		) {
+			return null;
+		}
+		return super.formatValue(aValues, sTargetType);
+	}
+}
+export default DateTimeWithTimezone;

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

@@ -2,19 +2,37 @@
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/ui/model/odata/type/String", "sap/ui/model/ValidateException"], function (ODataStringType, ValidateException) {
+sap.ui.define(["sap/ui/core/Core", "sap/ui/model/odata/type/String", "sap/ui/model/ValidateException", "sap/fe/core/helpers/ClassSupport"], function (Core, ODataStringType, ValidateException, ClassSupport) {
   "use strict";
 
+  var _dec, _class;
+
+  var defineUI5Class = ClassSupport.defineUI5Class;
+
+  function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
+
+  function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
   var emailW3CRegexp = /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:.[a-zA-Z0-9-]+)*$/;
-  var EmailType = ODataStringType.extend("sap.fe.core.type.Email", {
-    validateValue: function (sValue) {
+  var EmailType = (_dec = defineUI5Class("sap.fe.core.type.Email"), _dec(_class = /*#__PURE__*/function (_ODataStringType) {
+    _inheritsLoose(EmailType, _ODataStringType);
+
+    function EmailType() {
+      return _ODataStringType.apply(this, arguments) || this;
+    }
+
+    var _proto = EmailType.prototype;
+
+    _proto.validateValue = function validateValue(sValue) {
       if (!emailW3CRegexp.test(sValue)) {
-        throw new ValidateException(sap.ui.getCore().getLibraryResourceBundle("sap.fe.core").getText("T_EMAILTYPE_INVALID_VALUE"));
+        throw new ValidateException(Core.getLibraryResourceBundle("sap.fe.core").getText("T_EMAILTYPE_INVALID_VALUE"));
       }
 
-      ODataStringType.prototype.validateValue.apply(this, [sValue]);
-    }
-  });
+      _ODataStringType.prototype.validateValue.call(this, sValue);
+    };
+
+    return EmailType;
+  }(ODataStringType)) || _class);
   return EmailType;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkVtYWlsLnRzIl0sIm5hbWVzIjpbImVtYWlsVzNDUmVnZXhwIiwiRW1haWxUeXBlIiwiT0RhdGFTdHJpbmdUeXBlIiwiZXh0ZW5kIiwidmFsaWRhdGVWYWx1ZSIsInNWYWx1ZSIsInRlc3QiLCJWYWxpZGF0ZUV4Y2VwdGlvbiIsInNhcCIsInVpIiwiZ2V0Q29yZSIsImdldExpYnJhcnlSZXNvdXJjZUJ1bmRsZSIsImdldFRleHQiLCJwcm90b3R5cGUiLCJhcHBseSJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7OztBQUVBLE1BQU1BLGNBQWMsR0FBRyxxRUFBdkI7QUFDQSxNQUFNQyxTQUFTLEdBQUdDLGVBQWUsQ0FBQ0MsTUFBaEIsQ0FBdUIsd0JBQXZCLEVBQWlEO0FBQ2xFQyxJQUFBQSxhQURrRSxZQUNwREMsTUFEb0QsRUFDcEM7QUFDN0IsVUFBSSxDQUFDTCxjQUFjLENBQUNNLElBQWYsQ0FBb0JELE1BQXBCLENBQUwsRUFBa0M7QUFDakMsY0FBTSxJQUFJRSxpQkFBSixDQUNKQyxHQUFHLENBQUNDLEVBQUosQ0FBT0MsT0FBUCxHQUFpQkMsd0JBQWpCLENBQTBDLGFBQTFDLENBQUQsQ0FBNkVDLE9BQTdFLENBQXFGLDJCQUFyRixDQURLLENBQU47QUFHQTs7QUFDRFYsTUFBQUEsZUFBZSxDQUFDVyxTQUFoQixDQUEwQlQsYUFBMUIsQ0FBd0NVLEtBQXhDLENBQThDLElBQTlDLEVBQW9ELENBQUNULE1BQUQsQ0FBcEQ7QUFDQTtBQVJpRSxHQUFqRCxDQUFsQjtTQVVlSixTIiwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgUmVzb3VyY2VCdW5kbGUgZnJvbSBcInNhcC9iYXNlL2kxOG4vUmVzb3VyY2VCdW5kbGVcIjtcbmltcG9ydCBPRGF0YVN0cmluZ1R5cGUgZnJvbSBcInNhcC91aS9tb2RlbC9vZGF0YS90eXBlL1N0cmluZ1wiO1xuaW1wb3J0IFZhbGlkYXRlRXhjZXB0aW9uIGZyb20gXCJzYXAvdWkvbW9kZWwvVmFsaWRhdGVFeGNlcHRpb25cIjtcblxuY29uc3QgZW1haWxXM0NSZWdleHAgPSAvXlthLXpBLVowLTkuISMkJSbigJkqKy89P15fYHt8fX4tXStAW2EtekEtWjAtOS1dKyg/Oi5bYS16QS1aMC05LV0rKSokLztcbmNvbnN0IEVtYWlsVHlwZSA9IE9EYXRhU3RyaW5nVHlwZS5leHRlbmQoXCJzYXAuZmUuY29yZS50eXBlLkVtYWlsXCIsIHtcblx0dmFsaWRhdGVWYWx1ZShzVmFsdWU6IHN0cmluZykge1xuXHRcdGlmICghZW1haWxXM0NSZWdleHAudGVzdChzVmFsdWUpKSB7XG5cdFx0XHR0aHJvdyBuZXcgVmFsaWRhdGVFeGNlcHRpb24oXG5cdFx0XHRcdChzYXAudWkuZ2V0Q29yZSgpLmdldExpYnJhcnlSZXNvdXJjZUJ1bmRsZShcInNhcC5mZS5jb3JlXCIpIGFzIFJlc291cmNlQnVuZGxlKS5nZXRUZXh0KFwiVF9FTUFJTFRZUEVfSU5WQUxJRF9WQUxVRVwiKVxuXHRcdFx0KTtcblx0XHR9XG5cdFx0T0RhdGFTdHJpbmdUeXBlLnByb3RvdHlwZS52YWxpZGF0ZVZhbHVlLmFwcGx5KHRoaXMsIFtzVmFsdWVdKTtcblx0fVxufSk7XG5leHBvcnQgZGVmYXVsdCBFbWFpbFR5cGU7XG4iXX0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkVtYWlsLnRzIl0sIm5hbWVzIjpbImVtYWlsVzNDUmVnZXhwIiwiRW1haWxUeXBlIiwiZGVmaW5lVUk1Q2xhc3MiLCJ2YWxpZGF0ZVZhbHVlIiwic1ZhbHVlIiwidGVzdCIsIlZhbGlkYXRlRXhjZXB0aW9uIiwiQ29yZSIsImdldExpYnJhcnlSZXNvdXJjZUJ1bmRsZSIsImdldFRleHQiLCJPRGF0YVN0cmluZ1R5cGUiXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7Ozs7Ozs7Ozs7OztBQUlBLE1BQU1BLGNBQWMsR0FBRyxxRUFBdkI7TUFFTUMsUyxXQURMQyxjQUFjLENBQUMsd0JBQUQsQzs7Ozs7Ozs7O1dBRWRDLGEsR0FBQSx1QkFBY0MsTUFBZCxFQUE4QjtBQUM3QixVQUFJLENBQUNKLGNBQWMsQ0FBQ0ssSUFBZixDQUFvQkQsTUFBcEIsQ0FBTCxFQUFrQztBQUNqQyxjQUFNLElBQUlFLGlCQUFKLENBQXVCQyxJQUFELENBQWlCQyx3QkFBakIsQ0FBMEMsYUFBMUMsRUFBeURDLE9BQXpELENBQWlFLDJCQUFqRSxDQUF0QixDQUFOO0FBQ0E7O0FBQ0QsaUNBQU1OLGFBQU4sWUFBb0JDLE1BQXBCO0FBQ0EsSzs7O0lBTnNCTSxlO1NBUVRULFMiLCJzb3VyY2VSb290IjoiLiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBDb3JlIGZyb20gXCJzYXAvdWkvY29yZS9Db3JlXCI7XG5pbXBvcnQgT0RhdGFTdHJpbmdUeXBlIGZyb20gXCJzYXAvdWkvbW9kZWwvb2RhdGEvdHlwZS9TdHJpbmdcIjtcbmltcG9ydCB7IENvcmVFeCB9IGZyb20gXCJ0eXBlcy9leHRlbnNpb25fdHlwZXNcIjtcbmltcG9ydCBWYWxpZGF0ZUV4Y2VwdGlvbiBmcm9tIFwic2FwL3VpL21vZGVsL1ZhbGlkYXRlRXhjZXB0aW9uXCI7XG5pbXBvcnQgeyBkZWZpbmVVSTVDbGFzcyB9IGZyb20gXCJzYXAvZmUvY29yZS9oZWxwZXJzL0NsYXNzU3VwcG9ydFwiO1xuXG5jb25zdCBlbWFpbFczQ1JlZ2V4cCA9IC9eW2EtekEtWjAtOS4hIyQlJuKAmSorLz0/Xl9ge3x9fi1dK0BbYS16QS1aMC05LV0rKD86LlthLXpBLVowLTktXSspKiQvO1xuQGRlZmluZVVJNUNsYXNzKFwic2FwLmZlLmNvcmUudHlwZS5FbWFpbFwiKVxuY2xhc3MgRW1haWxUeXBlIGV4dGVuZHMgT0RhdGFTdHJpbmdUeXBlIHtcblx0dmFsaWRhdGVWYWx1ZShzVmFsdWU6IHN0cmluZykge1xuXHRcdGlmICghZW1haWxXM0NSZWdleHAudGVzdChzVmFsdWUpKSB7XG5cdFx0XHR0aHJvdyBuZXcgVmFsaWRhdGVFeGNlcHRpb24oKENvcmUgYXMgQ29yZUV4KS5nZXRMaWJyYXJ5UmVzb3VyY2VCdW5kbGUoXCJzYXAuZmUuY29yZVwiKS5nZXRUZXh0KFwiVF9FTUFJTFRZUEVfSU5WQUxJRF9WQUxVRVwiKSk7XG5cdFx0fVxuXHRcdHN1cGVyLnZhbGlkYXRlVmFsdWUoc1ZhbHVlKTtcblx0fVxufVxuZXhwb3J0IGRlZmF1bHQgRW1haWxUeXBlO1xuIl19

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

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