@openui5/sap.ui.fl 1.140.0 → 1.141.1

package/src/sap/ui/fl/library.js

@@ -6,7 +6,7 @@
 
 sap.ui.define([
 	"sap/ui/core/Lib",
-	"sap/ui/fl/apply/_internal/preprocessors/RegistrationDelegator",
+	"sap/ui/fl/initial/_internal/preprocessors/RegistrationDelegator",
 	"sap/ui/fl/initial/_internal/FlexConfiguration",
 	"sap/ui/fl/Utils",
 	"sap/ui/fl/Layer",
@@ -32,7 +32,7 @@ sap.ui.define([
 	 * changes or other flex objects that need processing. If there is nothing to
 	 * process, any further flex processing is stopped to avoid runtime impact for end users.
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @since 1.44
 	 * @namespace
 	 * @name sap.ui.fl.initial
@@ -44,7 +44,7 @@ sap.ui.define([
 	 * The <code>sap.ui.fl.initial._internal</code> namespace contains internals that are used
 	 * during app startup, e.g. to load the flex data and resolve or bootstrap the <code>sap.ui.fl.apply</code> for applying changes.
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.initial._internal
 	 * @private
@@ -57,7 +57,7 @@ sap.ui.define([
 	 * The <code>Configuration</code> is not limited to these connectors and can include every connector extending <code>sap.ui.fl.interfaces.BaseLoadConnector</code>
 	 * and <code>sap.ui.fl.write.connectors.BaseConnector</code>.
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.initial._internal.connectors
 	 * @private
@@ -67,7 +67,7 @@ sap.ui.define([
 	/**
 	 * The <code>sap.ui.fl.apply</code> namespace contains all code to apply flexibility changes on application startup.
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.apply
 	 * @private
@@ -78,7 +78,7 @@ sap.ui.define([
 	 * The <code>sap.ui.fl.apply.api</code> namespace contains public APIs that can be used
 	 * during app startup, e.g. to wait for changes to be applied or to access the current variant and switch variants.
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.apply.api
 	 * @private
@@ -87,7 +87,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal
 	 * @private
@@ -96,7 +96,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.changes
 	 * @private
@@ -105,7 +105,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.changes.descriptor
 	 * @private
@@ -114,7 +114,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.changes.descriptor.app
 	 * @private
@@ -123,7 +123,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.changes.descriptor.fiori
 	 * @private
@@ -132,7 +132,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.changes.descriptor.ovp
 	 * @private
@@ -141,7 +141,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.changes.descriptor.ui5
 	 * @private
@@ -150,7 +150,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.flexObjects
 	 * @private
@@ -159,7 +159,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.flexState
 	 * @private
@@ -168,7 +168,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.flexState.changes
 	 * @private
@@ -177,7 +177,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.flexState.compVariants
 	 * @private
@@ -186,7 +186,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.flexState.controlVariants
 	 * @private
@@ -195,7 +195,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.flexState.UI2Personalization
 	 * @private
@@ -204,7 +204,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.preprocessors
 	 * @private
@@ -213,7 +213,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.variants
 	 * @private
@@ -222,7 +222,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.support
 	 * @private
@@ -231,7 +231,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.support.api
 	 * @private
@@ -240,7 +240,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.support._internal
 	 * @private
@@ -249,7 +249,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.variants.context
 	 * @private
@@ -260,7 +260,7 @@ sap.ui.define([
 	 * Namespace containing interfaces and base classes of connectors to implement a connection to a specific end point
 	 * capable of storing flexibility entities as well as providing information about its capabilities.
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.connectors
 	 * @deprecated since 1.87. Use a implementing class in the {@link sap.ui.fl.write.api.connectors} namespace instead.
@@ -271,7 +271,7 @@ sap.ui.define([
 	/**
 	 * The <code>sap.ui.fl.variants</code> namespace contains the {@link sap.ui.fl.variants.VariantManagement} control and its internals.
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @public
 	 * @name sap.ui.fl.variants
@@ -282,7 +282,7 @@ sap.ui.define([
 	 * create, update, and reset flex objects. Additional common functionality needed
 	 * by personalization dialogs or tools like key user adaptation are part of the namespace.
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.write
 	 * @public
@@ -291,7 +291,7 @@ sap.ui.define([
 	/**
 	 * The <code>sap.ui.fl.write.api</code> namespace contains public APIs to work with flex objects.
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.write.api
 	 * @public
@@ -301,7 +301,7 @@ sap.ui.define([
 	 * Namespace containing interfaces and base classes of connectors to implement a connection to a specific end point
 	 * capable of storing flexibility entities as well as providing information about its capabilities.
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.write.api.connectors
 	 * @private
@@ -310,7 +310,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.write._internal
 	 * @private
@@ -319,7 +319,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.write._internal.appVariant
 	 * @private
@@ -330,7 +330,7 @@ sap.ui.define([
 	 * Namespace containing all types of connectors to write flex data. The usage of the connectors is restricted to the
 	 * <code>sap.ui.fl</code> library.
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.write._internal.connectors
 	 * @private
@@ -339,7 +339,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.write._internal.extensionPoint
 	 * @private
@@ -348,7 +348,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.write._internal.fieldExtensibility
 	 * @private
@@ -357,7 +357,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.write._internal.flexState
 	 * @private
@@ -366,7 +366,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.write._internal.flexState.compVariants
 	 * @private
@@ -375,7 +375,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.write.connectors
 	 * @private
@@ -384,7 +384,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.changeHandler
 	 * @private
@@ -395,7 +395,7 @@ sap.ui.define([
 	 * The <code>sap.ui.fl.interfaces</code> namespace contains only interface jsdoc descriptions.
 	 * It does not contain running code.
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.interfaces
 	 * @private
@@ -404,7 +404,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.interfaces.delegate
 	 * @private
@@ -415,7 +415,7 @@ sap.ui.define([
 	 * The <code>sap.ui.fl.interfaces</code> namespace contains only interface jsdoc descriptions.
 	 * It does not contain running code.
 	 *
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @namespace
 	 * @name sap.ui.fl.registry
 	 * @private
@@ -478,12 +478,12 @@ sap.ui.define([
 	 * @alias sap.ui.fl
 	 * @author SAP SE
 	 * @public
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 */
 	var thisLib = Lib.init({
 		apiVersion: 2,
 		name: "sap.ui.fl",
-		version: "1.140.0",
+		version: "1.141.1",
 		controls: [
 			"sap.ui.fl.variants.VariantManagement",
 			"sap.ui.fl.util.IFrame"

package/src/sap/ui/fl/support/_internal/getAllUIChanges.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.support._internal.getAllUIChanges
 	 * @since 1.121
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.support.api.SupportAPI
 	 */

package/src/sap/ui/fl/support/_internal/getChangeDependencies.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.support._internal.getChangeDependencies
 	 * @since 1.98
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.support.api.SupportAPI
 	 */

package/src/sap/ui/fl/support/_internal/getFlexObjectInfos.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.support._internal.getFlexObjectInfos
 	 * @since 1.128
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.support.api.SupportAPI
 	 */

package/src/sap/ui/fl/support/_internal/getFlexSettings.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.support._internal.getFlexSettings
 	 * @since 1.99
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @param {sap.ui.core.UIComponent} oAppComponent - Application Component
 	 * @private
 	 * @ui5-restricted sap.ui.fl.support.api.SupportAPI

package/src/sap/ui/fl/support/api/SupportAPI.js

@@ -66,7 +66,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.support.api.SupportAPI
 	 * @since 1.98
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @private
 	 * @ui5-restricted ui5 support tools
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/controller/ContentDetails.controller.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.ContentDetails
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/controller/ContentDetailsEdit.controller.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.ContentDetailsEdit
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/controller/LayerContentMaster.controller.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.LayerContentMaster
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/controller/Layers.controller.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.Layers
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/lrepConnector/LRepConnector.js

@@ -13,7 +13,7 @@ sap.ui.define(["sap/ui/fl/Utils", "sap/ui/thirdparty/jquery"], function(Utils, j
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.lrepConnector.LRepConnector
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/utils/DataUtils.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.utils.DataUtils
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/utils/ErrorUtils.js

@@ -17,7 +17,7 @@ function(MessageItem, MessagePopover, JSONModel) {
 		 * @constructor
 		 * @alias sap.ui.fl.support.apps.contentbrowser.utils.ErrorUtils
 		 * @author SAP SE
-		 * @version 1.140.0
+		 * @version 1.141.1
 		 * @since 1.45
 		 * @private
 		 */

package/src/sap/ui/fl/transport/TransportSelection.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.transport.TransportSelection
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @since 1.38.0
 	 * Helper object to select an ABAP transport for an LREP object. This is not a generic utility to select a transport request, but part
 	 *        of the SmartVariant control.

package/src/sap/ui/fl/util/IFrame.js

@@ -13,8 +13,9 @@ sap.ui.define([
 	"sap/base/security/URLListValidator",
 	"sap/base/Log",
 	"sap/ui/fl/util/IFrameRenderer",
-	"sap/ui/fl/library",
 	"sap/ui/core/library"
+	// The iFrame control does not need to require its library module because no DataTypes are defined in fl library and the control
+	// doesn't require any CSS from the library.css
 ], function(
 	uid,
 	Control,
@@ -50,7 +51,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/fl/util/ManagedObjectModel.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/fl/variants/VariantManagement.js

@@ -6,29 +6,31 @@
 
 // Provides control sap.ui.fl.variants.VariantManagement.
 sap.ui.define([
-	"sap/ui/model/Context",
-	"sap/ui/model/Filter",
-	"sap/ui/model/FilterOperator",
+	"sap/base/Log",
 	"sap/m/VariantItem",
 	"sap/m/VariantManagement",
-	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
-	"sap/ui/fl/initial/_internal/Settings",
 	"sap/ui/core/Control",
 	"sap/ui/core/Lib",
 	"sap/ui/core/library",
-	"sap/base/Log"
+	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
+	"sap/ui/fl/initial/_internal/Settings",
+	"sap/ui/fl/Utils",
+	"sap/ui/model/Context",
+	"sap/ui/model/Filter",
+	"sap/ui/model/FilterOperator"
 ], function(
-	Context,
-	Filter,
-	FilterOperator,
+	Log,
 	VariantItem,
 	MVariantManagement,
-	ControlVariantApplyAPI,
-	flSettings,
 	Control,
 	Lib,
 	coreLibrary,
-	Log
+	ControlVariantApplyAPI,
+	flSettings,
+	Utils,
+	Context,
+	Filter,
+	FilterOperator
 ) {
 	"use strict";
 
@@ -139,11 +141,11 @@ sap.ui.define([
 				},
 
 				/**
-								 * Semantic level of the header.
-								 * For more information, see {@link sap.m.Title#setLevel}.
-								 *
-								 * @since 1.104
-								 */
+				 * Semantic level of the header.
+				 * For more information, see {@link sap.m.Title#setLevel}.
+				 *
+				 * @since 1.104
+				 */
 				headerLevel: {
 					type: "sap.ui.core.TitleLevel",
 					group: "Appearance",
@@ -348,6 +350,15 @@ sap.ui.define([
 				oRm.renderControl(oControl._oVM);
 				oRm.close("div");
 			}
+		},
+		// eslint-disable-next-line object-shorthand
+		constructor: function(...aArgs) {
+			Control.prototype.constructor.apply(this, aArgs); // Call base class constructor
+			this._oInitPromise = new Promise((resolve) => {
+				this.attachEventOnce("initialized", () => {
+					resolve();
+				});
+			});
 		}
 	});
 
@@ -381,6 +392,15 @@ sap.ui.define([
 		this._updateWithSettingsInfo();
 	};
 
+	/**
+	 * Waits for VM control initialization.
+	 *
+	 * @returns {Promise} A promise that resolves when the control is initialized
+	 */
+	VariantManagement.prototype.waitForInit = function() {
+		return this._oInitPromise;
+	};
+
 	/**
 	 * Registers an invalidation event that is fired when the width of the control is changed.
 	 * <b>Note:</b> This is required by the {@link sap.m.IOverflowToolbarContent} interface.
@@ -717,7 +737,7 @@ sap.ui.define([
 	};
 
 	VariantManagement.prototype.setShowExecuteOnSelection = function(bValue) {
-		// this.setProperty("showExecuteOnSelection", bValue);
+		// This property is not bound since it is not part of the model
 		this._oVM.setSupportApplyAutomatically(bValue);
 		return this;
 	};
@@ -865,7 +885,7 @@ sap.ui.define([
 		if (!this.oContext) {
 			oModel = this.getModel(sModelName);
 			if (oModel) {
-				sLocalId = this._getLocalId(oModel);
+				sLocalId = this.getVariantManagementReference();
 
 				if (sLocalId) {
 					this.oContext = new Context(oModel, `/${sLocalId}`);
@@ -901,11 +921,6 @@ sap.ui.define([
 						model: sModelName
 					});
 
-					this._oVM.bindProperty("supportApplyAutomatically", {
-						path: `${this.oContext}/showExecuteOnSelection`,
-						model: sModelName
-					});
-
 					this._oVM.bindProperty("showFooter", {
 						path: `${this.oContext}/variantsEditable`,
 						model: sModelName
@@ -945,18 +960,6 @@ sap.ui.define([
 		});
 	};
 
-	VariantManagement.prototype._getLocalId = function(oModel) {
-		var sModelName = this.getModelName();
-		if (!sModelName) {
-			return null;
-		}
-		if (sModelName !== ControlVariantApplyAPI.getVariantModelName()) {
-			return this.getId();
-		}
-
-		return oModel.getVariantManagementReferenceForControl(this);
-	};
-
 	VariantManagement.prototype._getInnerItems = function() {
 		var aItems = [];
 		if (this.oContext && this.oContext.getObject()) {
@@ -1119,5 +1122,15 @@ sap.ui.define([
 		});
 	};
 
+	/**
+	 * Returns the reference of the variant management control.
+	 * @returns {string} The reference of the variant management control
+	 */
+	VariantManagement.prototype.getVariantManagementReference = function() {
+		const sControlId = this.getId();
+		const oAppComponent = Utils.getAppComponentForControl(this);
+		return (oAppComponent && oAppComponent.getLocalId(sControlId)) || sControlId;
+	};
+
 	return VariantManagement;
 });