@openui5/sap.ui.rta 1.114.0 → 1.114.1

package/src/sap/ui/rta/toolbar/Adaptation.js

@@ -7,7 +7,6 @@
 sap.ui.define([
 	"./AdaptationRenderer",
 	"sap/base/Log",
-	"sap/m/MessageBox",
 	"sap/ui/core/BusyIndicator",
 	"sap/ui/core/Fragment",
 	"sap/ui/core/Popup",
@@ -15,18 +14,17 @@ sap.ui.define([
 	"sap/ui/fl/write/api/ContextBasedAdaptationsAPI",
 	"sap/ui/fl/write/api/Version",
 	"sap/ui/model/json/JSONModel",
-	"sap/ui/model/resource/ResourceModel",
 	"sap/ui/rta/appVariant/Feature",
 	"sap/ui/rta/toolbar/Base",
 	"sap/ui/rta/toolbar/contextBased/ManageAdaptations",
 	"sap/ui/rta/toolbar/contextBased/SaveAsAdaptation",
 	"sap/ui/rta/toolbar/translation/Translation",
 	"sap/ui/rta/toolbar/versioning/Versioning",
-	"sap/ui/rta/Utils"
+	"sap/ui/rta/Utils",
+	"sap/m/MessageBox"
 ], function(
 	AdaptationRenderer,
 	Log,
-	MessageBox,
 	BusyIndicator,
 	Fragment,
 	Popup,
@@ -34,14 +32,14 @@ sap.ui.define([
 	ContextBasedAdaptationsAPI,
 	Version,
 	JSONModel,
-	ResourceModel,
 	AppVariantFeature,
 	Base,
 	ManageAdaptations,
 	SaveAsAdaptation,
 	Translation,
 	Versioning,
-	Utils
+	Utils,
+	MessageBox
 ) {
 	"use strict";
 
@@ -53,7 +51,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.toolbar.Base
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.1
 	 *
 	 * @constructor
 	 * @private
@@ -351,16 +349,85 @@ sap.ui.define([
 		AppVariantFeature.onSaveAs(true, true, this.getRtaInformation().flexSettings.layer, null);
 	}
 
+	function confirmMigration(oRtaInformation) {
+		var bDirty = oRtaInformation.commandStack.canSave();
+
+		Utils.showMessageBox("confirm", (bDirty) ? "DAC_DIALOG_MIGRATION_DIRTY_DESCRIPTION" : "DAC_DIALOG_MIGRATION_DESCRIPTION", {
+			titleKey: "DAC_DIALOG_MIGRATION_HEADER",
+			actionKeys: ["DAC_DIALOG_MIGRATION_HEADER"],
+			showCancel: true
+		})
+		.then(function(sAction) {
+			if (sAction !== MessageBox.Action.CANCEL) {
+				BusyIndicator.show();
+
+				if (bDirty) {
+					oRtaInformation.commandStack.removeAllCommands(true);
+				}
+
+				ContextBasedAdaptationsAPI.migrate({
+					control: oRtaInformation.rootControl,
+					layer: oRtaInformation.flexSettings.layer
+				})
+				.finally(function() {
+					BusyIndicator.hide();
+				})
+				.then(Utils.showMessageBox.bind(undefined, "information", "DAC_DIALOG_MIGRATION_SUCCESSFULL_DESCRIPTION", {
+					titleKey: "DAC_DIALOG_MIGRATION_HEADER"
+				}))
+				.then(function() {
+					return new Promise(function(resolve) {
+						this.fireEvent("switchAdaptation", {adaptationId: "DEFAULT", callback: resolve});
+					}.bind(this));
+				}.bind(this))
+				.catch(function(oError) {
+					Log.error(oError.stack || oError);
+					var sMessage = "DAC_DIALOG_MIGRATION_ERROR_DESCRIPTION";
+					var oOptions = {
+						titleKey: "DAC_DIALOG_MIGRATION_HEADER",
+						details: oError.userMessage || oError
+					};
+					Utils.showMessageBox("error", sMessage, oOptions);
+				});
+			}
+		}.bind(this));
+	}
+
 	function onSaveAsAdaptation() {
-		this.getExtension("contextBasedSaveAs", SaveAsAdaptation).openAddAdaptationDialog(this.getRtaInformation().flexSettings.layer);
+		var oRtaInformation = this.getRtaInformation();
+		Utils.checkDraftOverwrite(this.getModel("versions")).then(function() {
+			return ContextBasedAdaptationsAPI.canMigrate({ control: oRtaInformation.rootControl, layer: oRtaInformation.flexSettings.layer });
+		}).then(function(bCanMigrate) {
+			if (bCanMigrate) {
+				confirmMigration.call(this, oRtaInformation);
+			} else {
+				this.getExtension("contextBasedSaveAs", SaveAsAdaptation).openAddAdaptationDialog(oRtaInformation.flexSettings.layer);
+			}
+		}.bind(this))
+		.catch(handleError);
 	}
 
 	function onEditAdaptation() {
-		this.getExtension("contextBasedSaveAs", SaveAsAdaptation).openAddAdaptationDialog(this.getRtaInformation().flexSettings.layer, true /*bIsEditMode*/);
+		Utils.checkDraftOverwrite(this.getModel("versions"))
+		.then(function() {
+			this.getExtension("contextBasedSaveAs", SaveAsAdaptation).openAddAdaptationDialog(this.getRtaInformation().flexSettings.layer, true /*bIsEditMode*/);
+		}.bind(this))
+		.catch(handleError);
+	}
+
+	function handleError(oError) {
+		if (oError !== "cancel") {
+			Utils.showMessageBox("error", "MSG_LREP_TRANSFER_ERROR", {error: oError});
+			Log.error("sap.ui.rta: " + oError.stack || oError.message || oError);
+		}
 	}
 
 	function onDeleteAdaptation() {
-		this.fireEvent("deleteAdaptation");
+		Utils.checkDraftOverwrite(this.getModel("versions"))
+		.then(function() {
+			this.fireEvent("deleteAdaptation");
+		}.bind(this))
+		.catch(handleError);
 	}
 
 	function onManageAdaptations() {
@@ -374,7 +441,7 @@ sap.ui.define([
 	function formatAdaptationsMenuText(iCount, sTitle) {
 		if (iCount > 0) {
 			if (sTitle === "") {
-				sTitle = this.getTextResources().getText("TXT_DEFAULT_APP");
+				return this.getTextResources().getText("TXT_DEFAULT_APP");
 			}
 			return this.getTextResources().getText("BTN_ADAPTING_FOR", sTitle);
 		}

package/src/sap/ui/rta/toolbar/Base.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.m.HBox
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/Fiori.js

@@ -32,7 +32,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Adaptation
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/FioriLike.js

@@ -20,7 +20,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Adaptation
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/OverflowToolbarButton.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.m.OverflowToolbarButton
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/Personalization.js

@@ -22,7 +22,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Base
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/Standalone.js

@@ -20,7 +20,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Adaptation
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/contextBased/ManageAdaptations.js

@@ -77,7 +77,9 @@ function(
 					moveDown: moveDown.bind(this),
 					onDropSelectedAdaptation: onDropSelectedAdaptation.bind(this),
 					onSaveReorderedAdaptations: onSaveReorderedAdaptations.bind(this),
-					onClose: onCloseDialog.bind(this)
+					isAdaptationsSelected: isAdaptationsSelected.bind(this),
+					getIndexOfSelectedAdaptation: getIndexOfSelectedAdaptation.bind(this),
+					onCancel: onCancelDialog.bind(this)
 				}
 			}).then(function(oDialog) {
 				this._oManageAdaptationDialog = oDialog;
@@ -85,7 +87,7 @@ function(
 				this.getToolbar().addDependent(this._oManageAdaptationDialog);
 			}.bind(this));
 		} else {
-			setEnabledPropertyOfMoveButton.call(this, false);
+			syncEnabledPropertyOfMoveButtons.call(this);
 			enableDragAndDropForAdaptationTable.call(this, true);
 			enableSaveButton.call(this, false);
 		}
@@ -97,6 +99,7 @@ function(
 			this.oAdaptationsModel = ContextBasedAdaptationsAPI.getAdaptationsModel({control: this._oRtaInformation.rootControl, layer: this._oRtaInformation.flexSettings.layer});
 			this.oAdaptationsModel.updateAdaptations(oAdaptations.adaptations);
 			this.oReferenceAdaptationsData = JSON.parse(JSON.stringify(this.oAdaptationsModel.getProperty("/adaptations")));
+			this._oOriginAdaptationsData = JSON.parse(JSON.stringify(this.oAdaptationsModel.getProperty("/allAdaptations")));
 			this._oControlConfigurationModel = new JSONModel({isTableItemSelected: false});
 			this._oManageAdaptationDialog.setModel(this.oAdaptationsModel, "contextBased");
 			this._oManageAdaptationDialog.setModel(this._oControlConfigurationModel, "controlConfiguration");
@@ -127,26 +130,36 @@ function(
 		var oOptions = {
 			year: "numeric",
 			month: "short",
-			day: "numeric"
+			day: "numeric",
+			hour: "numeric",
+			minute: "numeric"
 		};
 		var sLanguage = sap.ui.getCore().getConfiguration().getLanguage();
-		return sModifiedBy + "\n" + oUi5Date.toLocaleDateString(sLanguage, oOptions);
+		return sModifiedBy + "\n" + oUi5Date.toLocaleTimeString(sLanguage, oOptions);
 	}
 
 	function onSelectionChange(oEvent) {
 		if (oEvent.getParameter("selected") === true) {
 			this._oControlConfigurationModel.setProperty("/isTableItemSelected", true);
-			if (isSearchFieldValueEmpty.call(this)) {
-				setEnabledPropertyOfMoveButton.call(this, true);
-			}
+			syncEnabledPropertyOfMoveButtons.call(this);
 		}
 	}
 
-	function setEnabledPropertyOfMoveButton(bIsEnabled) {
+	function syncEnabledPropertyOfMoveButtons() {
 		var oUpButton = getControlInDialog.call(this, "moveUpButton");
 		var oDownButton = getControlInDialog.call(this, "moveDownButton");
-		oUpButton.setEnabled(bIsEnabled);
-		oDownButton.setEnabled(bIsEnabled);
+		if (isSearchFieldValueEmpty.call(this)) {
+			if (isAdaptationsSelected.call(this)) {
+				oUpButton.setEnabled(getIndexOfSelectedAdaptation.call(this) > 0);
+				oDownButton.setEnabled(getIndexOfSelectedAdaptation.call(this) < this.oAdaptationsModel.getProperty("/count") - 1);
+			} else {
+				oUpButton.setEnabled(false);
+				oDownButton.setEnabled(false);
+			}
+		} else {
+			oUpButton.setEnabled(false);
+			oDownButton.setEnabled(false);
+		}
 	}
 
 	// ------ search field ------
@@ -157,7 +170,7 @@ function(
 		var oDefaultApplicationTable = getDefaultApplicationTable.call(this);
 		var sDefaultTableText = getDefaultApplicationTitle.call(this);
 		if (sQuery && sQuery.length > 0) {
-			setEnabledPropertyOfMoveButton.call(this, false);
+			syncEnabledPropertyOfMoveButtons.call(this);
 			enableDragAndDropForAdaptationTable.call(this, false);
 			//filter Table context
 			var oFilterByTitle = new Filter("title", FilterOperator.Contains, sQuery);
@@ -181,7 +194,7 @@ function(
 		} else {
 			enableDragAndDropForAdaptationTable.call(this, true);
 			if (this._oControlConfigurationModel.getProperty("/isTableItemSelected")) {
-				setEnabledPropertyOfMoveButton.call(this, true);
+				syncEnabledPropertyOfMoveButtons.call(this);
 			}
 			oDefaultApplicationTable.setVisible(true);
 		}
@@ -235,6 +248,7 @@ function(
 		// after move select the sibling
 		oTable.getItems()[iSiblingItemIndex].setSelected(true).focus();
 		enableSaveButton.call(this, didAdaptationsPriorityChange.call(this));
+		syncEnabledPropertyOfMoveButtons.call(this);
 	}
 
 	function onDropSelectedAdaptation(oEvent) {
@@ -279,8 +293,8 @@ function(
 
 	function didAdaptationsPriorityChange() {
 		return !_isEqual(
-			this.oAdaptationsModel.getProperty("/adaptations").map(function(oAdapation) { return oAdapation.id; }),
-			this.oReferenceAdaptationsData.map(function(oAdapation) { return oAdapation.id; })
+			this.oAdaptationsModel.getProperty("/adaptations").map(function(oAdaptation) { return oAdaptation.id; }),
+			this.oReferenceAdaptationsData.map(function(oAdaptation) { return oAdaptation.id; })
 		);
 	}
 
@@ -318,19 +332,42 @@ function(
 		getAdaptationsTable.call(this).getDragDropConfig()[0].setEnabled(bIsEnabled);
 	}
 
+	function isAdaptationsSelected() {
+		var oAdaptationsTable = getAdaptationsTable.call(this);
+		return oAdaptationsTable.getSelectedContextPaths().length > 0;
+	}
+
+	function getIndexOfSelectedAdaptation() {
+		var oAdaptationsTable = getAdaptationsTable.call(this);
+		if (oAdaptationsTable.getSelectedContextPaths().length > 0) {
+			var aSplitedPath = oAdaptationsTable.getSelectedContextPaths()[0].split("/");
+			var iIndexOfSelectedItem = Number(aSplitedPath[aSplitedPath.length - 1]);
+			return iIndexOfSelectedItem;
+		}
+		return -1;
+	}
+
 	function onSaveReorderedAdaptations() {
-		var oRtaInformation = this.getToolbar().getRtaInformation();
-		var aAdaptationPriorities = this.oAdaptationsModel.getProperty("/adaptations").map(function(oAdaptation) { return oAdaptation.id; });
-		ContextBasedAdaptationsAPI.reorder({control: oRtaInformation.rootControl, layer: oRtaInformation.flexSettings.layer, parameters: {priorities: aAdaptationPriorities}})
+		Utils.checkDraftOverwrite(this.getToolbar().getModel("versions")).then(function() {
+			var oRtaInformation = this.getToolbar().getRtaInformation();
+			var aAdaptationPriorities = this.oAdaptationsModel.getProperty("/adaptations").map(function(oAdaptation) { return oAdaptation.id; });
+			return ContextBasedAdaptationsAPI.reorder({control: oRtaInformation.rootControl, layer: oRtaInformation.flexSettings.layer, parameters: {priorities: aAdaptationPriorities}});
+		}.bind(this)).then(function() {
+			var oAllUpdatedAdaptations = Object.assign(this.oAdaptationsModel.getProperty("/allAdaptations"), this.oAdaptationsModel.getProperty("/adaptations"));
+			this.oAdaptationsModel.updateAdaptations(oAllUpdatedAdaptations);
+			onCloseDialog.call(this);
+		}.bind(this))
 		.catch(function(oError) {
-			Log.error(oError.stack);
-			var sMessage = "MSG_LREP_TRANSFER_ERROR";
-			var oOptions = { titleKey: "BTN_MANAGE_APP_CTX" };
-			oOptions.details = oError.userMessage;
-			Utils.showMessageBox("error", sMessage, oOptions);
+			if (oError !== "cancel") {
+				Utils.showMessageBox("error", "MSG_LREP_TRANSFER_ERROR", { titleKey: "BTN_MANAGE_APP_CTX", error: oError});
+				Log.error("sap.ui.rta: " + oError.stack || oError.message || oError);
+			}
 		});
-		var oAllUpdatedAdaptations = Object.assign(this.oAdaptationsModel.getProperty("/allAdaptations"), this.oAdaptationsModel.getProperty("/adaptations"));
-		this.oAdaptationsModel.updateAdaptations(oAllUpdatedAdaptations);
+	}
+
+	function onCancelDialog() {
+		// the adaptationsModel has to be set to its origin as no reorder has taken place
+		this.oAdaptationsModel.updateAdaptations(this._oOriginAdaptationsData);
 		onCloseDialog.call(this);
 	}
 

package/src/sap/ui/rta/toolbar/contextBased/ManageAdaptationsDialog.fragment.xml

@@ -48,7 +48,7 @@
 					hAlign="Left">
 					<Text text="{i18n>CLM_HEADER_ADAPTATIONS_TITLE}" />
 				</Column>
-				<Column width="8rem"
+				<Column width="6rem"
 					minScreenWidth="tablet"
 					demandPopin="true"
 					popinDisplay="Inline"
@@ -87,14 +87,8 @@
 				<ColumnListItem>
 					<cells>
 						<Text text="{contextBased>rank}"/>
-						<CustomListItem>
-							<HBox>
-								<VBox class="sapUiSmallMarginTopBottom">
 									<Text wrapping="false" maxLines="1" text="{contextBased>title}"
 									tooltip="{contextBased>title}"/>
-								</VBox>
-							</HBox>
-						</CustomListItem>
 						<Text text="{ parts: ['contextBased>contexts/role'], formatter: '.formatContextColumnCell'}"
 							tooltip="{ parts: ['contextBased>contexts/role'], formatter: '.formatContextColumnTooltip'}" />
 						<Text text="{ parts: ['contextBased>createdBy', 'contextBased>createdAt'], formatter: '.formatCreatedChangedOnColumnCell'}"/>
@@ -151,7 +145,7 @@
 		<endButton>
 			<Button id="manageAdaptations-closeButton"
 				text="{i18n>APP_CTX_DIALOG_CANCEL}"
-				press=".onClose"/>
+				press=".onCancel"/>
 		</endButton>
 	</Dialog>
 </core:FragmentDefinition>

package/src/sap/ui/rta/toolbar/contextBased/SaveAsAdaptation.js

@@ -15,7 +15,6 @@ sap.ui.define([
 	"sap/ui/fl/write/api/ContextBasedAdaptationsAPI",
 	"sap/ui/fl/write/api/ContextSharingAPI",
 	"sap/ui/rta/Utils",
-	"sap/ui/model/Binding",
 	"sap/ui/model/json/JSONModel"
 ], function(
 	ManagedObject,
@@ -28,7 +27,6 @@ sap.ui.define([
 	ContextBasedAdaptationsAPI,
 	ContextSharingAPI,
 	Utils,
-	Binding,
 	JSONModel
 ) {
 	"use strict";
@@ -43,7 +41,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.1
 	 *
 	 * @constructor
 	 * @private
@@ -167,6 +165,7 @@ sap.ui.define([
 		oContextBasedAdaptation.priority = getAdaptationPriority.call(this);
 		var oRtaInformation = this.getToolbar().getRtaInformation();
 		if (this._bIsEditMode) {
+			oContextBasedAdaptation.adaptationId = this._mEditProperties.adaptationId;
 			ContextBasedAdaptationsAPI.update({
 				control: oRtaInformation.rootControl,
 				layer: oRtaInformation.flexSettings.layer,
@@ -279,7 +278,8 @@ sap.ui.define([
 		var oInputField = this.getToolbar().getControl("addAdaptationDialog--saveAdaptation-title-input");
 		var bEnable;
 		var bRolesSelectedAndValidTitle = this._oContextComponentInstance.getSelectedContexts().role.length > 0
-			&& oInputField.getValueState() === ValueState.None;
+			&& oInputField.getValueState() === ValueState.None
+			&& oInputField.getValue().length > 0;
 		if (this._bIsEditMode && this._mEditProperties && this.oDialogModel) {
 			bEnable = bRolesSelectedAndValidTitle
 				// check that some of the properties title, priority, roles have been changed

package/src/sap/ui/rta/toolbar/translation/Translation.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/versioning/Versioning.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/util/PluginManager.js

@@ -68,7 +68,7 @@ sap.ui.define([
 	 * Constructor for a new sap.ui.rta.util.PluginManager
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.86

package/src/sap/ui/rta/util/PopupManager.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * Constructor for a new sap.ui.rta.util.PopupManager
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.48

package/src/sap/ui/rta/util/ReloadManager.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @namespace sap.ui.rta.util.ReloadManager
 	 * @alias sap.ui.rta.util.ReloadManager
 	 * @since 1.104
-	 * @version 1.114.0
+	 * @version 1.114.1
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -77,7 +77,7 @@ sap.ui.define([
 			sReason = "MSG_DRAFT_EXISTS";
 		} else if (oReloadInfo.allContexts) {
 			sReason = "MSG_RESTRICTED_CONTEXT_EXIST";
-		} // TODO add app descr changes case for start?
+		}// TODO add app descr changes case for start?
 		return sReason;
 	}
 
@@ -94,6 +94,9 @@ sap.ui.define([
 			if (oReloadInfo.allContexts) {
 				return "MSG_RELOAD_WITH_PERSONALIZATION_AND_RESTRICTED_CONTEXT";
 			}
+			if (oReloadInfo.switchEndUserAdaptation) {
+				return "MSG_RELOAD_WITH_PERSONALIZATION_AND_CONTEXT_BASED_ADAPTATION";
+			}
 			return "MSG_RELOAD_WITH_PERSONALIZATION_AND_VIEWS";
 		}
 
@@ -112,6 +115,10 @@ sap.ui.define([
 		if (oReloadInfo.allContexts) {
 			return "MSG_RELOAD_WITHOUT_ALL_CONTEXT";
 		}
+
+		if (oReloadInfo.switchEndUserAdaptation) {
+			return "MSG_RELOAD_OTHER_CONTEXT_BASED_ADAPTATION";
+		}
 		return undefined;
 	}
 
@@ -127,33 +134,34 @@ sap.ui.define([
 	}
 
 	function triggerReloadOnStart(oReloadInfo, bVersioningEnabled, bDeveloperMode) {
-		if (mUShellServices.CrossApplicationNavigation && bVersioningEnabled) {
-			// clears FlexState and triggers reloading of the flex data without blocking
-			if (oReloadInfo.isDraftAvailable) {
-				VersionsAPI.loadDraftForApplication({
-					control: oReloadInfo.selector,
-					layer: oReloadInfo.layer,
-					allContexts: oReloadInfo.allContexts,
-					adaptationId: oReloadInfo.adaptationId
-				});
-			} else {
-				VersionsAPI.loadVersionForApplication({
+		return Promise.resolve().then(function() {
+			if (mUShellServices.CrossApplicationNavigation && bVersioningEnabled) {
+				// clears FlexState and triggers reloading of the flex data without blocking
+				if (oReloadInfo.isDraftAvailable) {
+					return VersionsAPI.loadDraftForApplication({
+						control: oReloadInfo.selector,
+						layer: oReloadInfo.layer,
+						allContexts: oReloadInfo.allContexts,
+						adaptationId: oReloadInfo.adaptationId
+					});
+				}
+				return VersionsAPI.loadVersionForApplication({
 					control: oReloadInfo.selector,
 					layer: oReloadInfo.layer,
 					allContexts: oReloadInfo.allContexts,
 					adaptationId: oReloadInfo.adaptationId
 				});
 			}
-		}
-		var sReason = getReloadMessageOnStart(oReloadInfo);
-		// showing messages in visual editor is leading to blocked screen. In this case we should reload without message
-		var pMessageBox = bDeveloperMode ? Promise.resolve() : Utils.showMessageBox("information", sReason);
-		return pMessageBox.then(function() {
+			return undefined;
+		}).then(function() {
+			var sReason = getReloadMessageOnStart(oReloadInfo);
+			// showing messages in visual editor is leading to blocked screen. In this case we should reload without message
+			return bDeveloperMode ? undefined : Utils.showMessageBox("information", sReason);
+		}).then(function() {
 			ReloadManager.enableAutomaticStart(oReloadInfo.layer, oReloadInfo.selector);
 			oReloadInfo.onStart = true;
 			return ReloadManager.triggerReload(oReloadInfo);
-		})
-		.then(function() {
+		}).then(function() {
 			return true;
 		});
 	}
@@ -270,6 +278,7 @@ sap.ui.define([
 	 * @param {sap.ui.fl.Selector} mProperties.selector - Root control
 	 * @param {boolean} mProperties.versioningEnabled - Whether versioning is enabled
 	 * @param {boolean} mProperties.developerMode - Whether the developer mode is set
+	 * @param {string} mProperties.adaptationId - Context-based adaptation ID of the currently displayed adaptation
 	 *
 	 * @return {Promise<boolean>} Resolving to <code>false</code> means that reload is not necessary
 	 */
@@ -282,8 +291,7 @@ sap.ui.define([
 			URLParsingService: mUShellServices.URLParsing
 		});
 		return ReloadInfoAPI.getReloadReasonsForStart(mProperties).then(function(oReloadInfo) {
-			//TODO: add reload trigger for context-based adaptations
-			if (oReloadInfo.hasHigherLayerChanges || oReloadInfo.isDraftAvailable || oReloadInfo.allContexts) {
+			if (oReloadInfo.hasHigherLayerChanges || oReloadInfo.isDraftAvailable || oReloadInfo.allContexts || oReloadInfo.switchAdaptation) {
 				return triggerReloadOnStart(oReloadInfo, mProperties.versioningEnabled, mProperties.developerMode);
 			}
 			return undefined;

package/src/sap/ui/rta/util/ServiceEventBus.js

@@ -19,7 +19,7 @@ function(
 	 *
 	 * @extends sap.ui.core.EventBus
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.1
 	 * @private
 	 * @since 1.56.0
 	 * @alias sap.ui.rta.util.ServiceEventBus

package/src/sap/ui/rta/util/changeVisualization/ChangeIndicator.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeIndicator
 	 * @author SAP SE
 	 * @since 1.84.0
-	 * @version 1.114.0
+	 * @version 1.114.1
 	 * @private
 	 */
 	var ChangeIndicator = Control.extend("sap.ui.rta.util.changeVisualization.ChangeIndicator", {

package/src/sap/ui/rta/util/changeVisualization/ChangeIndicatorRegistry.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeIndicatorRegistry
 	 * @author SAP SE
 	 * @since 1.86.0
-	 * @version 1.114.0
+	 * @version 1.114.1
 	 * @private
 	 */
 	var ChangeIndicatorRegistry = ManagedObject.extend("sap.ui.rta.util.changeVisualization.ChangeIndicatorRegistry", {

package/src/sap/ui/rta/util/changeVisualization/ChangeVisualization.js

@@ -67,7 +67,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeVisualization
 	 * @author SAP SE
 	 * @since 1.84.0
-	 * @version 1.114.0
+	 * @version 1.114.1
 	 * @private
 	 */
 	var ChangeVisualization = Control.extend("sap.ui.rta.util.changeVisualization.ChangeVisualization", {