@sapui5/sap.fe.templates 1.97.0 → 1.99.1

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,10 +9,11 @@
 >
 	<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}"
+		isVisible="{subSection>formDefinition/isVisible}"
 	/>
 </core:FragmentDefinition>

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,10 +9,11 @@
 >
 	<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}"
+		isVisible="{subSection>formDefinition/isVisible}"
 	/>
 </core:FragmentDefinition>

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

@@ -1,6 +1,7 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(
 	[

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

@@ -1,6 +1,7 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(
 	[

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

@@ -1,6 +1,7 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(
 	[
@@ -156,14 +157,13 @@ sap.ui.define(
 							}
 
 							var oAppComponent = that.getAppComponent();
-							var oData = { oView: oView, oAppComponent: oAppComponent };
 							that._scrollTablesToLastNavigatedItems();
 							if (oAppComponent.getEnvironmentCapabilities().getCapabilities().UShell) {
-								that.computeTitleHierarchy(oData);
+								that._computeTitleHierarchy(oView);
 							}
 							var bForceFocus = oAppComponent.getRouterProxy().isFocusForced();
 							oAppComponent.getRouterProxy().setFocusForced(false); // reset
-							if (oView.getController() && oView.getController().onPageReady) {
+							if (oView.getController() && oView.getController().onPageReady && oView.getParent().onPageReady) {
 								oView.getParent().onPageReady({ forceFocus: bForceFocus });
 							}
 							if (that.onContainerReady) {
@@ -182,12 +182,12 @@ sap.ui.define(
 			/**
 			 * This function returns the TitleHierarchy cache ( or initializes it if undefined).
 			 *
-			 * @name sap.fe.templates.RootContainer.controller.BaseController#getTitleHierarchyCache
+			 * @name sap.fe.templates.RootContainer.controller.BaseController#_getTitleHierarchyCache
 			 * @memberof sap.fe.templates.RootContainer.controller.BaseController
 			 *
 			 * @returns {object}  The TitleHierarchy cache
 			 */
-			getTitleHierarchyCache: function() {
+			_getTitleHierarchyCache: function() {
 				if (!this.oTitleHierarchyCache) {
 					this.oTitleHierarchyCache = {};
 				}
@@ -219,53 +219,86 @@ sap.ui.define(
 			},
 
 			/**
-			 * This function is updating the cache to store Title Information
+			 * Fetches the value of the HeaderInfo title for a given path.
 			 *
-			 * @name sap.fe.templates.RootContainer.controller.BaseController#addNewEntryINCacheTitle
-			 * @memberof sap.fe.templates.RootContainer.controller.BaseController
-			 * @param {*} sPath path of the context to retrieve title information from MetaModel
-			 * @param {*} oAppComponent reference to the oAppComponent
-			 *
-			 * @returns {promise}  oTitleinformation returned as promise
+			 * @param {string} sPath The path to the entity
+			 * @returns {Promise} A promise containing the value of the title, or an empty string if no HeaderInfo title annotation is available
 			 */
+			_fetchTitleValue: function(sPath) {
+				var oAppComponent = this.getAppComponent(),
+					oModel = this.getView().getModel(),
+					oMetaModel = oAppComponent.getMetaModel(),
+					sMetaPath = oMetaModel.getMetaPath(sPath);
 
-			addNewEntryInCacheTitle: function(sPath, oAppComponent) {
-				var oTitleModel = this.getView().getModel();
-				var that = this;
-				var sEntityPath = sPath.replace(/ *\([^)]*\) */g, "");
 				var sTitleExpression = AnnotationHelper.format(
-					oAppComponent.getMetaModel().getProperty(sEntityPath + "/@com.sap.vocabularies.UI.v1.HeaderInfo/Title/Value"),
-					{ context: oAppComponent.getMetaModel().createBindingContext("/") }
+					oMetaModel.getProperty(sMetaPath + "/@com.sap.vocabularies.UI.v1.HeaderInfo/Title/Value"),
+					{ context: oMetaModel.createBindingContext("/") }
 				);
 				var oTitleExpression = BindingParser.complexParser(sTitleExpression);
-				var sTypeName = oAppComponent.getMetaModel().getProperty(sEntityPath + "/@com.sap.vocabularies.UI.v1.HeaderInfo/TypeName");
-				var oBindingViewContext = oTitleModel.createBindingContext(sPath);
+
 				if (oTitleExpression) {
 					var sTitlePath = oTitleExpression.parts ? oTitleExpression.parts[0].path : oTitleExpression.path;
 					var fnTitleFormatter = oTitleExpression.formatter;
-					var oPropertyBinding = oTitleModel.bindProperty(sTitlePath, oBindingViewContext);
+					var oBindingViewContext = oModel.createBindingContext(sPath);
+					var oPropertyBinding = oModel.bindProperty(sTitlePath, oBindingViewContext);
+
 					oPropertyBinding.initialize();
-				}
-				return new Promise(function(resolve, reject) {
-					var sAppSpecificHash = HashChanger.getInstance().hrefForAppSpecificHash
-						? HashChanger.getInstance().hrefForAppSpecificHash("")
-						: "";
-					var sIntent = sAppSpecificHash + sPath.slice(1);
-					var oTitleHierarchyCache = that.getTitleHierarchyCache();
-					var fnChange = function(oEvent) {
-						var sTargetValue = fnTitleFormatter
-							? fnTitleFormatter(oEvent.getSource().getValue())
-							: oEvent.getSource().getValue();
-						oTitleHierarchyCache[sPath] = that._computeTitleInfo(sTypeName, sTargetValue, sIntent);
-						resolve(oTitleHierarchyCache[sPath]);
-						oPropertyBinding.detachChange(fnChange);
-					};
-					if (oPropertyBinding) {
+
+					return new Promise(function(resolve) {
+						var fnChange = function(oEvent) {
+							var sTargetValue = fnTitleFormatter
+								? fnTitleFormatter(oEvent.getSource().getValue())
+								: oEvent.getSource().getValue();
+
+							oPropertyBinding.detachChange(fnChange);
+							resolve(sTargetValue);
+						};
+
 						oPropertyBinding.attachChange(fnChange);
-					} else {
-						oTitleHierarchyCache[sPath] = that._computeTitleInfo(sTypeName, "", sIntent);
-						resolve(oTitleHierarchyCache[sPath]);
-					}
+					});
+				} else {
+					return Promise.resolve("");
+				}
+			},
+
+			_getAppSpecificHash: function() {
+				return HashChanger.getInstance().hrefForAppSpecificHash ? HashChanger.getInstance().hrefForAppSpecificHash("") : "";
+			},
+
+			_getHash: function() {
+				return HashChanger.getInstance().getHash();
+			},
+
+			/**
+			 * This function returns titleInformation from a path.
+			 * It updates the cache to store Title Information if necessary
+			 *
+			 * @name sap.fe.templates.RootContainer.controller.BaseController#getTitleInfoFromPath
+			 * @memberof sap.fe.templates.RootContainer.controller.BaseController
+			 * @param {*} sPath path of the context to retrieve title information from MetaModel
+			 *
+			 * @returns {promise}  oTitleinformation returned as promise
+			 */
+
+			getTitleInfoFromPath: function(sPath) {
+				var oTitleHierarchyCache = this._getTitleHierarchyCache();
+
+				if (oTitleHierarchyCache[sPath]) {
+					// The title info is already stored in the cache
+					return Promise.resolve(oTitleHierarchyCache[sPath]);
+				}
+
+				var oMetaModel = this.getAppComponent().getMetaModel();
+				var that = this;
+				var sEntityPath = oMetaModel.getMetaPath(sPath);
+				var sTypeName = oMetaModel.getProperty(sEntityPath + "/@com.sap.vocabularies.UI.v1.HeaderInfo/TypeName");
+				var sAppSpecificHash = this._getAppSpecificHash();
+				var sIntent = sAppSpecificHash + sPath.slice(1);
+
+				return this._fetchTitleValue(sPath).then(function(sTitle) {
+					var oTitleInfo = that._computeTitleInfo(sTypeName, sTitle, sIntent);
+					oTitleHierarchyCache[sPath] = oTitleInfo;
+					return oTitleInfo;
 				});
 			},
 			/**
@@ -281,7 +314,7 @@ sap.ui.define(
 			 * @param {*} aHierarchy Shell title hierarchy
 			 * @returns {*} Copy of shell title hierarchy containing all elements as strings
 			 */
-			ensureHierarchyElementsAreStrings: function(aHierarchy) {
+			_ensureHierarchyElementsAreStrings: function(aHierarchy) {
 				var aHierarchyShell = [];
 				for (var level in aHierarchy) {
 					var oHierarchy = aHierarchy[level];
@@ -294,113 +327,91 @@ sap.ui.define(
 				return aHierarchyShell;
 			},
 
+			_getTargetTypeFromHash: function(sHash) {
+				var oAppComponent = this.getAppComponent();
+				var sTargetType = "";
+
+				var aRoutes = oAppComponent.getManifestEntry("/sap.ui5/routing/routes");
+				for (var j = 0; j < aRoutes.length; j++) {
+					var oRoute = oAppComponent.getRouter().getRoute(aRoutes[j].name);
+					if (oRoute.match(sHash)) {
+						var sTarget = Array.isArray(aRoutes[j].target) ? aRoutes[j].target[0] : aRoutes[j].target;
+						sTargetType = oAppComponent.getRouter().getTarget(sTarget)._oOptions.name;
+						break;
+					}
+				}
+
+				return sTargetType;
+			},
+
 			/**
 			 * This function is updating the shell title after each navigation.
 			 *
 			 * @memberof sap.fe.templates.RootContainer.controller.BaseController
-			 * @param {*} oData Object containing reference to view and to oAppComponent
+			 * @param {*} oView The current view
+			 * @returns {*} A Promise that is resolved when the menu is filled properly
 			 */
-			computeTitleHierarchy: function(oData) {
+			_computeTitleHierarchy: function(oView) {
 				var that = this,
-					oView = oData.oView,
-					oAppComponent = oData.oAppComponent,
+					oAppComponent = this.getAppComponent(),
 					oContext = oView.getBindingContext(),
 					oCurrentPage = oView.getParent(),
 					aTitleInformationPromises = [],
-					sAppSpecificHash = HashChanger.getInstance().hrefForAppSpecificHash
-						? HashChanger.getInstance().hrefForAppSpecificHash("")
-						: "",
+					sAppSpecificHash = this._getAppSpecificHash(),
 					sAppTitle = oAppComponent.getMetadata().getManifestEntry("sap.app").title || "",
 					sAppSubTitle = oAppComponent.getMetadata().getManifestEntry("sap.app").appSubTitle || "",
-					sAppRootPath = sAppSpecificHash,
-					oPageTitleInformationPromise,
+					oPageTitleInformation,
 					sNewPath;
 
-				if (this.bIsComputingTitleHierachy === true) {
-					Log.warning("computeTitleHierarchy already running ... this call is canceled");
-					return;
-				}
-				this.bIsComputingTitleHierachy = true;
-
 				if (oCurrentPage && oCurrentPage._getPageTitleInformation) {
 					if (oContext) {
+						// If the first page of the application is a LR, use the title and subtitle from the manifest
+						if (this._getTargetTypeFromHash("") === "sap.fe.templates.ListReport") {
+							aTitleInformationPromises.push(
+								Promise.resolve(that._computeTitleInfo(sAppTitle, sAppSubTitle, sAppSpecificHash))
+							);
+						}
+
+						// Then manage other pages
 						sNewPath = oContext.getPath();
 						var aPathParts = sNewPath.split("/"),
-							sTargetType,
-							sPath = "",
-							iNbPathParts = aPathParts.length;
-						aPathParts.splice(-1, 1);
-
-						aPathParts.forEach(function(sPathPart, i) {
-							if (i === 0) {
-								var aRoutes = oAppComponent.getManifestEntry("/sap.ui5/routing/routes"),
-									aTargets = oAppComponent.getManifestEntry("/sap.ui5/routing/targets");
-								var fnTargetTypeEval = function(sTarget) {
-									if (typeof aRoutes[this.index].target === "string") {
-										return sTarget === aRoutes[this.index].target;
-									} else if (typeof aRoutes[this.index].target === "object") {
-										for (var k = 0; k < aRoutes[this.index].target.length; k++) {
-											return sTarget === aRoutes[this.index].target[k];
-										}
-									}
-								};
-								for (var j = 0; j < aRoutes.length; j++) {
-									var oRoute = oAppComponent.getRouter().getRoute(aRoutes[j].name);
-									if (oRoute.match(aPathParts[i])) {
-										var sTarget = Object.keys(aTargets).find(fnTargetTypeEval, { index: j });
-										sTargetType = oAppComponent.getRouter().getTarget(sTarget)._oOptions.name;
-										break;
-									}
-								}
-								if (sTargetType === "sap.fe.templates.ListReport") {
-									aTitleInformationPromises.push(
-										Promise.resolve(that._computeTitleInfo(sAppTitle, sAppSubTitle, sAppRootPath))
-									);
-								}
-							} else if (i < iNbPathParts) {
-								sPath += "/" + sPathPart;
-								var oMetaModel = oAppComponent.getMetaModel(),
-									sParameterPath = oMetaModel.getMetaPath(sPath),
-									bIsParameterized = oMetaModel.getObject(
-										sParameterPath + "/@com.sap.vocabularies.Common.v1.ResultContext"
-									);
-								if (bIsParameterized) {
-									return;
-								}
-								if (!that.getTitleHierarchyCache()[sPath]) {
-									aTitleInformationPromises.push(that.addNewEntryInCacheTitle(sPath, oAppComponent));
-								} else {
-									aTitleInformationPromises.push(Promise.resolve(that.getTitleHierarchyCache()[sPath]));
-								}
+							sPath = "";
+
+						aPathParts.shift(); // Remove the first segment (empty string) as it has been managed above
+						aPathParts.pop(); // Remove the last segment as it corresponds to the current page and shouldn't appear in the menu
+
+						aPathParts.forEach(function(sPathPart) {
+							sPath += "/" + sPathPart;
+							var oMetaModel = oAppComponent.getMetaModel(),
+								sParameterPath = oMetaModel.getMetaPath(sPath),
+								bIsParameterized = oMetaModel.getObject(sParameterPath + "/@com.sap.vocabularies.Common.v1.ResultContext");
+							if (!bIsParameterized) {
+								aTitleInformationPromises.push(that.getTitleInfoFromPath(sPath));
 							}
 						});
 					}
-					oPageTitleInformationPromise = oCurrentPage._getPageTitleInformation().then(function(oPageTitleInformation) {
-						var sPageHash = HashChanger.getInstance().getHash();
-						var aParts = sPageHash.split("/");
-						if (aParts[aParts.length - 1].indexOf("?") === -1) {
-							sPageHash += "?restoreHistory=true";
-						} else {
-							sPageHash += "&restoreHistory=true";
-						}
 
-						oPageTitleInformation.intent = sAppSpecificHash + sPageHash;
-						if (oContext) {
-							that.getTitleHierarchyCache()[sNewPath] = oPageTitleInformation;
-						} else {
-							that.getTitleHierarchyCache()[sAppRootPath] = oPageTitleInformation;
-						}
-						return oPageTitleInformation;
-					});
-					aTitleInformationPromises.push(oPageTitleInformationPromise);
+					// Current page
+					oPageTitleInformation = oCurrentPage._getPageTitleInformation();
+					oPageTitleInformation = that._computeTitleInfo(
+						oPageTitleInformation.title,
+						oPageTitleInformation.subtitle,
+						sAppSpecificHash + this._getHash()
+					);
+
+					if (oContext) {
+						that._getTitleHierarchyCache()[sNewPath] = oPageTitleInformation;
+					} else {
+						that._getTitleHierarchyCache()[sAppSpecificHash] = oPageTitleInformation;
+					}
 				} else {
 					aTitleInformationPromises.push(Promise.reject("Title information missing in HeaderInfo"));
 				}
-				Promise.all(aTitleInformationPromises)
+				return Promise.all(aTitleInformationPromises)
 					.then(function(aTitleInfoHierarchy) {
 						// workaround for shell which is expecting all elements being of type string
-						var aTitleInfoHierarchyShell = that.ensureHierarchyElementsAreStrings(aTitleInfoHierarchy),
-							sTitle = aTitleInfoHierarchyShell.pop().title;
+						var aTitleInfoHierarchyShell = that._ensureHierarchyElementsAreStrings(aTitleInfoHierarchy),
+							sTitle = oPageTitleInformation.title;
 						oAppComponent.getShellServices().setHierarchy(aTitleInfoHierarchyShell.reverse());
 						oAppComponent.getShellServices().setTitle(sTitle);
 					})

package/src/sap/fe/templates/RootContainer/overrides/EditFlow.js

@@ -1,6 +1,7 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define([], function() {
 	"use strict";

package/src/sap/fe/templates/TableScroller.js

@@ -1,6 +1,7 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(
 	[],

package/src/sap/fe/templates/controls/Table.fragment.xml

@@ -20,7 +20,7 @@
 		visible="{= ${converterContext>hasMultiVisualizations} ? '{= ${pageInternal>alpContentView} !== \'Chart\'}' : 'true' }"
 		tabTitle="{view>title}"
 		fieldMode='{= ${converterContext>templateType} === "ListReport" ? "nowrapper" : ""}'
-		stateChanged='{= ${converterContext>template} !== "ObjectPage" ? ".handlers.onTableStateChanged" : undefined}'
+		stateChanged='{= ${converterContext>template} !== "ObjectPage" ? ".handlers.onStateChanged" : undefined}'
 	>
 	</macro:Table>
 </core:FragmentDefinition>

package/src/sap/fe/templates/library.js

@@ -1,6 +1,7 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 /**
  * Initialization Code and shared classes of library sap.fe.templates
@@ -46,7 +47,7 @@ sap.ui.define(
 			interfaces: [],
 			controls: [],
 			elements: [],
-			version: "1.97.0",
+			version: "1.99.1",
 			noLibraryCSS: true
 		});
 		if (!sap.fe.templates.ObjectPage) {