@sapui5/sap.fe.templates 1.101.1 → 1.102.2

package/src/sap/fe/templates/ListReport/overrides/ViewState.ts

@@ -92,7 +92,11 @@ const ViewStateOverride: any = {
 			}
 			aStateControls.push(oTable);
 		});
-
+		if (oController._getControls("Chart")) {
+			oController._getControls("Chart").forEach(function (oChart: any) {
+				aStateControls.push(oChart);
+			});
+		}
 		if (oController._hasMultiVisualizations()) {
 			aStateControls.push(oController._getSegmentedButton(TemplateContentView.Chart));
 			aStateControls.push(oController._getSegmentedButton(TemplateContentView.Table));
@@ -175,6 +179,8 @@ const ViewStateOverride: any = {
 							} else {
 								bPreventInitialSearch = this._preventInitialSearch(oFilterBarVM);
 							}
+							// reset the suspend selection on filter bar to allow loading of data when needed (was set on LR Init)
+							oFilterBarControl.setSuspendSelection(false);
 							this._bSearchTriggered = !bPreventInitialSearch;
 							oDynamicPage.setHeaderExpanded(system.desktop || bPreventInitialSearch);
 						}

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

@@ -13,15 +13,15 @@
 	controllerName="sap.fe.templates.ObjectPage.ObjectPageController"
 	template:require="{
 				MODEL: 'sap/ui/model/odata/v4/AnnotationHelper',
-				OP: 'sap/fe/templates/ObjectPage/AnnotationHelper',
+				OP: 'sap/fe/templates/ObjectPage/ObjectPageTemplating',
 				CONTACT: 'sap/fe/macros/ContactHelper',
-				OPTemplating: 'sap/fe/templates/ObjectPage/templating/ObjectPageTemplating',
-				UI: 'sap/fe/core/templating/UIFormatters'
+				UI: 'sap/fe/core/templating/UIFormatters',
+				COMMON: 'sap/fe/macros/CommonHelper'
 			}"
 >
 	<template:with path="entitySet>./" var="entityType">
 		<template:with path="entityType>@com.sap.vocabularies.UI.v1.HeaderInfo" var="headerInfo">
-		<!-- OPLayout binding contains explicit $select for SAP__Messages or the path from @Common.Messages until model provides an alternative.
+			<!-- OPLayout binding contains explicit $select for SAP__Messages or the path from @Common.Messages until model provides an alternative.
 		This is to enable side effects to request messages. -->
 			<uxap:ObjectPageLayout
 				id="fe::ObjectPage"
@@ -67,12 +67,157 @@
 						enabled="{= OP.getDeleteCommandExecutionEnabled(${converterContext>header/actions}) }"
 						command="DeleteObject"
 					/>
-					<control:CommandExecution execute="._saveDocument(${$view>/getBindingContext})" visible="{ui>/isEditable}" command="Save" />
+					<control:CommandExecution
+						execute="._saveDocument(${$view>/getBindingContext})"
+						visible="{ui>/isEditable}"
+						command="Save"
+					/>
 					<control:CommandExecution
 						execute="._cancelDocument(${$view>/getBindingContext},{cancelButton:'fe::FooterBar::StandardAction::Cancel'})"
 						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:elseif>
+								</template:if>
+							</template:if>
+						</template:repeat>
+					</template:if>
 				</uxap:dependents>
 				<template:if test="{converterContext>header/visible}">
 					<template:with path="converterContext>header" var="header">
@@ -80,20 +225,20 @@
 							<uxap:ObjectPageDynamicHeaderTitle primaryArea="Begin" areaShrinkRatio="0:0:1">
 								<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.Heading" type="XML" />
 								<uxap:expandedContent>
-								<FlexBox>
-									<template:if test="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description}">
-									<Label
-												text="{= OPTemplating.getExpressionForDescription(${headerInfo>@@UI.getConverterContext}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
+									<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>
-								</FlexBox>
+										</template:if>
+									</FlexBox>
 								</uxap:expandedContent>
 								<uxap:snappedContent>
 									<FlexBox>
 										<template:if test="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description}">
 											<Label
-												text="{= OPTemplating.getExpressionForDescription(${headerInfo>@@UI.getConverterContext}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
+												text="{= OP.getExpressionForDescription(${headerInfo>@@UI.getConverterContext}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
 												wrapping="true"
 											/>
 										</template:if>
@@ -101,11 +246,13 @@
 								</uxap:snappedContent>
 								<uxap:content>
 									<template:if test="{entitySet>@com.sap.vocabularies.Common.v1.DraftRoot}">
-										<macro:DraftIndicator DraftIndicatorType="IconOnly" class="sapUiTinyMarginBegin sapMTB sapMTBNewFlex" entitySet="{entitySet>}" />
-									</template:if>
-									<template:if test="{header>situations}">
-										<internal:SituationsIndicator xmlns:internal="sap.fe.macros.internal" entitySet="{entitySet>}" />
+										<macro:DraftIndicator
+											DraftIndicatorType="IconOnly"
+											class="sapUiTinyMarginBegin sapMTB sapMTBNewFlex"
+											entitySet="{entitySet>}"
+										/>
 									</template:if>
+									<SituationsIndicator xmlns="sap.fe.macros.internal.situations" entitySet="{entitySet>}" />
 								</uxap:content>
 								<uxap:navigationActions>
 									<template:if test="{= ${viewData>/viewLevel} > 1}">
@@ -125,8 +272,7 @@
 										visible="{= OP.getVisibleExpressionForBreadcrumbs(${viewData>/}) }"
 										modelContextChange="._setBreadcrumbLinks(${$source>/})"
 										id="fe::Breadcrumbs"
-									>
-									</Breadcrumbs>
+									/>
 								</uxap:breadcrumbs>
 							</uxap:ObjectPageDynamicHeaderTitle>
 						</uxap:headerTitle>