@sap/open.fe 1.99.0 → 1.100.0

package/packages/sap.fe.core/src/sap/fe/core/actions/messageHandling.js

@@ -2,4 +2,4 @@
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/m/MessageToast","sap/m/MessageItem","sap/m/MessageView","sap/m/Button","sap/m/Dialog","sap/m/Text","sap/ui/core/library","sap/ui/model/Filter","sap/ui/model/FilterOperator","sap/ui/core/message/Message","sap/ui/core/IconPool","sap/ui/model/json/JSONModel","sap/ui/core/format/DateFormat","sap/m/Bar","sap/m/MessageBox","sap/m/FormattedText"],function(M,a,b,B,D,T,C,F,c,d,I,J,e,f,g,h){"use strict";var j=C.MessageType;var m=[];var k=[];var r=[];var o;var l;var n;var p;function q(){var P;function i(O){return O.property?"( ${"+O.property+'} ? ("<p>'+O.property.substr(Math.max(O.property.lastIndexOf("/"),O.property.lastIndexOf("."))+1)+' : " + '+"${"+O.property+'} + "</p>") : "" )':"";}function K(O){var N="";if(O.groupName&&O.property&&O.groupName!==P){N+="( ${"+O.property+'} ? "<br><h3>'+O.groupName+'</h3>" : "" ) + ';P=O.groupName;}return N;}function L(){var O="technicalDetails";return[{"groupName":"","property":O+"/status"},{"groupName":"","property":O+"/statusText"},{"groupName":"Application","property":O+"/error/@SAP__common.Application/ComponentId"},{"groupName":"Application","property":O+"/error/@SAP__common.Application/ServiceId"},{"groupName":"Application","property":O+"/error/@SAP__common.Application/ServiceRepository"},{"groupName":"Application","property":O+"/error/@SAP__common.Application/ServiceVersion"},{"groupName":"ErrorResolution","property":O+"/error/@SAP__common.ErrorResolution/Analysis"},{"groupName":"ErrorResolution","property":O+"/error/@SAP__common.ErrorResolution/Note"},{"groupName":"ErrorResolution","property":O+"/error/@SAP__common.ErrorResolution/DetailedNote"},{"groupName":"ErrorResolution","property":O+"/error/@SAP__common.ExceptionCategory"},{"groupName":"ErrorResolution","property":O+"/error/@SAP__common.TimeStamp"},{"groupName":"ErrorResolution","property":O+"/error/@SAP__common.TransactionId"},{"groupName":"Messages","property":O+"/error/code"},{"groupName":"Messages","property":O+"/error/message"}];}var N="Object.keys("+"${technicalDetails}"+').length > 0 ? "<h2>Technical Details</h2>" : "" ';L().forEach(function(O){N=N+K(O)+""+i(O)+" + ";});return N;}function s(){var i="(${"+'description} ? ("<h2>Description</h2>" + ${'+'description}) : "")';return i;}function G(K){var L=j.None;var N=K.length;var O={Error:0,Warning:0,Success:0,Information:0};for(var i=0;i<N;i++){++O[K[i].getType()];}if(O[j.Error]>0){L=j.Error;}else if(O[j.Warning]>0){L=j.Warning;}else if(O[j.Success]>0){L=j.Success;}else if(O[j.Information]>0){L=j.Information;}return L;}function t(K,R){var L=K.getMessageModel().getObject("/");var N=false;var O="";L.forEach(function(P,i){var Q=P.getTechnicalDetails();if(Q&&Q.httpStatus===412){O=O||R.getText("C_APP_COMPONENT_SAPFE_ETAG_TECHNICAL_ISSUES");K.removeMessages(L[i]);P.setMessage(O);P.target="";K.addMessages(P);N=true;}});return N;}function u(){o.close();l.setVisible(false);m=[];y();}function v(i,K){var N=new Date();var L=i.getTechnicalDetails();var R=sap.ui.getCore().getLibraryResourceBundle("sap.fe.core");var O;if(L&&L.httpStatus===503&&L.retryAfter){var P=L.retryAfter;var Q;if(N.getFullYear()!==P.getFullYear()){Q=e.getDateTimeInstance({pattern:"MMMM dd, yyyy 'at' hh:mm a"});O=R.getText("C_MESSAGE_HANDLING_SAPFE_503_ERROR",[Q.format(P)]);}else if(N.getFullYear()==P.getFullYear()){if(K){O=R.getText("C_MESSAGE_HANDLING_SAPFE_503_TITLE")+" "+R.getText("C_MESSAGE_HANDLING_SAPFE_503_DESC");}else if(N.getMonth()!==P.getMonth()||N.getDate()!==P.getDate()){Q=e.getDateTimeInstance({pattern:"MMMM dd 'at' hh:mm a"});O=R.getText("C_MESSAGE_HANDLING_SAPFE_503_ERROR",[Q.format(P)]);}else{Q=e.getDateTimeInstance({pattern:"hh:mm a"});O=R.getText("C_MESSAGE_HANDLING_SAPFE_503_ERROR_DAY",[Q.format(P)]);}}}if(L&&L.httpStatus===503&&!L.retryAfter){O=R.getText("C_MESSAGE_HANDLING_SAPFE_503_ERROR_NO_RETRY_AFTER");}return O;}function w(K,L,N,S){var U=this.getMessages();var O=sap.ui.getCore().getMessageManager();var P;var Q;var R=[new F({path:"code",operator:c.NE,value1:null}),new F({path:"persistent",operator:c.NE,value1:false})];var V=false,W=false;if(S){U=U.concat(A(true,true));R.push(new F({path:"persistent",operator:c.EQ,value1:true}));var X=function(i){var a1=Infinity,b1=sap.ui.getCore().byId(i[0]);var c1=sap.ui.getCore().byId(i[0]);while(b1){var d1=b1 instanceof D?c1.getParent().findElements(true).indexOf(c1):Infinity;if(b1 instanceof D){if(a1>d1){a1=d1;c1.focus();}return false;}b1=b1.getParent();}return true;};R.push(new F({path:"controlIds",test:X,caseSensitive:true}));}else{R.push(new F({path:"target",operator:c.EQ,value1:""}));}if(K&&K.length){K.forEach(function(i){var a1=i.code?i.code:"";O.addMessages(new d({message:i.text,type:i.type,target:"",persistent:true,code:a1}));});}var Y=new J();if(U.length===1&&U[0].getCode()==="503"){W=true;}else{var Z=O.getMessageModel().bindList("/",undefined,undefined,R),$=Z.getCurrentContexts();if($&&$.length>0){V=true;var _=[];$.forEach(function(L){var i;if(L.getObject().technicalDetails&&m.indexOf(L.getObject().technicalDetails.originalMessage.message)===-1){m.push(L.getObject().technicalDetails.originalMessage.message);i=L.getObject();_.push(i);k=_;}else if(!L.getObject().technicalDetails){i=L.getObject();_.push(i);k=_;}});Y.setData(k);}}if(U.length===0&&!K&&!N){return Promise.resolve(true);}else if(U.length===1&&U[0].getType()===j.Success&&!K){return new Promise(function(i){M.show(U[0].message);O.removeMessages(U);i();});}else if(V){r=r||[];return new Promise(function(a1,b1){r.push(a1);sap.ui.getCore().getLibraryResourceBundle("sap.fe.core",true).then(function(c1){n=n||new a(undefined,{counter:{path:"counter"},title:"{message}",subtitle:"{additionalText}",longtextUrl:"{descriptionUrl}",type:{path:"type"},description:"{= ${"+"description} || ${technicalDetails} ? "+'"<html><body>" + '+s()+" + "+q()+'"</body></html>"'+' : "" }',markupDescription:true});p=p||new b({showDetailsPageHeader:false,itemSelect:function(){l.setVisible(true);},items:{path:"/",template:n}});l=l||new B({icon:I.getIconURI("nav-back"),visible:false,press:function(){p.navigateBack();this.setVisible(false);}});var N=t(O,c1);p.setModel(Y);o=o||new D({resizable:true,content:p,endButton:new B({press:function(){u();if(S){z();}},text:c1.getText("C_COMMON_SAPFE_CLOSE")}),customHeader:new f({contentMiddle:[new T({text:c1.getText("C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE")})],contentLeft:[l]}),contentWidth:"37.5em",contentHeight:"21.5em",verticalScrolling:false,afterClose:function(){for(var i=0;i<r.length;i++){r[i].call();}r=[];}});if(N){sap.ui.require(["sap/m/ButtonType"],function(i){o.setBeginButton(new B({press:function(){u();if(L.hasPendingChanges()){L.getBinding().resetChanges();}L.refresh();},text:c1.getText("C_COMMON_SAPFE_REFRESH"),type:i.Emphasized}));});}else{o.destroyBeginButton();}P=G(p.getItems());Q=x(P);o.setState(P);o.getCustomHeader().getContentMiddle()[0].setText(Q);p.navigateBack();o.open();}).catch(b1);});}else if(W){return new Promise(function(i){var a1=U[0];if(a1.technicalDetails&&m.indexOf(a1.technicalDetails.originalMessage.message)===-1){m.push(a1.technicalDetails.originalMessage.message);var b1="<html><body>";var c1=v(a1,true);if(c1){b1="<h6>"+c1+"</h6><br>";}b1=b1+a1.getMessage()+"</html></body>";var d1=new h({htmlText:b1});g.error(d1,{onClose:function(){m=[];if(S){z();}y();i(true);}});}});}else{return Promise.resolve(true);}}function x(i){var R=sap.ui.getCore().getLibraryResourceBundle("sap.fe.core");switch(i){case"Error":return R.getText("C_COMMON_SAPFE_ERROR_MESSAGES_PAGE_TITLE_ERROR");case"Information":return R.getText("C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE_INFO");case"Success":return R.getText("C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE_SUCCESS");case"Warning":return R.getText("C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE_WARNING");default:return R.getText("C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE");}}function y(){E(false);}function z(){E(true);}function A(){var K=arguments.length>0&&arguments[0]!==undefined?arguments[0]:false;var L=arguments.length>1&&arguments[1]!==undefined?arguments[1]:false;var i;var N=sap.ui.getCore().getMessageManager(),O=N.getMessageModel(),P=O.getObject("/"),R=sap.ui.getCore().getLibraryResourceBundle("sap.fe.core"),Q=[];for(i=0;i<P.length;i++){if((!L||P[i].persistent)&&(K&&P[i].target!==""||!K&&(!P[i].target||P[i].target===""))&&P[i].code){Q.push(P[i]);}}for(i=0;i<Q.length;i++){if(Q[i].code==="503"&&Q[i].message!==""&&Q[i].message.indexOf(R.getText("C_MESSAGE_HANDLING_SAPFE_503_BACKEND_PREFIX"))===-1){Q[i].message="\n"+R.getText("C_MESSAGE_HANDLING_SAPFE_503_BACKEND_PREFIX")+Q[i].message;}}return Q;}function E(i){var K=A(i,true);if(K.length>0){sap.ui.getCore().getMessageManager().removeMessages(K);}}var H={getMessages:A,showUnboundMessages:w,removeUnboundTransitionMessages:y,removeBoundTransitionMessages:z,modifyETagMessagesOnly:t,getRetryAfterMessage:v};return H;},false);
+sap.ui.define(["sap/m/MessageToast","sap/m/MessageItem","sap/m/MessageView","sap/m/Button","sap/m/Dialog","sap/m/Text","sap/ui/core/library","sap/ui/model/Filter","sap/ui/model/FilterOperator","sap/ui/core/message/Message","sap/ui/core/IconPool","sap/ui/model/json/JSONModel","sap/ui/core/format/DateFormat","sap/m/Bar","sap/m/MessageBox","sap/m/FormattedText"],function(M,a,b,B,D,T,C,F,c,d,I,J,e,f,g,h){"use strict";var j=C.MessageType;var m=[];var k=[];var r=[];var o;var l;var n;var p;function q(){var P;function i(Q){return Q.property?"( ${"+Q.property+'} ? ("<p>'+Q.property.substr(Math.max(Q.property.lastIndexOf("/"),Q.property.lastIndexOf("."))+1)+' : " + '+"${"+Q.property+'} + "</p>") : "" )':"";}function L(Q){var O="";if(Q.groupName&&Q.property&&Q.groupName!==P){O+="( ${"+Q.property+'} ? "<br><h3>'+Q.groupName+'</h3>" : "" ) + ';P=Q.groupName;}return O;}function N(){var Q="technicalDetails";return[{"groupName":"","property":Q+"/status"},{"groupName":"","property":Q+"/statusText"},{"groupName":"Application","property":Q+"/error/@SAP__common.Application/ComponentId"},{"groupName":"Application","property":Q+"/error/@SAP__common.Application/ServiceId"},{"groupName":"Application","property":Q+"/error/@SAP__common.Application/ServiceRepository"},{"groupName":"Application","property":Q+"/error/@SAP__common.Application/ServiceVersion"},{"groupName":"ErrorResolution","property":Q+"/error/@SAP__common.ErrorResolution/Analysis"},{"groupName":"ErrorResolution","property":Q+"/error/@SAP__common.ErrorResolution/Note"},{"groupName":"ErrorResolution","property":Q+"/error/@SAP__common.ErrorResolution/DetailedNote"},{"groupName":"ErrorResolution","property":Q+"/error/@SAP__common.ExceptionCategory"},{"groupName":"ErrorResolution","property":Q+"/error/@SAP__common.TimeStamp"},{"groupName":"ErrorResolution","property":Q+"/error/@SAP__common.TransactionId"},{"groupName":"Messages","property":Q+"/error/code"},{"groupName":"Messages","property":Q+"/error/message"}];}var O="Object.keys("+"${technicalDetails}"+').length > 0 ? "<h2>Technical Details</h2>" : "" ';N().forEach(function(Q){O=O+L(Q)+""+i(Q)+" + ";});return O;}function s(){var i="(${"+'description} ? ("<h2>Description</h2>" + ${'+'description}) : "")';return i;}function G(L){var N=j.None;var O=L.length;var P={Error:0,Warning:0,Success:0,Information:0};for(var i=0;i<O;i++){++P[L[i].getType()];}if(P[j.Error]>0){N=j.Error;}else if(P[j.Warning]>0){N=j.Warning;}else if(P[j.Success]>0){N=j.Success;}else if(P[j.Information]>0){N=j.Information;}return N;}function t(L,R){var N=L.getMessageModel().getObject("/");var O=false;var P="";N.forEach(function(Q,i){var S=Q.getTechnicalDetails();if(S&&S.httpStatus===412){P=P||R.getText("C_APP_COMPONENT_SAPFE_ETAG_TECHNICAL_ISSUES");L.removeMessages(N[i]);Q.setMessage(P);Q.target="";L.addMessages(Q);O=true;}});return O;}function u(){o.close();l.setVisible(false);m=[];z();}function v(i,L){var N=new Date();var O=i.getTechnicalDetails();var R=sap.ui.getCore().getLibraryResourceBundle("sap.fe.core");var P;if(O&&O.httpStatus===503&&O.retryAfter){var Q=O.retryAfter;var S;if(N.getFullYear()!==Q.getFullYear()){S=e.getDateTimeInstance({pattern:"MMMM dd, yyyy 'at' hh:mm a"});P=R.getText("C_MESSAGE_HANDLING_SAPFE_503_ERROR",[S.format(Q)]);}else if(N.getFullYear()==Q.getFullYear()){if(L){P=R.getText("C_MESSAGE_HANDLING_SAPFE_503_TITLE")+" "+R.getText("C_MESSAGE_HANDLING_SAPFE_503_DESC");}else if(N.getMonth()!==Q.getMonth()||N.getDate()!==Q.getDate()){S=e.getDateTimeInstance({pattern:"MMMM dd 'at' hh:mm a"});P=R.getText("C_MESSAGE_HANDLING_SAPFE_503_ERROR",[S.format(Q)]);}else{S=e.getDateTimeInstance({pattern:"hh:mm a"});P=R.getText("C_MESSAGE_HANDLING_SAPFE_503_ERROR_DAY",[S.format(Q)]);}}}if(O&&O.httpStatus===503&&!O.retryAfter){P=R.getText("C_MESSAGE_HANDLING_SAPFE_503_ERROR_NO_RETRY_AFTER");}return P;}function w(i,S){if(!S){n=n||new a(undefined,{counter:{path:"counter"},title:"{message}",subtitle:"{additionalText}",longtextUrl:"{descriptionUrl}",type:{path:"type"},description:"{= ${"+"description} || ${technicalDetails} ? "+'"<html><body>" + '+s()+" + "+q()+'"</body></html>"'+' : "" }',markupDescription:true});}else{n=new a({title:"{message}",type:"Warning",longtextUrl:"{descriptionUrl}"});}p=p||new b({showDetailsPageHeader:false,itemSelect:function(){l.setVisible(true);},items:{path:"/",template:n}});l=l||new B({icon:I.getIconURI("nav-back"),visible:false,press:function(){p.navigateBack();this.setVisible(false);}});p.setModel(i);return{oMessageView:p,oBackButton:l};}function x(L,N,O,S){var U=this.getMessages();var P=sap.ui.getCore().getMessageManager();var Q;var R;var V=[new F({path:"code",operator:c.NE,value1:null}),new F({path:"persistent",operator:c.NE,value1:false})];var W=false,X=false;if(S){U=U.concat(E(true,true));V.push(new F({path:"persistent",operator:c.EQ,value1:true}));var Y=function(i){var b1=Infinity,c1=sap.ui.getCore().byId(i[0]);var d1=sap.ui.getCore().byId(i[0]);while(c1){var e1=c1 instanceof D?d1.getParent().findElements(true).indexOf(d1):Infinity;if(c1 instanceof D){if(b1>e1){b1=e1;d1.focus();}return false;}c1=c1.getParent();}return true;};V.push(new F({path:"controlIds",test:Y,caseSensitive:true}));}else{V.push(new F({path:"target",operator:c.EQ,value1:""}));}if(L&&L.length){L.forEach(function(i){var b1=i.code?i.code:"";P.addMessages(new d({message:i.text,type:i.type,target:"",persistent:true,code:b1}));});}var Z=new J();if(U.length===1&&U[0].getCode()==="503"){X=true;}else{var $=P.getMessageModel().bindList("/",undefined,undefined,V),_=$.getCurrentContexts();if(_&&_.length>0){W=true;var a1=[];_.forEach(function(N){var i;if(N.getObject().technicalDetails&&m.indexOf(N.getObject().technicalDetails.originalMessage.message)===-1){m.push(N.getObject().technicalDetails.originalMessage.message);i=N.getObject();a1.push(i);k=a1;}else if(!N.getObject().technicalDetails){i=N.getObject();a1.push(i);k=a1;}});Z.setData(k);}}if(U.length===0&&!L&&!O){return Promise.resolve(true);}else if(U.length===1&&U[0].getType()===j.Success&&!L){return new Promise(function(i){M.show(U[0].message);P.removeMessages(U);i();});}else if(W){r=r||[];return new Promise(function(b1,c1){r.push(b1);sap.ui.getCore().getLibraryResourceBundle("sap.fe.core",true).then(function(d1){var e1=false;var O=t(P,d1);var f1=w(Z,e1);o=o||new D({resizable:true,content:f1.oMessageView,endButton:new B({press:function(){u();if(S){A();}},text:d1.getText("C_COMMON_SAPFE_CLOSE")}),customHeader:new f({contentMiddle:[new T({text:d1.getText("C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE")})],contentLeft:[l]}),contentWidth:"37.5em",contentHeight:"21.5em",verticalScrolling:false,afterClose:function(){for(var i=0;i<r.length;i++){r[i].call();}r=[];}});if(O){sap.ui.require(["sap/m/ButtonType"],function(i){o.setBeginButton(new B({press:function(){u();if(N.hasPendingChanges()){N.getBinding().resetChanges();}N.refresh();},text:d1.getText("C_COMMON_SAPFE_REFRESH"),type:i.Emphasized}));});}else{o.destroyBeginButton();}Q=G(p.getItems());R=y(Q);o.setState(Q);o.getCustomHeader().getContentMiddle()[0].setText(R);p.navigateBack();o.open();}).catch(c1);});}else if(X){return new Promise(function(i){var b1=U[0];if(b1.technicalDetails&&m.indexOf(b1.technicalDetails.originalMessage.message)===-1){m.push(b1.technicalDetails.originalMessage.message);var c1="<html><body>";var d1=v(b1,true);if(d1){c1="<h6>"+d1+"</h6><br>";}c1=c1+b1.getMessage()+"</html></body>";var e1=new h({htmlText:c1});g.error(e1,{onClose:function(){m=[];if(S){A();}z();i(true);}});}});}else{return Promise.resolve(true);}}function y(i){var R=sap.ui.getCore().getLibraryResourceBundle("sap.fe.core");switch(i){case"Error":return R.getText("C_COMMON_SAPFE_ERROR_MESSAGES_PAGE_TITLE_ERROR");case"Information":return R.getText("C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE_INFO");case"Success":return R.getText("C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE_SUCCESS");case"Warning":return R.getText("C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE_WARNING");default:return R.getText("C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE");}}function z(){H(false);}function A(){H(true);}function E(){var L=arguments.length>0&&arguments[0]!==undefined?arguments[0]:false;var N=arguments.length>1&&arguments[1]!==undefined?arguments[1]:false;var i;var O=sap.ui.getCore().getMessageManager(),P=O.getMessageModel(),Q=P.getObject("/"),R=sap.ui.getCore().getLibraryResourceBundle("sap.fe.core"),S=[];for(i=0;i<Q.length;i++){if((!N||Q[i].persistent)&&(L&&Q[i].target!==""||!L&&(!Q[i].target||Q[i].target===""))&&Q[i].code){S.push(Q[i]);}}for(i=0;i<S.length;i++){if(S[i].code==="503"&&S[i].message!==""&&S[i].message.indexOf(R.getText("C_MESSAGE_HANDLING_SAPFE_503_BACKEND_PREFIX"))===-1){S[i].message="\n"+R.getText("C_MESSAGE_HANDLING_SAPFE_503_BACKEND_PREFIX")+S[i].message;}}return S;}function H(i){var L=E(i,true);if(L.length>0){sap.ui.getCore().getMessageManager().removeMessages(L);}}var K={getMessages:E,showUnboundMessages:x,removeUnboundTransitionMessages:z,removeBoundTransitionMessages:A,modifyETagMessagesOnly:t,getRetryAfterMessage:v,prepareMessageViewForDialog:w};return K;},false);

package/packages/sap.fe.core/src/sap/fe/core/actions/messageHandling.ts

@@ -39,6 +39,7 @@ export type messageHandlingType = {
 	removeBoundTransitionMessages: () => void;
 	modifyETagMessagesOnly: (oMessageManager: any, oResourceBundle: any) => boolean;
 	getRetryAfterMessage: (oMessage: any, bMessageDialog?: any) => any;
+	prepareMessageViewForDialog: (oMessageDialogModel: JSONModel, bStrictHandlingFlow: boolean) => any;
 };
 
 function fnFormatTechnicalDetails() {
@@ -154,7 +155,7 @@ function dialogCloseHandler() {
 	aMessageList = [];
 	removeUnboundTransitionMessages();
 }
-function getRetryAfterMessage(oMessage: any, bMessageDialog: any) {
+function getRetryAfterMessage(oMessage: any, bMessageDialog?: any) {
 	const dNow = new Date();
 	const oTechnicalDetails = oMessage.getTechnicalDetails();
 	const oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.fe.core") as ResourceBundle;
@@ -196,6 +197,65 @@ function getRetryAfterMessage(oMessage: any, bMessageDialog: any) {
 	}
 	return sRetryAfterMessage;
 }
+
+function prepareMessageViewForDialog(oMessageDialogModel: JSONModel, bStrictHandlingFlow: boolean) {
+	if (!bStrictHandlingFlow) {
+		oMessageTemplate =
+			oMessageTemplate ||
+			new MessageItem(undefined, {
+				counter: { path: "counter" },
+				title: "{message}",
+				subtitle: "{additionalText}",
+				longtextUrl: "{descriptionUrl}",
+				type: { path: "type" },
+				description:
+					"{= ${" +
+					"description} || ${technicalDetails} ? " +
+					'"<html><body>" + ' +
+					fnFormatDescription() +
+					" + " +
+					fnFormatTechnicalDetails() +
+					'"</body></html>"' +
+					' : "" }',
+				markupDescription: true
+			});
+	} else {
+		oMessageTemplate = new MessageItem({
+			title: "{message}",
+			type: "Warning",
+			longtextUrl: "{descriptionUrl}"
+		});
+	}
+	oMessageView =
+		oMessageView ||
+		new MessageView({
+			showDetailsPageHeader: false,
+			itemSelect: function() {
+				oBackButton.setVisible(true);
+			},
+			items: {
+				path: "/",
+				template: oMessageTemplate
+			}
+		});
+	oBackButton =
+		oBackButton ||
+		new Button({
+			icon: IconPool.getIconURI("nav-back"),
+			visible: false,
+			press: function(this: Button) {
+				oMessageView.navigateBack();
+				this.setVisible(false);
+			}
+		});
+	// Update proper ETag Mismatch error
+	oMessageView.setModel(oMessageDialogModel);
+	return {
+		oMessageView,
+		oBackButton
+	};
+}
+
 function showUnboundMessages(
 	this: messageHandlingType,
 	aCustomMessages?: any[],
@@ -316,55 +376,14 @@ function showUnboundMessages(
 			aResolveFunctions.push(resolve);
 			(sap.ui.getCore().getLibraryResourceBundle("sap.fe.core", true) as Promise<ResourceBundle>)
 				.then(function(oResourceBundle: any) {
-					oMessageTemplate =
-						oMessageTemplate ||
-						new MessageItem(undefined, {
-							counter: { path: "counter" },
-							title: "{message}",
-							subtitle: "{additionalText}",
-							longtextUrl: "{descriptionUrl}",
-							type: { path: "type" },
-							description:
-								"{= ${" +
-								"description} || ${technicalDetails} ? " +
-								'"<html><body>" + ' +
-								fnFormatDescription() +
-								" + " +
-								fnFormatTechnicalDetails() +
-								'"</body></html>"' +
-								' : "" }',
-							markupDescription: true
-						});
-					oMessageView =
-						oMessageView ||
-						new MessageView({
-							showDetailsPageHeader: false,
-							itemSelect: function() {
-								oBackButton.setVisible(true);
-							},
-							items: {
-								path: "/",
-								template: oMessageTemplate
-							}
-						});
-					oBackButton =
-						oBackButton ||
-						new Button({
-							icon: IconPool.getIconURI("nav-back"),
-							visible: false,
-							press: function(this: Button) {
-								oMessageView.navigateBack();
-								this.setVisible(false);
-							}
-						});
-					// Update proper ETag Mismatch error
+					const bStrictHandlingFlow = false;
 					const bHasEtagMessage = fnModifyETagMessagesOnly(oMessageManager, oResourceBundle);
-					oMessageView.setModel(oMessageDialogModel);
+					const oMessageObject = prepareMessageViewForDialog(oMessageDialogModel, bStrictHandlingFlow);
 					oDialog =
 						oDialog ||
 						new Dialog({
 							resizable: true,
-							content: oMessageView,
+							content: oMessageObject.oMessageView,
 							endButton: new Button({
 								press: function() {
 									dialogCloseHandler();
@@ -526,7 +545,8 @@ const messageHandling: messageHandlingType = {
 	removeUnboundTransitionMessages: removeUnboundTransitionMessages,
 	removeBoundTransitionMessages: removeBoundTransitionMessages,
 	modifyETagMessagesOnly: fnModifyETagMessagesOnly,
-	getRetryAfterMessage: getRetryAfterMessage
+	getRetryAfterMessage: getRetryAfterMessage,
+	prepareMessageViewForDialog: prepareMessageViewForDialog
 };
 
 export default messageHandling;