@sapui5/sap.fe.templates 1.96.4 → 1.99.0

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

@@ -96,7 +96,11 @@
 							visible="{= ${ui>/editMode} === 'Editable' }"
 							ariaHasPopup="Dialog"
 							enabled="true"
-						/>
+						>
+							<layoutData>
+								<OverflowToolbarLayoutData priority="NeverOverflow" />
+							</layoutData>
+						</Button>
 					</template:elseif>
 					<template:elseif test="{= CORE.isManifestAction(${footerAction>}) }">
 						<Button

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

@@ -19,15 +19,22 @@
 				text="{sap.fe.i18n>T_HEADER_DATAPOINT_TITLE_LINK_EXTERNAL_ARIA}"
 				id="{= ID.generate(['fe', ${converterHeaderFacet>targetAnnotationValue}, 'AriaText']) }"
 			/>
-			<Link
-				unittest:id="headerDataPointLinkTest"
-				id="{= ID.generate(['fe', 'HeaderDPLink', ${converterHeaderFacet>targetAnnotationValue}]) }"
-				text="{dataPoint>Title@@MODEL.value}"
+			<Title
+				unittest:id="headerDataPointLinkTitleTest"
+				level="H3"
 				visible="{= COMMON.getHeaderDataPointLinkVisibility(ID.generate(['fe', 'HeaderDPLink', ${converterHeaderFacet>targetAnnotationValue}]), true, ${dataPoint>@@FIELD.isNotAlwaysHidden}) }"
-				press="{= OP.getPressExpressionForLink(${viewData>controlConfiguration}[${converterHeaderFacet>targetAnnotationValue}]['navigation'], ${manifest>/sap.app/crossNavigation/outbounds})}"
-				ariaDescribedBy="{= ID.generate(['fe', ${converterHeaderFacet>targetAnnotationValue}, 'AriaText']) }"
-				class="sapUiTinyMarginBottom"
-			/>
+			>
+				<content>
+					<Link
+						unittest:id="headerDataPointLinkInsideTitleTest"
+						id="{= ID.generate(['fe', 'HeaderDPLink', ${converterHeaderFacet>targetAnnotationValue}]) }"
+						text="{dataPoint>Title@@MODEL.value}"
+						press="{= OP.getPressExpressionForLink(${viewData>controlConfiguration}[${converterHeaderFacet>targetAnnotationValue}]['navigation'], ${manifest>/sap.app/crossNavigation/outbounds})}"
+						ariaDescribedBy="{= ID.generate(['fe', ${converterHeaderFacet>targetAnnotationValue}, 'AriaText']) }"
+						class="sapUiTinyMarginBottom"
+					/>
+				</content>
+			</Title>
 
 			<Title
 				unittest:id="headerDataPointTitleTest"
@@ -47,14 +54,17 @@
 				text="{sap.fe.i18n>T_COMMON_HEADERDP_TITLE_LINK_INPAGE_ARIA}"
 				id="{= ID.generate(['fe', ${converterHeaderFacet>targetAnnotationValue}, 'AriaText']) }"
 			/>
-			<Link
-				unittest:id="HeaderDataPointInternalLinkTest"
-				id="{= ID.generate(['fe', 'HeaderDPLink', ${headerFacet>Target/$AnnotationPath}]) }"
-				text="{dataPoint>Title@@MODEL.value}"
-				visible="{= !!${dataPoint>Title}}"
-				press="{= OP.getPressExpressionForLink(${viewData>controlConfiguration}[${converterHeaderFacet>targetAnnotationValue}]['navigation']) }"
-				ariaDescribedBy="{= ID.generate(['fe', ${converterHeaderFacet>targetAnnotationValue}, 'AriaText']) }"
-			/>
+			<Title level="H3" visible="{= !!${dataPoint>Title}}">
+				<content>
+					<Link
+						unittest:id="HeaderDataPointInternalLinkTest"
+						id="{= ID.generate(['fe', 'HeaderDPLink', ${headerFacet>Target/$AnnotationPath}]) }"
+						text="{dataPoint>Title@@MODEL.value}"
+						press="{= OP.getPressExpressionForLink(${viewData>controlConfiguration}[${converterHeaderFacet>targetAnnotationValue}]['navigation']) }"
+						ariaDescribedBy="{= ID.generate(['fe', ${converterHeaderFacet>targetAnnotationValue}, 'AriaText']) }"
+					/>
+				</content>
+			</Title>
 		</template:elseif>
 		<template:else>
 			<Title

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

@@ -0,0 +1,33 @@
+<core:FragmentDefinition
+	xmlns="sap.m"
+	xmlns:core="sap.ui.core"
+	xmlns:uxap="sap.uxap"
+	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}">
+					<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" />
+		</uxap:snappedTitleOnMobile>
+	</template:with>
+	</template:with>
+</core:FragmentDefinition>

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

@@ -0,0 +1,17 @@
+<core:FragmentDefinition
+	xmlns="sap.m"
+	xmlns:core="sap.ui.core"
+	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:if test="{avatar>}">
+        <Avatar
+			class="sapUiSmallMarginEnd"
+			src="{avatar>src}"
+			initials="{avatar>initials}"
+			fallbackIcon="{avatar>fallbackIcon}"
+			displayShape="{avatar>displayShape}"
+			displaySize="S"
+		/>
+	</template:if>
+</core:FragmentDefinition>

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

@@ -0,0 +1,18 @@
+<core:FragmentDefinition
+	xmlns="sap.m"
+	xmlns:core="sap.ui.core"
+	xmlns:uxap="sap.uxap"
+	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">
+        <Title
+			text="{= OPTemplating.getExpressionForTitle(${headerInfo>@@UI.getConverterContext}, ${viewData>}, ${fullContextPath>@@UI.getDataModelObjectPath}, ${entitySet>@com.sap.vocabularies.Common.v1.DraftRoot})}"
+			wrapping="true"
+		/>
+	</template:with>
+</core:FragmentDefinition>

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

@@ -3,12 +3,12 @@
 	xmlns="sap.m"
 	xmlns:internalMacro="sap.fe.macros.internal"
 	xmlns:core="sap.ui.core"
-	xmlns:l="sap.ui.layout"
 	xmlns:unittest="http://schemas.sap.com/sapui5/preprocessorextension/sap.fe.unittesting/1"
 	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/AnnotationHelper',
+		FIELD: 'sap/fe/macros/field/FieldHelper'
 	}"
 >
 	<VBox id="{= ${converterHeaderFacet>headerFormData/id} }" displayInline="true">
@@ -38,10 +38,10 @@
 									<Label
 										unittest:id="ObjectPageHeaderLabelTest"
 										id="{= ID.generate([ ${formElement>idPrefix}, 'Label'])}"
-										text="{formElement>label}:"
-										visible="{= ${formElement>label} ? 'true':'false'}"
+										text="{= ${dataField>@@FIELD.computeLabelText} + ':' }"
+										visible="{= !!${dataField>@@FIELD.computeLabelText} }"
 										class="sapUiTinyMarginEnd"
-										vAlign="{= ${formElement>isValueMultilineText} === true ? 'Middle' : 'Bottom' }"
+										vAlign="{= ${formElement>isValueMultilineText} === true ? 'Middle' : 'Inherit' }"
 									/>
 									<internalMacro:Field
 										idPrefix="{formElement>idPrefix}"

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

@@ -55,18 +55,36 @@
 							showTitle="{subSection>showTitle}"
 							visible="{subSection>visible}"
 						>
-							<uxap:customData>
+							<!--uxap:customData>
 								<core:CustomData key="strategyForVisibilityChange" value="lazyLoading" />
+							</uxap:customData-->
+							<uxap:customData>
 								<core:CustomData key="isVisibilityDynamic" value="{subSection>isVisibilityDynamic}" />
 							</uxap:customData>
 							<template:if test="{= ${subSection>type} === 'Mixed'}">
 								<template:then>
-									<template:repeat list="{subSection>content}" var="subSection">
-										<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContent" type="XML" />
-									</template:repeat>
+									<template:if test="{viewData>/useNewLazyLoading}">
+										<template:then>
+											<template:repeat list="{subSection>content}" var="subSection">
+												<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContentLazyLoader" type="XML" />
+											</template:repeat>
+										</template:then>
+										<template:else>
+											<template:repeat list="{subSection>content}" var="subSection">
+												<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContent" type="XML" />
+											</template:repeat>
+										</template:else>
+									</template:if>
 								</template:then>
 								<template:else>
-									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContent" type="XML" />
+									<template:if test="{viewData>/useNewLazyLoading}">
+										<template:then>
+											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContentLazyLoader" type="XML" />
+										</template:then>
+										<template:else>
+											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContent" type="XML" />
+										</template:else>
+									</template:if>
 								</template:else>
 							</template:if>
 						</uxap:ObjectPageSubSection>

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

@@ -0,0 +1,181 @@
+<core:FragmentDefinition
+	xmlns:uxap="sap.uxap"
+	xmlns:core="sap.ui.core"
+	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
+	xmlns:fpm="sap.fe.macros.fpm"
+	xmlns:macro="sap.fe.macros"
+	xmlns:layout="sap.ui.layout"
+	xmlns:dt="sap.ui.dt"
+	xmlns="sap.m"
+	xmlns:opcontrol="sap.fe.templates.ObjectPage.controls"
+	template:require="{
+		fpm: 'sap/fe/macros/fpm/fpm',
+		MODEL: 'sap/ui/model/odata/v4/AnnotationHelper',
+		OP: 'sap/fe/templates/ObjectPage/AnnotationHelper',
+		COMMON: 'sap/fe/macros/CommonHelper',
+		ID: 'sap/fe/core/helpers/StableIdHelper'
+	}"
+>
+		<!-- We want to ensure that statically non visible sections are non visible-->
+         <template:if test="{subSection>visible}">
+            <template:if test="{= ${subSection>type} === 'XMLFragment'}">
+                <template:then>
+                    <core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.FormActions" type="XML" />
+                    <uxap:blocks>
+						<uxap:ObjectPageLazyLoader stashed="true" id="{= ID.generate(['fe', ${subSection>key}])}">
+                        <opcontrol:SubSectionBlock>
+                            <opcontrol:content>
+                                <template:if test="{= ${subSection>sideContent} !== undefined}">
+                                    <template:then>
+                                        <layout:DynamicSideContent
+											id="{= ID.generate(['fe', ${subSection>key}, 'SideContentLayout'])}"
+											showMainContent="true"
+											showSideContent="{subSection>sideContent/visible}"
+											sideContentFallDown="BelowM"
+											containerQuery="true"
+											equalSplit="{subSection>sideContent/equalSplit}"
+										>
+                                            <layout:mainContent>
+                                                <core:Fragment
+													fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionCustomSection"
+													type="XML"
+												/>
+                                            </layout:mainContent>
+                                            <layout:sideContent>
+                                                <core:Fragment
+													fragmentName="sap.fe.templates.ObjectPage.view.fragments.SideContentCustomContainer"
+													type="XML"
+												/>
+                                            </layout:sideContent>
+                                        </layout:DynamicSideContent>
+                                    </template:then>
+                                    <template:else>
+                                        <core:Fragment
+											fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionCustomSection"
+											type="XML"
+										/>
+                                    </template:else>
+                                </template:if>
+                            </opcontrol:content>
+                        </opcontrol:SubSectionBlock>
+						</uxap:ObjectPageLazyLoader>
+                    </uxap:blocks>
+
+                </template:then>
+                <template:elseif test="{= ${subSection>type} === 'Form'}">
+                    <core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.FormActions" type="XML" />
+                    <uxap:blocks>
+					<uxap:ObjectPageLazyLoader stashed="true" id="{= ID.generate(['fe', ${subSection>key}])}">
+                    <opcontrol:SubSectionBlock>
+                        <opcontrol:content>
+							<template:if test="{= ${subSection>sideContent} !== undefined}">
+							<template:then>
+								<layout:DynamicSideContent
+											id="{= ID.generate(['fe', ${subSection>key}, 'SideContentLayout'])}"
+											showMainContent="true"
+											showSideContent="{subSection>sideContent/visible}"
+											sideContentFallDown="BelowM"
+											containerQuery="true"
+											equalSplit="{subSection>sideContent/equalSplit}"
+										>
+									<layout:mainContent>
+										<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionFormContent" type="XML" />
+									</layout:mainContent>
+									<layout:sideContent>
+										<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SideContentCustomContainer" type="XML" />
+									</layout:sideContent>
+								</layout:DynamicSideContent>
+
+							</template:then>
+							<template:else>
+								<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionFormContent" type="XML" />
+							</template:else>
+							</template:if>
+                        </opcontrol:content>
+                    </opcontrol:SubSectionBlock>
+					</uxap:ObjectPageLazyLoader>
+                    </uxap:blocks>
+                    <template:if test="{subSection>formDefinition/hasFacetsNotPartOfPreview}">
+                        <template:then>
+                            <!-- Button "Show More / Less" is displayed for a collection facets that contains at least one reference facets with annotation "PartOfPreview === TRUE" -->
+                            <uxap:moreBlocks>
+                                <template:if test="{= ${subSection>level} === 2}">
+                                    <Title text="{subSection>title}" />
+                                </template:if>
+                                <opcontrol:SubSectionBlock>
+                                    <opcontrol:content>
+										<template:if test="{= ${subSection>sideContent} !== undefined}">
+										<template:then>
+											<layout:DynamicSideContent
+												id="{= ID.generate(['fe', ${subSection>key}, 'MoreSideContentLayout'])}"
+												showMainContent="true"
+												showSideContent="{subSection>sideContent/visible}"
+												sideContentFallDown="BelowM"
+												containerQuery="true"
+												equalSplit="{subSection>sideContent/equalSplit}"
+											>
+												<layout:mainContent>
+													<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionMoreFormContent" type="XML" />
+												</layout:mainContent>
+												<layout:sideContent>
+													<!--No Side Content for MoreBlocks so far-->
+												</layout:sideContent>
+											</layout:DynamicSideContent>
+										</template:then>
+										<template:else>
+											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionMoreFormContent" type="XML" />
+										</template:else>
+										</template:if>
+                                    </opcontrol:content>
+                                </opcontrol:SubSectionBlock>
+                            </uxap:moreBlocks>
+                        </template:then>
+                    </template:if>
+                </template:elseif>
+                <template:elseif test="{= ${subSection>type} === 'DataVisualization'}">
+                    <uxap:blocks>
+						<uxap:ObjectPageLazyLoader stashed="true" id="{= ID.generate(['fe', ${subSection>key}])}">
+                        <template:if test="{= ${subSection>level} === 2}">
+                            <Title
+								text="{subSection>title}"
+								visible="{= ${subSection>visible} &amp;&amp; ${subSection>title} !=='undefined' &amp;&amp; ${subSection>showTitle} ? true : false}"
+							/>
+                        </template:if>
+                         <opcontrol:SubSectionBlock visible="{subSection>visible}">
+                            <opcontrol:content>
+								<template:if test="{= ${subSection>sideContent} !== undefined}">
+								<template:then>
+									<layout:DynamicSideContent
+											id="{= ID.generate(['fe', ${subSection>key}, 'SideContentLayout'])}"
+											showMainContent="true"
+											showSideContent="{subSection>sideContent/visible}"
+											sideContentFallDown="BelowM"
+											containerQuery="true"
+											equalSplit="{subSection>sideContent/equalSplit}"
+										>
+										<layout:mainContent>
+											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionPresentationVisualization" type="XML" />
+										</layout:mainContent>
+										<layout:sideContent>
+											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SideContentCustomContainer" type="XML" />
+										</layout:sideContent>
+									</layout:DynamicSideContent>
+								</template:then>
+								<template:else>
+									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionPresentationVisualization" type="XML" />
+								</template:else>
+								</template:if>
+                            </opcontrol:content>
+                        </opcontrol:SubSectionBlock>
+					</uxap:ObjectPageLazyLoader>
+                    </uxap:blocks>
+                </template:elseif>
+                <template:elseif test="{= ${subSection>type} === 'Unknown'}">
+                    <Text text="{subSection>text}" />
+                </template:elseif>
+                <template:else>
+
+                </template:else>
+            </template:if>
+        </template:if>
+</core:FragmentDefinition>

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

@@ -1,6 +1,6 @@
 <core:FragmentDefinition
 	xmlns:core="sap.ui.core"
-	xmlns:macro="sap.fe.macros"
+	xmlns:macro="sap.fe.macros.internal"
 	xmlns="sap.m"
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
 	template:require="{
@@ -9,8 +9,8 @@
 >
 	<macro:Form
 		id="{= ID.generate([${subSection>formDefinition/id}, 'Content']) }"
-		facet="{subSection>annotationPath}"
-		entitySet="{entitySet>}"
+		metaPath="{subSection>annotationPath}"
+		contextPath="{entitySet>}"
 		useFormContainerLabels="{= ${subSection>formDefinition/useFormContainerLabels}}"
 		partOfPreview="true"
 		formContainers="{subSection>formDefinition/formContainers}"

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

@@ -1,7 +1,7 @@
 <core:FragmentDefinition
 	xmlns:core="sap.ui.core"
 	xmlns="sap.m"
-	xmlns:macro="sap.fe.macros"
+	xmlns:macro="sap.fe.macros.internal"
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
 	template:require="{
 		ID: 'sap/fe/core/helpers/StableIdHelper'
@@ -9,8 +9,8 @@
 >
 	<macro:Form
 		id="{= ID.generate([${subSection>formDefinition/id}, 'MoreContent']) }"
-		facet="{subSection>annotationPath}"
-		entitySet="{entitySet>}"
+		metaPath="{subSection>annotationPath}"
+		contextPath="{entitySet>}"
 		useFormContainerLabels="{= ${subSection>formDefinition/useFormContainerLabels}}"
 		partOfPreview="false"
 		formContainers="{subSection>formDefinition/formContainers}"

package/src/sap/fe/templates/RootContainer/controller/Fcl.controller.js

@@ -1,6 +1,7 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(
 	[
@@ -9,7 +10,7 @@ sap.ui.define(
 		"./RootContainerBaseController",
 		"sap/f/FlexibleColumnLayoutSemanticHelper",
 		"sap/ui/core/Component",
-		"sap/fe/core/CommonUtils",
+		"sap/fe/core/helpers/KeepAliveHelper",
 		"sap/fe/core/controllerextensions/ViewState",
 		"sap/m/Link",
 		"sap/m/MessagePage",
@@ -21,7 +22,7 @@ sap.ui.define(
 		BaseController,
 		FlexibleColumnLayoutSemanticHelper,
 		Component,
-		CommonUtils,
+		KeepAliveHelper,
 		ViewState,
 		Link,
 		MessagePage,
@@ -753,15 +754,16 @@ sap.ui.define(
 			},
 
 			onContainerReady: function() {
+				// Restore views if neccessary.
 				var aViews = this._getAllVisibleViews();
 				var aRestorePromises = [];
 				aViews.reduce(function(aPromises, oTargetView) {
-					aPromises.push(CommonUtils.restoreView(oTargetView));
+					aPromises.push(KeepAliveHelper.restoreView(oTargetView));
 					return aPromises;
 				}, aRestorePromises);
 				return Promise.all(aRestorePromises);
 			},
-
+			
 			getRightmostContext: function() {
 				var oContext;
 				switch (this.getFclControl().getLayout()) {

package/src/sap/fe/templates/RootContainer/controller/NavContainer.controller.js

@@ -1,18 +1,21 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(
 	[
 		"sap/ui/model/json/JSONModel",
 		"./RootContainerBaseController",
 		"sap/fe/core/CommonUtils",
+		"sap/fe/core/helpers/KeepAliveHelper",
 		"sap/fe/core/controllerextensions/ViewState",
 		"sap/m/Link",
 		"sap/m/MessagePage",
-		"sap/m/MessageBox"
+		"sap/m/MessageBox",
+		"sap/base/Log"
 	],
-	function(JSONModel, BaseController, CommonUtils, ViewState, Link, MessagePage, MessageBox) {
+	function(JSONModel, BaseController, CommonUtils, KeepAliveHelper, ViewState, Link, MessagePage, MessageBox, Log) {
 		"use strict";
 
 		/**
@@ -72,7 +75,7 @@ sap.ui.define(
 
 				return oPagePromise.then(function(oCurrentPage) {
 					var oTargetView = CommonUtils.getTargetView(oCurrentPage);
-					return CommonUtils.restoreView(oTargetView);
+					return KeepAliveHelper.restoreView(oTargetView);
 				});
 			},
 
@@ -126,40 +129,60 @@ sap.ui.define(
 			_scrollTablesToLastNavigatedItems: function() {},
 
 			displayMessagePage: function(sErrorMessage, mParameters) {
-				var oNavContainer = this._getNavContainer();
+				return new Promise(
+					function(resolve, reject) {
+						try {
+							var oNavContainer = this._getNavContainer();
+
+							if (!this.oMessagePage) {
+								this.oMessagePage = new MessagePage({
+									showHeader: false,
+									icon: "sap-icon://message-error"
+								});
 
-				if (!this.oMessagePage) {
-					this.oMessagePage = new MessagePage({
-						showHeader: false,
-						icon: "sap-icon://message-error"
-					});
+								oNavContainer.addPage(this.oMessagePage);
+							}
 
-					oNavContainer.addPage(this.oMessagePage);
-				}
+							this.oMessagePage.setText(sErrorMessage);
+
+							if (mParameters.technicalMessage) {
+								this.oMessagePage.setCustomDescription(
+									new Link({
+										text: mParameters.description || mParameters.technicalMessage,
+										press: function() {
+											MessageBox.show(mParameters.technicalMessage, {
+												icon: MessageBox.Icon.ERROR,
+												title: mParameters.title,
+												actions: [MessageBox.Action.OK],
+												defaultAction: MessageBox.Action.OK,
+												details: mParameters.technicalDetails || "",
+												contentWidth: "60%"
+											});
+										}
+									})
+								);
+							} else {
+								this.oMessagePage.setDescription(mParameters.description || "");
+							}
 
-				this.oMessagePage.setText(sErrorMessage);
-
-				if (mParameters.technicalMessage) {
-					this.oMessagePage.setCustomDescription(
-						new Link({
-							text: mParameters.description || mParameters.technicalMessage,
-							press: function() {
-								MessageBox.show(mParameters.technicalMessage, {
-									icon: MessageBox.Icon.ERROR,
-									title: mParameters.title,
-									actions: [MessageBox.Action.OK],
-									defaultAction: MessageBox.Action.OK,
-									details: mParameters.technicalDetails || "",
-									contentWidth: "60%"
+							if (mParameters.handleShellBack) {
+								var oErrorOriginPage = oNavContainer.getCurrentPage(),
+									oAppComponent = CommonUtils.getAppComponent(oNavContainer.getCurrentPage());
+								oAppComponent.getShellServices().setBackNavigation(function() {
+									oNavContainer.to(oErrorOriginPage.getId());
+									oAppComponent.getShellServices().setBackNavigation();
 								});
 							}
-						})
-					);
-				} else {
-					this.oMessagePage.setDescription(mParameters.description || "");
-				}
-
-				oNavContainer.to(this.oMessagePage.getId());
+							oNavContainer.attachAfterNavigate(function() {
+								resolve(true);
+							});
+							oNavContainer.to(this.oMessagePage.getId());
+						} catch (e) {
+							reject(false);
+							Log.info(e);
+						}
+					}.bind(this)
+				);
 			}
 		});
 	},