@openui5/sap.ui.rta 1.94.0 → 1.97.0

package/src/sap/ui/rta/Utils.js

@@ -12,6 +12,9 @@ sap.ui.define([
 	"sap/ui/fl/LayerUtils",
 	"sap/ui/dt/OverlayUtil",
 	"sap/ui/dt/DOMUtil",
+	"sap/ui/dt/ElementUtil",
+	"sap/ui/dt/MetadataPropagationUtil",
+	"sap/ui/rta/util/hasStableId",
 	"sap/m/MessageBox",
 	"sap/ui/rta/util/BindingsExtractor",
 	"sap/base/util/restricted/_omit",
@@ -26,6 +29,9 @@ function(
 	FlexLayerUtils,
 	OverlayUtil,
 	DOMUtil,
+	ElementUtil,
+	MetadataPropagationUtil,
+	hasStableId,
 	MessageBox,
 	BindingsExtractor,
 	_omit,
@@ -40,7 +46,7 @@ function(
 	 * @class Utility functionality to work with controls, e.g. iterate through aggregations, find parents, etc.
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @private
 	 * @static
@@ -553,5 +559,71 @@ function(
 		}, {});
 	};
 
+	/**
+	 * Checks drop ability for aggregation overlays
+	 * @param {sap.ui.dt.Overlay} oAggregationOverlay Aggregation overlay object
+	 * @param {sap.ui.dt.ElementOverlay} oMovedOverlay Overlay being moved/added
+	 * @param {sap.ui.rta.Plugin} oPlugin RTA plugin calling this method
+	 * @param {boolean} [bOverlayNotInDom] Flag defining if overlay is not in DOM
+	 * @return {Promise.<boolean>} Promise with true value if overlay can be added to the aggregation overlay or false value if not.
+	 * @override
+	 */
+	Utils.checkTargetZone = function(oAggregationOverlay, oMovedOverlay, oPlugin, bOverlayNotInDom) {
+		function fnHasMoveAction(oAggregationOverlay, oElement, oRelevantContainer, oPlugin) {
+			var oAggregationDTMetadata = oAggregationOverlay.getDesignTimeMetadata();
+			var oMoveAction = oAggregationDTMetadata.getAction("move", oElement);
+			if (!oMoveAction) {
+				return Promise.resolve(false);
+			}
+			// moveChangeHandler information is always located on the relevant container
+			return oPlugin.hasChangeHandler(oMoveAction.changeType, oRelevantContainer);
+		}
+
+		return ElementUtil.checkTargetZone(oAggregationOverlay, oMovedOverlay, bOverlayNotInDom)
+			.then(function(bTargetZone) {
+				if (!bTargetZone) {
+					return false;
+				}
+
+				var oMovedElement = oMovedOverlay.getElement();
+				var oTargetOverlay = oAggregationOverlay.getParent();
+				var oMovedRelevantContainer = oMovedOverlay.getRelevantContainer();
+
+				// the element or the parent overlay might be destroyed or not available
+				if (!oMovedElement || !oTargetOverlay) {
+					return false;
+				}
+
+				var oTargetElement = oTargetOverlay.getElement();
+				var oAggregationDtMetadata = oAggregationOverlay.getDesignTimeMetadata();
+
+				// determine target relevantContainer
+				var vTargetRelevantContainerAfterMove = MetadataPropagationUtil.getRelevantContainerForPropagation(oAggregationDtMetadata.getData(), oMovedElement);
+				vTargetRelevantContainerAfterMove = vTargetRelevantContainerAfterMove || oTargetElement;
+
+				// check for same relevantContainer
+				if (
+					!oMovedRelevantContainer
+					|| !vTargetRelevantContainerAfterMove
+					|| !hasStableId(oTargetOverlay)
+					|| oMovedRelevantContainer !== vTargetRelevantContainerAfterMove
+				) {
+					return false;
+				}
+
+				// check if binding context is the same
+				if (
+					// binding context is not relevant if the element is being moved inside its parent
+					oMovedOverlay.getParent().getElement() !== oTargetElement
+					&& !Utils.checkSourceTargetBindingCompatibility(oMovedElement, oTargetElement)
+				) {
+					return false;
+				}
+
+				// check if movedOverlay is movable into the target aggregation
+				return fnHasMoveAction(oAggregationOverlay, oMovedElement, vTargetRelevantContainerAfterMove, oPlugin);
+			});
+	};
+
 	return Utils;
 }, /* bExport= */true);

package/src/sap/ui/rta/api/startAdaptation.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @alias module:sap/ui/rta/api/startAdaptation
 	 *
 	 * @param {object} mOptions - Object with properties
-	 * @param {sap.ui.core.Element|sap.ui.core.UIComponent} mOptions.rootControl - Control instance from where UI adaptation should be started
+	 * @param {sap.ui.core.Control|sap.ui.core.UIComponent} mOptions.rootControl - Control instance to get the AppComponent. This then is used to start UI adaptation.
 	 * @param {object} [mOptions.flexSettings] - Map with flex-related settings
 	 * @param {string} [mOptions.flexSettings.layer] - The Layer in which RTA should be started. Default: "CUSTOMER"
 	 * @param {boolean} [mOptions.flexSettings.developerMode] - Whether RTA is started in developerMode mode. Default: <code>false</code>
@@ -41,7 +41,6 @@ sap.ui.define([
 	 * @param {function} [onFailed] - Event handler function called on failed event
 	 * @param {function} [onStop] - Event handler function called on stop event
 	 * @returns {Promise} Resolves when UI adaptation was successfully started
-	 * @ui5-restricted
 	 * @public
 	 */
 	function startAdaptation(mOptions, loadPlugins, onStart, onFailed, onStop) {

package/src/sap/ui/rta/api/startKeyUserAdaptation.js

@@ -22,9 +22,9 @@ sap.ui.define([
 	 * @alias module:sap/ui/rta/api/startKeyUserAdaptation
 	 *
 	 * @param {object} mPropertyBag - Object with properties
-	 * @param {sap.ui.core.Element|sap.ui.core.UIComponent} mPropertyBag.rootControl - Control instance from where key user adaptation should be started
+	 * @param {sap.ui.core.Control|sap.ui.core.UIComponent} mPropertyBag.rootControl - Control instance to get the AppComponent. This then is used to start UI adaptation.
 	 *
-	 * @returns {Promise} Resolves when adaptation was successfully started
+	 * @returns {Promise} Resolves when UI adaptation was successfully started
 	 * @public
 	 */
 	function startKeyUserAdaptation(mPropertyBag) {

package/src/sap/ui/rta/appVariant/AppVariantDialog.js

@@ -26,6 +26,7 @@ sap.ui.define([
 	"sap/ui/model/FilterOperator",
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/rta/Utils",
+	"sap/ui/layout/form/SimpleFormLayout",
 	// needs to be preloaded for the test to work
 	"sap/ui/layout/form/ResponsiveGridLayout"
 ],
@@ -49,7 +50,8 @@ function(
 	Filter,
 	FilterOperator,
 	JSONModel,
-	RtaUtils
+	RtaUtils,
+	SimpleFormLayout
 ) {
 	"use strict";
 
@@ -143,9 +145,10 @@ function(
 		var aIcons = [];
 
 		aUI5Icons.forEach(function(sName) {
+			var iconInfo = IconPool.getIconInfo(sName);
 			aIcons.push({
-				icon: IconPool.getIconInfo(sName).uri,
-				name: sName.toLowerCase()
+				icon: iconInfo.uri,
+				name: (iconInfo.text === "") ? sName.toLowerCase() : iconInfo.text
 			});
 		});
 
@@ -220,7 +223,7 @@ function(
 	function _createSimpleForm() {
 		oSimpleForm = new SimpleForm({
 			editable: true,
-			layout: "ResponsiveGridLayout",
+			layout: SimpleFormLayout.ResponsiveGridLayout,
 			labelSpanXL: 4,
 			labelSpanL: 4,
 			labelSpanM: 4,
@@ -283,7 +286,7 @@ function(
 
 			// initialize dialog and create member variables.
 			this.setTitle(oResources.getText("CREATE_APP_VARIANT_DIALOG_TITLE"));
-			this.setContentWidth("620px");
+			this.setContentWidth("860px");
 			this.setContentHeight("250px");
 
 			oCustomTileModel = new JSONModel({

package/src/sap/ui/rta/appVariant/AppVariantManager.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @constructor
 	 * @private
 	 * @since 1.53
@@ -46,10 +46,6 @@ sap.ui.define([
 		}
 	});
 
-	/**
-	 * Opens the 'Save As' dialog.
-	 * @private
-	 */
 	AppVariantManager.prototype._openDialog = function(fnCreate, fnCancel) {
 		var oDialog = new AppVariantDialog("appVariantDialog");
 
@@ -83,6 +79,7 @@ sap.ui.define([
 	/**
 	 *
 	 * @param {Object} oAppVariantSpecificData - Contains the specific info needed to create the inline changes for the app variant
+	 * @param {sap.ui.fl.Selector} vSelector - Managed object or selector object
 	 * @returns {Promise[]} returns all the descriptor inline changes
 	 * @description Creates all the descriptor inline changes for different change types.
 	 */
@@ -108,29 +105,36 @@ sap.ui.define([
 		aAllInlineChangeOperations.push(AppVariantUtils.createInlineChange(oPropertyChange, "appdescr_ui_setIcon", vSelector));
 
 		/***********************************************************Inbounds handling******************************************************************/
-		var oInboundInfo = AppVariantUtils.getInboundInfo(oAppVariantSpecificData.inbounds);
-		var sCurrentRunningInboundId = oInboundInfo.currentRunningInbound;
+		return AppVariantUtils.getInboundInfo(oAppVariantSpecificData.inbounds)
+			.then(function(oInboundInfo) {
+				var sCurrentRunningInboundId = oInboundInfo.currentRunningInbound;
 
-		// If there is no inbound, create a new inbound
-		if (oInboundInfo.addNewInboundRequired) {
-			// create a inline change using a change type 'appdescr_app_addNewInbound'
-			oPropertyChange = AppVariantUtils.prepareAddNewInboundChange(sCurrentRunningInboundId, sAppVariantId, oAppVariantSpecificData);
-			aAllInlineChangeOperations.push(AppVariantUtils.createInlineChange(oPropertyChange, "appdescr_app_addNewInbound", vSelector));
+				// If there is no inbound, create a new inbound
+				if (oInboundInfo.addNewInboundRequired) {
+					// create a inline change using a change type 'appdescr_app_addNewInbound'
+					var oInlineChangePromise = AppVariantUtils.prepareAddNewInboundChange(sCurrentRunningInboundId, sAppVariantId, oAppVariantSpecificData)
+						.then(function(oPropertyChange) {
+							return AppVariantUtils.createInlineChange(oPropertyChange, "appdescr_app_addNewInbound", vSelector);
+						});
 
-			// create a inline change using a change type 'appdescr_app_removeAllInboundsExceptOne'
-			oPropertyChange = AppVariantUtils.prepareRemoveAllInboundsExceptOneChange(sCurrentRunningInboundId);
-			aAllInlineChangeOperations.push(AppVariantUtils.createInlineChange(oPropertyChange, "appdescr_app_removeAllInboundsExceptOne", vSelector));
-		} else {
-			// create a inline change using a change type 'appdescr_app_changeInbound'
-			oPropertyChange = AppVariantUtils.prepareChangeInboundChange(sCurrentRunningInboundId, sAppVariantId, oAppVariantSpecificData);
-			aAllInlineChangeOperations.push(AppVariantUtils.createInlineChange(oPropertyChange, "appdescr_app_changeInbound", vSelector));
-		}
+					aAllInlineChangeOperations.push(oInlineChangePromise);
 
-		return Promise.all(aAllInlineChangeOperations);
+					// create a inline change using a change type 'appdescr_app_removeAllInboundsExceptOne'
+					oPropertyChange = AppVariantUtils.prepareRemoveAllInboundsExceptOneChange(sCurrentRunningInboundId);
+					aAllInlineChangeOperations.push(AppVariantUtils.createInlineChange(oPropertyChange, "appdescr_app_removeAllInboundsExceptOne", vSelector));
+				} else {
+					// create a inline change using a change type 'appdescr_app_changeInbound'
+					oPropertyChange = AppVariantUtils.prepareChangeInboundChange(sCurrentRunningInboundId, sAppVariantId, oAppVariantSpecificData);
+					aAllInlineChangeOperations.push(AppVariantUtils.createInlineChange(oPropertyChange, "appdescr_app_changeInbound", vSelector));
+				}
+
+				return Promise.all(aAllInlineChangeOperations);
+			});
 	};
 
 	/**
 	 * @param {String} sAppVariantId - Application variant ID
+	 * @param {sap.ui.fl.Selector} vSelector - Selector
 	 * @returns {Promise} Resolved promise
 	 * @description Creates the app variant with all inline changes in backend.
 	 */
@@ -182,6 +186,7 @@ sap.ui.define([
 
 	/**
 	 * Dirty changes get taken over by the app variant.
+	 * @returns {Promise} Resolves as soon as the command stack is cleared
 	 * @private
 	 */
 	AppVariantManager.prototype._clearRTACommandStack = function() {
@@ -224,7 +229,7 @@ sap.ui.define([
 	/**
 	 *
 	 * @param {String} sIamId - Identity Access Management ID of SAP Fiori app
-	 * @param {String} sAppVariantId - Application variant ID
+	 * @param {String} sAppVarId - Application variant ID
 	 * @param {Boolean} bCreation - Indicates that app is being created
 	 * @returns {Promise} Resolved promise
 	 * @description When the app variant creation/deletion and catalog assignment/unassignment are executed successfully, this asynchronous process gets triggered. It talks to the server every 2.5 secs.

package/src/sap/ui/rta/appVariant/AppVariantUtils.js

@@ -4,8 +4,6 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-/* global XMLHttpRequest */
-
 sap.ui.define([
 	"sap/ui/fl/Utils",
 	"sap/m/MessageBox",
@@ -16,8 +14,7 @@ sap.ui.define([
 	"sap/ui/fl/write/api/PersistenceWriteAPI",
 	"sap/ui/fl/write/api/AppVariantWriteAPI",
 	"sap/ui/fl/write/api/ChangesWriteAPI"
-],
-function(
+], function(
 	FlexUtils,
 	MessageBox,
 	RtaUtils,
@@ -167,43 +164,48 @@ function(
 		if (!oInbounds) {
 			oInboundInfo.currentRunningInbound = "customer.savedAsAppVariant";
 			oInboundInfo.addNewInboundRequired = true;
-			return oInboundInfo;
-		}
-
-		var oParsedHash = FlexUtils.getParsedURLHash();
-		var aInbounds = Object.keys(oInbounds);
-		var aInboundsFound = [];
-
-		// This will only happen if app variants are created on top of app variants
-		if (aInbounds.length === 1 && aInbounds[0] === "customer.savedAsAppVariant") {
-			return {
-				currentRunningInbound: "customer.savedAsAppVariant",
-				addNewInboundRequired: false
-			};
+			return Promise.resolve(oInboundInfo);
 		}
 
-		aInbounds.forEach(function(sInboundId) {
-			if ((oInbounds[sInboundId].action === oParsedHash.action) && (oInbounds[sInboundId].semanticObject === oParsedHash.semanticObject)) {
-				aInboundsFound.push(sInboundId);
-			}
-		});
+		return FlexUtils.getUShellService("URLParsing")
+			.then(function(oURLParsingService) {
+				return FlexUtils.getParsedURLHash(oURLParsingService);
+			})
+			.then(function(oParsedHash) {
+				var aInbounds = Object.keys(oInbounds);
+				var aInboundsFound = [];
+
+				// This will only happen if app variants are created on top of app variants
+				if (aInbounds.length === 1 && aInbounds[0] === "customer.savedAsAppVariant") {
+					return {
+						currentRunningInbound: "customer.savedAsAppVariant",
+						addNewInboundRequired: false
+					};
+				}
 
-		switch (aInboundsFound.length) {
-			case 0:
-				oInboundInfo.currentRunningInbound = "customer.savedAsAppVariant";
-				oInboundInfo.addNewInboundRequired = true;
-				break;
-			case 1:
-				oInboundInfo.currentRunningInbound = aInboundsFound[0];
-				oInboundInfo.addNewInboundRequired = false;
-				break;
-			default:
-				oInboundInfo.currentRunningInbound = "customer.savedAsAppVariant";
-				oInboundInfo.addNewInboundRequired = true;
-				break;
-		}
+				aInbounds.forEach(function(sInboundId) {
+					if ((oInbounds[sInboundId].action === oParsedHash.action) && (oInbounds[sInboundId].semanticObject === oParsedHash.semanticObject)) {
+						aInboundsFound.push(sInboundId);
+					}
+				});
+
+				switch (aInboundsFound.length) {
+					case 0:
+						oInboundInfo.currentRunningInbound = "customer.savedAsAppVariant";
+						oInboundInfo.addNewInboundRequired = true;
+						break;
+					case 1:
+						oInboundInfo.currentRunningInbound = aInboundsFound[0];
+						oInboundInfo.addNewInboundRequired = false;
+						break;
+					default:
+						oInboundInfo.currentRunningInbound = "customer.savedAsAppVariant";
+						oInboundInfo.addNewInboundRequired = true;
+						break;
+				}
 
-		return oInboundInfo;
+				return oInboundInfo;
+			});
 	};
 
 	AppVariantUtils.getInboundPropertiesKey = function(sAppVariantId, sCurrentRunningInboundId, sPropertyName) {
@@ -230,47 +232,60 @@ function(
 		};
 	};
 
+	/**
+	 * Collects the inbound properties and adds to the change content
+	 *
+	 * @param {string} sCurrentRunningInboundId - Identifier of current running inbound
+	 * @param {string} sAppVariantId - App Variant Identifier
+	 * @param {object} oAppVariantSpecificData - App Variant specific data (e.g. reference App Id)
+	 * @returns {Promise<object>} resolving to property object containing inbound properties
+	 */
 	AppVariantUtils.prepareAddNewInboundChange = function(sCurrentRunningInboundId, sAppVariantId, oAppVariantSpecificData) {
-		var oParsedHash = FlexUtils.getParsedURLHash();
-		var oProperty = {
-			content: {
-				inbound: {}
-			},
-			texts: {}
-		};
-
-		var sInboundTitleKey = this.getInboundPropertiesKey(oAppVariantSpecificData.referenceAppId, sCurrentRunningInboundId, "title");
-		var sInboundSubTitleKey = this.getInboundPropertiesKey(oAppVariantSpecificData.referenceAppId, sCurrentRunningInboundId, "subTitle");
+		return FlexUtils.getUShellService("URLParsing")
+			.then(function(oURLParsingService) {
+				return FlexUtils.getParsedURLHash(oURLParsingService);
+			})
+			.then(function(oParsedHash) {
+				var oProperty = {
+					content: {
+						inbound: {}
+					},
+					texts: {}
+				};
 
-		// Filling change content
-		oProperty.content.inbound[sCurrentRunningInboundId] = {
-			semanticObject: oParsedHash.semanticObject,
-			action: oParsedHash.action,
-			title: "{{" + sInboundTitleKey + "}}",
-			subTitle: "{{" + sInboundSubTitleKey + "}}",
-			icon: oAppVariantSpecificData.icon,
-			signature: {
-				parameters: {
-					"sap-appvar-id": {
-						required: true,
-						filter: {
-							value: sAppVariantId,
-							format: "plain"
+				var sInboundTitleKey = this.getInboundPropertiesKey(oAppVariantSpecificData.referenceAppId, sCurrentRunningInboundId, "title");
+				var sInboundSubTitleKey = this.getInboundPropertiesKey(oAppVariantSpecificData.referenceAppId, sCurrentRunningInboundId, "subTitle");
+
+				// Filling change content
+				oProperty.content.inbound[sCurrentRunningInboundId] = {
+					semanticObject: oParsedHash.semanticObject,
+					action: oParsedHash.action,
+					title: "{{" + sInboundTitleKey + "}}",
+					subTitle: "{{" + sInboundSubTitleKey + "}}",
+					icon: oAppVariantSpecificData.icon,
+					signature: {
+						parameters: {
+							"sap-appvar-id": {
+								required: true,
+								filter: {
+									value: sAppVariantId,
+									format: "plain"
+								},
+								launcherValue: {
+									value: sAppVariantId
+								}
+							}
 						},
-						launcherValue: {
-							value: sAppVariantId
-						}
+						additionalParameters: "ignored"
 					}
-				},
-				additionalParameters: "ignored"
-			}
-		};
+				};
 
-		// Filling change texts
-		oProperty.texts[sInboundTitleKey] = this.prepareTextsChange("title", oAppVariantSpecificData.title);
-		oProperty.texts[sInboundSubTitleKey] = this.prepareTextsChange("subTitle", oAppVariantSpecificData.subTitle);
+				// Filling change texts
+				oProperty.texts[sInboundTitleKey] = this.prepareTextsChange("title", oAppVariantSpecificData.title);
+				oProperty.texts[sInboundSubTitleKey] = this.prepareTextsChange("subTitle", oAppVariantSpecificData.subTitle);
 
-		return oProperty;
+				return oProperty;
+			}.bind(this));
 	};
 
 	AppVariantUtils.prepareChangeInboundChange = function(sCurrentRunningInboundId, sAppVariantId, oAppVariantSpecificData) {
@@ -462,9 +477,6 @@ function(
 		};
 	};
 
-	/**
-	 * Builds the final success message on S/4HANA Cloud.
-	 */
 	AppVariantUtils.buildFinalSuccessInfoS4HANACloud = function() {
 		var sMessage = AppVariantUtils.getText("MSG_SAVE_APP_VARIANT_NEW_TILE_AVAILABLE");
 		return { text: sMessage	};
@@ -546,18 +558,29 @@ function(
 
 	/**
 	 * Navigates to the Fiorilaunchpad
+	 * @returns {Promise} resolving when the navigation is triggered if ushell is available
 	 */
 	AppVariantUtils.navigateToFLPHomepage = function() {
-		var oApplication = sap.ushell.services.AppConfiguration.getCurrentApplication();
-		var oComponentInstance = oApplication.componentHandle.getInstance();
-
-		if (oComponentInstance) {
-			FlexUtils.ifUShellContainerThen(function(aServices) {
-				var oCrossAppNav = aServices[0];
-				if (oCrossAppNav && oCrossAppNav.toExternal) {
-					oCrossAppNav.toExternal({target: {shellHash: "#"}}, oComponentInstance);
-				}
-			}, ["CrossApplicationNavigation"]);
+		var oUshellContainer = FlexUtils.getUshellContainer();
+		var oComponentInstance;
+		if (oUshellContainer) {
+			return oUshellContainer.getServiceAsync("AppConfiguration")
+				.then(function(oAppConfiguration) {
+					var oApplication = oAppConfiguration.getCurrentApplication();
+					oComponentInstance = oApplication.componentHandle.getInstance();
+					if (oComponentInstance) {
+						return oUshellContainer.getServiceAsync("CrossApplicationNavigation");
+					}
+					return undefined;
+				})
+				.then(function(oCrossAppNav) {
+					if (oCrossAppNav && oCrossAppNav.toExternal) {
+						oCrossAppNav.toExternal({target: {shellHash: "#"}}, oComponentInstance);
+					}
+				})
+				.catch(function(vError) {
+					throw new Error("Error navigating to FLP Homepage: " + vError);
+				});
 		}
 		return Promise.resolve();
 	};

package/src/sap/ui/rta/appVariant/Feature.js

@@ -168,23 +168,16 @@ sap.ui.define([
 			if (oDescriptor["sap.app"] && oDescriptor["sap.app"].id) {
 				return FeaturesAPI.isSaveAsAvailable(sCurrentLayer).then(function(bIsSaveAsAvailable) {
 					if (bIsSaveAsAvailable) {
-						var oInboundInfo;
-
 						if (oDescriptor["sap.app"].crossNavigation && oDescriptor["sap.app"].crossNavigation.inbounds) {
-							oInboundInfo = AppVariantUtils.getInboundInfo(oDescriptor["sap.app"].crossNavigation.inbounds);
-						} else {
-							oInboundInfo = AppVariantUtils.getInboundInfo();
-						}
-
-						if (oInboundInfo) {
-							return true;
+							return AppVariantUtils.getInboundInfo(oDescriptor["sap.app"].crossNavigation.inbounds);
 						}
+						return AppVariantUtils.getInboundInfo();
 					}
-
-					return false;
+					return undefined;
+				}).then(function(oInboundInfo) {
+					return !!oInboundInfo;
 				});
 			}
-
 			return Promise.resolve(false);
 		},
 		/**

package/src/sap/ui/rta/appVariant/S4HanaCloudBackend.js

@@ -143,7 +143,8 @@ sap.ui.define([
 	/**
 	 * Polls the OData model to check catalog publishing status of the given IAM app ID.
 	 *
-	 * @param  {string} sIamAppId Identity Access Management ID of SAP Fiori app
+	 * @param {string} sIamAppId - Identity Access Management ID of SAP Fiori app
+	 * @param {boolean} bAppVarCreation - Indicates if it's a creation scenario
 	 * @return {Promise<boolean>} Promise delivering a boolean value
 	 * @async
 	 */

package/src/sap/ui/rta/appVariant/Utils.js

@@ -6,6 +6,7 @@
 sap.ui.define([
 	"sap/ui/rta/appVariant/AppVariantUtils",
 	"sap/ui/fl/registry/Settings",
+	"sap/ui/fl/Utils",
 	"sap/base/i18n/ResourceBundle",
 	"sap/ui/fl/write/api/AppVariantWriteAPI",
 	"sap/ui/core/IconPool"
@@ -13,6 +14,7 @@ sap.ui.define([
 function(
 	AppVariantUtils,
 	Settings,
+	FlUtils,
 	ResourceBundle,
 	AppVariantWriteAPI,
 	IconPool
@@ -27,8 +29,14 @@ function(
 	});
 
 	Utils._checkNavigationSupported = function(oNavigationParams) {
-		var oNavigationService = sap.ushell.Container.getService("CrossApplicationNavigation");
-		return oNavigationService.getLinks(oNavigationParams);
+		var oUShellContainer = FlUtils.getUshellContainer();
+		return oUShellContainer.getServiceAsync("CrossApplicationNavigation")
+			.then(function(oNavigationService) {
+				return oNavigationService.getLinks(oNavigationParams);
+			})
+			.catch(function(vError) {
+				throw new Error("Error retrieving ushell service CrossApplicationNavigation: " + vError);
+			});
 	};
 
 	Utils._checkAppType = function(bOriginalApp, bAppVariant) {