@sap/open.fe 1.98.0 → 1.99.0

package/packages/sap.fe.core/src/sap/fe/core/controllerextensions/InternalEditFlow-dbg.js

@@ -13,7 +13,10 @@ sap.ui.define(
 		"sap/fe/core/CommonUtils",
 		"sap/fe/core/BusyLocker",
 		"sap/fe/core/library",
-		"sap/fe/core/helpers/EditState"
+		"sap/fe/core/helpers/EditState",
+		"sap/m/Button",
+		"sap/m/Dialog",
+		"sap/fe/core/actions/sticky"
 	],
 	function(
 		ControllerExtension,
@@ -24,7 +27,10 @@ sap.ui.define(
 		CommonUtils,
 		BusyLocker,
 		FELibrary,
-		EditState
+		EditState,
+		Button,
+		Dialog,
+		sticky
 	) {
 		"use strict";
 
@@ -33,7 +39,105 @@ sap.ui.define(
 			EditMode = FELibrary.EditMode,
 			CreationMode = FELibrary.CreationMode;
 
-		var Extension = ControllerExtension.extend("sap.fe.core.controllerextensions.InternalEditFlow", {
+		function _registerDirtyStateProvider(oContext, oAppComponent, oInternalModel, sHashTracker) {
+			function fnDirtyStateProvider(oNavigationContext) {
+				var sTargetHash = oNavigationContext.innerAppRoute,
+					oRouterProxy = oAppComponent.getRouterProxy(),
+					bDirty,
+					bSessionON = oInternalModel.getProperty("/sessionOn");
+
+				if (!bSessionON) {
+					// If the sticky session was terminated before hand.
+					// Eexample in case of navigating away from application using IBN.
+					return undefined;
+				}
+
+				if (!oRouterProxy.isNavigationFinalized()) {
+					// If navigation is currently happening in RouterProxy, it's a transient state
+					// (not dirty)
+					bDirty = false;
+					sHashTracker = sTargetHash;
+				} else if (sHashTracker === sTargetHash) {
+					// the hash didn't change so either the user attempts to refresh or to leave the app
+					bDirty = true;
+				} else if (oRouterProxy.checkHashWithGuard(sTargetHash) || oRouterProxy.isGuardCrossAllowedByUser()) {
+					// the user attempts to navigate within the root object
+					// or crossing the guard has already been allowed by the RouterProxy
+					sHashTracker = sTargetHash;
+					bDirty = false;
+				} else {
+					// the user attempts to navigate within the app, for example back to the list report
+					bDirty = true;
+				}
+
+				if (bDirty) {
+					// the FLP doesn't call the dirty state provider anymore once it's dirty, as they can't
+					// change this due to compatibility reasons we set it back to not-dirty
+					setTimeout(function() {
+						oAppComponent.getShellServices().setDirtyFlag(false);
+					}, 0);
+				}
+
+				return bDirty;
+			}
+
+			oContext.fnDirtyStateProvider = fnDirtyStateProvider;
+			oAppComponent.getShellServices().registerDirtyStateProvider(oContext.fnDirtyStateProvider);
+		}
+
+		function _attachSessionTimeout(oContext, i18nModel) {
+			var that = oContext;
+
+			function fnHandleSessionTimeout() {
+				// remove transient messages since we will showing our own message
+				that.getMessageHandler().removeTransitionMessages();
+
+				var oDialog = new Dialog({
+					title: "{sap.fe.i18n>C_EDITFLOW_OBJECT_PAGE_SESSION_EXPIRED_DIALOG_TITLE}",
+					state: "Warning",
+					content: new Text({ text: "{sap.fe.i18n>C_EDITFLOW_OBJECT_PAGE_SESSION_EXPIRED_DIALOG_MESSAGE}" }),
+					beginButton: new Button({
+						text: "{sap.fe.i18n>C_COMMON_DIALOG_OK}",
+						type: "Emphasized",
+						press: function() {
+							// remove sticky handling after navigation since session has already been terminated
+							that.handleStickyOff();
+							that.getRoutingListener().navigateBackFromContext(oContext);
+						}
+					}),
+					afterClose: function() {
+						oDialog.destroy();
+					}
+				});
+				oDialog.addStyleClass("sapUiContentPadding");
+				oDialog.setModel(i18nModel, "sap.fe.i18n");
+				that.getView().addDependent(oDialog);
+				oDialog.open();
+			}
+
+			// handle session timeout
+			that.fnHandleSessionTimeout = fnHandleSessionTimeout;
+			that.getView()
+				.getModel()
+				.attachSessionTimeout(that.fnHandleSessionTimeout);
+		}
+
+		function _attachRouteMatched(oFnContext, oContext, oAppComponent) {
+			var that = oFnContext;
+
+			function fnStickyDiscardAfterNavigation() {
+				var sCurrentHash = oAppComponent.getRouterProxy().getHash();
+				// either current hash is empty so the user left the app or he navigated away from the object
+				if (!sCurrentHash || !oAppComponent.getRouterProxy().checkHashWithGuard(sCurrentHash)) {
+					that.discardStickySession(oContext);
+				}
+			}
+
+			that.fnStickyDiscardAfterNavigation = fnStickyDiscardAfterNavigation;
+			oAppComponent.getRoutingService().attachRouteMatched(that.fnStickyDiscardAfterNavigation);
+		}
+
+		return ControllerExtension.extend("sap.fe.core.controllerextensions.InternalEditFlow", {
 			metadata: {
 				methods: {
 					createMultipleDocuments: { "public": true, "final": true },
@@ -54,7 +158,9 @@ sap.ui.define(
 					deleteCurrentActionPromise: { "public": true, "final": true },
 					getActionResponseDataAndKeys: { "public": true, "final": true },
 					setCreationMode: { "public": false, "final": false, "overrideExecution": OverrideExecution.After },
-					getMessageHandler: { "public": true, "final": true }
+					getMessageHandler: { "public": true, "final": true },
+					handleStickyOn: { "public": true, "final": true },
+					handleStickyOff: { "public": true, "final": true }
 				}
 			},
 
@@ -69,7 +175,7 @@ sap.ui.define(
 				// to be overridden
 			},
 
-			createMultipleDocuments: function(oListBinding, aData, bCreateAtEnd, bFromCopyPaste) {
+			createMultipleDocuments: function(oListBinding, aData, bCreateAtEnd, bFromCopyPaste, beforeCreateCallBack) {
 				var that = this,
 					transactionHelper = this.getTransactionHelper(),
 					oLockObject = this.getGlobalUIModel(),
@@ -77,6 +183,12 @@ sap.ui.define(
 
 				BusyLocker.lock(oLockObject);
 				return this.syncTask()
+					.then(function() {
+						var onBeforeCreatePromise = beforeCreateCallBack
+							? beforeCreateCallBack({ contextPath: oListBinding && oListBinding.getPath() })
+							: Promise.resolve();
+						return onBeforeCreatePromise;
+					})
 					.then(function() {
 						var oModel = oListBinding.getModel(),
 							oMetaModel = oModel.getMetaModel(),
@@ -113,7 +225,8 @@ sap.ui.define(
 								mParameters,
 								oResourceBundle,
 								that.getMessageHandler(),
-								bFromCopyPaste
+								bFromCopyPaste,
+								that.getView()
 							);
 						});
 
@@ -221,7 +334,8 @@ sap.ui.define(
 			 */
 
 			computeEditMode: function(oContext) {
-				var that = this;
+				var that = this,
+					sCustomAction = that.getInternalModel().getProperty("/sCustomAction");
 
 				return Promise.resolve(
 					(function() {
@@ -248,6 +362,19 @@ sap.ui.define(
 									Log.error("Error while determining the editMode for draft", oError);
 									throw oError;
 								});
+						} else if (sProgrammingModel === ProgrammingModel.Sticky) {
+							if (
+								sCustomAction &&
+								sCustomAction !== "" &&
+								that._hasNewActionForSticky(oContext, that.getView(), sCustomAction)
+							) {
+								that.getTransactionHelper()._bCreateMode = true;
+								that.getTransactionHelper().handleDocumentModifications();
+								that.setEditMode(EditMode.Editable, true);
+								EditState.setEditStateDirty();
+								that.handleStickyOn(oContext);
+								that.getInternalModel().setProperty("/sCustomAction", "");
+							}
 						}
 					})()
 				);
@@ -507,9 +634,149 @@ sap.ui.define(
 				onInit: function() {
 					this._oAppComponent = this.base.getAppComponent();
 				}
+			},
+
+			handleStickyOn: function(oContext) {
+				var that = this,
+					oAppComponent = CommonUtils.getAppComponent(this.getView());
+
+				try {
+					if (oAppComponent === undefined || oContext === undefined) {
+						throw new Error("undefined AppComponent or Context for function handleStickyOn");
+					}
+
+					if (!oAppComponent.getRouterProxy().hasNavigationGuard()) {
+						var sHashTracker = oAppComponent.getRouterProxy().getHash(),
+							oInternalModel = this.getInternalModel();
+
+						// Set a guard in the RouterProxy
+						// A timeout is necessary, as with deferred creation the hashChanger is not updated yet with
+						// the new hash, and the guard cannot be found in the managed history of the router proxy
+						setTimeout(function() {
+							oAppComponent.getRouterProxy().setNavigationGuard();
+						}, 0);
+
+						// Setting back navigation on shell service, to get the dicard message box in case of sticky
+						oAppComponent.getShellServices().setBackNavigation(that.onBackNavigationInSession.bind(that));
+
+						_registerDirtyStateProvider(that, oAppComponent, oInternalModel, sHashTracker);
+
+						var i18nModel = this.getView().getModel("sap.fe.i18n");
+						_attachSessionTimeout(that, i18nModel);
+
+						_attachRouteMatched(that, oContext, oAppComponent);
+					}
+				} catch (error) {
+					Log.info(error);
+					return undefined;
+				}
+				return true;
+			},
+
+			handleStickyOff: function() {
+				var oAppComponent = CommonUtils.getAppComponent(this.getView());
+				try {
+					if (oAppComponent === undefined) {
+						throw new Error("undefined AppComponent for function handleStickyOff");
+					}
+
+					if (oAppComponent && oAppComponent.getRouterProxy) {
+						// If we have exited from the app, CommonUtils.getAppComponent doesn't return a
+						// sap.fe.core.AppComponent, hence the 'if' above
+						oAppComponent.getRouterProxy().discardNavigationGuard();
+					}
+
+					if (this.fnDirtyStateProvider) {
+						oAppComponent.getShellServices().deregisterDirtyStateProvider(this.fnDirtyStateProvider);
+						this.fnDirtyStateProvider = null;
+					}
+
+					if (this.getView().getModel() && this.fnHandleSessionTimeout) {
+						this.getView()
+							.getModel()
+							.detachSessionTimeout(this.fnHandleSessionTimeout);
+					}
+
+					oAppComponent.getRoutingService().detachRouteMatched(this.fnStickyDiscardAfterNavigation);
+					this.fnStickyDiscardAfterNavigation = null;
+
+					this.getTransactionHelper()._bCreateMode = false;
+					this.setEditMode(EditMode.Display, false);
+
+					if (oAppComponent) {
+						// If we have exited from the app, CommonUtils.getAppComponent doesn't return a
+						// sap.fe.core.AppComponent, hence the 'if' above
+						oAppComponent.getShellServices().setBackNavigation();
+					}
+				} catch (error) {
+					Log.info(error);
+					return undefined;
+				}
+				return true;
+			},
+
+			/**
+			 * @description Method to display a 'discard' popover when exiting a sticky session.
+			 *
+			 * @function
+			 * @name onBackNavigationInSession
+			 * @memberof sap.fe.core.controllerextensions.InternalEditFlow
+			 */
+			onBackNavigationInSession: function() {
+				var that = this,
+					oView = that.getView(),
+					oAppComponent = CommonUtils.getAppComponent(oView),
+					oRouterProxy = oAppComponent.getRouterProxy();
+
+				if (oRouterProxy.checkIfBackIsOutOfGuard()) {
+					var oBindingContext = oView && oView.getBindingContext();
+
+					CommonUtils.processDataLossConfirmation(
+						function() {
+							that.discardStickySession(oBindingContext);
+							history.back();
+						},
+						oView,
+						that.getProgrammingModel(oBindingContext)
+					);
+
+					return;
+				}
+				history.back();
+			},
+
+			discardStickySession: function(oContext) {
+				sticky.discardDocument(oContext);
+				this.handleStickyOff();
+			},
+
+			_hasNewActionForSticky: function(oContext, oView, sCustomAction) {
+				try {
+					if (oContext === undefined || oView === undefined) {
+						throw new Error("Invalid input parameters for function _hasNewActionForSticky");
+					}
+
+					var oMetaModel = oView.getModel().getMetaModel(),
+						sMetaPath = oContext.getPath().substring(0, oContext.getPath().indexOf("(")),
+						oStickySession = oMetaModel.getObject(sMetaPath + "@com.sap.vocabularies.Session.v1.StickySessionSupported");
+
+					if (oStickySession && oStickySession.NewAction && oStickySession.NewAction === sCustomAction) {
+						return true;
+					} else if (oStickySession && oStickySession.AdditionalNewActions) {
+						return sCustomAction ===
+							oStickySession.AdditionalNewActions.find(function(sAdditionalAction) {
+								return sAdditionalAction === sCustomAction;
+							})
+							? true
+							: false;
+					} else {
+						return false;
+					}
+				} catch (error) {
+					Log.info(error);
+					return undefined;
+				}
 			}
 		});
-
-		return Extension;
 	}
 );

package/packages/sap.fe.core/src/sap/fe/core/controllerextensions/InternalEditFlow.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/core/mvc/ControllerExtension","sap/ui/core/mvc/OverrideExecution","sap/fe/core/actions/messageHandling","sap/fe/core/TransactionHelper","sap/base/Log","sap/fe/core/CommonUtils","sap/fe/core/BusyLocker","sap/fe/core/library","sap/fe/core/helpers/EditState"],function(C,O,m,T,L,a,B,F,E){"use strict";var P=F.ProgrammingModel,D=F.DraftStatus,b=F.EditMode,c=F.CreationMode;var d=C.extend("sap.fe.core.controllerextensions.InternalEditFlow",{metadata:{methods:{createMultipleDocuments:{"public":true,"final":true},deleteMultipleDocuments:{"public":true,"final":true},computeEditMode:{"public":true,"final":true},setEditMode:{"public":true,"final":true},setDraftStatus:{"public":true,"final":true},getRoutingListener:{"public":true,"final":true},getGlobalUIModel:{"public":true,"final":true},syncTask:{"public":true,"final":true},getProgrammingModel:{"public":true,"final":true},deleteDocumentTransaction:{"public":true,"final":true},handleCreateEvents:{"public":true,"final":true},getTransactionHelper:{"public":true,"final":true},getInternalModel:{"public":true,"final":true},createActionPromise:{"public":true,"final":true},getCurrentActionPromise:{"public":true,"final":true},deleteCurrentActionPromise:{"public":true,"final":true},getActionResponseDataAndKeys:{"public":true,"final":true},setCreationMode:{"public":false,"final":false,"overrideExecution":O.After},getMessageHandler:{"public":true,"final":true}}},setCreationMode:function(){},createMultipleDocuments:function(l,e,f,g){var t=this,h=this.getTransactionHelper(),o=this.getGlobalUIModel(),r=t.getView().getController().oResourceBundle;B.lock(o);return this.syncTask().then(function(){var M=l.getModel(),i=M.getMetaModel(),s;if(l.getContext()){s=i.getMetaPath(l.getContext().getPath()+"/"+l.getPath());}else{s=i.getMetaPath(l.getPath());}t.handleCreateEvents(l);var j=e.map(function(p){var k={data:{}};k.keepTransientContextOnFailed=false;k.busyMode="None";k.creationMode=c.CreationRow;k.parentControl=t.getView();k.createAtEnd=f;for(var n in p){var q=i.getObject(s+"/"+n);if(q&&q.$kind!=="NavigationProperty"&&p[n]){k.data[n]=p[n];}}return h.createDocument(l,k,r,t.getMessageHandler(),g);});return Promise.all(j);}).then(function(i){return Promise.all(i.map(function(n){return n.created();}));}).then(function(){var i=t.getView().getBindingContext();if(!a.hasTransientContext(l)){t._oAppComponent.getSideEffectsService().requestSideEffectsForNavigationProperty(l.getPath(),i);}}).catch(function(i){L.error("Error while creating multiple documents.");return Promise.reject(i);}).finally(function(){B.unlock(o);});},deleteMultipleDocuments:function(e,p){var t=this,r=this.getRoutingListener(),l=this.getGlobalUIModel();var o=t.getView().byId(p.controlId);if(!o||!o.isA("sap.ui.mdc.Table")){throw new Error("parameter controlId missing or incorrect");}var f=o.getRowBinding();p.bFindActiveContexts=true;B.lock(l);return this.deleteDocumentTransaction(e,p).then(function(){var R;o.clearSelection();var g=t.getView().getBindingContext();if(f.isRoot()){R=new Promise(function(h){f.attachEventOnce("dataReceived",function(){h();});});f.refresh();}else if(g){if(!a.hasTransientContext(f)){t._oAppComponent.getSideEffectsService().requestSideEffectsForNavigationProperty(f.getPath(),g);}}E.setEditStateDirty();for(var i=0;i<e.length;i++){if(r.isCurrentStateImpactedBy(e[i])){r.navigateBackFromContext(e[i]);break;}}return R;}).catch(function(g){L.error("Error while deleting the document(s)",g);}).finally(function(){B.unlock(l);});},computeEditMode:function(o){var t=this;return Promise.resolve((function(){var p=t.getProgrammingModel(o);if(p===P.Draft){t.setDraftStatus(D.Clear);return o.requestObject("IsActiveEntity").then(function(i){if(i===false){t.setEditMode(b.Editable);return o.requestObject("HasActiveEntity").then(function(h){t.setEditMode(undefined,!h);});}else{t.setEditMode(b.Display,false);}}).catch(function(e){L.error("Error while determining the editMode for draft",e);throw e;});}})());},setEditMode:function(e,f){var g=this.getGlobalUIModel();if(e){g.setProperty("/editMode",e,undefined,true);g.setProperty("/isEditable",e==="Editable",undefined,true);}if(f!==undefined){this.setCreationMode(f);}},setDraftStatus:function(s){this.base.getView().getModel("ui").setProperty("/draftStatus",s,undefined,true);},getRoutingListener:function(){if(this.base._routing){return this.base._routing;}else{throw new Error("Edit Flow works only with a given routing listener");}},getGlobalUIModel:function(){return this.base.getView().getModel("ui");},syncTask:function(t){var n;if(t instanceof Promise){n=function(){return t;};}else if(typeof t==="function"){n=t;}this._pTasks=this._pTasks||Promise.resolve();if(!!n){this._pTasks=this._pTasks.then(n).catch(function(){return Promise.resolve();});}return this._pTasks;},getProgrammingModel:function(o){return this.getTransactionHelper().getProgrammingModel(o);},deleteDocumentTransaction:function(o,p){var t=this,r=this.getView().getController().oResourceBundle,e=this.getTransactionHelper();p=p||{};p.internalModelContext=p.controlId?sap.ui.getCore().byId(p.controlId).getBindingContext("internal"):null;return this.syncTask().then(e.deleteDocument.bind(e,o,p,r,t.getMessageHandler())).then(function(){t.getInternalModel().setProperty("/sessionOn",false);}).catch(function(f){return Promise.reject(f);});},handleCreateEvents:function(o){var t=this,p,e=t.getTransactionHelper();t.setDraftStatus(D.Clear);o=(o.getBinding&&o.getBinding())||o;p=t.getProgrammingModel(o);o.attachEvent("createSent",function(){e.handleDocumentModifications();if(p===P.Draft){t.setDraftStatus(D.Saving);}});o.attachEvent("createCompleted",function(f){var s=f.getParameter("success");if(p===P.Draft){t.setDraftStatus(s?D.Saved:D.Clear);}t.getMessageHandler().showMessageDialog();});},getTransactionHelper:function(){if(!this._oTransactionHelper){this._oTransactionHelper=new T(this._oAppComponent,this.getGlobalUIModel());}return this._oTransactionHelper;},getInternalModel:function(){return this.base.getView().getModel("internal");},createActionPromise:function(A,s){var t=this,r,R;this.oActionPromise=new Promise(function(e,f){r=e;R=f;}).then(function(o){return Object.assign({controlId:s},t.getActionResponseDataAndKeys(A,o));});return{fResolver:r,fRejector:R};},getCurrentActionPromise:function(){return this.oActionPromise;},deleteCurrentActionPromise:function(){this.oActionPromise=null;},getActionResponseDataAndKeys:function(A,r){if(Array.isArray(r)){if(r.length===1){r=r[0];}else{return null;}}if(!r){return null;}var v=this.getView(),M=v.getModel().getMetaModel().getData(),s=M&&M[A]&&M[A][0]&&M[A][0].$ReturnType?M[A][0].$ReturnType.$Type:null,k=s&&M[s]?M[s].$Key:null;return{oData:r.getObject(),keys:k};},getMessageHandler:function(){if(this.base.messageHandler){return this.base.messageHandler;}else{throw new Error("Edit Flow works only with a given message handler");}},override:{onInit:function(){this._oAppComponent=this.base.getAppComponent();}}});return d;});
+sap.ui.define(["sap/ui/core/mvc/ControllerExtension","sap/ui/core/mvc/OverrideExecution","sap/fe/core/actions/messageHandling","sap/fe/core/TransactionHelper","sap/base/Log","sap/fe/core/CommonUtils","sap/fe/core/BusyLocker","sap/fe/core/library","sap/fe/core/helpers/EditState","sap/m/Button","sap/m/Dialog","sap/fe/core/actions/sticky"],function(C,O,m,T,L,a,B,F,E,b,D,s){"use strict";var P=F.ProgrammingModel,c=F.DraftStatus,d=F.EditMode,e=F.CreationMode;function _(o,A,i,h){function j(n){var t=n.innerAppRoute,r=A.getRouterProxy(),k,S=i.getProperty("/sessionOn");if(!S){return undefined;}if(!r.isNavigationFinalized()){k=false;h=t;}else if(h===t){k=true;}else if(r.checkHashWithGuard(t)||r.isGuardCrossAllowedByUser()){h=t;k=false;}else{k=true;}if(k){setTimeout(function(){A.getShellServices().setDirtyFlag(false);},0);}return k;}o.fnDirtyStateProvider=j;A.getShellServices().registerDirtyStateProvider(o.fnDirtyStateProvider);}function f(o,i){var t=o;function h(){t.getMessageHandler().removeTransitionMessages();var j=new D({title:"{sap.fe.i18n>C_EDITFLOW_OBJECT_PAGE_SESSION_EXPIRED_DIALOG_TITLE}",state:"Warning",content:new Text({text:"{sap.fe.i18n>C_EDITFLOW_OBJECT_PAGE_SESSION_EXPIRED_DIALOG_MESSAGE}"}),beginButton:new b({text:"{sap.fe.i18n>C_COMMON_DIALOG_OK}",type:"Emphasized",press:function(){t.handleStickyOff();t.getRoutingListener().navigateBackFromContext(o);}}),afterClose:function(){j.destroy();}});j.addStyleClass("sapUiContentPadding");j.setModel(i,"sap.fe.i18n");t.getView().addDependent(j);j.open();}t.fnHandleSessionTimeout=h;t.getView().getModel().attachSessionTimeout(t.fnHandleSessionTimeout);}function g(o,h,A){var t=o;function S(){var i=A.getRouterProxy().getHash();if(!i||!A.getRouterProxy().checkHashWithGuard(i)){t.discardStickySession(h);}}t.fnStickyDiscardAfterNavigation=S;A.getRoutingService().attachRouteMatched(t.fnStickyDiscardAfterNavigation);}return C.extend("sap.fe.core.controllerextensions.InternalEditFlow",{metadata:{methods:{createMultipleDocuments:{"public":true,"final":true},deleteMultipleDocuments:{"public":true,"final":true},computeEditMode:{"public":true,"final":true},setEditMode:{"public":true,"final":true},setDraftStatus:{"public":true,"final":true},getRoutingListener:{"public":true,"final":true},getGlobalUIModel:{"public":true,"final":true},syncTask:{"public":true,"final":true},getProgrammingModel:{"public":true,"final":true},deleteDocumentTransaction:{"public":true,"final":true},handleCreateEvents:{"public":true,"final":true},getTransactionHelper:{"public":true,"final":true},getInternalModel:{"public":true,"final":true},createActionPromise:{"public":true,"final":true},getCurrentActionPromise:{"public":true,"final":true},deleteCurrentActionPromise:{"public":true,"final":true},getActionResponseDataAndKeys:{"public":true,"final":true},setCreationMode:{"public":false,"final":false,"overrideExecution":O.After},getMessageHandler:{"public":true,"final":true},handleStickyOn:{"public":true,"final":true},handleStickyOff:{"public":true,"final":true}}},setCreationMode:function(){},createMultipleDocuments:function(l,h,i,j,k){var t=this,n=this.getTransactionHelper(),o=this.getGlobalUIModel(),r=t.getView().getController().oResourceBundle;B.lock(o);return this.syncTask().then(function(){var p=k?k({contextPath:l&&l.getPath()}):Promise.resolve();return p;}).then(function(){var M=l.getModel(),p=M.getMetaModel(),q;if(l.getContext()){q=p.getMetaPath(l.getContext().getPath()+"/"+l.getPath());}else{q=p.getMetaPath(l.getPath());}t.handleCreateEvents(l);var u=h.map(function(v){var w={data:{}};w.keepTransientContextOnFailed=false;w.busyMode="None";w.creationMode=e.CreationRow;w.parentControl=t.getView();w.createAtEnd=i;for(var x in v){var y=p.getObject(q+"/"+x);if(y&&y.$kind!=="NavigationProperty"&&v[x]){w.data[x]=v[x];}}return n.createDocument(l,w,r,t.getMessageHandler(),j,t.getView());});return Promise.all(u);}).then(function(p){return Promise.all(p.map(function(N){return N.created();}));}).then(function(){var p=t.getView().getBindingContext();if(!a.hasTransientContext(l)){t._oAppComponent.getSideEffectsService().requestSideEffectsForNavigationProperty(l.getPath(),p);}}).catch(function(p){L.error("Error while creating multiple documents.");return Promise.reject(p);}).finally(function(){B.unlock(o);});},deleteMultipleDocuments:function(h,p){var t=this,r=this.getRoutingListener(),l=this.getGlobalUIModel();var o=t.getView().byId(p.controlId);if(!o||!o.isA("sap.ui.mdc.Table")){throw new Error("parameter controlId missing or incorrect");}var i=o.getRowBinding();p.bFindActiveContexts=true;B.lock(l);return this.deleteDocumentTransaction(h,p).then(function(){var R;o.clearSelection();var j=t.getView().getBindingContext();if(i.isRoot()){R=new Promise(function(n){i.attachEventOnce("dataReceived",function(){n();});});i.refresh();}else if(j){if(!a.hasTransientContext(i)){t._oAppComponent.getSideEffectsService().requestSideEffectsForNavigationProperty(i.getPath(),j);}}E.setEditStateDirty();for(var k=0;k<h.length;k++){if(r.isCurrentStateImpactedBy(h[k])){r.navigateBackFromContext(h[k]);break;}}return R;}).catch(function(j){L.error("Error while deleting the document(s)",j);}).finally(function(){B.unlock(l);});},computeEditMode:function(o){var t=this,h=t.getInternalModel().getProperty("/sCustomAction");return Promise.resolve((function(){var p=t.getProgrammingModel(o);if(p===P.Draft){t.setDraftStatus(c.Clear);return o.requestObject("IsActiveEntity").then(function(i){if(i===false){t.setEditMode(d.Editable);return o.requestObject("HasActiveEntity").then(function(H){t.setEditMode(undefined,!H);});}else{t.setEditMode(d.Display,false);}}).catch(function(i){L.error("Error while determining the editMode for draft",i);throw i;});}else if(p===P.Sticky){if(h&&h!==""&&t._hasNewActionForSticky(o,t.getView(),h)){t.getTransactionHelper()._bCreateMode=true;t.getTransactionHelper().handleDocumentModifications();t.setEditMode(d.Editable,true);E.setEditStateDirty();t.handleStickyOn(o);t.getInternalModel().setProperty("/sCustomAction","");}}})());},setEditMode:function(h,i){var G=this.getGlobalUIModel();if(h){G.setProperty("/editMode",h,undefined,true);G.setProperty("/isEditable",h==="Editable",undefined,true);}if(i!==undefined){this.setCreationMode(i);}},setDraftStatus:function(h){this.base.getView().getModel("ui").setProperty("/draftStatus",h,undefined,true);},getRoutingListener:function(){if(this.base._routing){return this.base._routing;}else{throw new Error("Edit Flow works only with a given routing listener");}},getGlobalUIModel:function(){return this.base.getView().getModel("ui");},syncTask:function(t){var n;if(t instanceof Promise){n=function(){return t;};}else if(typeof t==="function"){n=t;}this._pTasks=this._pTasks||Promise.resolve();if(!!n){this._pTasks=this._pTasks.then(n).catch(function(){return Promise.resolve();});}return this._pTasks;},getProgrammingModel:function(o){return this.getTransactionHelper().getProgrammingModel(o);},deleteDocumentTransaction:function(o,p){var t=this,r=this.getView().getController().oResourceBundle,h=this.getTransactionHelper();p=p||{};p.internalModelContext=p.controlId?sap.ui.getCore().byId(p.controlId).getBindingContext("internal"):null;return this.syncTask().then(h.deleteDocument.bind(h,o,p,r,t.getMessageHandler())).then(function(){t.getInternalModel().setProperty("/sessionOn",false);}).catch(function(i){return Promise.reject(i);});},handleCreateEvents:function(o){var t=this,p,h=t.getTransactionHelper();t.setDraftStatus(c.Clear);o=(o.getBinding&&o.getBinding())||o;p=t.getProgrammingModel(o);o.attachEvent("createSent",function(){h.handleDocumentModifications();if(p===P.Draft){t.setDraftStatus(c.Saving);}});o.attachEvent("createCompleted",function(i){var S=i.getParameter("success");if(p===P.Draft){t.setDraftStatus(S?c.Saved:c.Clear);}t.getMessageHandler().showMessageDialog();});},getTransactionHelper:function(){if(!this._oTransactionHelper){this._oTransactionHelper=new T(this._oAppComponent,this.getGlobalUIModel());}return this._oTransactionHelper;},getInternalModel:function(){return this.base.getView().getModel("internal");},createActionPromise:function(A,h){var t=this,r,R;this.oActionPromise=new Promise(function(i,j){r=i;R=j;}).then(function(o){return Object.assign({controlId:h},t.getActionResponseDataAndKeys(A,o));});return{fResolver:r,fRejector:R};},getCurrentActionPromise:function(){return this.oActionPromise;},deleteCurrentActionPromise:function(){this.oActionPromise=null;},getActionResponseDataAndKeys:function(A,r){if(Array.isArray(r)){if(r.length===1){r=r[0];}else{return null;}}if(!r){return null;}var v=this.getView(),M=v.getModel().getMetaModel().getData(),h=M&&M[A]&&M[A][0]&&M[A][0].$ReturnType?M[A][0].$ReturnType.$Type:null,k=h&&M[h]?M[h].$Key:null;return{oData:r.getObject(),keys:k};},getMessageHandler:function(){if(this.base.messageHandler){return this.base.messageHandler;}else{throw new Error("Edit Flow works only with a given message handler");}},override:{onInit:function(){this._oAppComponent=this.base.getAppComponent();}},handleStickyOn:function(o){var t=this,A=a.getAppComponent(this.getView());try{if(A===undefined||o===undefined){throw new Error("undefined AppComponent or Context for function handleStickyOn");}if(!A.getRouterProxy().hasNavigationGuard()){var h=A.getRouterProxy().getHash(),i=this.getInternalModel();setTimeout(function(){A.getRouterProxy().setNavigationGuard();},0);A.getShellServices().setBackNavigation(t.onBackNavigationInSession.bind(t));_(t,A,i,h);var j=this.getView().getModel("sap.fe.i18n");f(t,j);g(t,o,A);}}catch(k){L.info(k);return undefined;}return true;},handleStickyOff:function(){var A=a.getAppComponent(this.getView());try{if(A===undefined){throw new Error("undefined AppComponent for function handleStickyOff");}if(A&&A.getRouterProxy){A.getRouterProxy().discardNavigationGuard();}if(this.fnDirtyStateProvider){A.getShellServices().deregisterDirtyStateProvider(this.fnDirtyStateProvider);this.fnDirtyStateProvider=null;}if(this.getView().getModel()&&this.fnHandleSessionTimeout){this.getView().getModel().detachSessionTimeout(this.fnHandleSessionTimeout);}A.getRoutingService().detachRouteMatched(this.fnStickyDiscardAfterNavigation);this.fnStickyDiscardAfterNavigation=null;this.getTransactionHelper()._bCreateMode=false;this.setEditMode(d.Display,false);if(A){A.getShellServices().setBackNavigation();}}catch(h){L.info(h);return undefined;}return true;},onBackNavigationInSession:function(){var t=this,v=t.getView(),A=a.getAppComponent(v),r=A.getRouterProxy();if(r.checkIfBackIsOutOfGuard()){var o=v&&v.getBindingContext();a.processDataLossConfirmation(function(){t.discardStickySession(o);history.back();},v,t.getProgrammingModel(o));return;}history.back();},discardStickySession:function(o){s.discardDocument(o);this.handleStickyOff();},_hasNewActionForSticky:function(o,v,h){try{if(o===undefined||v===undefined){throw new Error("Invalid input parameters for function _hasNewActionForSticky");}var M=v.getModel().getMetaModel(),i=o.getPath().substring(0,o.getPath().indexOf("(")),S=M.getObject(i+"@com.sap.vocabularies.Session.v1.StickySessionSupported");if(S&&S.NewAction&&S.NewAction===h){return true;}else if(S&&S.AdditionalNewActions){return h===S.AdditionalNewActions.find(function(A){return A===h;})?true:false;}else{return false;}}catch(j){L.info(j);return undefined;}}});});

package/packages/sap.fe.core/src/sap/fe/core/controllerextensions/InternalIntentBasedNavigation-dbg.js

@@ -375,7 +375,10 @@ sap.ui.define(
 			 */
 			prepareFiltersForExternalNavigation: function(oFilterBarConditions, sRootPath, aParameters) {
 				var oDistinctKeys = {};
-				function _findDistinctKeysInObject(LookUpObject, sLookUpObjectMetaPath) {
+				var oFilterConditionsWithoutConflict = {};
+				var sMainEntityValuePath, sCurrentValuePath, sFullContextPath, sWinnerValuePath, sPathInContext;
+				function _findDistinctKeysInObject(LookUpObject) {
+					var sLookUpObjectMetaPath;
 					for (var sKey in LookUpObject) {
 						if (LookUpObject[sKey]) {
 							if (sKey.includes("/")) {
@@ -396,9 +399,7 @@ sap.ui.define(
 					}
 				}
 
-				_findDistinctKeysInObject(oFilterBarConditions, sRootPath);
-				var oFilterConditionsWithoutConflict = {};
-				var sMainEntityValuePath, sCurrentValuePath, sFullContextPath, sWinnerValuePath, sPathInContext;
+				_findDistinctKeysInObject(oFilterBarConditions);
 				for (var sDistinctKey in oDistinctKeys) {
 					var aConflictingPaths = oDistinctKeys[sDistinctKey];
 

package/packages/sap.fe.core/src/sap/fe/core/controllerextensions/InternalIntentBasedNavigation.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/core/mvc/ControllerExtension","sap/ui/core/mvc/OverrideExecution","sap/fe/navigation/SelectionVariant","sap/fe/core/helpers/ModelHelper","sap/ui/core/util/XMLPreprocessor","sap/ui/core/XMLTemplateProcessor","sap/ui/core/Fragment","sap/ui/model/json/JSONModel","sap/base/Log","sap/fe/core/CommonUtils","sap/fe/core/helpers/KeepAliveHelper","sap/base/util/merge"],function(C,O,S,M,X,a,F,J,L,b,K,m){"use strict";return C.extend("sap.fe.core.controllerextensions.InternalInternalBasedNavigation",{metadata:{methods:{navigate:{"final":true,"public":true},getEntitySet:{"final":false,"public":false},navigateOutbound:{"final":true,"public":true},navigateWithConfirmationDialog:{"final":true,"public":true},getNavigationMode:{"final":false,"public":true,overrideExecution:O.Instead},prepareContextForExternalNavigation:{"final":true,"public":true},removeSensitiveData:{"final":true,"public":true},prepareFiltersForExternalNavigation:{"final":true,"public":true},getOutboundParams:{"final":true,"public":true}}},navigate:function(s,A,n){var t=this;var _=function(c){var N=n&&n.navigationContexts,d=N&&!Array.isArray(N)?[N]:N,v=n&&n.semanticObjectMapping,e=n&&n.additionalNavigationParameters,T={semanticObject:s,action:A},V=t.base.getView(),f=V.getController();if(c){t._oView.setBindingContext(c);}if(s&&A){var g=[],h=new S();if(d&&d.length){d.map(function(q){if(q.isA&&q.isA("sap.ui.model.odata.v4.Context")){var u=q.getObject(),w=t._oMetaModel.getMetaPath(q.getPath());u=t.removeSensitiveData(u,w);var x=t.prepareContextForExternalNavigation(u,q);T["propertiesWithoutConflict"]=x.propertiesWithoutConflict;g.push(x.semanticAttributes);}else if(!(q&&Array.isArray(q.data))&&typeof q==="object"){g.push(t.removeSensitiveData(q.data,q.metaPath));}else if(q&&Array.isArray(q.data)){g=t.removeSensitiveData(q.data,q.metaPath);}});}if(g&&g.length){h=t._oNavigationService.mixAttributesAndSelectionVariant(g,h.toJSONString());}var i=t._oView.getModel(),E=t.getEntitySet(),j=E?t._oNavigationService.constructContextUrl(E,i):undefined;if(j){h.setFilterContextUrl(j);}if(e){t._applyOutboundParams(h,e);}f.intentBasedNavigation.adaptNavigationContext(h,T);if(v){t._applySemanticObjectMappings(h,v);}t._removeTechnicalParameters(h);var k=f._intentBasedNavigation.getNavigationMode();var r=(n&&n.refreshStrategies)||{},I=V.getModel("internal");if(I){if(V&&V.getViewData().refreshStrategyOnAppRestore){var l=V.getViewData().refreshStrategyOnAppRestore||{};m(r,l);}var R=K.getRefreshStrategyForIntent(r,s,A);if(R){I.setProperty("/refreshStrategyOnAppRestore",R);}}var p=function(){sap.ui.require(["sap/m/MessageBox"],function(q){var u=sap.ui.getCore().getLibraryResourceBundle("sap.fe.core");q.show(u.getText("C_COMMON_HELPER_NAVIGATION_ERROR_MESSAGE"),{title:u.getText("C_COMMON_NAVIGATION_ERROR_TITLE")});});};t._oNavigationService.navigate(s,A,h.toJSONString(),null,p,null,k);}else{throw new Error("Semantic Object/action is not provided");}};var B=this.base.getView().getBindingContext();var o=B&&B.getModel().getMetaModel();if(this.getView().getViewData().converterType==="ObjectPage"&&o&&!M.isStickySessionSupported(o)){b.fnProcessDataLossOrDraftDiscardConfirmation(_.bind(this),Function.prototype,this.base.getView().getBindingContext(),this.base.getView().getController());}else{_();}},prepareContextForExternalNavigation:function(s,c){var d={},e=c.getPath(),o=c.getModel().getMetaModel(),f=o.getMetaPath(e),g=f.split("/").filter(Boolean);function _(u,v){for(var x in u){if(u[x]===null||typeof u[x]!=="object"){if(!d[x]){d[x]=[];}d[x].push(v);}else{var N=u[x];_(N,v+"/"+x);}}}_(s,f);var h=g[0],j=o.getObject("/"+h+"/@sapui.name"),p={};var k,l,n;for(var D in d){var q=d[D],w;if(q.length>1){for(var i=0;i<=q.length-1;i++){var P=q[i],r=P.replace(P===f?f:f+"/","");r=(r===""?r:r+"/")+D;var E=o.getObject(P+"/@sapui.name");if(E===j){k=r;}if(P===f){l=r;}n=r;s[(f+"/"+r).split("/").filter(function(v){return v!="";}).join(".")]=c.getProperty(r);}w=k||l||n;s[D]=c.getProperty(w);k=undefined;l=undefined;n=undefined;}else{var P=q[0],r=P.replace(P===f?f:f+"/","");r=(r===""?r:r+"/")+D;s[D]=c.getProperty(r);p[D]=(f+"/"+r).split("/").filter(function(v){return v!="";}).join(".");}}for(var t in s){if(s[t]!==null&&typeof s[t]==="object"){delete s[t];}}return{semanticAttributes:s,propertiesWithoutConflict:p};},prepareFiltersForExternalNavigation:function(f,r,p){var d={};function _(j,l){for(var k in j){if(j[k]){if(k.includes("/")){l=k;var n=k.split("/");k=n[n.length-1];}else{l=r;}if(!d[k]){d[k]=[];}d[k].push(l);}}}_(f,r);var o={};var s,c,e,w,P;for(var D in d){var g=d[D];if(g.length>1){for(var i=0;i<=g.length-1;i++){var h=g[i];if(h===r){e=r+"/"+D;P=D;s=D;if(p&&p.includes(D)){f["$Parameter."+D]=f[D];}}else{P=h;e=(r+"/"+h).replaceAll("*","");c=h;}f[e.split("/").filter(function(v){return v!="";}).join(".")]=f[P];delete f[h];}w=s||c;f[D]=f[w];}else{var h=g[0],e=h===r?r+"/"+D:(r+"/"+h).replaceAll("*","");o[D]=e.split("/").filter(function(v){return v!="";}).join(".");if(p&&p.includes(D)){f["$Parameter."+D]=f[D];}}}return{filterConditions:f,filterConditionsWithoutConflict:o};},getNavigationMode:function(){return undefined;},navigateWithConfirmationDialog:function(s,A,n){var t=this;if(n.notApplicableContexts&&n.notApplicableContexts.length>=1){var o;var c={onClose:function(){o.close();},onContinue:function(){n.navigationContexts=n.applicableContexts;o.close();t.navigate(s,A,n);}};var f=function(){var j,k=n.notApplicableContexts.length,N=[];for(var i=0;i<n.notApplicableContexts.length;i++){j=n.notApplicableContexts[i].getObject();N.push(j);}var l=new J(N);var T=new J({total:k,label:n.label});o.setModel(l,"notApplicable");o.setModel(T,"totals");o.open();};var d="sap.fe.core.controls.ActionPartial";var D=a.loadTemplate(d,"fragment");var e=this._oView.getModel();var g=e.getMetaModel();var h=n.notApplicableContexts[0].getCanonicalPath();var E=h.substr(0,h.indexOf("("))+"/";Promise.resolve(X.process(D,{name:d},{bindingContexts:{entityType:g.createBindingContext(E)},models:{entityType:g,metaModel:g}})).then(function(i){return F.load({definition:i,controller:c});}).then(function(p){o=p;t.getView().addDependent(p);f();}).catch(function(){L.error("Error");});}else{t.navigate(s,A,n);}},_removeTechnicalParameters:function(s){s.removeSelectOption("@odata.context");s.removeSelectOption("@odata.metadataEtag");s.removeSelectOption("SAP__Messages");},getEntitySet:function(){return this._oView.getViewData().entitySet;},removeSensitiveData:function(A,s){var p=Object.keys(A);if(p.length){delete A["@odata.context"];delete A["@odata.metadataEtag"];delete A["SAP__Messages"];for(var j=0;j<p.length;j++){if(A[p[j]]&&typeof A[p[j]]==="object"){this.removeSensitiveData(A[p[j]],s+"/"+p[j]);}var P=p[j],c=this._oMetaModel.getObject(s+"/"+P+"@");if(c){if(c["@com.sap.vocabularies.PersonalData.v1.IsPotentiallySensitive"]||c["@com.sap.vocabularies.UI.v1.ExcludeFromNavigationContext"]||c["@com.sap.vocabularies.Analytics.v1.Measure"]){delete A[P];}else if(c["@com.sap.vocabularies.Common.v1.FieldControl"]){var f=c["@com.sap.vocabularies.Common.v1.FieldControl"];if(f["$EnumMember"]&&f["$EnumMember"].split("/")[1]==="Inapplicable"){delete A[P];}else if(f["$Path"]&&this._isFieldControlPathInapplicable(f["$Path"],A)){delete A[P];}}}}}return A;},_isFieldControlPathInapplicable:function(f,A){var i=false,p=f.split("/");if(p.length>1){i=A[p[0]]&&A[p[0]].hasOwnProperty(p[1])&&A[p[0]][p[1]]===0;}else{i=A[f]===0;}return i;},_applySemanticObjectMappings:function(s,v){var o=typeof v==="string"?JSON.parse(v):v;for(var i=0;i<o.length;i++){var l=(o[i]["LocalProperty"]&&o[i]["LocalProperty"]["$PropertyPath"])||(o[i]["@com.sap.vocabularies.Common.v1.LocalProperty"]&&o[i]["@com.sap.vocabularies.Common.v1.LocalProperty"]["$Path"]);var c=o[i]["SemanticObjectProperty"]||o[i]["@com.sap.vocabularies.Common.v1.SemanticObjectProperty"];if(s.getSelectOption(l)){var d=s.getSelectOption(l);s.removeSelectOption(l);s.massAddSelectOption(c,d);}}return s;},navigateOutbound:function(o,n){var c=this.base.getAppComponent().getManifestEntry("sap.app"),d=c.crossNavigation&&c.crossNavigation.outbounds[o];if(!d){L.error("Outbound is not defined in manifest!!");return;}var s=d.semanticObject,A=d.action,e=d.parameters&&this.getOutboundParams(d.parameters);if(n){var N=[];Object.keys(n).forEach(function(k){if(Array.isArray(n[k])){var v=n[k];for(var i=0;i<v.length;i++){var p={};p[k]=v[i];N.push(p);}}else{var p={};p[k]=n[k];N.push(p);}});}if(N||e){n={navigationContexts:{data:N||e}};}this.base._intentBasedNavigation.navigate(s,A,n);},_applyOutboundParams:function(s,o){var p=Object.keys(o);var c=s.getSelectOptionsPropertyNames();p.forEach(function(k){if(!c.includes(k)){s.addSelectOption(k,"I","EQ",o[k]);}});return s;},getOutboundParams:function(o){var p={};if(o){var P=Object.keys(o)||[];if(P.length>0){P.forEach(function(k){var c=o[k];if(c.value&&c.value.value&&c.value.format==="plain"){if(!p[k]){p[k]=c.value.value;}}});}}return p;},onChevronPressNavigateOutBound:function(c,o,d,s){var e=c.getAppComponent().getRoutingService().getOutbounds(),D=e[o],f;if(D&&D.semanticObject&&D.action){var r={intents:{}},g={},h;if(d){if(d.isA&&d.isA("sap.ui.model.odata.v4.Context")){h=M.getMetaPathForContext(d);d=[d];}else{h=M.getMetaPathForContext(d[0]);}g[h]="self";r["_feDefault"]=g;}if(s){var k=D.semanticObject+"-"+D.action;r.intents[k]={};r.intents[k][s]="self";}if(D&&D.parameters){var p=D.parameters&&this.getOutboundParams(D.parameters);if(Object.keys(p).length>0){f=p;}}c._intentBasedNavigation.navigate(D.semanticObject,D.action,{navigationContexts:d,refreshStrategies:r,additionalNavigationParameters:f});return Promise.resolve();}else{throw new Error("outbound target "+o+" not found in cross navigation definition of manifest");}},override:{onInit:function(){this._oAppComponent=this.base.getAppComponent();this._oMetaModel=this._oAppComponent.getModel().getMetaModel();this._oNavigationService=this._oAppComponent.getNavigationService();this._oView=this.base.getView();}}});});
+sap.ui.define(["sap/ui/core/mvc/ControllerExtension","sap/ui/core/mvc/OverrideExecution","sap/fe/navigation/SelectionVariant","sap/fe/core/helpers/ModelHelper","sap/ui/core/util/XMLPreprocessor","sap/ui/core/XMLTemplateProcessor","sap/ui/core/Fragment","sap/ui/model/json/JSONModel","sap/base/Log","sap/fe/core/CommonUtils","sap/fe/core/helpers/KeepAliveHelper","sap/base/util/merge"],function(C,O,S,M,X,a,F,J,L,b,K,m){"use strict";return C.extend("sap.fe.core.controllerextensions.InternalInternalBasedNavigation",{metadata:{methods:{navigate:{"final":true,"public":true},getEntitySet:{"final":false,"public":false},navigateOutbound:{"final":true,"public":true},navigateWithConfirmationDialog:{"final":true,"public":true},getNavigationMode:{"final":false,"public":true,overrideExecution:O.Instead},prepareContextForExternalNavigation:{"final":true,"public":true},removeSensitiveData:{"final":true,"public":true},prepareFiltersForExternalNavigation:{"final":true,"public":true},getOutboundParams:{"final":true,"public":true}}},navigate:function(s,A,n){var t=this;var _=function(c){var N=n&&n.navigationContexts,d=N&&!Array.isArray(N)?[N]:N,v=n&&n.semanticObjectMapping,e=n&&n.additionalNavigationParameters,T={semanticObject:s,action:A},V=t.base.getView(),f=V.getController();if(c){t._oView.setBindingContext(c);}if(s&&A){var g=[],h=new S();if(d&&d.length){d.map(function(q){if(q.isA&&q.isA("sap.ui.model.odata.v4.Context")){var u=q.getObject(),w=t._oMetaModel.getMetaPath(q.getPath());u=t.removeSensitiveData(u,w);var x=t.prepareContextForExternalNavigation(u,q);T["propertiesWithoutConflict"]=x.propertiesWithoutConflict;g.push(x.semanticAttributes);}else if(!(q&&Array.isArray(q.data))&&typeof q==="object"){g.push(t.removeSensitiveData(q.data,q.metaPath));}else if(q&&Array.isArray(q.data)){g=t.removeSensitiveData(q.data,q.metaPath);}});}if(g&&g.length){h=t._oNavigationService.mixAttributesAndSelectionVariant(g,h.toJSONString());}var i=t._oView.getModel(),E=t.getEntitySet(),j=E?t._oNavigationService.constructContextUrl(E,i):undefined;if(j){h.setFilterContextUrl(j);}if(e){t._applyOutboundParams(h,e);}f.intentBasedNavigation.adaptNavigationContext(h,T);if(v){t._applySemanticObjectMappings(h,v);}t._removeTechnicalParameters(h);var k=f._intentBasedNavigation.getNavigationMode();var r=(n&&n.refreshStrategies)||{},I=V.getModel("internal");if(I){if(V&&V.getViewData().refreshStrategyOnAppRestore){var l=V.getViewData().refreshStrategyOnAppRestore||{};m(r,l);}var R=K.getRefreshStrategyForIntent(r,s,A);if(R){I.setProperty("/refreshStrategyOnAppRestore",R);}}var p=function(){sap.ui.require(["sap/m/MessageBox"],function(q){var u=sap.ui.getCore().getLibraryResourceBundle("sap.fe.core");q.show(u.getText("C_COMMON_HELPER_NAVIGATION_ERROR_MESSAGE"),{title:u.getText("C_COMMON_NAVIGATION_ERROR_TITLE")});});};t._oNavigationService.navigate(s,A,h.toJSONString(),null,p,null,k);}else{throw new Error("Semantic Object/action is not provided");}};var B=this.base.getView().getBindingContext();var o=B&&B.getModel().getMetaModel();if(this.getView().getViewData().converterType==="ObjectPage"&&o&&!M.isStickySessionSupported(o)){b.fnProcessDataLossOrDraftDiscardConfirmation(_.bind(this),Function.prototype,this.base.getView().getBindingContext(),this.base.getView().getController());}else{_();}},prepareContextForExternalNavigation:function(s,c){var d={},e=c.getPath(),o=c.getModel().getMetaModel(),f=o.getMetaPath(e),g=f.split("/").filter(Boolean);function _(u,v){for(var x in u){if(u[x]===null||typeof u[x]!=="object"){if(!d[x]){d[x]=[];}d[x].push(v);}else{var N=u[x];_(N,v+"/"+x);}}}_(s,f);var h=g[0],j=o.getObject("/"+h+"/@sapui.name"),p={};var k,l,n;for(var D in d){var q=d[D],w;if(q.length>1){for(var i=0;i<=q.length-1;i++){var P=q[i],r=P.replace(P===f?f:f+"/","");r=(r===""?r:r+"/")+D;var E=o.getObject(P+"/@sapui.name");if(E===j){k=r;}if(P===f){l=r;}n=r;s[(f+"/"+r).split("/").filter(function(v){return v!="";}).join(".")]=c.getProperty(r);}w=k||l||n;s[D]=c.getProperty(w);k=undefined;l=undefined;n=undefined;}else{var P=q[0],r=P.replace(P===f?f:f+"/","");r=(r===""?r:r+"/")+D;s[D]=c.getProperty(r);p[D]=(f+"/"+r).split("/").filter(function(v){return v!="";}).join(".");}}for(var t in s){if(s[t]!==null&&typeof s[t]==="object"){delete s[t];}}return{semanticAttributes:s,propertiesWithoutConflict:p};},prepareFiltersForExternalNavigation:function(f,r,p){var d={};var o={};var s,c,e,w,P;function _(j){var l;for(var k in j){if(j[k]){if(k.includes("/")){l=k;var n=k.split("/");k=n[n.length-1];}else{l=r;}if(!d[k]){d[k]=[];}d[k].push(l);}}}_(f);for(var D in d){var g=d[D];if(g.length>1){for(var i=0;i<=g.length-1;i++){var h=g[i];if(h===r){e=r+"/"+D;P=D;s=D;if(p&&p.includes(D)){f["$Parameter."+D]=f[D];}}else{P=h;e=(r+"/"+h).replaceAll("*","");c=h;}f[e.split("/").filter(function(v){return v!="";}).join(".")]=f[P];delete f[h];}w=s||c;f[D]=f[w];}else{var h=g[0],e=h===r?r+"/"+D:(r+"/"+h).replaceAll("*","");o[D]=e.split("/").filter(function(v){return v!="";}).join(".");if(p&&p.includes(D)){f["$Parameter."+D]=f[D];}}}return{filterConditions:f,filterConditionsWithoutConflict:o};},getNavigationMode:function(){return undefined;},navigateWithConfirmationDialog:function(s,A,n){var t=this;if(n.notApplicableContexts&&n.notApplicableContexts.length>=1){var o;var c={onClose:function(){o.close();},onContinue:function(){n.navigationContexts=n.applicableContexts;o.close();t.navigate(s,A,n);}};var f=function(){var j,k=n.notApplicableContexts.length,N=[];for(var i=0;i<n.notApplicableContexts.length;i++){j=n.notApplicableContexts[i].getObject();N.push(j);}var l=new J(N);var T=new J({total:k,label:n.label});o.setModel(l,"notApplicable");o.setModel(T,"totals");o.open();};var d="sap.fe.core.controls.ActionPartial";var D=a.loadTemplate(d,"fragment");var e=this._oView.getModel();var g=e.getMetaModel();var h=n.notApplicableContexts[0].getCanonicalPath();var E=h.substr(0,h.indexOf("("))+"/";Promise.resolve(X.process(D,{name:d},{bindingContexts:{entityType:g.createBindingContext(E)},models:{entityType:g,metaModel:g}})).then(function(i){return F.load({definition:i,controller:c});}).then(function(p){o=p;t.getView().addDependent(p);f();}).catch(function(){L.error("Error");});}else{t.navigate(s,A,n);}},_removeTechnicalParameters:function(s){s.removeSelectOption("@odata.context");s.removeSelectOption("@odata.metadataEtag");s.removeSelectOption("SAP__Messages");},getEntitySet:function(){return this._oView.getViewData().entitySet;},removeSensitiveData:function(A,s){var p=Object.keys(A);if(p.length){delete A["@odata.context"];delete A["@odata.metadataEtag"];delete A["SAP__Messages"];for(var j=0;j<p.length;j++){if(A[p[j]]&&typeof A[p[j]]==="object"){this.removeSensitiveData(A[p[j]],s+"/"+p[j]);}var P=p[j],c=this._oMetaModel.getObject(s+"/"+P+"@");if(c){if(c["@com.sap.vocabularies.PersonalData.v1.IsPotentiallySensitive"]||c["@com.sap.vocabularies.UI.v1.ExcludeFromNavigationContext"]||c["@com.sap.vocabularies.Analytics.v1.Measure"]){delete A[P];}else if(c["@com.sap.vocabularies.Common.v1.FieldControl"]){var f=c["@com.sap.vocabularies.Common.v1.FieldControl"];if(f["$EnumMember"]&&f["$EnumMember"].split("/")[1]==="Inapplicable"){delete A[P];}else if(f["$Path"]&&this._isFieldControlPathInapplicable(f["$Path"],A)){delete A[P];}}}}}return A;},_isFieldControlPathInapplicable:function(f,A){var i=false,p=f.split("/");if(p.length>1){i=A[p[0]]&&A[p[0]].hasOwnProperty(p[1])&&A[p[0]][p[1]]===0;}else{i=A[f]===0;}return i;},_applySemanticObjectMappings:function(s,v){var o=typeof v==="string"?JSON.parse(v):v;for(var i=0;i<o.length;i++){var l=(o[i]["LocalProperty"]&&o[i]["LocalProperty"]["$PropertyPath"])||(o[i]["@com.sap.vocabularies.Common.v1.LocalProperty"]&&o[i]["@com.sap.vocabularies.Common.v1.LocalProperty"]["$Path"]);var c=o[i]["SemanticObjectProperty"]||o[i]["@com.sap.vocabularies.Common.v1.SemanticObjectProperty"];if(s.getSelectOption(l)){var d=s.getSelectOption(l);s.removeSelectOption(l);s.massAddSelectOption(c,d);}}return s;},navigateOutbound:function(o,n){var c=this.base.getAppComponent().getManifestEntry("sap.app"),d=c.crossNavigation&&c.crossNavigation.outbounds[o];if(!d){L.error("Outbound is not defined in manifest!!");return;}var s=d.semanticObject,A=d.action,e=d.parameters&&this.getOutboundParams(d.parameters);if(n){var N=[];Object.keys(n).forEach(function(k){if(Array.isArray(n[k])){var v=n[k];for(var i=0;i<v.length;i++){var p={};p[k]=v[i];N.push(p);}}else{var p={};p[k]=n[k];N.push(p);}});}if(N||e){n={navigationContexts:{data:N||e}};}this.base._intentBasedNavigation.navigate(s,A,n);},_applyOutboundParams:function(s,o){var p=Object.keys(o);var c=s.getSelectOptionsPropertyNames();p.forEach(function(k){if(!c.includes(k)){s.addSelectOption(k,"I","EQ",o[k]);}});return s;},getOutboundParams:function(o){var p={};if(o){var P=Object.keys(o)||[];if(P.length>0){P.forEach(function(k){var c=o[k];if(c.value&&c.value.value&&c.value.format==="plain"){if(!p[k]){p[k]=c.value.value;}}});}}return p;},onChevronPressNavigateOutBound:function(c,o,d,s){var e=c.getAppComponent().getRoutingService().getOutbounds(),D=e[o],f;if(D&&D.semanticObject&&D.action){var r={intents:{}},g={},h;if(d){if(d.isA&&d.isA("sap.ui.model.odata.v4.Context")){h=M.getMetaPathForContext(d);d=[d];}else{h=M.getMetaPathForContext(d[0]);}g[h]="self";r["_feDefault"]=g;}if(s){var k=D.semanticObject+"-"+D.action;r.intents[k]={};r.intents[k][s]="self";}if(D&&D.parameters){var p=D.parameters&&this.getOutboundParams(D.parameters);if(Object.keys(p).length>0){f=p;}}c._intentBasedNavigation.navigate(D.semanticObject,D.action,{navigationContexts:d,refreshStrategies:r,additionalNavigationParameters:f});return Promise.resolve();}else{throw new Error("outbound target "+o+" not found in cross navigation definition of manifest");}},override:{onInit:function(){this._oAppComponent=this.base.getAppComponent();this._oMetaModel=this._oAppComponent.getModel().getMetaModel();this._oNavigationService=this._oAppComponent.getNavigationService();this._oView=this.base.getView();}}});});

package/packages/sap.fe.core/src/sap/fe/core/controllerextensions/InternalRouting-dbg.js

@@ -155,15 +155,6 @@ sap.ui.define(
 					var oContextInfo = {};
 					mParameters = mParameters || {};
 
-					//Setting shell back navigation to undefined only for draft applications
-					if (oContext.getModel() && oContext.getModel().getMetaModel) {
-						var bIsStickyMode = ModelHelper.isStickySessionSupported(oContext.getModel().getMetaModel());
-						if (!bIsStickyMode) {
-							CommonUtils.getAppComponent(that.getView())
-								.getShellServices()
-								.setBackNavigation();
-						}
-					}
 					if (oContext.isA("sap.ui.model.odata.v4.ODataListBinding")) {
 						if (mParameters.asyncContext) {
 							// the context is either created async (Promise)
@@ -447,7 +438,14 @@ sap.ui.define(
 				 * @ui5-restricted
 				 */
 				_createFilterFromSemanticPath: function(sSemanticPath, aSemanticKeys, oMetaModel) {
-					var aKeyValues = sSemanticPath.substring(sSemanticPath.indexOf("(") + 1, sSemanticPath.length - 1).split(","),
+					var fnUnquoteAndDecode = function(sValue) {
+							if (sValue.indexOf("'") === 0 && sValue.lastIndexOf("'") === sValue.length - 1) {
+								// Remove the quotes from the value and decode special chars
+								sValue = decodeURIComponent(sValue.substring(1, sValue.length - 1));
+							}
+							return sValue;
+						},
+						aKeyValues = sSemanticPath.substring(sSemanticPath.indexOf("(") + 1, sSemanticPath.length - 1).split(","),
 						aFilters;
 
 					if (aSemanticKeys.length != aKeyValues.length) {
@@ -458,11 +456,7 @@ sap.ui.define(
 
 					if (aSemanticKeys.length === 1) {
 						// Take the first key value
-						var sKeyValue = aKeyValues[0];
-						if (sKeyValue.indexOf("'") === 0 && sKeyValue.lastIndexOf("'") === sKeyValue.length - 1) {
-							// Remove the quotes from the value and decode special chars
-							sKeyValue = decodeURIComponent(sKeyValue.substring(1, sKeyValue.length - 1));
-						}
+						var sKeyValue = fnUnquoteAndDecode(aKeyValues[0]);
 						aFilters = [
 							new Filter({
 								path: aSemanticKeys[0].$PropertyPath,
@@ -476,12 +470,7 @@ sap.ui.define(
 						// Create a map of all key values
 						aKeyValues.forEach(function(sKeyAssignment) {
 							var aParts = sKeyAssignment.split("="),
-								sKeyValue = aParts[1];
-
-							if (sKeyValue.indexOf("'") === 0 && sKeyValue.lastIndexOf("'") === sKeyValue.length - 1) {
-								// Remove the quotes from the value and decode special chars
-								sKeyValue = decodeURIComponent(sKeyValue.substring(1, sKeyValue.length - 1));
-							}
+								sKeyValue = fnUnquoteAndDecode(aParts[1]);
 
 							mKeyValues[aParts[0]] = sKeyValue;
 						});
@@ -760,31 +749,43 @@ sap.ui.define(
 					oHiddenBinding.attachEventOnce("dataRequested", function() {
 						BusyLocker.lock(that._oView);
 					});
-					oHiddenBinding.attachEventOnce("dataReceived", function(oEvent) {
-						var sErrorDescription = oEvent && oEvent.getParameter("error");
-						BusyLocker.unlock(that._oView);
-						if (sErrorDescription) {
-							// TODO: in case of 404 the text shall be different
-							sap.ui
-								.getCore()
-								.getLibraryResourceBundle("sap.fe.core", true)
-								.then(function(oResourceBundle) {
-									var messageHandler = new MessageHandler();
-									messageHandler.removeTransitionMessages();
-									that.navigateToMessagePage(oResourceBundle.getText("C_COMMON_SAPFE_DATA_RECEIVED_ERROR"), {
-										title: oResourceBundle.getText("SAPFE_ERROR"),
-										description: sErrorDescription
-									});
-								})
-								.catch(function(oError) {
-									Log.error("Error while getting the core resource bundle", oError);
-								});
-						}
-					});
-
+					oHiddenBinding.attachEventOnce("dataReceived", this._dataReceivedEventHandler.bind(this));
 					return oHiddenBinding.getBoundContext();
 				},
 
+				_dataReceivedEventHandler: function(oEvent) {
+					var that = this;
+					var sErrorDescription = oEvent && oEvent.getParameter("error");
+					BusyLocker.unlock(that._oView);
+					if (sErrorDescription) {
+						// TODO: in case of 404 the text shall be different
+						sap.ui
+							.getCore()
+							.getLibraryResourceBundle("sap.fe.core", true)
+							.then(function(oResourceBundle) {
+								var messageHandler = that.base.messageHandler;
+								var mParams = {};
+								if (sErrorDescription && sErrorDescription.status === 503) {
+									mParams = {
+										isInitialLoad503Error: true,
+										shellBack: true
+									};
+								} else {
+									mParams = {
+										title: oResourceBundle.getText("SAPFE_ERROR"),
+										description: sErrorDescription,
+										isDataReceivedError: true,
+										shellBack: true
+									};
+								}
+								messageHandler.showMessages(mParams);
+							})
+							.catch(function(oError) {
+								Log.error("Error while getting the core resource bundle", oError);
+							});
+					}
+				},
+
 				/**
 				 * Requests side effects on a binding context to "refresh" it.
 				 * TODO: get rid of this once provided by the model