@sapui5/sap.fe.templates 1.95.0 → 1.98.0

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

@@ -1,18 +1,20 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 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";
 
 		/**
@@ -39,9 +41,43 @@ sap.ui.define(
 					var oView = this.getView(),
 						oController = oView.getController();
 					aStateControls.push(oController._getCurrentPage(oView));
+				},
+				onRestore: function() {
+					var oView = this.getView(),
+						oNavContainer = oView.byId("appContent");
+					var oInternalModel = oNavContainer.getModel("internal");
+					var oPages = oInternalModel.getProperty("/pages");
+
+					for (var sComponentId in oPages) {
+						oInternalModel.setProperty("/pages/" + sComponentId + "/restoreStatus", "pending");
+					}
+				},
+				onSuspend: function() {
+					var oView = this.getView(),
+						oNavContainer = oView.byId("appContent");
+					var aPages = oNavContainer.getPages();
+					aPages.forEach(function(oPage) {
+						var oTargetView = CommonUtils.getTargetView(oPage);
+
+						var oController = oTargetView && oTargetView.getController();
+						if (oController && oController.viewState && oController.viewState.onSuspend) {
+							return oController.viewState.onSuspend();
+						}
+					});
 				}
 			}),
 
+			onContainerReady: function() {
+				// Restore views if neccessary.
+				var oView = this.getView(),
+					oPagePromise = this._getCurrentPage(oView);
+
+				return oPagePromise.then(function(oCurrentPage) {
+					var oTargetView = CommonUtils.getTargetView(oCurrentPage);
+					return KeepAliveHelper.restoreView(oTargetView);
+				});
+			},
+
 			_getCurrentPage: function(oView) {
 				return new Promise(function(resolve) {
 					var oNavContainer = oView.byId("appContent");
@@ -92,40 +128,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%"
-								});
+							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 || "");
 							}
-						})
-					);
-				} else {
-					this.oMessagePage.setDescription(mParameters.description || "");
-				}
 
-				oNavContainer.to(this.oMessagePage.getId());
+							if (mParameters.handleShellBack) {
+								var oErrorOriginPage = oNavContainer.getCurrentPage(),
+									oAppComponent = CommonUtils.getAppComponent(oNavContainer.getCurrentPage());
+								oAppComponent.getShellServices().setBackNavigation(function() {
+									oNavContainer.to(oErrorOriginPage.getId());
+									oAppComponent.getShellServices().setBackNavigation();
+								});
+							}
+							oNavContainer.attachAfterNavigate(function() {
+								resolve(true);
+							});
+							oNavContainer.to(this.oMessagePage.getId());
+						} catch (e) {
+							reject(false);
+							Log.info(e);
+						}
+					}.bind(this)
+				);
 			}
 		});
 	},

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[
@@ -53,12 +53,12 @@ sap.ui.define(
 				this.oPlaceholder.attachRouteMatchers();
 				this.getAppComponent()
 					.getRoutingService()
-					.attachAfterRouteMatched(this.shellTitleHandler, this);
+					.attachAfterRouteMatched(this._onAfterRouteMatched, this);
 			},
 			onExit: function() {
 				this.getAppComponent()
 					.getRoutingService()
-					.detachAfterRouteMatched(this.shellTitleHandler, this);
+					.detachAfterRouteMatched(this._onAfterRouteMatched, this);
 				this.oRouter = null;
 
 				SizeHelper.exit();
@@ -132,42 +132,48 @@ sap.ui.define(
 			},
 
 			/**
-			 * This function is updating the shell title after each navigation.
+			 * Callback when the navigation is done.
+			 *  - update the shell title.
+			 *  - update table scroll.
+			 *  - call onPageReady on the rightMostView.
 			 *
 			 * @param oEvent
-			 * @name sap.fe.templates.RootContainer.controller.BaseController#shellTitleHandler
+			 * @name sap.fe.templates.RootContainer.controller.BaseController#_onAfterRouteMatched
 			 * @memberof sap.fe.templates.RootContainer.controller.BaseController
 			 */
-			shellTitleHandler: function(oEvent) {
+			_onAfterRouteMatched: function(oEvent) {
 				var that = this;
-				if (!that.oShellTitlePromise) {
-					that.oShellTitlePromise = that
+				if (!that._oRouteMatchedPromise) {
+					that._oRouteMatchedPromise = that
 						.waitForRightMostViewReady(oEvent)
 						.then(function(oView) {
+							// The autoFocus is initially disabled on the navContainer or the FCL, so that the focus stays on the Shell menu
+							// even if the app takes a long time to launch
+							// The first time the view is displayed, we need to enable the autofocus so that it's managed properly during navigation
+							var oRootControl = that.getView().getContent()[0];
+							if (oRootControl && oRootControl.getAutoFocus && !oRootControl.getAutoFocus()) {
+								oRootControl.setProperty("autoFocus", true, true); // Do not mark the container as invalid, otherwise it's re-rendered
+							}
+
 							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 && oView.getParent().onPageReady) {
+								oView.getParent().onPageReady({ forceFocus: bForceFocus });
 							}
-							var oLastFocusedControl = oAppComponent.getRouterProxy().getFocusControlForCurrentHash();
-							if (oView.getController() && oView.getController().onPageReady) {
-								if (oLastFocusedControl) {
-									oView.getParent().onPageReady({ lastFocusedControl: oLastFocusedControl });
-								} else {
-									var currentFocusedControlId = sap.ui.getCore().getCurrentFocusedControlId();
-									var oCurrentFocusedControl = {
-										controlId: currentFocusedControlId,
-										focusInfo: { id: currentFocusedControlId }
-									};
-									oView.getParent().onPageReady({ lastFocusedControl: oCurrentFocusedControl });
-								}
+							if (that.onContainerReady) {
+								that.onContainerReady();
 							}
-							that.oShellTitlePromise = null;
 						})
 						.catch(function(oError) {
 							Log.error("An error occurs while computing the title hierarchy and calling focus method", oError);
-							that.oShellTitlePromise = null;
+						})
+						.finally(function() {
+							that._oRouteMatchedPromise = null;
 						});
 				}
 			},
@@ -175,12 +181,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 = {};
 				}
@@ -212,53 +218,86 @@ sap.ui.define(
 			},
 
 			/**
-			 * This function is updating the cache to store Title Information
-			 *
-			 * @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
+			 * Fetches the value of the HeaderInfo title for a given path.
 			 *
-			 * @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;
 				});
 			},
 			/**
@@ -274,7 +313,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];
@@ -287,113 +326,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.getProperty(
-										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,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define([], function() {
 	"use strict";

package/src/sap/fe/templates/RootContainer/view/Fcl.view.xml

@@ -8,8 +8,9 @@
 	<FlexibleColumnLayout
 		id="appContent"
 		backgroundDesign="Transparent"
-		layout="{fcl>/layout}"
 		stateChange="onStateChanged"
 		afterEndColumnNavigate="onStateChanged"
+		restoreFocusOnBackNavigation="true"
+		autoFocus="false"
 	/>
 </mvc:View>

package/src/sap/fe/templates/RootContainer/view/NavContainer.view.xml

@@ -5,5 +5,5 @@
 	height="100%"
 	controllerName="sap.fe.templates.RootContainer.controller.NavContainer"
 >
-	<NavContainer id="appContent" />
+	<NavContainer id="appContent" autoFocus="false" />
 </mvc:View>

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[],

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

@@ -3,17 +3,21 @@
 	xmlns="sap.m"
 	xmlns:macro="sap.fe.macros.internal"
 	xmlns:core="sap.ui.core"
+	template:require="{
+		HELPER: 'sap/fe/macros/chart/ChartHelper'
+	}"
 >
 
 	<macro:Chart
 		id="{visualizationDefinition>id}"
+		_applyIdToContent="true"
 		contextPath="{visualizationDefinition>collection}"
 		metaPath="{presentationContext>annotationPath}"
 		chartDefinition="{visualizationDefinition>}"
 		selectionMode="Multiple"
 		personalization="{visualizationDefinition>personalization}"
-		chartDelegate="{= '{name: \'sap/fe/templates/AnalyticalListPage/chart/FEChartDelegate\', payload: { contextPath: \'' + (${viewData>contextPath} ? ${viewData>contextPath} : ('\/' + ${visualizationDefinition>entityName})) + '\' } }' }"
-		dataPointsSelected=".handlers.onChartSelectionChanged"
+		chartDelegate="{= '{name: \'sap/fe/templates/AnalyticalListPage/chart/FEChartDelegate\', payload: { contextPath: \'' + HELPER.getCollectionName(${visualizationDefinition>collection}) + '\', parameters:{$$groupId:\'$auto.Workers\'}, selectionMode: \'Multiple\' } }' }"
+		selectionChange=".handlers.onChartSelectionChanged"
 		noDataText="{= ${converterContext>template} === 'ObjectPage' ? undefined : ${sap.fe.i18n>T_OP_TABLE_AND_CHART_NO_DATA_TEXT} }"
 	>
 	</macro:Chart>

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

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

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

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