@sapui5/sap.fe.templates 1.103.0 → 1.106.0

package/src/sap/fe/templates/ObjectPage/ObjectPage.view.xml

@@ -10,14 +10,16 @@
 	xmlns:fe="sap.fe.templates.controls"
 	xmlns:dt="sap.ui.dt"
 	xmlns:macro="sap.fe.macros"
+	xmlns:internalMacro="sap.fe.macros.internal"
 	controllerName="sap.fe.templates.ObjectPage.ObjectPageController"
 	template:require="{
 				MODEL: 'sap/ui/model/odata/v4/AnnotationHelper',
 				OP: 'sap/fe/templates/ObjectPage/ObjectPageTemplating',
-				CONTACT: 'sap/fe/macros/ContactHelper',
+				CONTACT: 'sap/fe/macros/contact/ContactHelper',
 				UI: 'sap/fe/core/templating/UIFormatters',
 				COMMON: 'sap/fe/macros/CommonHelper',
-				COMMONFORMATTERS: 'sap/fe/core/templating/CommonFormatters'
+				COMMONFORMATTERS: 'sap/fe/core/templating/CommonFormatters',
+				DATAFIELDHELPER : 'sap/fe/core/converters/helpers/DataFieldHelper'
 			}"
 >
 	<template:with path="entitySet>./" var="entityType">
@@ -78,147 +80,46 @@
 						visible="{ui>/isEditable}"
 						command="Cancel"
 					/>
-					<template:if test="{converterContext>header/actions}">
-						<template:repeat list="{converterContext>header/actions}" var="headerAction">
-							<template:if test="{= ${headerAction>type} === 'Menu' }">
-								<template:then>
-									<template:repeat list="{headerAction>menu}" var="menuItemAction">
-										<template:if test="{menuItemAction>command}">
-											<template:with path="menuItemAction>annotationPath" var="dataField">
-												<template:if test="{= ${menuItemAction>type} === 'ForAction'}">
-													<template:then>
-														<control:CommandExecution
-															execute="{= OP.getPressExpressionForEdit(${dataField>}, ${entitySet>@sapui.name}, ${headerAction>}) }"
-															enabled="{menuItemAction>enabled}"
-															visible="{menuItemAction>visible}"
-															command="{menuItemAction>command}"
-														/>
-													</template:then>
-													<template:elseif test="{= ${menuItemAction>type} === 'ForNavigation'}">
-														<control:CommandExecution
-															execute="{menuItemAction>press}"
-															enabled="{menuItemAction>enabled}"
-															visible="{menuItemAction>visible}"
-															command="{menuItemAction>command}"
-														/>
-													</template:elseif>
-													<template:else>
-														<control:CommandExecution
-															core:require="{FPM: 'sap/fe/core/helpers/FPMHelper'}"
-															execute="{= COMMON.buildActionWrapper(${menuItemAction>}, ${headerAction>})}"
-															visible="{menuItemAction>visible}"
-															enabled="{menuItemAction>enabled}"
-															command="{menuItemAction>command}"
-														/>
-													</template:else>
-												</template:if>
-											</template:with>
-										</template:if>
-									</template:repeat>
-								</template:then>
-								<template:elseif test="{headerAction>command}">
-									<template:with path="headerAction>annotationPath" var="dataField">
-										<template:if test="{= ${headerAction>type} === 'ForNavigation'}">
-											<template:then>
-												<control:CommandExecution
-													execute="{headerAction>press}"
-													enabled="{headerAction>enabled}"
-													visible="{headerAction>visible}"
-													command="{headerAction>command}"
-												/>
-											</template:then>
-											<template:elseif test="{= ${headerAction>type} === 'ForAction'}">
-												<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="{= !(${dataField>./@com.sap.vocabularies.UI.v1.Hidden} === true) &amp;&amp; (${isBound>$IsBound} !== true || ${actionContext>@Org.OData.Core.V1.OperationAvailable} !== false) }"
-															>
-																<control:CommandExecution
-																	execute="{= OP.getPressExpressionForEdit(${dataField>}, ${entitySet>@sapui.name}, ${headerAction>}) }"
-																	enabled="{headerAction>enabled}"
-																	visible="{headerAction>visible}"
-																	command="{headerAction>command}"
-																/>
-															</template:if>
-														</template:with>
-													</template:with>
-												</template:if>
-											</template:elseif>
-											<template:else>
-												<control:CommandExecution
-													core:require="{FPM: 'sap/fe/core/helpers/FPMHelper'}"
-													execute="{= COMMON.buildActionWrapper(${headerAction>})}"
-													enabled="{headerAction>enabled}"
-													visible="{headerAction>visible}"
-													command="{headerAction>command}"
-												/>
-											</template:else>
-										</template:if>
-									</template:with>
-								</template:elseif>
-							</template:if>
-						</template:repeat>
-					</template:if>
-					<template:if test="{converterContext>footerActions}">
-						<template:repeat list="{converterContext>footerActions}" var="footerAction">
-							<template:if test="{footerAction>command}">
-								<template:if test="{= ${footerAction>type} === 'ForAction'}">
-									<template:then>
-										<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: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 }"
-															>
-																<control:CommandExecution
-																	execute="{= OP.getPressExpressionForFooterAnnotationAction(${dataField>}, ${entitySet>@sapui.name}, ${footerAction>}) }"
-																	visible="{footerAction>visible}"
-																	enabled="{footerAction>enabled}"
-																	command="{footerAction>command}"
-																/>
-															</template:if>
-														</template:with>
-													</template:with>
-												</template:if>
-											</template:if>
-										</template:with>
-									</template:then>
-									<template:elseif test="{= OP.isManifestAction(${footerAction>}) }">
-										<control:CommandExecution
-											core:require="{FPM: 'sap/fe/core/helpers/FPMHelper'}"
-											execute="{= COMMON.buildActionWrapper(${footerAction>})}"
-											visible="{footerAction>visible}"
-											enabled="{footerAction>enabled}"
-											command="{footerAction>command}"
+					<template:repeat list="{converterContext>headerCommandActions}" var="headerAction">
+						<template:with path="headerAction>annotationPath" var="dataField">
+							<template:with path="dataField>Action" helper="COMMON.getActionContext" var="actionContext">
+								<template:with path="dataField>Action" helper="COMMON.getPathToBoundActionOverload" var="isBound">
+									<template:if
+										test="{= ${headerAction>type} === 'ForAction' ? ((${isBound>$IsBound} !== true || ${actionContext>@Org.OData.Core.V1.OperationAvailable} !== false) &amp;&amp; ${dataField>Determining} !== true) : true }"
+									>
+										<internalMacro:ActionCommand
+											action="{headerAction>}"
+											onExecuteAction="{= OP.getPressExpressionForEdit(${dataField>}, ${entitySet>@sapui.name}, ${headerAction>}) }"
+											onExecuteIBN="{headerAction>press}"
+											onExecuteManifest="{= COMMON.buildActionWrapper(${headerAction>})}"
+											isIBNEnabled="{headerAction>enabled}"
+											isActionEnabled="{headerAction>enabled}"
+										/>
+									</template:if>
+								</template:with>
+							</template:with>
+						</template:with>
+					</template:repeat>
+					<template:repeat list="{converterContext>footerCommandActions}" var="footerAction">
+						<template:with path="footerAction>annotationPath" var="dataField">
+							<template:with path="dataField>Action" helper="COMMON.getActionContext" var="actionContext">
+								<template:with path="dataField>Action" helper="COMMON.getPathToBoundActionOverload" var="isBound">
+									<template:if
+										test="{= ${footerAction>type} === 'ForAction' ? ((${isBound>$IsBound} !== true || ${actionContext>@Org.OData.Core.V1.OperationAvailable} !== false) &amp;&amp; ${dataField>Determining} === true) : true }"
+									>
+										<internalMacro:ActionCommand
+											action="{footerAction>}"
+											onExecuteAction="{= OP.getPressExpressionForFooterAnnotationAction(${dataField>}, ${entitySet>@sapui.name}, ${footerAction>}) }"
+											onExecuteIBN="{footerAction>press}"
+											onExecuteManifest="{= COMMON.buildActionWrapper(${footerAction>})}"
+											isIBNEnabled="{footerAction>enabled}"
+											isActionEnabled="{footerAction>enabled}"
 										/>
-									</template:elseif>
-								</template:if>
-							</template:if>
-						</template:repeat>
-					</template:if>
+									</template:if>
+								</template:with>
+							</template:with>
+						</template:with>
+					</template:repeat>
 				</uxap:dependents>
 				<template:if test="{converterContext>header/visible}">
 					<template:with path="converterContext>header" var="header">
@@ -228,20 +129,28 @@
 								<uxap:expandedContent>
 									<FlexBox>
 										<template:if test="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description}">
-											<Label
-												text="{= OP.getExpressionForDescription(${headerInfo>@@UI.getConverterContext}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
-												wrapping="true"
-											/>
+											<template:if
+												test="{= !DATAFIELDHELPER.isHeaderStaticallyHidden(${headerInfo>Description@@UI.getDataModelObjectPath})}"
+											>
+												<Label
+													text="{= OP.getExpressionForDescription(${headerInfo>@@UI.getConverterContext}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
+													wrapping="true"
+												/>
+											</template:if>
 										</template:if>
 									</FlexBox>
 								</uxap:expandedContent>
 								<uxap:snappedContent>
 									<FlexBox>
 										<template:if test="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description}">
-											<Label
-												text="{= OP.getExpressionForDescription(${headerInfo>@@UI.getConverterContext}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
-												wrapping="true"
-											/>
+											<template:if
+												test="{= !DATAFIELDHELPER.isHeaderStaticallyHidden(${headerInfo>Description@@UI.getDataModelObjectPath})}"
+											>
+												<Label
+													text="{= OP.getExpressionForDescription(${headerInfo>@@UI.getConverterContext}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
+													wrapping="true"
+												/>
+											</template:if>
 										</template:if>
 									</FlexBox>
 								</uxap:snappedContent>
@@ -284,7 +193,7 @@
 									unittest:id="FlexBoxTest"
 									dt:designtime="sap/fe/templates/ObjectPage/designtime/FlexBox.designtime"
 									wrap="Wrap"
-									fitContainer="true"
+									fitContainer="false"
 									alignItems="Stretch"
 								>
 									<template:if test="{header>avatar}">