@sapui5/sap.suite.ui.generic.template 1.134.2 → 1.136.0

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

@@ -1,13 +1,13 @@
 
-ST_GENERIC_DRAFT_WITH_ACTIVE_DOCUMENT_DELETED=\u5DF2\u6368\u68C4\u66F4\u6539\u3002
+ST_GENERIC_DRAFT_WITH_ACTIVE_DOCUMENT_DELETED=\u5DF2\u6368\u68C4\u66F4\u6539\u5167\u5BB9
 
-ST_GENERIC_DRAFT_WITHOUT_ACTIVE_DOCUMENT_DELETED=\u5DF2\u6368\u68C4\u8349\u7A3F\u3002
+ST_GENERIC_DRAFT_WITHOUT_ACTIVE_DOCUMENT_DELETED=\u5DF2\u6368\u68C4\u8349\u7A3F
 
 ST_GENERIC_UNKNOWN_NAVIGATION_TARGET=\u627E\u4E0D\u5230\u76EE\u6A19\u3002
 
 ST_GENERIC_ERROR_LOAD_DATA_TEXT=\u627E\u4E0D\u5230\u8ACB\u6C42\u7684\u8CC7\u6599\u3002
 
-ST_GENERIC_NO_ITEM_SELECTED=\u8ACB\u9078\u64C7\u9805\u76EE\u3002
+ST_GENERIC_NO_ITEM_SELECTED=\u8ACB\u9078\u64C7\u9805\u76EE
 
 ST_GENERIC_MULTIPLE_ITEMS_SELECTED=\u8ACB\u50C5\u9078\u64C7\u4E00\u500B\u9805\u76EE\u3002
 
@@ -73,6 +73,10 @@ ST_SEND_CARD_TO_CHAT=\u50B3\u9001
 
 ST_OPEN_NEW_TAB_OR_WINDOW=\u5728\u65B0\u7D22\u5F15\u6A19\u7C64\u6216\u8996\u7A97\u4E2D\u958B\u555F
 
+ST_SHARE_TO_COLLABORATION_MANAGER=\u5206\u4EAB\u81F3 SAP Collaboration Manager
+
+T_TABLE_SHARE_TO_COLLABORATION_MANAGER_TOO_MANY_ITEMS_SELECTED=\u60A8\u50C5\u53EF\u540C\u6642\u5206\u4EAB {0} \u500B\u9805\u76EE\u3002
+
 ST_MESSAGES_DIALOG_TITLE_WARNING=\u8B66\u544A
 
 ST_MESSAGES_DIALOG_TITLE_ERROR=\u932F\u8AA4
@@ -253,7 +257,9 @@ DRAFT_LOCK_EXPIRED=\u53E6\u4E00\u500B\u4F7F\u7528\u8005\u5DF2\u7DE8\u8F2F\u6B64\
 
 ST_NAV_ERROR_NOT_AUTHORIZED_DESC=\u4E0D\u652F\u63F4\u6B64\u61C9\u7528\u7A0B\u5F0F\u7684\u700F\u89BD
 
-NEW_OBJECT=\u672A\u547D\u540D\u7684\u7269\u4EF6
+NEW_OBJECT=\u65B0\u7269\u4EF6
+
+UNNAMED_OBJECT=\u672A\u547D\u540D\u7684\u7269\u4EF6
 
 NOITEMS_SMARTTABLE=\u6C92\u6709\u9805\u76EE\u3002
 
@@ -344,3 +350,108 @@ RTA_CONFIGURATION_CANCEL=\u53D6\u6D88
 
 RTA_CONFIGURATION_APPLY=\u5957\u7528
 
+RTA_CONDENSED_TABLE_LAYOUT=\u58D3\u7E2E\u7684\u8868\u683C\u914D\u7F6E
+
+RTA_CONDENSED_TABLE_LAYOUT_DESC=\u5B9A\u7FA9\u8868\u683C\u662F\u5426\u5177\u6709\u58D3\u7E2E\u7684\u914D\u7F6E
+
+RTA_WIDTH_INCLUDING_COLUMN_HEADER=\u5305\u542B\u6B04\u8868\u982D\u7684\u5BEC\u5EA6
+
+RTA_WIDTH_INCLUDING_COLUMN_HEADER_DESC=\u5B9A\u7FA9\u8868\u683C\u7684\u6B04\u6A19\u984C\u662F\u5426\u5305\u542B\u5BEC\u5EA6
+
+RTA_SELECT_ALL=\u555F\u7528 [\u5168\u9078]
+
+RTA_SELECT_ALL_DESC=\u5B9A\u7FA9\u8868\u683C\u662F\u5426\u61C9\u652F\u63F4\u5168\u9078
+
+RTA_CREATE_MODE=\u5EFA\u7ACB\u6A21\u5F0F
+
+RTA_CREATE_MODE_DESC=\u5B9A\u7FA9\u5EFA\u7ACB\u6A21\u5F0F
+
+RTA_SELECTION_LIMIT=\u9078\u64C7\u9650\u5236
+
+RTA_SELECTION_LIMIT_DESC=\u5B9A\u7FA9\u9078\u64C7\u9650\u5236
+
+RTA_ENABLE_ADD_CARD_TO_INSIGHTS=\u555F\u7528 [\u5C07\u5361\u7247\u65B0\u589E\u81F3\u6D1E\u5BDF]
+
+RTA_DISABLE_ADD_CARD_TO_INSIGHTS=\u96B1\u85CF [\u5C07\u5361\u7247\u65B0\u589E\u81F3\u6D1E\u5BDF]
+
+RTA_DISABLE_ADD_CARD_TO_INSIGHTS_DESC=\u5B9A\u7FA9\u8868\u683C\u662F\u5426\u61C9\u5177\u6709\u6D1E\u5BDF\u6309\u9215
+
+RTA_OP_VARIANT_MANAGEMENT_TABLE=\u8868\u683C\u8B8A\u5F0F\u7BA1\u7406
+
+RTA_OP_VARIANT_MANAGEMENT_TABLE_DESC=\u8868\u683C\u8B8A\u5F0F\u7BA1\u7406
+
+RTA_OP_VARIANT_MANAGEMENT_CHART=\u5716\u8868\u8B8A\u5F0F\u7BA1\u7406
+
+RTA_OP_VARIANT_MANAGEMENT_CHART_DESC=\u5716\u8868\u8B8A\u5F0F\u7BA1\u7406
+
+RTA_INITIAL_LOAD=\u521D\u59CB\u8F09\u5165
+
+RTA_INITIAL_LOAD_DESC=\u521D\u59CB\u8F09\u5165
+
+RTA_SMART_VARIANT_MANAGEMENT=\u8B8A\u5F0F\u7BA1\u7406
+
+RTA_SMART_VARIANT_MANAGEMENT_DESC=\u555F\u7528\u667A\u6167\u8B8A\u5F0F\u7BA1\u7406
+
+RTA_HIDE_VARIANT_MANAGEMENT=\u96B1\u85CF\u8B8A\u5F0F\u7BA1\u7406
+
+RTA_HIDE_VARIANT_MANAGEMENT_DESC=\u96B1\u85CF\u8B8A\u5F0F\u7BA1\u7406
+
+RTA_OPEN_IN_EDIT_MODE=\u5728\u7DE8\u8F2F\u6A21\u5F0F\u4E2D\u958B\u555F
+
+RTA_OPEN_IN_EDIT_MODE_DESC=\u5B9A\u7FA9\u9078\u64C7\u9650\u5236
+
+RTA_DEFAULT_CONTENT_VIEW=\u9810\u8A2D\u5167\u5BB9\u6AA2\u8996
+
+RTA_DEFAULT_CONTENT_VIEW_DESC=\u9810\u8A2D\u5167\u5BB9\u6AA2\u8996
+
+RTA_ENABLE_TABLE_FILTER_IN_PAGE_VARIANT=\u5728\u9801\u9762\u8B8A\u5F0F\u4E2D\u555F\u7528\u8868\u683C\u7BE9\u9078
+
+RTA_ENABLE_TABLE_FILTER_IN_PAGE_VARIANT_DESC=\u5728\u9801\u9762\u8B8A\u5F0F\u4E2D\u555F\u7528\u8868\u683C\u7BE9\u9078
+
+RTA_NAVIGATION_PROPERTIES_LIST_REPORT_FILTER=\u700F\u89BD\u5C6C\u6027
+
+RTA_NAVIGATION_PROPERTIES_LIST_REPORT_FILTER_DESC=\u700F\u89BD\u5C6C\u6027
+
+RTA_SHOW_GO_BUTTON_ON_FILTER_BAR_ANALYTICAL_PAGE=\u5728\u7BE9\u9078\u5217\u4E0A\u986F\u793A [\u958B\u59CB] \u6309\u9215
+
+RTA_SHOW_GO_BUTTON_ON_FILTER_BAR_DESC_ANALYTICAL_PAGE_DESC=\u5728\u7BE9\u9078\u5217\u4E0A\u986F\u793A [\u958B\u59CB] \u6309\u9215
+
+RTA_HIDE_VISUAL_FILTER=\u96B1\u85CF\u8996\u89BA\u5316\u7BE9\u9078
+
+RTA_HIDE_VISUAL_FILTER_DESC=\u96B1\u85CF\u8996\u89BA\u5316\u7BE9\u9078
+
+RTA_DEFAULT_FILTER_MODE=\u9810\u8A2D\u7BE9\u9078\u6A21\u5F0F
+
+RTA_DEFAULT_FILTER_MODE_DESC=\u9810\u8A2D\u7BE9\u9078\u6A21\u5F0F
+
+RTA_SELECTION_MODE=\u9078\u64C7\u6A21\u5F0F
+
+RTA_SELECTION_MODE_DESC=\u5B9A\u7FA9\u9078\u64C7\u6A21\u5F0F
+
+RTA_OP_EDITABLE_HEADER_CONTENT=\u53EF\u7DE8\u8F2F\u7684\u8868\u982D\u5167\u5BB9
+
+RTA_OP_EDITABLE_HEADER_CONTENT_DESC=\u53EF\u7DE8\u8F2F\u7684\u8868\u982D\u5167\u5BB9
+
+RTA_OP_SHOW_RELATED_APPS=\u986F\u793A\u76F8\u95DC\u61C9\u7528\u7A0B\u5F0F
+
+RTA_OP_SHOW_RELATED_APPS_DESC=\u986F\u793A\u76F8\u95DC\u61C9\u7528\u7A0B\u5F0F
+
+RTA_SCOPE_OF_THE_CHANGES=\u66F4\u6539\u5167\u5BB9\u7BC4\u570D
+
+RTA_SCOPE_OF_THE_CHANGES_TOOLTIP=\u66F4\u6539\u5167\u5BB9\u7BC4\u570D
+
+RTA_SCROLLTHRESHOLD_FOR_TABLE_CONFIG=\u6372\u52D5\u9580\u6ABB\u503C
+
+RTA_SCROLLTHRESHOLD_DESC_FOR_TABLE_CONFIG=\u5B9A\u7FA9\u6372\u52D5\u9580\u6ABB\u503C
+
+RTA_THRESHOLD_FOR_TABLE_CONFIG=\u9580\u6ABB\u503C
+
+RTA_THRESHOLD_DESC_FOR_TABLE_CONFIG=\u5B9A\u7FA9\u9580\u6ABB\u503C
+
+RTA_TABLE_TYPE_CONFIG=\u8868\u683C\u985E\u578B
+
+RTA_TABLE_TYPE_DESC_CONFIG=\u5B9A\u7FA9\u61C9\u4F7F\u7528\u7684\u8868\u683C\u985E\u578B
+
+RTA_ENABLE_DATE_RANGE_FILTER=\u555F\u7528\u65E5\u671F\u7BC4\u570D
+
+RTA_ENABLE_DATE_RANGE_FILTER_DESC=\u555F\u7528\u65E5\u671F\u7BC4\u570D

package/src/sap/suite/ui/generic/template/lib/multipleViews/MultipleViewsHandler.js

@@ -11,9 +11,10 @@ sap.ui.define([
 	"sap/base/security/encodeURL",
 	"sap/ui/comp/util/DateTimeUtil",
 	"sap/base/util/isEmptyObject",
-	"sap/ui/core/format/NumberFormat"
+	"sap/ui/core/format/NumberFormat",
+	"sap/suite/ui/generic/template/genericUtilities/filterHelper"
 ], function(BaseObject, Filter, MultipleTablesModeHelper, SingleTableModeHelper, SelectionVariant, metadataAnalyser, FeLogger, testableHelper,
-		extend, encodeURL, DateTimeUtil, isEmptyObject, NumberFormat) {
+		extend, encodeURL, DateTimeUtil, isEmptyObject, NumberFormat,filterHelper) {
 	"use strict";
 
 	var oLogger = new FeLogger("lib.multipleViews.MultipleViewsHandler").getLogger();
@@ -345,6 +346,10 @@ sap.ui.define([
 			// In this case the filters coming from the smart filterbar are not yet included in aFilters.
 			// They will be added by oImplementingHelper.
 			// Thereby, oImplementingHelper may also update its internal structure.
+			
+			//Normalise the table level filters to follow the same format as SFB filters
+			aFilters = filterHelper.fnNormaliseControlFilters(aFilters);
+
 			if (oImplementingHelper.getFiltersAdaptedFromItem) {
 				aFilters = oImplementingHelper.getFiltersAdaptedFromItem(aFilters, oViewMeta, bForCount);
 			}
@@ -392,7 +397,7 @@ sap.ui.define([
 				return "";
 			}
 			if (oItemDataModel.state === "error") {
-				return oTemplateUtils.oCommonUtils.getText("SEG_BUTTON_ERROR", oItemDataModel.text); // originally the text was for segmented button only but is now used for all texts with multiple views
+				return oTemplateUtils.oCommonUtils.getText("SEG_BUTTON_ERROR", [oItemDataModel.text]); // originally the text was for segmented button only but is now used for all texts with multiple views
 			}
 			if (oItemDataModel.state === "" || oItemDataModel.state === "busy") {
 				var oIntegerInstance = NumberFormat.getIntegerInstance({
@@ -639,6 +644,7 @@ sap.ui.define([
 			getMode: fnGetMode,
 			registerKeyChange: fnRegisterKeyChange,
 			getKeys: fnGetKeys,
+                        getFiltersForItem: getFiltersForItem,
 			getInitializationPromise: function() { return oInitializationPromise; }
 		};
 	}

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

@@ -516,8 +516,13 @@ sap.ui.define(["sap/ui/base/Object",
 			sTitle = sTitle || getAppTitle();
 
 			oTemplateContract.oShellServicePromise.then(function (oShellService) {
-				oShellService.setTitle(sTitle);
 				var oCurrentRegistryEntry = oTemplateContract.componentRegistry[oCurrentIdentity.treeNode.componentId];
+				var oAdditionalInformation = oCurrentRegistryEntry.oControllerUtils && oCurrentRegistryEntry.oControllerUtils.oServices.oTemplateCapabilities.fnConstructTitleAdditionalInfo;
+				if (oAdditionalInformation) {
+					oShellService.setTitle(sTitle, oCurrentRegistryEntry.oControllerUtils.oServices.oTemplateCapabilities.fnConstructTitleAdditionalInfo(sTitle, oTemplateContract, oCurrentIdentity));
+				} else {
+					oShellService.setTitle(sTitle);
+				}
 				var oTemplatePrivateModel = oCurrentRegistryEntry.utils.getTemplatePrivateModel();
 				oTemplatePrivateModel.setProperty("/objectPage/headerInfo/objectShellTitle", sTitle);
 			}).catch(function() {
@@ -559,10 +564,9 @@ sap.ui.define(["sap/ui/base/Object",
 				}
 			}
 
-			var bIsAppTitlePrefered = isEmptyObject(oCurrentHash.componentsDisplayed) || (oTemplateContract.oFlexibleColumnLayoutHandler && oTemplateContract.oFlexibleColumnLayoutHandler.isAppTitlePrefered());
-			fnSetTitleForComponent(bIsAppTitlePrefered, oTitleProvider || oActiveComponent);
-
 			Promise.all(aPageDataLoadedPromises).then(function(){
+				var bIsAppTitlePrefered = isEmptyObject(oCurrentHash.componentsDisplayed) || (oTemplateContract.oFlexibleColumnLayoutHandler && oTemplateContract.oFlexibleColumnLayoutHandler.isAppTitlePrefered());
+				fnSetTitleForComponent(bIsAppTitlePrefered, oTitleProvider || oActiveComponent);
 				if (iCurrentHashCount === oCurrentHash.iHashChangeCount && isEmptyObject(mMessagePageParams)){
 					oTemplateContract.oAppComponent.firePageDataLoaded();
 				}
@@ -2057,7 +2061,7 @@ sap.ui.define(["sap/ui/base/Object",
 
 			if (mParameters) {
 				sText = mParameters.text;
-				sMessageType = mParameters.messageType || IllustratedMessageType.ErrorScreen;
+				sMessageType = mParameters.messageType || IllustratedMessageType.UnableToUpload;
 				sDescription = mParameters.description;
 				aAdditionalContent = mParameters.additionalContent;
 			}
@@ -2231,45 +2235,47 @@ sap.ui.define(["sap/ui/base/Object",
 				var fnActivate = function() {
 					// Bind the model for the page itself and all its ancestors (up to level 1)
 					var bindComponentPromise = oRegistryEntry.utils.bindComponent(oRegistryEntry.sCurrentBindingPath, bIsComponentCurrentlyActive);
-					bindComponentPromise.then(function(){
-						if (sComponentId === oCurrentIdentity.treeNode.componentId){
-							var mAncestors = Object.create(null); // Collect all ancestor routes
-							mAncestors.root = true;
-							for (var oTreeNode = oCurrentIdentity.treeNode; oTreeNode.level > 0; oTreeNode = oTemplateContract.mRoutingTree[oTreeNode.parentRoute]){
-								mAncestors[oTreeNode.sRouteName] = true;
-								// Temporary solution (AncestorFeature)
-								if (oTreeNode.contextTargets){
-									for (var i = 0; i < oTreeNode.contextTargets.length; i++){
-										var oContextTarget = oTreeNode.contextTargets[i];
-										// Link control used for BreadCrumbs is bound to the context of the ancestor node as the description is fetched from 
-										// the ancestor object. Unfortunately, the OP where the link is on the OP & its context is propagated, even specific call 
-										// to set the context of ancestor node is not respected as the model find a context which is already bound. Hence, we need 
-										// to break the propagation of current object context before setting the context of ancestor node.
-										oContextTarget.setBindingContext(null);
-										oTreeNode.bindElement(oContextTarget, null, false);
+					return bindComponentPromise
+						.then(function(){
+							(oRegistryEntry.methods.onActivate || Function.prototype)(sBindingPath, bIsComponentCurrentlyActive);
+						})
+						.then(function(){
+							if (sComponentId === oCurrentIdentity.treeNode.componentId){
+								var mAncestors = Object.create(null); // Collect all ancestor routes
+								mAncestors.root = true;
+								for (var oTreeNode = oCurrentIdentity.treeNode; oTreeNode.level > 0; oTreeNode = oTemplateContract.mRoutingTree[oTreeNode.parentRoute]){
+									mAncestors[oTreeNode.sRouteName] = true;
+									// Temporary solution (AncestorFeature)
+									if (oTreeNode.contextTargets){
+										for (var i = 0; i < oTreeNode.contextTargets.length; i++){
+											var oContextTarget = oTreeNode.contextTargets[i];
+											// Link control used for BreadCrumbs is bound to the context of the ancestor node as the description is fetched from 
+											// the ancestor object. Unfortunately, the OP where the link is on the OP & its context is propagated, even specific call 
+											// to set the context of ancestor node is not respected as the model find a context which is already bound. Hence, we need 
+											// to break the propagation of current object context before setting the context of ancestor node.
+											oContextTarget.setBindingContext(null);
+											oTreeNode.bindElement(oContextTarget, null, false);
+										}
 									}
 								}
-							}
-							// Now we have done the binding of the tree node specific model for all ancestors of the current page.
-							// Unbind the tree node specific models for all other pages, as they might use outdated binding pathes.
-							for (var sRouteName in oTemplateContract.mRoutingTree) {
-								if (!mAncestors[sRouteName]) {
-									var oOtherTreeNode = oTemplateContract.mRoutingTree[sRouteName];
-									oOtherTreeNode.unbindElement(oTemplateContract.oNavigationHost, true);
-									// Temporary solution (AncestorFeature)
-									if (oOtherTreeNode.contextTargets) {
-										oOtherTreeNode.contextTargets.forEach(oOtherTreeNode.unbindElement);
+								// Now we have done the binding of the tree node specific model for all ancestors of the current page.
+								// Unbind the tree node specific models for all other pages, as they might use outdated binding pathes.
+								for (var sRouteName in oTemplateContract.mRoutingTree) {
+									if (!mAncestors[sRouteName]) {
+										var oOtherTreeNode = oTemplateContract.mRoutingTree[sRouteName];
+										oOtherTreeNode.unbindElement(oTemplateContract.oNavigationHost, true);
+										// Temporary solution (AncestorFeature)
+										if (oOtherTreeNode.contextTargets) {
+											oOtherTreeNode.contextTargets.forEach(oOtherTreeNode.unbindElement);
+										}
 									}
 								}
 							}
-						}
-						oRegistryEntry.utils.refreshBinding();
-						oRegistryEntry.oStatePreserverPromise.then(function(oStatePreserver){
-							oStatePreserver.applyAppState(sBindingPath, bIsComponentCurrentlyActive);
+							oRegistryEntry.utils.refreshBinding();
+							oRegistryEntry.oStatePreserverPromise.then(function(oStatePreserver){
+								oStatePreserver.applyAppState(sBindingPath, bIsComponentCurrentlyActive);
+							});
 						});
-					});
-					
-					return (oRegistryEntry.methods.onActivate || Function.prototype)(sBindingPath, bIsComponentCurrentlyActive);
 				};
 				// If view is not registered yet ( == oComponentRegistryEntry.fnViewRegisteredResolve still available) perform fnActivate asyncronously, otherwise synchronosly
 				var oRet = oRegistryEntry.fnViewRegisteredResolve ? oRegistryEntry.viewRegistered.then(fnActivate) : (fnActivate() || Promise.resolve());
@@ -3200,7 +3206,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.134.2
+	 * @version 1.136.0
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

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

@@ -808,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]),
-					messageType: IllustratedMessageType.ErrorScreen,
+					messageType: IllustratedMessageType.UnableToUpload,
 					replaceURL: true						
 				};
 			});

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

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

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

@@ -54,6 +54,16 @@ sap.ui.define(["sap/ui/base/Object",
 		var oSmartTableWrapper, oSmartChartWrapper;
 		oSmartChartWrapper = oState.oSmartChart && oTemplateUtils.oCommonUtils.getControlStateWrapper(oState.oSmartChart);
 		oSmartTableWrapper = oState.oSmartTable && oTemplateUtils.oCommonUtils.getControlStateWrapper(oState.oSmartTable);
+
+		if (oState?.oSmartTable?.getTableType() === "ResponsiveTable"){
+			oSmartTableWrapper?.attachStateChanged(function(){
+				//make sure all the previous calls are finished before initiating the current app state call to avoide race condition issues
+				setTimeout(function () {
+					fnStoreCurrentAppStateAndAdjustURL();
+				}, 0);
+			});
+		}
+
 		/**
 		 * This function return the URL parameter info
 		 * @return {promise}

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

@@ -111,7 +111,7 @@ sap.ui.define(["sap/ui/core/mvc/Controller",
 								},
 								"title": {
 									"style": {
-										"color": "#000000"
+										"color": "@sapTextColor"
 									}
 								}
 							}

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

@@ -14,7 +14,7 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/FeError", "sap/ba
 							type: "string",
 							defaultValue: "auto" // allowed values: enabled, disabled, auto
 						},
-						fields: { // Map - keys are property names (of EntitySet used for SFB) 
+						fields: { // Map - keys are property names (of EntitySet used for SFB)
 							type: "object",
 							mapEntryProperties: {
 								historyEnabled: {
@@ -33,7 +33,7 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/FeError", "sap/ba
 			}
 		};
 	}
-		
+
 	function getSelectionFields(oPageSettings, oLeadingEntityType){
 		return oLeadingEntityType["com.sap.vocabularies.UI.v1.SelectionFields"] && oLeadingEntityType["com.sap.vocabularies.UI.v1.SelectionFields"].map(function(oSelectionField, i) {
 			return {
@@ -44,7 +44,7 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/FeError", "sap/ba
 			};
 		});
 	}
-	
+
 	function getHistoryEnabled(oHistorySettings, sPropertyName){
 		var oRelevantSettings = oHistorySettings && oHistorySettings.fields && oHistorySettings.fields[sPropertyName] || oHistorySettings;
 		switch (oRelevantSettings && oRelevantSettings.historyEnabled) {
@@ -71,8 +71,8 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/FeError", "sap/ba
 			return oSetting.historyEnabled !== undefined;
 		});
 	}
-	
-	// creates an object out of an array 
+
+	// creates an object out of an array
 	// entries should have one property used as unique key
 	// result has properties per entry (if key is unique)
 	// if key is not unique: last one wins
@@ -129,29 +129,26 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/FeError", "sap/ba
 	}
 
 	/**
-	 * Reads the navigation properties from "filterSettings" section of manifest 
+	 * Reads the navigation properties from "filterSettings" section of manifest
 	 * and sets the filter bar's navigation properties.
-	 * 
+	 *
 	 * @returns {object} navigation property settings for filter bar. It has 2 attributes.
 	 * 1. "navigationProperties" - Comma separated list of navigation property names
-	 * 2. "useProvidedNavigationProperties" - Boolean value. 
+	 * 2. "useProvidedNavigationProperties" - Boolean value.
 	 * 		If it's true, the filter bar includes only the navigation properties provided in above string.
 	 * 		Otherwise, considers all the navigation properties.
 	 */
-	function fnGetNavigationPropSettings (oPageSettings) {
+	function fnGetNavigationPropSettings (oPageSettings, bIsDraftEnabled) {
 		var aNavigationProperties = oPageSettings && oPageSettings.filterSettings && oPageSettings.filterSettings.navigationProperties;
-		var bUseProvidedNavigationProperties = false;
-		var sIncludedNavigationProperties = "";
-
-		if (Array.isArray(aNavigationProperties)) {
-			bUseProvidedNavigationProperties = true;
-			sIncludedNavigationProperties = aNavigationProperties.join(",");
-		} else {
-			bUseProvidedNavigationProperties = true;
+		if (!Array.isArray(aNavigationProperties)) {
+			aNavigationProperties = [];
+		}
+		if (bIsDraftEnabled && aNavigationProperties.indexOf("DraftAdministrativeData") < 0) {
+			aNavigationProperties.push("DraftAdministrativeData");
 		}
 		return {
-			navigationProperties: sIncludedNavigationProperties,
-			useProvidedNavigationProperties: bUseProvidedNavigationProperties
+			navigationProperties: aNavigationProperties.join(","),
+			useProvidedNavigationProperties: true
 		};
 	}
 

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

@@ -114,7 +114,8 @@
 											rowActionCount="{= ${_templPriv>/listReport/isLeaf} ? 0 : 1 }" 
 											rowSelectionChange="._templateEventHandlers.onRowSelectionChange"
 											beforeOpenContextMenu="._templateEventHandlers.beforeOpenContextMenu($event, '{smartControlId>id}')"
-											scrollThreshold="300">
+											threshold="{= ${tableSettings>threshold} ? ${tableSettings>threshold} : '100'}"
+											scrollThreshold="{= ${tableSettings>scrollThreshold} ? ${tableSettings>scrollThreshold} : '300'}">
 											<!-- Analytical table -->
 											<template:with path="entitySet>" var="listEntitySet">
 												<core:Fragment fragmentName="sap.suite.ui.generic.template.listTemplates.fragments.SmartTableUiTableCommons" type="XML"/>
@@ -137,7 +138,8 @@
 											rowActionCount="{= ${_templPriv&gt;/listReport/isLeaf} ? 0 : 1 }" 
 											rowSelectionChange="._templateEventHandlers.onRowSelectionChange"
 											beforeOpenContextMenu="._templateEventHandlers.beforeOpenContextMenu($event, '{smartControlId>id}')"
-											scrollThreshold="300">
+											threshold="{= ${tableSettings>threshold} ? ${tableSettings>threshold} : '100'}"
+											scrollThreshold="{= ${tableSettings>scrollThreshold} ? ${tableSettings>scrollThreshold} : '300'}">
 											<!-- Grid -->
 											<template:with path="entitySet>" var="listEntitySet">
 												<core:Fragment fragmentName="sap.suite.ui.generic.template.listTemplates.fragments.SmartTableUiTableCommons" type="XML"/>
@@ -164,7 +166,8 @@
 											rowActionCount="{= ${_templPriv&gt;/listReport/isLeaf} ? 0 : 1 }" 
 											rowSelectionChange="._templateEventHandlers.onRowSelectionChange"
 											beforeOpenContextMenu="._templateEventHandlers.beforeOpenContextMenu($event, '{smartControlId>id}')"
-											scrollThreshold="300">
+											threshold="{= ${tableSettings>threshold} ? ${tableSettings>threshold} : '100'}"
+											scrollThreshold="{= ${tableSettings>scrollThreshold} ? ${tableSettings>scrollThreshold} : '300'}">
 											<template:with path="entitySet>" var="listEntitySet">
 												<core:Fragment fragmentName="sap.suite.ui.generic.template.listTemplates.fragments.SmartTableUiTableCommons" type="XML"/>
 											</template:with>

package/src/sap/suite/ui/generic/template/manifestMerger/AddNewObjectPage.js

@@ -50,7 +50,11 @@ sap.ui.define([
             MergerUtil.consistencyCheck(oChangeContent, "ADD", aSupportedProperties);
             var sParentEntitySet = oChangeContent.parentPage.entitySet;
             var sParentComponent = oChangeContent.parentPage.component;
-            var oPageStructure = MergerUtil.iterateAndFind(oManifest["sap.ui.generic.app"],sParentEntitySet, sParentComponent, sChildPageId);
+            // Converting array based manifest into object structure
+            var pages = oManifest["sap.ui.generic.app"]["pages"];
+            oManifest["sap.ui.generic.app"]["pages"] = MergerUtil.transformPagesToMapStructure(pages);
+
+            var oPageStructure = MergerUtil.iterateAndFind(oManifest["sap.ui.generic.app"], sParentEntitySet, sParentComponent, sChildPageId);
             var oComponentContent  =  {
                 "name": "sap.suite.ui.generic.template.ObjectPage"
             };

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

@@ -1,8 +1,8 @@
 /* KPI TAG */
 @_sap_suite_ui_generic_template_ALPConstants_KpiCardMinHeight: 37.5rem;
 @_sap_suite_ui_generic_template_ALPConstants_KpiCardMinWidth: 25rem;
-@_sap_suite_ui_generic_template_ALPConstants_KpiTagContainerMarginLeft : 21px;
-@_sap_suite_ui_generic_template_ALPConstants_KpiErrorPopOverContainerPadding : 10px;
+@_sap_suite_ui_generic_template_ALPConstants_KpiTagContainerMarginLeft : 1.313rem;
+@_sap_suite_ui_generic_template_ALPConstants_KpiErrorPopOverContainerPadding : 0.625rem;
 @_sap_suite_ui_generic_template_ALPConstants_KpiTagPaddingLeftRight: 0.75rem;
 @_sap_suite_ui_generic_template_ALPConstants_KpiTagCompactPaddingTopBottom: 0rem;
 @_sap_suite_ui_generic_template_ALPConstants_KpiTagCozyPaddingTopBottom: 0rem;
@@ -14,7 +14,6 @@
 @_sap_suite_ui_generic_template_ALPConstants_KpiTagLineHeight: 1.4;
 @_sap_suite_ui_generic_template_ALPConstants_KpiTagMinWidth: 4.5rem;
 @_sap_suite_ui_generic_template_ALPConstants_KpiTagMarginTopBottom: 0rem;
-@_sap_suite_ui_generic_template_ALPConstants_KpiTagBorderWidth: 1px 1px 1px 3px;
 @_sap_suite_ui_generic_template_ALPConstants_KpiTagLeftMargin: 0rem;
 @_sap_suite_ui_generic_template_ALPConstants_KpiTagLeftPadding: 1rem;
 @_sap_suite_ui_generic_template_ALPConstants_KpiTagMarginInOverflow: 0.4rem 0.2rem 0.5rem 0.1rem;
@@ -43,5 +42,5 @@
 @_sap_suite_ui_generic_template_ALPConstants_PageChartTitlePadding: 0.2rem 0 0.5rem 0.15rem;
 @_sap_suite_ui_generic_template_ALPConstants_PageHeadingPadding : 0.5rem 2.75rem 0.5rem 1.8rem;
 @_sap_suite_ui_generic_template_ALPConstants_PageContentPadding : 1rem 2rem 1rem 2rem;
-@_sap_suite_ui_generic_template_ALPConstants_ZeroPadding : 0 0 0 0;
+@_sap_suite_ui_generic_template_ALPConstants_ZeroPadding : @sapContent_Padding_S;
 @_sap_suite_ui_generic_template_ALPConstants_PageChartMinHeight : 15rem;