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

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

@@ -13,8 +13,10 @@
 		class="navigationPopover navigationPopoverHeader sapMQuickViewPage sapSmartTemplatesSmartLinkNavPopoverContentTitleAreaTrunc">
 		<!--the icon comes from the target entity type header,
 		the binding context is set relatively to the the target, and an expand is added if the picture is behind a nav property-->
+		<!-- The formatter 'sap/suite/ui/generic/template/js/formatters/formatImageUrl' is used by 'AH.formatImageOrTypeUrl' -->
 		<Avatar
 			id="{:= ${parameter>/stableId}.getStableId({type: 'QuickView', subType: 'Avatar'})}"
+			core:require="{formatImageUrl: 'sap/suite/ui/generic/template/js/formatters/formatImageUrl'}"
 			tooltip="{path: 'header>Title/Value', formatter: 'AHModel.format'}"
 			visible="{= !!(${path: 'header>ImageUrl'} || ${path: 'header>TypeImageUrl'}) }"
 			binding="{parts:[{path: 'entitySet>'}, {path: 'quickView>/navigationPath'}, {path: 'header>ImageUrl'}, {path: 'header>TypeImageUrl'}], formatter: 'AH.getPathWithExpandFromHeader'}"
@@ -83,7 +85,6 @@
 													<template:with path="dataField>Value" helper="AHModel.resolvePath" var="dataFieldValue">
 														<template:if test="{= ${path: 'isFirstEmail>', formatter: 'AH.fnCheckFirstEmail'} &amp;&amp; ${dataFieldValue>com.sap.vocabularies.Communication.v1.IsEmailAddress}.Bool === 'true' &amp;&amp; ${parameter>/templateSpecific/teamsCollabOptions} !== undefined &amp;&amp; ${parameter>/templateSpecific/teamsCollabOptions}.length > 0}">
 															<VBox visible="{path: 'dataField>Value', formatter: 'AHModel.format'}" class="sapUiTinyMarginTop">
-																<Toolbar width="100%" height="1px"/>
 																<Toolbar>
 																	<Title text="{i18n>CONTACT_OPTION}" level="H5" class="sapUiTinyMarginBegin"/> 
 																	<ToolbarSpacer/>

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

@@ -66,6 +66,17 @@
 										<sfi:customData>
 											<core:CustomData key="defaultTextInEditModeSource" value="{path: 'dataFieldValue>', formatter: 'AH.setValidationForValueList'}" />
 										</sfi:customData>
+										<template:if test="{= ${connectedFieldElement>Criticality} }">
+											<sfi:controlProposal>
+												<sfi:ControlProposal>
+													<sfi:objectStatus>
+														<sfi:ObjectStatus
+															criticality="{path: 'connectedFieldElement>Criticality', formatter: 'AHModel.simplePath'}"
+															criticalityRepresentationType="{= (${connectedFieldElement>CriticalityRepresentation/EnumMember} === 'com.sap.vocabularies.UI.v1.CriticalityRepresentationType/WithoutIcon') ? 'WithoutIcon' : 'WithIcon'}" />
+													</sfi:objectStatus>
+												</sfi:ControlProposal>
+											</sfi:controlProposal>
+										</template:if>
 										<sfi:customData>
 											<template:with path="connectedFieldElement>Value" helper="AHModel.resolvePath" var="connectedFieldElementValue">
 												<core:CustomData key="SideEffectSourcePropertyType"
@@ -123,7 +134,7 @@
 						<sfi:SmartField
 							value="{path: 'dataField>Value', formatter: 'AH.getDataFieldValueSimplePath'}"
 							visible="{path: 'dataField>', formatter: 'AH.getVisibiltyBasedOnImportanceAndHidden'}"
-							editable="{ui>/editable}" press="._templateEventHandlers.onDataFieldWithNavigationPath">
+							editable="{ui>/editable}" linkPress="._templateEventHandlers.onDataFieldWithNavigationPath">
 							<sfi:customData>
 								<core:CustomData key="defaultTextInEditModeSource" value="{path: 'dataFieldValue>', formatter: 'AH.setValidationForValueList'}" />
 								<core:CustomData key="Target" value="{dataField>Target/NavigationPropertyPath}" />
@@ -173,7 +184,7 @@
 											textLabel="{path: 'dataField>', formatter: 'AH.getDataFieldLabel'}"
 											fetchValueListReadOnly="{parts:[{path: 'parameter>/entityType'},{path: 'dataField>'}], formatter: 'AH.getValueListReadOnly'}"
 											modeToggled="._templateEventHandlers.onSmartFieldModeToggled"
-											press="{parts:[{path: 'parameter>/entityType'},{path: 'dataField>'}], formatter: 'AH.checkIsEmailAddress'}"
+											linkPress="{parts:[{path: 'parameter>/entityType'},{path: 'dataField>'}], formatter: 'AH.checkIsEmailAddress'}"
 											changeModelValue="._templateEventHandlers.onSmartFieldModelValueChanged">
 											<sfi:customData>
 												<core:CustomData key="defaultTextInEditModeSource" value="{path: 'dataFieldValue>', formatter: 'AH.setValidationForValueList'}" />
@@ -183,6 +194,16 @@
 													<smartlink:SemanticObjectController ignoredFields="{parts: [{path: 'quickView>/'}, {path: 'dataField>'}], formatter: 'AH.disableSemanticObjectLinksOnPopups'}" />
 												</sfi:semanticObjectController>
 											</template:if>
+											<template:if test="{= ${dataField>Criticality} }">
+												<sfi:controlProposal>
+													<sfi:ControlProposal>
+														<sfi:objectStatus>
+															<sfi:ObjectStatus criticality="{= ${dataField>Criticality/EnumMember} ? ${dataField>Criticality/EnumMember} : ${path: 'dataField>Criticality', formatter: 'AHModel.simplePath'} }"
+																criticalityRepresentationType="{= (${dataField>CriticalityRepresentation/EnumMember} === 'com.sap.vocabularies.UI.v1.CriticalityRepresentationType/WithoutIcon') ? 'WithoutIcon' : 'WithIcon'}"/>
+														</sfi:objectStatus>
+													</sfi:ControlProposal>
+												</sfi:controlProposal>
+											</template:if>
 											<sfi:customData>
 												<core:CustomData key="SideEffectSourcePropertyType"
 													value="{parts: [{path: 'dataFieldValue>name'}, {path: 'parameter>/isDraftEnabled'}, {path: 'parameter>/metaModel'}, {path: 'parameter>/entityType'}], formatter: 'AH.getSideEffectSourcePropertyType'}" />

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

@@ -14,6 +14,17 @@
 							<smartField:configuration>
 								<smartField:Configuration displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'entitySet>'}, {path: 'dataFieldTarget>Data'}], formatter: 'AH.getTextArrangementForSCFields'}"/>
 							</smartField:configuration>
+							<template:if test="{= ${dataField>Criticality}}">
+								<smartField:controlProposal>
+									<smartField:ControlProposal>
+										<smartField:objectStatus>
+											<smartField:ObjectStatus criticality="{= ${dataField>Criticality/EnumMember} ? ${dataField>Criticality/EnumMember} : ${path: 'dataField>Criticality', formatter: 'AHModel.simplePath'} }"
+																	criticalityRepresentationType="{= (${dataField>CriticalityRepresentation/EnumMember} === 'com.sap.vocabularies.UI.v1.CriticalityRepresentationType/WithoutIcon') ? 'WithoutIcon' : 'WithIcon'}"
+																	ariaLabelledBy="{columnId>id}"/>
+										</smartField:objectStatus>
+									</smartField:ControlProposal>
+								</smartField:controlProposal>
+							</template:if>
 						</smartField:SmartField>
 					</template:then>
 					<template:elseif test="{parts: [{path: 'listEntitySet>'}, {path: 'dataField>'}], formatter: 'AHStream.checkIfEntityOrAssociationHasStreamEnabled'}">
@@ -110,7 +121,7 @@
 			<!-- ObjectPage Self-Linking -->
 			<smartField:SmartField
 				value="{path: 'dataField>Value', formatter: 'AH.getDataFieldValueSimplePath'}"
-				editable="{ui>/editable}" press="._templateEventHandlers.onDataFieldWithNavigationPath"
+				editable="{ui>/editable}" linkPress="._templateEventHandlers.onDataFieldWithNavigationPath"
 				ariaLabelledBy="{columnId>id}">
 				<smartField:customData>
 					<core:CustomData key="Target" value="{dataField>Target/NavigationPropertyPath}" />

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

@@ -116,7 +116,7 @@
 							<table:template>
 								<smartField:SmartField
 									value="{path: 'dataField>Value', formatter: 'AH.getDataFieldValueSimplePath'}"
-									editable="{ui>/editable}" press="._templateEventHandlers.onDataFieldWithNavigationPath">
+									editable="{ui>/editable}" linkPress="._templateEventHandlers.onDataFieldWithNavigationPath">
 									<smartField:customData>
 										<core:CustomData key="Target" value="{dataField>Target/NavigationPropertyPath}" />
 									</smartField:customData>

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

@@ -18,19 +18,23 @@ sap.ui.define([
 
 	/**
 	 * A convenient method to make XMLHTTPRequest with different types of http methods, with a few settings.
-	 * @param setting an object expects following
+	 * @param {object} mSettings an object expects following
 	 * {
-	 * 		url   		@type (boolean): Resource url
-	 * 		async 		@type (boolean): whether request is async or not; default value is true
-	 * 		type		@type (string): method type; GET, PUT, POST, DELETE, PATCH
-	 * 		dtatType 	@type (string):(string): text, json, xml
-	 * 		data		@type (object or string) : to be passed to server, only valid when request is not GET
-	 * }
-	 * @returns response object if async is false, promise if async is true (default).
+	 * @param {string} mSettings.url
+	 *     Resource url
+	 * @param {boolean} [mSettings.async=true]
+	 *     whether request is async or not; default value is true
+	 * @param {string} mSettings.type
+	 *     HTTP method type; GET, PUT, POST, DELETE, PATCH
+	 * @param {string} mSettings.dataType
+	 *     text, json, xml
+	 * @param {object|string} mSettings.data
+	 *     data to be passed to server, only valid when request is not GET
+	 * @returns {object|Promise<object>} response object if async is false, promise if async is true (default).
 	 *  promise is resolved or rejected with a response object with following fields:-
 	 * {
 	 * 		request		@type (XMLHttpRequest): xhr request
-	 * 		sucess		@type (boolean): flag which tells request is successful or not
+	 * 		success		@type (boolean): flag which tells request is successful or not
 	 * 		statusCode	@type (Number): statusCode returned by server
 	 * 		data		@type (undefined or document or json or string): data returned by server if request is successfull
 	 * 		textStatus	@type (string): text status of request like success, error, timeout, aborted
@@ -114,8 +118,8 @@ sap.ui.define([
 	};
 	/**
 	 * Returns getJson object asynchronously from server using xhr
-	 * @param url: Resource location
-	 * @returns promise which is resolved with json Object or rejected with error
+	 * @param {string} url: Resource location
+	 * @returns {Promise} promise which is resolved with json Object or rejected with error
 	 */
 	ajaxHelper.getJSON = function (url) {
 		return new Promise(function (resolve, reject){
@@ -128,17 +132,19 @@ sap.ui.define([
 	};
 	/**
 	 * Makes synchronous XHR call
-	 * @param setting an object, expects following
+	 * @param {object} mSettinga an object, expects following
+	 * @param {string} mSettings.url
+	 *     url to be hit
+	 * @param {string} mSettings.type
+	 *     HTTP method type; GET, PUT, POST, DELETE, PATCH
+	 * @param {string} mSettings.dataType 
+	 *     text, json, xml
+	 * @param {object|string} mSettings.data
+	 *     data to be passed to server, only valid when request is not GET
+	 * @returns {object} response object with following fields
 	 * {
-	 * 		url   		@type (boolean): url to be hit
-	 * 		type		@type (string): method type; GET, PUT, POST, DELETE, PATCH
-	 * 		dtatType 	@type (string):(string): text, json, xml
-	 * 		data		@type (object or string) : to be passed to server, only valid when request is not GET
-	 * }
-	 * @returns response object with following fields
-=	 * {
 	 * 		request		@type (XMLHttpRequest): xhr request
-	 * 		sucess		@type (boolean): flag which tells request is successful or not
+	 * 		success		@type (boolean): flag which tells request is successful or not
 	 * 		statusCode	@type (Number): statusCode returned by server
 	 * 		data		@type (undefined or document or json or string): data returned by server if request is successfull
 	 * 		textStatus	@type (string): text status of request like success, error, timeout, aborted
@@ -155,11 +161,11 @@ sap.ui.define([
 
 	/**
 	 * Returns the JSON object synchronously based on the passed resource URI
-	 * @param url: Resource location
-	 * @returns response object which with following properties
+	 * @param {string} url: Resource location
+	 * @returns {object} response object which with following properties
 =	 * {
 	 * 		request		@type (XMLHttpRequest): xhr request
-	 * 		sucess		@type (boolean): flag which tells request is successful or not
+	 * 		success		@type (boolean): flag which tells request is successful or not
 	 * 		statusCode	@type (Number): statusCode returned by server
 	 * 		data		@type (undefined or document or json or string): data returned by server if request is successfull
 	 * 		textStatus	@type (string): text status of request like success, error, timeout, aborted
@@ -171,10 +177,10 @@ sap.ui.define([
 	};
 
 	/**
-	 * Handel the scenario when we get response from server
-	 * @param {XMLHTTPReques load event} event
-	 * @param {mSettings} settings passed while calling ajaxHelper.ajax function
-	 * @returns prepare and returns whole response object which is
+	 * Handle the scenario when we get response from server
+	 * @param {ProgressEvent} XMLHttpRequest load event object
+	 * @param {object} mSettings settings passed while calling ajaxHelper.ajax function
+	 * @returns {object} prepare and returns whole response object which is
 	 * in turn returned by calling function.
 	 * this function sets all the fields in response object which is
 	 * returned by AjaxHelper.ajax function.
@@ -185,7 +191,7 @@ sap.ui.define([
 		 * At the end we prepare response object with following fields:
 		 * {
 	 	 * 		request		@type (XMLHttpRequest): xhr request
-	 	 * 		sucess		@type (boolean): flag which tells request is successful or not
+	 	 * 		success		@type (boolean): flag which tells request is successful or not
 	 	 * 		statusCode	@type (Number): statusCode returned by server
 	 	 * 		data		@type (undefined or document or json or string): data returned by server if request is successfull
 	 	 * 		textStatus	@type (string): text status of request like success, error, timeout, aborted
@@ -253,9 +259,9 @@ sap.ui.define([
 	}
 
 	/**
-	 * Handel Error event and perpare a Error response
-	 * @param {XMLHTTPReques error event} event
-	 * @returns response object with following field set
+	 * Handle Error event and perpare a Error response
+	 * @param {ProgressEvent} event XMLHTTPRequest error event
+	 * @returns {object} response object with following field set
 	 * {
 	 * 		statusCode
 	 * 		XHRRequest
@@ -273,10 +279,10 @@ sap.ui.define([
 		return response;
 	}
 	/**
-	 * Handel abort event and perpare a abort response
-	 * @param {XMLHTTPReques error event} event
-	 * @returns response object with following field set
-	 *  * {
+	 * Handle abort event and prepare an abort response
+	 * @param {ProgressEVent} event XMLHTTPRequest abort event
+	 * @returns {object} response object with following field set
+	 * {
 	 * 		statusCode
 	 * 		XHRRequest
 	 * 		textStatus
@@ -291,16 +297,18 @@ sap.ui.define([
 		response.textStatus = "aborted";
 		return response;
 	}
+
 	/**
 	 *
-	 * @param @type:(string) xmlString
-	 * @returns {
-		* 				data: json object
-		* 				success : boolean
-		* 				textStatus: if any error then error status
-		* 				error : if any error
-		* 			}
-		*/
+	 * @param {string} jsonString
+	 * @returns {object} Object with the following properties
+	 *			{
+	 * 				data: json object
+	 * 				success : boolean
+	 * 				textStatus: if any error then error status
+	 * 				error : if any error
+	 * 			}
+	 */
 	function parseJson(jsonString) {
 		var response = {};
 		try {
@@ -314,8 +322,9 @@ sap.ui.define([
 	}
 	/**
 	 *
-	 * @param @type:(string) xmlString
-	 * @returns {
+	 * @param {string} xmlString
+	 * @returns {object} Object with the following properties
+	 * 			{
 	 * 				data: XML document
 	 * 				success : boolean
 	 * 				textStatus: if any error then error status
@@ -335,8 +344,9 @@ sap.ui.define([
 		return response;
 	}
 	/**
-	 * encodes the data in url encode formate
-	 * @param {javascript object} data
+	 * encodes the data in url encode format
+	 * @param {object} data
+	 * @returns {string}
 	 */
 	function encodeData(data){
 		var params;

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

@@ -96,7 +96,7 @@ sap.ui.define([
 			/**
 			 * Factory function to generate control wrapper object based on control type
 			 * 
-			 * @param {sap.ui.core.control} oControl - control a wrapper should be provided for
+			 * @param {sap.ui.core.Control} oControl - control a wrapper should be provided for
 			 * @param {object} [mParams] - map with any additional parameters passed to constructor of wrapper
 			 * @return {object} wrapper object for the control
 			 */

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

@@ -2,7 +2,6 @@
  * Fiori Element logger which prefix Fiori Elements for the log along with component
  */
 /* eslint-disable no-alert */
-/* global Promise */
 sap.ui.define([
 	"sap/ui/base/Object",
 	"sap/base/Log",

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

@@ -2,16 +2,6 @@ sap.ui.define([
 ], function () {
 	"use strict";
 
-	/**
-	 * Constructor for SmartFilterBarWrapper
-	 * @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 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) 
-	 * @returns
-	 */
 
 
 	// deals with state of SFB itself, without SVM (see SmartVariantManagementWrapper) and go-button (does not contain a state from SFB point of view - however, we remember whether it was pressed once
@@ -20,10 +10,22 @@ sap.ui.define([
 	var dataPropertyNameCustom = "sap.suite.ui.generic.template.customData",
 	dataPropertyNameExtension = "sap.suite.ui.generic.template.extensionData",
 	dataPropertyNameGeneric = "sap.suite.ui.generic.template.genericData";
-	
+
+	/**
+	 * Constructor for SmartFilterBarWrapper
+	 * @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.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) 
+	 * @returns {object}
+	 * @alias sap.suite.ui.generic.template.genericUtilities.controlStateWrapperFactory.SmartFilterBarWrapper
+	 */
 	function SmartFilterBarWrapper(vTarget, oFactory, mParams) {
 		var bIsApplying = false;
 		var aBasicFilters = [];
+		var aMissingNavFilters = [];
 		var oSmartFilterBar, oControlAssignedResolve, oPreliminaryState;
 		var oControlAssignedPromise = new Promise(function (resolve) {
 			oControlAssignedResolve = resolve;
@@ -81,9 +83,54 @@ sap.ui.define([
 				/* SFB header state of a variant (standard or custom) gets determined by the Apply Automatically checkbox's value of the corresponding
 				   variant i.e. if the checkbox is checked, then the header should be collapsed and vice versa. */
 				oSVMWrapperCallbacks.setHeaderState(!oEvent.getParameter("executeOnSelect"));
+				aMissingNavFilters = fnGetNavigationProperties();
 			});
 
 		}
+
+		function fnGetNavigationProperties() {
+			//Fetch the navigation properties
+			var oMetaModel = oSmartFilterBar.getModel().getMetaModel(),
+				sEntitySet = oSmartFilterBar.getEntitySet(),
+				oDataEntitySet = oMetaModel.getODataEntitySet(sEntitySet),
+				oDataEntityType = oMetaModel.getODataEntityType(oDataEntitySet.entityType),
+				oNavigationProperties = oDataEntityType['navigationProperty'],
+				aAddedNavigationProperties = [];
+			//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;
+			}
+			var oSmartFilterBarVariant = JSON.parse( oCurrentVariant.getContent().searchListReportVariant.filterBarVariant );
+			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);
+						}
+					}
+				}
+			}
+            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;
+		}
 		
 		function fnGetState() {
 			if (!oSmartFilterBar) {
@@ -242,6 +289,10 @@ sap.ui.define([
 			oSmartFilterBar = oControl;
 			oControlAssignedResolve(oSmartFilterBar);
 		}
+
+		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
@@ -256,7 +307,8 @@ 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

@@ -5,13 +5,13 @@ sap.ui.define([
     /**
      * Constructor for SmartTableChartCommon
      * ...
-     * @param {object} mParams 
+     * @param {object} mParams
      * @param 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) 
-     * @returns
+     *   (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}
      */
 
-    // deals with state of SFB itself, without SVM (see SmartVariantManagementWrapper) and go-button 
+    // deals with state of SFB itself, without SVM (see SmartVariantManagementWrapper) and go-button
     // (does not contain a state from SFB point of view - however, we remember whether it was pressed once
     // to restore data - this information is not considered being part of SFB)
     function SmartTableChartCommon(vTarget, oController, oFactory, sInitializationEvent) {
@@ -44,7 +44,7 @@ sap.ui.define([
             function fnSetState(oState) {
                 if (oState) {
                     if (!oState.oUiState) {
-                        // Legacy handling for state without additional level oUiState (created with 1.99.0 - 1.99.3). Could be relevant on LR and OP, and independent of VM 
+                        // Legacy handling for state without additional level oUiState (created with 1.99.0 - 1.99.3). Could be relevant on LR and OP, and independent of VM
                         oState = {
                             oUiState: oState
                         };
@@ -53,9 +53,11 @@ sap.ui.define([
                     // don't create UiState (managed object) from scratch, but fetch it from control and only apply known properties from state - thus, if any other properties would be added, we don't
                     // interfere with them
                     var oUiState = oControl.getUiState();
-                    oUiState.setPresentationVariant(oState.oUiState.oPresentationVariant);
-                    oUiState.setSelectionVariant(oState.oUiState.oSelectionVariant);
-                    oControl.setUiState(oUiState);
+                    if (!oUiState.getProperty("variantName")){
+                        oUiState.setPresentationVariant(oState.oUiState.oPresentationVariant);
+                        oUiState.setSelectionVariant(oState.oUiState.oSelectionVariant);
+                        oControl.setUiState(oUiState);
+                    }
                     bIsApplying = false;
                 } else {
                     // set standard variant to overcome "implicit personalization" (esp. for OP when navigating to different object in discovery mode)
@@ -88,32 +90,38 @@ sap.ui.define([
         function fnGetState() {
             if (bSmartControlInitialized) {
                 if (oVariantManagementStateWrapper) {
-                    // oVariantManagementStateWrapper would be undefined only in cases SmartControl is not yet initialized 
-                    // or VariantManagement is not enabled. 
+                    // oVariantManagementStateWrapper would be undefined only in cases SmartControl is not yet initialized
+                    // or VariantManagement is not enabled.
                     return oVariantManagementStateWrapper.getState();
                 }
-                
+
                 if (oSmartControlStateWrapper && !bVariantManagementActive) {
-                    // VariantManagement is not turned on & SmartControlStateWrapper instance 
+                    // VariantManagement is not turned on & SmartControlStateWrapper instance
                     return oSmartControlStateWrapper.getState();
                 }
             }
-            
-            // Control is not available and StateWrapper is not initialized 
+
+            // Control is not available and StateWrapper is not initialized
             return oPreliminaryState;
         }
 
         function fnSetState(oState) {
             oPreliminaryState = oState;
             oControlAssignedPromise.then(function () {
-                // map legacy states - before separating VM state from state of managed control, inner state information 
-                // (presentation variant and selection variant) were put as oUiState on the same level as VM state 
+                // map legacy states - before separating VM state from state of managed control, inner state information
+                // (presentation variant and selection variant) were put as oUiState on the same level as VM state
                 // information (variant id and dirty indicator), now they are contained in map managedControlStates
-                if (oState && oState.oUiState && !oState.managedControlStates){
-                    oState.managedControlStates = Object.create(null);
-                    oState.managedControlStates[oSmartControlStateWrapper.getLocalId()] = {oUiState: oState.oUiState};
-                    oState.modified = oState.bVariantModified;
-                    oState.variantId = oState.sVariantId;
+                if (oState){
+                    if (oState.oUiState && !oState.managedControlStates) {
+                        oState.managedControlStates = Object.create(null);
+                        oState.managedControlStates[oSmartControlStateWrapper.getLocalId()] = {oUiState: oState.oUiState};
+                    }
+                    if (oState.bVariantModified !== undefined) {
+                        oState.modified = oState.bVariantModified;
+                    }
+                    if (oState.sVariantId !== undefined) {
+                      oState.variantId = oState.sVariantId;
+                    }
                 }
 
                 if (bVariantManagementActive) {
@@ -122,7 +130,7 @@ sap.ui.define([
                     return;
                 }
 
-                // SmartTable/Chart shall be used 
+                // SmartTable/Chart shall be used
                 oSmartControlStateWrapper.setState(oPreliminaryState);
             });
         }
@@ -153,7 +161,7 @@ sap.ui.define([
             // in each case) -thus, we better create and return a vm wrapper here, passing the inner wrapper (the same, we would create in the other cases).
             // Additionally, this simplifies the adaptation to the change of format (formerly, variant data and control data were mixed on same level)
 
-            // to identify the situation, check properties smartVariant and useVariantManagement. (In LR/ALP, we could directly check component settings controlling these properties, but not 
+            // to identify the situation, check properties smartVariant and useVariantManagement. (In LR/ALP, we could directly check component settings controlling these properties, but not
             // in OP, as they could be different per section. Checking control's properties would also incorporate UI changes, however, these properties are anyway not allowed to be changed.)
             // values:	smartVariant	useVariantManagement
             // a)			null			false				on LR currently: truthy (id of VM) and true - but PageVM is not created, and thus being ignored => adapt how properties are set in xml
@@ -198,7 +206,7 @@ sap.ui.define([
             setState: fnSetState,
             setControl: fnSetControl,
             attachStateChanged: fnAttachStateChanged,
-            bVMConnection: bVariantManagementActive
+            bVMConnection: oSmartControl && oSmartControl.getSmartVariant && !!oSmartControl.getSmartVariant()
         };
     }
 

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

@@ -9,10 +9,10 @@ sap.ui.define([
 	 * @param {object} oController - the controller of the current component 
 	 * @param {object} oFactory - the controlStateWrapperFactory
 	 * @param {object} mParams 
-	 * @param mParams.managedControlWrappers - array of controlStateWrappers for controls handled by the SVM 
+	 * @param {array} mParams.managedControlWrappers - array of controlStateWrappers for controls handled by the SVM 
 	 * (currently also including SFB wrapper - to be removed) 
-	 * @param mParams.dynamicPageWrapper - dynamicPageWrapper instance handled by SVM
-	 * @returns
+	 * @param {Object} mParams.dynamicPageWrapper - dynamicPageWrapper instance handled by SVM
+	 * @returns {object}
 	 */
 	
 	function SmartVariantManagementWrapper(vTarget, oController, oFactory, mParams) {
@@ -103,9 +103,9 @@ sap.ui.define([
 			var oControl = oController.getView().byId(sId);
 			if (oControl && oControl.isA("sap.ui.comp.smarttable.SmartTable")) {
 				oControl.attachAfterVariantInitialise(function() {
-                                        //set currentVariantId only when sVariantId is not standard (as it might be overriding existing
-                                        //different currentVariantId) or smartTable's (oControl) currentVariantId is not equal to sVariantId.
-					if (sVariantId !== '*standard*' && oControl.getCurrentVarintId && oControl.getCurrentVarintId() !== sVariantId) {
+					//set currentVariantId only when sVariantId is not standard (as it might be overriding existing
+					//different currentVariantId) or smartTable's (oControl) currentVariantId is not equal to sVariantId.
+					if (sVariantId !== '*standard*' && oControl.getCurrentVariantId && oControl.getCurrentVariantId() !== sVariantId) {
 						oControl.setCurrentVariantId(sVariantId);
 						oSmartVariantManagement.setModified(false);
 					}

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

@@ -192,10 +192,9 @@ sap.ui.define([
      */
 	function getFilterInfoForPropertyFilters(oParams, sProperty, aFiltersForProperty, sLogicalOperator) {
 		var oValue1, oValue2, sOperator, oProperty = metadataAnalyser.getPropertyMetadata(oParams.oMetaModel, oParams.sEntityTypeName, sProperty);
-		// for navigation properties
-		sProperty = sProperty.replaceAll("/", ".");
+		var sPropertyForFilterData = sProperty.replaceAll("/", ".");
 		// If Custom filter is implemented date field for smart filter bar then we make static tile
-		if ((oProperty.type === "Edm.DateTime" || oProperty.type === "Edm.DateTimeOffset") && !oParams.oFilterData[sProperty]) {
+		if ((oProperty.type === "Edm.DateTime" || oProperty.type === "Edm.DateTimeOffset") && !oParams.oFilterData[sPropertyForFilterData]) {
 			oParams.bIsStatic = true;
 			return {
 				stringRep: "",
@@ -207,12 +206,12 @@ sap.ui.define([
 			if (oFilter.bCaseSensitive === undefined) {
 				bCaseSensitive = true;
 			}
-			if ((oProperty.type === "Edm.DateTime" || oProperty.type === "Edm.DateTimeOffset") && oParams.oFilterData[sProperty].conditionTypeInfo && oParams.oFilterData[sProperty].conditionTypeInfo.data.operation !== "DATE") {
-				if (!DynamicDateUtil.getAllOptionKeys().includes(oParams.oFilterData[sProperty].conditionTypeInfo.data.operation)) {
+			if ((oProperty.type === "Edm.DateTime" || oProperty.type === "Edm.DateTimeOffset") && oParams.oFilterData[sPropertyForFilterData].conditionTypeInfo && oParams.oFilterData[sPropertyForFilterData].conditionTypeInfo.data.operation !== "DATE") {
+				if (!DynamicDateUtil.getAllOptionKeys().includes(oParams.oFilterData[sPropertyForFilterData].conditionTypeInfo.data.operation)) {
 					oParams.bIsStatic = true;
 					return;
 				}
-				var oValue = getSematicDateFormat(oParams.oFilterData[sProperty], oProperty.type);
+				var oValue = getSematicDateFormat(oParams.oFilterData[sPropertyForFilterData], oProperty.type);
 				oValue1 = oValue.oValue1;
 				oValue2 = oValue.oValue2;
 				sOperator = oValue.operator;
@@ -280,6 +279,7 @@ sap.ui.define([
 		sFilterParams = oParams.bIsStatic ? "" : sFilterParams;
 		return sFilterParams;
 	}
+	testableHelper.testableStatic(getFilterInfoForPropertyFilters, "filterHelper_getFilterInfoForPropertyFilters");
 	testableHelper.testableStatic(getFilterString, "filterHelper_getFilterString");
     return {
 		getFilterParams: getFilterParams