@sapui5/sap.fe.templates 1.97.0 → 1.99.1

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

@@ -79,107 +79,85 @@
 					/>
 				</uxap:dependents>
 				<template:if test="{converterContext>header/visible}">
-					<uxap:headerTitle>
-						<uxap:ObjectPageDynamicHeaderTitle primaryArea="Begin">
-							<uxap:expandedHeading>
+					<template:with path="converterContext>header" var="header">
+						<uxap:headerTitle>
+							<uxap:ObjectPageDynamicHeaderTitle primaryArea="Begin">
+								<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.Heading" type="XML" />
+								<uxap:expandedContent>
 								<FlexBox>
-									<FlexBox visible="{converterContext>header/title/expandedImageVisible}">
-										<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderImage" type="XML" />
-									</FlexBox>
-									<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>
-								</FlexBox>
-							</uxap:expandedHeading>
-							<uxap:snappedHeading>
-								<FlexBox>
-									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderImage" type="XML" />
-									<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>
+									<template:if test="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description}">
+									<Label
+												text="{= OPTemplating.getExpressionForDescription(${headerInfo>@@UI.getConverterContext}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
+												wrapping="true"
+											/>
+									</template:if>
 								</FlexBox>
-							</uxap:snappedHeading>
-							<uxap:expandedContent>
-							 <FlexBox>
-                            	<template:if test="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description}">
-              					  <Label
-											text="{= OPTemplating.getExpressionForDescription(${headerInfo>@@UI.getConverterContext}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
-											wrapping="true"
-										/>
-            					  </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})}"
-											wrapping="true"
-										/>
-            						</template:if>
-			    				</FlexBox>
-							</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>
-							</uxap:content>
-							<uxap:navigationActions>
-								<template:if test="{= ${viewData>/viewLevel} > 1}">
-									<macro:Paginator id="fe::Paginator" />
-								</template:if>
-								<!-- Flexible column layout menu-->
-								<template:if test="{= ${viewData>/fclEnabled} }">
-									<macro:FlexibleColumnLayoutActions />
-								</template:if>
-							</uxap:navigationActions>
-							<uxap:actions>
-								<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.Actions" type="XML" />
-							</uxap:actions>
-							<uxap:breadcrumbs>
-								<Breadcrumbs
-									unittest:id="BreadcrumbsTest"
-									visible="{= OP.getVisibleExpressionForBreadcrumbs(${viewData>/}) }"
-									modelContextChange="._setBreadcrumbLinks(${$source>/})"
-									id="fe::Breadcrumbs"
+								</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})}"
+												wrapping="true"
+											/>
+										</template:if>
+									</FlexBox>
+								</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>
+									<internal:SituationsIndicator xmlns:internal="sap.fe.macros.internal" entitySet="{entitySet>}" />
+								</uxap:content>
+								<uxap:navigationActions>
+									<template:if test="{= ${viewData>/viewLevel} > 1}">
+										<macro:Paginator id="fe::Paginator" />
+									</template:if>
+									<!-- Flexible column layout menu-->
+									<template:if test="{= ${viewData>/fclEnabled} }">
+										<macro:FlexibleColumnLayoutActions />
+									</template:if>
+								</uxap:navigationActions>
+								<uxap:actions>
+									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.Actions" type="XML" />
+								</uxap:actions>
+								<uxap:breadcrumbs>
+									<Breadcrumbs
+										unittest:id="BreadcrumbsTest"
+										visible="{= OP.getVisibleExpressionForBreadcrumbs(${viewData>/}) }"
+										modelContextChange="._setBreadcrumbLinks(${$source>/})"
+										id="fe::Breadcrumbs"
+									>
+									</Breadcrumbs>
+								</uxap:breadcrumbs>
+							</uxap:ObjectPageDynamicHeaderTitle>
+						</uxap:headerTitle>
+						<template:if test="{header>hasContent}">
+							<uxap:headerContent>
+								<FlexBox
+									id="fe::HeaderContentContainer"
+									unittest:id="FlexBoxTest"
+									dt:designtime="sap/fe/templates/ObjectPage/designtime/FlexBox.designtime"
+									wrap="Wrap"
+									fitContainer="true"
+									alignItems="Stretch"
 								>
-								</Breadcrumbs>
-							</uxap:breadcrumbs>
-						</uxap:ObjectPageDynamicHeaderTitle>
-					</uxap:headerTitle>
-					<template:if test="{converterContext>header/hasContent}">
-						<uxap:headerContent>
-							<FlexBox
-								id="fe::HeaderContentContainer"
-								unittest:id="FlexBoxTest"
-								dt:designtime="sap/fe/templates/ObjectPage/designtime/FlexBox.designtime"
-								wrap="Wrap"
-								fitContainer="true"
-								alignItems="Stretch"
-							>
-								<template:if test="{converterContext>header/avatar}">
-									<template:with path="converterContext>header/avatar" var="avatar">
-									<Avatar
+									<template:if test="{header>avatar}">
+										<Avatar
 											unittest:id="AvatarOPHeaderContent"
 											class="sapUiSmallMarginEnd sapUiSmallMarginBottom"
-											src="{avatar>src}"
-											initials="{avatar>initials}"
-											fallbackIcon="{avatar>fallbackIcon}"
-											displayShape="{avatar>displayShape}"
+											src="{header>avatar/src}"
+											initials="{header>avatar/initials}"
+											fallbackIcon="{header>avatar/fallbackIcon}"
+											displayShape="{header>avatar/displayShape}"
 											displaySize="XL"
 										/>
-									</template:with>
-								</template:if>
-								<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderContent" type="XML" />
-							</FlexBox>
-						</uxap:headerContent>
-					</template:if>
+									</template:if>
+									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderContent" type="XML" />
+								</FlexBox>
+							</uxap:headerContent>
+						</template:if>
+					</template:with>
 				</template:if>
 				<uxap:sections>
 					<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.Section" type="XML" />

package/src/sap/fe/templates/ObjectPage/ObjectPageController.controller.js

@@ -1,13 +1,13 @@
 /*!
- * 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(
 	[
 		"sap/fe/core/PageController",
 		"sap/fe/core/controllerextensions/InternalRouting",
 		"./overrides/InternalRouting",
-		"sap/fe/core/controllerextensions/SideEffects",
 		"sap/fe/core/controllerextensions/EditFlow",
 		"sap/fe/core/controllerextensions/InternalEditFlow",
 		"sap/fe/core/controllerextensions/PageReady",
@@ -41,13 +41,14 @@ sap.ui.define(
 		"sap/ui/model/json/JSONModel",
 		"sap/fe/core/controllerextensions/Paginator",
 		"./overrides/Paginator",
-		"sap/fe/core/controllerextensions/Placeholder"
+		"sap/fe/core/controllerextensions/Placeholder",
+		"sap/base/util/UriParameters",
+		"sap/fe/core/controllerextensions/MassEdit"
 	],
 	function(
 		PageController,
 		InternalRouting,
 		InternalRoutingOverride,
-		SideEffects,
 		EditFlow,
 		InternalEditFlow,
 		PageReady,
@@ -81,7 +82,9 @@ sap.ui.define(
 		JSONModel,
 		Paginator,
 		PaginatorOverride,
-		Placeholder
+		Placeholder,
+		UriParameters,
+		MassEdit
 	) {
 		"use strict";
 
@@ -100,7 +103,6 @@ sap.ui.define(
 				}
 			},
 			placeholder: Placeholder,
-			sideEffects: SideEffects,
 			editFlow: EditFlow,
 			share: Share.override(ShareOverrides),
 			_editFlow: InternalEditFlow.override(EditFlowOverrides),
@@ -112,7 +114,7 @@ sap.ui.define(
 				getNavigationMode: function() {
 					var bIsStickyEditMode =
 						this._oView.getController().getStickyEditMode && this._oView.getController().getStickyEditMode();
-					return bIsStickyEditMode ? "explace" : "inplace";
+					return bIsStickyEditMode ? "explace" : undefined;
 				}
 			}),
 			viewState: ViewState.override(ViewStateOverrides),
@@ -121,6 +123,7 @@ sap.ui.define(
 					return true;
 				}
 			}),
+			massEdit: MassEdit,
 
 			getExtensionAPI: function(sId) {
 				if (sId) {
@@ -152,7 +155,7 @@ sap.ui.define(
 				});
 				oInternalModelContext.setProperty("batchGroups", this._getBatchGroupsForView());
 				oInternalModelContext.setProperty("errorNavigationSectionFlag", false);
-				if (oObjectPage.getEnableLazyLoading()) {
+				if (!this.getView().getViewData().useNewLazyLoading && oObjectPage.getEnableLazyLoading()) {
 					//Attaching the event to make the subsection context binding active when it is visible.
 					oObjectPage.attachEvent("subSectionEnteredViewPort", this._handleSubSectionEnteredViewPort.bind(this));
 				}
@@ -203,8 +206,8 @@ sap.ui.define(
 					aTables = this._findTables(),
 					oFastCreationRow,
 					oObjectPage = this.byId("fe::ObjectPage"),
-					oBinding = mParameters.listBinding,
 					oInternalModelContext = that.getView().getBindingContext("internal"),
+					oInternalModel = that.getView().getModel("internal"),
 					aBatchGroups = oInternalModelContext.getProperty("batchGroups"),
 					iViewLevel = this.getView().getViewData().viewLevel;
 
@@ -260,29 +263,37 @@ sap.ui.define(
 				});
 
 				//Set the Binding for Paginators using ListBinding ID
-				if (oBinding && iViewLevel > 1) {
-					if (oBinding.isA("sap.ui.model.odata.v4.ODataListBinding")) {
-						this.paginator.initialize(oBinding, oContext);
-					} else {
-						//if the binding type is not ODataListBinding because of a deeplink navigation or a refresh of the page
-						// we need to create it
-						var sContextPath = oBinding.getPath().replace(/\([^\)]*\)*$/, ""); //removing the last tuple
-						var oBinding = new sap.ui.model.odata.v4.ODataListBinding(
-							oBinding.oModel,
-							"",
-							oBinding.oModel.createBindingContext(sContextPath)
-						);
-
-						oBinding.getContexts(0);
-						oBinding.attachEvent("change", function _setListBindingAsync() {
-							if (oBinding.getContexts().length > 0) {
-								that.paginator.initialize(oBinding, oContext);
-								oBinding.detachEvent("change", _setListBindingAsync);
-							}
-						});
+				if (iViewLevel > 1) {
+					var oBinding = mParameters && mParameters.listBinding,
+						oPaginatorCurrentContext = oInternalModel.getProperty("/paginatorCurrentContext");
+					if (oPaginatorCurrentContext) {
+						var oBindingToUse = oPaginatorCurrentContext.getBinding();
+						this.paginator.initialize(oBindingToUse, oPaginatorCurrentContext);
+						oInternalModel.setProperty("/paginatorCurrentContext", null);
+					} else if (oBinding) {
+						if (oBinding.isA("sap.ui.model.odata.v4.ODataListBinding")) {
+							this.paginator.initialize(oBinding, oContext);
+						} else {
+							//if the binding type is not ODataListBinding because of a deeplink navigation or a refresh of the page
+							// we need to create it
+							var sContextPath = oBinding.getPath().replace(/\([^\)]*\)*$/, ""); //removing the last tuple
+							oBinding = new sap.ui.model.odata.v4.ODataListBinding(
+								oBinding.oModel,
+								"",
+								oBinding.oModel.createBindingContext(sContextPath)
+							);
+
+							oBinding.getContexts(0);
+							oBinding.attachEvent("change", function _setListBindingAsync() {
+								if (oBinding.getContexts().length > 0) {
+									that.paginator.initialize(oBinding, oContext);
+									oBinding.detachEvent("change", _setListBindingAsync);
+								}
+							});
+						}
 					}
 				}
-				if (oObjectPage.getEnableLazyLoading()) {
+				if (!this.getView().getViewData().useNewLazyLoading && oObjectPage.getEnableLazyLoading()) {
 					var aSections = oObjectPage.getSections(),
 						bUseIconTabBar = oObjectPage.getUseIconTabBar(),
 						iSkip = 2,
@@ -295,7 +306,9 @@ sap.ui.define(
 							// In IconTabBar mode keep the second section bound if there is an editable header and we are switching to display mode
 							if (iSkip < 1 || (bUseIconTabBar && (iSection > 1 || (iSection === 1 && !bEditableHeader && !bIsInEditMode)))) {
 								var oSubSection = aSubSections[iSubSection];
-								oSubSection.setBindingContext(null);
+								if (oSubSection.data().isVisibilityDynamic !== "true") {
+									oSubSection.setBindingContext(null);
+								}
 							}
 						}
 					}
@@ -322,30 +335,39 @@ sap.ui.define(
 			},
 
 			_getFirstEmptyMandatoryFieldFromSubSection: function(aSubSections) {
-				for (var subSection = 0; aSubSections && subSection < aSubSections.length; subSection++) {
-					var aBlocks = aSubSections[subSection].getBlocks();
-
-					for (var block = 0; aBlocks && block < aBlocks.length; block++) {
-						var aFormContainers;
-
-						if (aBlocks[block].isA("sap.ui.layout.form.Form")) {
-							aFormContainers = aBlocks[block].getFormContainers();
-						} else if (
-							aBlocks[block].getContent &&
-							aBlocks[block].getContent() &&
-							aBlocks[block].getContent().isA("sap.ui.layout.form.Form")
-						) {
-							aFormContainers = aBlocks[block].getContent().getFormContainers();
-						}
-
-						for (var formContainer = 0; aFormContainers && formContainer < aFormContainers.length; formContainer++) {
-							var aFormElements = aFormContainers[formContainer].getFormElements();
-
-							for (var formElement = 0; aFormElements && formElement < aFormElements.length; formElement++) {
-								var aFields = aFormElements[formElement].getFields();
+				if (aSubSections) {
+					for (var subSection = 0; subSection < aSubSections.length; subSection++) {
+						var aBlocks = aSubSections[subSection].getBlocks();
+
+						if (aBlocks) {
+							for (var block = 0; block < aBlocks.length; block++) {
+								var aFormContainers;
+
+								if (aBlocks[block].isA("sap.ui.layout.form.Form")) {
+									aFormContainers = aBlocks[block].getFormContainers();
+								} else if (
+									aBlocks[block].getContent &&
+									aBlocks[block].getContent() &&
+									aBlocks[block].getContent().isA("sap.ui.layout.form.Form")
+								) {
+									aFormContainers = aBlocks[block].getContent().getFormContainers();
+								}
 
-								if (aFields[0].getRequired() && !aFields[0].getValue()) {
-									return aFields[0];
+								if (aFormContainers) {
+									for (var formContainer = 0; formContainer < aFormContainers.length; formContainer++) {
+										var aFormElements = aFormContainers[formContainer].getFormElements();
+										if (aFormElements) {
+											for (var formElement = 0; formElement < aFormElements.length; formElement++) {
+												var aFields = aFormElements[formElement].getFields();
+
+												// The first field is not necessarily an InputBase (e.g. could be a Text)
+												// So we need to check whether it has a getRequired method
+												if (aFields[0].getRequired && aFields[0].getRequired() && !aFields[0].getValue()) {
+													return aFields[0];
+												}
+											}
+										}
+									}
 								}
 							}
 						}
@@ -379,24 +401,32 @@ sap.ui.define(
 			},
 
 			_onBackNavigationInDraft: function(oContext) {
-				CommonUtils.fnProcessDataLossOrDraftDiscardConfirmation(
-					function() {
-						history.back();
-					},
-					Function.prototype,
-					oContext,
-					this.getView().getController(),
-					false
-				);
+				if (
+					this.getAppComponent()
+						.getRouterProxy()
+						.checkIfBackHasSameContext()
+				) {
+					// Back nav will keep the same context --> no need to display the dialog
+					history.back();
+				} else {
+					CommonUtils.fnProcessDataLossOrDraftDiscardConfirmation(
+						function() {
+							history.back();
+						},
+						Function.prototype,
+						oContext,
+						this,
+						false
+					);
+				}
 			},
 
 			_onAfterBinding: function(oBindingContext, mParameters) {
 				var oObjectPage = this.byId("fe::ObjectPage"),
 					that = this,
-					aTables = this._findTables(),
-					aFormContainers = this._findFormContainers();
+					aTables = this._findTables();
 
-				this.sideEffects.clearPropertiesStatus();
+				this._sideEffects.clearPropertiesStatus();
 
 				// TODO: this is only a temp solution as long as the model fix the cache issue and we use this additional
 				// binding with ownRequest
@@ -415,25 +445,6 @@ sap.ui.define(
 				// 2. Another problem is, that FormContainers assigned to a 'MoreBlock' does not have an
 				// internal model context at all.
 
-				aFormContainers.forEach(function(oFormContainer) {
-					var oInternalModelContext,
-						oInternalModel = oObjectPage.getModel("internal"),
-						sPageContextPath = "/pages/" + that.getView().getId(),
-						sFormContainerContextPath = "controls/" + that.getView().getLocalId(oFormContainer.getId()),
-						SHOW_DETAILS = "showDetails";
-					if (oFormContainer.getModel("internal") === undefined) {
-						oFormContainer.setModel(oInternalModel, "internal");
-						oFormContainer.setBindingContext(
-							oInternalModel.createBindingContext(sPageContextPath + "/" + sFormContainerContextPath),
-							"internal"
-						);
-						oFormContainer.bindElement({ path: "", model: "internal" });
-					} else {
-						oFormContainer.bindElement({ path: sFormContainerContextPath, model: "internal" });
-					}
-					oInternalModelContext = oFormContainer.getBindingContext("internal");
-					oInternalModelContext.setProperty(SHOW_DETAILS, false);
-				});
 				aTables.forEach(function(oTable) {
 					var oInternalModelContext = oTable.getBindingContext("internal");
 					oInternalModelContext.setProperty("creationRowFieldValidity", {});
@@ -574,8 +585,10 @@ sap.ui.define(
 							});
 					});
 
-					// should be called only after binding is ready hence calling it in onAfterBinding
-					oObjectPage._triggerVisibleSubSectionsEvents();
+					if (!this.getView().getViewData().useNewLazyLoading) {
+						// should be called only after binding is ready hence calling it in onAfterBinding
+						oObjectPage._triggerVisibleSubSectionsEvents();
+					}
 				}
 			},
 			onPageReady: function(mParameters) {
@@ -666,7 +679,7 @@ sap.ui.define(
 					icon: ""
 				};
 
-				return Promise.resolve(oTitleInfo);
+				return oTitleInfo;
 			},
 
 			_executeHeaderShortcut: function(sId) {
@@ -792,20 +805,19 @@ sap.ui.define(
 						);
 					}
 				});
-				return Promise.all(aWaitCreateDocuments).then(function(aBindings) {
-					var mParameters = {
-						bExecuteSideEffectsOnError: bExecuteSideEffectsOnError,
-						bindings: aBindings
-					};
-					return that.editFlow
-						.saveDocument(oContext, mParameters)
-						.catch(that._showMessagePopover.bind(that))
-						.finally(function() {
-							if (BusyLocker.isLocked(oModel)) {
-								BusyLocker.unlock(oModel);
-							}
-						});
-				});
+				return Promise.all(aWaitCreateDocuments)
+					.then(function(aBindings) {
+						var mParameters = {
+							bExecuteSideEffectsOnError: bExecuteSideEffectsOnError,
+							bindings: aBindings
+						};
+						return that.editFlow.saveDocument(oContext, mParameters).catch(that._showMessagePopover.bind(that));
+					})
+					.finally(function() {
+						if (BusyLocker.isLocked(oModel)) {
+							BusyLocker.unlock(oModel);
+						}
+					});
 			},
 
 			_cancelDocument: function(oContext, mParameters) {
@@ -886,37 +898,6 @@ sap.ui.define(
 				return aBlocks;
 			},
 
-			_findFormContainers: function() {
-				var aSubSections = this._getAllSubSections(),
-					aFormContainers = [];
-
-				function _collectFormContainersInBlocks(aBlocks) {
-					for (var i = 0; i < aBlocks.length; i++) {
-						var oElement = aBlocks[i].getContent instanceof Function && aBlocks[i].getContent();
-						if (oElement && oElement.isA && oElement.isA("sap.ui.layout.DynamicSideContent")) {
-							oElement = oElement.getMainContent instanceof Function && oElement.getMainContent();
-							if (oElement && oElement.length > 0) {
-								oElement = oElement[0];
-							}
-						}
-						if (
-							oElement &&
-							oElement.isA &&
-							oElement.isA("sap.ui.layout.form.Form") &&
-							oElement.getFormContainers instanceof Function
-						) {
-							aFormContainers = aFormContainers.concat(oElement.getFormContainers());
-						}
-					}
-				}
-
-				for (var i = 0; i < aSubSections.length; i++) {
-					_collectFormContainersInBlocks(aSubSections[i].getBlocks());
-					_collectFormContainersInBlocks(aSubSections[i].getMoreBlocks());
-				}
-				return aFormContainers;
-			},
-
 			//TODO: This is needed for two workarounds - to be removed again
 			_findTables: function() {
 				var aSubSections = this._getAllSubSections(),
@@ -1088,7 +1069,6 @@ sap.ui.define(
 					aPathParts.forEach(function(sPathPart, i) {
 						sPath += "/" + sPathPart;
 						var oRootViewController = oAppComponent.getRootViewController();
-						var oTitleHierarchyCache = oRootViewController.getTitleHierarchyCache();
 						var pWaitForTitleHiearchyInfo;
 						var sParameterPath = oMetaModel.getMetaPath(sPath);
 						var bResultContext = oMetaModel.getObject(sParameterPath + "/@com.sap.vocabularies.Common.v1.ResultContext");
@@ -1097,11 +1077,9 @@ sap.ui.define(
 							iSkipParameterized = 1;
 							return;
 						}
-						if (!oTitleHierarchyCache[sPath]) {
-							pWaitForTitleHiearchyInfo = oRootViewController.addNewEntryInCacheTitle(sPath, oAppComponent);
-						} else {
-							pWaitForTitleHiearchyInfo = Promise.resolve(oTitleHierarchyCache[sPath]);
-						}
+
+						pWaitForTitleHiearchyInfo = oRootViewController.getTitleInfoFromPath(sPath);
+
 						pWaitForTitleHiearchyInfo
 							.then(function(oTitleHiearchyInfo) {
 								var idx = i - iSkipParameterized,

package/src/sap/fe/templates/ObjectPage/controls/StashableHBox.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(
 	["sap/m/HBox", "sap/m/HBoxRenderer", "sap/ui/core/StashedControlSupport"],

package/src/sap/fe/templates/ObjectPage/controls/StashableVBox.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(
 	["sap/m/VBox", "sap/m/VBoxRenderer", "sap/ui/core/StashedControlSupport"],

package/src/sap/fe/templates/ObjectPage/controls/SubSectionBlock.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(["sap/uxap/BlockBase"], function(BlockBase) {

package/src/sap/fe/templates/ObjectPage/designtime/FlexBox.designtime.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
+    
  */
 // Provides the Design Time Metadata for the sap.m.FlexBox control
 sap.ui.define([], function() {

package/src/sap/fe/templates/ObjectPage/designtime/StashableHBox.designtime.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
+    
  */
 
 // Provides the Design Time Metadata for the sap.fe.templates.ObjectPage.controls.StashableHBox control

package/src/sap/fe/templates/ObjectPage/designtime/StashableVBox.designtime.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
+    
  */
 
 // Provides the Design Time Metadata for the sap.fe.templates.ObjectPage.controls.StashableVBox control