@sapui5/sap.fe.core 1.97.0 → 1.100.0

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

@@ -1,7 +1,7 @@
-import { EntitySet, EntityType, NavigationProperty, Property } from "@sap-ux/annotation-converter";
-import { annotationExpression, constant, equal, Expression } from "sap/fe/core/helpers/BindingExpression";
+import { ConverterOutput, EntitySet, EntityType, NavigationProperty, Property } from "@sap-ux/annotation-converter";
+import { annotationExpression, constant, equal, Expression, unresolveableExpression } from "sap/fe/core/helpers/BindingExpression";
 import { NavigationPropertyRestrictionTypes } from "@sap-ux/vocabularies-types/dist/generated/Capabilities";
-import { PropertyOrPath } from "sap/fe/core/templating/UIFormatters";
+import { PropertyOrPath } from "sap/fe/core/templating/DisplayModeFormatter";
 import { isAnnotationPathExpression, isPathExpression } from "sap/fe/core/templating/PropertyHelper";
 import {
 	FilterExpressionRestrictionTypeTypes,
@@ -20,6 +20,14 @@ export type DataModelObjectPath = {
 	targetEntitySet?: EntitySet;
 	targetEntityType: EntityType;
 	targetObject: any;
+	convertedTypes: ConverterOutput;
+};
+
+type ExtractionParametersOnPath = {
+	propertyPath?: PropertyOrPath<Property>;
+	pathVisitor?: Function;
+	ignoreTargetCollection?: boolean;
+	authorizeUnresolvable?: boolean;
 };
 
 export const getPathRelativeLocation = function(
@@ -28,51 +36,49 @@ export const getPathRelativeLocation = function(
 ): NavigationProperty[] {
 	if (!contextPath) {
 		return visitedNavProps;
+	} else if (visitedNavProps.length >= contextPath.navigationProperties.length) {
+		let remainingNavProps: NavigationProperty[] = [];
+		contextPath.navigationProperties.forEach((navProp, navIndex) => {
+			if (visitedNavProps[navIndex] !== navProp) {
+				remainingNavProps.push(visitedNavProps[navIndex]);
+			}
+		});
+		remainingNavProps = remainingNavProps.concat(visitedNavProps.slice(contextPath.navigationProperties.length));
+		// Clean up NavProp -> Owner
+		let currentIdx = 0;
+		while (remainingNavProps.length > 1 && currentIdx != remainingNavProps.length - 1) {
+			const currentNav = remainingNavProps[currentIdx];
+			const nextNavProp = remainingNavProps[currentIdx + 1];
+			if (currentNav.partner === nextNavProp.name) {
+				remainingNavProps.splice(0, 2);
+			} else {
+				currentIdx++;
+			}
+		}
+		return remainingNavProps;
 	} else {
-		if (visitedNavProps.length >= contextPath.navigationProperties.length) {
-			let remainingNavProps: NavigationProperty[] = [];
-			contextPath.navigationProperties.forEach((navProp, navIndex) => {
-				if (visitedNavProps[navIndex] !== navProp) {
-					remainingNavProps.push(visitedNavProps[navIndex]);
-				}
-			});
-			remainingNavProps = remainingNavProps.concat(visitedNavProps.slice(contextPath.navigationProperties.length));
-			// Clean up NavProp -> Owner
-			let currentIdx = 0;
-			while (remainingNavProps.length > 1 && currentIdx != remainingNavProps.length - 1) {
-				const currentNav = remainingNavProps[currentIdx];
-				const nextNavProp = remainingNavProps[currentIdx + 1];
-				if (currentNav.partner === nextNavProp.name) {
-					remainingNavProps.splice(0, 2);
-				} else {
-					currentIdx++;
-				}
+		let extraNavProp: NavigationProperty[] = [];
+		visitedNavProps.forEach((navProp, navIndex) => {
+			if (contextPath.navigationProperties[navIndex] !== navProp) {
+				extraNavProp.push(visitedNavProps[navIndex]);
 			}
-			return remainingNavProps;
-		} else {
-			let extraNavProp: NavigationProperty[] = [];
-			visitedNavProps.forEach((navProp, navIndex) => {
-				if (contextPath.navigationProperties[navIndex] !== navProp) {
-					extraNavProp.push(visitedNavProps[navIndex]);
-				}
-			});
-			extraNavProp = extraNavProp.concat(contextPath.navigationProperties.slice(visitedNavProps.length));
-			// Clean up NavProp -> Owner
-			let currentIdx = 0;
-			while (extraNavProp.length > 1 && currentIdx != extraNavProp.length - 1) {
-				const currentNav = extraNavProp[currentIdx];
-				const nextNavProp = extraNavProp[currentIdx + 1];
-				if (currentNav.partner === nextNavProp.name) {
-					extraNavProp.splice(0, 2);
-				} else {
-					currentIdx++;
-				}
+		});
+		extraNavProp = extraNavProp.concat(contextPath.navigationProperties.slice(visitedNavProps.length));
+		// Clean up NavProp -> Owner
+		let currentIdx = 0;
+		while (extraNavProp.length > 1 && currentIdx != extraNavProp.length - 1) {
+			const currentNav = extraNavProp[currentIdx];
+			const nextNavProp = extraNavProp[currentIdx + 1];
+			if (currentNav.partner === nextNavProp.name) {
+				extraNavProp.splice(0, 2);
+			} else {
+				currentIdx++;
 			}
-			extraNavProp = extraNavProp.map(navProp => {
-				return navProp.targetType.navigationProperties.find(np => np.name === navProp.partner) as NavigationProperty;
-			});
-			return extraNavProp;
 		}
+		extraNavProp = extraNavProp.map(navProp => {
+			return navProp.targetType.navigationProperties.find(np => np.name === navProp.partner) as NavigationProperty;
+		});
+		return extraNavProp;
 	}
 };
 
@@ -122,57 +128,24 @@ export const enhanceDataModelPath = function(
 		contextLocation: dataModelObjectPath.contextLocation,
 		targetEntitySet: currentEntitySet,
 		targetEntityType: currentEntityType,
-		targetObject: oTarget
+		targetObject: oTarget,
+		convertedTypes: dataModelObjectPath.convertedTypes
 	};
 };
 
-export const getTargetEntitySetPath = function(dataModelObjectPath: DataModelObjectPath, bRelative: boolean = false): string {
-	let targetEntitySetPath: string = "";
-	if (!bRelative) {
-		targetEntitySetPath += `/${dataModelObjectPath.startingEntitySet.name}`;
-	}
-	let currentEntitySet =
-		bRelative && dataModelObjectPath.contextLocation?.targetEntitySet
-			? dataModelObjectPath.contextLocation.targetEntitySet
-			: dataModelObjectPath.startingEntitySet;
-	let navigatedPaths: string[] = [];
-	dataModelObjectPath.navigationProperties.forEach(navProp => {
-		if (
-			!bRelative ||
-			!dataModelObjectPath.contextLocation ||
-				!dataModelObjectPath.contextLocation?.navigationProperties.some(
-					contextNavProp => contextNavProp.fullyQualifiedName === navProp.fullyQualifiedName
-				)
-		) {
-			// in case of relative entitySetPath we don't consider navigationPath that are already in the context
-			navigatedPaths.push(navProp.name);
-		}
-		if (currentEntitySet && currentEntitySet.navigationPropertyBinding.hasOwnProperty(navigatedPaths.join("/"))) {
-			if (bRelative) {
-				targetEntitySetPath += `${navigatedPaths.join("/")}`;
-			} else {
-				targetEntitySetPath += `/$NavigationPropertyBinding/${navigatedPaths.join("/")}/$`;
-			}
-			currentEntitySet = currentEntitySet.navigationPropertyBinding[navigatedPaths.join("/")];
-			navigatedPaths = [];
-		}
-	});
-	return targetEntitySetPath;
-};
-
-export const getTargetEntitySetNavigation = function(dataModelObjectPath: DataModelObjectPath): NavigationProperty[] {
-	const visitedNavigationProperties: NavigationProperty[] = [];
+export const getTargetEntitySetPath = function(dataModelObjectPath: DataModelObjectPath): string {
+	let targetEntitySetPath: string = `/${dataModelObjectPath.startingEntitySet.name}`;
 	let currentEntitySet = dataModelObjectPath.startingEntitySet;
 	let navigatedPaths: string[] = [];
 	dataModelObjectPath.navigationProperties.forEach(navProp => {
 		navigatedPaths.push(navProp.name);
 		if (currentEntitySet && currentEntitySet.navigationPropertyBinding.hasOwnProperty(navigatedPaths.join("/"))) {
-			visitedNavigationProperties.push(navProp);
+			targetEntitySetPath += `/$NavigationPropertyBinding/${navigatedPaths.join("/")}/$`;
 			currentEntitySet = currentEntitySet.navigationPropertyBinding[navigatedPaths.join("/")];
 			navigatedPaths = [];
 		}
 	});
-	return visitedNavigationProperties;
+	return targetEntitySetPath;
 };
 
 export const getTargetObjectPath = function(dataModelObjectPath: DataModelObjectPath, bRelative: boolean = false): string {
@@ -251,59 +224,53 @@ export const getContextRelativeTargetObjectPath = function(
 
 export const isPathUpdatable = function(
 	dataModelObjectPath: DataModelObjectPath | undefined,
-	propertyPath?: PropertyOrPath<Property>,
-	bTableCase?: boolean
+	extractionParametersOnPath?: ExtractionParametersOnPath
 ): Expression<boolean> {
 	return checkOnPath(
 		dataModelObjectPath,
-		(annotationObject: NavigationPropertyRestriction | EntitySetAnnotations_Capabilities | EntityTypeAnnotations_Capabilities) => {
+		(annotationObject: NavigationPropertyRestriction | EntitySetAnnotations_Capabilities) => {
 			return annotationObject?.UpdateRestrictions?.Updatable;
 		},
-		propertyPath,
-		bTableCase
+		extractionParametersOnPath
 	);
 };
 
 export const isPathSearchable = function(
 	dataModelObjectPath: DataModelObjectPath | undefined,
-	propertyPath?: PropertyOrPath<Property>,
-	bTableCase?: boolean
+	extractionParametersOnPath?: ExtractionParametersOnPath
 ): Expression<boolean> {
 	return checkOnPath(
 		dataModelObjectPath,
 		(annotationObject: NavigationPropertyRestriction | EntitySetAnnotations_Capabilities) => {
 			return annotationObject?.SearchRestrictions?.Searchable;
 		},
-		propertyPath,
-		bTableCase
+		extractionParametersOnPath
 	);
 };
 
 export const isPathDeletable = function(
 	dataModelObjectPath: DataModelObjectPath | undefined,
-	propertyPath?: PropertyOrPath<Property>,
-	bTableCase?: boolean
+	extractionParametersOnPath?: ExtractionParametersOnPath
 ): Expression<boolean> {
 	return checkOnPath(
 		dataModelObjectPath,
-		(annotationObject: NavigationPropertyRestriction | EntitySetAnnotations_Capabilities | EntityTypeAnnotations_Capabilities) => {
+		(annotationObject: NavigationPropertyRestriction | EntitySetAnnotations_Capabilities) => {
 			return annotationObject?.DeleteRestrictions?.Deletable;
 		},
-		propertyPath,
-		bTableCase
+		extractionParametersOnPath
 	);
 };
 
 export const isPathInsertable = function(
 	dataModelObjectPath: DataModelObjectPath | undefined,
-	propertyPath?: PropertyOrPath<Property>
+	extractionParametersOnPath?: ExtractionParametersOnPath
 ): Expression<boolean> {
 	return checkOnPath(
 		dataModelObjectPath,
-		(annotationObject: NavigationPropertyRestriction | EntitySetAnnotations_Capabilities | EntityTypeAnnotations_Capabilities) => {
+		(annotationObject: NavigationPropertyRestriction | EntitySetAnnotations_Capabilities) => {
 			return annotationObject?.InsertRestrictions?.Insertable;
 		},
-		propertyPath
+		extractionParametersOnPath
 	);
 };
 
@@ -335,13 +302,13 @@ export const checkFilterExpressionRestrictions = function(
 export const checkOnPath = function(
 	dataModelObjectPath: DataModelObjectPath | undefined,
 	checkFunction: Function,
-	propertyPath?: PropertyOrPath<Property>,
-	bTableCase?: boolean
+	extractionParametersOnPath?: ExtractionParametersOnPath
 ): Expression<boolean> {
 	if (!dataModelObjectPath || !dataModelObjectPath.startingEntitySet) {
 		return constant(true);
 	}
-	dataModelObjectPath = enhanceDataModelPath(dataModelObjectPath, propertyPath);
+
+	dataModelObjectPath = enhanceDataModelPath(dataModelObjectPath, extractionParametersOnPath?.propertyPath);
 
 	let currentEntitySet: EntitySet | null = dataModelObjectPath.startingEntitySet;
 	let parentEntitySet: EntitySet | null = null;
@@ -379,11 +346,11 @@ export const checkOnPath = function(
 	});
 
 	// At this point we have navigated down all the nav prop and we should have
-	// The target entityset pointing to either null (in case of containment navprop a last part), or the actual target (non containment as target)
-	// The parent entitySet pointing to the previous entityset used in the path
+	// The target entitySet pointing to either null (in case of containment navprop a last part), or the actual target (non containment as target)
+	// The parent entitySet pointing to the previous entitySet used in the path
 	// VisitedNavigationPath should contain the path up to this property
 
-	// Restrictions should then be evaluated as ParentEntitySet.NavRestrictions[NavpropertyPath] || TargetEntitySet.Restrictions
+	// Restrictions should then be evaluated as ParentEntitySet.NavRestrictions[NavPropertyPath] || TargetEntitySet.Restrictions
 	const fullNavigationPath = visitedNavigationPropsName.join("/");
 	let restrictions, visitedNavProps;
 	if (parentEntitySet !== null) {
@@ -396,18 +363,19 @@ export const checkOnPath = function(
 						const _allVisitedNavigationProps = allVisitedNavigationProps.slice(0, -1);
 						if (targetEntitySet !== null) {
 							visitedNavProps = _allVisitedNavigationProps;
+						} else if (_allVisitedNavigationProps.length === 0) {
+							visitedNavProps = allVisitedNavigationProps.slice(0);
 						} else {
-							if (_allVisitedNavigationProps.length === 0) {
-								visitedNavProps = allVisitedNavigationProps.slice(0);
-							} else {
-								visitedNavProps = _allVisitedNavigationProps;
-							}
+							visitedNavProps = _allVisitedNavigationProps;
 						}
+						const pathRelativeLocation = getPathRelativeLocation(dataModelObjectPath?.contextLocation, visitedNavProps).map(
+							np => np.name
+						);
+						const pathVisitorFunction = extractionParametersOnPath?.pathVisitor
+							? getPathVisitorForSingleton(extractionParametersOnPath.pathVisitor, pathRelativeLocation)
+							: undefined; // send pathVisitor function only when it is defined and only send function or defined as a parameter
 						restrictions = equal(
-							annotationExpression(
-								restrictionDefinition,
-								getPathRelativeLocation(dataModelObjectPath?.contextLocation, visitedNavProps).map(np => np.name)
-							),
+							annotationExpression(restrictionDefinition, pathRelativeLocation, undefined, pathVisitorFunction),
 							true
 						);
 					}
@@ -416,25 +384,34 @@ export const checkOnPath = function(
 		);
 	}
 	let targetRestrictions;
-	let restrictionDefinition = checkFunction(targetEntitySet?.annotations?.Capabilities);
-	if (targetEntitySet === null && restrictionDefinition === undefined) {
-		restrictionDefinition = checkFunction(targetEntityType?.annotations?.Capabilities);
-	}
-	if (restrictionDefinition !== undefined) {
-		targetRestrictions = equal(
-			annotationExpression(
-				restrictionDefinition,
-				getPathRelativeLocation(dataModelObjectPath.contextLocation, allVisitedNavigationProps).map(np => np.name)
-			),
-			true
-		);
-	}
-	//object page table case in path based scenario's fallback to exisiting approach
-	if (bTableCase && !restrictions && restrictionDefinition?.path) {
-		const oResult: any = {
-			"currentEntityRestriction": targetRestrictions
-		};
-		return oResult;
+	if (!extractionParametersOnPath?.ignoreTargetCollection) {
+		let restrictionDefinition = checkFunction(targetEntitySet?.annotations?.Capabilities);
+		if (targetEntitySet === null && restrictionDefinition === undefined) {
+			restrictionDefinition = checkFunction(targetEntityType?.annotations?.Capabilities);
+		}
+		if (restrictionDefinition !== undefined) {
+			const pathRelativeLocation = getPathRelativeLocation(dataModelObjectPath.contextLocation, allVisitedNavigationProps).map(
+				np => np.name
+			);
+			const pathVisitorFunction = extractionParametersOnPath?.pathVisitor
+				? getPathVisitorForSingleton(extractionParametersOnPath.pathVisitor, pathRelativeLocation)
+				: undefined;
+			targetRestrictions = equal(
+				annotationExpression(restrictionDefinition, pathRelativeLocation, undefined, pathVisitorFunction),
+				true
+			);
+		}
 	}
-	return restrictions || targetRestrictions || constant(true);
+
+	return (
+		restrictions || targetRestrictions || (extractionParametersOnPath?.authorizeUnresolvable ? unresolveableExpression : constant(true))
+	);
+};
+// This helper method is used to add relative path location argument to singletonPathVisitorFunction i.e. pathVisitor
+// pathVisitor method is used later to get the correct bindings for singleton entity
+// method is invoked later in bindingExpression() method to get the correct binding.
+const getPathVisitorForSingleton = function(pathVisitor: Function, pathRelativeLocation: string[]) {
+	return function(path: string) {
+		return pathVisitor(path, pathRelativeLocation);
+	};
 };

package/src/sap/fe/core/templating/DisplayModeFormatter.js

@@ -0,0 +1,114 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+ *      (c) Copyright 2009-2021 SAP SE. All rights reserved
+ */
+sap.ui.define(["sap/fe/core/templating/PropertyHelper"], function (PropertyHelper) {
+  "use strict";
+
+  var _exports = {};
+  var isPathExpression = PropertyHelper.isPathExpression;
+
+  var EDM_TYPE_MAPPING = {
+    "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"
+    }
+  };
+  _exports.EDM_TYPE_MAPPING = EDM_TYPE_MAPPING;
+
+  var getDisplayMode = function (oPropertyPath, oDataModelObjectPath) {
+    var _oProperty$annotation, _oProperty$annotation2, _oTextAnnotation$anno, _oTextAnnotation$anno2, _oTextAnnotation$anno3, _oEntityType$annotati, _oEntityType$annotati2, _oEntityType$annotati3, _oEntityType$annotati4, _oEntityType$annotati5, _oEntityType$annotati6;
+
+    if (!oPropertyPath || typeof oPropertyPath === "string") {
+      return "Value";
+    }
+
+    var oProperty = isPathExpression(oPropertyPath) && oPropertyPath.$target || oPropertyPath;
+    var oEntityType = oDataModelObjectPath && oDataModelObjectPath.targetEntityType;
+    var oTextAnnotation = (_oProperty$annotation = oProperty.annotations) === null || _oProperty$annotation === void 0 ? void 0 : (_oProperty$annotation2 = _oProperty$annotation.Common) === null || _oProperty$annotation2 === void 0 ? void 0 : _oProperty$annotation2.Text;
+    var oTextArrangementAnnotation = typeof oTextAnnotation !== "string" && (oTextAnnotation === null || oTextAnnotation === void 0 ? void 0 : (_oTextAnnotation$anno = oTextAnnotation.annotations) === null || _oTextAnnotation$anno === void 0 ? void 0 : (_oTextAnnotation$anno2 = _oTextAnnotation$anno.UI) === null || _oTextAnnotation$anno2 === void 0 ? void 0 : (_oTextAnnotation$anno3 = _oTextAnnotation$anno2.TextArrangement) === null || _oTextAnnotation$anno3 === void 0 ? void 0 : _oTextAnnotation$anno3.toString()) || (oEntityType === null || oEntityType === void 0 ? void 0 : (_oEntityType$annotati = oEntityType.annotations) === null || _oEntityType$annotati === void 0 ? void 0 : (_oEntityType$annotati2 = _oEntityType$annotati.UI) === null || _oEntityType$annotati2 === void 0 ? void 0 : (_oEntityType$annotati3 = _oEntityType$annotati2.TextArrangement) === null || _oEntityType$annotati3 === void 0 ? void 0 : _oEntityType$annotati3.toString());
+    var sDisplayValue = oTextAnnotation ? "DescriptionValue" : "Value";
+
+    if (oTextAnnotation && oTextArrangementAnnotation || oEntityType !== null && oEntityType !== void 0 && (_oEntityType$annotati4 = oEntityType.annotations) !== null && _oEntityType$annotati4 !== void 0 && (_oEntityType$annotati5 = _oEntityType$annotati4.UI) !== null && _oEntityType$annotati5 !== void 0 && (_oEntityType$annotati6 = _oEntityType$annotati5.TextArrangement) !== null && _oEntityType$annotati6 !== void 0 && _oEntityType$annotati6.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;
+  };
+
+  _exports.getDisplayMode = getDisplayMode;
+  return _exports;
+}, false);
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["DisplayModeFormatter.ts"],"names":["EDM_TYPE_MAPPING","type","constraints","getDisplayMode","oPropertyPath","oDataModelObjectPath","oProperty","isPathExpression","$target","oEntityType","targetEntityType","oTextAnnotation","annotations","Common","Text","oTextArrangementAnnotation","UI","TextArrangement","toString","sDisplayValue"],"mappings":"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","sourceRoot":".","sourcesContent":["/**\n * Separating these methods from the UIFormatters as they are used also in the converter.\n * These methods must NOT used any dependency from the UI5 runtime.\n * When consumed outside of converters, you should call them via UIFormatters.\n */\n\nimport { Property } from \"@sap-ux/annotation-converter\";\nimport { DataModelObjectPath } from \"sap/fe/core/templating/DataModelPathHelper\";\nimport { isPathExpression } from \"sap/fe/core/templating/PropertyHelper\";\nimport { PathAnnotationExpression } from \"@sap-ux/vocabularies-types/types/Edm\";\n\nexport type PropertyOrPath<P> = string | P | PathAnnotationExpression<P>;\n\nexport const EDM_TYPE_MAPPING: Record<string, any> = {\n\t\"Edm.Boolean\": { type: \"sap.ui.model.odata.type.Boolean\" },\n\t\"Edm.Byte\": { type: \"sap.ui.model.odata.type.Byte\" },\n\t\"Edm.Date\": { type: \"sap.ui.model.odata.type.Date\" },\n\t\"Edm.DateTimeOffset\": {\n\t\tconstraints: {\n\t\t\t\"$Precision\": \"precision\"\n\t\t},\n\t\ttype: \"sap.ui.model.odata.type.DateTimeOffset\"\n\t},\n\t\"Edm.Decimal\": {\n\t\tconstraints: {\n\t\t\t\"@Org.OData.Validation.V1.Minimum/$Decimal\": \"minimum\",\n\t\t\t\"@Org.OData.Validation.V1.Minimum@Org.OData.Validation.V1.Exclusive\": \"minimumExclusive\",\n\t\t\t\"@Org.OData.Validation.V1.Maximum/$Decimal\": \"maximum\",\n\t\t\t\"@Org.OData.Validation.V1.Maximum@Org.OData.Validation.V1.Exclusive\": \"maximumExclusive\",\n\t\t\t\"$Precision\": \"precision\",\n\t\t\t\"$Scale\": \"scale\"\n\t\t},\n\t\ttype: \"sap.ui.model.odata.type.Decimal\"\n\t},\n\t\"Edm.Double\": { type: \"sap.ui.model.odata.type.Double\" },\n\t\"Edm.Guid\": { type: \"sap.ui.model.odata.type.Guid\" },\n\t\"Edm.Int16\": { type: \"sap.ui.model.odata.type.Int16\" },\n\t\"Edm.Int32\": { type: \"sap.ui.model.odata.type.Int32\" },\n\t\"Edm.Int64\": { type: \"sap.ui.model.odata.type.Int64\" },\n\t\"Edm.SByte\": { type: \"sap.ui.model.odata.type.SByte\" },\n\t\"Edm.Single\": { type: \"sap.ui.model.odata.type.Single\" },\n\t\"Edm.Stream\": { type: \"sap.ui.model.odata.type.Stream\" },\n\t\"Edm.Binary\": { type: \"sap.ui.model.odata.type.Stream\" },\n\t\"Edm.String\": {\n\t\tconstraints: {\n\t\t\t\"@com.sap.vocabularies.Common.v1.IsDigitSequence\": \"isDigitSequence\",\n\t\t\t\"$MaxLength\": \"maxLength\",\n\t\t\t\"$Nullable\": \"nullable\"\n\t\t},\n\t\ttype: \"sap.ui.model.odata.type.String\"\n\t},\n\t\"Edm.TimeOfDay\": {\n\t\tconstraints: {\n\t\t\t\"$Precision\": \"precision\"\n\t\t},\n\t\ttype: \"sap.ui.model.odata.type.TimeOfDay\"\n\t}\n};\n\nexport type DisplayMode = \"Value\" | \"Description\" | \"DescriptionValue\" | \"ValueDescription\";\nexport const getDisplayMode = function(oPropertyPath: PropertyOrPath<Property>, oDataModelObjectPath?: DataModelObjectPath): DisplayMode {\n\tif (!oPropertyPath || typeof oPropertyPath === \"string\") {\n\t\treturn \"Value\";\n\t}\n\tconst oProperty = (isPathExpression(oPropertyPath) && oPropertyPath.$target) || (oPropertyPath as Property);\n\tconst oEntityType = oDataModelObjectPath && oDataModelObjectPath.targetEntityType;\n\tconst oTextAnnotation = oProperty.annotations?.Common?.Text;\n\tconst oTextArrangementAnnotation =\n\t\t(typeof oTextAnnotation !== \"string\" && oTextAnnotation?.annotations?.UI?.TextArrangement?.toString()) ||\n\t\toEntityType?.annotations?.UI?.TextArrangement?.toString();\n\n\tlet sDisplayValue = oTextAnnotation ? \"DescriptionValue\" : \"Value\";\n\tif ((oTextAnnotation && oTextArrangementAnnotation) || oEntityType?.annotations?.UI?.TextArrangement?.toString()) {\n\t\tif (oTextArrangementAnnotation === \"UI.TextArrangementType/TextOnly\") {\n\t\t\tsDisplayValue = \"Description\";\n\t\t} else if (oTextArrangementAnnotation === \"UI.TextArrangementType/TextLast\") {\n\t\t\tsDisplayValue = \"ValueDescription\";\n\t\t} else if (oTextArrangementAnnotation === \"UI.TextArrangementType/TextSeparate\") {\n\t\t\tsDisplayValue = \"Value\";\n\t\t} else {\n\t\t\t//Default should be TextFirst if there is a Text annotation and neither TextOnly nor TextLast are set\n\t\t\tsDisplayValue = \"DescriptionValue\";\n\t\t}\n\t}\n\treturn sDisplayValue as DisplayMode;\n};\n"]}

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

@@ -0,0 +1,86 @@
+/**
+ * Separating these methods from the UIFormatters as they are used also in the converter.
+ * These methods must NOT used any dependency from the UI5 runtime.
+ * When consumed outside of converters, you should call them via UIFormatters.
+ */
+
+import { Property } from "@sap-ux/annotation-converter";
+import { DataModelObjectPath } from "sap/fe/core/templating/DataModelPathHelper";
+import { isPathExpression } from "sap/fe/core/templating/PropertyHelper";
+import { PathAnnotationExpression } from "@sap-ux/vocabularies-types/types/Edm";
+
+export type PropertyOrPath<P> = string | P | PathAnnotationExpression<P>;
+
+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"
+	}
+};
+
+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;
+};