@sapui5/sap.suite.ui.generic.template 1.124.2 → 1.126.0

package/src/sap/suite/ui/generic/template/lib/i18n/i18n_zh_TW.properties

@@ -43,6 +43,10 @@ ST_UNSAVED_CHANGES_TITLE=\u672A\u5132\u5B58\u7684\u66F4\u6539\u5167\u5BB9
 
 ST_STREAM_OPEN_FILE=\u958B\u555F\u6A94\u6848
 
+ST_STREAM_FILE_UNREADABLE=\u7121\u6CD5\u8B80\u53D6\u6A94\u6848\uFF0C\u53EF\u80FD\u8A72\u6A94\u6848\u5DF2\u66F4\u6539\u3002
+
+ST_STREAM_TYPE_MISMATCH=\u4E0D\u652F\u63F4\u6240\u9078\u6A94\u6848\u985E\u578B\u3002
+
 ST_DRAFT_OWNER=\u7531 {0}
 
 ST_DRAFT_ANOTHER_USER=\u3008\u7531\u5176\u4ED6\u4F7F\u7528\u8005\u6240\u57F7\u884C\u3009
@@ -67,7 +71,7 @@ COPY=\u8907\u88FD
 
 ST_SEND_CARD_TO_CHAT=\u50B3\u9001
 
-ST_OPEN_NEW_TAB_OR_WINDOW=\u65BC\u65B0\u7D22\u5F15\u6A19\u7C64\u6216\u8996\u7A97\u4E2D\u958B\u555F
+ST_OPEN_NEW_TAB_OR_WINDOW=\u5728\u65B0\u7D22\u5F15\u6A19\u7C64\u6216\u8996\u7A97\u4E2D\u958B\u555F
 
 ST_MESSAGES_DIALOG_TITLE_WARNING=\u8B66\u544A
 
@@ -151,7 +155,7 @@ ST_GENERIC_ERROR_SYSTEM_UNAVAILABLE_FOR_ACTION=\u7121\u6CD5\u57F7\u884C\u6B64\u5
 
 ST_GENERIC_ERROR_NOT_AUTORIZED_CREATE=\u60A8\u6C92\u6709\u5EFA\u7ACB\u7684\u6B0A\u9650\u3002
 
-T_TABLE_NAVIGATION_TOO_MANY_ITEMS_SELECTED=\u60A8\u4E00\u6B21\u50C5\u53EF\u958B\u555F\u6700\u591A {0} \u500B\u9805\u76EE\u3002
+T_TABLE_NAVIGATION_TOO_MANY_ITEMS_SELECTED=\u60A8\u50C5\u53EF\u540C\u6642\u958B\u555F {0} \u500B\u9805\u76EE\u3002
 
 ST_GENERIC_ERROR_NOT_AUTORIZED_ACTION=\u60A8\u6C92\u6709\u57F7\u884C\u6B64\u52D5\u4F5C\u7684\u6B0A\u9650
 

package/src/sap/suite/ui/generic/template/lib/insights/InsightsCardHelper.js

@@ -436,7 +436,7 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
 	};
 
 	/**
-	* Create Manifest for Data Property of Sap.Card component with the given card defination
+	* Create Manifest for Data Property of Sap.Card component with the given card definition
 	*
 	* @param {Object} oCardDefinition
 	* @param {Object} oSapCard

package/src/sap/suite/ui/generic/template/lib/navigation/NavigationController.js

@@ -76,9 +76,10 @@ sap.ui.define(["sap/ui/base/Object",
 	"sap/suite/ui/generic/template/lib/navigation/routingHelper",
 	"sap/suite/ui/generic/template/lib/navigation/startupParameterHelper",
 	"sap/suite/ui/generic/template/lib/TemplateComponent",
-	"sap/base/strings/whitespaceReplacer"
+	"sap/base/strings/whitespaceReplacer",
+	"sap/m/IllustratedMessageType"
 ], function(BaseObject, extend, isEmptyObject, HashChanger, History, coreLibrary, controlHelper, FeLogger, jsonHelper, oDataModelHelper, ProcessObserver, Queue, testableHelper, CRUDHelper, MessageUtils, routingHelper, startupParameterHelper,
-			TemplateComponent, whitespaceReplacer) {
+			TemplateComponent, whitespaceReplacer, IllustratedMessageType) {
 	"use strict";
 	var	sClassName = "lib.navigation.NavigationController";
 	var oLogger = new FeLogger(sClassName).getLogger();
@@ -417,8 +418,10 @@ sap.ui.define(["sap/ui/base/Object",
 		}
 
 		function getRootComponentPromise(){
-			fnPrepareHostView(oTemplateContract.mRoutingTree.root.sRouteName); // Make sure that the loading of the root component starts
-			return oTemplateContract.mRoutingTree.root.componentCreated;
+			return fnPrepareHostView(oTemplateContract.mRoutingTree.root.sRouteName).then(function () {
+				// Make sure that the loading of the root component starts
+				return oTemplateContract.mRoutingTree.root.componentCreated;
+			}); 
 		}
 
 		function getAppTitle(){
@@ -1290,7 +1293,8 @@ sap.ui.define(["sap/ui/base/Object",
 				title: oDataLoadFailedTexts.dataLoadFailedTitle,
 				text: oDataLoadFailedTexts.dataLoadFailedText,
 				description: "",
-				viewLevel: oFailedNode.fCLLevel                         
+				viewLevel: oFailedNode.fCLLevel,
+				messageType: IllustratedMessageType.NoData                      
 			});
 			return Promise.resolve();
 		}
@@ -1975,30 +1979,17 @@ sap.ui.define(["sap/ui/base/Object",
 		}
 
 		function fnTransferMessageParametersToGlobalModelAndDisplayMessage(mParameters) {
-			var sEntitySet, sText, oEntitySet, oEntityType, oHeaderInfo, sIcon = null,
-				oMetaModel, sDescription;
+			var sText, sDescription, sMessageType;
+
 			if (mParameters) {
-				sEntitySet = mParameters.entitySet;
 				sText = mParameters.text;
-				sIcon = mParameters.icon;
+				sMessageType = mParameters.messageType || IllustratedMessageType.ErrorScreen;
 				sDescription = mParameters.description;
 			}
 
-			if (sEntitySet) {
-				oMetaModel = oTemplateContract.oAppComponent.getModel().getMetaModel();
-				if (oMetaModel) {
-					oEntitySet = oMetaModel.getODataEntitySet(sEntitySet);
-					oEntityType = oMetaModel.getODataEntityType(oEntitySet.entityType);
-					oHeaderInfo = oEntityType["com.sap.vocabularies.UI.v1.HeaderInfo"];
-				}
-				if (oHeaderInfo && oHeaderInfo.TypeImageUrl && oHeaderInfo.TypeImageUrl.String) {
-					sIcon = oHeaderInfo.TypeImageUrl.String;
-				}
-			}
-
 			oTemplateContract.oTemplatePrivateGlobalModel.setProperty("/generic/messagePage", {
 				text: sText,
-				icon: sIcon,
+				messageType: sMessageType,
 				description: sDescription
 			});
 
@@ -2253,34 +2244,42 @@ sap.ui.define(["sap/ui/base/Object",
 		function fnPrepareHostView(oTreeNode, isComponentPreloaded, bOnlyComponent){
 			if (oTreeNode.createComponent) {
 				if (bOnlyComponent || oTemplateContract.oAppComponent.isDestroyed()) {
-					return;
+					return Promise.resolve();
 				}
 				oTreeNode.createComponent();
 				delete oTreeNode.createComponent;
-				return;
+				return Promise.resolve();
 			}
 			if (mRoutesToHostViews[oTreeNode.sRouteName] || oTemplateContract.oAppComponent.isDestroyed()){
-				return;
+				return Promise.resolve();
 			}
+			
 			oLogger.debug("Prepare host view for route " + oTreeNode.sRouteName);
-			var oHostView = oNavigationControllerProxy.createHostView();
-			mRoutesToHostViews[oTreeNode.sRouteName] = oHostView;
-			var oViews = oNavigationControllerProxy.oRouter.getViews();
-			oViews.setView(oTreeNode.sRouteName, oHostView);
-			var oComponentContainer = oHostView.byId("host");
-			if (bOnlyComponent) {
-				oTreeNode.createComponent = fnCreateTemplateComponent.bind(null, oComponentContainer, oTreeNode.sRouteName, isComponentPreloaded);
-			} else {
-				fnCreateTemplateComponent(oComponentContainer, oTreeNode.sRouteName, isComponentPreloaded);	
-			}	
+            var oHostViewPromise = oNavigationControllerProxy.createHostView();
+            var oViews = oNavigationControllerProxy.oRouter.getViews();
+			// Temporarily add the oHostViewPromise to the view cache
+            oViews.setView(oTreeNode.sRouteName, oHostViewPromise);
+
+            return oHostViewPromise.then(function(oHostView) {
+				//Update the view cache with the actual view
+				oViews.setView(oTreeNode.sRouteName, oHostView);
+                mRoutesToHostViews[oTreeNode.sRouteName] = oHostView;
+				var oComponentContainer = oHostView.byId("host");
+				if (bOnlyComponent) {
+					oTreeNode.createComponent = fnCreateTemplateComponent.bind(null, oComponentContainer, oTreeNode.sRouteName, isComponentPreloaded);
+				} else {
+					fnCreateTemplateComponent(oComponentContainer, oTreeNode.sRouteName, isComponentPreloaded); 
+				}
+			});
 		}
 
 		function fnPreloadComponent(sRouteName) {
 			var mRoutingTree = oTemplateContract.mRoutingTree;
 			if (mRoutingTree[sRouteName]) {
 				oLogger.debug("Start preloading of component for route " + sRouteName);
-				fnPrepareHostView(mRoutingTree[sRouteName], true);
+				return fnPrepareHostView(mRoutingTree[sRouteName], true);
 			}
+			return Promise.resolve();
 		}
 		
 		function fnHandleBeforeRouteMatched(oEvent){
@@ -2637,7 +2636,8 @@ sap.ui.define(["sap/ui/base/Object",
 			fnNavigateToMessagePage({
 				title: oTemplateContract.getText("ST_ERROR"),
 				text:  oTemplateContract.getText("ST_GENERIC_UNKNOWN_NAVIGATION_TARGET"),
-				description: ""
+				description: "",
+				messageType: IllustratedMessageType.PageNotFound
 			});
 			oTemplateContract.oBusyHelper.setBusyReason("HashChange", false, undefined, undefined, true);
 		}
@@ -3055,7 +3055,7 @@ sap.ui.define(["sap/ui/base/Object",
 	 * @param {sap.suite.ui.generic.template.lib.AppComponent} oAppComponent The AppComponent instance
 	 * @public
 	 * @extends sap.ui.base.Object
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

package/src/sap/suite/ui/generic/template/lib/navigation/routingHelper.js

@@ -181,16 +181,15 @@ sap.ui.define(["sap/ui/core/Element",
 					oTemplateContract.oNavigationHost, oTemplateContract.oNavigationControllerProxy
 				);
 			}
-			var oHostViewPrepared = XMLView.create({
-				viewName: "sap.suite.ui.generic.template.fragments.TemplateHost"
-			}).then(function(oHostViewTemplate){
-				oTemplateContract.oNavigationControllerProxy.createHostView = function(){
-					return oHostViewTemplate.clone();	
-				};				
-			});
+			
+			oTemplateContract.oNavigationControllerProxy.createHostView = function(){
+				return XMLView.create({
+					viewName: "sap.suite.ui.generic.template.fragments.TemplateHost"
+				});
+			};
+
 			var oModel = oTemplateContract.oAppComponent.getModel();
-			var oPreparationDone = Promise.all([oHostViewPrepared, oModel.getMetaModel().loaded()]);
-			return oPreparationDone.then(function(){
+			return oModel.getMetaModel().loaded().then(function(){
 				var sTargetControlId = oTemplateContract.oNavigationHost.getId();
 				var oConfig = oTemplateContract.oAppComponent.getConfig();
 				if (!oConfig.pages || !oConfig.pages.length) {

package/src/sap/suite/ui/generic/template/lib/navigation/startupParameterHelper.js

@@ -12,9 +12,10 @@ sap.ui.define(["sap/base/util/extend",
 	"sap/suite/ui/generic/template/genericUtilities/testableHelper",
 	"sap/suite/ui/generic/template/lib/CRUDHelper",
 	"sap/base/util/deepExtend",
-	"sap/suite/ui/generic/template/genericUtilities/CacheHelper"
+	"sap/suite/ui/generic/template/genericUtilities/CacheHelper",
+	"sap/m/IllustratedMessageType"
 ], function(extend, isEmptyObject, each, MessageBox, UI5Date, Filter, FilterOperator, odata4analytics, 
-	ModelUtil, FeLogger, oDataModelHelper, testableHelper, CRUDHelper, deepExtend, CacheHelper){
+	ModelUtil, FeLogger, oDataModelHelper, testableHelper, CRUDHelper, deepExtend, CacheHelper, IllustratedMessageType){
 		"use strict";
 		var	sClassName = "lib.navigation.startupParameterHelper";
 		var oLogger = new FeLogger(sClassName).getLogger();
@@ -476,46 +477,48 @@ sap.ui.define(["sap/base/util/extend",
 			if (bIsDraft) {
 				//get the treenode(internal representation of page)
 				var oTreeNode = oTemplateContract.mEntityTree[sEntitySet] || oTemplateContract.mRoutingTree.root;
+				var oComponentRegistryEntry;
 				//create component and register view in order to get oController and oApplicationController.
-				oTemplateContract.oNavigationControllerProxy.prepareHostView(oTreeNode);
-				var oTargets = oTemplateContract.oNavigationControllerProxy.oRouter.getTargets();
-				var oDisplayPromise = oTargets.display(oTreeNode.sRouteName);
-				oTemplateContract.oBusyHelper.setBusy(oDisplayPromise, true, undefined, true);
-				return oTreeNode.componentCreated.then(function(oComponent) {
-					var oComponentRegistryEntry = oTemplateContract.componentRegistry[oComponent.getId()];
-					return oComponentRegistryEntry.viewRegistered.then(function(){
-						var oInfoForContentIdPromise = CacheHelper.getInfoForContentIdPromise(sEntitySet, oModel, oTemplateContract.oAppComponent.getId(), oComponentRegistryEntry.utils.getRootExpand);
-						return oInfoForContentIdPromise.then(function(oInfoObject) {
-							var sRootExpand = oInfoObject.contentIdRequestPossible ? oInfoObject.parametersForContentIdRequest.sRootExpand : null;
-							var oController = oComponentRegistryEntry.oController;
-							var oApplicationController = oTemplateContract.oAppComponent.getApplicationController();
-							var bUseNewActionForCreate = !!(oTemplateContract.mRoutingTree.root.page.component.settings && oTemplateContract.mRoutingTree.root.page.component.settings.useNewActionForCreate);
-							var oParameters = {
-								sRootExpand: sRootExpand,
-								oController: oController,
-								oApplicationController: oApplicationController,
-								bUseNewActionForCreate: bUseNewActionForCreate
-							};
-							var oCreatePromise = CRUDHelper.create(oDraftController, sEntitySet, "/" + sEntitySet, oModel, oTemplateContract.oApplicationProxy, oPredefinedValues, oParameters, oComponentRegistryEntry.oControllerUtils.oCommonUtils);
-							return oCreatePromise.then(function(oContext) {
-								var mAppStates = Object.create(null);
-								// if there is defaultLayoutTypeIfExternalNavigation property  in the manifest of the target application
-								// set the fcl layout property from the value of defaultLayoutTypeIfExternalNavigation
-								if (oTemplateContract.oFlexibleColumnLayoutHandler){
-									var oTreeNode = oTemplateContract.mEntityTree[sEntitySet];
-									oTemplateContract.oFlexibleColumnLayoutHandler.adaptAppStatesForExternalNavigation(oTreeNode, mAppStates);
-								}
-								return oTemplateContract.oNavigationControllerProxy.navigateToSubContext(oContext, true, 4, null, mAppStates).then(Function.prototype); // in case of success: return a Promise that resolves to nothing
-							}, function(oError) {
-								return {
-									title: oTemplateContract.getText("ST_GENERIC_ERROR_TITLE"),
-									text: oError.messageText,
-									description: "",
-									icon: "sap-icon://message-error"
-								};
-							});
-						});
-					});
+				return oTemplateContract.oNavigationControllerProxy.prepareHostView(oTreeNode).then(function () {
+					var oTargets = oTemplateContract.oNavigationControllerProxy.oRouter.getTargets();
+					var oDisplayPromise = oTargets.display(oTreeNode.sRouteName);
+					oTemplateContract.oBusyHelper.setBusy(oDisplayPromise, true, undefined, true);
+					return oTreeNode.componentCreated;
+				}).then(function (oComponent) {
+					oComponentRegistryEntry = oTemplateContract.componentRegistry[oComponent.getId()];
+					return oComponentRegistryEntry.viewRegistered;
+				}).then(function () {
+					var oInfoForContentIdPromise = CacheHelper.getInfoForContentIdPromise(sEntitySet, oModel, oTemplateContract.oAppComponent.getId(), oComponentRegistryEntry.utils.getRootExpand);
+					return oInfoForContentIdPromise;
+				}).then(function (oInfoObject) {
+					var sRootExpand = oInfoObject.contentIdRequestPossible ? oInfoObject.parametersForContentIdRequest.sRootExpand : null;
+					var oController = oComponentRegistryEntry.oController;
+					var oApplicationController = oTemplateContract.oAppComponent.getApplicationController();
+					var bUseNewActionForCreate = !!(oTemplateContract.mRoutingTree.root.page.component.settings && oTemplateContract.mRoutingTree.root.page.component.settings.useNewActionForCreate);
+					var oParameters = {
+						sRootExpand: sRootExpand,
+						oController: oController,
+						oApplicationController: oApplicationController,
+						bUseNewActionForCreate: bUseNewActionForCreate
+					};
+					var oCreatePromise = CRUDHelper.create(oDraftController, sEntitySet, "/" + sEntitySet, oModel, oTemplateContract.oApplicationProxy, oPredefinedValues, oParameters, oComponentRegistryEntry.oControllerUtils.oCommonUtils);
+					return oCreatePromise;
+				}).then(function (oContext) {
+					var mAppStates = Object.create(null);
+					// if there is defaultLayoutTypeIfExternalNavigation property  in the manifest of the target application
+					// set the fcl layout property from the value of defaultLayoutTypeIfExternalNavigation
+					if (oTemplateContract.oFlexibleColumnLayoutHandler){
+						var oTreeNode = oTemplateContract.mEntityTree[sEntitySet];
+						oTemplateContract.oFlexibleColumnLayoutHandler.adaptAppStatesForExternalNavigation(oTreeNode, mAppStates);
+					}
+					return oTemplateContract.oNavigationControllerProxy.navigateToSubContext(oContext, true, 4, null, mAppStates).then(Function.prototype); // in case of success: return a Promise that resolves to nothing
+				}).catch(function (oError) {
+					return {
+						title: oTemplateContract.getText("ST_GENERIC_ERROR_TITLE"),
+						text: oError.messageText,
+						description: "",
+						icon: "sap-icon://message-error"
+					};
 				});
 			}
 			// Non-draft case
@@ -767,8 +770,9 @@ sap.ui.define(["sap/base/util/extend",
 				});
 			});
 			oTemplateContract.oBusyHelper.setBusy(oCallFunctionPromise);
-			oTemplateContract.oNavigationControllerProxy.preloadComponent(oActionDef.treeNode.sRouteName);
-			return oCallFunctionPromise;
+			return oTemplateContract.oNavigationControllerProxy.preloadComponent(oActionDef.treeNode.sRouteName).then(function () {
+				return oCallFunctionPromise;
+			});
 		}
 		
 		function fnParametersToNavigation(oTemplateContract, mParameters){
@@ -804,7 +808,7 @@ sap.ui.define(["sap/base/util/extend",
 					title: oTemplateContract.getText("ST_GENERIC_ERROR_TITLE"),
 					text: oTemplateContract.getText("ST_GENERIC_ERROR_TITLE"),
 					description: oTemplateContract.getText("PARAMETER_COMBINATION_NOT_SUPPORTED", [sMode, sPreferredMode]),
-					icon: "sap-icon://message-error",
+					messageType: IllustratedMessageType.ErrorScreen,
 					replaceURL: true						
 				};
 			});

package/src/sap/suite/ui/generic/template/lib/presentationControl/SmartChartHandler.js

@@ -7,19 +7,30 @@ sap.ui.define([
     function getMethods(oController, oCommonUtils, oComponentUtils, oSmartChart) {
         // Immutable instance attributes
         var oInnerChart;
-        /* multi-table case SmartChart is not yet initialized. Calling getChartAsync() before initialization will be ignored by SmartChart.
-           So waiting for the initialized event! and then calling getChartAsync().
+        /* In multi-table case, the SmartChart is not yet initialized. SmartChart throws error while calling getChartAsync() before initialization.
+           So waiting for the initialized event and then calling getChartAsync(). 
         */
-        oSmartChart.attachInitialized(function() {
-            oSmartChart.getChartAsync().then(function(oChart){
-                oInnerChart = oChart;
-            });
-        });
+        oSmartChart.isInitialised() ? fnInitInnerChart() : oSmartChart.attachInitialized(fnInitInnerChart);
 
-        oSmartChart.getChartAsync().then(function(oChart){
-            oInnerChart = oChart;
+        var fnResolveInit = null;
+        var oInitPromise = new Promise(function (fnResolve) {
+            fnResolveInit = fnResolve;
         });
 
+        function fnGetInitializationPromise() {
+            return oInitPromise;
+        }
+
+        function fnInitInnerChart() {
+            oSmartChart.getChartAsync().then(function(oChart){
+                oInnerChart = oChart;
+                // Resolve the init promise
+                if (fnResolveInit) {
+                    fnResolveInit();
+                }
+            });
+        }
+        
         function fnGetAvailableChartTypes() {
             return oSmartChart.getAvailableChartTypes();
         }
@@ -154,7 +165,8 @@ sap.ui.define([
             applyNavigationSortOrder: fnApplyNavigationSortOrder,
             getToolbar: getToolbar,
             scrollToSelectedItemAsPerChildContext: Function.prototype,
-            getPressedItemParameter: Function.prototype
+            getPressedItemParameter: Function.prototype,
+            getInitializationPromise: fnGetInitializationPromise
         };
     }
 

package/src/sap/suite/ui/generic/template/lib/presentationControl/SmartListHandler.js

@@ -34,6 +34,10 @@ sap.ui.define([
 			return oSmartList.getToolbar();
 		}
         
+        function fnGetInitializationPromise() {
+            return Promise.resolve();
+        }
+
 		// public instance methods
 		return {
             getBinding: fnGetBinding,
@@ -54,7 +58,8 @@ sap.ui.define([
             getToolbar: getToolbar,
             applyNavigationSortOrder: Function.prototype,  // no way to set the sort order in the smart list
             scrollToSelectedItemAsPerChildContext: Function.prototype,
-            getPressedItemParameter: Function.prototype
+            getPressedItemParameter: Function.prototype,
+            getInitializationPromise: fnGetInitializationPromise
 		};
 	}
 

package/src/sap/suite/ui/generic/template/lib/presentationControl/SmartTableHandler.js

@@ -497,20 +497,32 @@ sap.ui.define([
             var oEntityType = oMetaModel.getODataEntityType(oEntitySet.entityType);
             var aAllFieldsMetaModel = oEntityType.property;
 
-            var aPotentialReadOnlyFields = [];
+            var aReadOnlyFields = [], aFieldControls = [];
 			aAllFieldsMetaModel.forEach(function(oEntityProperty) {
                 var oFieldControl = oEntityProperty["com.sap.vocabularies.Common.v1.FieldControl"] && oEntityProperty["com.sap.vocabularies.Common.v1.FieldControl"];
-				var sPath = oFieldControl && oFieldControl.Path;
 				var bEnumMemberReadOnly = oFieldControl && oFieldControl.EnumMember === "com.sap.vocabularies.Common.v1.FieldControlType/ReadOnly";
-				if (oEntityProperty["sap:updatable"] === "false" || sPath || bEnumMemberReadOnly) {
-					aPotentialReadOnlyFields.push({
+				var sFCPath = oFieldControl && oFieldControl.Path;
+				if (oEntityProperty["sap:updatable"] === "false" || bEnumMemberReadOnly) {
+					aReadOnlyFields.push({
 						name: oEntityProperty.name,
 						label: oEntityProperty["sap:label"],
 						ignoredFromPaste: false
 					});
+					return;
+				}
+				// field-control based on path
+				var sFieldControl = oEntityProperty["sap:field-control"];
+				if (sFieldControl || sFCPath) {
+					aFieldControls.push({
+						name: oEntityProperty.name,
+						fieldControl: sFieldControl || sFCPath
+					});
 				}
 			});
-			return aPotentialReadOnlyFields;
+			return {
+				readOnlyFields: aReadOnlyFields,
+				fieldControls: aFieldControls
+			};
 		}
 
 		/**
@@ -537,6 +549,10 @@ sap.ui.define([
 			return null;
 		}
 
+		function fnGetInitializationPromise() {
+            return Promise.resolve();
+        }
+
 		// public instance methods
 		return {
             getBinding: fnGetBinding,
@@ -576,7 +592,8 @@ sap.ui.define([
 			addCellSelector: fnAddCellSelector,
 			getSelection: getSelection,
 			getPotentiallyReadOnlyField: getPotentiallyReadOnlyField,
-			getColumnByKey: fnGetColumnByKey
+			getColumnByKey: fnGetColumnByKey,
+			getInitializationPromise: fnGetInitializationPromise
 		};
 	}
 

package/src/sap/suite/ui/generic/template/library.js

@@ -62,7 +62,7 @@ sap.ui.define([
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.124.2",
+		version: "1.126.0",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {

package/src/sap/suite/ui/generic/template/listTemplates/controller/DetailController.js

@@ -18,6 +18,7 @@ sap.ui.define([
 		"use strict";
 		var eventProvider = new EventProvider();
 	    var oLogger = new FeLogger("listTemplates.controller.DetailController").getLogger();
+		var mPreloadComponentPromiseByRouteName = new Map();
 
 		var tController = Controller.extend("sap.suite.ui.generic.template.listTemplates.controller.DetailController", {
 			setState: function(oState) {
@@ -50,9 +51,23 @@ sap.ui.define([
 				}
 			},
 
+			/**
+			 * This method ensures that "preloadComponent" is called only once per route.
+			 * 
+			 * In the multi-table scenario, this method is called multiple times. 
+			 * There's a possibility that it can be called with same route name (same entity set) multiple times.
+			 * If "preloadComponent" is called multiple times for the same route, it will lead to race condition and the component initialization would break
+			 */
 			onSmartTableDataRequested: function(oSmartTable) {
 				var sRouteName = oSmartTable.getEntitySet();
-				this.oState.oTemplateUtils.oServices.oApplication.preloadComponent(sRouteName);
+				// If the promise is already available in cache, return it
+				if (mPreloadComponentPromiseByRouteName.has(sRouteName)) {
+					return mPreloadComponentPromiseByRouteName.get(sRouteName);
+				}
+				// Otherwise, invoke "preloadComponent" and store the result in cache
+				var oPreloadPromise = this.oState.oTemplateUtils.oServices.oApplication.preloadComponent(sRouteName);
+				mPreloadComponentPromiseByRouteName.set(sRouteName, oPreloadPromise);
+				return oPreloadPromise;
 			},
 
 			///////////////////////

package/src/sap/suite/ui/generic/template/listTemplates/controller/IappStateHandler.js

@@ -30,7 +30,7 @@ sap.ui.define(["sap/ui/base/Object",
 		bIsSearchTriggeredByStartUp = false,
 		_fnStartUpPromise = null,
 		_oStartUpSelectionVariant;
-		var oStoringInformation = null;
+		var sStoredAppStateKey = null;
 		var oSettings = oTemplateUtils.oComponentUtils.getSettings();
 		var sAppStateKeyInUrl = null;
 		var oRealizedAppState = { // this object contains information which can be derived from url
@@ -405,7 +405,7 @@ sap.ui.define(["sap/ui/base/Object",
 				fnSetDefaultFilter();
 			}
 			fnUpdateSVFB();
-			oStoringInformation = null;
+			sStoredAppStateKey = null;
 			//onload behaviour change for Go button mode
 			if (!oState.oSmartFilterbar.isLiveMode()) {
 				var bDataLoad = _fnIsLoadDataOnAppLaunch();
@@ -699,35 +699,38 @@ sap.ui.define(["sap/ui/base/Object",
 			if (oTemplateUtils.oComponentUtils.isStateHandlingSuspended()) {
 				return;
 			}
+
+			var oUshellContainer = sap.ui.require("sap/ushell/Container");
+			// The NavigationHandler.storeInnerAppStateAsync API works only on the ushell environment.
+			// Hence, simply return if ushell container is unavailable.
+			if (!oUshellContainer) {
+				oLogger.error("AnalyticalListPage.fnStoreCurrentAppStateAndAdjustURL: Can't save the app state as ushell container is not found!");
+				return;
+			}
 			// oCurrentAppState is optional
 			// - nothing, if NavigationHandler not available
-			// - adjusts URL immediately
+			// - adjusts URL
 			// - stores appState for this URL (asynchronously)
 			var oCurrentAppState  = getCurrentAppState();
-			// currently NavigationHandler raises an exception when ushellContainer is not available, should be changed
-			// by
-			// Denver
-			try {
-				//storage information object
-				oStoringInformation =  oNavigationHandler.storeInnerAppStateWithImmediateReturn(oCurrentAppState, true);
-			} catch (err) {
-				oLogger.error("AnalyticalListPage.fnStoreCurrentAppStateAndAdjustURL: " + err);
-			}
-			if (oStoringInformation instanceof sap.fe.navigation.NavError) {
-				oStoringInformation = null;
-				return;
-			}
-			if (oState.oTemplateUtils.oComponentUtils.isComponentActive() && oStoringInformation) { // if the appstateKey really represents a new state and the view is still active set it to hash
-				oState.oTemplateUtils.oServices.oApplication.navigateByExchangingQueryParam(sAppState, oStoringInformation.appStateKey);
-			}
-			//LR is using replaceHash function of NavigationHandler to update the key.
-			//LR’s logic is creating the navigation promise and triggering the resolve function on every app state change
-			//For ALP that logic will create performance issue. So using a different logic
-			if (oStoringInformation && sAppStateKeyInUrl !== oStoringInformation.appStateKey) {
-				//No need to wait for oStoringInformation.promise, app state is directly accessible from oStoringInformation object
-				oRealizedAppState.appStateKey = oStoringInformation.appStateKey;
-				oStoringInformation = null;
-			}
+			
+			var oStoreInnerAppStatePromise = oNavigationHandler.storeInnerAppStateAsync(oCurrentAppState, true);
+			oStoreInnerAppStatePromise.done(function (sAppStateKey) {
+				sStoredAppStateKey = sAppStateKey;
+				if (oState.oTemplateUtils.oComponentUtils.isComponentActive() && sStoredAppStateKey) { // if the appstateKey really represents a new state and the view is still active set it to hash
+					oState.oTemplateUtils.oServices.oApplication.navigateByExchangingQueryParam(sAppState, sStoredAppStateKey);
+				}
+				//LR is using replaceHash function of NavigationHandler to update the key.
+				//LR’s logic is creating the navigation promise and triggering the resolve function on every app state change
+				//For ALP that logic will create performance issue. So using a different logic
+				if (sStoredAppStateKey && sAppStateKeyInUrl !== sStoredAppStateKey) {
+					oRealizedAppState.appStateKey = sStoredAppStateKey;
+					sStoredAppStateKey = null;
+				}
+			});
+			oStoreInnerAppStatePromise.fail(function (oError) {
+				oLogger.error("AnalyticalListPage.fnStoreCurrentAppStateAndAdjustURL: " + oError);
+				sStoredAppStateKey = null;
+			});	
 		}
 		function fnCheckToLaunchDialog() {
 			var oTemplatePrivate = oState.oController.getOwnerComponent().getModel("_templPriv");

package/src/sap/suite/ui/generic/template/listTemplates/filterSettingsPreparationHelper.js

@@ -146,6 +146,8 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/FeError", "sap/ba
 		if (Array.isArray(aNavigationProperties)) {
 			bUseProvidedNavigationProperties = true;
 			sIncludedNavigationProperties = aNavigationProperties.join(",");	
+		} else {
+			bUseProvidedNavigationProperties = true;
 		}
 		return {
 			navigationProperties: sIncludedNavigationProperties,

package/src/sap/suite/ui/generic/template/listTemplates/fragments/ActionsFragment.fragment.xml

@@ -8,7 +8,12 @@
   <Button id="template::ClearButton" text="{i18n>CLEAR_FILTERS}" type="Default"
     press="._templateEventHandlers.onClearPress" visible="false"/>
 	<template:if test="{= !${parameter>/settings/showGoButtonOnFilterBar} &amp;&amp; !${device>/system/phone}}">
-		<Button id="template::VisualFilterDialogButton" text="{path:'_templPriv>/alp/filtersLink', formatter: 'sap.suite.ui.generic.template.AnalyticalListPage.util.FilterUtil.formatFiltersLink'}" type="Default" tooltip="{path:'_templPriv>/alp/filtersLink', formatter: 'sap.suite.ui.generic.template.AnalyticalListPage.util.FilterUtil.formatFiltersLink'}"
-		  ariaHasPopup="Dialog" press="._templateEventHandlers.onFilterPress"/>
+      <Button id="template::VisualFilterDialogButton" 
+          core:require="{ALPFilterUtil: 'sap/suite/ui/generic/template/AnalyticalListPage/util/FilterUtil'}"
+          type="Default"
+          text="{parts: [{path: 'i18n>VISUAL_FILTER_FILTERS'}, {path: 'i18n>VISUAL_FILTER_FILTERS_WITH_COUNT'}, {path:'_templPriv>/alp/filtersLink'}], formatter: 'ALPFilterUtil.formatFiltersLink'}"
+          tooltip="{parts: [{path: 'i18n>VISUAL_FILTER_FILTERS'}, {path: 'i18n>VISUAL_FILTER_FILTERS_WITH_COUNT'}, {path:'_templPriv>/alp/filtersLink'}], formatter: 'ALPFilterUtil.formatFiltersLink'}"
+          ariaHasPopup="Dialog" 
+          press="._templateEventHandlers.onFilterPress"/>
 	</template:if>
 </core:FragmentDefinition>