@sapui5/sap.suite.ui.generic.template 1.124.0 → 1.125.0

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.0
+	 * @version 1.125.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,17 @@ 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.isInitialised() ? fnInitInnerChart() : oSmartChart.attachInitialized(fnInitInnerChart);
+
+        function fnInitInnerChart() {
             oSmartChart.getChartAsync().then(function(oChart){
                 oInnerChart = oChart;
             });
-        });
-
-        oSmartChart.getChartAsync().then(function(oChart){
-            oInnerChart = oChart;
-        });
-
+        }
+        
         function fnGetAvailableChartTypes() {
             return oSmartChart.getAvailableChartTypes();
         }

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

@@ -231,7 +231,7 @@ sap.ui.define([
 		//Accepts row context in Grid Table and returns the Grid table row
 		function getGridTableRow(oContext) {
 			var iFirstVisibleRowIndex = oInnerTable.getFirstVisibleRow();
-			var iVisibleRowCount = oInnerTable.getVisibleRowCount();
+			var iVisibleRowCount = oInnerTable.getRowMode().getConfiguredRowCount();
 			var sRowPath = oContext.getPath();
 			for (var i = 0; i < iVisibleRowCount; i++) {
 				if (oInnerTable.getContextByIndex(iFirstVisibleRowIndex + i).getPath() === sRowPath) {
@@ -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
+			};
 		}
 
 		/**

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

@@ -62,7 +62,7 @@ sap.ui.define([
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.124.0",
+		version: "1.125.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/filterSettingsPreparationHelper.js

@@ -40,7 +40,7 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/FeError", "sap/ba
 				key: oSelectionField.PropertyPath.replace('/', '.'),
 				groupId: "_BASIC",
 				index: 10 * (i + 1),
-				visibleInAdvancedArea: true
+				visibleInFilterBar: true
 			};
 		});
 	}

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>

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

@@ -1,20 +1,22 @@
-<core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core" xmlns:smartlink="sap.ui.comp.navpopover" xmlns:smarttable="sap.ui.comp.smarttable" xmlns:table="sap.ui.table" xmlns:plugins="sap.m.plugins"
+<core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core" xmlns:smartlink="sap.ui.comp.navpopover" xmlns:smarttable="sap.ui.comp.smarttable" xmlns:table="sap.ui.table" xmlns:plugins="sap.m.plugins" xmlns:rowmodes="sap.ui.table.rowmodes"
 	xmlns:customData="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
 	template:require="{ AH: 'sap/suite/ui/generic/template/js/AnnotationHelper',
 						AHModel: 'sap/ui/model/odata/AnnotationHelper', 
 						ALPHelper: 'sap/suite/ui/generic/template/AnalyticalListPage/util/AnnotationHelper', 
-						AHMultipleViews:'sap/suite/ui/generic/template/js/AnnotationHelperMultipleViews'}">
+						AHMultipleViews:'sap/suite/ui/generic/template/js/AnnotationHelperMultipleViews',
+						StableIdHelper: 'sap/suite/ui/generic/template/js/StableIdHelper'}">
 
 	<template:with path="entityType&gt;com.sap.vocabularies.UI.v1.HeaderInfo" var="header">
 		<template:with path="tableAnnotationPath>" var="collection">
 			<template:with path="entitySet&gt;dummy" var="facet">
 			<template:with path="entitySet&gt;dummy" var="chartItem">
-				<template:with path="parameter>/" helper="sap.suite.ui.generic.template.js.StableIdHelper.preparePathForStableId" var="smartControlId">
+				<template:with path="parameter>/" helper="StableIdHelper.preparePathForStableId" var="smartControlId">
 					<template:with path="parameter>/settings/keyPerformanceIndicators" helper="ALPHelper.getFilterableKPIs" var="kpiContext">
 						<template:with path="kpiContext>filterableKPIs" var="kpis">
 						<template:if test="{= ${smartControlId>}.buildStableId({type: 'ALPTable', subType: 'SmartTable', sQuickVariantKey: ${tabItem>key}})}" />
 							<smarttable:SmartTable
+									core:require="{setRowNavigated: 'sap/suite/ui/generic/template/js/formatters/setRowNavigated'}"
 									id="{smartControlId>id}"
 									smartFilterId="template::SmartFilterBar"
 									visible="{path: 'tabItem>', formatter: 'AHMultipleViews.getVisibleForALPTableTabs'}"
@@ -33,7 +35,7 @@
 									showDetailsButton="{= ${tableSettings>type} === 'ResponsiveTable'}"
 									detailsButtonSetting="{= ${tableSettings>type} === 'ResponsiveTable' ? 'None,Low,Medium' : null}"
 									demandPopin="{= ${tableSettings>type} === 'ResponsiveTable'}"
-									useExportToExcel="true"
+									enableExport="true"
 									customData:p13nDialogSettings="{= (${parameter&gt;/settings/smartVariantManagement} &amp;&amp; !${parameter&gt;/settings/enableTableFilterInPageVariant}) ? '{filter:{visible:false}}' : '{filter:{visible:true}}'}"
 									customizeConfig="{parts: [{path: 'entitySet>'}, {path: 'entitySet>dummy'}, {path: 'tableSettings>calculateWidthIncludingColumnHeader'}], formatter: 'AH.buildSmartTableCustomizeConfig'}"
 									ignoredFields="{workingContext&gt;ignoredFields}"
@@ -106,7 +108,7 @@
 									<template:then>
 										<!-- ANALYTICAL TABLE -->
 										<table:AnalyticalTable id="{:= ${parameter>/stableId}.getStableId({type: 'ALPTable', subType: 'AnalyticalTable', sQuickVariantKey: ${tabItem>key}})}" 
-											visibleRowCountMode="Auto" enableColumnReordering="true" 
+											enableColumnReordering="true" 
 											showColumnVisibilityMenu="false"  
 											enableColumnFreeze="true" 
 											enableCellFilter="true" 
@@ -123,12 +125,14 @@
 													<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.AnalyticalTableColumns" type="XML" />
 												</table:columns>
 											</template:with>
+											<table:rowMode>
+												<rowmodes:Auto/>
+											</table:rowMode>
 										</table:AnalyticalTable>
 									</template:then>
 									<template:elseif test="{= ${tableSettings>type} === 'GridTable'}">
 										<!-- GRID TABLE -->
 										<table:Table id="{:= ${parameter>/stableId}.getStableId({type: 'ALPTable', subType: 'GridTable', sQuickVariantKey: ${tabItem>key}})}" 
-											visibleRowCountMode="Auto" 
 											enableColumnReordering="true" 
 											showColumnVisibilityMenu="false" 
 											enableColumnFreeze="true" 
@@ -149,13 +153,15 @@
 													<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.GridTableColumns" type="XML" />
 												</table:columns>
 											</template:with>
+											<table:rowMode>
+												<rowmodes:Auto/>
+											</table:rowMode>
 										</table:Table>
 									</template:elseif>
 									<template:elseif test="{= ${tableSettings>type} === 'TreeTable'}">
 										<!-- TREE TABLE -->
 										<table:TreeTable 
 											id="{:= ${parameter>/stableId}.getStableId({type: 'ALPTable', subType: 'TreeTable', sQuickVariantKey: ${tabItem>key}})}" 
-											visibleRowCountMode="Auto" 
 											enableColumnReordering="true" 
 											showColumnVisibilityMenu="false" 
 											enableColumnFreeze="true" 
@@ -171,6 +177,9 @@
 													<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.TreeTableColumns" type="XML" />
 												</table:columns>
 											</template:with>
+											<table:rowMode>
+												<rowmodes:Auto/>
+											</table:rowMode>
 										</table:TreeTable>
 									</template:elseif>
 									<!-- On failing all the above conditions or if the display mode is anything but desktop i.e tablet or phone or any other device it falls back to responsive -->
@@ -185,19 +194,19 @@
 											mode="{tableSettings>mode}" 
 											selectionChange="._templateEventHandlers.onRowSelectionChange" 
 											beforeOpenContextMenu="._templateEventHandlers.beforeOpenContextMenu($event, '{smartControlId>id}')"
-											sticky="ColumnHeaders,HeaderToolbar" 
+											sticky="ColumnHeaders,HeaderToolbar,InfoToolbar" 
 											multiSelectMode="{= (${tableSettings>multiSelect} &amp;&amp; ${tableSettings>selectAll}) ? 'SelectAll' : 'ClearAll'}">
 											<template:with path="entitySet>" var="listEntitySet">
 												<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.TableColumns" type="XML" />
 												<!-- The cloumnListItem added below for the semantic coloring of the table columns overrides the type and press properties of the columnListItem present in the common table column fragment used by responsive table. Hence we are reintroducing them here -->
 												<items>
-													<ColumnListItem highlight="None" id="{:= ${parameter>/stableId}.getStableId({type: 'ALPTable', subType: 'ColumnListItem', sQuickVariantKey: ${tabItem>key}})}" type="{parts: [{path: 'entitySet&gt;'}, {path: 'parameter&gt;/settings/subPages/'}, {path: 'parameter&gt;/manifest/'}, {path: 'parameter&gt;/treeNode/'}, {path:'parameter&gt;/isDraftEnabled'}, {path: 'facet&gt;Target/AnnotationPath'}], formatter: 'AH.getColumnListItemType'}" press="._templateEventHandlers.onListNavigate" navigated="{parts: [{path: '_templPriv>/generic/currentActiveChildContext'}, {path: ''}], formatter: 'sap.suite.ui.generic.template.js.RuntimeFormatters.setRowNavigated'}" >
+													<ColumnListItem highlight="None" id="{:= ${parameter>/stableId}.getStableId({type: 'ALPTable', subType: 'ColumnListItem', sQuickVariantKey: ${tabItem>key}})}" type="{parts: [{path: 'entitySet&gt;'}, {path: 'parameter&gt;/settings/subPages/'}, {path: 'parameter&gt;/manifest/'}, {path: 'parameter&gt;/treeNode/'}, {path:'parameter&gt;/isDraftEnabled'}, {path: 'facet&gt;Target/AnnotationPath'}], formatter: 'AH.getColumnListItemType'}" press="._templateEventHandlers.onListNavigate" navigated="{parts: [{path: '_templPriv>/generic/currentActiveChildContext'}, {path: ''}], formatter: 'setRowNavigated'}" >
 														<customData>
 															<core:CustomData key="CrossNavigation" value="{parts: [{path: 'listEntitySet>name'}, {path: 'parameter>/settings/subPages/'}, {path: 'facet>Target/AnnotationPath'}], formatter: 'AH.getDisplayNavigationIntent'}" />
 														</customData>
 														<cells>
 															<template:repeat list="{collection>}" var="lineItems">
-																<template:with path="parameter>/" helper="sap.suite.ui.generic.template.js.StableIdHelper.preparePathForStableId" var="columnId">
+																<template:with path="parameter>/" helper="StableIdHelper.preparePathForStableId" var="columnId">
 																	<template:if test="{= ${lineItems>RecordType} === 'com.sap.vocabularies.UI.v1.DataField' }">
 																		<template:then>
 																			<template:if test="{= ${columnId>}.buildStableId({type: 'TableColumn', subType: 'DataField', sSmartTableId: ${smartControlId>id}, sProperty: ${lineItems>Value/Path}})}" />

package/src/sap/suite/ui/generic/template/listTemplates/i18n/i18n_sh.properties

@@ -1,2 +1,2 @@
 
-ST_LIST_DISPLAY_TEXT_FOR_EXECUTE_ON_SELECTION=Ako su dostupne prethodno definisane vrijednosti filtera, sadr\u017Eaj se u\u010Ditava automatski.
+ST_LIST_DISPLAY_TEXT_FOR_EXECUTE_ON_SELECTION=Ako su dostupne prethodno definisane vrednosti filtera, sadr\u017Eaj se u\u010Ditava automatski.

package/src/sap/suite/ui/generic/template/themes/base/ObjectPage.less

@@ -386,6 +386,6 @@ html[dir="rtl"] .sapSmartTemplatesObjectPage .sapSmartTemplatesObjectPageSubSect
   display:flex;
 }
 
-.sapSmartTemplatesObjectPageHeaderFormObjectStatus{
+.sapSmartTemplatesObjectPageHeaderFormField .sapMObjStatusText {
   line-height: 1.320rem !important;
 }

package/src/sap/suite/ui/generic/template/themes/sap_belize/library.source.less

@@ -1,4 +1,13 @@
-@import "../base/library.source.less";
+/***********************************************************************************
+/* Due to deprecation of the Belize theme family with SAPUI5 version 1.120 the
+/* inheritance of the base theme is now updated to an inheritance of a static
+/* copy of the base theme named sap_belize_base. The respective
+/* control css files of base are copied to the sap_belize_base theme folder.
+/* This decoupling of the base theme is introduced with SAPUI5 version 1.125.
+***********************************************************************************/
+
+
+@import "../sap_belize_base/library.source.less";
 @import "../../../../../../../sap/ui/core/themes/sap_belize/base.less";
 @import "../../../../../../../sap/ui/core/themes/sap_belize/global.less";