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

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

@@ -40,7 +40,7 @@ sap.ui.define([
 				},
 				"sap.ui.comp.smarttable.SmartTable": {
 					properties: ["useExportToExcel", "editable", "showPasteButton"],
-					actions: ["settings"]
+					actions: ["settings", "annotation"]
 				},
 				"sap.m.Table": {
 					properties: ["growingThreshold", "popinLayout", "includeItemInSelection", "rememberSelections"]		// growingThreshold should not be possible in single section with single subsection
@@ -64,15 +64,6 @@ sap.ui.define([
 							actions: ["move"]
 						}
 					}
-				},
-				"sap.ui.table.Table": {
-					properties: ["scrollThreshold"]
-				},
-				"sap.ui.table.AnalyticalTable": {
-					properties: ["scrollThreshold"]
-				},
-				"sap.ui.table.TreeTable": {
-					properties: ["scrollThreshold"]
 				}
 			};
 
@@ -234,7 +225,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,22 +233,21 @@ 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)
 				},
 				"sap.ui.comp.smarttable.SmartTable": {
-					actions: ["compVariant"]		// allows table personalization (same as for end user)
+					actions: ["compVariant", "annotation"]		// allows table personalization (same as for end user)
 				},
 				"sap.ui.comp.smartchart.SmartChart": {
 					actions: ["compVariant"]		// allows table personalization (same as for end user)
 				},
 				"sap.m.Title": {
 					actions: ["rename"]
-				},
-				"sap.ui.comp.smartfield.SmartField": {
-					actions: ["annotation"] // Allows to change text arrangement
 				}
 			};
 

package/src/sap/suite/ui/generic/template/designtime/utils/designtimeHelper.js

@@ -334,10 +334,14 @@ sap.ui.define([
 						propagateMetadata: function (oElement) {
 							// propagateMetadata is also called for (reuse) components - but they don't have a method getElementName. Anyway, no need to provide (modified) designtime in this case, so just
 							// ignore.
-							var oReducedDesigntime = oElement.getMetadata().getElementName && getReducedDesignTime(oElement, mAllow[oElement.getMetadata().getElementName()]);
+							if (!oElement.getMetadata().getElementName) {
+								return null;
+							}
+							var sElementName = oElement.getMetadata().getElementName();
+							var oReducedDesigntime = getReducedDesignTime(oElement, mAllow[sElementName]);
 
 							var oCustomDesigntime = {};
-							switch (oElement.getMetadata().getElementName()) {
+							switch (sElementName) {
 								case "sap.uxap.ObjectPageLayout":
 									oCustomDesigntime = ObjectPageLayoutDesigntimeHelper.getDesigntime(
 										oElement

package/src/sap/suite/ui/generic/template/designtime/utils/designtimeUtils.js

@@ -8,8 +8,9 @@
 sap.ui.define([
 	"sap/base/util/ObjectPath",
 	"sap/ui/core/Component",
+	"sap/ui/core/message/MessageType",
 	"sap/suite/ui/generic/template/genericUtilities/testableHelper"
-], function (ObjectPath, Component, testableHelper) {
+], function (ObjectPath, Component, MessageType, testableHelper) {
 	"use strict";
 	/**
 	 * Creates the adaptation dialog content based on the provided settings, property values, and unchanged data.
@@ -301,17 +302,17 @@ sap.ui.define([
 				"sap/m/Button",
 				"sap/m/MessageStrip"
 			], function (Dialog, Button, MessageStrip) {
-				const informationText = new MessageStrip({
-					type: "Information",
+				const warningText = new MessageStrip({
+					type: MessageType.Warning,
 					showIcon: true,
 					text: "{i18n>RTA_CONFIGURATION_INFO_MESSAGE}"
 				});
-				informationText.addStyleClass("sapUiSmallMarginBottom");
+				warningText.addStyleClass("sapUiSmallMarginBottom");
 				const dialog = new Dialog({
 					title: title,
 					contentWidth: size ? size.width : "550px",
 					contentHeight: size ? size.height : "300px",
-					content: [informationText, list],
+					content: [warningText, list],
 					resizable: true,
 					buttons: [
 						new Button({

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/EasyFilter.fragment.xml

@@ -2,12 +2,13 @@
     <!-- to check how to use a common model property instead of listReport/filterMode  which is specific to LR-->
     <VBox  visible="{= ${_templPriv>/listReport/filterMode} === 'easyFilter'}">
          <feControls:EasyFilterBarContainer id="template::easyFilterContainer"
-			showValueHelp="._templateEventHandlers.onEasyFilterShowValueHelp"
-			queryChanged="._templateEventHandlers.onEasyFilterQueryChanged"
-			tokensChanged="._templateEventHandlers.onEasyFilterTokensChanged"
-			beforeQueryProcessing="._templateEventHandlers.onEasyFilterBeforeQueryProcessing"
-			afterQueryProcessing="._templateEventHandlers.onEasyFilterAfterQueryProcessing"
-			clearFilters="._templateEventHandlers.onEasyFilterClearFilters"
-		/>
+            showValueHelp="._templateEventHandlers.onEasyFilterShowValueHelp"
+            queryChanged="._templateEventHandlers.onEasyFilterQueryChanged"
+            tokensChanged="._templateEventHandlers.onEasyFilterTokensChanged"
+            beforeQueryProcessing="._templateEventHandlers.onEasyFilterBeforeQueryProcessing"
+            afterQueryProcessing="._templateEventHandlers.onEasyFilterAfterQueryProcessing"
+            clearFilters="._templateEventHandlers.onEasyFilterClearFilters"
+            dataFetcher="._templateEventHandlers.onEasyFilterDataFetcher"
+        />
     </VBox>
 </core:FragmentDefinition>

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/fragments/MessagePage.view.xml

@@ -3,6 +3,6 @@
         id="messagePage" 
         title="{_templPrivGlobal>/generic/messagePage/text}"
         description="{_templPrivGlobal>/generic/messagePage/description}"
-        illustrationSize="Scene"
+        illustrationSize="Large"
         illustrationType="{_templPrivGlobal>/generic/messagePage/messageType}"/>
 </mvc:View>

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

@@ -60,10 +60,10 @@
 	                                        ariaLabelledBy="{columnId>id}"/>
 									</template:else>
 								</template:if>
-								<FormattedText 
-									core:require="{encodeXML: 'sap/base/security/encodeXML'}"
-									htmlText="&lt;em&gt;{path:'i18n>NEW_OBJECT', formatter:'encodeXML'}&lt;/em&gt;"
-									visible="{parts: [{path: 'dataFieldValue>'}, {path: 'dataField>'}, {path: 'entityType>'}], formatter: 'AH.getHeaderVisibility'}"/>
+								<FormattedText
+									core:require="{RuntimeFormatters: 'sap/suite/ui/generic/template/js/RuntimeFormatters'}"
+									htmlText="&lt;em&gt;{parts:[{path:'HasActiveEntity'},{path:'IsActiveEntity'},{path:'i18n>NEW_OBJECT'},{path:'i18n>UNNAMED_OBJECT'}], formatter:'RuntimeFormatters.getDraftObjectDisplayText.bind($control)'}&lt;/em&gt;"
+									visible="{parts: [{path: 'dataFieldValue>'}, {path: 'dataField>'}, {path: 'entityType>'}], formatter: 'AH.getHeaderVisibility'}" />
 								<Text class="sapUiTinyMarginTop"
 									renderWhitespace="true"
 									text="{parts: [{path: 'dataFieldValue>'}, {path: 'dataField>'}, {path: 'entityType>'}], formatter: 'AH.getColumnCellSecondText'}"

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;