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

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

@@ -52,12 +52,14 @@ sap.ui.define([
 	"sap/suite/ui/commons/collaboration/CollaborationHelper",
 	"sap/insights/CardHelper",
 	"sap/suite/ui/generic/template/lib/insights/InsightsFECardProvider",
+	"sap/suite/ui/generic/template/lib/ai/JouleContextProvider",
 	"sap/ui/core/service/ServiceFactoryRegistry",
 	"sap/ui/VersionInfo",
 	"sap/m/IllustratedMessageType",
+	"sap/suite/ui/generic/template/lib/ai/FioriAIHandler",
 	"sap/suite/ui/generic/template/js/RuntimeFormatters"  // just to make sure that this class is loaded
 ], function(
-	extend, 
+	extend,
 	isPlainObject,
 	NavContainer,
 	FlexibleColumnLayout,
@@ -85,12 +87,13 @@ sap.ui.define([
 	startupParameterHelper,
 	PageLeaveHandler,
 	ShareUtils,
-	CollaborationHelper, 
+	CollaborationHelper,
 	CardHelper,
 	InsightsFECardProvider,
+	JouleContextProvider,
 	ServiceFactoryRegistry,
 	VersionInfo,
-	IllustratedMessageType) {
+	IllustratedMessageType, FioriAIHandler) {
 	"use strict";
 	var	sClassName = "lib.AppComponent";
 
@@ -102,7 +105,7 @@ sap.ui.define([
 	var mDesigntimeHandlers = Object.create(null); // maps the ids of AppComponents to the corresponding instance of DesigntimeHandler
 
 	var fnRegisterAppComponent = TemplateAssembler.getRegisterAppComponent(); // Retrieve the possibility to register at TemplateAssembler
-	var bShellConfigPlaceholderEnabled = true; 
+	var bShellConfigPlaceholderEnabled = true;
 	if (window["sap-ushell-config"] && window["sap-ushell-config"].apps && window["sap-ushell-config"].apps.placeholder) {
 		bShellConfigPlaceholderEnabled =  window["sap-ushell-config"].apps.placeholder.enabled;
 	}
@@ -177,12 +180,11 @@ sap.ui.define([
 			                                  // The implementation of this infrastructure is done in class BusyHelper.
 			bEnablePlaceholder: bShellConfigPlaceholderEnabled, //holds the value of placeholder enablement shell and URL (URL enablement will be added in constructor code of NavigationController).
 			bStateHandlingSuspended: false, // holds the RTA or Key user mode
-			nDelayedDraftTimerInSeconds: 20, // holds the timer interval value for draft data save and by default, the value is 20 seconds
-			sSummarizationLibraryUrl: "" // property hold the Url for the Summarization service library
+			nDelayedDraftTimerInSeconds: 20 // holds the timer interval value for draft data save and by default, the value is 20 seconds
 		};
 		oTemplateContract.oDataLossHandler = new DataLossHandler(oTemplateContract); // an object which expose methods that can be used to bring data loss popup at app level
 		oTemplateContract.oPageLeaveHandler = new PageLeaveHandler(oTemplateContract);
-					
+
 		// the following additional properties are added to TemplateContract later:
 		// - appSettings a model representing the settings of the app (by function init()). These settings are derived from the settings section in the manifest, but also take in account the defaults.
 		// - oBusyHelper (instance of BusyHelper) by function createContent
@@ -287,8 +289,11 @@ sap.ui.define([
 					shellServiceUnavailable: false,
 					// experimental: not yet used
 					forceFullscreenCreate: false,
-					// Check Summarization is enabled
-					isSummarizationEnabled: false
+					// Check FioriAI servce is enabled
+					"fioriAI": {
+						isSummarizationEnabled : false,
+						isEasyFilterEnabled : false
+					}
 			});
 			oAppComponent.setModel(oTemplateContract.oTemplatePrivateGlobalModel, "_templPrivGlobal");
 			oTemplateContract.oShellServicePromise.catch(function(){
@@ -299,16 +304,8 @@ sap.ui.define([
 			var oParsingServicePromise;
 			if (UShellContainer) {
 				oParsingServicePromise = UShellContainer.getServiceAsync("URLParsing");
-				UShellContainer.getServiceAsync("Navigation").then(function(oNavigationService) {
-					oNavigationService.resolveIntent("#IntelligentPrompt-summarize").then(function(sUrl) {
-						oTemplateContract.oTemplatePrivateGlobalModel.setProperty("/generic/isSummarizationEnabled", !!sUrl);
-						oTemplateContract.sSummarizationLibraryUrl = sUrl;
-					}).catch(function() {
-						oLogger.warning("No intelligent summarization capability enabled on the tenant");
-					});
-				});
 			}
-			
+
 			Promise.allSettled([oCurrentUrlPromise, oParsingServicePromise]).then(function(aResult) {
 				var sURL = aResult[0].value,
 					oParsingService = aResult[1].value;
@@ -320,13 +317,18 @@ sap.ui.define([
 					});
 				} else {
 					oTemplateContract.oTemplatePrivateGlobalModel.setProperty("/generic/crossAppNavSupport", false);
-				}		
+				}
 			});
 			CollaborationHelper.isTeamsModeActive().then(function(bIsActive) {
                 oTemplateContract.oTemplatePrivateGlobalModel.setProperty("/generic/isTeamsModeActive", bIsActive);
             }).finally(function(bIsActive) {
-				// If MSTeams mode is active and in ghostApp init scenario do not load the insights service
+				// If MSTeams mode is active and in ghostApp init scenario do not load
 				if (!bIsActive && !oTemplateContract.ghostapp) {
+					// Load the FioriAI library
+					oTemplateContract.oFioriAIHandler = new FioriAIHandler(oTemplateContract);
+					oTemplateContract.oFioriAIHandler.loadAILibrary();
+
+					// Load the Insights library
 					CardHelper.getServiceAsync("UIService").then(function(oInstance) {
 						oTemplateContract.oTemplatePrivateGlobalModel.setProperty("/generic/insights", {
 							"oInsightsInstance": oInstance,
@@ -334,6 +336,9 @@ sap.ui.define([
 						});
 						oTemplateContract.oInsightsFECardProvider = new InsightsFECardProvider(oTemplateContract);
 						oTemplateContract.oInsightsFECardProvider.fnRegisterApplicationAsCardProvider();
+						//joule context provider registration
+						oTemplateContract.JouleContextProvider = new JouleContextProvider(oTemplateContract);
+						oTemplateContract.JouleContextProvider.fnRegisterProvider();
 					}).catch(Function.prototype);
 				}
 			});
@@ -396,9 +401,9 @@ sap.ui.define([
 		// Begin: Implementation of standard lifecycle methods
 
 		function init(){
-			// redirect app with shorten URL to actual URL. Method returns promise and 
+			// redirect app with shorten URL to actual URL. Method returns promise and
 			// and resolved when redirection to full URL is complete.
-			// If already full URL then it resolved immediately without any redirection. 
+			// If already full URL then it resolved immediately without any redirection.
 			var oExpandHashPromise = CollaborationHelper.processAndExpandHash();
 			var sAppComponentId =  oAppComponent.getId();
 			oLogger.info("Init called for AppComponent " + sAppComponentId);
@@ -407,7 +412,7 @@ sap.ui.define([
 			if (RuntimeAuthoring.willRTAStartAfterReload()){
 				oLogger.info("AppComponent " + sAppComponentId + " has been restarted for RTA");
 				oDesigntimeHandler.start(true);
-			}			
+			}
 			var oAppRegistryEntry = {
 				appComponent: oAppComponent,
 				oTemplateContract: oTemplateContract,
@@ -418,7 +423,16 @@ sap.ui.define([
 			oTemplateContract.oShellServicePromise = oAppComponent.getService("ShellUIService").catch(function(){
 				// fallback to old generic logic if service is not defined in manifest
 				var oShellServiceFactory = ServiceFactoryRegistry.get("sap.ushell.ui5service.ShellUIService");
-				return ((oShellServiceFactory && oShellServiceFactory.createInstance()) || Promise.reject());
+				var oServiceContext = { 
+					scopeObject: oAppComponent, 
+					scopeType: "component"
+				};
+
+				if (oShellServiceFactory) {
+					return Promise.resolve(oShellServiceFactory.createInstance(oServiceContext));
+				} else {
+					return Promise.reject();
+				}
 			});
 			oTemplateContract.oShellServicePromise.catch(function(){
 				oLogger.warning("No ShellService available");
@@ -428,7 +442,7 @@ sap.ui.define([
 				mSettings = extend({}, mSettings);     // but should not be passed as an "official" setting
 				delete mSettings.ghostapp;
 			} else {
-				 mSettings = mSettings || Object.create(null);	
+				 mSettings = mSettings || Object.create(null);
 			}
 			if (mSettings.draftSettings && mSettings.draftSettings.dataSaveFrequency === "immediate") {
 				oTemplateContract.nDelayedDraftTimerInSeconds = 0;
@@ -560,7 +574,7 @@ sap.ui.define([
 			});
 			return oTemplateContract.oNavigationHost;
 		}
-		
+
 		function fnLeave(){
 			for (var sComponentId in oTemplateContract.componentRegistry){
 				var oRegistryEntry = oTemplateContract.componentRegistry[sComponentId];
@@ -592,6 +606,10 @@ sap.ui.define([
 			if (oTemplateContract.oInsightsFECardProvider) {
 				oTemplateContract.oInsightsFECardProvider.unRegisterApplicationAsCardProvider();
 			}
+			if (oTemplateContract.JouleContextProvider) {
+				oTemplateContract.JouleContextProvider.fnUnregisterProvider();
+				oTemplateContract.JouleContextProvider.destroy();
+			}
 			CommonMethods.setAppComponent(null);
 			(UIComponent.prototype.exit || Function.prototype).apply(oAppComponent, arguments);
 			fnDeregister();
@@ -617,7 +635,7 @@ sap.ui.define([
 			}
 			oTemplateContract.ghostapp = true;
 			oTemplateContract.aStateChangers.forEach(function(oStateChanger){
-				oStateChanger.leaveApp();                         
+				oStateChanger.leaveApp();
 			});
 			(oTemplateContract.oNavigationControllerProxy ? oTemplateContract.oNavigationControllerProxy.suspend : Function.prototype)();
 			fnLeaveAppResolve();
@@ -773,7 +791,7 @@ sap.ui.define([
 		function fnGetShellDataLossPopup(oShellContext) {
 			return !oTemplateContract.ghostapp && oTemplateContract.oDataLossHandler.getShellDataLossPopup(oShellContext);
 		}
-		
+
 		var oNextStartupParameters; // next target for function navigateBasedOnStartupParameter
 
 		// This flag will be set if the app should refresh its data when navigateBasedOnStartupParameter is called the next time
@@ -793,47 +811,47 @@ sap.ui.define([
 
 		var oMethods = {
 			/**
-			 * 
+			 *
 			 * @private
 			 */
 			init: init,
 			/**
-			 * 
+			 *
 			 * @private
 			 */
 			createContent: createContent,
 			/**
-			 * 
+			 *
 			 * @private
 			 */
 			exit: exit,
 			/**
-			 * 
+			 *
 			 * @private
 			 */
 			suspend: suspend,
 			/**
-			 * 
+			 *
 			 * @private
 			 */
 			restore: restore,
 			/**
-			 * 
+			 *
 			 * @private
 			 */
 			getConfig: getConfig,
 			/**
-			 * 
+			 *
 			 * @private
 			 */
 			getInternalManifest: getInternalManifest,
 
 			/**
 			 * Method returns the associated Transaction Controller
-			 * @returns {sap.ui.generic.app.transaction.BaseController} Returns instance of  
-			 * {@link sap.ui.generic.app.transaction.DraftController DraftController} incase of 
-			 * Draft enabled application. In case application is non-draft, instance of 
-			 * {@link sap.ui.generic.app.transaction.TransactionController TransactionController} will be returned 
+			 * @returns {sap.ui.generic.app.transaction.BaseController} Returns instance of
+			 * {@link sap.ui.generic.app.transaction.DraftController DraftController} incase of
+			 * Draft enabled application. In case application is non-draft, instance of
+			 * {@link sap.ui.generic.app.transaction.TransactionController TransactionController} will be returned
 			 * @public
 			 */
 			getTransactionController: function() {
@@ -861,9 +879,9 @@ sap.ui.define([
 
 			/**
 			 * Navigate to the target component based on the startup parameters passed as input. Currently this API
-			 * is exposed only for consumption of My Inbox integration and should not be consumed by other consumers 
+			 * is exposed only for consumption of My Inbox integration and should not be consumed by other consumers
 			 * without consent from the Fiori element V2 team
-			 * 
+			 *
 			 * @param {object} oStartupParameters Startup parameters for the application
 			 * @internal
 			 */
@@ -882,12 +900,12 @@ sap.ui.define([
 					var oExecutionPromise = oTemplateContract.oNavigationControllerProxy.clearHistory().then(startupParameterHelper.parametersToNavigation.bind(null, oTemplateContract, oNextStartupParameters));
 					oTemplateContract.oBusyHelper.setBusy(oExecutionPromise);
 					oNextStartupParameters = null;
-				});                         
+				});
 			},
-			
+
 			/**
 			 * Refresh the data cached by this app.  Currently this API
-			 * is exposed only for consumption of My Inbox integration and should not be consumed by other consumers 
+			 * is exposed only for consumption of My Inbox integration and should not be consumed by other consumers
 			 * without consent from the Fiori element V2 team.
 			 * @param [object] oStartupParameters if provided it defines the object for which data should be refreshed. Otherwise, all data should be refreshed.
 			 * @param {boolean} bIsCurrentlyVisible information whether myInbox is currently displaying this component
@@ -916,12 +934,16 @@ sap.ui.define([
 	/**
 	 * Main class used for Smart Template(Fiori elements V2) Application Component
 	 * @class Smart Templates Application Component
+	 * @abstract
 	 * 
+	 * @param {string}
+	 *            [sId] Generated automatically if no non-empty ID is given;
+	 * @param {object}
+	 *            [mSettings] Initial settings for the new AppComponent instance
 	 * @public
 	 * @extends sap.ui.core.UIComponent
-	 * @abstract
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	var oAppComponent = UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {
@@ -971,6 +993,10 @@ sap.ui.define([
 					type: "object",
 					defaultValue: null
 				},
+				tableSettings: {
+					type: "object",
+					defaultValue: null
+				},
 				// "tableColumnVerticalAlignment" to set the vAlign property of columnListItem for responsive tables across LR,WL and OP
 				tableColumnVerticalAlignment: {
 					type: "string",
@@ -1002,9 +1028,9 @@ sap.ui.define([
 				draftDiscardConfirmationSettings: {
 					type:"object",
 					defaultValue: {enabled: "always"}
-				}, 
+				},
 				collaborationSettings : {
-					type: "object", 
+					type: "object",
 					defaultValue: {
 						isShareAsCardEnabled: true
 					}
@@ -1043,7 +1069,7 @@ sap.ui.define([
 						oDesigntimeHandler.stop();
 					}
 				}
-			}			
+			}
 		},
 
 		/**
@@ -1055,7 +1081,7 @@ sap.ui.define([
 		suppressDataLossPopup: function() {
 			return false;
 		},
-		
+
 		constructor: function() {
 			var oAppId = testableHelper.startApp(); // suppress access to private methods in productive coding
 			extend(this, getMethods(this, oAppId));
@@ -1065,9 +1091,9 @@ sap.ui.define([
 
 	/**
 	 * Implement "_fnGetRouterClassName" hook to derive the router class name.
-	 * We do not want to have router class derived from "/sap.ui5/routing" section of manifest settings, 
-	 * instead derive it from FCL setting of Fiori Elements section ("sap.ui.generic.app") 
-	 * @param {*} oManifest 
+	 * We do not want to have router class derived from "/sap.ui5/routing" section of manifest settings,
+	 * instead derive it from FCL setting of Fiori Elements section ("sap.ui.generic.app")
+	 * @param {*} oManifest
 	 * @returns {string} Router class name
 	 */
 	oAppComponent._fnGetRouterClassName = function (oManifest) {

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

@@ -26,11 +26,9 @@ sap.ui.define(["sap/ui/base/Object",
 		"use strict";
 		
 		var GHOSTNAVIGATIONHANDLER = {
-			storeInnerAppStateWithImmediateReturn: function(){
+			storeInnerAppStateAsync: function(){
 				return {
-					promise: {
-						fail: Function.prototype
-					}
+					fail: Function.prototype
 				};
 			},
 			parseNavigation: function(){
@@ -925,10 +923,7 @@ sap.ui.define(["sap/ui/base/Object",
 				setNextFocus: oFocusHelper.setNextFocus,
 				getIntentPromise: getIntentPromise,
 				getComponentUtilsIfLoaded: getComponentUtilsIfLoaded,
-				preloadComponent: fnPreloadComponent,
-				getSummarizationLibraryUrl : function() {
-					return oTemplateContract.sSummarizationLibraryUrl;
-				}
+				preloadComponent: fnPreloadComponent
 			};
 		}
 

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

@@ -4,7 +4,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 
 		var oRejectedPromise = Promise.reject();
 		oRejectedPromise.catch(Function.prototype);
-		
+
 		function createNonDraft(oParentContext, sBindingPath, oModel, vPredefinedValues, bMakeRequestsCanonical) {
 			var oCreateContext = oModel.createEntry(sBindingPath, {
 				properties: vPredefinedValues,
@@ -184,7 +184,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 					MessageUtils.handleTransientMessages(oTemplateContract);
 				});
 			};
-			
+
 			var fnPropertyChanged = function(oEvent){
 				oTemplateContract.oTemplatePrivateGlobalModel.setProperty("/generic/draftIndicatorState", sap.m.DraftIndicatorState.Clear);
 
@@ -242,7 +242,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 					var oEditEntityPromise = oTransactionController.editEntity(oContext, false, sRootExpand);
 					resolve(oEditEntityPromise);
 					// The active context is invalidated as the DraftAdministrativeData of the context(the active context) has changed after draft creation.
-					// This is done to keep the DraftAdministrativeData of the record updated.					
+					// This is done to keep the DraftAdministrativeData of the record updated.
 					oEditEntityPromise.then(function(){
 						oModel.invalidateEntry(oContext);
 					});
@@ -291,7 +291,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 					oModel.createBindingContext(sBindingPath, null, null, function(oBindingContext){
 						if (oDraftContext.isDraftEnabled(sEntitySet)) {
 							// todo: enable preserveChanges
-							if (true || !oDraftContext.hasPreserveChanges(oBindingContext)) {
+							//if (true || !oDraftContext.hasPreserveChanges(oBindingContext)) { //Commenting out this if condition to avoid eslint error
 								fnReadDraftAdministrativeData(oModel, sBindingPath, oTemplateContract.oBusyHelper).then(function(oResponse) {
 									if (!oResponse.DraftAdministrativeData || oResponse.DraftAdministrativeData.DraftIsCreatedByMe) {
 										// no or own draft
@@ -319,7 +319,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 										draftAdminReadResponse: oResponse
 									});
 								});
-							}
+							//}
 						} else {
 							resolve({
 								context: oBindingContext
@@ -331,8 +331,8 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 			oTemplateContract.oBusyHelper.setBusy(oRet, true);
 			return oRet;
 		}
-		
-		/* 
+
+		/*
 		Allows direct edit on the entires on the list, unlike the method 'edit'above, this method first edit the entry with preserveChanges as true
 		If the response indicates an unsaved change or locked record, a corresponding dialog is shown to proceed or cancel with the edit.
 		*/
@@ -346,7 +346,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 							oViewDependencyHelper.setRootPageToDirty();
 							resolve({
 								context: oResponse.context
-							});		
+							});
 						}, function(oResponse) {
 							if (oResponse && oResponse.response && oResponse.response.statusCode === "409") {
 								//remove transient message associated with rc 409 in order to prevent message pop-up
@@ -364,7 +364,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 													oViewDependencyHelper.setRootPageToDirty();
 													resolve({
 														context: oResponse.context
-													});	
+													});
 												});
 												oApplication.getBusyHelper().setBusy(oUnsavedChangesEditPromise, true);
 											};
@@ -393,7 +393,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 			});
 			return oPromise;
 		}
-		
+
 		function deleteEntity(oDraftController, fnExecuteDelete, oApplicationProxy, oContext, bIsActiveEntity, sActionType){
 			var bHasActiveEntity = oDraftController.hasActiveEntity(oContext);
 			var oSiblingPromise = bHasActiveEntity && !bIsActiveEntity ? oApplicationProxy.getDraftSiblingPromise(oContext) : Promise.resolve();
@@ -404,10 +404,10 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 						return  { context: oActive };
 					};
 					var oCancellationPromise = oDeletePromise.then(fnTransformActiveContext);
-					oApplicationProxy.cancellationStarted(oContext, oCancellationPromise, sActionType, oActive);					
+					oApplicationProxy.cancellationStarted(oContext, oCancellationPromise, sActionType, oActive);
 				}
 				return oDeletePromise;
-			});			
+			});
 		}
 
 		function discardDraft(oDraftController, oTransactionController, oApplicationProxy, oContext){
@@ -416,7 +416,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 			};
 			return deleteEntity(oDraftController, fnExecuteDelete, oApplicationProxy, oContext, false, "discardAction");
 		}
-		
+
 		function fnGetMessagesFromContextFilter(oContextFilter, oMessageManager, bExcludeETagMessages) {
 			var oMessageModel = oMessageManager.getMessageModel();
 			var oMessageBinding = oMessageModel.bindList("/", null, null, [oContextFilter]); // Note: It is necessary to create this binding each time, since UI5 does not update it (because there is no change handler)
@@ -425,7 +425,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 			});
 			if (bExcludeETagMessages){
 				aRet = aRet.filter(function(oMessage){
-					return !MessageUtils.isMessageETagMessage(oMessage);	
+					return !MessageUtils.isMessageETagMessage(oMessage);
 				});
 			}
 			return aRet;
@@ -479,7 +479,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 							// In case 2 and 3 it is expected that at least one of those messages is an error message.
 							// Note that in case 2 and possibly also in case 1 we need to suppress the generic error message (like "An exception has occurred") which is coming as a transient message to
 							// indicate that the activation request has failed.
-							// Note that case 3 has 2 subcases 
+							// Note that case 3 has 2 subcases
 							// 3a) Some severe technical error has happened which even prevented the Preparation call to be executed successfully
 							// 3b) The Preparation call was successful and did not find any reason which prevents activation. However, the call of activation failed.
 							//     Note that this failure may still be because of business reasons (excluding reasons named in case 1) or technical reasons.
@@ -523,22 +523,25 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 									aTransientErrors.push(oMessage);
 								}
 							});
-							var bHasStateError = aCurrentStateMessages.some(function(oMessage){
+							var bHasStateError = aCurrentStateMessages.some(function(oMessage) {
 								return oMessage.type === "Error";
 							});
-							var bIsWarning = bIs412 && !bHasStateError;
-							if (bIsWarning){
+							var bHasStateWarning = aCurrentStateMessages.some(function(oMessage) {
+								return oMessage.type === "Warning";
+							});
+							var bIsWarning = bIs412 && !bHasStateError && (!!aTransientWarnings.length || bHasStateWarning);
+							if (bIsWarning) {
 								// Only show transient warnings in the confirmation popup if no state warning is available (note that backend sometimes sends warnings redundantly as transient and state message)
-								var aMessagesForUserDecision = aCurrentStateMessages.length > 0 ? aCurrentStateMessages : aTransientWarnings;
+								var aMessagesForUserDecision = bHasStateWarning ? aCurrentStateMessages : aTransientWarnings;
 								var oCustomMessageProvider = aCurrentStateMessages.length === 0 && { // if confirmation popup is to show transient messages these messages should be excluded from the
-									isCustomMessage: function(oMessage){                             // normal handling of transient messages (until the confirmation popup is closed)
+									isCustomMessage: function (oMessage) {                             // normal handling of transient messages (until the confirmation popup is closed)
 										return aTransientWarnings.indexOf(oMessage) >= 0;
 									}
 								};
 								if (oCustomMessageProvider){
 									oServices.oApplication.registerCustomMessageProvider(oCustomMessageProvider);
 								}
-								oServices.oApplication.removeTransientMessages();								
+								oServices.oApplication.removeTransientMessages();
 								var fnOnConfirmationPopupClose = function(bConfirmed){
 									if (oCustomMessageProvider){ // if transient messages have been shown in the confirmation popup they can be removed from the message model when the confirmation popup is closed
 										oServices.oApplication.deregisterCustomMessageProvider(oCustomMessageProvider);
@@ -578,7 +581,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 					oBusyHelper.setBusy(oGetSiblingPromise);
 					oGetSiblingPromise.then(fnActivate.bind(null, false));
 				});
-			
+
 				oBusyHelper.setBusy(oActivationStartedPromise);
 			});
 			return oRet;

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

@@ -606,19 +606,23 @@ sap.ui.define(["sap/ui/base/Object",
 			}
 
 			function getActionUtil(mParameters){
-				return new ActionUtil(mParameters);
+				var oActionUtil = new ActionUtil(mParameters);
+				// NOTE: The following property is set using the setter method to ensure even if the values
+				// are i18N paths, it is taken over and not been resolved at the time of setting
+				oActionUtil.setActionLabel(mParameters.actionLabel);
+				return oActionUtil;
 			}
 
 			/*
 			 * 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	
 			 * @param {object} oEventSource to extract context and entityset
-			 * @param {object} oPredefinedValues existing predefined values
+			 * @param {object} mPredefinedValues existing predefined values
 			 * @param {boolean} bIsInlineCreationRowsEnabled is inline creation rows feature enabled
 			 * @returns {Promise} A <code>Promise</code> for default value function predefined values are returned if no default values function exists. If both are not available then an empty object is returned.
 			 * @public
 			 */
-			function getDefaultValues(oEventSource, oPredefinedValues, bIsInlineCreationRowsEnabled) {
+			function getDefaultValues(oEventSource, mPredefinedValues, bIsInlineCreationRowsEnabled) {
 				if (!oComponentUtils.isDraftEnabled() || bIsInlineCreationRowsEnabled) {
 					var oContext, sNavigationProperty;
 					var oPresentationControlHandler = oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oCommonUtils.getOwnerPresentationControl(oEventSource));
@@ -633,9 +637,9 @@ sap.ui.define(["sap/ui/base/Object",
 					} else {
 						oContext = new Context(oPresentationControlHandler.getModel(), "/" + sEntitySet);
 					}
-					return oServices.oTransactionController.getDefaultValues([oContext], [oPredefinedValues], sNavigationProperty);
+					return oServices.oTransactionController.getDefaultValues([oContext], mPredefinedValues, sNavigationProperty);
 				} else {
-					return oPredefinedValues;
+					return mPredefinedValues;
 				}
 			}
 
@@ -648,9 +652,8 @@ sap.ui.define(["sap/ui/base/Object",
 				var aFailed = [];
 				var aWarning = [];
 				var bSuccess = false;
-				var mAdditionalParmsData = Object.create(null);
+				var mContextIndependentParameterData = Object.create(null);
 				var aWarningIndex = [];
-				var sFunctionImportPath = mParameters.functionImportPath;
 				var aCurrentContexts = mParameters.contexts || [];
 				var oSourceControlHandler = mParameters.sourceControlHandler;
 				// Code to support context Independent actions with parameter
@@ -664,7 +667,6 @@ sap.ui.define(["sap/ui/base/Object",
 				}
 				var sFunctionImportLabel = mParameters.label;
 				var sOperationGrouping = mParameters.operationGrouping;
-				var oSkipProperties = mParameters.skipProperties;
 				var fnCleanUpContext =  function(){
 					// remove pending request from the last change of the model
 					// actually, this should rather be done by ActionUtil itself
@@ -715,15 +717,19 @@ sap.ui.define(["sap/ui/base/Object",
 					}
 					var oActionProcessor = getActionUtil({
 						controller: oController,
-						contexts: aContexts,
 						applicationController: oServices.oApplicationController,
+						contexts: aContexts,
+						functionImport: mParameters.functionImport,
+						functionImportPath: mParameters.functionImportPath,
+						entityType: mParameters.entityType,
+						actionLabel: sFunctionImportLabel,
+						actionButtonText: mParameters.actionButtonText,
+						isDraftEnabled: oComponentUtils.isDraftEnabled(),
+						contextIndependentParameterData: mContextIndependentParameterData,
+						expand: mParameters.sRootExpand,
 						operationGrouping: sOperationGrouping
 					});
-					if (!mAdditionalParmsData) {
-						mAdditionalParmsData = Object.create(null);
-					}
-					mAdditionalParmsData.expand = mParameters.sRootExpand;
-					oActionProcessor.call(sFunctionImportPath, sFunctionImportLabel, oComponentUtils.isDraftEnabled(), oSkipProperties, bIsStrict, mAdditionalParmsData).then(function(oResult){
+					oActionProcessor.call(bIsStrict).then(function(oResult){
 						var oSessionParams = {};
 						oSessionParams.actionLabel = sFunctionImportLabel;
 						oBusyHelper.setBusy(oResult.executionPromise, null, oSessionParams);
@@ -744,7 +750,7 @@ sap.ui.define(["sap/ui/base/Object",
 						// userEnteredAdditionalParams represents the parameter that user has entered in parameter dialog,
 						// We get back these param in order to fill the parameter dialog, when user accepts the warning and proceeds.
 						// We do this to avoid reentering the same data again in paramater dialog.
-						mAdditionalParmsData = aResponse[0].userEnteredAdditionalParams;
+						mContextIndependentParameterData = aResponse[0].userEnteredAdditionalParams;
 						var oParsedResult = fnParseResponse(aPaths, aFormattedResponse, bWithWarningDialog);
 						aFailed = aFailed.concat(mapToArray(oParsedResult.mFailed));
 						aSuccess = aSuccess.concat(mapToArray(oParsedResult.mSuccess));
@@ -848,12 +854,13 @@ sap.ui.define(["sap/ui/base/Object",
 				var oMetaModel = oModel.getMetaModel();
 				var oComponent = oController.getOwnerComponent();
 				var sEntitySet = oComponent.getEntitySet();
-				var oFuctionImport =  oMetaModel.getODataFunctionImport(mParameters.functionImportPath);
+				var oFunctionImport =  getFunctionImport(oMetaModel, mParameters.functionImportPath);
 				var oEntitySet = oMetaModel.getODataEntitySet(sEntitySet);
-
-				var sFunctionImportReturnType = oFuctionImport && oFuctionImport.returnType;
+				var sFunctionImportReturnType = oFunctionImport && oFunctionImport.returnType;
 				var sEntityType = oEntitySet && oEntitySet.entityType;
-
+				var oEntityType = oMetaModel.getODataEntityType(sEntityType);
+				mParameters.functionImport = oFunctionImport;
+				mParameters.entityType = oEntityType;
 				if (sFunctionImportReturnType === sEntityType) {
 					var oAppComponent = oComponent.getAppComponent();
 					var oOPComponentUtils = oServices.oApplication.getComponentUtilsIfLoaded(sEntitySet); // oOPComponentUtils would differ from oComponentUtils if this instance belongs to the root page
@@ -875,6 +882,14 @@ sap.ui.define(["sap/ui/base/Object",
 				return oRet;
 			}
 
+			function getFunctionImport(oMetaModel, sFunctionImportPath) {
+				if (oMetaModel && sFunctionImportPath) {
+					var sFunctionImportName = sFunctionImportPath.split("/").pop();
+					return oMetaModel.getODataFunctionImport(sFunctionImportName);
+				}
+				return undefined;
+			}
+
 			/*
 			 * Adds an entry to a table. Only called in draft scenarios.
 			 *