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

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

@@ -4,22 +4,22 @@ sap.ui.define([
 
 	/**
 	 * Constructor for SmartVariantManagementWrapper
-	 * @param {sap.ui.comp.smartvariants.SmartVariantManagement} vTarget - The SmartVariantManagement control 
+	 * @param {sap.ui.comp.smartvariants.SmartVariantManagement} vTarget - The SmartVariantManagement control
 	 * or the Id of control for which this wrapper is created
-	 * @param {object} oController - the controller of the current component 
+	 * @param {object} oController - the controller of the current component
 	 * @param {object} oFactory - the controlStateWrapperFactory
-	 * @param {object} mParams 
-	 * @param {array} mParams.managedControlWrappers - array of controlStateWrappers for controls handled by the SVM 
-	 * (currently also including SFB wrapper - to be removed) 
+	 * @param {object} mParams
+	 * @param {array} mParams.managedControlWrappers - array of controlStateWrappers for controls handled by the SVM
+	 * (currently also including SFB wrapper - to be removed)
 	 * @param {Object} mParams.dynamicPageWrapper - dynamicPageWrapper instance handled by SVM
 	 * @returns {object}
 	 */
-	
+
 	function SmartVariantManagementWrapper(vTarget, oController, oFactory, mParams) {
 		// Special handling of SmartFilterBarWrapper for several reasons:
 		// - Suppress selection when restoring a variant. Selection is solely triggered according to information in appState. Otherwise, erroneous selection could be triggered in
 		//		a few situations:
-		//		- Variant marked as execute on select, but no data selected in appState (execute on select marked when saving variant without selecting, or changed after state was 
+		//		- Variant marked as execute on select, but no data selected in appState (execute on select marked when saving variant without selecting, or changed after state was
 		//			stored)
 		//		- Fallback to standard variant in case of dirty variant in state
 		//		- Fallback to standard variant if variant cannot be read (logic of SVM)
@@ -42,11 +42,11 @@ sap.ui.define([
 		// - not available at this point in time, and no corresponding event to attach to available
 		// - provides only those controls with directly connection to SVM implemented (i.e. with wrappers marked with bVMConnection)
 
-		// ensure managed state wrappers do not trigger change event when applying state to them. 
+		// ensure managed state wrappers do not trigger change event when applying state to them.
 		// Todo: rethink, whether this is the right place to do this (or rather when the wrappers get created)
 		mParams.managedControlWrappers = mParams.managedControlWrappers.map(oFactory.getSuppressChangeEventWhenApplyingWrapper);
 
-		// Any change of managed control should also mark variant as modified. However, this is not true for controls with direct connection to SVM (SFB, SmartTable, SmartChart). 
+		// Any change of managed control should also mark variant as modified. However, this is not true for controls with direct connection to SVM (SFB, SmartTable, SmartChart).
 		// For these controls, a real user changes are already handled by the direct connection. On the other hand, these controls also fire their change events, if their state is
 		// changed from SVM (by the same connection) - setting variant dirty here would be wrong.
 		mParams.managedControlWrappers.forEach(function(oWrapper){
@@ -56,18 +56,18 @@ sap.ui.define([
 				});
 			}
 		});
-		
-		
+
+
 
 		function fnSetControl(oControl) {
 			oSmartVariantManagement = oControl;
 			fnResolveControlAssigned(oSmartVariantManagement);
 		}
-		
+
 		var oSmartFilterBarWrapper = mParams.managedControlWrappers.find(function(oWrapper){
 			return oWrapper.setSVMWrapperCallbacks;
 		});
-		
+
 		// provide callbacks needed for SFB wrapper to store/restore extnesion state with variant
 		if (oSmartFilterBarWrapper){
 			oSmartFilterBarWrapper.setSVMWrapperCallbacks({
@@ -105,28 +105,28 @@ sap.ui.define([
 				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*') {
+					if (sVariantId !== '*standard*' && sVariantId !== '') {
 						if (oControl.getCurrentVariantId && oControl.getCurrentVariantId() !== sVariantId) {
 							oControl.setCurrentVariantId(sVariantId);
 						}
 						oSmartVariantManagement.setModified(false);
 					}
 				});
-			} 
+			}
 			oSmartVariantManagement.setCurrentVariantId(sVariantId);
 			if (oSmartFilterBarWrapper){
 				oSmartFilterBarWrapper.suppressSelection(false);
 			}
 		}
 
-		// Restore state of all managed controls 
+		// Restore state of all managed controls
 		function fnSetManagedControlStates(oState){
-			// Usually, looping through mParams.managedControlWrappers or through oState.managedControlStates should be equivalent, but in exceptional cases, their might be 
-			// differences, if application has changed (changing the controls managed by the SVM - in LR, this could be achieved by changing setting SmartVariantManagement). 
+			// Usually, looping through mParams.managedControlWrappers or through oState.managedControlStates should be equivalent, but in exceptional cases, their might be
+			// differences, if application has changed (changing the controls managed by the SVM - in LR, this could be achieved by changing setting SmartVariantManagement).
 			// mParams.managedControlWrappers reflects current state, while oState.managedControlStates reflects state at the time iAppState was written
 			// - when adding a control (in LR changing setting SmartVariantManagement from false to true), state for that control would not be contained  - calling the wrapper with
 			//		undefined to ensure initial state
-			// - when removing a control, state would be contained that should not be applied here 
+			// - when removing a control, state would be contained that should not be applied here
 			mParams.managedControlWrappers.forEach(function(oWrapper){
 				oWrapper.setState(oState.managedControlStates[oWrapper.getLocalId()]);
 			});
@@ -164,8 +164,8 @@ sap.ui.define([
 					// set (which is achieved by empty string)
 					fnSetVariant("");
 					// Usually restoring the state of any of the managed controls should mark the variant as dirty, but there might be edge cases (state from an old release not containing information for any
-					// managed control now relevant), so to be on the safe side, we set modified=true explicitly. 
-					oSmartVariantManagement.currentVariantSetModified(true); 
+					// managed control now relevant), so to be on the safe side, we set modified=true explicitly.
+					oSmartVariantManagement.currentVariantSetModified(true);
 					fnSetManagedControlStates(oPreliminaryState);
 				} else {
 					fnSetVariant(oPreliminaryState.variantId);
@@ -177,7 +177,7 @@ sap.ui.define([
 							oSmartFilterBarWrapper.setState(oPreliminaryState.managedControlStates[oSmartFilterBarWrapper.getLocalId()]);
 						}
 						if (oPreliminaryState.variantId !== oSmartVariantManagement.getCurrentVariantId()){
-							// variant could not be set because it is not known, i.e. it could be private and URL was shared, or could be deleted after page was bookmarked. In this case, 
+							// variant could not be set because it is not known, i.e. it could be private and URL was shared, or could be deleted after page was bookmarked. In this case,
 							// standard variant is set (by VM). Additionally, it should be marked as modified.
 							oSmartVariantManagement.currentVariantSetModified(true);
 						}
@@ -193,19 +193,19 @@ sap.ui.define([
 			oControlAssignedPromise.then(function() {
 				// state change when user selects a different variant
 				oSmartVariantManagement.attachSelect(fnHandler);
-				
+
 				// when user saves current state as a new variant, this is also a state change (as the variant id is part of the state)
 				// note: Even if new (SFB) variant is marked as execute on select, and currently no data is selected, no need to select data here (and thus also not to collapse header).
-				// This is one of the possible ways to get into a state with a clean variant with execute on select, but no data loaded - see also comment to identify SFB wrapper.  
+				// This is one of the possible ways to get into a state with a clean variant with execute on select, but no data loaded - see also comment to identify SFB wrapper.
 				oSmartVariantManagement.attachAfterSave(fnHandler);
-				
+
 				// any change of a managed control is state change
 				mParams.managedControlWrappers.forEach(function(oWrapper){
 					oWrapper.attachStateChanged(fnHandler);
 				});
 			});
 		}
-		
+
 		return {
 			getState : getState,
 			setState : setState,
@@ -215,4 +215,4 @@ sap.ui.define([
 	}
 
 	return SmartVariantManagementWrapper;
-});
+});

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
+	};
 });

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

@@ -3041,6 +3041,37 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			}
 			return sTextArrangement;
 		},
+		getTextArrangementPath: function (oField) {
+			return oField["com.sap.vocabularies.Common.v1.Text"] && oField["com.sap.vocabularies.Common.v1.Text"].Path;
+		},
+		isValueHelpTableAvailable: function (oField) {
+			return !!oField.extensions?.find((extension)=> extension.name === "value-list");
+		},
+		getTextArrangementFinalString: function(result,idPath,descriptionPath,textArrangementType) {
+			var id = result[idPath];
+			var description = result[descriptionPath];
+
+			if (description) {
+				var result = "";
+				switch (textArrangementType) {
+					case "descriptionAndId":
+						result = `${description} (${id})`;
+						break;
+					case "idAndDescription":
+						result = `${id} (${description})`;
+						break;
+					case "descriptionOnly":
+						result = `${description}`;
+						break;
+					default:
+						result = `${id}`;
+						break;
+				}
+				return result;
+			} else {
+				return id;
+			}
+		},
 		getTitleTextArrangementBindingPath: function (sTextArrangement, sPropertyPath, sTextPath) {
 			var sPropertyBinding = "{" + sPropertyPath + "}";
 			var sTextBinding = "{" + sTextPath + "}";
@@ -3447,8 +3478,8 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		},
 
 		// applicable for both types of action i.e., standard and custom actions
-		getActionCommandVisibility: function (sButtonId) {
-			return !sButtonId || "{= " + oAnnotationHelper.getControlVisibleTerm(sButtonId) + " && " + oAnnotationHelper.getControlEnabledTerm(sButtonId) + "}";
+		getActionCommandVisibility: function (sButtonId, bVisible) {
+			return !sButtonId || bVisible || "{= " + oAnnotationHelper.getControlVisibleTerm(sButtonId) + " && " + oAnnotationHelper.getControlEnabledTerm(sButtonId) + "}";
 		},
 
 		buildVisibilityExprOfDataFieldForIntentBasedNaviButton: function (oDataField) {
@@ -4541,6 +4572,9 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 	oAnnotationHelper.getLinkTextForDFwithEmail.requiresIContext = true;
 	oAnnotationHelper.checkIsEmailAddress.requiresIContext = true;
 	oAnnotationHelper.isEmailAddressAndMuliplicity.requiresIContext = true;
+	oAnnotationHelper.getTextArrangementPath.requiresIContext = true;
+	oAnnotationHelper.isValueHelpTableAvailable.requiresIContext = true;
+	oAnnotationHelper.getTextArrangementFinalString.requiresIContext = true;
 
 	return oAnnotationHelper;
 }, /* bExport= */ true);

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

@@ -7,7 +7,8 @@ sap.ui.define([
 	"sap/m/RatingIndicator",
 	"sap/suite/ui/generic/template/genericUtilities/FeLogger", 
 	"sap/suite/ui/generic/template/genericUtilities/testableHelper", 
-	"sap/suite/ui/generic/template/genericUtilities/utils"
+	"sap/suite/ui/generic/template/genericUtilities/utils",
+        "sap/base/security/encodeXML"
 ], function (
 	Formatting,
 	Locale,
@@ -17,7 +18,8 @@ sap.ui.define([
 	RatingIndicator,
 	FeLogger,
 	testableHelper,
-	utils
+	utils,
+        encodeXML
 ) {
 	"use strict";
 
@@ -308,7 +310,42 @@ sap.ui.define([
 		 */
 		formatCurrency: function (vAmount, sCurrency) {
 			return getCurrencyFormatter().format(vAmount, sCurrency);
+		},
+
+		/**
+		 * Determines what text to be displayed for draft objects without title 
+		 * 
+		 * @param {boolean} hasActiveEntity
+		 * @param {boolean} isActiveEntity 
+		 * @param {boolean} newObject , i18n text for newly created draft object
+		 * @param {boolean} unnamedObject , i18n text for active object
+		 * @returns {string}
+		 */
+
+		getDraftObjectDisplayText: function (hasActiveEntity, isActiveEntity, newObject, unnamedObject) {
+			var oComponent = sap.ui.core.Component.getOwnerComponentFor(this);
+			// When both HasActiveEntity and IsActiveEntity are false, it indicates a new object.
+			// In this case, display the text 'New Object' or the app-specific override text for the key 'NEW_OBJECT' if available.
+			// Otherwise, if it's an active entity, display 'Unnamed Object' or the override text for the key 'UNNAMED_OBJECT' if provided by the app.		
+			var text = (!hasActiveEntity && !isActiveEntity) ? newObject : unnamedObject;
+
+			// As a fallback to maintain backward compatibility, if the app already defines the 'NEW_OBJECT' key (from previous behavior),
+			// use the app-specific overridden text for both newly created objects and active objects.
+			if (oComponent) {
+				var oModelApplicationListReport = oComponent.getAppComponent().getModel("i18n|" + oComponent.getMetadata().getComponentName() + "|" + oComponent.getEntitySet());
+				var oModelApplication = oComponent.getAppComponent().getModel("i18n");
+				var bHasAppNewObjectText = ((oModelApplication ? oModelApplication.getResourceBundle().hasText("NEW_OBJECT") : false) || (oModelApplicationListReport ? oModelApplicationListReport.getResourceBundle().hasText("NEW_OBJECT") : false));
+				var bHasAppUnnamedObjectText = ((oModelApplication ? oModelApplication.getResourceBundle().hasText("UNNAMED_OBJECT") : false) || (oModelApplicationListReport ? oModelApplicationListReport.getResourceBundle().hasText("UNNAMED_OBJECT") : false));
+				if (bHasAppNewObjectText && !bHasAppUnnamedObjectText) {
+					var text = newObject;
+				}
+
+			}
+			// Encode the text to ensure HTML special characters are escaped
+			// This prevents XSS and rendering issues in HTML context
+			return encodeXML(text);
 		}
+ 
 	};
 
 	return oRuntimeFormatters;

package/src/sap/suite/ui/generic/template/lib/AppComponent.js

@@ -950,11 +950,14 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.134.2
+	 * @version 1.136.0
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	var oAppComponent = UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {
 		metadata: {
+			interfaces: [
+				"sap.ui.core.IAsyncContentCreation"
+			],
 			config: {
 				title: "SAP UI Application Component", // TODO: This should be set from App descriptor
 				fullWidth: true

package/src/sap/suite/ui/generic/template/lib/CRUDActionHandler.js

@@ -9,7 +9,7 @@
  * It has options to handle the scenario when there is error coming from the backend and we still want to save in second try.
  */
 
- sap.ui.define(["sap/ui/base/Object", "sap/ui/model/Filter", "sap/ui/model/FilterOperator", "sap/base/util/extend", "sap/suite/ui/generic/template/lib/MessageUtils", "sap/ui/model/json/JSONModel", 
+ sap.ui.define(["sap/ui/base/Object", "sap/ui/model/Filter", "sap/ui/model/FilterOperator", "sap/base/util/extend", "sap/suite/ui/generic/template/lib/MessageUtils", "sap/ui/model/json/JSONModel",
 	"sap/suite/ui/generic/template/genericUtilities/controlHelper", "sap/ui/core/message/MessageType",
 	"sap/suite/ui/generic/template/genericUtilities/FeLogger"
 ], function(BaseObject, Filter, FilterOperator, extend, MessageUtils, JSONModel, controlHelper, MessageType, FeLogger) {
@@ -122,12 +122,13 @@
 			}).then(function (oFragment) {
 				oRet = oFragment;
 				oLocalModel = oRet.getModel(sLocalModelName);
-				
+
 				var oMsgModel = aMessages ? new JSONModel(aMessages) : sap.ui.getCore().getMessageManager().getMessageModel();
+				oMsgModel.setSizeLimit(9999); // Increase limit for created binding count. This will ensure that all messages are visible.
 				oMessageView.setModel(oMsgModel, "msg");
 				oLocalModel.setProperty("/situation", iSituation);
 				oLocalModel.setProperty("/afterClose", Function.prototype);
-				
+
 
 				var oOverallFilter = oAtLeastWarningFilter;
 				var oErrorFilter = oBaseErrorFilter;
@@ -183,13 +184,14 @@
 					if (oItemBinding.filter(oErrorFilter).getLength() === 0) {
 						oLocalModel.setProperty("/situation", 4);
 					}
-					
+
 				}
+				oLocalModel.setProperty("/backbtnvisibility", false);
 				oItemBinding.filter(oOverallFilter);
 				if (oItemBinding.getLength() === 0){
 					return null; // no popup needed
 				}
-				var aMsg = oItemBinding.getAllCurrentContexts().map(function(oContext) { 
+				var aMsg = oItemBinding.getAllCurrentContexts().map(function(oContext) {
 					return oContext.getObject();
 				});
 				var oMsgDialogHeaderInfo = MessageUtils.getMessageDialogTitleAndSeverity(aMsg, oTemplateContract);

package/src/sap/suite/ui/generic/template/lib/CRUDManager.js

@@ -114,7 +114,7 @@ sap.ui.define(["sap/ui/base/Object",
 				return oComponentUtils.getMainComponentUtils().then(function(oMainUtils) {
 					var oInfoForContentIdPromise = CacheHelper.getInfoForContentIdPromise(oMainUtils.entitySet, oModel, sAppId, oMainUtils.getRootExpand);
 					return oInfoForContentIdPromise.then(function(oInfoObject) {
-						return oInfoObject.contentIdRequestPossible ? oInfoObject.parametersForContentIdRequest.sRootExpand : null;                         
+						return oInfoObject.contentIdRequestPossible ? oInfoObject.parametersForContentIdRequest.sRootExpand : null;
 					});
 				});
 			}
@@ -229,7 +229,7 @@ sap.ui.define(["sap/ui/base/Object",
 			// The resulting object may contain properties context/draftAdministrativeData and targetSiblingKey
 			// The object contains property 'draftAdministrativeData' when there exists a non-locking draft of another user (this can only be the case when bUnconditional is false)
 			// The property, 'draftAdministrativeData' contains the draft administrative data of the non-locking draft.
-			// When the editing can start, the object contains the property 'context',this property contains the context of the entity to be edited. 
+			// When the editing can start, the object contains the property 'context',this property contains the context of the entity to be edited.
 			// The object also holds 'targetSiblingKey' property containing the target sibling keys and treeNode info. in case of draft application and for non-draft application this property will hold value undefined
 			function editEntity(bUnconditional) {
 				if (oBusyHelper.isBusy()) {
@@ -439,7 +439,7 @@ sap.ui.define(["sap/ui/base/Object",
 						aSelectedContextPath.push(oContext.sContextPath);
 					});
 					var oParsedUpdateResult = fnParseResponse(aSelectedContextPath, aUpdateResults);
-					// The error and warning scenarios are handled via transient handling. 
+					// The error and warning scenarios are handled via transient handling.
 					// We only need to show message to user regarding records that are updated, Hence returning only successfull responses.
 					// In future if we need to show/use info about error and warning cases, oParsedUpdateResult contains that info as well.
 					var aSuccess = mapToArray(oParsedUpdateResult.mSuccess);
@@ -507,7 +507,7 @@ sap.ui.define(["sap/ui/base/Object",
 			function saveEntityImpl(resolve, reject, oCreateWithDialogFilters) {
 				var oMessageManager = sap.ui.getCore().getMessageManager();
 				var oModel = oController.getView().getModel();
-				
+
 				// Create mandatory check (not performed in case of Create with dialogue).
 				if (!oCreateWithDialogFilters) {
 					var aMandatoryFields = fnGetAllMandatoryFields(oModel),
@@ -519,7 +519,7 @@ sap.ui.define(["sap/ui/base/Object",
 						return;
 					}
 				}
-				
+
 				// Prepare message handling by storing information which messages have been available before saving
 				var oContextFilter =  oCreateWithDialogFilters ? oCreateWithDialogFilters : oServices.oTemplateCapabilities.oMessageButtonHelper && oServices.oTemplateCapabilities.oMessageButtonHelper.getContextFilter(false);
 				var aMessagesBeforeSave = CRUDHelper.fnGetMessagesFromContextFilter(oContextFilter, oMessageManager, true);
@@ -615,7 +615,7 @@ sap.ui.define(["sap/ui/base/Object",
 
 			/*
 			 * Calls generic app layer to get default values. If oPredefinedValues are passed then it overrides the values returned from the default values function.
-			 * Default value function is invoked when the application is non-draft (or) inline creation rows feature enabled	
+			 * Default value function is invoked when the application is non-draft (or) inline creation rows feature enabled
 			 * @param {object} oEventSource to extract context and entityset
 			 * @param {object} mPredefinedValues existing predefined values
 			 * @param {boolean} bIsInlineCreationRowsEnabled is inline creation rows feature enabled
@@ -727,11 +727,15 @@ sap.ui.define(["sap/ui/base/Object",
 						isDraftEnabled: oComponentUtils.isDraftEnabled(),
 						contextIndependentParameterData: mContextIndependentParameterData,
 						expand: mParameters.sRootExpand,
-						operationGrouping: sOperationGrouping
+						operationGrouping: sOperationGrouping,
+						handleFocus: oServices.controllerServices && oServices.controllerServices.getRestoreFocusHelper
+								? oServices.controllerServices.getRestoreFocusHelper().rememberFocus
+								: null
 					});
 					oActionProcessor.call(bIsStrict).then(function(oResult){
 						var oSessionParams = {};
 						oSessionParams.actionLabel = sFunctionImportLabel;
+						oServices.oApplication.setNextFocus(Function.prototype);
 						oBusyHelper.setBusy(oResult.executionPromise, null, oSessionParams);
 						oResult.executionPromise.then(fnHandleResponse,fnHandleResponse);
 					}, fnActionPopUpReject);
@@ -812,6 +816,11 @@ sap.ui.define(["sap/ui/base/Object",
 									});
 								});
 								oServices.oApplication.navigateToDetailContextIfPossible(oResponseContext, false, oContextInfo.bIsDraft ? 2 * (1 + oContextInfo.bIsCreate) : 1, oContextInfo);
+							}	else {
+								// Restore focus, because we don't navigate out
+								oServices.oApplication.setNextFocus(function(oBeforeData, fnFallback){
+									fnFallback();
+								});
 							}
 							var oTableBindingInfo = oSourceControlHandler && oSourceControlHandler.getBindingInfo();
 							var oListBinding = oTableBindingInfo && oTableBindingInfo.binding;
@@ -906,7 +915,7 @@ sap.ui.define(["sap/ui/base/Object",
 				var oModel = oView.getModel();
 				var sEntitySet, sBindingPath;
 				var iViewLevel = oComponentUtils.getViewLevel();
-				if (iViewLevel > 0) { // Details page 
+				if (iViewLevel > 0) { // Details page
 					var sTableBindingPath = oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oCommonUtils.getOwnerPresentationControl(oTable)).getBindingInfo().path;
 					sEntitySet = oTable.getEntitySet();
 					// create binding path
@@ -922,14 +931,14 @@ sap.ui.define(["sap/ui/base/Object",
 					var fnSetBusy = function(oBusyPromise){
 						var oBusyHelper = oServices.oApplication.getBusyHelper();
 						oBusyHelper.setBusy(oBusyPromise);
-						oServices.oApplication.setNextFocus(Function.prototype); // Prevent default handling in error case. Focus for success should be set there. 
+						oServices.oApplication.setNextFocus(Function.prototype); // Prevent default handling in error case. Focus for success should be set there.
 					};
 					// Method will be called in case the create has to be performed on a DraftEntity. For better performance Fe would check
 					// whether the expand information in the PreProcessor data is stored in the localStorage. In case this is available Fe
 					// will pass the expand nodes and read the newly created instance information. PreProcessor data is always stored with
 					// a cache key which ensures Fe don't work with stale data
-					
-					
+
+
 					var oTargetComponentUtils = oServices.oApplication.getComponentUtilsIfLoaded(sEntitySet);
 					var getRootExpand = oTargetComponentUtils && oTargetComponentUtils.viewRegistered && !oTargetComponentUtils.fnViewRegisteredResolve && oTargetComponentUtils.getRootExpand;
 					var oInfoForContentIdPromise = CacheHelper.getInfoForContentIdPromise(sEntitySet, oModel, oAppComponent.getId(), getRootExpand);
@@ -942,7 +951,10 @@ sap.ui.define(["sap/ui/base/Object",
 							oController: oController,
 							oApplicationController: oServices.oApplicationController,
 							bUseNewActionForCreate: oSettings && oSettings.useNewActionForCreate,
-							fnSetBusy: fnSetBusy
+							fnSetBusy: fnSetBusy,
+							handleFocus: oServices.controllerServices && oServices.controllerServices.getRestoreFocusHelper
+									? oServices.controllerServices.getRestoreFocusHelper().rememberFocus
+									: null
 						};
 						var oCreatePromise = CRUDHelper.create(oServices.oDraftController,
 							sEntitySet,
@@ -982,7 +994,7 @@ sap.ui.define(["sap/ui/base/Object",
 					});
 				});
 			}
-			
+
 
 			/* eslint-disable */
 			var handleError = testableHelper.testable(handleError, "handleError");

package/src/sap/suite/ui/generic/template/lib/CommonEventHandlers.js

@@ -987,7 +987,7 @@ sap.ui.define(["sap/ui/base/Object",
 							onTeamsCollabOptionPress: onTeamsCollabOptionPress.bind(this),
 							onContactDetails: onContactDetails.bind(this),
 							// Ignoring the below events since quick view forms don't handle side effects. Handle them if support is added in the future.
-							onSmartFieldModeToggled: Function.prototype, 
+							onSmartFieldModeToggled: Function.prototype,
 							onSmartFieldModelValueChanged: Function.prototype,
 							// Ignoring this event as SmartMultiInput isn't rendered in the quick view smart form.
 							submitChangesForSmartMultiInput: Function.prototype,
@@ -2039,8 +2039,8 @@ sap.ui.define(["sap/ui/base/Object",
 					oPrivModel.setProperty("/generic/controlProperties/" + "fileUploader/" + sEntitySet, oFileUploaderSettings);
 				}
 
-				// URLEncoded filenames are decoded by Chrome, Firefox browsers but Safari doesn't do this automatically. 
-				// Therefore, FE decodes it on our side & ensure actual file name is used for further processing. 
+				// URLEncoded filenames are decoded by Chrome, Firefox browsers but Safari doesn't do this automatically.
+				// Therefore, FE decodes it on our side & ensure actual file name is used for further processing.
 				oFileUploaderSettings.fileName = decodeURIComponent(oEvent.mParameters.fileName);
 				var fileType = oEvent.mParameters.requestHeaders.find(function(requestHeader) {
 					if (requestHeader.name === "Content-Type") {
@@ -2713,14 +2713,14 @@ sap.ui.define(["sap/ui/base/Object",
 
 		/**
 		 * Performs intent based navigation and opens the given line item context in a new tab.
-		 * 
+		 *
 		 * @param {object} oOutbound The target outbound intent (contains semantic object and action)
 		 * @param {sap.ui.model.Context} oLineItemContext The line item context to be opened in new tab
 		 * @param {sap.ui.comp.smartfilterbar.SmartFilterBar} oSmartFilterBar The filter bar
 		 * @param {Function} fnHandleError The error handling function
 		 */
 		function fnNavigateIntentOnNewTab(oOutbound, oLineItemContext, oSmartFilterBar, fnHandleError) {
-			var sSelectionVariant, 
+			var sSelectionVariant,
 				oSelectionVariant,
 				sNavMode = "explace"; // "explace" is the navigation mode for opening in new tab
 			// Get selection variant from filter bar