@sapui5/sap.fe.templates 1.101.0 → 1.103.0

package/src/sap/fe/templates/ObjectPage/view/fragments/EditableHeaderFacet.fragment.xml

@@ -11,7 +11,7 @@
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
 	xmlns:formdata="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
 	template:require="{
-		OP: 'sap/fe/templates/ObjectPage/AnnotationHelper',
+		OP: 'sap/fe/templates/ObjectPage/ObjectPageTemplating',
 		MODEL: 'sap/ui/model/odata/v4/AnnotationHelper',
 		FIELD: 'sap/fe/macros/field/FieldHelper',
 		ID: 'sap/fe/core/helpers/StableIdHelper',
@@ -37,9 +37,11 @@
 			<f:FormContainer
 				unittest:id="HeaderInfoFormContainerTest"
 				id="fe::EditableHeaderForm::EditableHeaderInfo"
-				title="{sap.fe.i18n>T_COMMON_OBJECT_PAGE_OBJECT_INFO}"
 				visible="{= OP.getVisiblityOfHeaderFacet(${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Title/Value/$Path@},${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description/Value/$Path@},${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Title/Value/$Path@@FIELD.fieldControl},${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description/Value/$Path@@FIELD.fieldControl}) }"
 			>
+				<f:title>
+					<core:Title level="H4" text="{sap.fe.i18n>T_COMMON_OBJECT_PAGE_OBJECT_INFO}" />
+				</f:title>
 				<f:dependents>
 					<macro:ValueHelp
 						idPrefix="fe::EditableHeaderForm::EditableHeaderTitle::FieldValueHelp"
@@ -71,25 +73,25 @@
 						</f:fields>
 					</f:FormElement>
 					<template:if test="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description}">
-					<f:FormElement id="fe::EditableHeaderForm::EditableHeaderDescription">
-						<f:label>
-							<Label text="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description/@@MODEL.label}">
-								<layoutData>
-									<f:ColumnElementData cellsLarge="12" />
-								</layoutData>
-							</Label>
-						</f:label>
-						<f:fields>
-							<internalMacro:Field
+						<f:FormElement id="fe::EditableHeaderForm::EditableHeaderDescription">
+							<f:label>
+								<Label text="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description/@@MODEL.label}">
+									<layoutData>
+										<f:ColumnElementData cellsLarge="12" />
+									</layoutData>
+								</Label>
+							</f:label>
+							<f:fields>
+								<internalMacro:Field
 									idPrefix="fe::EditableHeaderForm::EditableHeaderDescription"
 									vhIdPrefix="fe::EditableHeaderForm::EditableHeaderDescription::FieldValueHelp"
 									entitySet="{entitySet>}"
 									dataField="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description}"
 								>
-								<internalMacro:formatOptions textAlignMode="Form" showEmptyIndicator="true" />
-							</internalMacro:Field>
-						</f:fields>
-					</f:FormElement>
+									<internalMacro:formatOptions textAlignMode="Form" showEmptyIndicator="true" />
+								</internalMacro:Field>
+							</f:fields>
+						</f:FormElement>
 					</template:if>
 				</f:formElements>
 			</f:FormContainer>
@@ -111,6 +113,7 @@
 															id="{= ${formContainer>id} ? ID.generate(['fe', 'HeaderFacet', 'FormContainer', ${formContainer>id} ]) : undefined }"
 															designtimeSettings="{= ${subSection>flexSettings/designtime} === 'Default' ? 'sap/fe/macros/FormContainer.designtime' : ${subSection>flexSettings/designtime}}"
 															title="{facet>@@MODEL.label}"
+															titleLevel="H4"
 															displayMode="Edit"
 															entitySet="{targetEntitySet>}"
 															navigationPath="{= MODEL.getNavigationPath(${facet>Target/$AnnotationPath}) ? MODEL.getNavigationPath(${facet>Target/$AnnotationPath}) : ''}"
@@ -124,6 +127,7 @@
 														id="{= ${formContainer>id} ? ID.generate(['fe', 'HeaderFacet', 'FormContainer', ${formContainer>id} ]) : undefined }"
 														designtimeSettings="{= ${subSection>flexSettings/designtime} === 'Default' ? 'sap/fe/macros/FormContainer.designtime' : ${subSection>flexSettings/designtime}}"
 														title="{facet>@@MODEL.label}"
+														titleLevel="H4"
 														displayMode="Edit"
 														entitySet="{entitySet>}"
 														dataFieldCollection="{formContainer>formElements}"
@@ -137,10 +141,14 @@
 								<template:else>
 									<f:FormContainer
 										id="{= ${subSection>id} ? ID.generate([${subSection>id}, 'CustomFormContainer', ${subSection>}]) : undefined }"
-										title="{subSection>title}"
 										visible="{subSection>visible}"
 										dt:designtime="{= ${subSection>flexSettings/designtime} === 'Default' ? 'sap/ui/layout/designtime/form/FormContainer.designtime' : ${subSection>flexSettings/designtime}}"
 									>
+										<template:if test="{subSection>title}">
+											<f:title>
+												<core:Title level="H4" text="{subSection>title}" />
+											</f:title>
+										</template:if>
 										<f:formElements>
 											<fpm:CustomFragment
 												id="{= ${subSection>id} ? ID.generate([${subSection>id}, 'CustomFragment', ${subSection>}]) : undefined }"

package/src/sap/fe/templates/ObjectPage/view/fragments/FooterContent.fragment.xml

@@ -6,24 +6,24 @@
 	xmlns:core="sap.ui.core"
 	template:require="{
 							 ID: 'sap/fe/core/helpers/StableIdHelper',
-						 	 CORE: 'sap/fe/core/AnnotationHelper',
 							 MODEL: 'sap/ui/model/odata/v4/AnnotationHelper',
-							 OP: 'sap/fe/templates/ObjectPage/AnnotationHelper',
+							 OP: 'sap/fe/templates/ObjectPage/ObjectPageTemplating',
 							 COMMON: 'sap/fe/macros/CommonHelper',
 							 UI: 'sap/fe/core/templating/UIFormatters',
-							 CRIT: 'sap/fe/core/templating/CriticalityFormatters',
-							 OPTemplating: 'sap/fe/templates/ObjectPage/templating/ObjectPageTemplating'
+							 CRIT: 'sap/fe/core/templating/CriticalityFormatters'
 							}"
 >
-
 	<OverflowToolbar
 		unittest:id="OverflowToolbarTest"
 		id="fe::FooterBar"
 		asyncMode="true"
-		visible="{= CORE.getFooterVisible(${converterContext>footerActions}, ${entityType>./@com.sap.vocabularies.UI.v1.Identification})}"
+		visible="{= OP.getFooterVisible(${converterContext>footerActions}, ${entityType>./@com.sap.vocabularies.UI.v1.Identification})}"
 	>
-			<core:InvisibleText id="fe::FooterBar::MessageButton::AriaText" text="{sap.fe.i18n>C_COMMON_SAPFE_ERROR_MESSAGES_PAGE_BUTTON_ARIA_TEXT}" />
-			<common:MessageButton
+		<core:InvisibleText
+			id="fe::FooterBar::MessageButton::AriaText"
+			text="{sap.fe.i18n>C_COMMON_SAPFE_ERROR_MESSAGES_PAGE_BUTTON_ARIA_TEXT}"
+		/>
+		<common:MessageButton
 			id="fe::FooterBar::MessageButton"
 			messageChange="_getFooterVisibility"
 			ariaLabelledBy="fe::FooterBar::MessageButton::AriaText"
@@ -31,12 +31,12 @@
 			ariaHasPopup="Dialog"
 		/>
 		<ToolbarSpacer />
-			<template:if
+		<template:if
 			test="{= ${entitySet>@com.sap.vocabularies.Common.v1.DraftRoot} || ${entitySet>@com.sap.vocabularies.Common.v1.DraftNode}
 			 					|| COMMON.isDraftParentEntityForContainment(${entitySet>$ContainsTarget}, undefined, ${converterContext>}) }"
 		>
-				<DraftIndicator state="{ui>/draftStatus}" />
-			</template:if>
+			<DraftIndicator state="{ui>/draftStatus}" />
+		</template:if>
 		<template:if test="{converterContext>footerActions}">
 			<template:repeat list="{converterContext>footerActions}" var="footerAction">
 				<template:if test="{= ${footerAction>type} === 'DefaultApply'}">
@@ -45,7 +45,7 @@
 							unittest:id="ApplyActionTest"
 							id="fe::FooterBar::StandardAction::Apply"
 							text="{sap.fe.i18n>T_COMMON_OBJECT_PAGE_APPLY_DRAFT}"
-							type="{path: 'entitySet>./@com.sap.vocabularies.UI.v1.Identification', formatter: 'CORE.buildEmphasizedButtonExpression'}"
+							type="{path: 'entitySet>./@com.sap.vocabularies.UI.v1.Identification', formatter: 'OP.buildEmphasizedButtonExpression'}"
 							enabled="true"
 							press="._applyDocument(${$view>/getBindingContext})"
 							visible="{ui>/isEditable}"
@@ -54,22 +54,26 @@
 					<template:elseif test="{= ${footerAction>type} === 'ForAction'}">
 						<template:with path="footerAction>annotationPath" var="dataField">
 							<template:if test="{= !(${dataField>./@com.sap.vocabularies.UI.v1.Hidden} === true) }">
-								<template:if test="{= ${dataField>$Type} === 'com.sap.vocabularies.UI.v1.DataFieldForAction' &amp;&amp; ${dataField>Determining} === true}">
+								<template:if
+									test="{= ${dataField>$Type} === 'com.sap.vocabularies.UI.v1.DataFieldForAction' &amp;&amp; ${dataField>Determining} === true}"
+								>
 									<template:with path="dataField>Action" helper="COMMON.getActionContext" var="actionContext">
-									<template:with path="dataField>Action" helper="COMMON.getPathToBoundActionOverload" var="isBound">
-									<template:if test="{= ${isBound>$IsBound} !== true || ${actionContext>@Org.OData.Core.V1.OperationAvailable} !== false }">
-										<Button
+										<template:with path="dataField>Action" helper="COMMON.getPathToBoundActionOverload" var="isBound">
+											<template:if
+												test="{= ${isBound>$IsBound} !== true || ${actionContext>@Org.OData.Core.V1.OperationAvailable} !== false }"
+											>
+												<Button
 													unittest:id="AnnotationActionTest"
 													id="{= ID.generate(['fe', 'FooterBar', ${dataField>}] )}"
 													text="{dataField>Label}"
 													ariaHasPopup="{actionContext>@@COMMON.isDialog}"
-													press="{= OP.getPressExpressionForFooterAnnotationAction(${dataField>}, ${entitySet>@sapui.name}, ${footerAction>}) }"
+													press="{= ${footerAction>command} ? ('cmd:' + ${footerAction>command}) : OP.getPressExpressionForFooterAnnotationAction(${dataField>}, ${entitySet>@sapui.name}, ${footerAction>}) }"
 													visible="{footerAction>visible}"
 													enabled="{footerAction>enabled}"
 													type="{= CRIT.buildExpressionForCriticalityButtonType(${dataField>@@UI.getDataModelObjectPath}) }"
 												/>
-									</template:if>
-									</template:with>
+											</template:if>
+										</template:with>
 									</template:with>
 								</template:if>
 							</template:if>
@@ -79,9 +83,9 @@
 						<Button
 							unittest:id="PrimaryActionTest"
 							id="fe::FooterBar::StandardAction::Save"
-							text="{= OPTemplating.getExpressionForSaveButton(${viewData>}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
+							text="{= OP.getExpressionForSaveButton(${viewData>}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
 							tooltip="{= COMMON.getTooltipForKeyboardShortcuts(${sap.fe.i18n>T_KEYBOARD_SHORTCUT_SAVE_WIN}, ${sap.fe.i18n>T_KEYBOARD_SHORTCUT_SAVE_MAC})}"
-							type="{path: 'entitySet>./@com.sap.vocabularies.UI.v1.Identification', formatter: 'CORE.buildEmphasizedButtonExpression'}"
+							type="{path: 'entitySet>./@com.sap.vocabularies.UI.v1.Identification', formatter: 'OP.buildEmphasizedButtonExpression'}"
 							visible="{ui>/isEditable}"
 							enabled="true"
 							press="cmd:Save"
@@ -91,7 +95,7 @@
 						<Button
 							unittest:id="SecondaryActionTest"
 							id="fe::FooterBar::StandardAction::Cancel"
-							text="{sap.fe.i18n>C_COMMON_OBJECT_PAGE_CANCEL}"
+							text="{= ${entitySet>@com.sap.vocabularies.Common.v1.DraftRoot} ? ${sap.fe.i18n>C_COMMON_OBJECT_PAGE_DISCARD_DRAFT} : ${sap.fe.i18n>C_COMMON_OBJECT_PAGE_CANCEL} }"
 							press="cmd:Cancel"
 							visible="{ui>/isEditable}"
 							ariaHasPopup="Dialog"
@@ -102,13 +106,13 @@
 							</layoutData>
 						</Button>
 					</template:elseif>
-					<template:elseif test="{= CORE.isManifestAction(${footerAction>}) }">
+					<template:elseif test="{= OP.isManifestAction(${footerAction>}) }">
 						<Button
 							unittest:id="ManifestActionTest"
 							core:require="{FPM: 'sap/fe/core/helpers/FPMHelper'}"
 							id="{= ID.generate(['fe','FooterBar',${footerAction>id}])}"
 							text="{footerAction>text}"
-							press="{= CORE.buildActionWrapper(${footerAction>})}"
+							press="{= ${footerAction>command} ? ('cmd:' + ${footerAction>command}) : COMMON.buildActionWrapper(${footerAction>})}"
 							type="Transparent"
 							visible="{footerAction>visible}"
 							enabled="{footerAction>enabled}"

package/src/sap/fe/templates/ObjectPage/view/fragments/FormActionButtons.fragment.xml

@@ -4,11 +4,10 @@
 	xmlns="sap.m"
 	xmlns:core="sap.ui.core"
 	template:require="{
-		CORE: 'sap/fe/core/AnnotationHelper',
 		ID: 'sap/fe/core/helpers/StableIdHelper',
 		COMMON: 'sap/fe/macros/CommonHelper'
 	}"
->	
+>
 	<template:if test="{= ${action>type} === 'Menu'}">
 		<template:then>
 			<MenuButton
@@ -22,41 +21,41 @@
 				<menu>
 					<Menu>
 						<template:repeat list="{action>menu}" var="menuItemAction">
-								<template:if test="{= ${menuItemAction>type} === 'Default'}">
-									<template:then>
-										<MenuItem
+							<template:if test="{= ${menuItemAction>type} === 'Default'}">
+								<template:then>
+									<MenuItem
 										core:require="{FPM: 'sap/fe/core/helpers/FPMHelper'}"
 										id="{= ID.generate(['fe',${menuItemAction>id}])}"
 										text="{menuItemAction>text}"
-										press="{= CORE.buildActionWrapper(${menuItemAction>})}"
+										press="{= ${menuItemAction>command} ? ('cmd:' + ${menuItemAction>command}) : COMMON.buildActionWrapper(${menuItemAction>})}"
 										visible="{menuItemAction>visible}"
 										enabled="{menuItemAction>enabled}"
-									/>	
-									</template:then>
-									<template:else>
-										<MenuItem
+									/>
+								</template:then>
+								<template:else>
+									<MenuItem
 										id="{menuItemAction>id}"
 										binding="{menuItemAction>binding}"
 										text="{menuItemAction>text}"
-										press="{menuItemAction>press}"
+										press="{= ${menuItemAction>command} ? ('cmd:' + ${menuItemAction>command}) : ${menuItemAction>press}}"
 										ariaHasPopup="{menuItemAction>requiresDialog}"
 										visible="{menuItemAction>visible}"
 										enabled="{menuItemAction>enabled}"
 										macrodata:IBNData="{menuItemAction>customData}"
 									/>
-									</template:else>
-								</template:if>
+								</template:else>
+							</template:if>
 						</template:repeat>
 					</Menu>
 				</menu>
 			</MenuButton>
-		</template:then>				
+		</template:then>
 		<template:elseif test="{= ${action>type} === 'Default'}">
 			<Button
 				core:require="{FPM: 'sap/fe/core/helpers/FPMHelper'}"
 				id="{= ID.generate(['fe',${action>id}])}"
 				text="{action>text}"
-				press="{= CORE.buildActionWrapper(${action>})}"
+				press="{= ${action>command} ? ('cmd:' + ${action>command}) : COMMON.buildActionWrapper(${action>})}"
 				type="Transparent"
 				visible="{action>visible}"
 				enabled="{action>enabled}"
@@ -67,7 +66,7 @@
 				id="{action>id}"
 				binding="{action>binding}"
 				text="{action>text}"
-				press="{action>press}"
+				press="{= ${action>command} ? ('cmd:' + ${action>command}) : ${action>press}}"
 				type="{action>buttonType}"
 				ariaHasPopup="{action>requiresDialog}"
 				visible="{action>visible}"

package/src/sap/fe/templates/ObjectPage/view/fragments/FormActions.fragment.xml

@@ -3,9 +3,6 @@
 	xmlns="sap.m"
 	xmlns:core="sap.ui.core"
 	xmlns:uxap="sap.uxap"
-	template:require="{
-		AH: 'sap/fe/templates/ObjectPage/AnnotationHelper'
-	}"
 >
 	<!--
 		This Fragment renders Action buttons in Sections.
@@ -17,8 +14,7 @@
 	 -->
 	<uxap:actions>
 		<template:repeat list="{subSection>actions}" var="action">
-						<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.FormActionButtons" type="XML" />
+			<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.FormActionButtons" type="XML" />
 		</template:repeat>
 	</uxap:actions>
-
 </core:FragmentDefinition>

package/src/sap/fe/templates/ObjectPage/view/fragments/HeaderDataPoint.fragment.xml

@@ -6,7 +6,7 @@
 	xmlns:unittest="http://schemas.sap.com/sapui5/preprocessorextension/sap.fe.unittesting/1"
 	template:require="{
 		ID: 'sap/fe/core/helpers/StableIdHelper',
-		OP: 'sap/fe/templates/ObjectPage/AnnotationHelper',
+		OP: 'sap/fe/templates/ObjectPage/ObjectPageTemplating',
 		MODEL: 'sap/ui/model/odata/v4/AnnotationHelper',
 		MESSAGE: 'sap/base/strings/formatMessage',
 		FIELD: 'sap/fe/macros/field/FieldHelper',
@@ -14,7 +14,6 @@
 		UI: 'sap/fe/core/templating/UIFormatters'
 	}"
 >
-
 	<VBox
 		id="{= ID.generate(['fe', 'HeaderFacet', ${converterHeaderFacet>headerDataPointData/type} !== 'Content' ? ${converterHeaderFacet>headerDataPointData/type} : 'KeyFigure', { Facet: ${headerFacet>} }]) }"
 	>

package/src/sap/fe/templates/ObjectPage/view/fragments/HeaderDataPointTitle.fragment.xml

@@ -8,7 +8,7 @@
 		MODEL: 'sap/ui/model/odata/v4/AnnotationHelper',
 		COMMON: 'sap/fe/macros/CommonHelper',
 		FIELD: 'sap/fe/macros/field/FieldHelper',
-		OP: 'sap/fe/templates/ObjectPage/AnnotationHelper'
+		OP: 'sap/fe/templates/ObjectPage/ObjectPageTemplating'
 	}"
 >
 	<template:if
@@ -44,8 +44,6 @@
 				class="sapUiTinyMarginBottom"
 				visible="{= COMMON.getHeaderDataPointLinkVisibility(ID.generate(['fe', 'HeaderDPLink', ${converterHeaderFacet>targetAnnotationValue}]), false, ${dataPoint>@@FIELD.isNotAlwaysHidden}) }"
 			/>
-
-
 		</template:then>
 		<template:elseif
 			test="{= ${viewData>controlConfiguration}[${converterHeaderFacet>targetAnnotationValue}]['navigation']['targetSections'] }"

package/src/sap/fe/templates/ObjectPage/view/fragments/HeaderFacet.fragment.xml

@@ -10,9 +10,8 @@
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
 	template:require="{
 		MODEL: 'sap/ui/model/odata/v4/AnnotationHelper',
-		CORE: 'sap/fe/core/AnnotationHelper',
 		COMMON: 'sap/fe/macros/CommonHelper',
-		OP: 'sap/fe/templates/ObjectPage/AnnotationHelper',
+		OP: 'sap/fe/templates/ObjectPage/ObjectPageTemplating',
 		ID: 'sap/fe/core/helpers/StableIdHelper'
 	}"
 >
@@ -35,7 +34,7 @@
 			</template:then>
 			<template:elseif test="{= ${converterHeaderFacet>targetAnnotationType} === 'Chart'}">
 				<template:with path="headerFacet>Target/$AnnotationPath" var="collection" helper="MODEL.resolve$Path">
-					<template:with path="collection>" var="collection" helper="CORE.getNavigationContext">
+					<template:with path="collection>" var="collection" helper="COMMON.getNavigationContext">
 						<internalMacro:MicroChart
 							unittest:id="macroMicroChart"
 							id="{= ID.generate(['fe', 'HeaderFacet', 'MicroChart', { Facet: ${headerFacet>} }]) }"
@@ -57,20 +56,7 @@
 				</template:with>
 			</template:elseif>
 			<template:elseif test="{= ${converterHeaderFacet>targetAnnotationType} === 'Contact'}">
-				<template:with path="headerFacet>Target/$AnnotationPath" var="collection" helper="MODEL.resolve$Path">
-					<template:with path="collection>" var="collection" helper="CORE.getNavigationContext">
-						<VBox id="{= ID.generate(['fe', 'HeaderFacet', 'Contact', { Facet: ${headerFacet>} }]) }" displayInline="true">
-							<template:if test="{headerFacet>@@MODEL.label}">
-								<Title text="{headerFacet>@@MODEL.label}" class="sapUiSmallMarginBottom" />
-							</template:if>
-							<template:with path="headerFacet>Target/$AnnotationPath" var="contact">
-								<template:with path="headerFacet>Target/$AnnotationPath@@COMMON.getMetaPath" var="contactPath">
-									<macro:Contact contact="{contact>}" visible="true" />
-								</template:with>
-							</template:with>
-						</VBox>
-					</template:with>
-				</template:with>
+				<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.ObjectPageHeaderContact" type="XML" />
 			</template:elseif>
 			<template:elseif test="{= ${converterHeaderFacet>targetAnnotationType} === 'Address'}">
 				<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.ObjectPageHeaderAddress" type="XML" />

package/src/sap/fe/templates/ObjectPage/view/fragments/Heading.fragment.xml

@@ -5,29 +5,28 @@
 	xmlns:unittest="http://schemas.sap.com/sapui5/preprocessorextension/sap.fe.unittesting/1"
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
 	template:require="{
-		OPTemplating: 'sap/fe/templates/ObjectPage/templating/ObjectPageTemplating',
 		UI: 'sap/fe/core/templating/UIFormatters'
 	}"
 >
 	<template:with path="entityType>@com.sap.vocabularies.UI.v1.HeaderInfo" var="headerInfo">
-	<template:with path="header>avatar" var="avatar">
-		<uxap:expandedHeading>
-			<FlexBox>
-				<FlexBox visible="{header>title/expandedImageVisible}">
+		<template:with path="header>avatar" var="avatar">
+			<uxap:expandedHeading>
+				<FlexBox>
+					<FlexBox visible="{header>title/expandedImageVisible}">
+						<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeadingAvatar" type="XML" />
+					</FlexBox>
+					<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeadingTitle" type="XML" />
+				</FlexBox>
+			</uxap:expandedHeading>
+			<uxap:snappedHeading>
+				<FlexBox>
 					<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeadingAvatar" type="XML" />
+					<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeadingTitle" type="XML" />
 				</FlexBox>
+			</uxap:snappedHeading>
+			<uxap:snappedTitleOnMobile>
 				<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeadingTitle" type="XML" />
-			</FlexBox>
-		</uxap:expandedHeading>
-		<uxap:snappedHeading>
-			<FlexBox>
-				<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeadingAvatar" type="XML" />
-				<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeadingTitle" type="XML" />
-			</FlexBox>
-		</uxap:snappedHeading>
-		<uxap:snappedTitleOnMobile>
-			<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeadingTitle" type="XML" />
-		</uxap:snappedTitleOnMobile>
-	</template:with>
+			</uxap:snappedTitleOnMobile>
+		</template:with>
 	</template:with>
 </core:FragmentDefinition>

package/src/sap/fe/templates/ObjectPage/view/fragments/HeadingTitle.fragment.xml

@@ -5,14 +5,15 @@
 	xmlns:unittest="http://schemas.sap.com/sapui5/preprocessorextension/sap.fe.unittesting/1"
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
 	template:require="{
-		OPTemplating: 'sap/fe/templates/ObjectPage/templating/ObjectPageTemplating',
+		OP: 'sap/fe/templates/ObjectPage/ObjectPageTemplating',
 		UI: 'sap/fe/core/templating/UIFormatters'
 	}"
 >
 	<template:with path="entityType>@com.sap.vocabularies.UI.v1.HeaderInfo" var="headerInfo">
-        <Title
-			text="{= OPTemplating.getExpressionForTitle(${headerInfo>@@UI.getConverterContext}, ${viewData>}, ${fullContextPath>@@UI.getDataModelObjectPath}, ${entitySet>@com.sap.vocabularies.Common.v1.DraftRoot})}"
+		<Title
+			text="{= OP.getExpressionForTitle(${headerInfo>@@UI.getConverterContext}, ${viewData>}, ${fullContextPath>@@UI.getDataModelObjectPath}, ${entitySet>@com.sap.vocabularies.Common.v1.DraftRoot})}"
 			wrapping="true"
+			level="H2"
 		/>
 	</template:with>
 </core:FragmentDefinition>

package/src/sap/fe/templates/ObjectPage/view/fragments/ObjectPageHeaderAddress.fragment.xml

@@ -13,8 +13,13 @@
 >
 	<template:with path="headerFacet>Target/$AnnotationPath/" var="addressPath">
 		<VBox id="{= ${converterHeaderFacet>headerFormData/id} }" displayInline="true">
-			<Title text="{headerFacet>Label}" />
-			<Text unittest:id="ObjectPageHeaderAddressTest" renderWhitespace="true" class="sapMLabel" text="{addressPath>label@@MODEL.format}" />
+			<Title level="H3" text="{headerFacet>Label}" />
+			<Text
+				unittest:id="ObjectPageHeaderAddressTest"
+				renderWhitespace="true"
+				class="sapMLabel"
+				text="{addressPath>label@@MODEL.format}"
+			/>
 		</VBox>
 	</template:with>
 </core:FragmentDefinition>

package/src/sap/fe/templates/ObjectPage/view/fragments/ObjectPageHeaderContact.fragment.xml

@@ -0,0 +1,26 @@
+<core:FragmentDefinition
+	xmlns="sap.m"
+	xmlns:core="sap.ui.core"
+	xmlns:macro="sap.fe.macros"
+	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
+	template:require="{
+		MODEL: 'sap/ui/model/odata/v4/AnnotationHelper',
+		COMMON: 'sap/fe/macros/CommonHelper',
+		ID: 'sap/fe/core/helpers/StableIdHelper'
+	}"
+>
+	<template:with path="headerFacet>Target/$AnnotationPath" var="collection" helper="MODEL.resolve$Path">
+		<template:with path="collection>" var="collection" helper="COMMON.getNavigationContext">
+			<VBox id="{= ID.generate(['fe', 'HeaderFacet', 'Contact', { Facet: ${headerFacet>} }]) }" displayInline="true">
+				<template:if test="{headerFacet>@@MODEL.label}">
+					<Title level="H3" text="{headerFacet>@@MODEL.label}" class="sapUiSmallMarginBottom" />
+				</template:if>
+				<template:with path="headerFacet>Target/$AnnotationPath" var="contact">
+					<template:with path="headerFacet>Target/$AnnotationPath@@COMMON.getMetaPath" var="contactPath">
+						<macro:Contact contact="{contact>}" visible="true" />
+					</template:with>
+				</template:with>
+			</VBox>
+		</template:with>
+	</template:with>
+</core:FragmentDefinition>

package/src/sap/fe/templates/ObjectPage/view/fragments/ObjectPageHeaderForm.fragment.xml

@@ -7,13 +7,13 @@
 	template:require="{
 		MODEL: 'sap/ui/model/odata/v4/AnnotationHelper',
 		ID: 'sap/fe/core/helpers/StableIdHelper',
-		OP: 'sap/fe/templates/ObjectPage/AnnotationHelper',
+		OP: 'sap/fe/templates/ObjectPage/ObjectPageTemplating',
 		FIELD: 'sap/fe/macros/field/FieldHelper'
 	}"
 >
 	<VBox id="{= ${converterHeaderFacet>headerFormData/id} }" displayInline="true">
 		<template:if test="{converterHeaderFacet>headerFormData/label}">
-			<Title text="{converterHeaderFacet>headerFormData/label}" class="sapUiSmallMarginBottom" />
+			<Title level="H3" text="{converterHeaderFacet>headerFormData/label}" class="sapUiSmallMarginBottom" />
 		</template:if>
 		<template:if test="{= OP.doesFieldGroupContainOnlyOneMultiLineDataField(${converterHeaderFacet>headerFormData/formElements})}">
 			<template:then>
@@ -50,8 +50,8 @@
 										dataField="{dataField>}"
 										ariaLabelledBy="{= ID.generate([ ${formElement>idPrefix}, 'Label'])}"
 									>
-											<internalMacro:formatOptions textAlignMode="Form" showEmptyIndicator="true" />
-										</internalMacro:Field>
+										<internalMacro:formatOptions textAlignMode="Form" showEmptyIndicator="true" />
+									</internalMacro:Field>
 								</HBox>
 							</template:with>
 						</template:then>

package/src/sap/fe/templates/ObjectPage/view/fragments/RelatedApps.fragment.xml

@@ -3,8 +3,12 @@
 	xmlns:customData="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
 	xmlns:core="sap.ui.core"
 >
-
-	<MenuButton id="fe::RelatedApps" text="{sap.fe.i18n>T_OP_RELATED_APPS}" binding="{internal>relatedApps}" visible="{internal>visibility}">
+	<MenuButton
+		id="fe::RelatedApps"
+		text="{sap.fe.i18n>T_OP_RELATED_APPS}"
+		binding="{internal>relatedApps}"
+		visible="{internal>visibility}"
+	>
 		<menu>
 			<Menu items="{path: 'internal>items', sorter: { path: 'text' }}">
 				<items>
@@ -12,11 +16,10 @@
 						text="{internal>text}"
 						customData:targetSemObject="{internal>targetSemObject}"
 						customData:targetAction="{internal>targetAction}"
-						press="._intentBasedNavigation.navigate(${internal>targetSemObject}, ${internal>targetAction})"
+						press="._intentBasedNavigation.navigate(${internal>targetSemObject}, ${internal>targetAction}, ${internal>targetParams})"
 					/>
 				</items>
 			</Menu>
 		</menu>
 	</MenuButton>
-
 </core:FragmentDefinition>