@sap/open.fe 1.97.0 → 1.98.0

package/packages/sap.fe.core/src/sap/fe/core/ExtensionAPI-dbg.js

@@ -158,11 +158,12 @@ sap.ui.define(
 			 * @alias sap.fe.core.ExtensionAPI#navigateToTarget
 			 * @param {string} sTarget Name of the target route
 			 * @param {sap.ui.model.Context} [oContext] Context instance
+			 * @returns {Promise} Promise that is resolved when the navigation is finalized
 			 *
 			 * @public
 			 */
 			navigateToTarget: function(sTarget, oContext) {
-				this._controller._routing.navigateToTarget(oContext, sTarget);
+				return this._controller._routing.navigateToTarget(oContext, sTarget);
 			},
 
 			/**
@@ -230,10 +231,17 @@ sap.ui.define(
 			 * @public
 			 */
 			updateAppState: function() {
-				return this._controller
-					.getAppComponent()
-					.getAppStateHandler()
-					.createAppState();
+				if (
+					!this._controller
+						.getAppComponent()
+						.getModel("internal")
+						.getProperty("/uiAdaptation")
+				) {
+					return this._controller
+						.getAppComponent()
+						.getAppStateHandler()
+						.createAppState();
+				}
 			},
 
 			/**

package/packages/sap.fe.core/src/sap/fe/core/ExtensionAPI.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/base/Object","sap/fe/core/CommonUtils","sap/base/Log","sap/ui/core/Component","sap/ui/model/json/JSONModel"],function(B,C,L,a,J){"use strict";var e=B.extend("sap.fe.core.ExtensionAPI",{metadata:{associations:{editFlow:{type:"sap.fe.core.controllerextensions.EditFlow",multiple:false},routing:{type:"sap.fe.core.controllerextensions.Routing",multiple:false}}},constructor:function(c,i){this._controller=c;this._view=c.getView();this.extension=this._controller.extension;this.editFlow=this._controller.editFlow;this.routing=this._controller.routing;this._routing=this._controller._routing;this.intentBasedNavigation._controller=this._controller;this._prefix=i;},destroy:function(){delete this._controller;delete this._view;delete this.editFlow._controller;delete this.intentBasedNavigation._controller;},byId:function(i){var c=this._view.byId(i);if(!c&&this._prefix){c=this._view.byId(this._prefix+"--"+i);}if(c){return c;}},getModel:function(m){var A;if(m&&m!=="ui"){A=C.getAppComponent(this._view);if(!A.getManifestEntry("sap.ui5").models[m]){return null;}}return this._view.getModel(m);},addDependent:function(c){this._view.addDependent(c);},removeDependent:function(c){this._view.removeDependent(c);},navigateToTarget:function(t,c){this._controller._routing.navigateToTarget(c,t);},loadFragment:function(s){var t=this;var T=a.getOwnerComponentFor(this._view);var p=this._view.getModel("_pageModel");var m=this.getModel().getMetaModel();var v=T.getViewData();var V=new J(v),P={bindingContexts:{"contextPath":m.createBindingContext(s.contextPath||"/"+T.getEntitySet()),converterContext:p.createBindingContext("/",null,{noResolve:true}),viewData:v?V.createBindingContext("/"):null},models:{"contextPath":m,converterContext:p,metaModel:m,viewData:V},appComponent:C.getAppComponent(this._view)};var o=C.templateControlFragment(s.name,P,{controller:s.controller||this,isXML:false,id:s.id});o.then(function(f){if(s.initialBindingContext!==undefined){f.setBindingContext(s.initialBindingContext);}t.addDependent(f);}).catch(function(E){L.error(E);});return o;},updateAppState:function(){return this._controller.getAppComponent().getAppStateHandler().createAppState();},intentBasedNavigation:{navigateOutbound:function(o,n){var i=this._controller.getView().getBindingContext("internal");i.setProperty("externalNavigationContext",{"page":false});this._controller._intentBasedNavigation.navigateOutbound(o,n);}}});return e;});
+sap.ui.define(["sap/ui/base/Object","sap/fe/core/CommonUtils","sap/base/Log","sap/ui/core/Component","sap/ui/model/json/JSONModel"],function(B,C,L,a,J){"use strict";var e=B.extend("sap.fe.core.ExtensionAPI",{metadata:{associations:{editFlow:{type:"sap.fe.core.controllerextensions.EditFlow",multiple:false},routing:{type:"sap.fe.core.controllerextensions.Routing",multiple:false}}},constructor:function(c,i){this._controller=c;this._view=c.getView();this.extension=this._controller.extension;this.editFlow=this._controller.editFlow;this.routing=this._controller.routing;this._routing=this._controller._routing;this.intentBasedNavigation._controller=this._controller;this._prefix=i;},destroy:function(){delete this._controller;delete this._view;delete this.editFlow._controller;delete this.intentBasedNavigation._controller;},byId:function(i){var c=this._view.byId(i);if(!c&&this._prefix){c=this._view.byId(this._prefix+"--"+i);}if(c){return c;}},getModel:function(m){var A;if(m&&m!=="ui"){A=C.getAppComponent(this._view);if(!A.getManifestEntry("sap.ui5").models[m]){return null;}}return this._view.getModel(m);},addDependent:function(c){this._view.addDependent(c);},removeDependent:function(c){this._view.removeDependent(c);},navigateToTarget:function(t,c){return this._controller._routing.navigateToTarget(c,t);},loadFragment:function(s){var t=this;var T=a.getOwnerComponentFor(this._view);var p=this._view.getModel("_pageModel");var m=this.getModel().getMetaModel();var v=T.getViewData();var V=new J(v),P={bindingContexts:{"contextPath":m.createBindingContext(s.contextPath||"/"+T.getEntitySet()),converterContext:p.createBindingContext("/",null,{noResolve:true}),viewData:v?V.createBindingContext("/"):null},models:{"contextPath":m,converterContext:p,metaModel:m,viewData:V},appComponent:C.getAppComponent(this._view)};var o=C.templateControlFragment(s.name,P,{controller:s.controller||this,isXML:false,id:s.id});o.then(function(f){if(s.initialBindingContext!==undefined){f.setBindingContext(s.initialBindingContext);}t.addDependent(f);}).catch(function(E){L.error(E);});return o;},updateAppState:function(){if(!this._controller.getAppComponent().getModel("internal").getProperty("/uiAdaptation")){return this._controller.getAppComponent().getAppStateHandler().createAppState();}},intentBasedNavigation:{navigateOutbound:function(o,n){var i=this._controller.getView().getBindingContext("internal");i.setProperty("externalNavigationContext",{"page":false});this._controller._intentBasedNavigation.navigateOutbound(o,n);}}});return e;});

package/packages/sap.fe.core/src/sap/fe/core/PageController-dbg.js

@@ -18,7 +18,9 @@ sap.ui.define(
 		"sap/fe/core/controllerextensions/Share",
 		"sap/fe/core/controllerextensions/ViewState",
 		"sap/fe/core/controllerextensions/Paginator",
-		"sap/fe/core/controllerextensions/Placeholder"
+		"sap/fe/core/controllerextensions/Placeholder",
+		"sap/fe/core/controllerextensions/SideEffects",
+		"sap/fe/core/controllerextensions/MassEdit"
 	],
 	function(
 		Controller,
@@ -34,7 +36,9 @@ sap.ui.define(
 		Share,
 		ViewState,
 		Paginator,
-		Placeholder
+		Placeholder,
+		SideEffects,
+		MassEdit
 	) {
 		"use strict";
 
@@ -61,6 +65,8 @@ sap.ui.define(
 			paginator: Paginator,
 			viewState: ViewState,
 			placeholder: Placeholder,
+			_sideEffects: SideEffects,
+			massEdit: MassEdit,
 			/**
 			 * @private
 			 * @name sap.fe.core.PageController.getMetadata

package/packages/sap.fe.core/src/sap/fe/core/PageController.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/fe/core/BaseController","sap/fe/core/ExtensionAPI","sap/fe/core/controllerextensions/InternalRouting","sap/fe/core/controllerextensions/Routing","sap/fe/core/controllerextensions/EditFlow","sap/fe/core/controllerextensions/InternalEditFlow","sap/fe/core/controllerextensions/PageReady","sap/fe/core/controllerextensions/MessageHandler","sap/fe/core/controllerextensions/IntentBasedNavigation","sap/fe/core/controllerextensions/InternalIntentBasedNavigation","sap/fe/core/controllerextensions/Share","sap/fe/core/controllerextensions/ViewState","sap/fe/core/controllerextensions/Paginator","sap/fe/core/controllerextensions/Placeholder"],function(C,E,I,R,a,b,P,M,c,d,S,V,e,f){"use strict";return C.extend("sap.fe.core.PageController",{routing:R,_routing:I,editFlow:a,_editFlow:b,intentBasedNavigation:c,_intentBasedNavigation:d,pageReady:P,messageHandler:M,share:S,paginator:e,viewState:V,placeholder:f,onInit:function(){var u=this.getAppComponent().getModel("ui"),i=this.getAppComponent().getModel("internal"),p="/pages/"+this.getView().getId();u.setProperty(p,{controls:{}});i.setProperty(p,{controls:{}});this.getView().bindElement({path:p,model:"ui"});this.getView().bindElement({path:p,model:"internal"});this.getView().bindElement({path:p,model:"pageInternal"});this.getView().setModel(i,"pageInternal");this.getView().setModel(u,"ui");this.getView().setModel(i,"internal");},onBeforeRendering:function(){if(this.placeholder.attachHideCallback){this.placeholder.attachHideCallback();}},getExtensionAPI:function(){if(!this.extensionAPI){this.extensionAPI=new E(this);}return this.extensionAPI;},onPageReady:function(p){this.getAppComponent().getAppStateHandler().applyAppState();}});});
+sap.ui.define(["sap/fe/core/BaseController","sap/fe/core/ExtensionAPI","sap/fe/core/controllerextensions/InternalRouting","sap/fe/core/controllerextensions/Routing","sap/fe/core/controllerextensions/EditFlow","sap/fe/core/controllerextensions/InternalEditFlow","sap/fe/core/controllerextensions/PageReady","sap/fe/core/controllerextensions/MessageHandler","sap/fe/core/controllerextensions/IntentBasedNavigation","sap/fe/core/controllerextensions/InternalIntentBasedNavigation","sap/fe/core/controllerextensions/Share","sap/fe/core/controllerextensions/ViewState","sap/fe/core/controllerextensions/Paginator","sap/fe/core/controllerextensions/Placeholder","sap/fe/core/controllerextensions/SideEffects","sap/fe/core/controllerextensions/MassEdit"],function(C,E,I,R,a,b,P,M,c,d,S,V,e,f,g,h){"use strict";return C.extend("sap.fe.core.PageController",{routing:R,_routing:I,editFlow:a,_editFlow:b,intentBasedNavigation:c,_intentBasedNavigation:d,pageReady:P,messageHandler:M,share:S,paginator:e,viewState:V,placeholder:f,_sideEffects:g,massEdit:h,onInit:function(){var u=this.getAppComponent().getModel("ui"),i=this.getAppComponent().getModel("internal"),p="/pages/"+this.getView().getId();u.setProperty(p,{controls:{}});i.setProperty(p,{controls:{}});this.getView().bindElement({path:p,model:"ui"});this.getView().bindElement({path:p,model:"internal"});this.getView().bindElement({path:p,model:"pageInternal"});this.getView().setModel(i,"pageInternal");this.getView().setModel(u,"ui");this.getView().setModel(i,"internal");},onBeforeRendering:function(){if(this.placeholder.attachHideCallback){this.placeholder.attachHideCallback();}},getExtensionAPI:function(){if(!this.extensionAPI){this.extensionAPI=new E(this);}return this.extensionAPI;},onPageReady:function(p){this.getAppComponent().getAppStateHandler().applyAppState();}});});

package/packages/sap.fe.core/src/sap/fe/core/RouterProxy-dbg.js

@@ -191,7 +191,7 @@ sap.ui.define(
 			 * @param {boolean} bPreserveHistory If set to true, non-ancestor entries in history will be retained
 			 * @param {boolean} bDisablePreservationCache If set to true, cache preservation mechanism is disabled for the current navigation
 			 * @param {boolean} bForceFocus If set to true, the logic to set the focus once the navigation is finalized will be triggered (onPageReady)
-			 * @returns {Promise} Promise that is resolved when the navigation is finalized
+			 * @returns {Promise} Promise (resolved when the navigation is finalized) that returns 'true' if a navigation took place, 'false' if the navigation didn't happen
 			 * @ui5-restricted
 			 */
 			navToHash: function(sHash, bPreserveHistory, bDisablePreservationCache, bForceFocus) {
@@ -225,7 +225,7 @@ sap.ui.define(
 					// in the EditFlow we rely on a UI5 mechanism that displays a confirm dialog.
 					if (!confirm(this.oResourceBundle.getText("C_ROUTER_PROXY_SAPFE_EXIT_NOTSAVED_MESSAGE"))) {
 						// The user clicked on Cancel --> cancel navigation
-						return Promise.resolve();
+						return Promise.resolve(false);
 					}
 					this.bIsGuardCrossAllowed = true;
 				}
@@ -608,12 +608,12 @@ sap.ui.define(
 			},
 
 			/**
-			 * Rebuilds the browser history from the app root page.
+			 * Synchronizes the browser history with the internal history of the routerProxy, and triggers a navigation if needed.
 			 *
 			 * @memberof sap.fe.core.RouterProxy
 			 * @param {object} oHistoryAction Specifies the navigation action to be performed
-			 * @param {boolean} bRebuildOnly `true` if rebuilding history
-			 * @returns {Promise} A promise that is resolved when the navigation is finalized
+			 * @param {boolean} bRebuildOnly `true` if internal history is currently being rebuilt
+			 * @returns {Promise} Promise (resolved when the navigation is finalized) that returns 'true' if a navigation took place, 'false' if the navigation didn't happen
 			 * @ui5-restricted
 			 * @final
 			 */
@@ -641,7 +641,7 @@ sap.ui.define(
 						}
 
 						that.bIsRebuildHistoryRunning = false;
-						resolve();
+						resolve(true); // a navigation occurred
 					}
 
 					// Async callbacks when navigating back, in order to let all notifications and events get processed
@@ -656,7 +656,7 @@ sap.ui.define(
 					function backAsync() {
 						window.removeEventListener("popstate", backAsync);
 						that.bIsRebuildHistoryRunning = false;
-						resolve();
+						resolve(true); // a navigation occurred
 					}
 
 					that._bIgnoreRestore = true;
@@ -666,14 +666,14 @@ sap.ui.define(
 							that._oRouter.getHashChanger().replaceHash(oTargetState.hash);
 							history.replaceState(Object.assign({ feLevel: newLevel }, history.state), "");
 							that.bIsRebuildHistoryRunning = false;
-							resolve();
+							resolve(true); // a navigation occurred
 							break;
 
 						case "append":
 							that._oRouter.getHashChanger().setHash(oTargetState.hash);
 							history.replaceState(Object.assign({ feLevel: newLevel }, history.state), "");
 							that.bIsRebuildHistoryRunning = false;
-							resolve();
+							resolve(true); // a navigation occurred
 							break;
 
 						case "back":
@@ -690,7 +690,7 @@ sap.ui.define(
 						default:
 							// No navigation
 							that.bIsRebuildHistoryRunning = false;
-							resolve();
+							resolve(false); // no navigation --> resolve to false
 					}
 				});
 			},
@@ -804,6 +804,22 @@ sap.ui.define(
 					return !sPrevHash || !that.checkHashWithGuard(sPrevHash);
 				}
 				return false;
+			},
+
+			/**
+			 * Checks if the last 2 entries in the history share the same context.
+			 *
+			 * @returns {boolean} `true` if they share the same context.
+			 */
+			checkIfBackHasSameContext: function() {
+				if (this._oManagedHistory.length < 2) {
+					return false;
+				}
+
+				var oCurrentState = this._oManagedHistory[this._oManagedHistory.length - 1];
+				var oPreviousState = this._oManagedHistory[this._oManagedHistory.length - 2];
+
+				return oCurrentState.hash.split("?")[0] === oPreviousState.hash.split("?")[0];
 			}
 		});
 	}

package/packages/sap.fe.core/src/sap/fe/core/RouterProxy.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/base/Log","sap/ui/base/Object","sap/ui/base/EventProvider","sap/fe/core/Synchronization","sap/ui/thirdparty/URI"],function(L,B,E,S,U){"use strict";var e={EQUAL:0,COMPATIBLE:1,ANCESTOR:2,DIFFERENT:3};var a={LAYOUTPARAM:"layout",IAPPSTATEPARAM:"sap-iapp-state"};function c(g){return{_guardHash:g.replace(/\?[^\?]*$/,""),check:function(h){return h.indexOf(this._guardHash)===0;}};}function f(h){var A=h.match(new RegExp("\\?.*"+a.IAPPSTATEPARAM+"=([^&]*)"));return A&&A.length>1?A[1]:null;}function r(h){return h.replace(new RegExp("[&?]*"+a.IAPPSTATEPARAM+"=[^&]*"),"");}function s(h,A){var n;if(h.indexOf(a.IAPPSTATEPARAM)>=0){n=h.replace(new RegExp(a.IAPPSTATEPARAM+"=[^&]*"),a.IAPPSTATEPARAM+"="+A);}else{if(h.indexOf("?")<0){n=h+"?";}else{n=h+"&";}n+=a.IAPPSTATEPARAM+"="+A;}return n;}return B.extend("sap.fe.core.RouterProxy",{bIsRebuildHistoryRunning:false,bIsComputingTitleHierachy:false,bIsGuardCrossAllowed:false,sIAppStateKey:null,init:function(A,i){A.getService("shellServices").then(function(){this._oShellServices=A.getShellServices();this.initRaw(A.getRouter());this.waitForRouteMatchBeforeNavigation();history.replaceState(Object.assign({feLevel:0},history.state),"",window.location);this.fclEnabled=i;this._fnBlockingNavFilter=this._blockingNavigationFilter.bind(this);this._oShellServices.registerNavigationFilter(this._fnBlockingNavFilter);}.bind(this)).catch(function(o){L.error("Cannot retrieve the shell services",o);});this._fnHashGuard=this.hashGuard.bind(this);window.addEventListener("popstate",this._fnHashGuard);this._bDisableOnHashChange=false;this._bIgnoreRestore=false;this._bCleanedRestore=false;this._bForceFocus=true;},destroy:function(){if(this._oShellServices){this._oShellServices.unregisterNavigationFilter(this._fnBlockingNavFilter);}window.removeEventListener("popstate",this._fnHashGuard);},initRaw:function(R){this._oRouter=R;this._oManagedHistory=[];this._oNavigationGuard=null;var C=this.getHash();this._oManagedHistory.push(this._extractStateFromHash(C));this.sIAppStateKey=f(C);},getHash:function(){return this._oRouter.getHashChanger().getHash();},isFocusForced:function(){return this._bForceFocus;},setFocusForced:function(F){this._bForceFocus=F;},removeIAppStateKey:function(){this.sIAppStateKey=null;},navToHash:function(h,p,d,F){var t=this;if(this._oRouteMatchSynchronization){return this._oRouteMatchSynchronization.waitFor().then(function(){t._oRouteMatchSynchronization=null;return t._internalNavToHash(h,p,d,F);});}else{if(this._bActivateRouteMatchSynchro){this.waitForRouteMatchBeforeNavigation();}return t._internalNavToHash(h,p,d,F);}},_internalNavToHash:function(h,p,d,F){if(this.fclEnabled&&this.sIAppStateKey&&!f(h)){h=s(h,this.sIAppStateKey);}if(!this.checkHashWithGuard(h)){if(!this.oResourceBundle){this.oResourceBundle=sap.ui.getCore().getLibraryResourceBundle("sap.fe.core");}if(!confirm(this.oResourceBundle.getText("C_ROUTER_PROXY_SAPFE_EXIT_NOTSAVED_MESSAGE"))){return Promise.resolve();}this.bIsGuardCrossAllowed=true;}var n=this._extractStateFromHash(h);if(!this._bForceFocus){var C=this._extractKeysFromHash(this.getHash());this._bForceFocus=F||(C.length<n.keys.length&&C.every(function(k,i){return k===n.keys[i];}));}var H=this._pushNewState(n,false,p,d);return this._rebuildBrowserHistory(H,false);},restoreHistory:function(){if(this._bApplyRestore){this._bApplyRestore=false;var t=this.getHash();t=t.replace(/(\?|&)restoreHistory=true/,"");var n=this._extractStateFromHash(t);var h=this._pushNewState(n,true,false,true);return this._rebuildBrowserHistory(h,true);}else{return Promise.resolve();}},navBack:function(){var C=this.getHash(),p;for(var i=this._oManagedHistory.length-1;i>0;i--){if(this._oManagedHistory[i].hash===C){p=this._oManagedHistory[i-1].hash;break;}}if(p){return this.navToHash(p);}else{window.history.back();return Promise.resolve();}},navTo:function(R,p){var h=this._oRouter.getURL(R,p);return this.navToHash(h,false,p.noPreservationCache);},exitFromApp:function(){return this._oShellServices.backToPreviousApp();},isCurrentStateImpactedBy:function(h){if(h[0]==="/"){h=h.substring(1);}var l=c(h);return l.check(this.getHash());},isNavigationFinalized:function(){return!this.bIsRebuildHistoryRunning&&!this._bDelayedRebuild;},setNavigationGuard:function(){this._oNavigationGuard=c(this.getHash());this.bIsGuardCrossAllowed=false;},discardNavigationGuard:function(){this._oNavigationGuard=null;},hasNavigationGuard:function(){return this._oNavigationGuard!==null;},checkHashWithGuard:function(h){return this._oNavigationGuard===null||this._oNavigationGuard.check(h);},isGuardCrossAllowedByUser:function(){return this.bIsGuardCrossAllowed;},activateRouteMatchSynchronization:function(){this._bActivateRouteMatchSynchro=true;},resolveRouteMatch:function(){if(this._oRouteMatchSynchronization){this._oRouteMatchSynchronization.resolve();}},waitForRouteMatchBeforeNavigation:function(){this._oRouteMatchSynchronization=new S();this._bActivateRouteMatchSynchro=false;},_extractKeysFromHash:function(h){if(h===undefined){h="";}var H=h.split("?")[0];var t=H.split("/");var k=[];t.forEach(function(T){var b=/[^\(\)]+\([^\(\)]+\)/;if(b.test(T)){k.push(T.split("(")[0]);}});return k;},_extractStateFromHash:function(h){if(h===undefined){h="";}var o={keys:this._extractKeysFromHash(h)};var l=h.match(new RegExp("\\?.*"+a.LAYOUTPARAM+"=([^&]*)"));o.sLayout=l&&l.length>1?l[1]:null;if(o.sLayout==="MidColumnFullScreen"){o.screenMode=1;}else if(o.sLayout==="EndColumnFullScreen"){o.screenMode=2;}else{o.screenMode=0;}o.hash=h;return o;},_pushNewState:function(n,R,p,d){var C=this.getHash(),l=this._oManagedHistory.length-1,P=R?1:0,t=this;if(!R){while(l>=0&&this._oManagedHistory[l].hash!==C){this._oManagedHistory.pop();l--;}if(this._oManagedHistory.length===0){this._oManagedHistory.push(this._extractStateFromHash(C));history.replaceState(Object.assign({feLevel:0},history.state),"");}}if(p&&!d){this._oManagedHistory[this._oManagedHistory.length-1].preserved=true;}var o;while(this._oManagedHistory.length>0){var T=this._oManagedHistory[this._oManagedHistory.length-1];if((d||!T.preserved)&&this._compareCacheStates(T,n)!==e.ANCESTOR){o=this._oManagedHistory.pop();P++;}else if(T.preserved&&r(T.hash)===r(n.hash)){o=this._oManagedHistory.pop();P++;n.preserved=true;break;}else{break;}}this.sIAppStateKey=f(n.hash);if(this.fclEnabled&&this.sIAppStateKey){this._oManagedHistory.forEach(function(m){m.hash=s(m.hash,t.sIAppStateKey);});}else if(!this.fclEnabled&&o){var b=f(o.hash);var g=this._compareCacheStates(o,n);if(!this.sIAppStateKey&&b&&(g===e.EQUAL||g===e.COMPATIBLE)){n.hash=s(n.hash,b);}}var h=o&&n.hash===o.hash;if(this._oManagedHistory.length===0||this._oManagedHistory[this._oManagedHistory.length-1].hash!==n.hash){this._oManagedHistory.push(n);}if(P===0){return{type:"append"};}else if(P===1){return h?{type:"none"}:{type:"replace"};}else{return h?{type:"back",steps:P-1}:{type:"back-replace",steps:P-1};}},_blockingNavigationFilter:function(){return this._bDisableOnHashChange?"Custom":"Continue";},_disableEventOnHashChange:function(){this._bDisableOnHashChange=true;this._oRouter.stop();},_enableEventOnHashChange:function(i){this._bDisableOnHashChange=false;this._oRouter.initialize(i);},_rebuildBrowserHistory:function(h,R){var t=this;return new Promise(function(b,d){t.bIsRebuildHistoryRunning=true;var T=t._oManagedHistory[t._oManagedHistory.length-1],n=t._oManagedHistory.length-1;function g(){if(!R){t._enableEventOnHashChange(true);}t._oRouter.getHashChanger().replaceHash(T.hash);history.replaceState(Object.assign({feLevel:n},history.state),"");if(R){setTimeout(function(){t._enableEventOnHashChange(true);},0);}t.bIsRebuildHistoryRunning=false;b();}function i(){window.removeEventListener("popstate",i);setTimeout(function(){g();},0);}function j(){window.removeEventListener("popstate",j);t.bIsRebuildHistoryRunning=false;b();}t._bIgnoreRestore=true;switch(h.type){case"replace":t._oRouter.getHashChanger().replaceHash(T.hash);history.replaceState(Object.assign({feLevel:n},history.state),"");t.bIsRebuildHistoryRunning=false;b();break;case"append":t._oRouter.getHashChanger().setHash(T.hash);history.replaceState(Object.assign({feLevel:n},history.state),"");t.bIsRebuildHistoryRunning=false;b();break;case"back":window.addEventListener("popstate",j);history.go(-h.steps);break;case"back-replace":t._disableEventOnHashChange();window.addEventListener("popstate",i);history.go(-h.steps);break;default:t.bIsRebuildHistoryRunning=false;b();}});},getLastHistoryEntry:function(){return this._oManagedHistory[this._oManagedHistory.length-1];},hashGuard:function(o){if(this._bCleanedRestore){this._bCleanedRestore=false;return;}var h=window.location.hash;if(h.indexOf("restoreHistory=true")!==-1){this._bApplyRestore=true;}else if(!this.bIsRebuildHistoryRunning){var H=h.split("&/");var A=H[1]?H[1]:"";if(this.checkHashWithGuard(A)){this._bDelayedRebuild=true;var n=this._extractStateFromHash(A);this._pushNewState(n,false,false,true);var t=this;setTimeout(function(){t._bDelayedRebuild=false;},0);}}},_compareCacheStates:function(o,b){if(o.keys.length>b.keys.length){return e.DIFFERENT;}var d=true;var i;for(i=0;d&&i<o.keys.length;i++){if(o.keys[i]!==b.keys[i]){d=false;}}if(!d){return e.DIFFERENT;}if(o.keys.length<b.keys.length||o.screenMode<b.screenMode){return e.ANCESTOR;}if(o.screenMode>b.screenMode){return e.DIFFERENT;}return o.sLayout===b.sLayout?e.EQUAL:e.COMPATIBLE;},checkIfBackIsOutOfGuard:function(p){var t=this,P;if(p===undefined){var o=this._oShellServices.splitHash(window.location.hash);if(o&&o.appSpecificRoute){p=o.appSpecificRoute;if(p.indexOf("&/")===0){p=p.substring(2);}}else{p=window.location.hash.substring(1);if(p[0]==="/"){p=p.substring(1);}}}p=U.decode(p);if(t._oNavigationGuard){for(var i=t._oManagedHistory.length-1;i>0;i--){if(t._oManagedHistory[i].hash===p){P=t._oManagedHistory[i-1].hash;break;}}return!P||!t.checkHashWithGuard(P);}return false;}});});
+sap.ui.define(["sap/base/Log","sap/ui/base/Object","sap/ui/base/EventProvider","sap/fe/core/Synchronization","sap/ui/thirdparty/URI"],function(L,B,E,S,U){"use strict";var e={EQUAL:0,COMPATIBLE:1,ANCESTOR:2,DIFFERENT:3};var a={LAYOUTPARAM:"layout",IAPPSTATEPARAM:"sap-iapp-state"};function c(g){return{_guardHash:g.replace(/\?[^\?]*$/,""),check:function(h){return h.indexOf(this._guardHash)===0;}};}function f(h){var A=h.match(new RegExp("\\?.*"+a.IAPPSTATEPARAM+"=([^&]*)"));return A&&A.length>1?A[1]:null;}function r(h){return h.replace(new RegExp("[&?]*"+a.IAPPSTATEPARAM+"=[^&]*"),"");}function s(h,A){var n;if(h.indexOf(a.IAPPSTATEPARAM)>=0){n=h.replace(new RegExp(a.IAPPSTATEPARAM+"=[^&]*"),a.IAPPSTATEPARAM+"="+A);}else{if(h.indexOf("?")<0){n=h+"?";}else{n=h+"&";}n+=a.IAPPSTATEPARAM+"="+A;}return n;}return B.extend("sap.fe.core.RouterProxy",{bIsRebuildHistoryRunning:false,bIsComputingTitleHierachy:false,bIsGuardCrossAllowed:false,sIAppStateKey:null,init:function(A,i){A.getService("shellServices").then(function(){this._oShellServices=A.getShellServices();this.initRaw(A.getRouter());this.waitForRouteMatchBeforeNavigation();history.replaceState(Object.assign({feLevel:0},history.state),"",window.location);this.fclEnabled=i;this._fnBlockingNavFilter=this._blockingNavigationFilter.bind(this);this._oShellServices.registerNavigationFilter(this._fnBlockingNavFilter);}.bind(this)).catch(function(o){L.error("Cannot retrieve the shell services",o);});this._fnHashGuard=this.hashGuard.bind(this);window.addEventListener("popstate",this._fnHashGuard);this._bDisableOnHashChange=false;this._bIgnoreRestore=false;this._bCleanedRestore=false;this._bForceFocus=true;},destroy:function(){if(this._oShellServices){this._oShellServices.unregisterNavigationFilter(this._fnBlockingNavFilter);}window.removeEventListener("popstate",this._fnHashGuard);},initRaw:function(R){this._oRouter=R;this._oManagedHistory=[];this._oNavigationGuard=null;var C=this.getHash();this._oManagedHistory.push(this._extractStateFromHash(C));this.sIAppStateKey=f(C);},getHash:function(){return this._oRouter.getHashChanger().getHash();},isFocusForced:function(){return this._bForceFocus;},setFocusForced:function(F){this._bForceFocus=F;},removeIAppStateKey:function(){this.sIAppStateKey=null;},navToHash:function(h,p,d,F){var t=this;if(this._oRouteMatchSynchronization){return this._oRouteMatchSynchronization.waitFor().then(function(){t._oRouteMatchSynchronization=null;return t._internalNavToHash(h,p,d,F);});}else{if(this._bActivateRouteMatchSynchro){this.waitForRouteMatchBeforeNavigation();}return t._internalNavToHash(h,p,d,F);}},_internalNavToHash:function(h,p,d,F){if(this.fclEnabled&&this.sIAppStateKey&&!f(h)){h=s(h,this.sIAppStateKey);}if(!this.checkHashWithGuard(h)){if(!this.oResourceBundle){this.oResourceBundle=sap.ui.getCore().getLibraryResourceBundle("sap.fe.core");}if(!confirm(this.oResourceBundle.getText("C_ROUTER_PROXY_SAPFE_EXIT_NOTSAVED_MESSAGE"))){return Promise.resolve(false);}this.bIsGuardCrossAllowed=true;}var n=this._extractStateFromHash(h);if(!this._bForceFocus){var C=this._extractKeysFromHash(this.getHash());this._bForceFocus=F||(C.length<n.keys.length&&C.every(function(k,i){return k===n.keys[i];}));}var H=this._pushNewState(n,false,p,d);return this._rebuildBrowserHistory(H,false);},restoreHistory:function(){if(this._bApplyRestore){this._bApplyRestore=false;var t=this.getHash();t=t.replace(/(\?|&)restoreHistory=true/,"");var n=this._extractStateFromHash(t);var h=this._pushNewState(n,true,false,true);return this._rebuildBrowserHistory(h,true);}else{return Promise.resolve();}},navBack:function(){var C=this.getHash(),p;for(var i=this._oManagedHistory.length-1;i>0;i--){if(this._oManagedHistory[i].hash===C){p=this._oManagedHistory[i-1].hash;break;}}if(p){return this.navToHash(p);}else{window.history.back();return Promise.resolve();}},navTo:function(R,p){var h=this._oRouter.getURL(R,p);return this.navToHash(h,false,p.noPreservationCache);},exitFromApp:function(){return this._oShellServices.backToPreviousApp();},isCurrentStateImpactedBy:function(h){if(h[0]==="/"){h=h.substring(1);}var l=c(h);return l.check(this.getHash());},isNavigationFinalized:function(){return!this.bIsRebuildHistoryRunning&&!this._bDelayedRebuild;},setNavigationGuard:function(){this._oNavigationGuard=c(this.getHash());this.bIsGuardCrossAllowed=false;},discardNavigationGuard:function(){this._oNavigationGuard=null;},hasNavigationGuard:function(){return this._oNavigationGuard!==null;},checkHashWithGuard:function(h){return this._oNavigationGuard===null||this._oNavigationGuard.check(h);},isGuardCrossAllowedByUser:function(){return this.bIsGuardCrossAllowed;},activateRouteMatchSynchronization:function(){this._bActivateRouteMatchSynchro=true;},resolveRouteMatch:function(){if(this._oRouteMatchSynchronization){this._oRouteMatchSynchronization.resolve();}},waitForRouteMatchBeforeNavigation:function(){this._oRouteMatchSynchronization=new S();this._bActivateRouteMatchSynchro=false;},_extractKeysFromHash:function(h){if(h===undefined){h="";}var H=h.split("?")[0];var t=H.split("/");var k=[];t.forEach(function(T){var b=/[^\(\)]+\([^\(\)]+\)/;if(b.test(T)){k.push(T.split("(")[0]);}});return k;},_extractStateFromHash:function(h){if(h===undefined){h="";}var o={keys:this._extractKeysFromHash(h)};var l=h.match(new RegExp("\\?.*"+a.LAYOUTPARAM+"=([^&]*)"));o.sLayout=l&&l.length>1?l[1]:null;if(o.sLayout==="MidColumnFullScreen"){o.screenMode=1;}else if(o.sLayout==="EndColumnFullScreen"){o.screenMode=2;}else{o.screenMode=0;}o.hash=h;return o;},_pushNewState:function(n,R,p,d){var C=this.getHash(),l=this._oManagedHistory.length-1,P=R?1:0,t=this;if(!R){while(l>=0&&this._oManagedHistory[l].hash!==C){this._oManagedHistory.pop();l--;}if(this._oManagedHistory.length===0){this._oManagedHistory.push(this._extractStateFromHash(C));history.replaceState(Object.assign({feLevel:0},history.state),"");}}if(p&&!d){this._oManagedHistory[this._oManagedHistory.length-1].preserved=true;}var o;while(this._oManagedHistory.length>0){var T=this._oManagedHistory[this._oManagedHistory.length-1];if((d||!T.preserved)&&this._compareCacheStates(T,n)!==e.ANCESTOR){o=this._oManagedHistory.pop();P++;}else if(T.preserved&&r(T.hash)===r(n.hash)){o=this._oManagedHistory.pop();P++;n.preserved=true;break;}else{break;}}this.sIAppStateKey=f(n.hash);if(this.fclEnabled&&this.sIAppStateKey){this._oManagedHistory.forEach(function(m){m.hash=s(m.hash,t.sIAppStateKey);});}else if(!this.fclEnabled&&o){var b=f(o.hash);var g=this._compareCacheStates(o,n);if(!this.sIAppStateKey&&b&&(g===e.EQUAL||g===e.COMPATIBLE)){n.hash=s(n.hash,b);}}var h=o&&n.hash===o.hash;if(this._oManagedHistory.length===0||this._oManagedHistory[this._oManagedHistory.length-1].hash!==n.hash){this._oManagedHistory.push(n);}if(P===0){return{type:"append"};}else if(P===1){return h?{type:"none"}:{type:"replace"};}else{return h?{type:"back",steps:P-1}:{type:"back-replace",steps:P-1};}},_blockingNavigationFilter:function(){return this._bDisableOnHashChange?"Custom":"Continue";},_disableEventOnHashChange:function(){this._bDisableOnHashChange=true;this._oRouter.stop();},_enableEventOnHashChange:function(i){this._bDisableOnHashChange=false;this._oRouter.initialize(i);},_rebuildBrowserHistory:function(h,R){var t=this;return new Promise(function(b,d){t.bIsRebuildHistoryRunning=true;var T=t._oManagedHistory[t._oManagedHistory.length-1],n=t._oManagedHistory.length-1;function g(){if(!R){t._enableEventOnHashChange(true);}t._oRouter.getHashChanger().replaceHash(T.hash);history.replaceState(Object.assign({feLevel:n},history.state),"");if(R){setTimeout(function(){t._enableEventOnHashChange(true);},0);}t.bIsRebuildHistoryRunning=false;b(true);}function i(){window.removeEventListener("popstate",i);setTimeout(function(){g();},0);}function j(){window.removeEventListener("popstate",j);t.bIsRebuildHistoryRunning=false;b(true);}t._bIgnoreRestore=true;switch(h.type){case"replace":t._oRouter.getHashChanger().replaceHash(T.hash);history.replaceState(Object.assign({feLevel:n},history.state),"");t.bIsRebuildHistoryRunning=false;b(true);break;case"append":t._oRouter.getHashChanger().setHash(T.hash);history.replaceState(Object.assign({feLevel:n},history.state),"");t.bIsRebuildHistoryRunning=false;b(true);break;case"back":window.addEventListener("popstate",j);history.go(-h.steps);break;case"back-replace":t._disableEventOnHashChange();window.addEventListener("popstate",i);history.go(-h.steps);break;default:t.bIsRebuildHistoryRunning=false;b(false);}});},getLastHistoryEntry:function(){return this._oManagedHistory[this._oManagedHistory.length-1];},hashGuard:function(o){if(this._bCleanedRestore){this._bCleanedRestore=false;return;}var h=window.location.hash;if(h.indexOf("restoreHistory=true")!==-1){this._bApplyRestore=true;}else if(!this.bIsRebuildHistoryRunning){var H=h.split("&/");var A=H[1]?H[1]:"";if(this.checkHashWithGuard(A)){this._bDelayedRebuild=true;var n=this._extractStateFromHash(A);this._pushNewState(n,false,false,true);var t=this;setTimeout(function(){t._bDelayedRebuild=false;},0);}}},_compareCacheStates:function(o,b){if(o.keys.length>b.keys.length){return e.DIFFERENT;}var d=true;var i;for(i=0;d&&i<o.keys.length;i++){if(o.keys[i]!==b.keys[i]){d=false;}}if(!d){return e.DIFFERENT;}if(o.keys.length<b.keys.length||o.screenMode<b.screenMode){return e.ANCESTOR;}if(o.screenMode>b.screenMode){return e.DIFFERENT;}return o.sLayout===b.sLayout?e.EQUAL:e.COMPATIBLE;},checkIfBackIsOutOfGuard:function(p){var t=this,P;if(p===undefined){var o=this._oShellServices.splitHash(window.location.hash);if(o&&o.appSpecificRoute){p=o.appSpecificRoute;if(p.indexOf("&/")===0){p=p.substring(2);}}else{p=window.location.hash.substring(1);if(p[0]==="/"){p=p.substring(1);}}}p=U.decode(p);if(t._oNavigationGuard){for(var i=t._oManagedHistory.length-1;i>0;i--){if(t._oManagedHistory[i].hash===p){P=t._oManagedHistory[i-1].hash;break;}}return!P||!t.checkHashWithGuard(P);}return false;},checkIfBackHasSameContext:function(){if(this._oManagedHistory.length<2){return false;}var C=this._oManagedHistory[this._oManagedHistory.length-1];var p=this._oManagedHistory[this._oManagedHistory.length-2];return C.hash.split("?")[0]===p.hash.split("?")[0];}});});

package/packages/sap.fe.core/src/sap/fe/core/TemplateComponent-dbg.js

@@ -4,8 +4,8 @@
     
  */
 sap.ui.define(
-	["sap/ui/core/UIComponent", "sap/fe/core/CommonUtils", "sap/base/Log"],
-	function(UIComponent, CommonUtils, Log) {
+	["sap/ui/core/UIComponent", "sap/fe/core/CommonUtils", "sap/ui/mdc/p13n/StateUtil", "sap/base/Log"],
+	function(UIComponent, CommonUtils, StateUtil, Log) {
 		"use strict";
 
 		var TemplateComponent = UIComponent.extend("sap.fe.core.TemplateComponent", {
@@ -13,7 +13,7 @@ sap.ui.define(
 				interfaces: ["sap.ui.core.IAsyncContentCreation"],
 				properties: {
 					/**
-					 * OData EntitySet name
+					 * Name of the OData entity set
 					 */
 					entitySet: {
 						type: "string",
@@ -94,6 +94,15 @@ sap.ui.define(
 			init: function() {
 				this.oAppComponent = CommonUtils.getAppComponent(this);
 				UIComponent.prototype.init.apply(this, arguments);
+				var oStateChangedHandler = function(oEvent) {
+					var oControl = oEvent.getParameter("control");
+					if (oControl.isA("sap.ui.mdc.Table") || oControl.isA("sap.ui.mdc.FilterBar")) {
+						var oMacroAPI = oControl.getParent();
+						oMacroAPI.fireStateChanged();
+					}
+				};
+				StateUtil.detachStateChange(oStateChangedHandler);
+				StateUtil.attachStateChange(oStateChangedHandler);
 			},
 
 			// This method is called by UI5 core to access to the component containing the customizing configuration.
@@ -142,7 +151,7 @@ sap.ui.define(
 						.getController()
 						._getPageTitleInformation();
 				} else {
-					return Promise.resolve({});
+					return {};
 				}
 			},
 

package/packages/sap.fe.core/src/sap/fe/core/TemplateComponent.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/core/UIComponent","sap/fe/core/CommonUtils","sap/base/Log"],function(U,C,L){"use strict";var T=U.extend("sap.fe.core.TemplateComponent",{metadata:{interfaces:["sap.ui.core.IAsyncContentCreation"],properties:{entitySet:{type:"string",defaultValue:null},contextPath:{type:"string",defaultValue:null},bindingContextPattern:{type:"string"},navigation:{type:"object"},enhanceI18n:{type:"string[]"},controlConfiguration:{type:"object"},content:{type:"object"},allowDeepLinking:{type:"boolean"},refreshStrategyOnAppRestore:{type:"object"}},events:{containerDefined:{container:{type:"sap.ui.base.ManagedObject"}},heroesBatchReceived:{element:{type:"sap.ui.base.ManagedObject"}},workersBatchReceived:{element:{type:"sap.ui.base.ManagedObject"}}},library:"sap.fe.core"},setContainer:function(c){U.prototype.setContainer.apply(this,arguments);this.fireContainerDefined({container:c});},init:function(){this.oAppComponent=C.getAppComponent(this);U.prototype.init.apply(this,arguments);},getExtensionComponent:function(){return this.oAppComponent;},onPageReady:function(p){if(this.getRootControl()&&this.getRootControl().getController()&&this.getRootControl().getController().onPageReady){this.getRootControl().getController().onPageReady(p);}},getNavigationConfiguration:function(t){var n=this.getNavigation();return n[t];},getViewData:function(){var p=this.getMetadata().getAllProperties();var v=Object.keys(p).reduce(function(V,P){V[P]=p[P].get(this);return V;}.bind(this),{});v.fclEnabled=this.oAppComponent._isFclEnabled();return v;},_getPageTitleInformation:function(){if(this.getRootControl()&&this.getRootControl().getController()&&this.getRootControl().getController()._getPageTitleInformation){return this.getRootControl().getController()._getPageTitleInformation();}else{return Promise.resolve({});}},getExtensionAPI:function(){return this.getRootControl().getController().getExtensionAPI();}});return T;},true);
+sap.ui.define(["sap/ui/core/UIComponent","sap/fe/core/CommonUtils","sap/ui/mdc/p13n/StateUtil","sap/base/Log"],function(U,C,S,L){"use strict";var T=U.extend("sap.fe.core.TemplateComponent",{metadata:{interfaces:["sap.ui.core.IAsyncContentCreation"],properties:{entitySet:{type:"string",defaultValue:null},contextPath:{type:"string",defaultValue:null},bindingContextPattern:{type:"string"},navigation:{type:"object"},enhanceI18n:{type:"string[]"},controlConfiguration:{type:"object"},content:{type:"object"},allowDeepLinking:{type:"boolean"},refreshStrategyOnAppRestore:{type:"object"}},events:{containerDefined:{container:{type:"sap.ui.base.ManagedObject"}},heroesBatchReceived:{element:{type:"sap.ui.base.ManagedObject"}},workersBatchReceived:{element:{type:"sap.ui.base.ManagedObject"}}},library:"sap.fe.core"},setContainer:function(c){U.prototype.setContainer.apply(this,arguments);this.fireContainerDefined({container:c});},init:function(){this.oAppComponent=C.getAppComponent(this);U.prototype.init.apply(this,arguments);var s=function(e){var c=e.getParameter("control");if(c.isA("sap.ui.mdc.Table")||c.isA("sap.ui.mdc.FilterBar")){var m=c.getParent();m.fireStateChanged();}};S.detachStateChange(s);S.attachStateChange(s);},getExtensionComponent:function(){return this.oAppComponent;},onPageReady:function(p){if(this.getRootControl()&&this.getRootControl().getController()&&this.getRootControl().getController().onPageReady){this.getRootControl().getController().onPageReady(p);}},getNavigationConfiguration:function(t){var n=this.getNavigation();return n[t];},getViewData:function(){var p=this.getMetadata().getAllProperties();var v=Object.keys(p).reduce(function(V,P){V[P]=p[P].get(this);return V;}.bind(this),{});v.fclEnabled=this.oAppComponent._isFclEnabled();return v;},_getPageTitleInformation:function(){if(this.getRootControl()&&this.getRootControl().getController()&&this.getRootControl().getController()._getPageTitleInformation){return this.getRootControl().getController()._getPageTitleInformation();}else{return{};}},getExtensionAPI:function(){return this.getRootControl().getController().getExtensionAPI();}});return T;},true);

package/packages/sap.fe.core/src/sap/fe/core/TransactionHelper-dbg.js

@@ -77,7 +77,13 @@ sap.ui.define(
 			},
 			getProgrammingModel: function(oContext) {
 				if (!this.sProgrammingModel && oContext) {
-					if (ModelHelper.isDraftSupported(oContext.getModel().getMetaModel(), oContext.getPath())) {
+					var sPath;
+					if (oContext.isA("sap.ui.model.odata.v4.Context")) {
+						sPath = oContext.getPath();
+					} else {
+						sPath = oContext.isRelative() ? oContext.getResolvedPath() : oContext.getPath();
+					}
+					if (ModelHelper.isDraftSupported(oContext.getModel().getMetaModel(), sPath)) {
 						this.sProgrammingModel = ProgrammingModel.Draft;
 					} else if (ModelHelper.isStickySessionSupported(oContext.getModel().getMetaModel())) {
 						this.sProgrammingModel = ProgrammingModel.Sticky;
@@ -94,9 +100,8 @@ sap.ui.define(
 			 *
 			 * @memberof sap.fe.core.TransactionHelper
 			 * @static
-			 * @param {sap.ui.model.odata.v4.ODataListBinding} oMainListBinding OData v4 ListBinding object
+			 * @param {sap.ui.model.odata.v4.ODataListBinding} oMainListBinding OData V4 ListBinding object
 			 * @param {object} [mParameters] Optional, can contain the following attributes:
-			 * @param {boolean} [mParameters.refreshList] If the list shall be refreshed immediately after creating the instance
 			 * @param {map} [mParameters.data] A map of data that should be sent within the POST
 			 * @param {string} [mParameters.busyMode] Global (default), Local, None TODO: to be refactored
 			 * @param {map} [mParameters.keepTransientContextOnFailed] If set, the context stays in the list if the POST failed and POST will be repeated with the next change
@@ -110,7 +115,6 @@ sap.ui.define(
 			createDocument: function(oMainListBinding, mParameters, oResourceBundle, messageHandler, bFromCopyPaste) {
 				var oNewDocumentContext,
 					that = this,
-					bSkipRefresh,
 					oModel = oMainListBinding.getModel(),
 					oMetaModel = oModel.getMetaModel(),
 					sMetaPath = oMetaModel.getMetaPath(oMainListBinding.getHeaderContext().getPath()),
@@ -132,8 +136,18 @@ sap.ui.define(
 						oMetaModel.getObject(
 							ModelHelper.getTargetEntitySet(oMetaModel.getContext(sMetaPath)) +
 								"@com.sap.vocabularies.Common.v1.DefaultValuesFunction"
-						);
-
+						),
+					bFunctionOnNavProp;
+				if (sFunctionName) {
+					if (
+						oMetaModel.getObject(sMetaPath + "@com.sap.vocabularies.Common.v1.DefaultValuesFunction") &&
+						ModelHelper.getTargetEntitySet(oMetaModel.getContext(sMetaPath)) !== sMetaPath
+					) {
+						bFunctionOnNavProp = true;
+					} else {
+						bFunctionOnNavProp = false;
+					}
+				}
 				if (sMessagesPath) {
 					mBindingParameters["$select"] = sMessagesPath;
 				}
@@ -151,7 +165,6 @@ sap.ui.define(
 					sBusyPath = "/busyLocal/" + oMainListBinding.sId;
 				}
 				BusyLocker.lock(this.oLockObject, sBusyPath);
-				bSkipRefresh = !mParameters.refreshList;
 				var oResourceBundleCore = sap.ui.getCore().getLibraryResourceBundle("sap.fe.core");
 				if (sNewAction) {
 					oCreationPromise = this.callAction(
@@ -159,7 +172,7 @@ sap.ui.define(
 						{
 							contexts: oMainListBinding.getHeaderContext(),
 							showActionParameterDialog: true,
-							label: oResourceBundleCore.getText("C_TRANSACTION_HELPER_SAPFE_ACTION_CREATE"),
+							label: this._getSpecificCreateActionDialogLabel(oMetaModel, sMetaPath, sNewAction, oResourceBundleCore),
 							bindingParameters: mBindingParameters,
 							parentControl: mParameters.parentControl,
 							bIsCreateAction: true
@@ -174,8 +187,29 @@ sap.ui.define(
 						? CommonUtils.getNonComputedVisibleFields(oMetaModel, sMetaPath)
 						: [];
 					sFunctionName = bFromCopyPaste ? null : sFunctionName;
-					oCreationPromise = operations
-						.callFunctionImport(sFunctionName, oModel)
+					var sFunctionPath, oFunctionContext;
+					if (sFunctionName) {
+						//bound to the source entity:
+						if (bFunctionOnNavProp) {
+							sFunctionPath =
+								oMainListBinding.getContext() &&
+								oMetaModel.getMetaPath(oMainListBinding.getContext().getPath()) + "/" + sFunctionName;
+							oFunctionContext = oMainListBinding.getContext();
+						} else {
+							sFunctionPath =
+								oMainListBinding.getHeaderContext() &&
+								oMetaModel.getMetaPath(oMainListBinding.getHeaderContext().getPath()) + "/" + sFunctionName;
+							oFunctionContext = oMainListBinding.getHeaderContext();
+						}
+					}
+					var oFunction = sFunctionPath && oMetaModel.createBindingContext(sFunctionPath);
+					if (oFunction && oFunction.getObject() && oFunction.getObject()[0].$IsBound) {
+						oCreationPromise = operations.callBoundFunction(sFunctionName, oFunctionContext, oModel);
+					} else {
+						oCreationPromise = operations.callFunctionImport(sFunctionName, oModel);
+					}
+
+					oCreationPromise = oCreationPromise
 						.then(function(oContext) {
 							if (oContext) {
 								return oContext.getObject();
@@ -184,7 +218,7 @@ sap.ui.define(
 							}
 						})
 						.catch(function(oError) {
-							Log.error("Error while calling function Import " + sFunctionName, oError);
+							Log.error("Error while executing the function " + sFunctionName, oError);
 							throw oError;
 						})
 						.then(function(oData) {
@@ -203,7 +237,7 @@ sap.ui.define(
 									}
 								);
 								oTransientListBinding.refreshInternal = function() {};
-								oNewDocumentContext = oTransientListBinding.create(mParameters.data, bSkipRefresh);
+								oNewDocumentContext = oTransientListBinding.create(mParameters.data, true);
 								return that._launchDialogWithKeyFields(
 									oMainListBinding,
 									oTransientListBinding,
@@ -214,7 +248,7 @@ sap.ui.define(
 									messageHandler
 								);
 							} else {
-								oNewDocumentContext = oMainListBinding.create(mParameters.data, bSkipRefresh, mParameters.createAtEnd);
+								oNewDocumentContext = oMainListBinding.create(mParameters.data, true, mParameters.createAtEnd);
 								return that.onAfterCreateCompletion(
 									oMainListBinding,
 									oNewDocumentContext,
@@ -408,22 +442,13 @@ sap.ui.define(
 								}
 								mParameters = getParameters(mParameters);
 								if (mParameters.title) {
-									if (mParameters.description) {
-										aParams = [mParameters.title, mParameters.description];
-										oDeleteMessage.text = CommonUtils.getTranslatedText(
-											"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTINFO",
-											oResourceBundle,
-											aParams,
-											mParameters.entitySetName
-										);
-									} else {
-										oDeleteMessage.text = CommonUtils.getTranslatedText(
-											"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTTITLE_SINGULAR",
-											oResourceBundle,
-											null,
-											mParameters.entitySetName
-										);
-									}
+									aParams = [mParameters.title, mParameters.description];
+									oDeleteMessage.text = CommonUtils.getTranslatedText(
+										"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTINFO",
+										oResourceBundle,
+										aParams,
+										mParameters.entitySetName
+									);
 								} else {
 									oDeleteMessage.text = CommonUtils.getTranslatedText(
 										"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTTITLE_SINGULAR",
@@ -633,8 +658,14 @@ sap.ui.define(
 							bDialogConfirmed = true;
 							BusyLocker.lock(that.oLockObject);
 							var aContexts = aDeletableContexts;
-							return that
-								.findActiveDraftRootContexts(aContexts, mParameters.bFindActiveContexts)
+							var onBeforeDeletePromise;
+							if (mParameters.beforeDeleteCallBack) {
+								onBeforeDeletePromise = mParameters.beforeDeleteCallBack({ contexts: aContexts });
+							} else {
+								onBeforeDeletePromise = Promise.resolve();
+							}
+							return onBeforeDeletePromise
+								.then(that.findActiveDraftRootContexts.bind(that, aContexts, mParameters.bFindActiveContexts))
 								.then(function(activeContexts) {
 									//make sure to fetch the active contexts before deleting the drafts
 									return Promise.all(
@@ -784,7 +815,7 @@ sap.ui.define(
 			 * @param {sap.ui.model.odata.v4.Context} oContext Context of the document to be canceled or deleted
 			 * @param {object} [mParameters] Optional, can contain the following attributes:
 			 * @param {sap.m.Button} mParameters.cancelButton Cancel Button of the discard popover (mandatory for now)
-			 * @param {boolean} mParameters.bSkipDiscardPopover Optional, supresses the discard popover incase of draft applications while navigating out of OP
+			 * @param {boolean} mParameters.skipDiscardPopover Optional, supresses the discard popover incase of draft applications while navigating out of OP
 			 * @param oResourceBundle
 			 * @param messageHandler
 			 * @returns {Promise} Promise resolves with ???
@@ -803,6 +834,7 @@ sap.ui.define(
 				var oParamsContext = oContext,
 					oCancelButton = mParameters.cancelButton,
 					oModel = oParamsContext.getModel(),
+					onBeforeCancelPromise,
 					sCanonicalPath;
 				return Promise.resolve(this.getProgrammingModel(oContext))
 					.then(function(sPModel) {
@@ -821,12 +853,20 @@ sap.ui.define(
 						}
 					})
 					.then(function() {
-						if (!mParameters.bSkipDiscardPopover) {
+						if (!mParameters.skipDiscardPopover) {
 							return that._showDiscardPopover(oCancelButton, that._bIsModified, oResourceBundle);
 						} else {
 							return Promise.resolve();
 						}
 					})
+					.then(function() {
+						if (mParameters.beforeCancelCallBack) {
+							onBeforeCancelPromise = mParameters.beforeCancelCallBack({ context: oContext });
+						} else {
+							onBeforeCancelPromise = Promise.resolve();
+						}
+						return onBeforeCancelPromise;
+					})
 					.then(function() {
 						// eslint-disable-next-line default-case
 						switch (sProgrammingModel) {
@@ -976,7 +1016,7 @@ sap.ui.define(
 					});
 			},
 			/**
-			 * Calls a bound/unbound action.
+			 * Calls a bound or unbound action.
 			 *
 			 * @function
 			 * @static
@@ -984,9 +1024,9 @@ sap.ui.define(
 			 * @memberof sap.fe.core.TransactionHelper
 			 * @param {string} sActionName The name of the action to be called
 			 * @param {map} [mParameters] Contains the following attributes:
-			 * @param {sap.ui.model.odata.v4.Context} [mParameters.contexts] Mandatory for a bound action: Either one context or an array with contexts for which the action shall be called
-			 * @param {sap.ui.model.odata.v4.ODataModel} [mParameters.model] Mandatory for an unbound action: An instance of an OData v4 model
-			 * @param {string} [mParameters.invocationGrouping] Mode how actions are to be called: Changeset to put all action calls into one changeset, Isolated to put them into separate changesets (TODO: create enum)
+			 * @param {sap.ui.model.odata.v4.Context} [mParameters.contexts] Mandatory for a bound action: Either one context or an array with contexts for which the action is to be called
+			 * @param {sap.ui.model.odata.v4.ODataModel} [mParameters.model] Mandatory for an unbound action: An instance of an OData V4 model
+			 * @param {string} [mParameters.invocationGrouping] Mode how actions are to be called: 'ChangeSet' to put all action calls into one changeset, 'Isolated' to put them into separate changesets
 			 * @param {string} [mParameters.label] A human-readable label for the action
 			 * @param {boolean} [mParameters.bGetBoundContext] If specified, the action promise returns the bound context
 			 * @param {object} oView Contains the object of the current view
@@ -1322,8 +1362,9 @@ sap.ui.define(
 						oMetaModel = oModel.getMetaModel(),
 						aImmutableFields = [],
 						oAppComponent = that._getAppComponent(),
-						oEntitySetContext = oMetaModel.createBindingContext(oListBinding.getPath()),
-						sMetaPath = oMetaModel.getMetaPath(oListBinding.getPath());
+						sPath = oListBinding.isRelative() ? oListBinding.getResolvedPath() : oListBinding.getPath(),
+						oEntitySetContext = oMetaModel.createBindingContext(sPath),
+						sMetaPath = oMetaModel.getMetaPath(sPath);
 					for (var i in mFields) {
 						aImmutableFields.push(oMetaModel.createBindingContext(sMetaPath + "/" + mFields[i]));
 					}
@@ -1576,6 +1617,50 @@ sap.ui.define(
 							: undefined;
 				}
 				return sNewAction;
+			},
+			/**
+			 * Retrieves the label for the title of a specific create action dialog, e.g. Create Sales Order from Quotation.
+			 *
+			 * The following priority is applied:
+			 * 1. label of line-item annotation.
+			 * 2. label annotated in the action.
+			 * 3. "Create" as a constant from i18n.
+			 *
+			 * @function
+			 * @static
+			 * @private
+			 * @name sap.fe.core.TransactionHelper._getSpecificCreateActionDialogLabel
+			 * @memberof sap.fe.core.TransactionHelper
+			 * @param {object} oMetaModel The MetaModel used to check for the NewAction parameter
+			 * @param {string} sMetaPath The MetaPath
+			 * @param {string} sNewAction Contains the name of the action to be executed
+			 * @param {object} oResourceBundleCore ResourceBundle to access the default Create label
+			 * @returns {string} The label for the Create Action Dialog
+			 * @ui5-restricted
+			 * @final
+			 **/
+			_getSpecificCreateActionDialogLabel: function(oMetaModel, sMetaPath, sNewAction, oResourceBundleCore) {
+				var fnGetLabelFromLineItemAnnotation = function() {
+					if (oMetaModel && oMetaModel.getObject(sMetaPath + "/@com.sap.vocabularies.UI.v1.LineItem")) {
+						var iLineItemIndex = oMetaModel
+							.getObject(sMetaPath + "/@com.sap.vocabularies.UI.v1.LineItem")
+							.findIndex(function(oLineItem) {
+								var aLineItemAction = oLineItem.Action ? oLineItem.Action.split("(") : undefined;
+								return aLineItemAction ? aLineItemAction[0] === sNewAction : false;
+							});
+						return iLineItemIndex > -1
+							? oMetaModel.getObject(sMetaPath + "/@com.sap.vocabularies.UI.v1.LineItem")[iLineItemIndex].Label
+							: undefined;
+					} else {
+						return undefined;
+					}
+				};
+
+				return (
+					fnGetLabelFromLineItemAnnotation() ||
+					(oMetaModel && oMetaModel.getObject(sMetaPath + "/" + sNewAction + "@com.sap.vocabularies.Common.v1.Label")) ||
+					(oResourceBundleCore && oResourceBundleCore.getText("C_TRANSACTION_HELPER_SAPFE_ACTION_CREATE"))
+				);
 			}
 		});
 	}