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

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_uk.properties

@@ -75,6 +75,18 @@ MSG_DESCRIPTION_COLUMN_VALUE={0}\: {1}
 
 MSG_DESCRIPTION_COLUMN_VALUE_HIDDEN={0} (\u043F\u0440\u0438\u0445\u043E\u0432\u0430\u043D\u043E)\: {1}
 
+MSG_SUBTITLE_DEFAULT_ROW=\u0420\u044F\u0434\u043E\u043A\: {0}
+
+MSG_SUBTITLE_DEFAULT_ROW_HIDDEN=\u0420\u044F\u0434\u043E\u043A (\u043F\u0440\u0438\u0445\u043E\u0432\u0430\u043D\u043E)\: {0}
+
+MSG_SUBTITLE_DEFAULT_ROW_COLUMN=\u0420\u044F\u0434\u043E\u043A\: {0}, \u0441\u0442\u043E\u0432\u043F\u0447\u0438\u043A\: {1}
+
+MSG_SUBTITLE_DEFAULT_ROW_COLUMN_HIDDEN=\u0420\u044F\u0434\u043E\u043A\: {0}, \u0441\u0442\u043E\u0432\u043F\u0447\u0438\u043A (\u043F\u0440\u0438\u0445\u043E\u0432\u0430\u043D\u043E)\: {1}
+
+MSG_SUBTITLE_DEFAULT_ROW_HIDDEN_COLUMN=\u0420\u044F\u0434\u043E\u043A (\u043F\u0440\u0438\u0445\u043E\u0432\u0430\u043D\u043E)\: {0}, \u0441\u0442\u043E\u0432\u043F\u0447\u0438\u043A\: {1}
+
+MSG_SUBTITLE_DEFAULT_ROW_HIDDEN_COLUMN_HIDDEN=\u0420\u044F\u0434\u043E\u043A (\u043F\u0440\u0438\u0445\u043E\u0432.)\: {0}, \u0441\u0442\u043E\u0432\u043F\u0447\u0438\u043A (\u043F\u0440\u0438\u0445\u043E\u0432.)\: {1}
+
 CONTACT_INFO=\u041A\u043E\u043D\u0442\u0430\u043A\u0442\u043D\u0430 \u0456\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u044F
 
 
@@ -158,9 +170,9 @@ OBJECT_SAVED=\u0412\u0430\u0448\u0456 \u0437\u043C\u0456\u043D\u0438 \u0437\u043
 
 ITEM_CREATED=\u041F\u043E\u0437\u0438\u0446\u0456\u044F \u0441\u0442\u0432\u043E\u0440\u0435\u043D\u0430
 
-WAITING_SMARTTABLE=\u0417\u0430\u0447\u0435\u043A., \u0434\u0430\u043D\u0456 \u0437\u0430\u0432\u0430\u043D\u0442\u0430\u0436\u0443\u044E\u0442\u044C\u0441\u044F...
+WAITING_SMARTTABLE=\u0417\u0430\u0447\u0435\u043A\u0430\u0439\u0442\u0435, \u043F\u043E\u043A\u0438 \u0434\u0430\u043D\u0456 \u0437\u0430\u0432\u0430\u043D\u0442\u0430\u0436\u0443\u044E\u0442\u044C\u0441\u044F.
 
-OBJECT_NOT_MODIFIED=\u0412\u0438 \u043D\u0435 \u0432\u0438\u043A\u043E\u043D\u0430\u043B\u0438 \u0436\u043E\u0434\u043D\u0438\u0445 \u0437\u043C\u0456\u043D.
+OBJECT_NOT_MODIFIED=\u0412\u0438 \u043D\u0435 \u0432\u043D\u0435\u0441\u043B\u0438 \u0436\u043E\u0434\u043D\u0438\u0445 \u0437\u043C\u0456\u043D.
 
 OBJECT_CREATED=\u041E\u0431'\u0454\u043A\u0442 \u0441\u0442\u0432\u043E\u0440\u0435\u043D\u043E.
 

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_vi.properties

@@ -75,6 +75,18 @@ MSG_DESCRIPTION_COLUMN_VALUE={0}\: {1}
 
 MSG_DESCRIPTION_COLUMN_VALUE_HIDDEN={0} (B\u1ECB \u1EA9n)\: {1}
 
+MSG_SUBTITLE_DEFAULT_ROW=Ha\u0300ng\: {0}
+
+MSG_SUBTITLE_DEFAULT_ROW_HIDDEN=Ha\u0300ng (\u00E2\u0309n)\: {0}
+
+MSG_SUBTITLE_DEFAULT_ROW_COLUMN=Ha\u0300ng\: {0}, C\u00F4\u0323t \: {1}
+
+MSG_SUBTITLE_DEFAULT_ROW_COLUMN_HIDDEN=Ha\u0300ng\: {0}, c\u00F4\u0323t (\u00E2\u0309n)\: {1}
+
+MSG_SUBTITLE_DEFAULT_ROW_HIDDEN_COLUMN=Ha\u0300ng (\u00E2\u0309n)\: {0}, c\u00F4\u0323t\: {1}
+
+MSG_SUBTITLE_DEFAULT_ROW_HIDDEN_COLUMN_HIDDEN=Ha\u0300ng (\u00E2\u0309n)\: {0}, c\u00F4\u0323t (\u00E2\u0309n)\: {1}
+
 CONTACT_INFO=Th\u00F4ng tin li\u00EAn h\u00EA\u0323
 
 
@@ -158,9 +170,9 @@ OBJECT_SAVED=Thay \u0111\u00F4\u0309i cu\u0309a ba\u0323n \u0111a\u0303 \u0111\u
 
 ITEM_CREATED=Mu\u0323c \u0111a\u0303 ta\u0323o
 
-WAITING_SMARTTABLE=Vui lo\u0300ng ch\u01A1\u0300 trong khi ta\u0309i d\u01B0\u0303 li\u00EA\u0323u...
+WAITING_SMARTTABLE=Vui l\u00F2ng ch\u1EDD trong khi t\u1EA3i d\u1EEF li\u1EC7u.
 
-OBJECT_NOT_MODIFIED=Ba\u0323n kh\u00F4ng th\u01B0\u0323c hi\u00EA\u0323n b\u00E2\u0301t ky\u0300 thay \u0111\u00F4\u0309i na\u0300o.
+OBJECT_NOT_MODIFIED=Ba\u0323n ch\u01B0a th\u01B0\u0323c hi\u00EA\u0323n b\u00E2\u0301t ky\u0300 thay \u0111\u00F4\u0309i na\u0300o.
 
 OBJECT_CREATED=\u0110a\u0303 ta\u0323o \u0111\u00F4\u0301i t\u01B0\u01A1\u0323ng.
 

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_zh_CN.properties

@@ -75,6 +75,18 @@ MSG_DESCRIPTION_COLUMN_VALUE={0}\uFF1A{1}
 
 MSG_DESCRIPTION_COLUMN_VALUE_HIDDEN={0}\uFF08\u9690\u85CF\uFF09\uFF1A{1}
 
+MSG_SUBTITLE_DEFAULT_ROW=\u884C\uFF1A{0}
+
+MSG_SUBTITLE_DEFAULT_ROW_HIDDEN=\u884C\uFF08\u9690\u85CF\uFF09\uFF1A{0}
+
+MSG_SUBTITLE_DEFAULT_ROW_COLUMN=\u884C\uFF1A{0}\uFF0C\u5217\uFF1A{1}
+
+MSG_SUBTITLE_DEFAULT_ROW_COLUMN_HIDDEN=\u884C\uFF1A{0}\uFF0C\u5217\uFF08\u9690\u85CF\uFF09\uFF1A{1}
+
+MSG_SUBTITLE_DEFAULT_ROW_HIDDEN_COLUMN=\u884C\uFF08\u9690\u85CF\uFF09\uFF1A{0}\uFF0C\u5217\uFF1A{1}
+
+MSG_SUBTITLE_DEFAULT_ROW_HIDDEN_COLUMN_HIDDEN=\u884C\uFF08\u9690\u85CF\uFF09\uFF1A{0}\uFF0C\u5217\uFF08\u9690\u85CF\uFF09\uFF1A{1}
+
 CONTACT_INFO=\u8054\u7CFB\u4EBA\u4FE1\u606F
 
 
@@ -158,7 +170,7 @@ OBJECT_SAVED=\u6240\u505A\u66F4\u6539\u5DF2\u4FDD\u5B58\u3002
 
 ITEM_CREATED=\u5DF2\u521B\u5EFA\u9879\u76EE
 
-WAITING_SMARTTABLE=\u6570\u636E\u52A0\u8F7D\u4E2D\uFF0C\u8BF7\u7A0D\u5019...
+WAITING_SMARTTABLE=\u6570\u636E\u52A0\u8F7D\u4E2D\uFF0C\u8BF7\u7A0D\u5019\u3002
 
 OBJECT_NOT_MODIFIED=\u5C1A\u672A\u8FDB\u884C\u4EFB\u4F55\u66F4\u6539\u3002
 

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

@@ -75,6 +75,18 @@ MSG_DESCRIPTION_COLUMN_VALUE={0}\uFF1A{1}
 
 MSG_DESCRIPTION_COLUMN_VALUE_HIDDEN={0} (\u5DF2\u96B1\u85CF)\uFF1A{1}
 
+MSG_SUBTITLE_DEFAULT_ROW=\u5217\uFF1A{0}
+
+MSG_SUBTITLE_DEFAULT_ROW_HIDDEN=\u5217 (\u5DF2\u96B1\u85CF)\uFF1A{0}
+
+MSG_SUBTITLE_DEFAULT_ROW_COLUMN=\u5217\uFF1A{0}\u3001\u6B04\uFF1A{1}
+
+MSG_SUBTITLE_DEFAULT_ROW_COLUMN_HIDDEN=\u5217\uFF1A{0}\u3001\u6B04 (\u5DF2\u96B1\u85CF)\uFF1A{1}
+
+MSG_SUBTITLE_DEFAULT_ROW_HIDDEN_COLUMN=\u5217 (\u5DF2\u96B1\u85CF)\uFF1A{0}\u3001\u6B04\uFF1A{1}
+
+MSG_SUBTITLE_DEFAULT_ROW_HIDDEN_COLUMN_HIDDEN=\u5217 (\u5DF2\u96B1\u85CF)\uFF1A{0}\u3001\u6B04 (\u5DF2\u96B1\u85CF)\uFF1A{1}
+
 CONTACT_INFO=\u806F\u7D61\u4EBA\u8CC7\u8A0A
 
 
@@ -158,7 +170,7 @@ OBJECT_SAVED=\u5DF2\u5132\u5B58\u60A8\u7684\u66F4\u6539\u3002
 
 ITEM_CREATED=\u5DF2\u5EFA\u7ACB\u9805\u76EE
 
-WAITING_SMARTTABLE=\u8CC7\u6599\u8F09\u5165\u4E2D\uFF0C\u8ACB\u7A0D\u5019....
+WAITING_SMARTTABLE=\u8ACB\u7B49\u5F85\u8CC7\u6599\u8F09\u5165\u3002
 
 OBJECT_NOT_MODIFIED=\u60A8\u5C1A\u672A\u9032\u884C\u66F4\u6539\u3002
 

package/src/sap/suite/ui/generic/template/ObjectPage/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.134.2"
+			"version": "1.135.0"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickCreate/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.134.2"
+			"version": "1.135.0"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickView/manifest.json

@@ -6,7 +6,7 @@
 	"type": "component",
 	"i18n": "i18n/i18n.properties",
 	"applicationVersion": {
-		"version": "1.134.2"
+		"version": "1.135.0"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/designtime/floorplans/ListReport.designtime.js

@@ -134,7 +134,7 @@ sap.ui.define([
 					}
 				},
 				"sap.ui.comp.smartform.Group": {						// used in multiedit dialog
-					actions: ["rename", "remove"],
+					actions: ["rename", "remove", "annotation"],
 					aggregations: {
 						formElements: {
 							actions: ["add", "move"]
@@ -142,7 +142,7 @@ sap.ui.define([
 					}
 				},
 				"sap.ui.comp.smartform.GroupElement": {			// used in multiedit dialog
-					actions: ["rename", "remove", "reveal"]
+					actions: ["rename", "remove", "reveal", "annotation"]
 				},
 				"sap.m.MenuButton": { // used for create and create with filters and possibly created by combining of buttons
 					actions: ["split", "rename", "remove"]

package/src/sap/suite/ui/generic/template/designtime/floorplans/ObjectPage.designtime.js

@@ -234,7 +234,7 @@ sap.ui.define([
 					}
 				},
 				"sap.ui.comp.smartform.Group": {						// not documented in allow list, but checked by RTA OPA test
-					actions: ["rename", "remove"],					// appearantly not checked directly, but indirect (selection of other checked actions by index)
+					actions: ["rename", "remove", "annotation"],					// appearantly not checked directly, but indirect (selection of other checked actions by index)
 					aggregations: {
 						formElements: {
 							actions: ["add", "move", "remove"]
@@ -242,7 +242,9 @@ sap.ui.define([
 					}
 				},
 				"sap.ui.comp.smartform.GroupElement": {			// not documented in allow list, but checked by RTA OPA test
-					actions: ["rename", "remove", "reveal", "combine", "split"] // combine/split is meant for grouping smartfield/links in sections
+					// combine/split is meant for grouping smartfield/links in sections
+					// annotation is meant for changing text arrangement
+					actions: ["rename", "remove", "reveal", "combine", "split", "annotation"] 
 				},
 				"sap.ui.comp.smartvariants.SmartVariantManagement": {
 					actions: ["compVariant"]		// allows to adapt filters (same as adapt filters for end user)
@@ -255,9 +257,6 @@ sap.ui.define([
 				},
 				"sap.m.Title": {
 					actions: ["rename"]
-				},
-				"sap.ui.comp.smartfield.SmartField": {
-					actions: ["annotation"] // Allows to change text arrangement
 				}
 			};
 

package/src/sap/suite/ui/generic/template/detailTemplates/detailUtils.js

@@ -216,6 +216,34 @@ sap.ui.define([	"sap/suite/ui/generic/template/genericUtilities/FeLogger", "sap/
 				oPaginatorButtonsHelper.handleShowPrevObject(oEvent);
 			}
 
+			function fnConstructTitleAdditionalInfo(sTitle, oTemplateContract, oCurrentIdentity) {
+				let sObjectTitle, sObjectSubtitle, sHeaderText;
+				let oCurrentRegistryEntry = oTemplateContract.componentRegistry[oCurrentIdentity.treeNode.componentId];
+				let oTemplatePrivateModel = oCurrentRegistryEntry.utils.getTemplatePrivateModel();
+				sObjectTitle = oTemplatePrivateModel.getProperty("/objectPage/headerInfo/objectTitle");
+				sObjectSubtitle = oTemplatePrivateModel.getProperty("/objectPage/headerInfo/objectSubtitle");
+				let oParentNode = oTemplateContract.mRoutingTree[oCurrentIdentity.treeNode.parentRoute]; //start from the currentNode's parent node
+				let aAncestors = [];
+				let sSeperator = " - ";
+				while (oParentNode.level > 0) { //construct the title only till the main object page
+					aAncestors.push(oParentNode.text || oParentNode.headerTitle);
+					oParentNode = oTemplateContract.mRoutingTree[oParentNode.parentRoute];
+				}
+				let sAncestorsTitle = aAncestors.join(" - "); //final string constructed for the breadcrumb
+				sObjectSubtitle = sObjectSubtitle ? "(" + sObjectSubtitle + ")" : "";
+				if (sObjectTitle && !sObjectSubtitle) {
+					sObjectTitle += sSeperator;
+				}
+				if (sObjectSubtitle) {
+					sObjectSubtitle += sSeperator;
+				}
+				if (sAncestorsTitle && sTitle) {
+					sAncestorsTitle += sSeperator;
+				}
+				sHeaderText = `${sObjectTitle} ${sObjectSubtitle} ${sAncestorsTitle} ${sTitle}`;
+				return {headerText : sHeaderText};
+			}
+
 			// Expose selected private functions to unit tests
 			/* eslint-disable */
 			var fnGetHashChangerInstance = testableHelper.testable(fnGetHashChangerInstance, "getHashChangerInstance");
@@ -259,6 +287,7 @@ sap.ui.define([	"sap/suite/ui/generic/template/genericUtilities/FeLogger", "sap/
 							};
 						}
 					};
+					oTemplateUtils.oServices.oTemplateCapabilities.fnConstructTitleAdditionalInfo = fnConstructTitleAdditionalInfo;
 				},
 				handlers: {
 					handleShowNextObject: handleShowNextObject,

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

@@ -13,7 +13,7 @@
 		<customHeader>
 			<Bar>
 				<contentMiddle>
-					<Text text="{model>/title}"/>
+					<Title level="H1" text="{model>/title}"/>
 				</contentMiddle>
 				<contentLeft>
 					<Button icon="sap-icon://nav-back" visible="{model>/backbtnvisibility}" press="onBackButtonPress" tooltip="{i18n>BACK}" />

package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartFilterBarWrapper.js

@@ -1,5 +1,6 @@
 sap.ui.define([
-], function () {
+	"sap/ui/model/FilterOperator"
+], function (FilterOperator) {
 	"use strict";
 
 
@@ -13,12 +14,12 @@ sap.ui.define([
 
 	/**
 	 * Constructor for SmartFilterBarWrapper
-	 * @param {sap.ui.comp.smartfilterbar.SmartFilterBar} vTarget - The SmartFilterBar control 
+	 * @param {sap.ui.comp.smartfilterbar.SmartFilterBar} vTarget - The SmartFilterBar control
 	 * or the Id of control for which this wrapper is created
 	 * @param {object} oFactory - the controlStateWrapperFactory
-	 * @param {object} mParams 
+	 * @param {object} mParams
 	 * @param {Object} mParams.oCustomFiltersWrapper - wrapper for custom filters (from SFB point of view)
-	 *   (currently containing: generic (currently only editState), app extension, and adaptation extension - but this is knowledge of LR, i.e. of iAppStateHandler, not of SFB) 
+	 *   (currently containing: generic (currently only editState), app extension, and adaptation extension - but this is knowledge of LR, i.e. of iAppStateHandler, not of SFB)
 	 * @returns {object}
 	 * @alias sap.suite.ui.generic.template.genericUtilities.controlStateWrapperFactory.SmartFilterBarWrapper
 	 */
@@ -35,10 +36,10 @@ sap.ui.define([
 			if (typeof vTarget !== "string") {
 				fnSetControl(vTarget);
 			}
-	
-			// Filters visible initially (after initialization). Stored here to be 
-			// able to compare with currently visible ones to identify added and 
-			// removed ones	without need to instantiate all possible filter items 
+
+			// Filters visible initially (after initialization). Stored here to be
+			// able to compare with currently visible ones to identify added and
+			// removed ones	without need to instantiate all possible filter items
 			// (which would harm performance). Can only be retrieved in initialized event.
 			oControlAssignedPromise.then(function () {
 				oSmartFilterBar.getInitializedPromise().then(function () {
@@ -55,7 +56,7 @@ sap.ui.define([
 		function setSVMWrapperCallbacks(oSVMWrapperCallbacks){
 			// Before saving the current state as a new variant, we need to provide all state data of controls controlled by VM, but not known to it with setCustomFilterData. From a
 			// logical point of view, the event (beforeVariantFetch) as well as the method to store the extension data (setCustomFilterData) belong to SVM, but both are implemented
-			// in SFB. Additionally, beforeVariantSave would actually be the name more logical to the consumer, however that name had been used earlier and was deprecated and 
+			// in SFB. Additionally, beforeVariantSave would actually be the name more logical to the consumer, however that name had been used earlier and was deprecated and
 			// replaced by the given one. Fetch actually does not mean to fetch variant content from the place variants are stored, but to get the current state from the controls!
 			oSmartFilterBar.attachBeforeVariantFetch(function(){
 				var oCustomData = Object.create(null);
@@ -63,14 +64,14 @@ sap.ui.define([
 				oCustomData[dataPropertyNameGeneric].customFilters = mParams.oCustomFiltersWrapper.getState();
 				oSmartFilterBar.setCustomFilterData(oCustomData);
 			});
-			
+
 			// When a variant is loaded, correspondingly we have to get the customData and apply the states to the controls not known to SVM. Again, event and method are implemented
 			// in SFB instead of SVM where it would make more sense.
 			// Here the event is afterVariantLoad, as the variant content known to SVM/SFB has first to be applied to the SFB, which will also pass the custom data accordingly. Only
-			// after this has happened, we can get the custom data from SFB. 
+			// after this has happened, we can get the custom data from SFB.
 			oSmartFilterBar.attachAfterVariantLoad(function(oEvent){
 				var oCustomData = oSmartFilterBar.getCustomFilterData();
-				// variant stored with 1.103 or later: all customFilter data stored in property customFilters 
+				// variant stored with 1.103 or later: all customFilter data stored in property customFilters
 				// legacy variant stored with 1.102 or earlier: customFilters (from storing point of view) separated according to their origin
 				var oCustomFiltersState = oCustomData[dataPropertyNameGeneric].customFilters || {
 						editState: oCustomData[dataPropertyNameGeneric].editStateFilter,
@@ -90,48 +91,76 @@ sap.ui.define([
 
 		function fnGetNavigationProperties() {
 			//Fetch the navigation properties
-			var oMetaModel = oSmartFilterBar.getModel().getMetaModel(),
+			const oMetaModel = oSmartFilterBar.getModel().getMetaModel(),
 				sEntitySet = oSmartFilterBar.getEntitySet(),
 				oDataEntitySet = oMetaModel.getODataEntitySet(sEntitySet),
 				oDataEntityType = oMetaModel.getODataEntityType(oDataEntitySet.entityType),
-				oNavigationProperties = oDataEntityType['navigationProperty'],
-				aAddedNavigationProperties = [];
+				aNavigationProperties = oDataEntityType['navigationProperty'];
 			//Fetch the added filters in the current variant
-			var sCurrentVariantID = oSmartFilterBar.getVariantManagement().getCurrentVariantId();
-			var oCurrentVariant = oSmartFilterBar.getVariantManagement().getAllVariants().find(function(variant) {
-				return variant.getId() === sCurrentVariantID;
-			});			
-			if (oCurrentVariant === undefined || oCurrentVariant.getContent() === undefined) {
-				return aAddedNavigationProperties;
+			const sCurrentVariantID = oSmartFilterBar.getVariantManagement().getCurrentVariantId(),
+				oCurrentVariant = oSmartFilterBar.getVariantManagement().getAllVariants().find(function(variant) {
+					return variant.getId() === sCurrentVariantID;
+				});
+			if (!oCurrentVariant
+				|| !oCurrentVariant.getContent()
+				|| !oCurrentVariant.getContent().searchListReportVariant
+				|| !oCurrentVariant.getContent().searchListReportVariant.filterBarVariant
+				|| !aNavigationProperties
+				|| !aNavigationProperties.length
+			) {
+				return [];
 			}
-			var oSmartFilterBarVariant = JSON.parse( oCurrentVariant.getContent().searchListReportVariant.filterBarVariant );
+			const oManifestNavigationProperties = oSmartFilterBar.getNavigationProperties() ?
+				oSmartFilterBar.getNavigationProperties().split(",").reduce(function(accumulator, currentValue){
+					accumulator[currentValue] = true;
+					return accumulator;
+				}, {}) : {},
+				oNavigationProperties = aNavigationProperties.reduce(function(accumulator, currentValue){
+					accumulator[currentValue.name] = true;
+					return accumulator;
+				}, {}),
+				oSmartFilterBarVariant = JSON.parse(oCurrentVariant.getContent().searchListReportVariant.filterBarVariant),
+				aMissing = [];
 			delete oSmartFilterBarVariant["_CUSTOM"];
-			//Compare the filter source and navigation properties
-			var aMatchedRanges = [];
-			for (var key in oSmartFilterBarVariant) {
-				for (var i = 0; i < oNavigationProperties.length; i++) {
-					var obj = oNavigationProperties[i];
-					if (key.startsWith(obj.name)) {
-						if (oSmartFilterBarVariant[key].ranges) {
-							aMatchedRanges.push(oSmartFilterBarVariant[key].ranges);
-						}
-					}
+
+			// Compare the filter source and navigation properties
+			// Take into account if parameter is already specified in page setting in manifest.json - settings->filterSettings->navigationProperties
+			// If parameter exist in navigationProperties -> SFB will handle specific parameter and code ignore it
+			for (const sFilterKey in oSmartFilterBarVariant) {
+				const sParamName = sFilterKey.split(".")[0]; // take first part from navigation parameter. Example: to_Currency.Currency_Code -> to_Currency
+				if (!oNavigationProperties[sParamName] || oManifestNavigationProperties[sParamName]
+				) {
+					// Parameter is
+					// 1) not navigation property -> we don't process it
+					// 2) is defined in manifest.json - settings->filterSettings->navigationProperties -> value will be handled by SFB
+					continue;
+				}
+				if (oSmartFilterBarVariant[sFilterKey].items && oSmartFilterBarVariant[sFilterKey].items.length) {
+					aMissing.push(oSmartFilterBarVariant[sFilterKey].items.map(function(entry) {
+						return {
+							exclude: false,
+							field: sFilterKey,
+							operation: FilterOperator.EQ,
+							value1: entry.key
+						};
+					}));
+					continue;
+				}
+				if (oSmartFilterBarVariant[sFilterKey].ranges && oSmartFilterBarVariant[sFilterKey].ranges.length) {
+					aMissing.push(oSmartFilterBarVariant[sFilterKey].ranges.map(function(entry) {
+						return {
+							exclude: entry.exclude,
+							field: entry.keyField,
+							operation: entry.operation,
+							value1: entry.value1,
+							value2: entry.value2
+						};
+					}));
 				}
 			}
-            if (aMatchedRanges.length) {
-                //Compare the manifest property with the filter source
-                var oManifestNavigationProperties = oSmartFilterBar.getNavigationProperties() || [];
-                var missingNavProperty = aMatchedRanges.filter(function(item) {
-                    var sKeyField = item[0].keyField.split('.')[0];
-                    return !oManifestNavigationProperties.includes(sKeyField);
-                });
-                if (missingNavProperty.length) {
-                    aAddedNavigationProperties = aMatchedRanges;
-                }
-            }
-			return aAddedNavigationProperties;
+			return aMissing;
 		}
-		
+
 		function fnGetState() {
 			if (!oSmartFilterBar) {
 				return oPreliminaryState;
@@ -147,14 +176,14 @@ sap.ui.define([
 			// added/removedFilterItems: selectOptions only contains values/ranges, not the information, whether the filter should be shown directly ("visibleInFilterBar"). SFB just assumes any items to
 			//		be shown that contain values (plus those shown per default), which is wrong in two directions: items made visible but without a value are missed, items with a value, but not shown are
 			//		added additionally
-			//		Remark: 
+			//		Remark:
 			//			- When saving as variant, the information seems to be passed to VM directly - but for appState, it would still be missing
 			//			- Storing added (not in BASIC group but made visible by user) and removed (the other way round) separately to not disconnect the user (using e.g. a saved tile) from future changes
 			//				in the application (e.g. adding a new property to selection fields)
 			//		(Remark: old logic (see iAppStateHandler.getByDefaultNonVisibleCustomFilterNames) seems to provide this data only for custom fields. Assumption: Even in VM it was only available for
 			//		standard fields some time back - now, this seems to be solved from SFB/SVM, but still it's missing for appState)
 			var oSelectOptions = oUiState.getSelectionVariant().SelectOptions; // again, data contained in SelectionVaraint is only partly relevant
-			// In beforeVariantFetch we need to provide the custom (from SVMs point of view) control's state data to the SFB. However, SFB also tries to interpret this data as 
+			// In beforeVariantFetch we need to provide the custom (from SVMs point of view) control's state data to the SFB. However, SFB also tries to interpret this data as
 			// name-value pairs (implicitly stringifying them and assuming name to be a name of a filter), thus whenever the beforeVariantFetch has occured before getting the state
 			// here, the selectionVariant contains a superfluous select option for the property sap.suite.ui.generic.template.genericData (filtering for the value [object Object]).
 			// Note: beforeVariantFetch is even called on initial startup, i.e. without explicetly removing it, the superfluous select option would always be there.
@@ -182,11 +211,11 @@ sap.ui.define([
 
 		function fnSetState(oState) {
 			// Don't cause side effects (filter change event), if setting state is no real change.
-			// If this comparison fails for state that actually are identically, maybe it needs to be enhanced (e.g. ignoring order in some arrays might be needed) 
+			// If this comparison fails for state that actually are identically, maybe it needs to be enhanced (e.g. ignoring order in some arrays might be needed)
 			if (JSON.stringify(oState) === JSON.stringify(fnGetState())){
 				return;
 			}
-			
+
 			bIsApplying = true;
 			oPreliminaryState = oState;
 
@@ -200,16 +229,16 @@ sap.ui.define([
 				oUiState.getSelectionVariant().SelectOptions = oPreliminaryState && oPreliminaryState.selectOptions;
 				oUiState.getSelectionVariant().Parameters = oPreliminaryState && oPreliminaryState.parameters;
 				oUiState.setSemanticDates(oPreliminaryState && oPreliminaryState.semanticDates);
-				// setState is meant to set the state absolutely, no merge needed => replace and strictMode can be set to true. 
+				// setState is meant to set the state absolutely, no merge needed => replace and strictMode can be set to true.
 				// (replace=false can be used to set additional selectOptions but keeping the existing ones. strictMode=false is used to map filters to parameters. Both might make sense in navigation
-				// scenarios (navigation parameter to be merged with defaults, property used in source app as filter but in target as parameter), but not when just restoring to a state (provided from the 
+				// scenarios (navigation parameter to be merged with defaults, property used in source app as filter but in target as parameter), but not when just restoring to a state (provided from the
 				// same control))
 				oSmartFilterBar.setUiState(oUiState, {replace: true, strictMode: true});
 
 				mParams.oCustomFiltersWrapper.setState(oPreliminaryState && oPreliminaryState.customFilters);
-				
+
 				// set visibility
-				// TODO: 
+				// TODO:
 				// - How to deal with old states (not containing all information about visibility) -> legacy state handler?
 				// - restoring from old state when annotation has changed (new selection fields)?
 				oSmartFilterBar.getAllFilterItems().forEach(function(oFilterItem){
@@ -261,7 +290,7 @@ sap.ui.define([
 			});
 			// unclear, whether this is needed, or filterChange event is anyway raised again (after dialog is closed)
 			oSmartFilterBar.attachFiltersDialogClosed(handleStateChanged);
-			
+
 			// do we need to provide and handle change events from custom filters?
 			// contra:
 			// - SFB raises filteChange event also for custom filters
@@ -272,7 +301,7 @@ sap.ui.define([
 			// - existing method in extensionAPI (onCustomAppStateChange)
 			mParams.oCustomFiltersWrapper.attachStateChanged(function(){
 				handleStateChanged();
-				// When a custom filter value is changed by the user, not only the appState changes, but also the variant needs to be marked as dirty. For some known controls, this is 
+				// When a custom filter value is changed by the user, not only the appState changes, but also the variant needs to be marked as dirty. For some known controls, this is
 				// handled from the SFB (which informs the SVM directly). This logic is broken from architectural point of view, as it does not allow to use arbitrary own controls for
 				// extension filters (which is the general idea of an extension).
 				// However, when user selects a variant, custom filters also have to be restored, but that must not mark the selected variant as dirty. Ideally, this should be handled
@@ -293,13 +322,13 @@ sap.ui.define([
 		function fnGetMissingNavProperties() {
 			return aMissingNavFilters;
 		}
-		
+
 		// check waiting for initialization (like in SmartTableWrapper/SmartChartWrapper)
 		// currently, whole appState restoring is waiting for initialized event from sfb - but probably it would be enough to wait for it here
 		fnInitialize();
-		
+
 		return {
-			// generic properties (provided by all state wrappers) 
+			// generic properties (provided by all state wrappers)
 			getState: fnGetState,
 			setState: fnSetState,
 			setControl: fnSetControl,
@@ -307,7 +336,7 @@ sap.ui.define([
 			// specific properties (needed to workaround direct connection between SFB and SVM)
 			setSVMWrapperCallbacks: setSVMWrapperCallbacks,
 			bVMConnection: oSmartFilterBar.getSmartVariant(),
-			suppressSelection: oSmartFilterBar.setSuppressSelection.bind(oSmartFilterBar), // if multiple reasons for suppressing overlap, a counter (to avoid to early resume) could be implemented here 
+			suppressSelection: oSmartFilterBar.setSuppressSelection.bind(oSmartFilterBar), // if multiple reasons for suppressing overlap, a counter (to avoid to early resume) could be implemented here
 			getMissingNavProperties: fnGetMissingNavProperties
 		};
 	}

package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartTableChartCommon.js

@@ -36,7 +36,8 @@ sap.ui.define([
                 return {
                     oUiState: {
                         oPresentationVariant: oUiState.getPresentationVariant(),
-                        oSelectionVariant: oUiState.getSelectionVariant()
+                        oSelectionVariant: oUiState.getSelectionVariant(),
+                        oTableSettings: oUiState.getTableSettings()
                     }
                 };
             }
@@ -56,6 +57,7 @@ sap.ui.define([
                     if (!oUiState.getProperty("variantName")){
                         oUiState.setPresentationVariant(oState.oUiState.oPresentationVariant);
                         oUiState.setSelectionVariant(oState.oUiState.oSelectionVariant);
+                        oUiState.setTableSettings(oState.oUiState.oTableSettings);
                         oControl.setUiState(oUiState);
                     }
                     bIsApplying = false;

package/src/sap/suite/ui/generic/template/genericUtilities/filterHelper.js

@@ -10,6 +10,18 @@ sap.ui.define([
 ], function (FilterOperator, DateFormat, encodeURL, DynamicDateUtil, metadataAnalyser, CalendarType, testableHelper,Filter) {
     "use strict";
 
+	const aNegateOperationsMapping = {
+		[FilterOperator.EQ]: FilterOperator.NE,
+		[FilterOperator.GE]: FilterOperator.LT,
+		[FilterOperator.LT]: FilterOperator.GE,
+		[FilterOperator.LE]: FilterOperator.GT,
+		[FilterOperator.GT]: FilterOperator.LE,
+		[FilterOperator.BT]: FilterOperator.NB,
+		[FilterOperator.Contains]: FilterOperator.NotContains,
+		[FilterOperator.StartsWith]: FilterOperator.NotStartsWith,
+		[FilterOperator.EndsWith]: FilterOperator.NotEndsWith
+	};
+
 	function getInfoForFilters(aFilters, getFilterInfoForPropertyFilters, bAnd){
 		var mPropertyFilters = Object.create(null);
 		var aInfosForFilters = [];
@@ -39,7 +51,7 @@ sap.ui.define([
 		}
 		if (aInfosForFilters.length === 0 ){
 			return null;
-		}		
+		}
 		if (aInfosForFilters.length === 1){
 			return aInfosForFilters[0];
 		}
@@ -60,11 +72,11 @@ sap.ui.define([
 	// The interface of this function should be as follows:
 	// sProperty defines the common property all atomic filters to be handled refer to
 	// aFiltersForProperty is an array of atomic filters all referring to that property
-	// sLogicalOperator is the logical operator ('and' or 'or') these filters should be combined with. 
+	// sLogicalOperator is the logical operator ('and' or 'or') these filters should be combined with.
 	// If aFiltersForProperty contains only one filter this parameter will be the empty string.
 	// The expected return value is an object containing two properties:
 	// - stringRep: The string representation of the given filters
-	// - logicalOperator: The topmost logical operator ('and' or 'or') that was used to create stringRep. 
+	// - logicalOperator: The topmost logical operator ('and' or 'or') that was used to create stringRep.
 	// In case no logical operator is used on top most level it should be faulty
 	function getFilterString(aFilters, getFilterInfoForPropertyFilters) {
 		var oFilterInfo = getInfoForFilters(aFilters, getFilterInfoForPropertyFilters, true);
@@ -187,7 +199,7 @@ sap.ui.define([
      * @param {object} oParams - It contains information like (Model/EntityType/FilterData/bIsStatic),
 	 * Here  bIsStatic is subject to change from false to true whenever application uses custom sematic date
 	 * @param {String} sProperty - property name of the filter field from SFB
-	 * @param {Array} aFiltersForProperty - filter operator of field from SFB 
+	 * @param {Array} aFiltersForProperty - filter operator of field from SFB
 	 * @param {String} sLogicalOperator - logical operator (and/or) betweem each filter item.
      * @returns {string} - return combination of filters as a string.
      */
@@ -265,7 +277,7 @@ sap.ui.define([
 
 /**
 	 * function wraps the table level filters into single filter object
-	 * This is done to follow the same format as SFB and chart filters 
+	 * This is done to follow the same format as SFB and chart filters
 	 * returns the updated aFilters
 	 * @param {Array} aFilters - It contains all the filters applied (in SFB , chart or table level filters)
 	 * @returns {Array} - returns array containing all the filters applied including the table filters wrapped as single filter object similar to SFB and chart filters
@@ -284,7 +296,7 @@ sap.ui.define([
 			}
 		});
 
-		if (aTableFilters && aTableFilters.length > 1) {
+		if (aTableFilters && aTableFilters.length) {
 			//Grouping the table level filters based on sPath
 			var aGroupedTableFilters = aTableFilters.reduce(
 				(aGroupedFilters, oCurrentfilter) => {
@@ -348,10 +360,25 @@ sap.ui.define([
 		sFilterParams = oParams.bIsStatic ? "" : sFilterParams;
 		return sFilterParams;
 	}
+
+	/**
+	 * Transforms operation for exclude
+	 * @private
+	 * @static
+	 * @param {string} sOperation the input operation
+	 * @returns {string} negated operation
+	 */
+	function fnNegateOperation(sOperation) {
+		return aNegateOperationsMapping[sOperation] || sOperation;
+	}
+
 	testableHelper.testableStatic(getFilterInfoForPropertyFilters, "filterHelper_getFilterInfoForPropertyFilters");
 	testableHelper.testableStatic(getFilterString, "filterHelper_getFilterString");
 	testableHelper.testableStatic(fnNormaliseControlFilters, "filterHelper_fnNormaliseControlFilters");
-    return {
-		getFilterParams: getFilterParams
-    };
+
+	return {
+		getFilterParams: getFilterParams,
+		fnNormaliseControlFilters: fnNormaliseControlFilters,
+		negateOperation: fnNegateOperation
+	};
 });