@openui5/sap.ui.rta 1.109.0 → 1.111.0

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -23,7 +23,6 @@ sap.ui.define([
 	"sap/ui/dt/Util",
 	"sap/ui/events/KeyCodes",
 	"sap/ui/fl/write/api/Version",
-	"sap/ui/fl/apply/api/SmartVariantManagementApplyAPI",
 	"sap/ui/fl/write/api/ContextBasedAdaptationsAPI",
 	"sap/ui/fl/write/api/ControlPersonalizationWriteAPI",
 	"sap/ui/fl/write/api/FeaturesAPI",
@@ -71,7 +70,6 @@ sap.ui.define([
 	DtUtil,
 	KeyCodes,
 	Version,
-	SmartVariantManagementApplyAPI,
 	ContextBasedAdaptationsAPI,
 	ControlPersonalizationWriteAPI,
 	FeaturesAPI,
@@ -118,7 +116,7 @@ sap.ui.define([
 	 * @class The runtime authoring allows to adapt the fields of a running application.
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 * @constructor
 	 * @private
 	 * @since 1.30
@@ -395,7 +393,7 @@ sap.ui.define([
 		var oUriParams = UriParameters.fromQuery(window.location.search);
 		var sUriLayer = oUriParams.get("sap-ui-layer");
 
-		mFlexSettings = jQuery.extend({}, this.getFlexSettings(), mFlexSettings);
+		mFlexSettings = Object.assign({}, this.getFlexSettings(), mFlexSettings);
 		if (sUriLayer) {
 			mFlexSettings.layer = sUriLayer.toUpperCase();
 		}
@@ -472,7 +470,6 @@ sap.ui.define([
 				}
 				var oFlexInfoSession = PersistenceWriteAPI.getResetAndPublishInfoFromSession(this.getRootControlInstance());
 				this.bInitialResetEnabled = !!oFlexInfoSession.isResetEnabled;
-				this.bInitialPublishEnabled = !!oFlexInfoSession.isPublishEnabled;
 
 				this._oSerializer = new LREPSerializer({commandStack: this.getCommandStack(), rootControl: this.getRootControl()});
 
@@ -496,12 +493,13 @@ sap.ui.define([
 					//add root control is triggering overlay creation, so we need to wait for the scope to be set.
 					this._oDesignTime.addRootElement(this._oRootControl);
 
-					jQuery(Overlay.getOverlayContainer()).addClass("sapUiRta");
+					//TODO: remove when Overlay.getOverlayContainer() does not return jQuery any more
+					Overlay.getOverlayContainer().get(0).classList.add("sapUiRta");
 					if (this.getLayer() === Layer.USER) {
-						jQuery(Overlay.getOverlayContainer()).addClass("sapUiRtaPersonalize");
+						Overlay.getOverlayContainer().get(0).classList.add("sapUiRtaPersonalize");
 					} else {
 						// RTA Visual Improvements
-						jQuery("body").addClass("sapUiRtaMode");
+						document.body.classList.add("sapUiRtaMode");
 					}
 					this._oDesignTime.getSelectionManager().attachChange(function(oEvent) {
 						this.fireSelectionChange({selection: oEvent.getParameter("selection")});
@@ -590,6 +588,18 @@ sap.ui.define([
 		return Promise.reject("RuntimeAuthoring is already started");
 	};
 
+	function showSaveConfirmation() {
+		return Utils.showMessageBox("warning", "MSG_UNSAVED_CHANGES_ON_CLOSE", {
+			titleKey: "TIT_UNSAVED_CHANGES_ON_CLOSE",
+			actionKeys: [
+				"BTN_UNSAVED_CHANGES_ON_CLOSE_SAVE",
+				"BTN_UNSAVED_CHANGES_ON_CLOSE_DONT_SAVE"
+			],
+			emphasizedActionKey: "BTN_UNSAVED_CHANGES_ON_CLOSE_SAVE",
+			showCancel: true
+		});
+	}
+
 	/**
 	 * Stops Runtime Authoring
 	 *
@@ -599,13 +609,33 @@ sap.ui.define([
 	 * @returns {Promise} Resolves with undefined
 	 */
 	RuntimeAuthoring.prototype.stop = function(bSkipSave, bSkipRestart) {
-		checkToolbarAndExecuteFunction.call(this, "setBusy", true);
+		var bUserCancelled;
 		var oReloadInfo;
+		checkToolbarAndExecuteFunction.call(this, "setBusy", true);
 		return waitForPendingActions.call(this)
+			.then(function() {
+				var oCommandStack = this.getCommandStack();
+				var sLayer = this.getLayer();
+				if (sLayer !== Layer.USER && !bSkipSave && oCommandStack.canUndo()) {
+					return showSaveConfirmation()
+					.then(function (sAction) {
+						if (sAction === MessageBox.Action.CANCEL) {
+							bUserCancelled = true;
+							return Promise.reject();
+						}
+						if (sAction === this._getTextResources().getText("BTN_UNSAVED_CHANGES_ON_CLOSE_DONT_SAVE")) {
+							return this._oSerializer.clearCommandStack(/*bRemoveChanges = */true);
+						}
+						return undefined;
+					}.bind(this));
+				}
+				return undefined;
+			}.bind(this))
 			.then(function() {
 				if (bSkipRestart) {
 					return {};
 				}
+				//Reload check must happen before _serializeToLrep is called
 				return ReloadManager.checkReloadOnExit({
 					layer: this.getLayer(),
 					selector: this.getRootControlInstance(),
@@ -617,20 +647,31 @@ sap.ui.define([
 			}.bind(this))
 			.then(function(oReturn) {
 				oReloadInfo = oReturn;
-				return bSkipSave ? Promise.resolve() : this._serializeToLrep();
+				if (!bSkipSave) {
+					// serializeToLrep has to be called on exit even when no changes were made -> to invalidate cache
+					return this._serializeToLrep(/*bCondenseAnyLayer=*/false, /*bIsExit=*/true);
+				}
+				return undefined;
 			}.bind(this))
-			.then(checkToolbarAndExecuteFunction.bind(this, "hide", bSkipSave))
 			.then(function() {
+				checkToolbarAndExecuteFunction.call(this, "hide", bSkipSave);
 				this.fireStop();
 				if (!bSkipRestart) {
 					ReloadManager.handleUrlParametersOnExit(oReloadInfo);
 				}
 			}.bind(this))
-			.catch(showTechnicalError)
+			.catch(function(vError) {
+				if (!bUserCancelled) {
+					return showTechnicalError(vError);
+				}
+				return undefined;
+			})
 			.then(function() {
 				checkToolbarAndExecuteFunction.call(this, "setBusy", false);
-				this._sStatus = STOPPED;
-				jQuery("body").removeClass("sapUiRtaMode");
+				if (!bUserCancelled) {
+					this._sStatus = STOPPED;
+					document.body.classList.remove("sapUiRtaMode");
+				}
 			}.bind(this));
 	};
 
@@ -707,9 +748,13 @@ sap.ui.define([
 
 			Overlay.getOverlayContainer().toggleClass("sapUiRtaVisualizationMode", (sNewMode === "visualization"));
 			if (sNewMode === "visualization") {
-				jQuery(".sapUiDtOverlayMovable").css("cursor", "default");
+				document.querySelectorAll(".sapUiDtOverlayMovable").forEach(function(oNode) {
+					oNode.style.cursor = "default";
+				});
 			} else {
-				jQuery(".sapUiDtOverlayMovable").css("cursor", "move");
+				document.querySelectorAll(".sapUiDtOverlayMovable").forEach(function(oNode) {
+					oNode.style.cursor = "move";
+				});
 			}
 
 			this._oToolbarControlsModel.setProperty("/modeSwitcher", sNewMode);
@@ -853,16 +898,30 @@ sap.ui.define([
 	// ---- API ----
 
 	// this function is used to save in the Visual Editor
-	RuntimeAuthoring.prototype._serializeToLrep = function(bCondenseAnyLayer) {
+	RuntimeAuthoring.prototype._serializeToLrep = function(bCondenseAnyLayer, bIsExit) {
 		// when saving a change that requires a reload, the information has to be cached
 		// to do the reload when exiting UI Adaptation as then the change will not be available anymore
 		if (!this._bSavedChangesNeedReload) {
 			return this._oSerializer.needsReload().then(function(bReloadNeeded) {
 				this._bSavedChangesNeedReload = bReloadNeeded;
-				return serializeAndSave.call(this, undefined, bCondenseAnyLayer);
+				return serializeAndSave.call(this, undefined, bCondenseAnyLayer, bIsExit);
 			}.bind(this));
 		}
-		return serializeAndSave.call(this, undefined, bCondenseAnyLayer);
+		return serializeAndSave.call(this, undefined, bCondenseAnyLayer, bIsExit);
+	};
+
+	/**
+	 * Condenses the given changes and saves the result.
+	 * For the function to do anything at least two changes have to be passed.
+	 *
+	 * @param {object[]} aChanges - Array of flex object instances
+	 * @returns {Promise} Resolves when the save and condense is done
+	 * @private
+	 * @ui5-restricted Visual Editor
+	 */
+	RuntimeAuthoring.prototype.condenseAndSaveChanges = function(/* aChanges */) {
+		// for now there is no functionality to only consider passed changes during condensing, so the standard save functionality is triggered
+		return this._serializeToLrep.apply(this, arguments);
 	};
 
 	/**
@@ -874,8 +933,7 @@ sap.ui.define([
 	RuntimeAuthoring.prototype._onUnload = function() {
 		// this function is still in the prototype scope for easier testing
 		var oCommandStack = this.getCommandStack();
-		var bUnsaved = oCommandStack.canUndo();
-		if (bUnsaved && this.getShowWindowUnloadDialog()) {
+		if (oCommandStack.canUndo() && this.getShowWindowUnloadDialog()) {
 			return this._getTextResources().getText("MSG_UNSAVED_CHANGES");
 		}
 		window.onbeforeunload = this._oldUnloadHandler;
@@ -1025,16 +1083,17 @@ sap.ui.define([
 			var oCommandStack = this.getCommandStack();
 			var bCanUndo = oCommandStack.canUndo();
 			var bCanRedo = oCommandStack.canRedo();
-			var bTranslationRelevantDirtyChange = this._oToolbarControlsModel.getProperty("/translationVisible") &&
+			var bWasSaved = oCommandStack.getSaved();
+			var bTranslationRelevantDirtyChange = this._oToolbarControlsModel.getProperty("/translation/visible") &&
 				TranslationAPI.hasTranslationRelevantDirtyChanges({layer: Layer.CUSTOMER, selector: this.getRootControlInstance()});
 
 			// TODO: move to the setter to the ChangesState
 			this._oVersionsModel.setDirtyChanges(PersistenceWriteAPI.hasDirtyChanges({selector: this.getRootControlInstance()}));
-			this._oToolbarControlsModel.setProperty("/undoEnabled", bCanUndo);
-			this._oToolbarControlsModel.setProperty("/redoEnabled", bCanRedo);
-			this._oToolbarControlsModel.setProperty("/publishEnabled", this.bInitialPublishEnabled || bCanUndo);
-			this._oToolbarControlsModel.setProperty("/restoreEnabled", this.bInitialResetEnabled || bCanUndo);
-			this._oToolbarControlsModel.setProperty("/translationEnabled", this.bPersistedDataTranslatable || bTranslationRelevantDirtyChange);
+			this._oToolbarControlsModel.setProperty("/undo/enabled", bCanUndo);
+			this._oToolbarControlsModel.setProperty("/redo/enabled", bCanRedo);
+			this._oToolbarControlsModel.setProperty("/save/enabled", bCanUndo);
+			this._oToolbarControlsModel.setProperty("/restore/enabled", this.bInitialResetEnabled || bCanUndo || bWasSaved);
+			this._oToolbarControlsModel.setProperty("/translation/enabled", this.bPersistedDataTranslatable || bTranslationRelevantDirtyChange);
 		}
 		this.fireUndoRedoStackModified();
 	}
@@ -1060,13 +1119,13 @@ sap.ui.define([
 		var bFocusInsideRtaToolbar = this.getShowToolbars() && this.getToolbar().getDomRef().contains(document.activeElement);
 		var bFocusOnContextMenu = false;
 		// there might be two divs with that style-class (compact and expanded context menu)
-		jQuery(".sapUiDtContextMenu").each(function(iIndex, oDomRef) {
-			if (oDomRef.contains(document.activeElement)) {
+		document.querySelectorAll(".sapUiDtContextMenu").forEach(function(oNode) {
+			if (oNode.contains(document.activeElement)) {
 				bFocusOnContextMenu = true;
 			}
 		});
 		var bFocusOnBody = document.body === document.activeElement;
-		var bFocusInsideRenameField = jQuery(document.activeElement).parents(".sapUiRtaEditableField").length > 0;
+		var bFocusInsideRenameField = DOMUtil.getParents(document.activeElement, ".sapUiRtaEditableField").length > 0;
 
 		if ((bFocusInsideOverlayContainer || bFocusInsideRtaToolbar || bFocusOnContextMenu || bFocusOnBody) && !bFocusInsideRenameField) {
 			// OSX: replace CTRL with CMD
@@ -1096,35 +1155,45 @@ sap.ui.define([
 		}
 	}
 
-	function onSaveAsContextBasedAdaptation(oEvent) {
-		var mPropertyBag = {
-			parameters: oEvent.mParameters,
-			control: this.getRootControlInstance(),
-			layer: this.getLayer()
-		};
-		return ContextBasedAdaptationsAPI.create(mPropertyBag);
-	}
-
 	function saveOnly(oEvent) {
 		var fnCallback = oEvent.getParameter("callback") || function() {};
 		return this.save()
 			.then(fnCallback);
 	}
 
-	function serializeAndSave(bActivateVersion, bCondenseAnyLayer) {
+	function serializeAndSave(bActivateVersion, bCondenseAnyLayer, bIsExit) {
 		if (this.getShowToolbars()) {
-			this.bPersistedDataTranslatable = this._oToolbarControlsModel.getProperty("/translationEnabled");
+			this.bPersistedDataTranslatable = this._oToolbarControlsModel.getProperty("/translation/enabled");
 		}
+
 		var mPropertyBag = {
-			// Save changes on the current layer and discard dirty changes on other layers
-			saveAsDraft: this._oVersionsModel.getProperty("/versioningEnabled") && this.getLayer() === Layer.CUSTOMER,
 			layer: this.getLayer(),
 			removeOtherLayerChanges: true,
-			version: bActivateVersion ? this._oVersionsModel.getProperty("/displayedVersion") : undefined,
 			condenseAnyLayer: bCondenseAnyLayer
 		};
 
-		return this._oSerializer.saveCommands(mPropertyBag);
+		if (this._oVersionsModel.getProperty("/versioningEnabled")) {
+			var sVersion = bActivateVersion ? this._oVersionsModel.getProperty("/displayedVersion") : undefined;
+
+			// If a draft is being processed, saving without exiting must retrieve the updated state of the draft version
+			if (!sVersion) {
+				sVersion = bIsExit ? undefined : Version.Number.Draft;
+			}
+			mPropertyBag.version = sVersion;
+
+			// Save changes on the current layer and discard dirty changes on other layers
+			mPropertyBag.saveAsDraft = this.getLayer() === Layer.CUSTOMER;
+		}
+
+		return this._oSerializer.saveCommands(mPropertyBag)
+			.then(function() {
+				if (!bIsExit) {
+					//clean CViz after Save
+					var oToolbar = this.getToolbar();
+					var oChangeVisualization = this.getChangeVisualization();
+					oChangeVisualization.updateAfterSave(oToolbar);
+				}
+			}.bind(this));
 	}
 
 	function onActivate(oEvent) {
@@ -1139,6 +1208,7 @@ sap.ui.define([
 				if (sAction === MessageBox.Action.OK) {
 					return activate.call(this, sVersionTitle);
 				}
+				return undefined;
 			}.bind(this));
 		}
 		return activate.call(this, sVersionTitle);
@@ -1159,7 +1229,7 @@ sap.ui.define([
 		}).then(function() {
 			showMessageToast.call(this, "MSG_DRAFT_ACTIVATION_SUCCESS");
 			this.bInitialResetEnabled = true;
-			this._oToolbarControlsModel.setProperty("/restoreEnabled", true);
+			this._oToolbarControlsModel.setProperty("/restore/enabled", true);
 			this.getCommandStack().removeAllCommands();
 		}.bind(this))
 		.catch(function(oError) {
@@ -1287,7 +1357,7 @@ sap.ui.define([
 		}.bind(this));
 	}
 
-	function createToolsMenu(aButtonsVisibility) {
+	function createToolsMenu(mButtonsAvailability) {
 		if (!this.getDependent("toolbar")) {
 			var bUserLayer = this.getLayer() === Layer.USER;
 			var oProperties = {
@@ -1309,7 +1379,6 @@ sap.ui.define([
 				oProperties.activate = onActivate.bind(this);
 				oProperties.discardDraft = onDiscardDraft.bind(this);
 				oProperties.switchVersion = onSwitchVersion.bind(this);
-				oProperties.saveAsContextBasedAdaptation = onSaveAsContextBasedAdaptation.bind(this);
 				oProperties.openChangeCategorySelectionPopover = this.getChangeVisualization
 					? this.getChangeVisualization().openChangeCategorySelectionPopover.bind(this.getChangeVisualization())
 					: function() {};
@@ -1331,8 +1400,8 @@ sap.ui.define([
 			return Promise.all([oToolbar.onFragmentLoaded(), FeaturesAPI.isKeyUserTranslationEnabled(this.getLayer())])
 				.then(function(aArguments) {
 					var bTranslationAvailable = aArguments[1];
-					var bSaveAsAvailable = aButtonsVisibility.saveAsAvailable;
-					var bExtendedOverview = bSaveAsAvailable && RtaAppVariantFeature.isOverviewExtended();
+					var bAppVariantsAvailable = mButtonsAvailability.saveAsAvailable;
+					var bExtendedOverview = bAppVariantsAvailable && RtaAppVariantFeature.isOverviewExtended();
 					var oUriParameters = UriParameters.fromURL(window.location.href);
 					// the "Visualization" tab should not be visible if the "fiori-tools-rta-mode" URL-parameter is set to any value but "false"
 					var bVisualizationButtonVisible;
@@ -1340,24 +1409,55 @@ sap.ui.define([
 					this.bPersistedDataTranslatable = false;
 
 					this._oToolbarControlsModel = new JSONModel({
-						undoEnabled: false,
-						redoEnabled: false,
-						translationVisible: bTranslationAvailable,
-						translationEnabled: this.bPersistedDataTranslatable,
-						publishVisible: aButtonsVisibility.publishAvailable,
-						publishEnabled: this.bInitialPublishEnabled,
-						restoreEnabled: this.bInitialResetEnabled,
-						appVariantsOverviewVisible: bSaveAsAvailable && bExtendedOverview,
-						appVariantsOverviewEnabled: bSaveAsAvailable && bExtendedOverview,
-						saveAsVisible: bSaveAsAvailable,
-						contextBasedAdaptationVisible: aButtonsVisibility.contextBasedAdaptationAvailable,
-						saveAsEnabled: false,
-						manageAppsVisible: bSaveAsAvailable && !bExtendedOverview,
-						manageAppsEnabled: bSaveAsAvailable && !bExtendedOverview,
 						modeSwitcher: this.getMode(),
-						visualizationButtonVisible: bVisualizationButtonVisible
+						undo: {
+							enabled: false
+						},
+						redo: {
+							enabled: false
+						},
+						save: {
+							enabled: false
+						},
+						translation: {
+							visible: bTranslationAvailable,
+							enabled: this.bPersistedDataTranslatable
+						},
+						appVariantMenu: {
+							visible: bAppVariantsAvailable,
+							enabled: bAppVariantsAvailable,
+							overview: {
+								visible: bAppVariantsAvailable && bExtendedOverview,
+								enabled: bAppVariantsAvailable && bExtendedOverview
+							},
+							manageApps: {
+								visible: bAppVariantsAvailable && !bExtendedOverview,
+								enabled: bAppVariantsAvailable && !bExtendedOverview
+							},
+							saveAs: {
+								visible: bAppVariantsAvailable,
+								enabled: bAppVariantsAvailable
+							}
+						},
+						restore: {
+							visible: !this._oVersionsModel.getProperty("/versioningEnabled"),
+							enabled: this.bInitialResetEnabled
+						},
+						contextBasedAdaptation: {
+							visible: mButtonsAvailability.contextBasedAdaptationAvailable,
+							enabled: mButtonsAvailability.contextBasedAdaptationAvailable
+						},
+						actionsMenuButton: {
+							enabled: true
+						},
+						visualizationButton: {
+							visible: bVisualizationButtonVisible,
+							enabled: bVisualizationButtonVisible
+						}
 					});
 
+					this._oVersionsModel.setProperty("/publishVersionVisible", mButtonsAvailability.publishAvailable);
+
 					var oTranslationPromise = new Promise(function(resolve) {
 						if (!bTranslationAvailable) {
 							resolve();
@@ -1367,20 +1467,20 @@ sap.ui.define([
 						TranslationAPI.getSourceLanguages({selector: this.getRootControlInstance(), layer: this.getLayer()})
 							.then(function(aSourceLanguages) {
 								this.bPersistedDataTranslatable = aSourceLanguages.length > 0;
-								this._oToolbarControlsModel.setProperty("/translationEnabled", this.bPersistedDataTranslatable);
+								this._oToolbarControlsModel.setProperty("/translation/enabled", this.bPersistedDataTranslatable);
 							}.bind(this)).finally(resolve);
 					}.bind(this));
 
 					var oSaveAsPromise = new Promise(function(resolve) {
-						if (!bSaveAsAvailable) {
+						if (!bAppVariantsAvailable) {
 							resolve();
 							return;
 						}
 
 						RtaAppVariantFeature.isManifestSupported().then(function(bResult) {
-							this._oToolbarControlsModel.setProperty("/saveAsEnabled", bResult);
-							this._oToolbarControlsModel.setProperty("/appVariantsOverviewEnabled", bResult);
-							this._oToolbarControlsModel.setProperty("/manageAppsEnabled", bResult);
+							this._oToolbarControlsModel.setProperty("/appVariantMenu/saveAs/enabled", bResult);
+							this._oToolbarControlsModel.setProperty("/appVariantMenu/overview/enabled", bResult);
+							this._oToolbarControlsModel.setProperty("/appVariantMenu/manageApps/enabled", bResult);
 						}.bind(this)).finally(resolve);
 					}.bind(this));
 
@@ -1540,6 +1640,7 @@ sap.ui.define([
 						Log.error("sap.ui.rta: " + oError.message);
 					});
 			}
+			return undefined;
 		}.bind(this));
 		return this._pElementModified;
 	}
@@ -1618,94 +1719,93 @@ sap.ui.define([
 				}
 			}
 		} else {
-			this._mServices[sName] = mService = {
-				status: SERVICE_STARTING,
-				location: sServiceLocation,
-				initPromise: new Promise(function(fnResolve, fnReject) {
-					sap.ui.require(
-						[sServiceLocation],
-						function(fnServiceFactory) {
-							mService.factory = fnServiceFactory;
-
-							if (!this._oServiceEventBus) {
-								this._oServiceEventBus = new ServiceEventBus();
-							}
+			this._mServices[sName] = mService = {};
+			mService.status = SERVICE_STARTING;
+			mService.location = sServiceLocation;
+			mService.initPromise = new Promise(function(fnResolve, fnReject) {
+				sap.ui.require(
+					[sServiceLocation],
+					function(fnServiceFactory) {
+						mService.factory = fnServiceFactory;
+
+						if (!this._oServiceEventBus) {
+							this._oServiceEventBus = new ServiceEventBus();
+						}
 
-							DtUtil.wrapIntoPromise(fnServiceFactory)(
-								this,
-								this._oServiceEventBus.publish.bind(this._oServiceEventBus, sName)
-							)
-								.then(function(oService) {
-									if (this.bIsDestroyed) {
-										throw DtUtil.createError(
-											"RuntimeAuthoring#startService",
-											DtUtil.printf("RuntimeAuthoring instance is destroyed while initializing the service '{0}'", sName),
-											"sap.ui.rta"
-										);
-									}
-									if (!isPlainObject(oService)) {
-										throw DtUtil.createError(
-											"RuntimeAuthoring#startService",
-											DtUtil.printf("Invalid service format. Service should return simple javascript object after initialization. Service name = '{0}'", sName),
-											"sap.ui.rta"
-										);
-									}
-
-									mService.service = oService;
-									mService.exports = {};
-
-									// Expose events API if there is at least one event
-									if (Array.isArray(oService.events) && oService.events.length > 0) {
-										jQuery.extend(mService.exports, {
-											attachEvent: this._oServiceEventBus.subscribe.bind(this._oServiceEventBus, sName),
-											detachEvent: this._oServiceEventBus.unsubscribe.bind(this._oServiceEventBus, sName),
-											attachEventOnce: this._oServiceEventBus.subscribeOnce.bind(this._oServiceEventBus, sName)
-										});
-									}
-
-									// Expose methods/properties from exports object if any
-									var mExports = oService.exports || {};
-									jQuery.extend(
-										mService.exports,
-										Object.keys(mExports).reduce(function(mResult, sKey) {
-											var vValue = mExports[sKey];
-											mResult[sKey] = typeof vValue === "function"
-												? DtUtil.waitForSynced(this._oDesignTime, vValue)
-												: vValue;
-											return mResult;
-										}.bind(this), {})
+						DtUtil.wrapIntoPromise(fnServiceFactory)(
+							this,
+							this._oServiceEventBus.publish.bind(this._oServiceEventBus, sName)
+						)
+							.then(function(oService) {
+								if (this.bIsDestroyed) {
+									throw DtUtil.createError(
+										"RuntimeAuthoring#startService",
+										DtUtil.printf("RuntimeAuthoring instance is destroyed while initializing the service '{0}'", sName),
+										"sap.ui.rta"
 									);
-
-									mService.status = SERVICE_STARTED;
-									fnResolve(Object.freeze(mService.exports));
-								}.bind(this))
-								.catch(fnReject);
-						}.bind(this),
-						function(vError) {
-							mService.status = SERVICE_FAILED;
-							fnReject(
-								DtUtil.propagateError(
-									vError,
-									"RuntimeAuthoring#startService",
-									DtUtil.printf("Can't load service '{0}' by its name: {1}", sName, sServiceLocation),
-									"sap.ui.rta"
-								)
-							);
-						}
-					);
-				}.bind(this))
-					.catch(function(vError) {
+								}
+								if (!isPlainObject(oService)) {
+									throw DtUtil.createError(
+										"RuntimeAuthoring#startService",
+										DtUtil.printf("Invalid service format. Service should return simple javascript object after initialization. Service name = '{0}'", sName),
+										"sap.ui.rta"
+									);
+								}
+
+								mService.service = oService;
+								mService.exports = {};
+
+								// Expose events API if there is at least one event
+								if (Array.isArray(oService.events) && oService.events.length > 0) {
+									Object.assign(mService.exports, {
+										attachEvent: this._oServiceEventBus.subscribe.bind(this._oServiceEventBus, sName),
+										detachEvent: this._oServiceEventBus.unsubscribe.bind(this._oServiceEventBus, sName),
+										attachEventOnce: this._oServiceEventBus.subscribeOnce.bind(this._oServiceEventBus, sName)
+									});
+								}
+
+								// Expose methods/properties from exports object if any
+								var mExports = oService.exports || {};
+								Object.assign(
+									mService.exports,
+									Object.keys(mExports).reduce(function(mResult, sKey) {
+										var vValue = mExports[sKey];
+										mResult[sKey] = typeof vValue === "function"
+											? DtUtil.waitForSynced(this._oDesignTime, vValue)
+											: vValue;
+										return mResult;
+									}.bind(this), {})
+								);
+
+								mService.status = SERVICE_STARTED;
+								fnResolve(Object.freeze(mService.exports));
+							}.bind(this))
+							.catch(fnReject);
+					}.bind(this),
+					function(vError) {
 						mService.status = SERVICE_FAILED;
-						return Promise.reject(
+						fnReject(
 							DtUtil.propagateError(
 								vError,
 								"RuntimeAuthoring#startService",
-								DtUtil.printf("Error during service '{0}' initialization.", sName),
+								DtUtil.printf("Can't load service '{0}' by its name: {1}", sName, sServiceLocation),
 								"sap.ui.rta"
 							)
 						);
-					})
-			};
+					}
+				);
+			}.bind(this))
+			.catch(function(vError) {
+				mService.status = SERVICE_FAILED;
+				return Promise.reject(
+					DtUtil.propagateError(
+						vError,
+						"RuntimeAuthoring#startService",
+						DtUtil.printf("Error during service '{0}' initialization.", sName),
+						"sap.ui.rta"
+					)
+				);
+			});
 
 			return mService.initPromise;
 		}
@@ -1744,4 +1844,4 @@ sap.ui.define([
 	};
 
 	return RuntimeAuthoring;
-});
+});