@openui5/sap.ui.fl 1.119.0 → 1.120.0

package/src/sap/ui/fl/apply/_internal/controlVariants/Utils.js

@@ -5,11 +5,11 @@
  */
 
 sap.ui.define([
-	"sap/ui/core/Core",
+	"sap/ui/core/Element",
 	"sap/ui/core/StaticArea",
 	"sap/ui/fl/Utils"
 ], function(
-	Core,
+	Element,
 	StaticArea,
 	Utils
 ) {
@@ -81,7 +81,7 @@ sap.ui.define([
 				aVMControlIds = getVariantManagementControlIds(oControl, bUseStaticArea);
 			}
 			var aAssociatedControlIds = aVMControlIds.reduce(function(aCurrentControlIds, sVMControlId) {
-				var oVMControl = Core.byId(sVMControlId);
+				var oVMControl = Element.getElementById(sVMControlId);
 				// there could be additional VMControl Ids that are not yet available
 				if (oVMControl) {
 					var aForControls = oVMControl.getFor();

package/src/sap/ui/fl/apply/_internal/extensionPoint/Processor.js

@@ -13,7 +13,7 @@ sap.ui.define([
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/base/SyncPromise",
 	"sap/base/util/merge",
-	"sap/ui/core/Configuration"
+	"sap/ui/base/DesignTime"
 ],
 function(
 	Applier,
@@ -23,7 +23,7 @@ function(
 	JsControlTreeModifier,
 	SyncPromise,
 	merge,
-	Configuration
+	DesignTime
 ) {
 	"use strict";
 
@@ -34,7 +34,7 @@ function(
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 */
 	var Processor;
 
@@ -119,7 +119,7 @@ function(
 		oRegistryPromise: Promise.resolve(),
 
 		registerExtensionPoint(mExtensionPointInfo) {
-			if (Configuration.getDesignMode()) {
+			if (DesignTime.isDesignModeEnabled()) {
 				if (Processor.oExtensionPointRegistry) {
 					Processor.oExtensionPointRegistry.registerExtensionPoint(mExtensionPointInfo);
 					return SyncPromise.resolve();

package/src/sap/ui/fl/apply/_internal/flexObjects/AppDescriptorChange.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.AppDescriptorChange
 	 * @since 1.105
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/flexObjects/CompVariant.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.Variant
 	 * @alias sap.ui.fl.apply._internal.flexObjects.CompVariant
 	 * @since 1.103
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.comp
 	 */

package/src/sap/ui/fl/apply/_internal/flexObjects/ControllerExtensionChange.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.ControllerExtensionChange
 	 * @since 1.105
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/apply/_internal/flexObjects/FlVariant.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.Variant
 	 * @alias sap.ui.fl.apply._internal.flexObjects.FlVariant
 	 * @since 1.104
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/apply/_internal/flexObjects/FlexObject.js

@@ -69,7 +69,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @since 1.100
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory.js

@@ -77,7 +77,6 @@ sap.ui.define([
 				command: mProperties.command,
 				compositeCommand: mProperties.compositeCommand,
 				generator: mProperties.generator,
-				sapui5Version: Core.getConfiguration().getVersion().toString(),
 				sourceChangeFileName: mProperties.support && mProperties.support.sourceChangeFileName,
 				sourceSystem: mProperties.sourceSystem,
 				sourceClient: mProperties.sourceClient,
@@ -98,7 +97,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexObjects.FlexObjectFactory
 	 * @since 1.100
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -120,8 +119,7 @@ sap.ui.define([
 		}
 		oNewFileContent.support = Object.assign(
 			{
-				generator: "FlexObjectFactory.createFromFileContent",
-				sapui5Version: Core.getConfiguration().getVersion().toString()
+				generator: "FlexObjectFactory.createFromFileContent"
 			},
 			oNewFileContent.support || {}
 		);

package/src/sap/ui/fl/apply/_internal/flexObjects/UIChange.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.UIChange
 	 * @since 1.109
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/flexObjects/Variant.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.Variant
 	 * @since 1.103
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/FlexState.js

@@ -85,7 +85,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.FlexState
 	 * @since 1.73
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
@@ -159,8 +159,8 @@ sap.ui.define([
 
 	function enhancePropertyBag(mPropertyBag) {
 		var oComponent = Component.get(mPropertyBag.componentId);
-		mPropertyBag.componentData = mPropertyBag.componentData || (oComponent && oComponent.getComponentData()) || {};
-		mPropertyBag.manifest = mPropertyBag.manifest || mPropertyBag.rawManifest || (oComponent && oComponent.getManifestObject()) || {};
+		mPropertyBag.componentData ||= (oComponent && oComponent.getComponentData()) || {};
+		mPropertyBag.manifest ||= mPropertyBag.rawManifest || (oComponent && oComponent.getManifestObject()) || {};
 		mPropertyBag.reference ||= ManifestUtils.getFlexReference(mPropertyBag);
 	}
 
@@ -577,12 +577,12 @@ sap.ui.define([
 						aFiltered.push(oUpdate.flexObject);
 						break;
 					case "delete":
-						aFiltered.splice(aFiltered.find((oFlexObject) => oFlexObject.fileName === sFileName), 1);
-						aUnfiltered.splice(aUnfiltered.find((oFlexObject) => oFlexObject.fileName === sFileName), 1);
+						aFiltered.splice(aFiltered.findIndex((oFlexObject) => oFlexObject.fileName === sFileName), 1);
+						aUnfiltered.splice(aUnfiltered.findIndex((oFlexObject) => oFlexObject.fileName === sFileName), 1);
 						break;
 					case "update":
-						aFiltered.splice(aFiltered.find((oFlexObject) => oFlexObject.fileName === sFileName), 1, oUpdate.flexObject);
-						aUnfiltered.splice(aUnfiltered.find((oFlexObject) => oFlexObject.fileName === sFileName), 1, oUpdate.flexObject);
+						aFiltered.splice(aFiltered.findIndex((oFlexObject) => oFlexObject.fileName === sFileName), 1, oUpdate.flexObject);
+						aUnfiltered.splice(aUnfiltered.findIndex((oFlexObject) => oFlexObject.fileName === sFileName), 1, oUpdate.flexObject);
 						break;
 					default:
 				}

package/src/sap/ui/fl/apply/_internal/flexState/InitialPrepareFunctions.js

@@ -5,13 +5,13 @@
  */
 sap.ui.define([
 	"sap/base/util/includes",
-	"sap/ui/core/Core",
+	"sap/ui/core/Lib",
 	"sap/ui/fl/apply/_internal/controlVariants/Utils",
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory",
 	"sap/ui/fl/Layer"
 ], function(
 	includes,
-	Core,
+	Lib,
 	ControlVariantUtils,
 	FlexObjectFactory,
 	Layer
@@ -73,7 +73,7 @@ sap.ui.define([
 				? oFlexObject.variantManagementReference
 				: oFlexObject.variantReference;
 			if (sVariantReference && !includes(aVariantIds, sVariantReference)) {
-				var oResourceBundle = Core.getLibraryResourceBundle("sap.ui.fl");
+				var oResourceBundle = Lib.getResourceBundleFor("sap.ui.fl");
 				var oNewVariant = FlexObjectFactory.createFlVariant({
 					id: sVariantReference,
 					variantManagementReference: sVariantReference,

package/src/sap/ui/fl/apply/_internal/flexState/Loader.js

@@ -100,7 +100,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.Loader
 	 * @since 1.74
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal.flexState
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/ManifestUtils.js

@@ -69,7 +69,7 @@ function(
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.ManifestUtils
 	 * @since 1.74
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @private
 	 */
 	var ManifestUtils = {

package/src/sap/ui/fl/apply/_internal/flexState/UI2Personalization/UI2PersonalizationState.js

@@ -5,11 +5,9 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/apply/_internal/flexState/FlexState",
-	"sap/ui/fl/write/_internal/connectors/LrepConnector"
+	"sap/ui/fl/apply/_internal/flexState/FlexState"
 ], function(
-	FlexState,
-	LrepConnector
+	FlexState
 ) {
 	"use strict";
 
@@ -18,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.UI2Personalization.UI2PersonalizationState
 	 * @since 1.75
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -50,75 +48,5 @@ sap.ui.define([
 		})[0];
 	};
 
-	/**
-	 * Stores a personalization object for an application under a given key pair.
-	 *
-	 * @param {object} oPersonalization - Object with information about the personalization
-	 * @param {string} oPersonalization.reference - Reference of the application for which the personalization should be stored
-	 * @param {string} oPersonalization.containerKey - Key of the container in which the personalization should stored
-	 * @param {string} oPersonalization.itemName - Name under which the personalization should be stored
-	 * @param {string} oPersonalization.content - Personalization content to be stored
-	 * @returns {Promise} Promise resolving with the object stored under the passed container key and item name,
-	 * or undefined in case no entry was stored for these
-	 */
-	UI2PersonalizationState.setPersonalization = function(oPersonalization) {
-		if (
-			!oPersonalization
-			|| !oPersonalization.reference
-			|| !oPersonalization.containerKey
-			|| !oPersonalization.itemName
-			|| !oPersonalization.content
-		) {
-			return Promise.reject("not all mandatory properties were provided for the storage of the personalization");
-		}
-
-		return LrepConnector.ui2Personalization.create({
-			flexObjects: oPersonalization
-		})
-		.then(function(oPersonalizationResult) {
-			const oPersonalizationSubsection = FlexState.getUI2Personalization(oPersonalizationResult.response.reference);
-			oPersonalizationSubsection[oPersonalizationResult.response.containerKey] ||= [];
-			oPersonalizationSubsection[oPersonalizationResult.response.containerKey].push(oPersonalizationResult.response);
-			FlexState.updateStorageResponse(oPersonalizationResult.response.reference, [{
-				type: "ui2",
-				newData: oPersonalizationSubsection
-			}]);
-		});
-	};
-
-	/**
-	 * Deletes the personalization for a given reference
-	 *
-	 * @param {string} sReference - Reference of the application for which the personalization should be deleted
-	 * @param {string} sContainerKey - Key of the container for which the personalization should be deleted
-	 * @param {string} sItemName - Name under which the personalization should be deleted
-	 * @returns {Promise} Promise resolving in case the deletion request was successful
-	 */
-	UI2PersonalizationState.deletePersonalization = function(sReference, sContainerKey, sItemName) {
-		if (
-			!sReference
-			|| !sContainerKey
-			|| !sItemName
-		) {
-			return Promise.reject("not all mandatory properties were provided for the storage of the personalization");
-		}
-
-		return LrepConnector.ui2Personalization.remove({
-			reference: sReference,
-			containerKey: sContainerKey,
-			itemName: sItemName
-		}).then(function() {
-			const oUI2Personalization = FlexState.getUI2Personalization(sReference);
-			const aItems = oUI2Personalization[sContainerKey];
-			const oToBeDeletedItem = UI2PersonalizationState.getPersonalization(sReference, sContainerKey, sItemName);
-			const nIndexOfItem = aItems.indexOf(oToBeDeletedItem);
-			aItems.splice(nIndexOfItem, 1);
-			FlexState.updateStorageResponse(sReference, [{
-				type: "ui2",
-				newData: oUI2Personalization
-			}]);
-		});
-	};
-
 	return UI2PersonalizationState;
 });

package/src/sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.DependencyHandler
 	 * @since 1.74
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/changes/ExtensionPointState.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.ExtensionPointState
 	 * @since 1.79
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger.js

@@ -123,7 +123,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.compVariants.CompVariantMerger
 	 * @since 1.86
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -208,7 +208,7 @@ sap.ui.define([
 		 *
 		 * @function
 		 * @since 1.89
-		 * @version 1.119.0
+		 * @version 1.120.0
 		 * @private
 		 * @ui5-restricted sap.ui.fl
 		 *

package/src/sap/ui/fl/apply/_internal/flexState/controlVariants/Switcher.js

@@ -90,7 +90,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.Switcher
 	 * @since 1.74
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.VariantManagementState
 	 * @since 1.74
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/preprocessors/ComponentLifecycleHooks.js

@@ -6,6 +6,7 @@
 
 sap.ui.define([
 	"sap/base/Log",
+	"sap/ui/core/Lib",
 	"sap/ui/fl/apply/_internal/changes/descriptor/Applier",
 	"sap/ui/fl/apply/_internal/changes/descriptor/ApplyStrategyFactory",
 	"sap/ui/fl/apply/_internal/changes/Applier",
@@ -20,6 +21,7 @@ sap.ui.define([
 	"sap/ui/performance/Measurement"
 ], function(
 	Log,
+	Lib,
 	AppDescriptorApplier,
 	ApplyStrategyFactory,
 	ChangesApplier,
@@ -78,7 +80,7 @@ sap.ui.define([
 
 			return new Promise(function(resolve, reject) {
 				Promise.all([
-					sap.ui.getCore().loadLibrary("sap.ui.rta", {async: true}),
+					Lib.load({name: "sap.ui.rta"}),
 					oComponent.rootControlLoaded()
 				])
 				.then(function() {

package/src/sap/ui/fl/apply/_internal/preprocessors/ControllerExtension.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @since 1.27.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.core

package/src/sap/ui/fl/apply/_internal/preprocessors/EventHistory.js

@@ -4,7 +4,7 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define(["sap/ui/core/Core"], function(oCore) {
+sap.ui.define(["sap/ui/core/EventBus"], function(EventBus) {
 	"use strict";
 
 	/**
@@ -14,7 +14,7 @@ sap.ui.define(["sap/ui/core/Core"], function(oCore) {
 	 * @alias sap.ui.fl.apply._internal.preprocessors.EventHistory
 	 * @since 1.47.0
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal.preprocessors.RegistrationDelegator
@@ -36,7 +36,7 @@ sap.ui.define(["sap/ui/core/Core"], function(oCore) {
 	EventHistory.start = function() {
 		EventHistory._aEventIds.forEach(function(sEventId) {
 			if (EventHistory._aUnsubscribedEventIds.indexOf(sEventId) === -1) {
-				oCore.getEventBus().subscribe("sap.ui", sEventId, EventHistory.saveEvent);
+				EventBus.getInstance().subscribe("sap.ui", sEventId, EventHistory.saveEvent);
 				EventHistory._oHistory[sEventId] = [];
 			}
 		});
@@ -53,7 +53,7 @@ sap.ui.define(["sap/ui/core/Core"], function(oCore) {
 		var oEvent = {
 			channelId: sChannelId,
 			eventId: sEventId,
-			parameters: mParameters.getId() // we only need the id. In unified.shell sap.ui.getCore().byId(vControl); will be used.
+			parameters: mParameters.getId() // we only need the id. In unified.shell Element.getElementById(vControl); will be used.
 		};
 
 		if (EventHistory._oHistory[sEventId]) {
@@ -76,7 +76,7 @@ sap.ui.define(["sap/ui/core/Core"], function(oCore) {
 	 * @return {array} List of events
 	 */
 	EventHistory.getHistoryAndStop = function(sEventId) {
-		oCore.getEventBus().unsubscribe("sap.ui", sEventId, EventHistory.saveEvent);
+		EventBus.getInstance().unsubscribe("sap.ui", sEventId, EventHistory.saveEvent);
 		EventHistory._addUnsubscribedEvent(sEventId);
 		return EventHistory._oHistory[sEventId] || [];
 	};

package/src/sap/ui/fl/apply/_internal/preprocessors/RegistrationDelegator.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/DelegateMediator",
 	"sap/ui/fl/apply/api/DelegateMediatorAPI",
 	"sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerRegistration",
-	"sap/ui/core/Configuration",
+	"sap/ui/base/DesignTime",
 	// the lower 2 are set as a callback in the "register...Processors" which are not detected as dependencies from the preload-building
 	"sap/ui/fl/apply/_internal/preprocessors/ControllerExtension",
 	"sap/ui/fl/apply/_internal/preprocessors/XmlPreprocessor"
@@ -33,7 +33,7 @@ sap.ui.define([
 	DelegateMediator,
 	DelegateMediatorAPI,
 	ChangeHandlerRegistration,
-	Configuration
+	DesignTime
 ) {
 	"use strict";
 
@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @since 1.43.0
 	 * @private
 	 */
@@ -85,7 +85,7 @@ sap.ui.define([
 		if (ManifestUtils.isFlexExtensionPointHandlingEnabled(oView)) {
 			return "sap/ui/fl/apply/_internal/extensionPoint/Processor";
 		}
-		if (Configuration.getDesignMode()) {
+		if (DesignTime.isDesignModeEnabled()) {
 			return "sap/ui/fl/write/_internal/extensionPoint/Processor";
 		}
 		return undefined;

package/src/sap/ui/fl/apply/_internal/preprocessors/XmlPreprocessor.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @since 1.27.0
 	 * @private
 	 */

package/src/sap/ui/fl/apply/api/ControlVariantApplyAPI.js

@@ -7,14 +7,12 @@
 sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/core/Component",
-	"sap/ui/core/Core",
 	"sap/ui/core/Element",
 	"sap/ui/fl/apply/_internal/controlVariants/URLHandler",
 	"sap/ui/fl/Utils"
 ], function(
 	Log,
 	Component,
-	Core,
 	Element,
 	URLHandler,
 	Utils
@@ -46,7 +44,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply.api.ControlVariantApplyAPI
 	 * @since 1.67
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @public
 	 */
 	var ControlVariantApplyAPI = /** @lends sap.ui.fl.apply.api.ControlVariantApplyAPI */{
@@ -132,7 +130,7 @@ sap.ui.define([
 			if (typeof mPropertyBag.element === "string") {
 				oElement = Component.get(mPropertyBag.element);
 				if (!(oElement instanceof Component)) {
-					oElement = Core.byId(mPropertyBag.element);
+					oElement = Element.getElementById(mPropertyBag.element);
 
 					if (!(oElement instanceof Element)) {
 						return logAndReject(Error("No valid component or control found for the provided ID"));
@@ -188,7 +186,7 @@ sap.ui.define([
 		 * @public
 		 */
 		attachVariantApplied(mPropertyBag) {
-			var oControl = mPropertyBag.selector.id && sap.ui.getCore().byId(mPropertyBag.selector.id) || mPropertyBag.selector;
+			var oControl = mPropertyBag.selector.id && Element.getElementById(mPropertyBag.selector.id) || mPropertyBag.selector;
 			var oAppComponent = Utils.getAppComponentForControl(oControl);
 
 			waitForVariantModel(oAppComponent).then(function(oVariantModel) {
@@ -211,7 +209,7 @@ sap.ui.define([
 		 * @public
 		 */
 		detachVariantApplied(mPropertyBag) {
-			var oControl = mPropertyBag.selector.id && sap.ui.getCore().byId(mPropertyBag.selector.id) || mPropertyBag.selector;
+			var oControl = mPropertyBag.selector.id && Element.getElementById(mPropertyBag.selector.id) || mPropertyBag.selector;
 			var oAppComponent = Utils.getAppComponentForControl(oControl);
 			waitForVariantModel(oAppComponent).then(function(oVariantModel) {
 				oVariantModel.detachVariantApplied(mPropertyBag.vmControlId, oControl.getId());

package/src/sap/ui/fl/apply/api/FlexRuntimeInfoAPI.js

@@ -10,6 +10,7 @@ sap.ui.define([
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/fl/apply/_internal/controlVariants/Utils",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/initial/_internal/FlexConfiguration",
 	"sap/ui/fl/ChangePersistenceFactory",
 	"sap/ui/fl/FlexControllerFactory",
 	"sap/ui/fl/Layer",
@@ -20,6 +21,7 @@ sap.ui.define([
 	JsControlTreeModifier,
 	VariantUtils,
 	ManifestUtils,
+	FlexConfiguration,
 	ChangePersistenceFactory,
 	FlexControllerFactory,
 	Layer,
@@ -167,6 +169,17 @@ sap.ui.define([
 		 */
 		getFlexReference(mPropertyBag) {
 			return ManifestUtils.getFlexReferenceForControl(mPropertyBag.element);
+		},
+
+		/**
+		 * Returns the configured Flexibility Services
+		 * @returns {object[]} Flexibility services configuration
+		 *
+		 * @private
+		 * @ui5-restricted sap.ui.rta
+		 */
+		getConfiguredFlexServices() {
+			return FlexConfiguration.getFlexibilityServices();
 		}
 	};
 

package/src/sap/ui/fl/apply/api/SmartVariantManagementApplyAPI.js

@@ -5,7 +5,6 @@
  */
 
 sap.ui.define([
-	"sap/base/util/UriParameters",
 	"sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger",
 	"sap/ui/fl/apply/_internal/flexState/compVariants/Utils",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
@@ -13,7 +12,6 @@ sap.ui.define([
 	"sap/ui/fl/LayerUtils",
 	"sap/ui/fl/Utils"
 ], function(
-	UriParameters,
 	CompVariantMerger,
 	CompVariantUtils,
 	FlexState,
@@ -155,7 +153,7 @@ sap.ui.define([
 		 * @ui5-restricted
 		 */
 		isVariantDownport() {
-			var oUriParams = UriParameters.fromQuery(window.location.search);
+			var oUriParams = new URLSearchParams(window.location.search);
 			var sIsHotfixMode = oUriParams.get("hotfix");
 			return SmartVariantManagementApplyAPI.isVendorLayer() && (sIsHotfixMode === "true");
 		},

package/src/sap/ui/fl/apply/api/UI2PersonalizationApplyAPI.js

@@ -39,21 +39,20 @@ sap.ui.define([
 		 * @private
 	 	 * @ui5-restricted
 		 */
-		load(mPropertyBag) {
+		async load(mPropertyBag) {
 			mPropertyBag.reference = ManifestUtils.getFlexReferenceForSelector(mPropertyBag.selector);
 
 			if (
 				!mPropertyBag.reference
 				|| !mPropertyBag.containerKey
 			) {
-				return Promise.reject(new Error("not all mandatory properties were provided for the loading of the personalization"));
+				throw new Error("not all mandatory properties were provided for the loading of the personalization");
 			}
 
-			return FlexState.initialize({
+			await FlexState.initialize({
 				componentId: mPropertyBag.selector.getId()
-			}).then(function() {
-				return UI2PersonalizationState.getPersonalization(mPropertyBag.reference, mPropertyBag.containerKey, mPropertyBag.itemName);
 			});
+			return UI2PersonalizationState.getPersonalization(mPropertyBag.reference, mPropertyBag.containerKey, mPropertyBag.itemName);
 		}
 	};