@sap/open.fe 1.96.0 → 1.97.0

package/packages/sap.fe.macros/src/sap/fe/macros/internal/Field.fragment.xml

@@ -7,14 +7,23 @@
 							ID: 'sap/fe/core/helpers/StableIdHelper'
 						 }"
 >
-
-	<macro:FieldAPI
-		change="{this>onChange}"
-		id="{= ${this>_apiId} ? ${this>_apiId} : (${this>idPrefix} ? ID.generate([${this>idPrefix}, 'Field']) : undefined )}"
-		required="{= FIELD.getRequiredForDataField(${dataField>Value/$Path@@FIELD.fieldControl}, ${this>editMode}, ${dataField>@@FIELD.fieldControl})}"
-		editable="{this>editableExpression}"
+	<template:if
+		test="{= !(${this>formatOptions/isAnalytics}) &amp;&amp; (${this>formatOptions/fieldMode} === 'nowrapper') &amp;&amp; (${this>editMode}==='Display') }"
 	>
-		<core:Fragment fragmentName="sap.fe.macros.internal.field.FieldContent" type="XML" />
-	</macro:FieldAPI>
+
+		<template:then>
+			<core:Fragment fragmentName="sap.fe.macros.internal.field.FieldContent" type="XML" />
+		</template:then>
+		<template:else>
+			<macro:FieldAPI
+				change="{this>onChange}"
+				id="{= ${this>_apiId} ? ${this>_apiId} : (${this>idPrefix} ? ID.generate([${this>idPrefix}, 'Field']) : undefined )}"
+				required="{= FIELD.getRequiredForDataField(${dataField>Value/$Path@@FIELD.fieldControl}, ${this>editMode}, ${dataField>@@FIELD.fieldControl})}"
+				editable="{this>editableExpression}"
+			>
+				<core:Fragment fragmentName="sap.fe.macros.internal.field.FieldContent" type="XML" />
+			</macro:FieldAPI>
+		</template:else>
+	</template:if>
 
 </core:FragmentDefinition>

package/packages/sap.fe.macros/src/sap/fe/macros/internal/field/FieldStructure.fragment.xml

@@ -32,24 +32,34 @@
 			<core:Fragment fragmentName="sap.fe.macros.internal.field.displayStyle.{this>displayStyle}" type="XML" />
 		</template:then>
 		<template:else>
-			<control:FieldWrapper
-				id="{= ${this>_flexId} || (${this>idPrefix} ? ID.generate([${this>idPrefix}, 'Field-content']) : undefined) }"
-				emptyIndicatorTrigger="{= FIELD.getEmptyIndicatorTrigger(${this>formatOptions/showEmptyIndicator},${this>valueBindingExpression}, ${this>text})}"
-				editMode="{this>editMode}"
-				visible="{this>visible}"
-				required="{= FIELD.getRequiredForDataField(${property>$Path@@FIELD.fieldControl}, ${this>editMode})}"
-				width="100%"
-				class="{this>class}"
+			
+			<template:if
+				test="{= !(${this>formatOptions/isAnalytics}) &amp;&amp; (${this>formatOptions/fieldMode} === 'nowrapper') &amp;&amp; (${this>editMode}==='Display') &amp;&amp; (${this>visible} === 'true') }"
 			>
-				<control:contentDisplay>
+				<template:then>
 					<core:Fragment fragmentName="sap.fe.macros.internal.field.displayStyle.{this>displayStyle}" type="XML" />
-				</control:contentDisplay>
-				<template:if test="{= ${this>editMode}!=='Display'  &amp;&amp; !!${this>editStyle}}">
-					<control:contentEdit>
-						<core:Fragment fragmentName="sap.fe.macros.internal.field.editStyle.{this>editStyle}" type="XML" />
-					</control:contentEdit>
-				</template:if>
-			</control:FieldWrapper>
+				</template:then>
+				<template:else>
+					<control:FieldWrapper
+						id="{= ${this>_flexId} || (${this>idPrefix} ? ID.generate([${this>idPrefix}, 'Field-content']) : undefined) }"
+						emptyIndicatorTrigger="{= FIELD.getEmptyIndicatorTrigger(${this>formatOptions/showEmptyIndicator},${this>valueBindingExpression}, ${this>text})}"
+						editMode="{this>editMode}"
+						visible="{this>visible}"
+						required="{= FIELD.getRequiredForDataField(${property>$Path@@FIELD.fieldControl}, ${this>editMode})}"
+						width="100%"
+						class="{this>class}"
+					>
+						<control:contentDisplay>
+							<core:Fragment fragmentName="sap.fe.macros.internal.field.displayStyle.{this>displayStyle}" type="XML" />
+						</control:contentDisplay>
+						<template:if test="{= ${this>editMode}!=='Display'  &amp;&amp; !!${this>editStyle}}">
+							<control:contentEdit>
+								<core:Fragment fragmentName="sap.fe.macros.internal.field.editStyle.{this>editStyle}" type="XML" />
+							</control:contentEdit>
+						</template:if>
+					</control:FieldWrapper>
+				</template:else>
+			</template:if>
 		</template:else>
 	</template:if>
 </core:FragmentDefinition>

package/packages/sap.fe.macros/src/sap/fe/macros/internal/field/editStyle/File.fragment.xml

@@ -31,6 +31,7 @@
 				style="Transparent"
 				sendXHR="true"
 				useMultipart="false"
+				sameFilenameAllowed="true"
 				uploadOnChange="false"
 				uploadAborted="FIELDRUNTIME.handleUploadAborted"
 				uploadComplete="FIELDRUNTIME.handleUploadComplete($event, '{propertyPath>@Org.OData.Core.V1.ContentDisposition/Filename@@FIELD.propertyName}')"

package/packages/sap.fe.macros/src/sap/fe/macros/internal/helpers/DataPointTemplating-dbg.js

@@ -14,6 +14,7 @@ sap.ui.define(["sap/fe/core/formatters/ValueFormatter", "sap/fe/core/templating/
   var annotationExpression = BindingExpression.annotationExpression;
   var getPathRelativeLocation = DataModelPathHelper.getPathRelativeLocation;
   var enhanceDataModelPath = DataModelPathHelper.enhanceDataModelPath;
+  var formatWithTypeInformation = UIFormatters.formatWithTypeInformation;
   var getBindingWithUnitOrCurrency = UIFormatters.getBindingWithUnitOrCurrency;
   var EDM_TYPE_MAPPING = UIFormatters.EDM_TYPE_MAPPING;
   var getDisplayMode = UIFormatters.getDisplayMode;
@@ -138,10 +139,12 @@ sap.ui.define(["sap/fe/core/formatters/ValueFormatter", "sap/fe/core/templating/
       return np.name;
     }) : [];
     outExpression = annotationExpression(fieldValue, relativeLocation);
+    var oPropertyDefinition = oPropertyDataModelPath.targetObject;
 
     if (sPropertyType) {
       var _EDM_TYPE_MAPPING$sPr;
 
+      formatWithTypeInformation(oPropertyDefinition, outExpression);
       outExpression.type = (_EDM_TYPE_MAPPING$sPr = EDM_TYPE_MAPPING[sPropertyType]) === null || _EDM_TYPE_MAPPING$sPr === void 0 ? void 0 : _EDM_TYPE_MAPPING$sPr.type;
     }
 
@@ -152,18 +155,6 @@ sap.ui.define(["sap/fe/core/formatters/ValueFormatter", "sap/fe/core/templating/
         outExpression = getDecimalFormat(outExpression, fieldValue, sNumberOfFractionalDigits);
         break;
 
-      case "Edm.String":
-        if (!outExpression.formatOptions) {
-          outExpression.formatOptions = {};
-        }
-
-        if (!outExpression.constraints) {
-          outExpression.constraints = {};
-        }
-
-        outExpression.formatOptions.parseKeepsEmptyString = true;
-        break;
-
       default:
     }
 
@@ -249,4 +240,4 @@ sap.ui.define(["sap/fe/core/formatters/ValueFormatter", "sap/fe/core/templating/
   _exports.buildExpressionForProgressIndicatorPercentValue = buildExpressionForProgressIndicatorPercentValue;
   return _exports;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["DataPointTemplating.ts"],"names":["getDataPointTargetExpression","oDataModelPath","TargetValue","annotationExpression","unresolveableExpression","oResourceModel","sap","ui","getCore","getLibraryResourceBundle","progressIndicatorDisplayValue","oPropertyDataModelObjectPath","fieldValue","targetObject","Value","relativeLocation","getPathRelativeLocation","contextLocation","navigationProperties","map","np","name","fieldValueExpression","TargetExpression","sUnitPropertyPath","$target","getAssociatedUnitPropertyPath","undefined","sUoMPercent","annotations","Measures","Unit","charAt","compileBinding","getText","bindingExpression","buildRatingIndicatorSubtitleExpression","oContext","mSampleSize","formatRatingIndicatorSubTitle","AnnotationHelper","value","context","iSampleSizeValue","sSubTitleLabel","String","getHeaderRatingIndicatorText","oDataPoint","SampleSize","Description","sModelValue","requiresIContext","buildExpressionForDescription","Common","Text","oTextExpression","parameters","getDecimalFormat","outExpression","sNumberOfFractionalDigits","constraints","Object","assign","precision","scale","getValueFormatted","oPropertyDataModelPath","sPropertyType","path","indexOf","type","EDM_TYPE_MAPPING","formatOptions","parseKeepsEmptyString","buildFieldBindingExpression","oProperty","dataPointFormatOptions","bMeasureDisplayModeEnabled","oDataPointValue","oFormatOptions","oDescription","ValueFormat","NumberOfFractionalDigits","enhanceDataModelPath","oFormatedValue","sDisplayMode","displayMode","getDisplayMode","oBindingExpression","formatResult","valueFormatters","formatWithBrackets","ISOCurrency","getBindingWithUnitOrCurrency","measureDisplayMode","showMeasure","buildExpressionForProgressIndicatorPercentValue","UnitExpression","oExpressionTemplate","computePercentage"],"mappings":"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","sourceRoot":".","sourcesContent":["import valueFormatters from \"sap/fe/core/formatters/ValueFormatter\";\nimport { getDisplayMode, EDM_TYPE_MAPPING, getBindingWithUnitOrCurrency } from \"sap/fe/core/templating/UIFormatters\";\n\nimport { DataModelObjectPath, enhanceDataModelPath, getPathRelativeLocation } from \"sap/fe/core/templating/DataModelPathHelper\";\nimport {\n\tExpression,\n\tannotationExpression,\n\tformatResult,\n\tBindingExpressionExpression,\n\tBindingExpression,\n\tcompileBinding,\n\tbindingExpression,\n\tComplexTypeExpression,\n\tunresolveableExpression\n} from \"sap/fe/core/helpers/BindingExpression\";\n\nimport { getAssociatedUnitPropertyPath } from \"sap/fe/core/templating/PropertyHelper\";\n\nimport { AnnotationHelper } from \"sap/ui/model/odata/v4\";\n\nexport type DataPointFormatOptions = Partial<{\n\tmeasureDisplayMode: String;\n}>;\n\nconst getDataPointTargetExpression = (oDataModelPath: any): Expression<string> => {\n\treturn oDataModelPath?.TargetValue ? annotationExpression(oDataModelPath.TargetValue) : unresolveableExpression;\n};\n\nconst oResourceModel = sap.ui.getCore().getLibraryResourceBundle(\"sap.fe.macros\");\n\nexport const progressIndicatorDisplayValue = (oPropertyDataModelObjectPath: DataModelObjectPath): BindingExpression<string> => {\n\tconst fieldValue = oPropertyDataModelObjectPath?.targetObject?.Value || \"\";\n\tconst relativeLocation = getPathRelativeLocation(\n\t\toPropertyDataModelObjectPath.contextLocation,\n\t\toPropertyDataModelObjectPath.navigationProperties\n\t).map(np => np.name);\n\tconst fieldValueExpression = annotationExpression(fieldValue, relativeLocation);\n\tconst TargetExpression = getDataPointTargetExpression(oPropertyDataModelObjectPath.targetObject);\n\n\tif (fieldValueExpression && TargetExpression) {\n\t\tconst sUnitPropertyPath = fieldValue?.$target ? getAssociatedUnitPropertyPath(fieldValue?.$target) : undefined;\n\n\t\tif (!sUnitPropertyPath) {\n\t\t\tconst sUoMPercent = fieldValue.$target?.annotations?.Measures?.Unit?.charAt(0);\n\t\t\tif (sUoMPercent === \"%\") {\n\t\t\t\treturn (compileBinding(fieldValueExpression) as string) + \" %\";\n\t\t\t} else {\n\t\t\t\treturn oResourceModel.getText(\"T_COMMON_PROGRESS_INDICATOR_DISPLAY_VALUE_NO_UOM\", [\n\t\t\t\t\tcompileBinding(fieldValueExpression) as string,\n\t\t\t\t\tcompileBinding(TargetExpression) as string\n\t\t\t\t]);\n\t\t\t}\n\t\t} else {\n\t\t\treturn (\n\t\t\t\toResourceModel.getText(\"T_COMMON_PROGRESS_INDICATOR_DISPLAY_VALUE_NO_UOM\", [\n\t\t\t\t\tcompileBinding(fieldValueExpression) as string,\n\t\t\t\t\tcompileBinding(TargetExpression) as string\n\t\t\t\t]) +\n\t\t\t\t\" \" +\n\t\t\t\tcompileBinding(bindingExpression(sUnitPropertyPath as string))\n\t\t\t);\n\t\t}\n\t}\n\treturn undefined;\n};\n\nconst buildRatingIndicatorSubtitleExpression = (oContext: any, mSampleSize: any): string | undefined => {\n\tif (mSampleSize) {\n\t\treturn formatRatingIndicatorSubTitle(AnnotationHelper.value(mSampleSize, { context: oContext }));\n\t}\n};\n// returns the text for the Rating Indicator Subtitle (e.g. '7 reviews')\nconst formatRatingIndicatorSubTitle = (iSampleSizeValue: number): string | undefined => {\n\tif (iSampleSizeValue) {\n\t\tconst sSubTitleLabel =\n\t\t\tiSampleSizeValue > 1\n\t\t\t\t? oResourceModel.getText(\"T_ANNOTATION_HELPER_RATING_INDICATOR_SUBTITLE_LABEL_PLURAL\")\n\t\t\t\t: oResourceModel.getText(\"T_ANNOTATION_HELPER_RATING_INDICATOR_SUBTITLE_LABEL\");\n\t\treturn oResourceModel.getText(\"T_ANNOTATION_HELPER_RATING_INDICATOR_SUBTITLE\", [String(iSampleSizeValue), sSubTitleLabel]);\n\t}\n};\n\n/**\n * This function is used to get the header text of rating indicator.\n * @param oContext\n * @param oDataPoint\n * @function param {object} oContext context of interface\n * param {object} oDataPoint data point object\n * @returns {string} Expression binding for rating indicator text\n */\nexport const getHeaderRatingIndicatorText = (oContext: any, oDataPoint: any): string | undefined => {\n\tif (oDataPoint && oDataPoint.SampleSize) {\n\t\treturn buildRatingIndicatorSubtitleExpression(oContext, oDataPoint.SampleSize);\n\t} else if (oDataPoint && oDataPoint.Description) {\n\t\tconst sModelValue = AnnotationHelper.value(oDataPoint.Description, { context: oContext });\n\t\treturn \"${path:\" + sModelValue + \"}\";\n\t}\n};\ngetHeaderRatingIndicatorText.requiresIContext = true;\n\nconst buildExpressionForDescription = (fieldValue: any): Expression<any> | undefined => {\n\tif (fieldValue?.$target?.annotations?.Common?.Text) {\n\t\tconst oTextExpression = annotationExpression(fieldValue?.$target?.annotations?.Common?.Text) as BindingExpressionExpression<any>;\n\t\toTextExpression.parameters = { \"$$noPatch\": true };\n\t\treturn oTextExpression;\n\t}\n\treturn undefined;\n};\n\nconst getDecimalFormat = (\n\toutExpression: BindingExpression<any>,\n\tfieldValue: any,\n\tsNumberOfFractionalDigits: string\n): BindingExpression<any> => {\n\tif (!outExpression.constraints) {\n\t\toutExpression.constraints = {};\n\t}\n\toutExpression.constraints = Object.assign(outExpression.constraints, {\n\t\tprecision: fieldValue.$target.precision,\n\t\tscale: sNumberOfFractionalDigits ? sNumberOfFractionalDigits : fieldValue.$target.scale\n\t});\n\treturn outExpression;\n};\n\nconst getValueFormatted = (\n\toPropertyDataModelPath: DataModelObjectPath,\n\tfieldValue: any,\n\tsPropertyType: string,\n\tsNumberOfFractionalDigits: string\n): BindingExpressionExpression<string> => {\n\tlet outExpression: BindingExpression<any>;\n\tconst relativeLocation =\n\t\tfieldValue?.path?.indexOf(\"/\") === -1\n\t\t\t? getPathRelativeLocation(oPropertyDataModelPath.contextLocation, oPropertyDataModelPath.navigationProperties).map(\n\t\t\t\t\tnp => np.name\n\t\t\t  )\n\t\t\t: [];\n\toutExpression = annotationExpression(fieldValue, relativeLocation);\n\tif (sPropertyType) {\n\t\toutExpression.type = EDM_TYPE_MAPPING[sPropertyType]?.type;\n\t}\n\tswitch (sPropertyType) {\n\t\tcase \"Edm.Decimal\":\n\t\t\t// for the listReport, the decimal fields are formatted by returning a string\n\t\t\t// for the facets of the OP, the decimal fields are formatted by returning a promise, so we manage all the cases\n\t\t\toutExpression = getDecimalFormat(outExpression, fieldValue, sNumberOfFractionalDigits);\n\t\t\tbreak;\n\t\tcase \"Edm.String\":\n\t\t\tif (!outExpression.formatOptions) {\n\t\t\t\toutExpression.formatOptions = {};\n\t\t\t}\n\t\t\tif (!outExpression.constraints) {\n\t\t\t\toutExpression.constraints = {};\n\t\t\t}\n\t\t\toutExpression.formatOptions.parseKeepsEmptyString = true;\n\t\t\tbreak;\n\t\tdefault:\n\t}\n\treturn outExpression as BindingExpressionExpression<string>;\n};\n\nexport const buildFieldBindingExpression = (\n\toDataModelPath: DataModelObjectPath,\n\toProperty: any,\n\tdataPointFormatOptions: DataPointFormatOptions,\n\tbMeasureDisplayModeEnabled: boolean\n): BindingExpression<string> => {\n\tconst oDataPoint = oDataModelPath.targetObject;\n\tconst oDataPointValue = oDataPoint?.Value || \"\";\n\tconst oFormatOptions = oProperty.formatOptions;\n\tconst oDescription = buildExpressionForDescription(oDataPointValue);\n\tconst sPropertyType = oDataPointValue?.$target?.type;\n\tlet sNumberOfFractionalDigits;\n\n\tif (sPropertyType === \"Edm.Decimal\" && oDataPoint.ValueFormat) {\n\t\tif (oDataPoint.ValueFormat.NumberOfFractionalDigits) {\n\t\t\tsNumberOfFractionalDigits = oDataPoint.ValueFormat.NumberOfFractionalDigits;\n\t\t}\n\t}\n\tconst oPropertyDataModelObjectPath = enhanceDataModelPath(oDataModelPath, oDataPointValue.path);\n\tconst oFormatedValue = getValueFormatted(oPropertyDataModelObjectPath, oDataPointValue, sPropertyType, sNumberOfFractionalDigits);\n\tconst sDisplayMode = oDescription\n\t\t? oFormatOptions.displayMode || getDisplayMode(oDataPointValue, oPropertyDataModelObjectPath)\n\t\t: \"Value\";\n\tlet oBindingExpression: any;\n\tswitch (sDisplayMode) {\n\t\tcase \"Description\":\n\t\t\toBindingExpression = oDescription;\n\t\t\tbreak;\n\t\tcase \"ValueDescription\":\n\t\t\toBindingExpression = formatResult([oFormatedValue, oDescription], valueFormatters.formatWithBrackets);\n\t\t\tbreak;\n\t\tcase \"DescriptionValue\":\n\t\t\toBindingExpression = formatResult([oDescription, oFormatedValue], valueFormatters.formatWithBrackets);\n\t\t\tbreak;\n\t\tdefault:\n\t\t\tif (\n\t\t\t\toPropertyDataModelObjectPath.targetObject?.annotations?.Measures?.Unit ||\n\t\t\t\toPropertyDataModelObjectPath.targetObject?.annotations?.Measures?.ISOCurrency\n\t\t\t) {\n\t\t\t\toBindingExpression = getBindingWithUnitOrCurrency(oPropertyDataModelObjectPath, oFormatedValue);\n\t\t\t\tif (oBindingExpression && bMeasureDisplayModeEnabled && dataPointFormatOptions?.measureDisplayMode !== \"ReadOnly\") {\n\t\t\t\t\t(oBindingExpression as ComplexTypeExpression<String>).formatOptions = {\n\t\t\t\t\t\t...(oBindingExpression as ComplexTypeExpression<String>).formatOptions,\n\t\t\t\t\t\tshowMeasure: false\n\t\t\t\t\t};\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\toBindingExpression = oFormatedValue;\n\t\t\t}\n\t}\n\n\treturn compileBinding(oBindingExpression);\n};\n\n/**\n * Method to calculate the percentage value of Progress Indicator. Basic formula is Value/Target * 100.\n *\n * @param {*} oPropertyDataModelObjectPath\n * @returns {Binding} Expression binding that will calculate the percent value to be shown in progress indicator. Formula given above.\n */\nexport const buildExpressionForProgressIndicatorPercentValue = (oPropertyDataModelObjectPath: DataModelObjectPath): string | undefined => {\n\tconst fieldValue = oPropertyDataModelObjectPath?.targetObject?.Value || \"\";\n\tconst relativeLocation = getPathRelativeLocation(\n\t\toPropertyDataModelObjectPath.contextLocation,\n\t\toPropertyDataModelObjectPath.navigationProperties\n\t).map(np => np.name);\n\tconst fieldValueExpression = annotationExpression(fieldValue, relativeLocation);\n\tconst TargetExpression = getDataPointTargetExpression(oPropertyDataModelObjectPath.targetObject);\n\tconst sUnitPropertyPath = fieldValue?.$target ? getAssociatedUnitPropertyPath(fieldValue.$target) : undefined;\n\tconst UnitExpression = sUnitPropertyPath ? bindingExpression(sUnitPropertyPath) : \"\";\n\n\tconst oExpressionTemplate = formatResult([fieldValueExpression, TargetExpression, UnitExpression], valueFormatters.computePercentage);\n\n\treturn compileBinding(oExpressionTemplate);\n};\n"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["DataPointTemplating.ts"],"names":["getDataPointTargetExpression","oDataModelPath","TargetValue","annotationExpression","unresolveableExpression","oResourceModel","sap","ui","getCore","getLibraryResourceBundle","progressIndicatorDisplayValue","oPropertyDataModelObjectPath","fieldValue","targetObject","Value","relativeLocation","getPathRelativeLocation","contextLocation","navigationProperties","map","np","name","fieldValueExpression","TargetExpression","sUnitPropertyPath","$target","getAssociatedUnitPropertyPath","undefined","sUoMPercent","annotations","Measures","Unit","charAt","compileBinding","getText","bindingExpression","buildRatingIndicatorSubtitleExpression","oContext","mSampleSize","formatRatingIndicatorSubTitle","AnnotationHelper","value","context","iSampleSizeValue","sSubTitleLabel","String","getHeaderRatingIndicatorText","oDataPoint","SampleSize","Description","sModelValue","requiresIContext","buildExpressionForDescription","Common","Text","oTextExpression","parameters","getDecimalFormat","outExpression","sNumberOfFractionalDigits","constraints","Object","assign","precision","scale","getValueFormatted","oPropertyDataModelPath","sPropertyType","path","indexOf","oPropertyDefinition","formatWithTypeInformation","type","EDM_TYPE_MAPPING","buildFieldBindingExpression","oProperty","dataPointFormatOptions","bMeasureDisplayModeEnabled","oDataPointValue","oFormatOptions","formatOptions","oDescription","ValueFormat","NumberOfFractionalDigits","enhanceDataModelPath","oFormatedValue","sDisplayMode","displayMode","getDisplayMode","oBindingExpression","formatResult","valueFormatters","formatWithBrackets","ISOCurrency","getBindingWithUnitOrCurrency","measureDisplayMode","showMeasure","buildExpressionForProgressIndicatorPercentValue","UnitExpression","oExpressionTemplate","computePercentage"],"mappings":"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","sourceRoot":".","sourcesContent":["import valueFormatters from \"sap/fe/core/formatters/ValueFormatter\";\nimport {\n\tgetDisplayMode,\n\tEDM_TYPE_MAPPING,\n\tgetBindingWithUnitOrCurrency,\n\tformatWithTypeInformation\n} from \"sap/fe/core/templating/UIFormatters\";\n\nimport { DataModelObjectPath, enhanceDataModelPath, getPathRelativeLocation } from \"sap/fe/core/templating/DataModelPathHelper\";\nimport {\n\tExpression,\n\tannotationExpression,\n\tformatResult,\n\tBindingExpressionExpression,\n\tBindingExpression,\n\tcompileBinding,\n\tbindingExpression,\n\tComplexTypeExpression,\n\tunresolveableExpression\n} from \"sap/fe/core/helpers/BindingExpression\";\n\nimport { getAssociatedUnitPropertyPath } from \"sap/fe/core/templating/PropertyHelper\";\n\nimport { Property } from \"@sap-ux/annotation-converter\";\n\nimport { AnnotationHelper } from \"sap/ui/model/odata/v4\";\n\nexport type DataPointFormatOptions = Partial<{\n\tmeasureDisplayMode: String;\n}>;\n\nconst getDataPointTargetExpression = (oDataModelPath: any): Expression<string> => {\n\treturn oDataModelPath?.TargetValue ? annotationExpression(oDataModelPath.TargetValue) : unresolveableExpression;\n};\n\nconst oResourceModel = sap.ui.getCore().getLibraryResourceBundle(\"sap.fe.macros\");\n\nexport const progressIndicatorDisplayValue = (oPropertyDataModelObjectPath: DataModelObjectPath): BindingExpression<string> => {\n\tconst fieldValue = oPropertyDataModelObjectPath?.targetObject?.Value || \"\";\n\tconst relativeLocation = getPathRelativeLocation(\n\t\toPropertyDataModelObjectPath.contextLocation,\n\t\toPropertyDataModelObjectPath.navigationProperties\n\t).map(np => np.name);\n\tconst fieldValueExpression = annotationExpression(fieldValue, relativeLocation);\n\tconst TargetExpression = getDataPointTargetExpression(oPropertyDataModelObjectPath.targetObject);\n\n\tif (fieldValueExpression && TargetExpression) {\n\t\tconst sUnitPropertyPath = fieldValue?.$target ? getAssociatedUnitPropertyPath(fieldValue?.$target) : undefined;\n\n\t\tif (!sUnitPropertyPath) {\n\t\t\tconst sUoMPercent = fieldValue.$target?.annotations?.Measures?.Unit?.charAt(0);\n\t\t\tif (sUoMPercent === \"%\") {\n\t\t\t\treturn (compileBinding(fieldValueExpression) as string) + \" %\";\n\t\t\t} else {\n\t\t\t\treturn oResourceModel.getText(\"T_COMMON_PROGRESS_INDICATOR_DISPLAY_VALUE_NO_UOM\", [\n\t\t\t\t\tcompileBinding(fieldValueExpression) as string,\n\t\t\t\t\tcompileBinding(TargetExpression) as string\n\t\t\t\t]);\n\t\t\t}\n\t\t} else {\n\t\t\treturn (\n\t\t\t\toResourceModel.getText(\"T_COMMON_PROGRESS_INDICATOR_DISPLAY_VALUE_NO_UOM\", [\n\t\t\t\t\tcompileBinding(fieldValueExpression) as string,\n\t\t\t\t\tcompileBinding(TargetExpression) as string\n\t\t\t\t]) +\n\t\t\t\t\" \" +\n\t\t\t\tcompileBinding(bindingExpression(sUnitPropertyPath as string))\n\t\t\t);\n\t\t}\n\t}\n\treturn undefined;\n};\n\nconst buildRatingIndicatorSubtitleExpression = (oContext: any, mSampleSize: any): string | undefined => {\n\tif (mSampleSize) {\n\t\treturn formatRatingIndicatorSubTitle(AnnotationHelper.value(mSampleSize, { context: oContext }));\n\t}\n};\n// returns the text for the Rating Indicator Subtitle (e.g. '7 reviews')\nconst formatRatingIndicatorSubTitle = (iSampleSizeValue: number): string | undefined => {\n\tif (iSampleSizeValue) {\n\t\tconst sSubTitleLabel =\n\t\t\tiSampleSizeValue > 1\n\t\t\t\t? oResourceModel.getText(\"T_ANNOTATION_HELPER_RATING_INDICATOR_SUBTITLE_LABEL_PLURAL\")\n\t\t\t\t: oResourceModel.getText(\"T_ANNOTATION_HELPER_RATING_INDICATOR_SUBTITLE_LABEL\");\n\t\treturn oResourceModel.getText(\"T_ANNOTATION_HELPER_RATING_INDICATOR_SUBTITLE\", [String(iSampleSizeValue), sSubTitleLabel]);\n\t}\n};\n\n/**\n * This function is used to get the header text of rating indicator.\n * @param oContext\n * @param oDataPoint\n * @function param {object} oContext context of interface\n * param {object} oDataPoint data point object\n * @returns {string} Expression binding for rating indicator text\n */\nexport const getHeaderRatingIndicatorText = (oContext: any, oDataPoint: any): string | undefined => {\n\tif (oDataPoint && oDataPoint.SampleSize) {\n\t\treturn buildRatingIndicatorSubtitleExpression(oContext, oDataPoint.SampleSize);\n\t} else if (oDataPoint && oDataPoint.Description) {\n\t\tconst sModelValue = AnnotationHelper.value(oDataPoint.Description, { context: oContext });\n\t\treturn \"${path:\" + sModelValue + \"}\";\n\t}\n};\ngetHeaderRatingIndicatorText.requiresIContext = true;\n\nconst buildExpressionForDescription = (fieldValue: any): Expression<any> | undefined => {\n\tif (fieldValue?.$target?.annotations?.Common?.Text) {\n\t\tconst oTextExpression = annotationExpression(fieldValue?.$target?.annotations?.Common?.Text) as BindingExpressionExpression<any>;\n\t\toTextExpression.parameters = { \"$$noPatch\": true };\n\t\treturn oTextExpression;\n\t}\n\treturn undefined;\n};\n\nconst getDecimalFormat = (\n\toutExpression: BindingExpression<any>,\n\tfieldValue: any,\n\tsNumberOfFractionalDigits: string\n): BindingExpression<any> => {\n\tif (!outExpression.constraints) {\n\t\toutExpression.constraints = {};\n\t}\n\toutExpression.constraints = Object.assign(outExpression.constraints, {\n\t\tprecision: fieldValue.$target.precision,\n\t\tscale: sNumberOfFractionalDigits ? sNumberOfFractionalDigits : fieldValue.$target.scale\n\t});\n\treturn outExpression;\n};\n\nconst getValueFormatted = (\n\toPropertyDataModelPath: DataModelObjectPath,\n\tfieldValue: any,\n\tsPropertyType: string,\n\tsNumberOfFractionalDigits: string\n): BindingExpressionExpression<string> => {\n\tlet outExpression: BindingExpression<any>;\n\tconst relativeLocation =\n\t\tfieldValue?.path?.indexOf(\"/\") === -1\n\t\t\t? getPathRelativeLocation(oPropertyDataModelPath.contextLocation, oPropertyDataModelPath.navigationProperties).map(\n\t\t\t\t\tnp => np.name\n\t\t\t  )\n\t\t\t: [];\n\toutExpression = annotationExpression(fieldValue, relativeLocation);\n\tconst oPropertyDefinition = oPropertyDataModelPath.targetObject as Property;\n\tif (sPropertyType) {\n\t\tformatWithTypeInformation(oPropertyDefinition, outExpression);\n\t\toutExpression.type = EDM_TYPE_MAPPING[sPropertyType]?.type;\n\t}\n\tswitch (sPropertyType) {\n\t\tcase \"Edm.Decimal\":\n\t\t\t// for the listReport, the decimal fields are formatted by returning a string\n\t\t\t// for the facets of the OP, the decimal fields are formatted by returning a promise, so we manage all the cases\n\t\t\toutExpression = getDecimalFormat(outExpression, fieldValue, sNumberOfFractionalDigits);\n\t\t\tbreak;\n\t\tdefault:\n\t}\n\treturn outExpression as BindingExpressionExpression<string>;\n};\n\nexport const buildFieldBindingExpression = (\n\toDataModelPath: DataModelObjectPath,\n\toProperty: any,\n\tdataPointFormatOptions: DataPointFormatOptions,\n\tbMeasureDisplayModeEnabled: boolean\n): BindingExpression<string> => {\n\tconst oDataPoint = oDataModelPath.targetObject;\n\tconst oDataPointValue = oDataPoint?.Value || \"\";\n\tconst oFormatOptions = oProperty.formatOptions;\n\tconst oDescription = buildExpressionForDescription(oDataPointValue);\n\tconst sPropertyType = oDataPointValue?.$target?.type;\n\tlet sNumberOfFractionalDigits;\n\n\tif (sPropertyType === \"Edm.Decimal\" && oDataPoint.ValueFormat) {\n\t\tif (oDataPoint.ValueFormat.NumberOfFractionalDigits) {\n\t\t\tsNumberOfFractionalDigits = oDataPoint.ValueFormat.NumberOfFractionalDigits;\n\t\t}\n\t}\n\tconst oPropertyDataModelObjectPath = enhanceDataModelPath(oDataModelPath, oDataPointValue.path);\n\tconst oFormatedValue = getValueFormatted(oPropertyDataModelObjectPath, oDataPointValue, sPropertyType, sNumberOfFractionalDigits);\n\tconst sDisplayMode = oDescription\n\t\t? oFormatOptions.displayMode || getDisplayMode(oDataPointValue, oPropertyDataModelObjectPath)\n\t\t: \"Value\";\n\tlet oBindingExpression: any;\n\tswitch (sDisplayMode) {\n\t\tcase \"Description\":\n\t\t\toBindingExpression = oDescription;\n\t\t\tbreak;\n\t\tcase \"ValueDescription\":\n\t\t\toBindingExpression = formatResult([oFormatedValue, oDescription], valueFormatters.formatWithBrackets);\n\t\t\tbreak;\n\t\tcase \"DescriptionValue\":\n\t\t\toBindingExpression = formatResult([oDescription, oFormatedValue], valueFormatters.formatWithBrackets);\n\t\t\tbreak;\n\t\tdefault:\n\t\t\tif (\n\t\t\t\toPropertyDataModelObjectPath.targetObject?.annotations?.Measures?.Unit ||\n\t\t\t\toPropertyDataModelObjectPath.targetObject?.annotations?.Measures?.ISOCurrency\n\t\t\t) {\n\t\t\t\toBindingExpression = getBindingWithUnitOrCurrency(oPropertyDataModelObjectPath, oFormatedValue);\n\t\t\t\tif (oBindingExpression && bMeasureDisplayModeEnabled && dataPointFormatOptions?.measureDisplayMode !== \"ReadOnly\") {\n\t\t\t\t\t(oBindingExpression as ComplexTypeExpression<String>).formatOptions = {\n\t\t\t\t\t\t...(oBindingExpression as ComplexTypeExpression<String>).formatOptions,\n\t\t\t\t\t\tshowMeasure: false\n\t\t\t\t\t};\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\toBindingExpression = oFormatedValue;\n\t\t\t}\n\t}\n\n\treturn compileBinding(oBindingExpression);\n};\n\n/**\n * Method to calculate the percentage value of Progress Indicator. Basic formula is Value/Target * 100.\n *\n * @param {*} oPropertyDataModelObjectPath\n * @returns {Binding} Expression binding that will calculate the percent value to be shown in progress indicator. Formula given above.\n */\nexport const buildExpressionForProgressIndicatorPercentValue = (oPropertyDataModelObjectPath: DataModelObjectPath): string | undefined => {\n\tconst fieldValue = oPropertyDataModelObjectPath?.targetObject?.Value || \"\";\n\tconst relativeLocation = getPathRelativeLocation(\n\t\toPropertyDataModelObjectPath.contextLocation,\n\t\toPropertyDataModelObjectPath.navigationProperties\n\t).map(np => np.name);\n\tconst fieldValueExpression = annotationExpression(fieldValue, relativeLocation);\n\tconst TargetExpression = getDataPointTargetExpression(oPropertyDataModelObjectPath.targetObject);\n\tconst sUnitPropertyPath = fieldValue?.$target ? getAssociatedUnitPropertyPath(fieldValue.$target) : undefined;\n\tconst UnitExpression = sUnitPropertyPath ? bindingExpression(sUnitPropertyPath) : \"\";\n\n\tconst oExpressionTemplate = formatResult([fieldValueExpression, TargetExpression, UnitExpression], valueFormatters.computePercentage);\n\n\treturn compileBinding(oExpressionTemplate);\n};\n"]}

package/packages/sap.fe.macros/src/sap/fe/macros/internal/helpers/DataPointTemplating.js

@@ -2,4 +2,4 @@
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/fe/core/formatters/ValueFormatter","sap/fe/core/templating/UIFormatters","sap/fe/core/templating/DataModelPathHelper","sap/fe/core/helpers/BindingExpression","sap/fe/core/templating/PropertyHelper","sap/ui/model/odata/v4/AnnotationHelper"],function(v,U,D,B,P,A){"use strict";var _={};var g=P.getAssociatedUnitPropertyPath;var u=B.unresolveableExpression;var b=B.bindingExpression;var c=B.compileBinding;var f=B.formatResult;var a=B.annotationExpression;var d=D.getPathRelativeLocation;var e=D.enhanceDataModelPath;var h=U.getBindingWithUnitOrCurrency;var E=U.EDM_TYPE_MAPPING;var j=U.getDisplayMode;function o(i,C){var F=Object.keys(i);if(Object.getOwnPropertySymbols){var G=Object.getOwnPropertySymbols(i);if(C){G=G.filter(function(H){return Object.getOwnPropertyDescriptor(i,H).enumerable;});}F.push.apply(F,G);}return F;}function k(C){for(var i=1;i<arguments.length;i++){var F=arguments[i]!=null?arguments[i]:{};if(i%2){o(Object(F),true).forEach(function(G){l(C,G,F[G]);});}else if(Object.getOwnPropertyDescriptors){Object.defineProperties(C,Object.getOwnPropertyDescriptors(F));}else{o(Object(F)).forEach(function(G){Object.defineProperty(C,G,Object.getOwnPropertyDescriptor(F,G));});}}return C;}function l(i,C,F){if(C in i){Object.defineProperty(i,C,{value:F,enumerable:true,configurable:true,writable:true});}else{i[C]=F;}return i;}var m=function(i){return i!==null&&i!==void 0&&i.TargetValue?a(i.TargetValue):u;};var r=sap.ui.getCore().getLibraryResourceBundle("sap.fe.macros");var p=function(i){var C;var F=(i===null||i===void 0?void 0:(C=i.targetObject)===null||C===void 0?void 0:C.Value)||"";var G=d(i.contextLocation,i.navigationProperties).map(function(O){return O.name;});var H=a(F,G);var T=m(i.targetObject);if(H&&T){var I=F!==null&&F!==void 0&&F.$target?g(F===null||F===void 0?void 0:F.$target):undefined;if(!I){var J,K,L,M;var N=(J=F.$target)===null||J===void 0?void 0:(K=J.annotations)===null||K===void 0?void 0:(L=K.Measures)===null||L===void 0?void 0:(M=L.Unit)===null||M===void 0?void 0:M.charAt(0);if(N==="%"){return c(H)+" %";}else{return r.getText("T_COMMON_PROGRESS_INDICATOR_DISPLAY_VALUE_NO_UOM",[c(H),c(T)]);}}else{return r.getText("T_COMMON_PROGRESS_INDICATOR_DISPLAY_VALUE_NO_UOM",[c(H),c(T)])+" "+c(b(I));}}return undefined;};_.progressIndicatorDisplayValue=p;var n=function(C,S){if(S){return q(A.value(S,{context:C}));}};var q=function(S){if(S){var i=S>1?r.getText("T_ANNOTATION_HELPER_RATING_INDICATOR_SUBTITLE_LABEL_PLURAL"):r.getText("T_ANNOTATION_HELPER_RATING_INDICATOR_SUBTITLE_LABEL");return r.getText("T_ANNOTATION_HELPER_RATING_INDICATOR_SUBTITLE",[String(S),i]);}};var s=function(C,i){if(i&&i.SampleSize){return n(C,i.SampleSize);}else if(i&&i.Description){var M=A.value(i.Description,{context:C});return"${path:"+M+"}";}};s.requiresIContext=true;_.getHeaderRatingIndicatorText=s;var t=function(i){var C,F,G;if(i!==null&&i!==void 0&&(C=i.$target)!==null&&C!==void 0&&(F=C.annotations)!==null&&F!==void 0&&(G=F.Common)!==null&&G!==void 0&&G.Text){var H,I,J;var T=a(i===null||i===void 0?void 0:(H=i.$target)===null||H===void 0?void 0:(I=H.annotations)===null||I===void 0?void 0:(J=I.Common)===null||J===void 0?void 0:J.Text);T.parameters={"$$noPatch":true};return T;}return undefined;};var w=function(i,C,N){if(!i.constraints){i.constraints={};}i.constraints=Object.assign(i.constraints,{precision:C.$target.precision,scale:N?N:C.$target.scale});return i;};var x=function(i,C,F,N){var G;var H;var I=(C===null||C===void 0?void 0:(G=C.path)===null||G===void 0?void 0:G.indexOf("/"))===-1?d(i.contextLocation,i.navigationProperties).map(function(K){return K.name;}):[];H=a(C,I);if(F){var J;H.type=(J=E[F])===null||J===void 0?void 0:J.type;}switch(F){case"Edm.Decimal":H=w(H,C,N);break;case"Edm.String":if(!H.formatOptions){H.formatOptions={};}if(!H.constraints){H.constraints={};}H.formatOptions.parseKeepsEmptyString=true;break;default:}return H;};var y=function(i,C,F,M){var G,H,I,J,K,L,N;var O=i.targetObject;var Q=(O===null||O===void 0?void 0:O.Value)||"";var R=C.formatOptions;var S=t(Q);var T=Q===null||Q===void 0?void 0:(G=Q.$target)===null||G===void 0?void 0:G.type;var V;if(T==="Edm.Decimal"&&O.ValueFormat){if(O.ValueFormat.NumberOfFractionalDigits){V=O.ValueFormat.NumberOfFractionalDigits;}}var W=e(i,Q.path);var X=x(W,Q,T,V);var Y=S?R.displayMode||j(Q,W):"Value";var Z;switch(Y){case"Description":Z=S;break;case"ValueDescription":Z=f([X,S],v.formatWithBrackets);break;case"DescriptionValue":Z=f([S,X],v.formatWithBrackets);break;default:if((H=W.targetObject)!==null&&H!==void 0&&(I=H.annotations)!==null&&I!==void 0&&(J=I.Measures)!==null&&J!==void 0&&J.Unit||(K=W.targetObject)!==null&&K!==void 0&&(L=K.annotations)!==null&&L!==void 0&&(N=L.Measures)!==null&&N!==void 0&&N.ISOCurrency){Z=h(W,X);if(Z&&M&&(F===null||F===void 0?void 0:F.measureDisplayMode)!=="ReadOnly"){Z.formatOptions=k(k({},Z.formatOptions),{},{showMeasure:false});}}else{Z=X;}}return c(Z);};_.buildFieldBindingExpression=y;var z=function(i){var C;var F=(i===null||i===void 0?void 0:(C=i.targetObject)===null||C===void 0?void 0:C.Value)||"";var G=d(i.contextLocation,i.navigationProperties).map(function(L){return L.name;});var H=a(F,G);var T=m(i.targetObject);var I=F!==null&&F!==void 0&&F.$target?g(F.$target):undefined;var J=I?b(I):"";var K=f([H,T,J],v.computePercentage);return c(K);};_.buildExpressionForProgressIndicatorPercentValue=z;return _;},false);
+sap.ui.define(["sap/fe/core/formatters/ValueFormatter","sap/fe/core/templating/UIFormatters","sap/fe/core/templating/DataModelPathHelper","sap/fe/core/helpers/BindingExpression","sap/fe/core/templating/PropertyHelper","sap/ui/model/odata/v4/AnnotationHelper"],function(v,U,D,B,P,A){"use strict";var _={};var g=P.getAssociatedUnitPropertyPath;var u=B.unresolveableExpression;var b=B.bindingExpression;var c=B.compileBinding;var f=B.formatResult;var a=B.annotationExpression;var d=D.getPathRelativeLocation;var e=D.enhanceDataModelPath;var h=U.formatWithTypeInformation;var j=U.getBindingWithUnitOrCurrency;var E=U.EDM_TYPE_MAPPING;var k=U.getDisplayMode;function o(i,F){var G=Object.keys(i);if(Object.getOwnPropertySymbols){var H=Object.getOwnPropertySymbols(i);if(F){H=H.filter(function(I){return Object.getOwnPropertyDescriptor(i,I).enumerable;});}G.push.apply(G,H);}return G;}function l(F){for(var i=1;i<arguments.length;i++){var G=arguments[i]!=null?arguments[i]:{};if(i%2){o(Object(G),true).forEach(function(H){m(F,H,G[H]);});}else if(Object.getOwnPropertyDescriptors){Object.defineProperties(F,Object.getOwnPropertyDescriptors(G));}else{o(Object(G)).forEach(function(H){Object.defineProperty(F,H,Object.getOwnPropertyDescriptor(G,H));});}}return F;}function m(i,F,G){if(F in i){Object.defineProperty(i,F,{value:G,enumerable:true,configurable:true,writable:true});}else{i[F]=G;}return i;}var n=function(i){return i!==null&&i!==void 0&&i.TargetValue?a(i.TargetValue):u;};var r=sap.ui.getCore().getLibraryResourceBundle("sap.fe.macros");var p=function(i){var F;var G=(i===null||i===void 0?void 0:(F=i.targetObject)===null||F===void 0?void 0:F.Value)||"";var H=d(i.contextLocation,i.navigationProperties).map(function(Q){return Q.name;});var I=a(G,H);var T=n(i.targetObject);if(I&&T){var J=G!==null&&G!==void 0&&G.$target?g(G===null||G===void 0?void 0:G.$target):undefined;if(!J){var K,L,M,N;var O=(K=G.$target)===null||K===void 0?void 0:(L=K.annotations)===null||L===void 0?void 0:(M=L.Measures)===null||M===void 0?void 0:(N=M.Unit)===null||N===void 0?void 0:N.charAt(0);if(O==="%"){return c(I)+" %";}else{return r.getText("T_COMMON_PROGRESS_INDICATOR_DISPLAY_VALUE_NO_UOM",[c(I),c(T)]);}}else{return r.getText("T_COMMON_PROGRESS_INDICATOR_DISPLAY_VALUE_NO_UOM",[c(I),c(T)])+" "+c(b(J));}}return undefined;};_.progressIndicatorDisplayValue=p;var q=function(i,S){if(S){return s(A.value(S,{context:i}));}};var s=function(S){if(S){var i=S>1?r.getText("T_ANNOTATION_HELPER_RATING_INDICATOR_SUBTITLE_LABEL_PLURAL"):r.getText("T_ANNOTATION_HELPER_RATING_INDICATOR_SUBTITLE_LABEL");return r.getText("T_ANNOTATION_HELPER_RATING_INDICATOR_SUBTITLE",[String(S),i]);}};var t=function(i,F){if(F&&F.SampleSize){return q(i,F.SampleSize);}else if(F&&F.Description){var M=A.value(F.Description,{context:i});return"${path:"+M+"}";}};t.requiresIContext=true;_.getHeaderRatingIndicatorText=t;var w=function(i){var F,G,H;if(i!==null&&i!==void 0&&(F=i.$target)!==null&&F!==void 0&&(G=F.annotations)!==null&&G!==void 0&&(H=G.Common)!==null&&H!==void 0&&H.Text){var I,J,K;var T=a(i===null||i===void 0?void 0:(I=i.$target)===null||I===void 0?void 0:(J=I.annotations)===null||J===void 0?void 0:(K=J.Common)===null||K===void 0?void 0:K.Text);T.parameters={"$$noPatch":true};return T;}return undefined;};var x=function(i,F,N){if(!i.constraints){i.constraints={};}i.constraints=Object.assign(i.constraints,{precision:F.$target.precision,scale:N?N:F.$target.scale});return i;};var y=function(i,F,G,N){var H;var I;var J=(F===null||F===void 0?void 0:(H=F.path)===null||H===void 0?void 0:H.indexOf("/"))===-1?d(i.contextLocation,i.navigationProperties).map(function(M){return M.name;}):[];I=a(F,J);var K=i.targetObject;if(G){var L;h(K,I);I.type=(L=E[G])===null||L===void 0?void 0:L.type;}switch(G){case"Edm.Decimal":I=x(I,F,N);break;default:}return I;};var z=function(i,F,G,M){var H,I,J,K,L,N,O;var Q=i.targetObject;var R=(Q===null||Q===void 0?void 0:Q.Value)||"";var S=F.formatOptions;var T=w(R);var V=R===null||R===void 0?void 0:(H=R.$target)===null||H===void 0?void 0:H.type;var W;if(V==="Edm.Decimal"&&Q.ValueFormat){if(Q.ValueFormat.NumberOfFractionalDigits){W=Q.ValueFormat.NumberOfFractionalDigits;}}var X=e(i,R.path);var Y=y(X,R,V,W);var Z=T?S.displayMode||k(R,X):"Value";var $;switch(Z){case"Description":$=T;break;case"ValueDescription":$=f([Y,T],v.formatWithBrackets);break;case"DescriptionValue":$=f([T,Y],v.formatWithBrackets);break;default:if((I=X.targetObject)!==null&&I!==void 0&&(J=I.annotations)!==null&&J!==void 0&&(K=J.Measures)!==null&&K!==void 0&&K.Unit||(L=X.targetObject)!==null&&L!==void 0&&(N=L.annotations)!==null&&N!==void 0&&(O=N.Measures)!==null&&O!==void 0&&O.ISOCurrency){$=j(X,Y);if($&&M&&(G===null||G===void 0?void 0:G.measureDisplayMode)!=="ReadOnly"){$.formatOptions=l(l({},$.formatOptions),{},{showMeasure:false});}}else{$=Y;}}return c($);};_.buildFieldBindingExpression=z;var C=function(i){var F;var G=(i===null||i===void 0?void 0:(F=i.targetObject)===null||F===void 0?void 0:F.Value)||"";var H=d(i.contextLocation,i.navigationProperties).map(function(M){return M.name;});var I=a(G,H);var T=n(i.targetObject);var J=G!==null&&G!==void 0&&G.$target?g(G.$target):undefined;var K=J?b(J):"";var L=f([I,T,K],v.computePercentage);return c(L);};_.buildExpressionForProgressIndicatorPercentValue=C;return _;},false);

package/packages/sap.fe.macros/src/sap/fe/macros/internal/helpers/DataPointTemplating.ts

@@ -1,5 +1,10 @@
 import valueFormatters from "sap/fe/core/formatters/ValueFormatter";
-import { getDisplayMode, EDM_TYPE_MAPPING, getBindingWithUnitOrCurrency } from "sap/fe/core/templating/UIFormatters";
+import {
+	getDisplayMode,
+	EDM_TYPE_MAPPING,
+	getBindingWithUnitOrCurrency,
+	formatWithTypeInformation
+} from "sap/fe/core/templating/UIFormatters";
 
 import { DataModelObjectPath, enhanceDataModelPath, getPathRelativeLocation } from "sap/fe/core/templating/DataModelPathHelper";
 import {
@@ -16,6 +21,8 @@ import {
 
 import { getAssociatedUnitPropertyPath } from "sap/fe/core/templating/PropertyHelper";
 
+import { Property } from "@sap-ux/annotation-converter";
+
 import { AnnotationHelper } from "sap/ui/model/odata/v4";
 
 export type DataPointFormatOptions = Partial<{
@@ -136,7 +143,9 @@ const getValueFormatted = (
 			  )
 			: [];
 	outExpression = annotationExpression(fieldValue, relativeLocation);
+	const oPropertyDefinition = oPropertyDataModelPath.targetObject as Property;
 	if (sPropertyType) {
+		formatWithTypeInformation(oPropertyDefinition, outExpression);
 		outExpression.type = EDM_TYPE_MAPPING[sPropertyType]?.type;
 	}
 	switch (sPropertyType) {
@@ -145,15 +154,6 @@ const getValueFormatted = (
 			// for the facets of the OP, the decimal fields are formatted by returning a promise, so we manage all the cases
 			outExpression = getDecimalFormat(outExpression, fieldValue, sNumberOfFractionalDigits);
 			break;
-		case "Edm.String":
-			if (!outExpression.formatOptions) {
-				outExpression.formatOptions = {};
-			}
-			if (!outExpression.constraints) {
-				outExpression.constraints = {};
-			}
-			outExpression.formatOptions.parseKeepsEmptyString = true;
-			break;
 		default:
 	}
 	return outExpression as BindingExpressionExpression<string>;

package/packages/sap.fe.macros/src/sap/fe/macros/internal/valuehelp/TableDelegate-dbg.js

@@ -16,7 +16,8 @@ sap.ui.define(
 		"sap/ui/model/FilterOperator",
 		"sap/base/Log",
 		"sap/fe/macros/DelegateUtil",
-		"sap/fe/core/helpers/ModelHelper"
+		"sap/fe/core/helpers/ModelHelper",
+		"sap/fe/core/CommonUtils"
 	],
 	function(
 		TableDelegate,
@@ -30,7 +31,8 @@ sap.ui.define(
 		FilterOperator,
 		Log,
 		MacrosDelegateUtil,
-		ModelHelper
+		ModelHelper,
+		CommonUtils
 	) {
 		"use strict";
 
@@ -177,7 +179,7 @@ sap.ui.define(
 				}
 
 				// get the basic search
-				oBindingInfo.parameters.$search = oFilter.getSearch() || undefined;
+				oBindingInfo.parameters.$search = CommonUtils.normalizeSearchTerm(oFilter.getSearch()) || undefined;
 			}
 			// add select to oBindingInfo (BCP 2170163012)
 			oBindingInfo.parameters.$select = aTableProperties.reduce(function(sQuery, oProperty) {

package/packages/sap.fe.macros/src/sap/fe/macros/internal/valuehelp/TableDelegate.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/mdc/odata/v4/TableDelegate","sap/ui/core/Core","sap/ui/mdc/util/FilterUtil","sap/ui/mdc/odata/v4/util/DelegateUtil","sap/ui/mdc/odata/v4/FilterBarDelegate","sap/ui/mdc/odata/v4/ODataMetaModelUtil","sap/ui/mdc/odata/v4/TypeUtil","sap/ui/model/Filter","sap/ui/model/FilterOperator","sap/base/Log","sap/fe/macros/DelegateUtil","sap/fe/core/helpers/ModelHelper"],function(T,C,F,D,a,O,b,c,d,L,M,e){"use strict";var f=Object.assign({},T);f.fetchProperties=function(t){var m=this._getModel(t);var p;if(!m){p=new Promise(function(r){t.attachModelContextChange({resolver:r},o,this);}.bind(this)).then(function(m){return this._createPropertyInfos(t,m);}.bind(this));}else{p=this._createPropertyInfos(t,m);}return p.then(function(P){if(t.data){t.data("$tablePropertyInfo",P);}return P;});};function o(E,g){var t=E.getSource();var m=this._getModel(t);if(m){t.detachModelContextChange(o);g.resolver(m);}}f._createPropertyInfos=function(t,m){var g=t.getDelegate().payload;var p=[];var E="/"+g.collectionName;var h=m.getMetaModel();return h.requestObject(E+"@").then(function(i){var s=i["@Org.OData.Capabilities.V1.SortRestrictions"]||{};var S=O.getSortRestrictionsInfo(s);var j=i["@Org.OData.Capabilities.V1.FilterRestrictions"];var k=O.getFilterRestrictionsInfo(j);var l=M.getCustomData(t,"columns");l.customData.forEach(function(n){p.push({name:n.path,path:n.path,label:n.label,sortable:S[n.path]?S[n.path].sortable:n.sortable,filterable:k[n.path]?k[n.path].filterable:n.filterable,typeConfig:M.isTypeFilterable(n.$Type)?t.getTypeUtil().getTypeConfig(n.$Type):undefined,maxConditions:O.isMultiValueFilterExpression(k.propertyInfo[n.path])?-1:1});});return p;});};f.updateBindingInfo=function(m,g,B){T.updateBindingInfo.apply(this,[m,g,B]);if(!m){return;}if(g&&B){B.path=B.path||g.collectionPath||"/"+g.collectionName;B.model=B.model||g.model;}if(!B){B={};}var h=C.byId(m.getFilter()),i=m.isFilteringEnabled(),j;var I,k;var l=[];var t=m.data("$tablePropertyInfo");if(i){j=m.getConditions();I=F.getFilterInfo(m,j,t);if(I.filters){l.push(I.filters);}}if(h){j=h.getConditions();if(j){var p=D.getParameterNames(h);k=F.getFilterInfo(h,j,t,p);if(k.filters){l.push(k.filters);}var P=D.getParametersInfo(h,j);if(P){B.path=P;}}B.parameters.$search=h.getSearch()||undefined;}B.parameters.$select=t.reduce(function(q,n){if(n.path&&n.path.indexOf("/")===-1){q=q?q+","+n.path:n.path;}return q;},"");if(e.isDraftSupported(m.getModel().getMetaModel(),B.path)){l.push(new c("IsActiveEntity",d.EQ,true));}B.filters=new c(l,true);};f.getFilterDelegate=function(){return a;};f.getTypeUtil=function(p){return b;};f._getModel=function(t){var m=t.getDelegate().payload;return t.getModel(m.model);};return f;});
+sap.ui.define(["sap/ui/mdc/odata/v4/TableDelegate","sap/ui/core/Core","sap/ui/mdc/util/FilterUtil","sap/ui/mdc/odata/v4/util/DelegateUtil","sap/ui/mdc/odata/v4/FilterBarDelegate","sap/ui/mdc/odata/v4/ODataMetaModelUtil","sap/ui/mdc/odata/v4/TypeUtil","sap/ui/model/Filter","sap/ui/model/FilterOperator","sap/base/Log","sap/fe/macros/DelegateUtil","sap/fe/core/helpers/ModelHelper","sap/fe/core/CommonUtils"],function(T,C,F,D,a,O,b,c,d,L,M,e,f){"use strict";var g=Object.assign({},T);g.fetchProperties=function(t){var m=this._getModel(t);var p;if(!m){p=new Promise(function(r){t.attachModelContextChange({resolver:r},o,this);}.bind(this)).then(function(m){return this._createPropertyInfos(t,m);}.bind(this));}else{p=this._createPropertyInfos(t,m);}return p.then(function(P){if(t.data){t.data("$tablePropertyInfo",P);}return P;});};function o(E,h){var t=E.getSource();var m=this._getModel(t);if(m){t.detachModelContextChange(o);h.resolver(m);}}g._createPropertyInfos=function(t,m){var h=t.getDelegate().payload;var p=[];var E="/"+h.collectionName;var i=m.getMetaModel();return i.requestObject(E+"@").then(function(j){var s=j["@Org.OData.Capabilities.V1.SortRestrictions"]||{};var S=O.getSortRestrictionsInfo(s);var k=j["@Org.OData.Capabilities.V1.FilterRestrictions"];var l=O.getFilterRestrictionsInfo(k);var n=M.getCustomData(t,"columns");n.customData.forEach(function(q){p.push({name:q.path,path:q.path,label:q.label,sortable:S[q.path]?S[q.path].sortable:q.sortable,filterable:l[q.path]?l[q.path].filterable:q.filterable,typeConfig:M.isTypeFilterable(q.$Type)?t.getTypeUtil().getTypeConfig(q.$Type):undefined,maxConditions:O.isMultiValueFilterExpression(l.propertyInfo[q.path])?-1:1});});return p;});};g.updateBindingInfo=function(m,h,B){T.updateBindingInfo.apply(this,[m,h,B]);if(!m){return;}if(h&&B){B.path=B.path||h.collectionPath||"/"+h.collectionName;B.model=B.model||h.model;}if(!B){B={};}var i=C.byId(m.getFilter()),j=m.isFilteringEnabled(),k;var I,l;var n=[];var t=m.data("$tablePropertyInfo");if(j){k=m.getConditions();I=F.getFilterInfo(m,k,t);if(I.filters){n.push(I.filters);}}if(i){k=i.getConditions();if(k){var p=D.getParameterNames(i);l=F.getFilterInfo(i,k,t,p);if(l.filters){n.push(l.filters);}var P=D.getParametersInfo(i,k);if(P){B.path=P;}}B.parameters.$search=f.normalizeSearchTerm(i.getSearch())||undefined;}B.parameters.$select=t.reduce(function(q,r){if(r.path&&r.path.indexOf("/")===-1){q=q?q+","+r.path:r.path;}return q;},"");if(e.isDraftSupported(m.getModel().getMetaModel(),B.path)){n.push(new c("IsActiveEntity",d.EQ,true));}B.filters=new c(n,true);};g.getFilterDelegate=function(){return a;};g.getTypeUtil=function(p){return b;};g._getModel=function(t){var m=t.getDelegate().payload;return t.getModel(m.model);};return g;});

package/packages/sap.fe.macros/src/sap/fe/macros/internal/valuehelp/ValueListHelper-dbg.js

@@ -59,14 +59,25 @@ sap.ui.define(
 			});
 		}
 
-		function _entityIsSearchable(oValueListInfo) {
-			var oCollectionAnnotations =
+		function _entityIsSearchable(oValueListInfo, oPropertyAnnotations) {
+			var bSearchSupported =
+					oPropertyAnnotations["@com.sap.vocabularies.Common.v1.ValueList"] &&
+					oPropertyAnnotations["@com.sap.vocabularies.Common.v1.ValueList"].SearchSupported,
+				oCollectionAnnotations =
 					oValueListInfo.valueListInfo.$model.getMetaModel().getObject("/" + oValueListInfo.valueListInfo.CollectionPath + "@") ||
 					{},
 				bSearchable =
 					oCollectionAnnotations["@Org.OData.Capabilities.V1.SearchRestrictions"] &&
 					oCollectionAnnotations["@Org.OData.Capabilities.V1.SearchRestrictions"].Searchable;
-			return bSearchable === undefined ? true : bSearchable;
+
+			if (
+				(bSearchable === undefined && bSearchSupported === false) ||
+				(bSearchable === true && bSearchSupported === false) ||
+				bSearchable === false
+			) {
+				return false;
+			}
+			return true;
 		}
 
 		function _getCachedValueHelp(sValueHelpId) {
@@ -804,6 +815,22 @@ sap.ui.define(
 								}
 							}
 						});
+						// Find DescriptionPath in column definition if not add it
+						if (
+							sDescriptionPath &&
+							aColumnDefs.findIndex(function(oColumn) {
+								return oColumn.path === sDescriptionPath;
+							}) === -1
+						) {
+							var oColumnDef = {
+								path: sDescriptionPath,
+								label: sDescriptionPath,
+								sortable: false,
+								filterable: false,
+								$Type: "Edm.String"
+							};
+							aColumnDefs.push(oColumnDef);
+						}
 						return {
 							keyValue: sKey,
 							descriptionValue: sDescriptionPath,
@@ -875,6 +902,10 @@ sap.ui.define(
 					sWrapperId = oWrapper && oWrapper.getId(),
 					sValueHelpId = oFVH.getModel("_VHUI").getProperty("/valueHelpId"),
 					that = this;
+				var oPropertyAnnotations = oFVH
+					.getModel()
+					.getMetaModel()
+					.getObject(propertyPath + "@");
 
 				//Only do this in case of context dependent value helps or other VH called the first time
 				if ((!oTable || sValueHelpId !== undefined) && sFVHClass.indexOf("FieldValueHelp") > -1) {
@@ -882,7 +913,7 @@ sap.ui.define(
 					oFVH.setTitle(oValueListInfo.valueListInfo.Label);
 					oFVH.setKeyPath(oValueListInfo.keyValue);
 					oFVH.setDescriptionPath(oValueListInfo.descriptionValue);
-					oFVH.setFilterFields(_entityIsSearchable(oValueListInfo) ? "$search" : "");
+					oFVH.setFilterFields(_entityIsSearchable(oValueListInfo, oPropertyAnnotations) ? "$search" : "");
 				}
 				var oSourceModel = new JSONModel({
 					id: sValueHelpId || oFVH.getId(),
@@ -972,6 +1003,10 @@ sap.ui.define(
 					sFVHClass = oFVH.getMetadata().getName(),
 					sValueHelpId = oFVH.getModel("_VHUI").getProperty("/valueHelpId"),
 					that = this;
+				var oPropertyAnnotations = oFVH
+					.getModel()
+					.getMetaModel()
+					.getObject(propertyPath + "@");
 
 				//Only do this in case of context dependent value helps or other VH called the first time
 				if ((!oTable || sValueHelpId !== undefined) && sFVHClass.indexOf("FieldValueHelp") > -1) {
@@ -979,7 +1014,7 @@ sap.ui.define(
 					oFVH.setTitle(oValueListInfo.valueListInfo.Label);
 					oFVH.setKeyPath(oValueListInfo.keyValue);
 					oFVH.setDescriptionPath(oValueListInfo.descriptionValue);
-					oFVH.setFilterFields(_entityIsSearchable(oValueListInfo) ? "$search" : "");
+					oFVH.setFilterFields(_entityIsSearchable(oValueListInfo, oPropertyAnnotations) ? "$search" : "");
 				}
 				var oSourceModel = new JSONModel({
 					id: sValueHelpId || oFVH.getId(),
@@ -1002,6 +1037,7 @@ sap.ui.define(
 				return Promise.all([oTable]).then(function(aControls) {
 					var sTableWidth,
 						oTable = aControls[0];
+
 					if (oTable) {
 						oTable.setModel(oValueListInfo.valueListInfo.$model);
 						var oBinding = oTable.getBinding("items");
@@ -1009,12 +1045,36 @@ sap.ui.define(
 							BusyLocker.lock(oTable);
 						});
 						oBinding.attachEvent("dataReceived", function(oEvent) {
+							var sParentId = oFVH.getParent().getId();
+							var oMessageManager = sap.ui.getCore().getMessageManager();
 							if (BusyLocker.isLocked(oTable)) {
 								BusyLocker.unlock(oTable);
 							}
+							// Handle messages related to input with invalid token
 							if (oEvent.getParameter("error")) {
-								// show the unbound messages but with a timeout as the messages are otherwise not yet in the message model
-								setTimeout(messageHandling.showUnboundMessages, 0);
+								var sErrorMessage = oEvent.getParameter("error").error.message;
+								var _updateMessage = function(oMessage) {
+									if (sParentId.indexOf("APD_::") === 0 && sErrorMessage === oMessage.message) {
+										oMessage.target = sParentId;
+										oFVH._oConditions.$search = undefined;
+									}
+									return oMessage;
+								};
+								// use timeout as the messages are otherwise not yet in the message model
+								setTimeout(function() {
+									messageHandling.getMessages().forEach(function(oMessage) {
+										_updateMessage(oMessage);
+									});
+								}, 0);
+							} else {
+								oMessageManager
+									.getMessageModel()
+									.getData()
+									.forEach(function(oMessage) {
+										if (oMessage.target.includes(sParentId) && oMessage.controlIds.length === 0) {
+											oMessage.target = "";
+										}
+									});
 							}
 						});
 
@@ -1249,7 +1309,11 @@ sap.ui.define(
 					return;
 				}
 				return ValueListHelper.getValueListInfo(oFVH, oMetaModel, propertyPath, sConditionModel).then(function(oValueListInfo) {
-					oValueListInfo && oFVH.setFilterFields(_entityIsSearchable(oValueListInfo) ? "$search" : "");
+					var oPropertyAnnotations = oFVH
+						.getModel()
+						.getMetaModel()
+						.getObject(propertyPath + "@");
+					oValueListInfo && oFVH.setFilterFields(_entityIsSearchable(oValueListInfo, oPropertyAnnotations) ? "$search" : "");
 				});
 			},
 			getColumnWidth: function(sDataFieldType, oValueList) {