@sap/open.fe 1.96.0 → 1.97.0

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

@@ -15,6 +15,7 @@ sap.ui.define(
 		"sap/ui/model/json/JSONModel",
 		"sap/base/Log",
 		"sap/fe/core/CommonUtils",
+		"sap/fe/core/helpers/KeepAliveHelper",
 		"sap/base/util/merge"
 	],
 	function(
@@ -28,6 +29,7 @@ sap.ui.define(
 		JSONModel,
 		Log,
 		CommonUtils,
+		KeepAliveHelper,
 		mergeObjects
 	) {
 		"use strict";
@@ -202,7 +204,11 @@ sap.ui.define(
 								var mViewRefreshStrategies = oView.getViewData().refreshStrategyOnAppRestore || {};
 								mergeObjects(mRefreshStrategies, mViewRefreshStrategies);
 							}
-							var mRefreshStrategy = CommonUtils.getRefreshStrategyForIntent(mRefreshStrategies, sSemanticObject, sAction);
+							var mRefreshStrategy = KeepAliveHelper.getRefreshStrategyForIntent(
+								mRefreshStrategies,
+								sSemanticObject,
+								sAction
+							);
 							if (mRefreshStrategy) {
 								oInternalModel.setProperty("/refreshStrategyOnAppRestore", mRefreshStrategy);
 							}
@@ -763,10 +769,10 @@ sap.ui.define(
 
 					if (oContext) {
 						if (oContext.isA && oContext.isA("sap.ui.model.odata.v4.Context")) {
-							sMetaPath = CommonUtils.getMetaPathForContext(oContext);
+							sMetaPath = ModelHelper.getMetaPathForContext(oContext);
 							oContext = [oContext];
 						} else {
-							sMetaPath = CommonUtils.getMetaPathForContext(oContext[0]);
+							sMetaPath = ModelHelper.getMetaPathForContext(oContext[0]);
 						}
 						oDefaultRefreshStrategy[sMetaPath] = "self";
 						oRefreshStrategies["_feDefault"] = oDefaultRefreshStrategy;

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/base/util/merge"],function(C,O,S,M,X,a,F,J,L,b,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=b.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){function _(u,v){for(var K in u){if(u[K]===null||typeof u[K]!=="object"){if(!d[K]){d[K]=[];}d[K].push(v);}else{var N=u[K];_(N,v+"/"+K);}}}var d={},e=c.getPath(),o=c.getModel().getMetaModel(),f=o.getMetaPath(e),g=f.split("/").filter(Boolean);_(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){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);}}}var d={};_(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"inplace";},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=b.getMetaPathForContext(d);d=[d];}else{h=b.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){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);}}}var d={},e=c.getPath(),o=c.getModel().getMetaModel(),f=o.getMetaPath(e),g=f.split("/").filter(Boolean);_(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){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);}}}var d={};_(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"inplace";},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,7 +155,8 @@ sap.ui.define(
 										checkNoHashChange: mParameters.checkNoHashChange,
 										editable: mParameters.editable,
 										bPersistOPScroll: mParameters.bPersistOPScroll,
-										updateFCLLevel: mParameters.updateFCLLevel
+										updateFCLLevel: mParameters.updateFCLLevel,
+										bForceFocus: mParameters.bForceFocus
 									});
 								})
 								.catch(function(oError) {
@@ -242,11 +243,11 @@ sap.ui.define(
 				navigateToMessagePage: function(sErrorMessage, mParameters) {
 					mParameters = mParameters || {};
 					if (this._oRouterProxy.getHash().indexOf("i-action=create") > -1) {
-						this._oRouterProxy.navToHash(this._oRoutingService.getDefaultCreateHash());
+						return this._oRouterProxy.navToHash(this._oRoutingService.getDefaultCreateHash());
 					} else {
 						mParameters.FCLLevel = this._getFCLLevel();
 
-						this._oAppComponent.getRootViewController().displayMessagePage(sErrorMessage, mParameters);
+						return this._oAppComponent.getRootViewController().displayMessagePage(sErrorMessage, mParameters);
 					}
 				},
 
@@ -880,59 +881,28 @@ sap.ui.define(
 					return this._oTargetInformation.FCLLevel;
 				},
 
-				overflowToolbarButtonHover: function() {
-					this.sCurrentFocusedControlId = sap.ui.getCore().getCurrentFocusedControlId();
-				},
 				/**
-				 * Sets the current column of a FCL to fullscreen mode.
+				 * Switches the FCL layout betwen column and full-screen.
 				 *
 				 * @ui5-restricted
 				 */
-				enterFullScreen: function() {
-					var oSource = this.base.getView();
-					var oContext = oSource.getBindingContext(),
-						sNextLayout = oSource.getModel("fclhelper").getProperty("/actionButtonsInfo/fullScreen");
-
-					var oRouterProxy = this._oRouterProxy;
-					var sCurrentFocusedControlId = this.sCurrentFocusedControlId;
-					this.base._routing
-						.navigateToContext(oContext, { sLayout: sNextLayout })
-						.then(function() {
-							var oLastHistoryEntry = oRouterProxy.getLastHistoryEntry();
-							oLastHistoryEntry.oLastFocusControl = Object.assign({}, oLastHistoryEntry.oLastFocusControl, {
-								controlId: sCurrentFocusedControlId,
-								focusInfo: { id: sCurrentFocusedControlId }
-							});
-						})
-						.catch(function() {
-							Log.warning("cannot set focus on last focused control");
-						});
-				},
 
-				/**
-				 * Exits fullscreen mode for the current column of a FCL.
-				 *
-				 * @ui5-restricted
-				 */
-				exitFullScreen: function() {
+				switchFullScreen: function() {
 					var oSource = this.base.getView();
-					var oContext = oSource.getBindingContext(),
-						sNextLayout = oSource.getModel("fclhelper").getProperty("/actionButtonsInfo/exitFullScreen");
-
-					var oRouterProxy = this._oRouterProxy;
-					var sCurrentFocusedControlId = this.sCurrentFocusedControlId;
-					this.base._routing
-						.navigateToContext(oContext, { sLayout: sNextLayout })
-						.then(function() {
-							var oLastHistoryEntry = oRouterProxy.getLastHistoryEntry();
-							oLastHistoryEntry.oLastFocusControl = Object.assign({}, oLastHistoryEntry.oLastFocusControl, {
-								controlId: sCurrentFocusedControlId,
-								focusInfo: { id: sCurrentFocusedControlId }
-							});
-						})
-						.catch(function() {
-							Log.warning("cannot set focus on last focused control");
-						});
+					var oFCLHelperModel = oSource.getModel("fclhelper"),
+						bIsFullScreen = oFCLHelperModel.getProperty("/actionButtonsInfo/isFullScreen"),
+						sNextLayout = oFCLHelperModel.getProperty(
+							bIsFullScreen ? "/actionButtonsInfo/exitFullScreen" : "/actionButtonsInfo/fullScreen"
+						),
+						oRootViewController = this._oAppComponent.getRootViewController();
+
+					var oContext = oRootViewController.getRightmostContext
+						? oRootViewController.getRightmostContext()
+						: oSource.getBindingContext();
+
+					this.base._routing.navigateToContext(oContext, { sLayout: sNextLayout }).catch(function() {
+						Log.warning("cannot switch between column and fullscreen");
+					});
 				},
 
 				/**

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

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/core/mvc/ControllerExtension","sap/fe/core/controllerextensions/ControllerExtensionMetadata","sap/ui/core/mvc/OverrideExecution","sap/ui/core/Component","sap/fe/core/CommonUtils","sap/fe/core/BusyLocker","sap/fe/core/helpers/SemanticKeyHelper","sap/ui/model/Filter","sap/ui/model/FilterOperator","sap/base/Log","sap/fe/core/actions/messageHandling","sap/m/MessageBox","sap/fe/core/helpers/EditState","sap/fe/core/controllerextensions/MessageHandler","sap/fe/core/helpers/ModelHelper"],function(C,a,O,b,c,B,S,F,d,L,m,M,E,e,f){"use strict";return C.extend("sap.fe.core.controllerextensions.InternalRouting",{metadata:{methods:{"navigateToTarget":{"public":true,"final":false},"byId":{"public":false},"getView":{"public":false},"onRouteMatched":{"public":true,"final":false,overrideExecution:O.After},"onRouteMatchedFinished":{"public":true,"final":false,overrideExecution:O.After},"onBeforeBinding":{"public":true,"final":false,overrideExecution:O.After},"onAfterBinding":{"public":true,"final":false,overrideExecution:O.After},"navigateToContext":{"public":true,"final":true},"navigateBackFromContext":{"public":true,"final":true},"navigateForwardToContext":{"public":true,"final":true},"navigateBackFromTransientState":{"public":true,"final":true},"navigateToMessagePage":{"public":true,"final":true},"enterFullScreen":{"public":true,"final":false,overrideExecution:sap.ui.core.mvc.OverrideExecution.Before},"exitFullScreen":{"public":true,"final":false,overrideExecution:sap.ui.core.mvc.OverrideExecution.Before},"closeColumn":{"public":true,"final":false,overrideExecution:sap.ui.core.mvc.OverrideExecution.Before},"isCurrentStateImpactedBy":{"public":true,"final":true}}},onRouteMatched:function(){},onRouteMatchedFinished:function(){},onBeforeBinding:function(o,p){var r=this.base.getView().getController().routing;if(r&&r.onBeforeBinding){r.onBeforeBinding(o,p);}},onAfterBinding:function(o,p){this._oAppComponent.getRootViewController().onContextBoundToView(o);var r=this.base.getView().getController().routing;if(r&&r.onAfterBinding){r.onAfterBinding(o,p);}},navigateToTarget:function(o,n,s,p){var N=this._oPageComponent&&this._oPageComponent.getNavigationConfiguration&&this._oPageComponent.getNavigationConfiguration(n);if(N){var D=N.detail;var r=D.route;var P=D.parameters;this._oRoutingService.navigateTo(o,r,P,p,s);}else{this._oRoutingService.navigateTo(o,null,null,p);}this._oView.getViewData();},navigateToContext:function(o,p){var t=this;var g={};p=p||{};if(o.isA("sap.ui.model.odata.v4.ODataListBinding")){if(p.asyncContext){this._oRouterProxy.activateRouteMatchSynchronization();p.asyncContext.then(function(o){t.navigateToContext(o,{checkNoHashChange:p.checkNoHashChange,editable:p.editable,bPersistOPScroll:p.bPersistOPScroll,updateFCLLevel:p.updateFCLLevel});}).catch(function(h){L.error("Error with the async context",h);});}else if(!p.bDeferredContext){throw"navigation to a list binding is not yet supported";}}if(p.callExtension){g.sourceBindingContext=o.getObject();g.bindingContext=o;if(p.oEvent){g.oEvent=p.oEvent;}if(this.base.getView().getController().routing.onBeforeNavigation(g)){return Promise.resolve();}}p.FCLLevel=this._getFCLLevel();return this._oRoutingService.navigateToContext(o,p,this._oView.getViewData(),this._oTargetInformation);},navigateBackFromContext:function(o,p){p=p||{};p.updateFCLLevel=-1;return this.navigateToContext(o,p);},navigateForwardToContext:function(o,p){if(this._oView.getBindingContext("internal").getProperty("messageFooterContainsErrors")===true){return Promise.resolve();}p=p||{};p.updateFCLLevel=1;return this.navigateToContext(o,p,true);},navigateBackFromTransientState:function(){var h=this._oRouterProxy.getHash();if(h.indexOf("(...)")!==-1){this._oRouterProxy.navBack();}},navigateToMessagePage:function(s,p){p=p||{};if(this._oRouterProxy.getHash().indexOf("i-action=create")>-1){this._oRouterProxy.navToHash(this._oRoutingService.getDefaultCreateHash());}else{p.FCLLevel=this._getFCLLevel();this._oAppComponent.getRootViewController().displayMessagePage(s,p);}},isCurrentStateImpactedBy:function(o){return this._oRoutingService.isCurrentStateImpactedBy(o);},_onRouteMatched:function(o){var t=o.getParameter("routeInformation")&&o.getParameter("routeInformation").targets;if(!t||t.indexOf(this._oTargetInformation.targetName)===-1){return;}var T;if(this._oPageComponent&&this._oPageComponent.getBindingContextPattern){T=this._oPageComponent.getBindingContextPattern();}T=T||this._oTargetInformation.contextPattern;if(T===null||T===undefined){T=o.getParameter("routePattern");}T=T.replace(":?query:","");var A=o.getParameters().arguments,D=false,n=o.getParameter("navigationInfo");for(var k in A){var v=A[k];if(v==="..."&&T.indexOf("{"+k+"}")>=0){D=true;n.bTargetEditable=true;}T=T.replace("{"+k+"}",v);}if(A["?query"]&&A["?query"].hasOwnProperty("i-action")){n.bActionCreate=true;}if(T&&T[0]!=="/"){T="/"+T;}this.onRouteMatched();var g=this._oView.getModel(),h;if(D){h=this._bindDeferred(T,n);}else{h=this._bindPage(T,g,n);}var i=this;h.finally(function(){i.onRouteMatchedFinished();});this._oAppComponent.getRootViewController().updateUIStateForView(this._oView,this._getFCLLevel());},_bindDeferred:function(t,n){this.onBeforeBinding(null,{editable:n.bTargetEditable});if(n.bDeferredContext||!n.oAsyncContext){if(this._oPageComponent&&this._oPageComponent.createDeferredContext){this._oPageComponent.createDeferredContext(t,n.bActionCreate);}}if(this._getBindingContext()&&this._getBindingContext().hasPendingChanges()){this._getBindingContext().getBinding().resetChanges();}this._setBindingContext(null);this.onAfterBinding(null);return Promise.resolve();},_bindPage:function(t,o,n){var g=this;if(t===""){return Promise.resolve(this._bindPageToContext(null,o,n));}else{return this._resolveSemanticPath(t,o).then(function(T){g._bindPageToPath(T,o,n);}).catch(function(h){var r=sap.ui.getCore().getLibraryResourceBundle("sap.fe.core");g.navigateToMessagePage(r.getText("C_COMMON_SAPFE_DATA_RECEIVED_ERROR"),{title:r.getText("C_COMMON_SAPFE_ERROR"),description:h.message});});}},_createFilterFromSemanticPath:function(s,g,o){var k=s.substring(s.indexOf("(")+1,s.length-1).split(","),h;if(g.length!=k.length){return null;}var i=f.isFilteringCaseSensitive(o);if(g.length===1){var K=k[0];if(K.indexOf("'")===0&&K.lastIndexOf("'")===K.length-1){K=decodeURIComponent(K.substring(1,K.length-1));}h=[new F({path:g[0].$PropertyPath,operator:d.EQ,value1:K,caseSensitive:i})];}else{var j={};k.forEach(function(p){var P=p.split("="),K=P[1];if(K.indexOf("'")===0&&K.lastIndexOf("'")===K.length-1){K=decodeURIComponent(K.substring(1,K.length-1));}j[P[0]]=K;});var l=false;h=g.map(function(p){var q=p.$PropertyPath,v=j[q];if(v!==undefined){return new F({path:q,operator:d.EQ,value1:v,caseSensitive:i});}else{l=true;return"XX";}});if(l){return null;}}var D=new F({filters:[new F("IsActiveEntity","EQ",false),new F("SiblingEntity/IsActiveEntity","EQ",null)],and:false});h.push(D);var n=new F(h,true);return n;},_getTechnicalPathFromSemanticPath:function(s,o,g){var h=o.getMetaModel(),i=h.getMetaContext(s).getPath();if(!g||g.length===0){return Promise.resolve(null);}var j=this._createFilterFromSemanticPath(s,g,h);if(j===null){return Promise.resolve(null);}var l=o.bindList("/"+i,undefined,undefined,j,{"$$groupId":"$auto.Heroes"});return l.requestContexts(0,2).then(function(k){if(k&&k.length){return k[0].getPath();}else{return null;}});},_checkPathForSemanticBookmarking:function(p,o){var g=/^[\/]?(\w+)\([^\/]+\)$/.exec(p);if(!g){return false;}var s="/"+g[1];var D=o.getObject(s+"@com.sap.vocabularies.Common.v1.DraftRoot");var h=o.getObject(s+"@com.sap.vocabularies.Common.v1.DraftNode");return D||h?true:false;},_resolveSemanticPath:function(p,o){var g=o.getMetaModel(),l=this._oRoutingService.getLastSemanticMapping(),s=this._oRouter.getHashChanger().getHash().split("?")[0],t=this;if(s&&s.lastIndexOf("/")===s.length-1){s=s.substring(0,s.length-1);}var r=s&&s.substr(0,s.indexOf("("));if(r.indexOf("/")===0){r=r.substring(1);}var A=this._checkPathForSemanticBookmarking(s,g),h=A&&S.getSemanticKeys(g,r);if(!h){return Promise.resolve(p);}else if(l&&l.semanticPath===p){return Promise.resolve(l.technicalPath);}else{return this._getTechnicalPathFromSemanticPath(s,o,h).then(function(T){if(T&&T!==p){t._oRoutingService.setLastSemanticMapping({technicalPath:T,semanticPath:p});return T;}else{return p;}});}},_bindPageToPath:function(t,o,n){var g=this._getBindingContext(),s=g&&g.getPath(),u=n.useContext;if(s!==t||(u&&u.getPath()===t)){var T;if(u&&u.getPath()===t){T=u;}else{T=this._createBindingContext(t,o);}if(T!==g){this._bindPageToContext(T,o,n);}}else if(!n.bReasonIsIappState&&E.isEditStateDirty()){this._refreshBindingContext(g);}},_bindPageToContext:function(o,g,n){var t=this;if(!o){this.onBeforeBinding(null);this.onAfterBinding(null);}else{var p=o.getBinding();if(!o.getBinding()||o.getBinding().isA("sap.ui.model.odata.v4.ODataListBinding")){o=this._createBindingContext(o.getPath(),g);if(E.isEditStateDirty()){setTimeout(function(){t._refreshBindingContext(o);},0);}}this.onBeforeBinding(o,{editable:n.bTargetEditable,listBinding:p,bPersistOPScroll:n.bPersistOPScroll,bDraftNavigation:n.bDraftNavigation,showPlaceholder:n.bShowPlaceholder});this._setBindingContext(o);this.onAfterBinding(o);}},_createBindingContext:function(p,o){var P=this._oPageComponent,s=P&&P.getEntitySet&&P.getEntitySet(),g=(P&&P.getContextPath&&P.getContextPath())||(s&&"/"+s),h=o.getMetaModel(),t=this,i={$$patchWithoutSideEffects:true,$$groupId:"$auto.Heroes",$$updateGroupId:"$auto"};if(s){var j=h.getObject(g+"/@com.sap.vocabularies.Common.v1.Messages/$Path");if(j){i.$select=j;}}var D=h.getObject(g+"@com.sap.vocabularies.Common.v1.DraftRoot");var k=h.getObject(g+"@com.sap.vocabularies.Common.v1.DraftNode");if(D||k){if(i.$select===undefined){i.$select="HasActiveEntity,HasDraftEntity,IsActiveEntity";}else{i.$select+=",HasActiveEntity,HasDraftEntity,IsActiveEntity";}}var H=o.bindContext(p,undefined,i);H.attachEventOnce("dataRequested",function(){B.lock(t._oView);});H.attachEventOnce("dataReceived",function(l){var n=l&&l.getParameter("error");B.unlock(t._oView);if(n){sap.ui.getCore().getLibraryResourceBundle("sap.fe.core",true).then(function(r){var q=new e();q.removeTransitionMessages();t.navigateToMessagePage(r.getText("C_COMMON_SAPFE_DATA_RECEIVED_ERROR"),{title:r.getText("SAPFE_ERROR"),description:n});}).catch(function(q){L.error("Error while getting the core resource bundle",q);});}});return H.getBoundContext();},_refreshBindingContext:function(o){var p=this._oPageComponent,s=this._oAppComponent.getSideEffectsService(),r=o.getPath(),g=p&&p.getEntitySet&&p.getEntitySet(),h=(p&&p.getContextPath&&p.getContextPath())||(g&&"/"+g),j=this._oView.getModel().getMetaModel(),k,n=[],P=[],l={TargetProperties:[],TargetEntities:[]};function q(t){var D,R=((t.getContext()&&t.getContext().getPath())||"").replace(r,""),u=(R?R.slice(1)+"/":R)+t.getPath();if(t.isA("sap.ui.model.odata.v4.ODataContextBinding")){D=t.getDependentBindings();if(D){for(var i=0;i<D.length;i++){q(D[i]);}}else if(n.indexOf(u)===-1){n.push(u);}}else if(t.isA("sap.ui.model.odata.v4.ODataListBinding")){if(n.indexOf(u)===-1){n.push(u);}}else if(t.isA("sap.ui.model.odata.v4.ODataPropertyBinding")){if(P.indexOf(u)===-1){P.push(u);}}}if(h){k=j.getObject(h+"/@com.sap.vocabularies.Common.v1.Messages/$Path");}q(o.getBinding());var i;for(i=0;i<n.length;i++){l.TargetEntities.push({$NavigationPropertyPath:n[i]});}l.TargetProperties=P;if(k){l.TargetProperties.push({$PropertyPath:k});}s.requestSideEffects(l.TargetEntities.concat(l.TargetProperties),o);},_getBindingContext:function(){if(this._oPageComponent){return this._oPageComponent.getBindingContext();}else{return this._oView.getBindingContext();}},_setBindingContext:function(o){if(this._oPageComponent){this._oPageComponent.setBindingContext(o);}else{this._oView.setBindingContext(o);}},_getFCLLevel:function(){return this._oTargetInformation.FCLLevel;},overflowToolbarButtonHover:function(){this.sCurrentFocusedControlId=sap.ui.getCore().getCurrentFocusedControlId();},enterFullScreen:function(){var s=this.base.getView();var o=s.getBindingContext(),n=s.getModel("fclhelper").getProperty("/actionButtonsInfo/fullScreen");var r=this._oRouterProxy;var g=this.sCurrentFocusedControlId;this.base._routing.navigateToContext(o,{sLayout:n}).then(function(){var l=r.getLastHistoryEntry();l.oLastFocusControl=Object.assign({},l.oLastFocusControl,{controlId:g,focusInfo:{id:g}});}).catch(function(){L.warning("cannot set focus on last focused control");});},exitFullScreen:function(){var s=this.base.getView();var o=s.getBindingContext(),n=s.getModel("fclhelper").getProperty("/actionButtonsInfo/exitFullScreen");var r=this._oRouterProxy;var g=this.sCurrentFocusedControlId;this.base._routing.navigateToContext(o,{sLayout:n}).then(function(){var l=r.getLastHistoryEntry();l.oLastFocusControl=Object.assign({},l.oLastFocusControl,{controlId:g,focusInfo:{id:g}});}).catch(function(){L.warning("cannot set focus on last focused control");});},closeColumn:function(){var s=this.base.getView();var v=s.getViewData();var o=s.getBindingContext();var g=this.base;var h=o.getModel().getMetaModel();if(v&&v.viewLevel===1&&f.isDraftSupported(h,o.getPath())){c.fnProcessDataLossOrDraftDiscardConfirmation(function(){g._routing.navigateBackFromContext(o,{noPreservationCache:true});},Function.prototype,o,s.getController(),false);}else{g._routing.navigateBackFromContext(o,{noPreservationCache:true});}},override:{onExit:function(){this._oRoutingService&&this._oRoutingService.detachRouteMatched(this._fnRouteMatchedBound);},onInit:function(){var t=this;this._oView=this.base.getView();this._oAppComponent=c.getAppComponent(this._oView);this._oPageComponent=b.getOwnerComponentFor(this._oView);this._oRouter=this._oAppComponent.getRouter();this._oRouterProxy=this._oAppComponent.getRouterProxy();if(!this._oAppComponent||!this._oPageComponent){throw new Error("Failed to initialize controler extension 'sap.fe.core.controllerextesions.InternalRouting");}if(this._oAppComponent===this._oPageComponent){this._oPageComponent=null;}this._oAppComponent.getService("routingService").then(function(r){t._oRoutingService=r;t._fnRouteMatchedBound=t._onRouteMatched.bind(t);t._oRoutingService.attachRouteMatched(t._fnRouteMatchedBound);t._oTargetInformation=r.getTargetInformationFor(t._oPageComponent||t._oView);}).catch(function(){throw new Error("This controller extension cannot work without a 'routingService' on the main AppComponent");});}}},a);});
+sap.ui.define(["sap/ui/core/mvc/ControllerExtension","sap/fe/core/controllerextensions/ControllerExtensionMetadata","sap/ui/core/mvc/OverrideExecution","sap/ui/core/Component","sap/fe/core/CommonUtils","sap/fe/core/BusyLocker","sap/fe/core/helpers/SemanticKeyHelper","sap/ui/model/Filter","sap/ui/model/FilterOperator","sap/base/Log","sap/fe/core/actions/messageHandling","sap/m/MessageBox","sap/fe/core/helpers/EditState","sap/fe/core/controllerextensions/MessageHandler","sap/fe/core/helpers/ModelHelper"],function(C,a,O,b,c,B,S,F,d,L,m,M,E,e,f){"use strict";return C.extend("sap.fe.core.controllerextensions.InternalRouting",{metadata:{methods:{"navigateToTarget":{"public":true,"final":false},"byId":{"public":false},"getView":{"public":false},"onRouteMatched":{"public":true,"final":false,overrideExecution:O.After},"onRouteMatchedFinished":{"public":true,"final":false,overrideExecution:O.After},"onBeforeBinding":{"public":true,"final":false,overrideExecution:O.After},"onAfterBinding":{"public":true,"final":false,overrideExecution:O.After},"navigateToContext":{"public":true,"final":true},"navigateBackFromContext":{"public":true,"final":true},"navigateForwardToContext":{"public":true,"final":true},"navigateBackFromTransientState":{"public":true,"final":true},"navigateToMessagePage":{"public":true,"final":true},"enterFullScreen":{"public":true,"final":false,overrideExecution:sap.ui.core.mvc.OverrideExecution.Before},"exitFullScreen":{"public":true,"final":false,overrideExecution:sap.ui.core.mvc.OverrideExecution.Before},"closeColumn":{"public":true,"final":false,overrideExecution:sap.ui.core.mvc.OverrideExecution.Before},"isCurrentStateImpactedBy":{"public":true,"final":true}}},onRouteMatched:function(){},onRouteMatchedFinished:function(){},onBeforeBinding:function(o,p){var r=this.base.getView().getController().routing;if(r&&r.onBeforeBinding){r.onBeforeBinding(o,p);}},onAfterBinding:function(o,p){this._oAppComponent.getRootViewController().onContextBoundToView(o);var r=this.base.getView().getController().routing;if(r&&r.onAfterBinding){r.onAfterBinding(o,p);}},navigateToTarget:function(o,n,s,p){var N=this._oPageComponent&&this._oPageComponent.getNavigationConfiguration&&this._oPageComponent.getNavigationConfiguration(n);if(N){var D=N.detail;var r=D.route;var P=D.parameters;this._oRoutingService.navigateTo(o,r,P,p,s);}else{this._oRoutingService.navigateTo(o,null,null,p);}this._oView.getViewData();},navigateToContext:function(o,p){var t=this;var g={};p=p||{};if(o.isA("sap.ui.model.odata.v4.ODataListBinding")){if(p.asyncContext){this._oRouterProxy.activateRouteMatchSynchronization();p.asyncContext.then(function(o){t.navigateToContext(o,{checkNoHashChange:p.checkNoHashChange,editable:p.editable,bPersistOPScroll:p.bPersistOPScroll,updateFCLLevel:p.updateFCLLevel,bForceFocus:p.bForceFocus});}).catch(function(h){L.error("Error with the async context",h);});}else if(!p.bDeferredContext){throw"navigation to a list binding is not yet supported";}}if(p.callExtension){g.sourceBindingContext=o.getObject();g.bindingContext=o;if(p.oEvent){g.oEvent=p.oEvent;}if(this.base.getView().getController().routing.onBeforeNavigation(g)){return Promise.resolve();}}p.FCLLevel=this._getFCLLevel();return this._oRoutingService.navigateToContext(o,p,this._oView.getViewData(),this._oTargetInformation);},navigateBackFromContext:function(o,p){p=p||{};p.updateFCLLevel=-1;return this.navigateToContext(o,p);},navigateForwardToContext:function(o,p){if(this._oView.getBindingContext("internal").getProperty("messageFooterContainsErrors")===true){return Promise.resolve();}p=p||{};p.updateFCLLevel=1;return this.navigateToContext(o,p,true);},navigateBackFromTransientState:function(){var h=this._oRouterProxy.getHash();if(h.indexOf("(...)")!==-1){this._oRouterProxy.navBack();}},navigateToMessagePage:function(s,p){p=p||{};if(this._oRouterProxy.getHash().indexOf("i-action=create")>-1){return this._oRouterProxy.navToHash(this._oRoutingService.getDefaultCreateHash());}else{p.FCLLevel=this._getFCLLevel();return this._oAppComponent.getRootViewController().displayMessagePage(s,p);}},isCurrentStateImpactedBy:function(o){return this._oRoutingService.isCurrentStateImpactedBy(o);},_onRouteMatched:function(o){var t=o.getParameter("routeInformation")&&o.getParameter("routeInformation").targets;if(!t||t.indexOf(this._oTargetInformation.targetName)===-1){return;}var T;if(this._oPageComponent&&this._oPageComponent.getBindingContextPattern){T=this._oPageComponent.getBindingContextPattern();}T=T||this._oTargetInformation.contextPattern;if(T===null||T===undefined){T=o.getParameter("routePattern");}T=T.replace(":?query:","");var A=o.getParameters().arguments,D=false,n=o.getParameter("navigationInfo");for(var k in A){var v=A[k];if(v==="..."&&T.indexOf("{"+k+"}")>=0){D=true;n.bTargetEditable=true;}T=T.replace("{"+k+"}",v);}if(A["?query"]&&A["?query"].hasOwnProperty("i-action")){n.bActionCreate=true;}if(T&&T[0]!=="/"){T="/"+T;}this.onRouteMatched();var g=this._oView.getModel(),h;if(D){h=this._bindDeferred(T,n);}else{h=this._bindPage(T,g,n);}var i=this;h.finally(function(){i.onRouteMatchedFinished();});this._oAppComponent.getRootViewController().updateUIStateForView(this._oView,this._getFCLLevel());},_bindDeferred:function(t,n){this.onBeforeBinding(null,{editable:n.bTargetEditable});if(n.bDeferredContext||!n.oAsyncContext){if(this._oPageComponent&&this._oPageComponent.createDeferredContext){this._oPageComponent.createDeferredContext(t,n.bActionCreate);}}if(this._getBindingContext()&&this._getBindingContext().hasPendingChanges()){this._getBindingContext().getBinding().resetChanges();}this._setBindingContext(null);this.onAfterBinding(null);return Promise.resolve();},_bindPage:function(t,o,n){var g=this;if(t===""){return Promise.resolve(this._bindPageToContext(null,o,n));}else{return this._resolveSemanticPath(t,o).then(function(T){g._bindPageToPath(T,o,n);}).catch(function(h){var r=sap.ui.getCore().getLibraryResourceBundle("sap.fe.core");g.navigateToMessagePage(r.getText("C_COMMON_SAPFE_DATA_RECEIVED_ERROR"),{title:r.getText("C_COMMON_SAPFE_ERROR"),description:h.message});});}},_createFilterFromSemanticPath:function(s,g,o){var k=s.substring(s.indexOf("(")+1,s.length-1).split(","),h;if(g.length!=k.length){return null;}var i=f.isFilteringCaseSensitive(o);if(g.length===1){var K=k[0];if(K.indexOf("'")===0&&K.lastIndexOf("'")===K.length-1){K=decodeURIComponent(K.substring(1,K.length-1));}h=[new F({path:g[0].$PropertyPath,operator:d.EQ,value1:K,caseSensitive:i})];}else{var j={};k.forEach(function(p){var P=p.split("="),K=P[1];if(K.indexOf("'")===0&&K.lastIndexOf("'")===K.length-1){K=decodeURIComponent(K.substring(1,K.length-1));}j[P[0]]=K;});var l=false;h=g.map(function(p){var q=p.$PropertyPath,v=j[q];if(v!==undefined){return new F({path:q,operator:d.EQ,value1:v,caseSensitive:i});}else{l=true;return"XX";}});if(l){return null;}}var D=new F({filters:[new F("IsActiveEntity","EQ",false),new F("SiblingEntity/IsActiveEntity","EQ",null)],and:false});h.push(D);var n=new F(h,true);return n;},_getTechnicalPathFromSemanticPath:function(s,o,g){var h=o.getMetaModel(),i=h.getMetaContext(s).getPath();if(!g||g.length===0){return Promise.resolve(null);}var j=this._createFilterFromSemanticPath(s,g,h);if(j===null){return Promise.resolve(null);}var l=o.bindList("/"+i,undefined,undefined,j,{"$$groupId":"$auto.Heroes"});return l.requestContexts(0,2).then(function(k){if(k&&k.length){return k[0].getPath();}else{return null;}});},_checkPathForSemanticBookmarking:function(p,o){var g=/^[\/]?(\w+)\([^\/]+\)$/.exec(p);if(!g){return false;}var s="/"+g[1];var D=o.getObject(s+"@com.sap.vocabularies.Common.v1.DraftRoot");var h=o.getObject(s+"@com.sap.vocabularies.Common.v1.DraftNode");return D||h?true:false;},_resolveSemanticPath:function(p,o){var g=o.getMetaModel(),l=this._oRoutingService.getLastSemanticMapping(),s=this._oRouter.getHashChanger().getHash().split("?")[0],t=this;if(s&&s.lastIndexOf("/")===s.length-1){s=s.substring(0,s.length-1);}var r=s&&s.substr(0,s.indexOf("("));if(r.indexOf("/")===0){r=r.substring(1);}var A=this._checkPathForSemanticBookmarking(s,g),h=A&&S.getSemanticKeys(g,r);if(!h){return Promise.resolve(p);}else if(l&&l.semanticPath===p){return Promise.resolve(l.technicalPath);}else{return this._getTechnicalPathFromSemanticPath(s,o,h).then(function(T){if(T&&T!==p){t._oRoutingService.setLastSemanticMapping({technicalPath:T,semanticPath:p});return T;}else{return p;}});}},_bindPageToPath:function(t,o,n){var g=this._getBindingContext(),s=g&&g.getPath(),u=n.useContext;if(s!==t||(u&&u.getPath()===t)){var T;if(u&&u.getPath()===t){T=u;}else{T=this._createBindingContext(t,o);}if(T!==g){this._bindPageToContext(T,o,n);}}else if(!n.bReasonIsIappState&&E.isEditStateDirty()){this._refreshBindingContext(g);}},_bindPageToContext:function(o,g,n){var t=this;if(!o){this.onBeforeBinding(null);this.onAfterBinding(null);}else{var p=o.getBinding();if(!o.getBinding()||o.getBinding().isA("sap.ui.model.odata.v4.ODataListBinding")){o=this._createBindingContext(o.getPath(),g);if(E.isEditStateDirty()){setTimeout(function(){t._refreshBindingContext(o);},0);}}this.onBeforeBinding(o,{editable:n.bTargetEditable,listBinding:p,bPersistOPScroll:n.bPersistOPScroll,bDraftNavigation:n.bDraftNavigation,showPlaceholder:n.bShowPlaceholder});this._setBindingContext(o);this.onAfterBinding(o);}},_createBindingContext:function(p,o){var P=this._oPageComponent,s=P&&P.getEntitySet&&P.getEntitySet(),g=(P&&P.getContextPath&&P.getContextPath())||(s&&"/"+s),h=o.getMetaModel(),t=this,i={$$patchWithoutSideEffects:true,$$groupId:"$auto.Heroes",$$updateGroupId:"$auto"};if(s){var j=h.getObject(g+"/@com.sap.vocabularies.Common.v1.Messages/$Path");if(j){i.$select=j;}}var D=h.getObject(g+"@com.sap.vocabularies.Common.v1.DraftRoot");var k=h.getObject(g+"@com.sap.vocabularies.Common.v1.DraftNode");if(D||k){if(i.$select===undefined){i.$select="HasActiveEntity,HasDraftEntity,IsActiveEntity";}else{i.$select+=",HasActiveEntity,HasDraftEntity,IsActiveEntity";}}var H=o.bindContext(p,undefined,i);H.attachEventOnce("dataRequested",function(){B.lock(t._oView);});H.attachEventOnce("dataReceived",function(l){var n=l&&l.getParameter("error");B.unlock(t._oView);if(n){sap.ui.getCore().getLibraryResourceBundle("sap.fe.core",true).then(function(r){var q=new e();q.removeTransitionMessages();t.navigateToMessagePage(r.getText("C_COMMON_SAPFE_DATA_RECEIVED_ERROR"),{title:r.getText("SAPFE_ERROR"),description:n});}).catch(function(q){L.error("Error while getting the core resource bundle",q);});}});return H.getBoundContext();},_refreshBindingContext:function(o){var p=this._oPageComponent,s=this._oAppComponent.getSideEffectsService(),r=o.getPath(),g=p&&p.getEntitySet&&p.getEntitySet(),h=(p&&p.getContextPath&&p.getContextPath())||(g&&"/"+g),j=this._oView.getModel().getMetaModel(),k,n=[],P=[],l={TargetProperties:[],TargetEntities:[]};function q(t){var D,R=((t.getContext()&&t.getContext().getPath())||"").replace(r,""),u=(R?R.slice(1)+"/":R)+t.getPath();if(t.isA("sap.ui.model.odata.v4.ODataContextBinding")){D=t.getDependentBindings();if(D){for(var i=0;i<D.length;i++){q(D[i]);}}else if(n.indexOf(u)===-1){n.push(u);}}else if(t.isA("sap.ui.model.odata.v4.ODataListBinding")){if(n.indexOf(u)===-1){n.push(u);}}else if(t.isA("sap.ui.model.odata.v4.ODataPropertyBinding")){if(P.indexOf(u)===-1){P.push(u);}}}if(h){k=j.getObject(h+"/@com.sap.vocabularies.Common.v1.Messages/$Path");}q(o.getBinding());var i;for(i=0;i<n.length;i++){l.TargetEntities.push({$NavigationPropertyPath:n[i]});}l.TargetProperties=P;if(k){l.TargetProperties.push({$PropertyPath:k});}s.requestSideEffects(l.TargetEntities.concat(l.TargetProperties),o);},_getBindingContext:function(){if(this._oPageComponent){return this._oPageComponent.getBindingContext();}else{return this._oView.getBindingContext();}},_setBindingContext:function(o){if(this._oPageComponent){this._oPageComponent.setBindingContext(o);}else{this._oView.setBindingContext(o);}},_getFCLLevel:function(){return this._oTargetInformation.FCLLevel;},switchFullScreen:function(){var s=this.base.getView();var o=s.getModel("fclhelper"),i=o.getProperty("/actionButtonsInfo/isFullScreen"),n=o.getProperty(i?"/actionButtonsInfo/exitFullScreen":"/actionButtonsInfo/fullScreen"),r=this._oAppComponent.getRootViewController();var g=r.getRightmostContext?r.getRightmostContext():s.getBindingContext();this.base._routing.navigateToContext(g,{sLayout:n}).catch(function(){L.warning("cannot switch between column and fullscreen");});},closeColumn:function(){var s=this.base.getView();var v=s.getViewData();var o=s.getBindingContext();var g=this.base;var h=o.getModel().getMetaModel();if(v&&v.viewLevel===1&&f.isDraftSupported(h,o.getPath())){c.fnProcessDataLossOrDraftDiscardConfirmation(function(){g._routing.navigateBackFromContext(o,{noPreservationCache:true});},Function.prototype,o,s.getController(),false);}else{g._routing.navigateBackFromContext(o,{noPreservationCache:true});}},override:{onExit:function(){this._oRoutingService&&this._oRoutingService.detachRouteMatched(this._fnRouteMatchedBound);},onInit:function(){var t=this;this._oView=this.base.getView();this._oAppComponent=c.getAppComponent(this._oView);this._oPageComponent=b.getOwnerComponentFor(this._oView);this._oRouter=this._oAppComponent.getRouter();this._oRouterProxy=this._oAppComponent.getRouterProxy();if(!this._oAppComponent||!this._oPageComponent){throw new Error("Failed to initialize controler extension 'sap.fe.core.controllerextesions.InternalRouting");}if(this._oAppComponent===this._oPageComponent){this._oPageComponent=null;}this._oAppComponent.getService("routingService").then(function(r){t._oRoutingService=r;t._fnRouteMatchedBound=t._onRouteMatched.bind(t);t._oRoutingService.attachRouteMatched(t._fnRouteMatchedBound);t._oTargetInformation=r.getTargetInformationFor(t._oPageComponent||t._oView);}).catch(function(){throw new Error("This controller extension cannot work without a 'routingService' on the main AppComponent");});}}},a);});

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

@@ -4,113 +4,233 @@
     
  */
 
-sap.ui.define(["sap/ui/core/mvc/ControllerExtension", "sap/ui/core/mvc/OverrideExecution", "sap/fe/core/actions/messageHandling"], function(
-	ControllerExtension,
-	OverrideExecution,
-	messageHandling
-) {
-	"use strict";
+sap.ui.define(
+	[
+		"sap/ui/core/mvc/ControllerExtension",
+		"sap/ui/core/mvc/OverrideExecution",
+		"sap/fe/core/actions/messageHandling",
+		"sap/fe/core/CommonUtils",
+		"sap/fe/core/controllerextensions/ControllerExtensionMetadata"
+	],
+	function(ControllerExtension, OverrideExecution, messageHandling, CommonUtils, ControllerExtensionMetadata) {
+		"use strict";
 
-	/**
-	 * @class A controller extension offering message handling.
-	 *
-	 * @name sap.fe.core.controllerextensions.MessageHandler
-	 * @hideconstructor
-	 * @public
-	 * @experimental As of version 1.90.0
-	 * @since 1.90.0
-	 */
-
-	var MessageHandler = ControllerExtension.extend("sap.fe.core.controllerextensions.MessageHandler", {
-		metadata: {
-			methods: {
-				showMessageDialog: { "public": true, "final": true },
-				getShowBoundMessagesInMessageDialog: { "public": false, "final": false, overrideExecution: OverrideExecution.Instead }
-			}
-		},
-
-		/**
-		 * @private
-		 * @name sap.fe.core.controllerextensions.MessageHandler.getMetadata
-		 * @function
-		 */
-		/**
-		 * @private
-		 * @name sap.fe.core.controllerextensions.MessageHandler.extend
-		 * @function
-		 */
 		/**
-		 * Determines whether or not bound messages are shown in the message dialog.
-		 *
-		 * This function is meant to be individually overridden by consuming controllers, but not to be called directly.
-		 * The override execution is: {@link sap.ui.core.mvc.OverrideExecution.Instead}.
-		 *
-		 * If the bound messages are shown to the user with a different control like the (TODO:Link) MessageButton
-		 * this method has to be overridden.
+		 * @class A controller extension offering message handling.
 		 *
-		 * @returns {boolean} Determines whether or not bound messages are shown in the message dialog.
-		 * @private
-		 */
-		getShowBoundMessagesInMessageDialog: function() {
-			return true;
-		},
-		// eslint-disable-next-line jsdoc/require-param
-		/**
-		 * Shows a message dialog with transition messages if there are any.
-		 * The message dialog is shown as a modal dialog. Once the user confirms the dialog, all transition messages
-		 * are removed from the message model. If there is more than one message, a list of messages is shown. The user
-		 * can filter on message types and can display details as well as the long text. If there is one message,
-		 * the dialog immediately shows the details of the message. If there is just one success message, a message
-		 * toast is shown instead.
-		 * @returns {Promise} A promise that is resolved once the user closes the dialog. If there are no messages
-		 * to be shown, the promise is resolved immediately
-		 * @alias sap.fe.core.controllerextensions.MessageHandler#showMessageDialog
+		 * @name sap.fe.core.controllerextensions.MessageHandler
+		 * @hideconstructor
 		 * @public
 		 * @experimental As of version 1.90.0
 		 * @since 1.90.0
 		 */
-		showMessageDialog: function(mParameters) {
-			var customMessages = mParameters && mParameters.customMessages ? mParameters.customMessages : undefined,
-				oOPInternalBindingContext = this.base.getView().getBindingContext("internal");
-			// set isActionParameterDialog open so that it can be used in the controller extension to decide whether message dialog should open or not
-			if (mParameters && mParameters.isActionParameterDialogOpen && oOPInternalBindingContext) {
-				oOPInternalBindingContext.setProperty("isActionParameterDialogOpen", true);
-			}
-			var bShowBoundMessages = this.getShowBoundMessagesInMessageDialog();
-			var oBindingContext = mParameters && mParameters.context ? mParameters.context : this.getView().getBindingContext();
-			var bEtagMessage = mParameters && mParameters.bHasEtagMessage;
-			// reset  isActionParameterDialogOpen
-			// cannot do this operations.js since it is not aware of the view
-			if (oOPInternalBindingContext) {
-				oOPInternalBindingContext.setProperty("isActionParameterDialogOpen", false);
-			}
-			return new Promise(function(resolve, reject) {
-				// we have to set a timeout to be able to access the most recent messages
-				setTimeout(function() {
-					// TODO: great API - will be changed later
-					messageHandling
-						.showUnboundMessages(customMessages, oBindingContext, bEtagMessage, bShowBoundMessages)
-						.then(resolve)
-						.catch(reject);
-				}, 0);
-			});
-		},
 
-		/**
-		 * You can remove the existing transition message from the message model with this method.
-		 * With every user interaction that causes server communication (like clicking on an action, changing data),
-		 * this method removes the existing transition messages from the message model.
-		 * @param {boolean} keepBoundMessage Checks if the bound transition messages are not to be removed
-		 *
-		 * @alias sap.fe.core.controllerextensions.MessageHandler#removesTransitionMessages
-		 * @private
-		 */
-		removeTransitionMessages: function(keepBoundMessage) {
-			if (!keepBoundMessage) {
-				messageHandling.removeBoundTransitionMessages();
-			}
-			messageHandling.removeUnboundTransitionMessages();
-		}
-	});
-	return MessageHandler;
-});
+		return ControllerExtension.extend(
+			"sap.fe.core.controllerextensions.MessageHandler",
+			{
+				metadata: {
+					methods: {
+						showMessageDialog: { "public": true, "final": true },
+						getShowBoundMessagesInMessageDialog: {
+							"public": false,
+							"final": false,
+							overrideExecution: OverrideExecution.Instead
+						}
+					}
+				},
+
+				/**
+				 * @private
+				 * @name sap.fe.core.controllerextensions.MessageHandler.getMetadata
+				 * @function
+				 */
+				/**
+				 * @private
+				 * @name sap.fe.core.controllerextensions.MessageHandler.extend
+				 * @function
+				 */
+				/**
+				 * Determines whether or not bound messages are shown in the message dialog.
+				 *
+				 * This function is meant to be individually overridden by consuming controllers, but not to be called directly.
+				 * The override execution is: {@link sap.ui.core.mvc.OverrideExecution.Instead}.
+				 *
+				 * If the bound messages are shown to the user with a different control like the (TODO:Link) MessageButton
+				 * this method has to be overridden.
+				 *
+				 * @returns {boolean} Determines whether or not bound messages are shown in the message dialog.
+				 * @private
+				 */
+				getShowBoundMessagesInMessageDialog: function() {
+					return true;
+				},
+				// eslint-disable-next-line jsdoc/require-param
+				/**
+				 * Shows a message dialog with transition messages if there are any.
+				 * The message dialog is shown as a modal dialog. Once the user confirms the dialog, all transition messages
+				 * are removed from the message model. If there is more than one message, a list of messages is shown. The user
+				 * can filter on message types and can display details as well as the long text. If there is one message,
+				 * the dialog immediately shows the details of the message. If there is just one success message, a message
+				 * toast is shown instead.
+				 * @returns {Promise} A promise that is resolved once the user closes the dialog. If there are no messages
+				 * to be shown, the promise is resolved immediately
+				 * @alias sap.fe.core.controllerextensions.MessageHandler#showMessageDialog
+				 * @public
+				 * @experimental As of version 1.90.0
+				 * @since 1.90.0
+				 */
+				showMessageDialog: function(mParameters) {
+					var customMessages = mParameters && mParameters.customMessages ? mParameters.customMessages : undefined,
+						oOPInternalBindingContext = this.base.getView().getBindingContext("internal");
+					// set isActionParameterDialog open so that it can be used in the controller extension to decide whether message dialog should open or not
+					if (mParameters && mParameters.isActionParameterDialogOpen && oOPInternalBindingContext) {
+						oOPInternalBindingContext.setProperty("isActionParameterDialogOpen", true);
+					}
+					var bShowBoundMessages = this.getShowBoundMessagesInMessageDialog();
+					var oBindingContext = mParameters && mParameters.context ? mParameters.context : this.getView().getBindingContext();
+					var bEtagMessage = mParameters && mParameters.bHasEtagMessage;
+					// reset  isActionParameterDialogOpen
+					// cannot do this operations.js since it is not aware of the view
+					if (oOPInternalBindingContext) {
+						oOPInternalBindingContext.setProperty("isActionParameterDialogOpen", false);
+					}
+					return new Promise(function(resolve, reject) {
+						// we have to set a timeout to be able to access the most recent messages
+						setTimeout(function() {
+							// TODO: great API - will be changed later
+							messageHandling
+								.showUnboundMessages(customMessages, oBindingContext, bEtagMessage, bShowBoundMessages)
+								.then(resolve)
+								.catch(reject);
+						}, 0);
+					});
+				},
+
+				/**
+				 * You can remove the existing transition message from the message model with this method.
+				 * With every user interaction that causes server communication (like clicking on an action, changing data),
+				 * this method removes the existing transition messages from the message model.
+				 * @param {boolean} keepBoundMessage Checks if the bound transition messages are not to be removed
+				 *
+				 * @alias sap.fe.core.controllerextensions.MessageHandler#removesTransitionMessages
+				 * @private
+				 */
+				removeTransitionMessages: function(keepBoundMessage) {
+					if (!keepBoundMessage) {
+						messageHandling.removeBoundTransitionMessages();
+					}
+					messageHandling.removeUnboundTransitionMessages();
+				},
+
+				_checkNavigationToMessagePage: function(mParameters) {
+					var aUnboundMessages = messageHandling.getMessages(),
+						bShowBoundTransitionMessages = this.getShowBoundMessagesInMessageDialog(),
+						aBoundTransitionMessages = bShowBoundTransitionMessages ? messageHandling.getMessages(true, true) : [],
+						aCustomMessages = mParameters && mParameters.customMessages ? mParameters.customMessages : [],
+						bIsStickyEditMode = CommonUtils.isStickyEditMode(this.base.getView()),
+						mMessagePageParameters;
+
+					// TODO: Stick mode check is okay as long as the controller extension is used with sap.fe.core and sap.fe.core.AppComponent.
+					// It might be better to provide an extension to the consumer of the controller extension to provide this value.
+
+					// The message page can only show 1 message today, so we navigate to it when :
+					// 1. There are no bound transition messages to show,
+					// 2. There are no custom messages to show, &
+					// 3. There is exactly 1 unbound message in the message model with statusCode=503 and retry-After available
+					// 4. retryAfter is greater than 120 seconds
+					//
+					// In Addition, navigating away from a sticky session will destroy the session so we do not navigate to message page for now.
+					// TODO: check if navigation should be done in sticky edit mode.
+					if (
+						!bIsStickyEditMode &&
+						!aBoundTransitionMessages.length &&
+						!aCustomMessages.length &&
+						aUnboundMessages.length === 1
+					) {
+						var oMessage = aUnboundMessages[0],
+							oTechnicalDetails = oMessage.getTechnicalDetails();
+						var sRetryAfterMessage;
+						if (oTechnicalDetails && oTechnicalDetails.httpStatus === 503) {
+							if (oTechnicalDetails.retryAfter) {
+								var iSecondsBeforeRetry = this._getSecondsBeforeRetryAfter(oTechnicalDetails.retryAfter);
+								if (iSecondsBeforeRetry > 120) {
+									// TODO: For now let's keep getRetryAfterMessage in messageHandling because it is needed also by the dialog.
+									// We can plan to move this and the dialog logic both to messageHandler controller extension if required.
+									sRetryAfterMessage = messageHandling.getRetryAfterMessage(oMessage);
+									mMessagePageParameters = {
+										description: sRetryAfterMessage
+											? sRetryAfterMessage + " " + oMessage.getMessage()
+											: oMessage.getMessage(),
+										navigateBackToOrigin: true
+									};
+								}
+							} else {
+								sRetryAfterMessage = messageHandling.getRetryAfterMessage(oMessage);
+								mMessagePageParameters = {
+									description: sRetryAfterMessage
+										? sRetryAfterMessage + " " + oMessage.getMessage()
+										: oMessage.getMessage(),
+									navigateBackToOrigin: true
+								};
+							}
+						}
+					}
+					return mMessagePageParameters;
+				},
+
+				_getSecondsBeforeRetryAfter: function(dRetryAfter) {
+					var dCurrentDateTime = new Date(),
+						iCurrentDateTimeInMilliSeconds = dCurrentDateTime.getTime(),
+						iRetryAfterDateTimeInMilliSeconds = dRetryAfter.getTime(),
+						iSecondsBeforeRetry = (iRetryAfterDateTimeInMilliSeconds - iCurrentDateTimeInMilliSeconds) / 1000;
+					return iSecondsBeforeRetry;
+				},
+				/**
+				 * Shows a message page or a message dialog based on the messages in the message dialog.
+				 * @param mParameters
+				 * @returns {Promise} A promise that is resolved once the user closes the message dialog or when navigation to the message page is complete. If there are no messages
+				 * to be shown, the promise is resolved immediately
+				 * @private
+				 */
+				showMessages: function(mParameters) {
+					var mMessagePageParameters = this._checkNavigationToMessagePage(mParameters);
+					if (mMessagePageParameters) {
+						// navigate to message page.
+						// handler before page navigation is triggered, for example to close the action parameter dialog
+						mParameters && mParameters.messagePageNavigationCallback && mParameters.messagePageNavigationCallback();
+
+						mMessagePageParameters.handleShellBack = true;
+						// TODO: Use Illustrated message instead of normal message page
+						// TODO: Return value needs to provided but since this function is private for now hence we can skip this.
+						this.removeTransitionMessages();
+						var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.fe.core");
+						if (this.base._routing) {
+							return new Promise(
+								function(resolve, reject) {
+									// we have to set a timeout to be able to access the most recent messages
+									setTimeout(
+										function() {
+											// TODO: great API - will be changed later
+											this.base._routing
+												.navigateToMessagePage(
+													oResourceBundle.getText("C_MESSAGE_HANDLING_SAPFE_503_TITLE"),
+													mMessagePageParameters
+												)
+												.then(resolve)
+												.catch(reject);
+										}.bind(this),
+										0
+									);
+								}.bind(this)
+							);
+						}
+					} else {
+						// navigate to message dialog
+						return this.showMessageDialog(mParameters);
+					}
+				}
+			},
+			ControllerExtensionMetadata
+		);
+	}
+);

package/packages/sap.fe.core/src/sap/fe/core/controllerextensions/MessageHandler.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"],function(C,O,m){"use strict";var M=C.extend("sap.fe.core.controllerextensions.MessageHandler",{metadata:{methods:{showMessageDialog:{"public":true,"final":true},getShowBoundMessagesInMessageDialog:{"public":false,"final":false,overrideExecution:O.Instead}}},getShowBoundMessagesInMessageDialog:function(){return true;},showMessageDialog:function(p){var c=p&&p.customMessages?p.customMessages:undefined,o=this.base.getView().getBindingContext("internal");if(p&&p.isActionParameterDialogOpen&&o){o.setProperty("isActionParameterDialogOpen",true);}var s=this.getShowBoundMessagesInMessageDialog();var b=p&&p.context?p.context:this.getView().getBindingContext();var e=p&&p.bHasEtagMessage;if(o){o.setProperty("isActionParameterDialogOpen",false);}return new Promise(function(r,a){setTimeout(function(){m.showUnboundMessages(c,b,e,s).then(r).catch(a);},0);});},removeTransitionMessages:function(k){if(!k){m.removeBoundTransitionMessages();}m.removeUnboundTransitionMessages();}});return M;});
+sap.ui.define(["sap/ui/core/mvc/ControllerExtension","sap/ui/core/mvc/OverrideExecution","sap/fe/core/actions/messageHandling","sap/fe/core/CommonUtils","sap/fe/core/controllerextensions/ControllerExtensionMetadata"],function(C,O,m,a,b){"use strict";return C.extend("sap.fe.core.controllerextensions.MessageHandler",{metadata:{methods:{showMessageDialog:{"public":true,"final":true},getShowBoundMessagesInMessageDialog:{"public":false,"final":false,overrideExecution:O.Instead}}},getShowBoundMessagesInMessageDialog:function(){return true;},showMessageDialog:function(p){var c=p&&p.customMessages?p.customMessages:undefined,o=this.base.getView().getBindingContext("internal");if(p&&p.isActionParameterDialogOpen&&o){o.setProperty("isActionParameterDialogOpen",true);}var s=this.getShowBoundMessagesInMessageDialog();var B=p&&p.context?p.context:this.getView().getBindingContext();var e=p&&p.bHasEtagMessage;if(o){o.setProperty("isActionParameterDialogOpen",false);}return new Promise(function(r,d){setTimeout(function(){m.showUnboundMessages(c,B,e,s).then(r).catch(d);},0);});},removeTransitionMessages:function(k){if(!k){m.removeBoundTransitionMessages();}m.removeUnboundTransitionMessages();},_checkNavigationToMessagePage:function(p){var u=m.getMessages(),s=this.getShowBoundMessagesInMessageDialog(),B=s?m.getMessages(true,true):[],c=p&&p.customMessages?p.customMessages:[],i=a.isStickyEditMode(this.base.getView()),M;if(!i&&!B.length&&!c.length&&u.length===1){var o=u[0],t=o.getTechnicalDetails();var r;if(t&&t.httpStatus===503){if(t.retryAfter){var S=this._getSecondsBeforeRetryAfter(t.retryAfter);if(S>120){r=m.getRetryAfterMessage(o);M={description:r?r+" "+o.getMessage():o.getMessage(),navigateBackToOrigin:true};}}else{r=m.getRetryAfterMessage(o);M={description:r?r+" "+o.getMessage():o.getMessage(),navigateBackToOrigin:true};}}}return M;},_getSecondsBeforeRetryAfter:function(r){var c=new Date(),i=c.getTime(),R=r.getTime(),s=(R-i)/1000;return s;},showMessages:function(p){var M=this._checkNavigationToMessagePage(p);if(M){p&&p.messagePageNavigationCallback&&p.messagePageNavigationCallback();M.handleShellBack=true;this.removeTransitionMessages();var r=sap.ui.getCore().getLibraryResourceBundle("sap.fe.core");if(this.base._routing){return new Promise(function(c,d){setTimeout(function(){this.base._routing.navigateToMessagePage(r.getText("C_MESSAGE_HANDLING_SAPFE_503_TITLE"),M).then(c).catch(d);}.bind(this),0);}.bind(this));}}else{return this.showMessageDialog(p);}}},b);});