@sapui5/sap.suite.ui.generic.template 1.124.2 → 1.126.0

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

@@ -105,6 +105,17 @@ sap.ui.define([
 		return { edmType: undefined, sSemantic: undefined, sSapUnit: undefined };
 	};
 
+	var fnGetVisiblePathForFC = function (oControl) {
+		var visiblePathwithFormat = "";
+		var oParent = oControl.getParent();
+		if (oControl.getBindingPath("visible")) {
+			visiblePathwithFormat = "${" + oControl.getBindingPath("visible") + " !=0}";
+		} else if (oParent.getBindingPath("visible")) {
+			visiblePathwithFormat = "${(" + oParent.getBindingPath("visible") + " == false || " + oParent.getBindingPath("visible") + " == '' || " + oParent.getBindingPath("visible") + " == 0)}";
+		}
+		return visiblePathwithFormat;
+    };
+
 	var fnExtractDataFromDataPoint = function (item, controller) {
 		if (item.getItems().length > 1) {
 			var oDataPointData = {
@@ -116,10 +127,12 @@ sap.ui.define([
 				paths: {},
 				objectStatus: "",
 				color: "",
-				edmType: ""
+				edmType: "",
+				visiblePath: ""
 			};
 			var aControls = item.getItems();
 			oDataPointData.path = aControls[1].getBindingPath("value");
+			oDataPointData.visiblePath = fnGetVisiblePathForFC(aControls[1]);
 			if (isPotentiallySensitive(oDataPointData.path, controller)) {
 				return null;
 			}
@@ -178,11 +191,13 @@ sap.ui.define([
 				type: "PlainTextVBox",
 				label: "",
 				value: "",
-				path: ""
+				path: "",
+				visiblePath: ""
 			};
 			var aControls = item.getItems();
 			oPlainTextData.label = aControls[0].getText && aControls[0].getText();
 			oPlainTextData.path = aControls[1].getBindingPath("text");
+			oPlainTextData.visiblePath = fnGetVisiblePathForFC(aControls[1]);
 			// if (isPotentiallySensitive(oDataPointData.path, controller)) {
 			// 	return;
 			// }
@@ -218,11 +233,12 @@ sap.ui.define([
 					expand: "",
 					objectStatus: "",
 					color: "",
-					edmType: ""
+					edmType: "",
+                    visiblePath: ""
 				};
 				var aFieldControls = element.getItems();
 				oFieldData.label = aFieldControls[0].getText && aFieldControls[0].getText();
-
+				oFieldData.visiblePath = fnGetVisiblePathForFC(aFieldControls[1]);
 				if (aFieldControls[1].getText) {
 					oFieldData.path = aFieldControls[1].getBindingPath("text");
 					oFieldData.value = aFieldControls[1].getText();
@@ -604,6 +620,7 @@ sap.ui.define([
 								oFormFieldValueClone.text = fnSetPath(oField);
 								oFormFieldValueClone.color = oField.color ? oField.color : "Default";
 								oColumnClone.items.push(oFormFieldValueClone);
+								oColumnClone["$when"] = oField.visiblePath;
 								oColumnSetClone.columns.push(oColumnClone);
 							}
 							oAdaptiveCardJSON.body.push(oColumnSetClone);
@@ -616,6 +633,8 @@ sap.ui.define([
 						oFormFieldValueClone = deepClone(oFormFieldValue);
 						oFormFieldValueClone.text = fnSetPath(element);
 						oAdaptiveCardJSON.body.push(oFormFieldValueClone);
+                                                oFormTitleClone["$when"] = element.visiblePath;
+						oFormFieldValueClone["$when"] = element.visiblePath;
 						break;
 					case "DataPoint":
 						if (!oDataPointColumnSet) {
@@ -629,6 +648,7 @@ sap.ui.define([
 						oFormFieldValueClone.text = fnSetPath(element);
 						oFormFieldValueClone.color = element.color ? element.color : "Default";
 						oColumnClone.items.push(oFormFieldValueClone);
+						oColumnClone["$when"] = element.visiblePath;
 						oDataPointColumnSet.columns.push(oColumnClone);
 						break;
 					default:
@@ -735,7 +755,7 @@ sap.ui.define([
 			oAdaptiveCardJSON.body.push(oActionSetClone);
 		}
 
-		// console.log(oAdaptiveCardJSON);
+		//console.log(oAdaptiveCardJSON);
 		return oAdaptiveCardJSON;
 	};
 

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

@@ -54,6 +54,7 @@ sap.ui.define([
 	"sap/suite/ui/generic/template/lib/insights/InsightsFECardProvider",
 	"sap/ui/core/service/ServiceFactoryRegistry",
 	"sap/ui/VersionInfo",
+	"sap/m/IllustratedMessageType",
 	"sap/suite/ui/generic/template/js/RuntimeFormatters"  // just to make sure that this class is loaded
 ], function(
 	extend, 
@@ -88,7 +89,8 @@ sap.ui.define([
 	CardHelper,
 	InsightsFECardProvider,
 	ServiceFactoryRegistry,
-	VersionInfo) {
+	VersionInfo,
+	IllustratedMessageType) {
 	"use strict";
 	var	sClassName = "lib.AppComponent";
 
@@ -464,7 +466,7 @@ sap.ui.define([
 						oNavigationController.navigateToMessagePage({
 							title: getText("ST_GENERIC_ERROR_TITLE"),
 							text: getText("ST_GENERIC_ERROR_SYSTEM_UNAVAILABLE"),
-							icon: "sap-icon://message-error",
+							messageType: IllustratedMessageType.UnableToLoad,
 							description: getText("ST_GENERIC_ERROR_SYSTEM_UNAVAILABLE_DESC")
 						});
 						/* When the application's OData service's metadata document
@@ -919,7 +921,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.UIComponent
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	var oAppComponent = UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {

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

@@ -26,11 +26,9 @@ sap.ui.define(["sap/ui/base/Object",
 		"use strict";
 		
 		var GHOSTNAVIGATIONHANDLER = {
-			storeInnerAppStateWithImmediateReturn: function(){
+			storeInnerAppStateAsync: function(){
 				return {
-					promise: {
-						fail: Function.prototype
-					}
+					fail: Function.prototype
 				};
 			},
 			parseNavigation: function(){
@@ -799,7 +797,7 @@ sap.ui.define(["sap/ui/base/Object",
 			}
 
 			function fnPreloadComponent(sRouteName) {
-				oTemplateContract.oNavigationControllerProxy.preloadComponent(sRouteName);
+				return oTemplateContract.oNavigationControllerProxy.preloadComponent(sRouteName);
 			} 
 		
 			oTemplateContract.oApplicationProxy = { // inject own api for AppComponent into the Template Contract. Other classes (NavigationController, BusyHelper) will call these functions accordingly.

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

@@ -950,7 +950,13 @@ sap.ui.define(["sap/ui/base/Object",
 								}
 							)
 						);
-						oCreatePromise.then(function(oContext) {
+
+						// Load main object page (if not already done), as we will navigate there
+						// For sub-object pages this is not necessarily the case
+						var oPreloadComponentPromise = iViewLevel === 0 ? oServices.oApplication.preloadComponent(sEntitySet) : Promise.resolve();
+
+						Promise.all([oCreatePromise, oPreloadComponentPromise]).then(function (aResults) {
+							var oContext = aResults[0];
 							oServices.oApplication.markCurrentDraftAsModified();
 							var aKeys = oComponentUtils.getCurrentKeys();
 							aKeys.push(oDataModelHelper.analyseContext(oContext).key);
@@ -958,10 +964,6 @@ sap.ui.define(["sap/ui/base/Object",
 							oServices.oApplication.registerContext(oContext, iLevel, sEntitySet, aKeys);
 							fnResolve(oContext);
 						});
-
-						if (iViewLevel === 0){           // Load main object page (if not already done), as we will navigate there
-							oServices.oApplication.preloadComponent(sEntitySet);    // For subobject pages this is not necessarily the case
-						}
 					});
 				});
 			}

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

@@ -1942,7 +1942,8 @@ sap.ui.define(["sap/ui/base/Object",
 				oFileUploader.checkFileReadable().then(function() {
 					oFileUploader.upload();
 				}, function(error) {
-					sap.m.MessageToast.show("The file cannot be read. It may have changed.");
+					var sMessageText = oCommonUtils.getText("ST_STREAM_FILE_UNREADABLE");
+					oServices.oApplication.showMessageToast(sMessageText);
 				}).then(function() {
 					oFileUploader.clear();
 				});

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

@@ -63,7 +63,7 @@ sap.ui.define(["sap/ui/base/Object",
 		}
 
 		function preloadComponent(sRouteName) {
-			oComponentRegistryEntry.oTemplateContract.oNavigationControllerProxy.preloadComponent(sRouteName);
+			return oComponentRegistryEntry.oTemplateContract.oNavigationControllerProxy.preloadComponent(sRouteName);
 		}
 
 		function getTemplatePrivateGlobalModel() {
@@ -97,18 +97,22 @@ sap.ui.define(["sap/ui/base/Object",
 		// not yet created then we preload the component and once view registered, resolve to an object holding the Main Components's getText and getRootExpand methods
 		function getMainComponentUtils() {
 			var oMainTreeNode = oComponentRegistryEntry.oTemplateContract.oApplicationProxy.getAncestralNode(oTreeNode, 1);
+			var oPreloadComponentPromise = Promise.resolve();
 			if (!oMainTreeNode.componentId) { // ensure that main component is being instantiated if not already done
-				preloadComponent(oMainTreeNode.sRouteName);
-			  }
-			return oMainTreeNode.componentCreated.then(function(oComponent) {
-				var oMainRegistryEntry = oComponentRegistryEntry.oTemplateContract.componentRegistry[oComponent.getId()];
-				return oMainRegistryEntry.viewRegistered.then(function() {
-					return {
-						getText: oMainRegistryEntry.oControllerUtils.oCommonUtils.getText,
-						getRootExpand: oMainRegistryEntry.oControllerUtils.oComponentUtils.getRootExpand,
-						entitySet: oMainTreeNode.entitySet
-					};
-				});
+				oPreloadComponentPromise = preloadComponent(oMainTreeNode.sRouteName);
+			}
+			var oMainRegistryEntry;
+			return oPreloadComponentPromise.then(function () {
+				return oMainTreeNode.componentCreated;
+			}).then(function (oComponent) {
+				oMainRegistryEntry = oComponentRegistryEntry.oTemplateContract.componentRegistry[oComponent.getId()];
+				return oMainRegistryEntry.viewRegistered;
+			}).then(function () {
+				return {
+					getText: oMainRegistryEntry.oControllerUtils.oCommonUtils.getText,
+					getRootExpand: oMainRegistryEntry.oControllerUtils.oComponentUtils.getRootExpand,
+					entitySet: oMainTreeNode.entitySet
+				};
 			});
 		}
 

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

@@ -11,7 +11,7 @@ sap.ui.define([
 
 	// This helper class handles creation using dialog in the List Report
 	// In case the create with dialog is enabled in List Report it instantiates an instance of
-	// sap.suite.ui.generic.template.Listreport.controller.CreateWithDialogHandler which implements the main part of the logic
+	// sap.suite.ui.generic.template.ListReport.controller.CreateWithDialogHandler which implements the main part of the logic
 	// This class only contains the glue code which is used to adapt the services provided by  generic class to the requirements of the List Report
 
 	// oState is used as a channel to transfer data to the controller and back
@@ -22,15 +22,30 @@ sap.ui.define([
 		var oDialog, oTable;
 
 		function fnGetFilterForCurrentState(bIncludePersistenceFilter) {
+			var sDialogBindingPath = oDialog.getBindingContext().getPath();
+			var sEntitySet = "/" + oController.getOwnerComponent().getEntitySet();
+			var aFiltersOnTargetPath  = [
+				new Filter({
+					path: "aFullTargets",
+					test: function (aFullTargets) {
+						return aFullTargets.some(function(sFullTarget){
+							return sFullTarget.startsWith(sDialogBindingPath);
+						});
+					}
+				}),
+				new Filter({
+					path: "aTargets",
+					test: function (aTargets) {
+						return aTargets.includes(sEntitySet);
+					}
+				})
+			];
 			if (bIncludePersistenceFilter) {
 				return new Filter({
 					filters : [
 						new Filter("persistent", "EQ", false),
 						new Filter({
-							filters : [
-								new Filter("fullTarget", "StartsWith", oDialog.getBindingContext().getPath()),
-								new Filter("target", "EQ", "/" + oController.getOwnerComponent().getEntitySet())
-							],
+							filters : aFiltersOnTargetPath,
 							and : false
 						})
 					],
@@ -38,10 +53,7 @@ sap.ui.define([
 				});
 			} else {
 				return new Filter({
-					filters : [
-						new Filter("fullTarget", "StartsWith", oDialog.getBindingContext().getPath()),
-						new Filter("target", "EQ", "/" + oController.getOwnerComponent().getEntitySet())
-					],
+					filters : aFiltersOnTargetPath,
 					and : false
 				});
 			}
@@ -70,7 +82,8 @@ sap.ui.define([
 				oTemplateUtils.oServices.oCRUDManager.discardDraft(oDialog.getBindingContext());
 			} else {
 				fnRemoveOldMessageFromModel(oDialog);
-				oController.getView().getModel().deleteCreatedEntry(oDialog.getBindingContext());
+				var sContextPath = oDialog.getBindingContext().getPath();
+				oController.getView().getModel().resetChanges([sContextPath], undefined, true);
 			}
 			oDialog.setBindingContext(null);
 		}

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

@@ -281,13 +281,17 @@ sap.ui.define(["sap/ui/base/Object", "sap/f/FlexibleColumnLayoutSemanticHelper",
 			function fnHandleBeforeRouteMatched(oCurrentIdentity){
 				var sCurLayout = getFCLLayoutFromIdentity(oCurrentIdentity);
 				var bIsFullScreen = isFullscreenLayout(sCurLayout);
+				var aPromises = [];
+				var oHostViewPreparationPromise = null;
 				for (var oPredecessorNode = oCurrentIdentity.treeNode; oPredecessorNode.fCLLevel === 1 || oPredecessorNode.fCLLevel === 2; ){
 					oPredecessorNode = oTemplateContract.mRoutingTree[oPredecessorNode.parentRoute];
-					oNavigationControllerProxy.prepareHostView(oPredecessorNode, false, bIsFullScreen);
+					oHostViewPreparationPromise = oNavigationControllerProxy.prepareHostView(oPredecessorNode, false, bIsFullScreen);
+					aPromises.push(oHostViewPreparationPromise);
 				}
 				if (bLoadListAndFirstEntryOnStartup && oCurrentIdentity.treeNode.level === 0){ // master detail
 					var oSuccessorNode = oTemplateContract.mRoutingTree[sDetailRoute4MD];
-					oNavigationControllerProxy.prepareHostView(oSuccessorNode);
+					oHostViewPreparationPromise = oNavigationControllerProxy.prepareHostView(oSuccessorNode);
+					aPromises.push(oHostViewPreparationPromise);
 				}
 				var fnImpl = function(){ // implementation on what needs to be done. Relies on oFlexibleColumnLayoutSemanticHelper being ready to use
 					if (isMultipleColumn(oCurrentIdentity.treeNode)){
@@ -334,8 +338,11 @@ sap.ui.define(["sap/ui/base/Object", "sap/f/FlexibleColumnLayoutSemanticHelper",
 					fnImpl();
 					return Promise.resolve();
 				}
-				// During startup wait with execution of fnImpl until oFlexibleColumnLayoutSemanticHelper is ready to use
-				return oFlexibleColumnLayoutSemanticHelper.whenReady().then(function(){
+				// During startup wait with execution of fnImpl until all the promises are resolved
+				var oSemanticHelperReadyPromise = oFlexibleColumnLayoutSemanticHelper.whenReady();
+				aPromises.push(oSemanticHelperReadyPromise);
+
+				return Promise.all(aPromises).then(function(){
 					bSemanticHelperReady = true;
 					fnImpl();
 				});

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

@@ -276,17 +276,19 @@ sap.ui.define([
 			// Show messages for current context including all "property children"
 			aCurrentFilters = bIsODataBased ? [
 				new Filter(bIsNonDraftCreate ? { // in non-draft create mode the binding path does not contain the full path
-					path: "target",
-					operator: FilterOperator.StartsWith,
-					value1: sCurrentBindingPath
+					path: "aTargets",
+					test: function(aTargets){
+						return aTargets.some(function(sTarget){
+							return sTarget.startsWith(sCurrentBindingPath);
+						});
+					}
 				} : {
 					path: "aFullTargets", // there may be more than one full target identified for this message. If any of those fits we consider the message as fitting.
 					test: function(aFullTargets){
 						return aFullTargets.some(function(sFullTarget){
 							return sFullTarget.startsWith(sCurrentBindingPath);
 						});
-					},
-					caseSensitive: true
+					}
 				})
 			] : [];
 			addExternalFiltersToCurrentFilter(); //Check/add external filters

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

@@ -14,7 +14,7 @@ sap.ui.define([
 	var oMessageManager = sap.ui.getCore().getMessageManager();
 
 	// This class is implementing a facility of a message strip attached to a smart control or a accumulation of smart controls.
-	// More precisely, the class can be used in the following three different scnearios
+	// More precisely, the class can be used in the following three different scenarios
 	// - There is exactly one smart control for which the corresponding message strip should be displayed
 	// - There is exactly one smart control for which the corresponding message strip should be displayed, but the user may switch
 	//   between different views on this control. For each view a different message (resp. no message) may be shown in the message strip
@@ -28,11 +28,11 @@ sap.ui.define([
 	// not support the getDataStateIndicator() method or for which this method does not return a corresponding instance.
 	//
 	// The scenarios are unified in a way that a map mTabToGetPresentationControlHandler is passed to the constructor of this class.
-	// The keys of this map are called "tabs" and represent the differrent views (second scenario) resp. the differrent smart controls (third scenario).
+	// The keys of this map are called "tabs" and represent the different views (second scenario) resp. the different smart controls (third scenario).
 	// The corresponding value is a function that returns the corresponding smart control (identical for all in scenario 2).
 	// Note that this map is transferred to a more general map mApplicationCustomMessageInfo which has the same keys but holds an object
 	// as a value. This object has a method getPresentationControlHandler which is exactly the function named above.
-	// In adddition to this immutable member the object will have two properties which change during runtime:
+	// In addition to this immutable member the object will have two properties which change during runtime:
 	// - bindingPath: the binding path which is currently valid for the corresponding smart control
 	// - message: An instance of sap.ui.core.message.Message implementing the content of the message strip.
 	//   This property is faulty if no message should be displayed for the corresponding key.
@@ -70,8 +70,8 @@ sap.ui.define([
 			var oPresentationControlHandler = oApplicationCustomMessageInfo && oApplicationCustomMessageInfo.getPresentationControlHandler();
 			var oDataStateIndicator = oPresentationControlHandler && oPresentationControlHandler.getDataStateIndicator && oPresentationControlHandler.getDataStateIndicator();
 			if (oDataStateIndicator) {   //Only add message if there is Data state indicator to display it
-				oApplicationCustomMessageInfo.message.target = oApplicationCustomMessageInfo.bindingPath;
-				oApplicationCustomMessageInfo.message.fullTarget = oApplicationCustomMessageInfo.bindingPath;
+				oApplicationCustomMessageInfo.message.setTargets([oApplicationCustomMessageInfo.bindingPath]);
+				oApplicationCustomMessageInfo.message.aFullTargets = [oApplicationCustomMessageInfo.bindingPath];
 				oMessageManager.addMessages(oApplicationCustomMessageInfo.message);
 				oApplicationCustomMessageInfo.isAddedToMessageManager = true;
 			}
@@ -120,7 +120,7 @@ sap.ui.define([
 			}
 		}
 		
-		// Private methos that triggers a new calculation of the content of the message strip
+		// Private methods that triggers a new calculation of the content of the message strip
 		function fnRefresh(){
 			var oApplicationCustomMessageInfo = mApplicationCustomMessageInfo[sCurrentTab];
 			var oPresentationControlHandler = oApplicationCustomMessageInfo && oApplicationCustomMessageInfo.getPresentationControlHandler();

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

@@ -7,8 +7,9 @@ sap.ui.define([
 	"sap/ui/generic/app/util/MessageUtil",
 	"sap/suite/ui/generic/template/genericUtilities/controlHelper",
 	"sap/suite/ui/generic/template/genericUtilities/FeLogger",
-	"sap/suite/ui/generic/template/lib/TemplateComponent"
-], function(Event, SapCoreLibrary, IconPool, MessageToast, GenericMessageUtil, controlHelper, FeLogger, TemplateComponent) {
+	"sap/suite/ui/generic/template/lib/TemplateComponent",
+	"sap/m/IllustratedMessageType"
+], function(Event, SapCoreLibrary, IconPool, MessageToast, GenericMessageUtil, controlHelper, FeLogger, TemplateComponent, IllustratedMessageType) {
 		"use strict";
 
 		// shortcut for sap.ui.core.ValueState
@@ -195,7 +196,7 @@ sap.ui.define([
 					title: oResourceBundle.getText("ST_GENERIC_ERROR_TITLE"),
 					text: sMessageText,
 					description: sMessageDescription,
-					icon: "sap-icon://message-error",
+					messageType: IllustratedMessageType.UnableToLoad,
 					viewLevel: iViewLevel
 				});
 			} else if (!oErrorResponse.containsTransientMessage && !bShowMessagePopover){

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

@@ -1,7 +1,7 @@
 sap.ui.define(["sap/base/util/ObjectPath", "sap/ushell/ui/footerbar/AddBookmarkButton",
 	"sap/suite/ui/commons/collaboration/ServiceContainer", "sap/ui/core/CustomData", 'sap/ui/performance/trace/FESRHelper', "sap/ui/core/Component",
-	"sap/suite/ui/generic/template/lib/AdaptiveCardHelper", "sap/m/MenuItem", "sap/ui/core/Lib", "sap/suite/ui/commons/windowmessages/CollaborationMessageConsumer"
-], function (ObjectPath, AddBookmarkButton, ServiceContainer, CustomData, FESRHelper, Component, AdaptiveCardHelper, MenuItem, Library, CollaborationMessageConsumer) {
+	"sap/suite/ui/generic/template/lib/AdaptiveCardHelper", "sap/m/MenuItem", "sap/ui/core/Lib"
+], function (ObjectPath, AddBookmarkButton, ServiceContainer, CustomData, FESRHelper, Component, AdaptiveCardHelper, MenuItem, Library) {
 	"use strict";
 
 	var ShareUtils = {};
@@ -85,22 +85,12 @@ sap.ui.define(["sap/base/util/ObjectPath", "sap/ushell/ui/footerbar/AddBookmarkB
 
 		oCommonUtils.getDialogFragmentAsync("sap.suite.ui.generic.template.fragments.ShareSheet", oFragmentController, "share", ShareUtils.setStaticShareData, true).then(function (oFragment) {
 			oShareActionSheet = oFragment; 
-			var oUshellContainer = sap.ui.require("sap/ushell/Container");
 			var oShareModel = oShareActionSheet.getModel("share");
-			var that = this;
 			oFragmentController.getModelData().then(function (oFragmentModelData) {
 				oShareModel.setData(oFragmentModelData, true);
-				if (oUshellContainer && oUshellContainer.inAppRuntime()) {
-					CollaborationMessageConsumer.getProviderConfiguration().then(function(oProviderConfiguration){
-						ServiceContainer.getServiceAsyncForAppRuntime(oProviderConfiguration).then(function (oTeamsHelper) {
-							that.addMenuItem(oShareModel, oTeamsHelper, oShareActionSheet, oControlToOpenBy);
-						});
-					});
-				} else {
 					ServiceContainer.getServiceAsync().then(function (oTeamsHelper) {
 					this.addMenuItem(oShareModel, oTeamsHelper, oShareActionSheet, oControlToOpenBy);
 					}.bind(this));
-				}
 			}.bind(this));
 		}.bind(this));
 	};
@@ -180,10 +170,12 @@ sap.ui.define(["sap/base/util/ObjectPath", "sap/ushell/ui/footerbar/AddBookmarkB
 		var oServicePromise = ServiceContainer.getServiceAsync();
 		var UShellContainer = sap.ui.require("sap/ushell/Container");
 		var oUrlParserPromise = UShellContainer && UShellContainer.getServiceAsync("URLParsing");
+		var sCurrentURLPromise = getCurrentUrl();
 
-		Promise.all([oServicePromise, oUrlParserPromise]).then(function (aResults) {
+		Promise.all([oServicePromise, oUrlParserPromise, sCurrentURLPromise]).then(function (aResults) {
 			var oTeamsHelper = aResults[0];
 			var oURLParser = aResults[1];
+			var sCurrentURL = aResults[2];
 
 			var oShareModel = this.getModel("share");
 			var sAppTitle = "", sSubtitle = "";
@@ -194,7 +186,7 @@ sap.ui.define(["sap/base/util/ObjectPath", "sap/ushell/ui/footerbar/AddBookmarkB
 				sAppTitle = oShareModel.getProperty("/title");
 			}
 			var data = {
-				url: oShareModel.getProperty("/currentUrl"),
+				url: sCurrentURL,
 				appTitle: sAppTitle,
 				subTitle: sSubtitle,
 				minifyUrlForChat: true,

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

@@ -21,9 +21,10 @@ sap.ui.define(["sap/ui/core/mvc/ControllerExtension",
 		"sap/suite/ui/generic/template/genericUtilities/FeLogger",
 		"sap/base/util/deepExtend",
 		"sap/suite/ui/generic/template/lib/presentationControl/PresentationControlHandlerFactory",
-		"sap/suite/ui/generic/template/lib/info/InfoObjectHandler"
+		"sap/suite/ui/generic/template/lib/info/InfoObjectHandler",
+		"sap/m/IllustratedMessageType"
 ], function(ControllerExtension, OverrideExecution, View, ManagedObjectModel, TemplateViewController, TemplateComponent, CRUDManager, CommonUtils,
-			ComponentUtils, CommonEventHandlers, testableHelper, CommonMethods, FeLogger, deepExtend, PresentationControlHandlerFactory, InfoObjectHandler) {
+			ComponentUtils, CommonEventHandlers, testableHelper, CommonMethods, FeLogger, deepExtend, PresentationControlHandlerFactory, InfoObjectHandler, IllustratedMessageType) {
 			"use strict";
 	        var oLogger = new FeLogger("lib.TemplateAssembler").getLogger();
 
@@ -247,7 +248,8 @@ sap.ui.define(["sap/ui/core/mvc/ControllerExtension",
 							viewLevel: oComponentRegistryEntry.viewLevel,
 							title: oComponentRegistryEntry.oTemplateContract.getText("ST_ERROR"),
 							text:  oComponentRegistryEntry.oTemplateContract.getText("ST_GENERIC_UNKNOWN_NAVIGATION_TARGET"),
-							description: oError.message
+							description: oError.message,
+							messageType: IllustratedMessageType.PageNotFound
 						});
 					});
 					oComponentRegistryEntry.oControllerUtils = oTemplateUtils;

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

@@ -14,9 +14,10 @@ sap.ui.define(["sap/ui/core/library",
 	"sap/base/util/deepExtend",
 	"sap/suite/ui/generic/template/genericUtilities/CacheHelper",
 	"sap/suite/ui/generic/template/genericUtilities/FeError",
-	"sap/ui/core/mvc/XMLView"
+	"sap/ui/core/mvc/XMLView",
+	"sap/m/IllustratedMessageType"
 ], function(coreLibrary, Component, UIComponent, JSONModel, ResourceModel, Device,
-			reuseComponentHelper, CustomData, StableIdDefinition, StableIdHelper, FeLogger, AnnotationHelper, extend, deepExtend, CacheHelper, FeError, XMLView) {
+			reuseComponentHelper, CustomData, StableIdDefinition, StableIdHelper, FeLogger, AnnotationHelper, extend, deepExtend, CacheHelper, FeError, XMLView, IllustratedMessageType) {
 		"use strict";
         var	sClassName = "lib.TemplateComponent";
 	    var oLogger = new FeLogger(sClassName).getLogger();
@@ -393,7 +394,8 @@ sap.ui.define(["sap/ui/core/library",
 						var oNavigationController = oComponentRegistryEntry.oAppComponent.getNavigationController();
 						oNavigationController.navigateToMessagePage({
 							text: oComponentRegistryEntry.oTemplateContract.getText("ST_ERROR")                         ,
-							description: oError instanceof Error ? oError.message : ""
+							description: oError instanceof Error ? oError.message : "",
+							messageType: IllustratedMessageType.UnableToLoad
 						});
 						fnReject();
 					});

package/src/sap/suite/ui/generic/template/lib/i18n/i18n.properties

@@ -67,6 +67,9 @@ ST_UNSAVED_CHANGES_TITLE=Unsaved Changes
 # XTIT, 30
 ST_STREAM_OPEN_FILE=Open File
 
+#XMSG
+ST_STREAM_FILE_UNREADABLE=The file cannot be read. It may have changed.
+
 # XMSG
 ST_STREAM_TYPE_MISMATCH=Selected file type is not supported.
 

package/src/sap/suite/ui/generic/template/lib/i18n/i18n_ar.properties

@@ -43,6 +43,10 @@ ST_UNSAVED_CHANGES_TITLE=\u062A\u063A\u064A\u064A\u0631\u0627\u062A \u063A\u064A
 
 ST_STREAM_OPEN_FILE=\u0641\u062A\u062D \u0645\u0644\u0641
 
+ST_STREAM_FILE_UNREADABLE=\u0644\u0627 \u064A\u0645\u0643\u0646 \u0642\u0631\u0627\u0621\u0629 \u0627\u0644\u0645\u0644\u0641. \u0642\u062F \u064A\u0643\u0648\u0646 \u062A\u0645 \u062A\u063A\u064A\u064A\u0631\u0647.
+
+ST_STREAM_TYPE_MISMATCH=\u0646\u0648\u0639 \u0627\u0644\u0645\u0644\u0641 \u0627\u0644\u0645\u062D\u062F\u062F \u063A\u064A\u0631 \u0645\u062F\u0639\u0648\u0645.
+
 ST_DRAFT_OWNER=\u0628\u0648\u0627\u0633\u0637\u0629 {0}
 
 ST_DRAFT_ANOTHER_USER=\u0628\u0648\u0627\u0633\u0637\u0629 \u0645\u0633\u062A\u062E\u062F\u0645 \u0622\u062E\u0631
@@ -151,7 +155,7 @@ ST_GENERIC_ERROR_SYSTEM_UNAVAILABLE_FOR_ACTION=\u062A\u0639\u0630\u0631 \u062A\u
 
 ST_GENERIC_ERROR_NOT_AUTORIZED_CREATE=\u0644\u064A\u0633 \u0644\u062F\u064A\u0643 \u062A\u0641\u0648\u064A\u0636 \u0628\u0627\u0644\u0625\u0646\u0634\u0627\u0621.
 
-T_TABLE_NAVIGATION_TOO_MANY_ITEMS_SELECTED=\u064A\u0645\u0643\u0646\u0643 \u0641\u062A\u062D \u0645\u0627 \u064A\u0635\u0644 \u0625\u0644\u0649 {0} \u0641\u0642\u0637 \u0645\u0646 \u0627\u0644\u0639\u0646\u0627\u0635\u0631 \u0641\u064A \u0627\u0644\u0648\u0642\u062A \u0646\u0641\u0633\u0647.
+T_TABLE_NAVIGATION_TOO_MANY_ITEMS_SELECTED=\u064A\u0645\u0643\u0646\u0643 \u0641\u062A\u062D {0} \u0645\u0646 \u0627\u0644\u0628\u0646\u0648\u062F \u0641\u064A \u0627\u0644\u0648\u0642\u062A \u0646\u0641\u0633\u0647.
 
 ST_GENERIC_ERROR_NOT_AUTORIZED_ACTION=\u0644\u064A\u0633 \u0644\u062F\u064A\u0643 \u062A\u0641\u0648\u064A\u0636 \u0644\u0647\u0630\u0627 \u0627\u0644\u0625\u062C\u0631\u0627\u0621.
 

package/src/sap/suite/ui/generic/template/lib/i18n/i18n_bg.properties

@@ -43,6 +43,10 @@ ST_UNSAVED_CHANGES_TITLE=\u041D\u0435\u0437\u0430\u043F\u0430\u0437\u0435\u043D\
 
 ST_STREAM_OPEN_FILE=\u041E\u0442\u0432\u0430\u0440\u044F\u043D\u0435 \u043D\u0430 \u0444\u0430\u0439\u043B\u0430
 
+ST_STREAM_FILE_UNREADABLE=\u0424\u0430\u0439\u043B\u044A\u0442 \u043D\u0435 \u043C\u043E\u0436\u0435 \u0434\u0430 \u0431\u044A\u0434\u0435 \u043F\u0440\u043E\u0447\u0435\u0442\u0435\u043D. \u0412\u044A\u0437\u043C\u043E\u0436\u043D\u043E \u0435 \u0434\u0430 \u0435 \u043F\u0440\u043E\u043C\u0435\u043D\u0435\u043D.
+
+ST_STREAM_TYPE_MISMATCH=\u0418\u0437\u0431\u0440\u0430\u043D\u0438\u044F\u0442 \u0432\u0438\u0434 \u0444\u0430\u0439\u043B \u043D\u0435 \u0441\u0435 \u043F\u043E\u0434\u0434\u044A\u0440\u0436\u0430.
+
 ST_DRAFT_OWNER=\u043E\u0442 {0}
 
 ST_DRAFT_ANOTHER_USER=\u043E\u0442 \u0434\u0440\u0443\u0433 \u043F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B
@@ -151,7 +155,7 @@ ST_GENERIC_ERROR_SYSTEM_UNAVAILABLE_FOR_ACTION=\u0414\u0435\u0439\u0441\u0442\u0
 
 ST_GENERIC_ERROR_NOT_AUTORIZED_CREATE=\u041D\u044F\u043C\u0430\u0442\u0435 \u043E\u0442\u043E\u0440\u0438\u0437\u0430\u0446\u0438\u044F \u0437\u0430 \u0441\u044A\u0437\u0434\u0430\u0432\u0430\u043D\u0435.
 
-T_TABLE_NAVIGATION_TOO_MANY_ITEMS_SELECTED=\u041C\u043E\u0436\u0435\u0442\u0435 \u0434\u0430 \u043E\u0442\u0432\u043E\u0440\u0438\u0442\u0435 \u043D\u0430\u0439-\u043C\u043D\u043E\u0433\u043E {0} \u043F\u043E\u0437\u0438\u0446\u0438\u0438 \u0435\u0434\u043D\u043E\u0432\u0440\u0435\u043C\u0435\u043D\u043D\u043E.
+T_TABLE_NAVIGATION_TOO_MANY_ITEMS_SELECTED=\u041C\u043E\u0436\u0435 \u0434\u0430 \u043E\u0442\u0432\u043E\u0440\u0438\u0442\u0435 \u0441\u0430\u043C\u043E {0} \u043F\u043E\u0437\u0438\u0446\u0438\u0438 \u0435\u0434\u043D\u043E\u0432\u0440\u0435\u043C\u0435\u043D\u043D\u043E.
 
 ST_GENERIC_ERROR_NOT_AUTORIZED_ACTION=\u041D\u044F\u043C\u0430\u0442\u0435 \u043E\u0442\u043E\u0440\u0438\u0437\u0430\u0446\u0438\u044F \u0437\u0430 \u0442\u043E\u0432\u0430 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435.
 

package/src/sap/suite/ui/generic/template/lib/i18n/i18n_ca.properties

@@ -43,6 +43,10 @@ ST_UNSAVED_CHANGES_TITLE=Modificacions no desades
 
 ST_STREAM_OPEN_FILE=Obrir fitxer
 
+ST_STREAM_FILE_UNREADABLE=El fitxer no es pot llegir. Pot ser que hagi canviat.
+
+ST_STREAM_TYPE_MISMATCH=El tipus de fitxer seleccionat no \u00E9s compatible.
+
 ST_DRAFT_OWNER=per {0}
 
 ST_DRAFT_ANOTHER_USER=d'un altre usuari
@@ -151,7 +155,7 @@ ST_GENERIC_ERROR_SYSTEM_UNAVAILABLE_FOR_ACTION=No es pot executar l'acci\u00F3
 
 ST_GENERIC_ERROR_NOT_AUTORIZED_CREATE=No teniu autoritzaci\u00F3 per crear.
 
-T_TABLE_NAVIGATION_TOO_MANY_ITEMS_SELECTED=Nom\u00E9s es poden obrir com a m\u00E0xim {0} elements alhora.
+T_TABLE_NAVIGATION_TOO_MANY_ITEMS_SELECTED=Nom\u00E9s es poden obrir {0} elements alhora.
 
 ST_GENERIC_ERROR_NOT_AUTORIZED_ACTION=No teniu autoritzaci\u00F3 per a aquesta acci\u00F3
 

package/src/sap/suite/ui/generic/template/lib/i18n/i18n_cnr.properties

@@ -43,6 +43,10 @@ ST_UNSAVED_CHANGES_TITLE=Nesa\u010Duvane promjene
 
 ST_STREAM_OPEN_FILE=Otvori fajl
 
+ST_STREAM_FILE_UNREADABLE=Fajl se ne mo\u017Ee \u010Ditati. Mo\u017Eda je promijenjen.
+
+ST_STREAM_TYPE_MISMATCH=Izabrani tip fajla nije podr\u017Ean.
+
 ST_DRAFT_OWNER=izvr\u0161io {0}
 
 ST_DRAFT_ANOTHER_USER=drugi korisnik
@@ -151,7 +155,7 @@ ST_GENERIC_ERROR_SYSTEM_UNAVAILABLE_FOR_ACTION=Nije mogu\u0107e izvr\u0161iti ov
 
 ST_GENERIC_ERROR_NOT_AUTORIZED_CREATE=Nemate ovla\u0161\u0107enje za kreiranje.
 
-T_TABLE_NAVIGATION_TOO_MANY_ITEMS_SELECTED=Mo\u017Eete otvoriti najvi\u0161e {0} stavki istovremeno.
+T_TABLE_NAVIGATION_TOO_MANY_ITEMS_SELECTED=Mo\u017Eete otvoriti {0} stavki istovremeno.
 
 ST_GENERIC_ERROR_NOT_AUTORIZED_ACTION=Nemate ovla\u0161\u0107enje za ovu radnju.
 

package/src/sap/suite/ui/generic/template/lib/i18n/i18n_cs.properties

@@ -43,6 +43,10 @@ ST_UNSAVED_CHANGES_TITLE=Neulo\u017Een\u00E9 zm\u011Bny
 
 ST_STREAM_OPEN_FILE=Otev\u0159\u00EDt soubor
 
+ST_STREAM_FILE_UNREADABLE=Soubor nelze na\u010D\u00EDst. Mo\u017En\u00E1, \u017Ee se zm\u011Bnil.
+
+ST_STREAM_TYPE_MISMATCH=Vybran\u00FD typ souboru nen\u00ED podporov\u00E1n.
+
 ST_DRAFT_OWNER=z {0}
 
 ST_DRAFT_ANOTHER_USER=jin\u00E9ho u\u017Eivatele
@@ -151,7 +155,7 @@ ST_GENERIC_ERROR_SYSTEM_UNAVAILABLE_FOR_ACTION=Akci nelze prov\u00E9st.
 
 ST_GENERIC_ERROR_NOT_AUTORIZED_CREATE=Nem\u00E1te opr\u00E1vn\u011Bn\u00ED k vytvo\u0159en\u00ED.
 
-T_TABLE_NAVIGATION_TOO_MANY_ITEMS_SELECTED=Sou\u010Dasn\u011B m\u016F\u017Eete otev\u0159\u00EDt jen maxim\u00E1ln\u011B {0} polo\u017Eek.
+T_TABLE_NAVIGATION_TOO_MANY_ITEMS_SELECTED=Sou\u010Dasn\u011B m\u016F\u017Eete otev\u0159\u00EDt jen {0} polo\u017Eek.
 
 ST_GENERIC_ERROR_NOT_AUTORIZED_ACTION=Pro tuto akci nem\u00E1te opr\u00E1vn\u011Bn\u00ED.