@openui5/sap.ui.fl 1.114.0 → 1.115.1

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

@@ -0,0 +1,219 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	"sap/base/Log",
+	"sap/ui/fl/apply/_internal/changes/descriptor/Applier",
+	"sap/ui/fl/apply/_internal/changes/descriptor/ApplyStrategyFactory",
+	"sap/ui/fl/apply/_internal/changes/Applier",
+	"sap/ui/fl/apply/_internal/flexState/FlexState",
+	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
+	"sap/ui/fl/variants/VariantModel",
+	"sap/ui/fl/FlexControllerFactory",
+	"sap/ui/fl/Layer",
+	"sap/ui/fl/Utils",
+	"sap/ui/performance/Measurement"
+], function(
+	Log,
+	AppDescriptorApplier,
+	ApplyStrategyFactory,
+	ChangesApplier,
+	FlexState,
+	ManifestUtils,
+	ControlVariantApplyAPI,
+	VariantModel,
+	FlexControllerFactory,
+	Layer,
+	Utils,
+	Measurement
+) {
+	"use strict";
+
+	/**
+	 * @namespace sap.ui.fl.apply._internal.preprocessors.ComponentLifecycleHooks
+	 * @experimental Since 1.114
+	 * @since Since 1.114
+	 * @author SAP SE
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.fl
+	 */
+	var ComponentLifecycleHooks = {};
+
+	// in this object a promise is stored for every application component instance
+	// if the same instance is initialized twice the promise is replaced
+	ComponentLifecycleHooks._componentInstantiationPromises = new WeakMap();
+	var oEmbeddedComponentsPromises = {};
+
+	/**
+	 * The fl library must ensure a proper rta startup by a lazy loading of the rta library and starting RTA accordingly.
+	 * This is needed in the stand alone scenario; ATTENTION: if also the ushell-plugin of rta runs, the first one will
+	 * actually trigger the reload and clear the flag for the second.
+	 *
+	 * @param {object} oResult - The result which will be passed after the rta startup was checked and triggered if needed
+	 * @param {object} oComponent - Application component about to be started
+	 * @returns {Promise} Promise resolving with the initially passed result
+	 */
+	function checkForRtaStartOnDraftAndReturnResult(oResult, oComponent) {
+		// if the FLP is available the restart behavior is handled there
+		if (Utils.getUshellContainer()) {
+			return Promise.resolve(oResult);
+		}
+
+		var sRestartingComponent = window.sessionStorage.getItem("sap.ui.rta.restart." + Layer.CUSTOMER);
+		if (sRestartingComponent) {
+			var sComponentId = ManifestUtils.getFlexReferenceForControl(oComponent);
+			if (sRestartingComponent !== sComponentId && sRestartingComponent !== "true") {
+				Log.error("an application component was started " +
+					"which does not match the component for which the restart was triggered:\n" +
+					"Triggering component: " + sRestartingComponent + "\n" +
+					"Started component: " + sComponentId);
+
+				return Promise.resolve(oResult);
+			}
+
+			return new Promise(function(resolve, reject) {
+				Promise.all([
+					sap.ui.getCore().loadLibrary("sap.ui.rta", {async: true}),
+					oComponent.rootControlLoaded()
+				])
+				.then(function() {
+					sap.ui.require(["sap/ui/rta/api/startKeyUserAdaptation"], function(startKeyUserAdaptation) {
+						startKeyUserAdaptation({
+							rootControl: oComponent
+						});
+						resolve(oResult);
+					});
+				})
+				.catch(function(oError) {
+					reject(oError);
+				});
+			});
+		}
+
+		return Promise.resolve(oResult);
+	}
+
+	function propagateChangesForAppComponent (oAppComponent) {
+		// only manifest with type = "application" will fetch changes
+		var oFlexController = FlexControllerFactory.createForControl(oAppComponent);
+		var oVariantModel;
+		return oFlexController._oChangePersistence.loadChangesMapForComponent(oAppComponent)
+		.then(function(fnGetChangesMap) {
+			var fnPropagationListener = ChangesApplier.applyAllChangesForControl.bind(ChangesApplier, fnGetChangesMap, oAppComponent, oFlexController);
+			fnPropagationListener._bIsSapUiFlFlexControllerApplyChangesOnControl = true;
+			oAppComponent.addPropagationListener(fnPropagationListener);
+			oVariantModel = ComponentLifecycleHooks._createVariantModel(oFlexController, oAppComponent);
+			return oVariantModel.initialize();
+		})
+		.then(function() {
+			oAppComponent.setModel(oVariantModel, ControlVariantApplyAPI.getVariantModelName());
+			Measurement.end("flexProcessing");
+			return oVariantModel;
+		}).then(function(oResult) {
+			return checkForRtaStartOnDraftAndReturnResult(oResult, oAppComponent);
+		});
+	}
+
+	function getChangesAndPropagate(oComponent, vConfig) {
+		// if component's manifest is of type 'application' then only a flex controller and change persistence instances are created.
+		// if component's manifest is of type 'component' then no flex controller and change persistence instances are created. The variant model is fetched from the outer app component and applied on this component type.
+		if (Utils.isApplicationComponent(oComponent)) {
+			var sComponentId = oComponent.getId();
+			// TODO: remove this line when the maps and filtered response are always up to data
+			// Currently with the variants the maps are out of sync when the app gets loaded again without complete reload
+			FlexState.rebuildFilteredResponse(ManifestUtils.getFlexReferenceForControl(oComponent));
+			var oReturnPromise = FlexState.initialize({
+				componentId: sComponentId,
+				asyncHints: vConfig.asyncHints
+			})
+				.then(propagateChangesForAppComponent.bind(this, oComponent))
+				.then(function() {
+					// update any potential embedded component waiting for this app component
+					if (oEmbeddedComponentsPromises[sComponentId]) {
+						oEmbeddedComponentsPromises[sComponentId].forEach(function(oEmbeddedComponent) {
+							var oVariantModel = oComponent.getModel(ControlVariantApplyAPI.getVariantModelName());
+							oEmbeddedComponent.setModel(oVariantModel, ControlVariantApplyAPI.getVariantModelName());
+						});
+						delete oEmbeddedComponentsPromises[sComponentId];
+					}
+				});
+			ComponentLifecycleHooks._componentInstantiationPromises.set(oComponent, oReturnPromise);
+
+			return oReturnPromise;
+		} else if (Utils.isEmbeddedComponent(oComponent)) {
+			var oAppComponent = Utils.getAppComponentForControl(oComponent);
+			// Some embedded components might not have an app component, e.g. sap.ushell.plugins.rta, sap.ushell.plugins.rta-personalize
+			if (oAppComponent && Utils.isApplicationComponent(oAppComponent)) {
+				// once the VModel is set to the outer component it also has to be set to any embedded component
+				if (ComponentLifecycleHooks._componentInstantiationPromises.has(oAppComponent)) {
+					return ComponentLifecycleHooks._componentInstantiationPromises.get(oAppComponent).then(function() {
+						var oVariantModel = oAppComponent.getModel(ControlVariantApplyAPI.getVariantModelName());
+						oComponent.setModel(oVariantModel, ControlVariantApplyAPI.getVariantModelName());
+					});
+				}
+				oEmbeddedComponentsPromises[oAppComponent.getId()] = oEmbeddedComponentsPromises[oAppComponent.getId()] || [];
+				oEmbeddedComponentsPromises[oAppComponent.getId()].push(oComponent);
+			}
+			return Promise.resolve();
+		}
+		return Promise.resolve();
+	}
+
+	function onLoadComponent(oConfig, oManifest) {
+		// stop processing if the component is not of the type application or component ID is missing
+		if (!Utils.isApplication(oManifest) || !oConfig.id) {
+			return Promise.resolve();
+		}
+
+		FlexState.initialize({
+			componentData: oConfig.componentData || (oConfig.settings && oConfig.settings.componentData),
+			asyncHints: oConfig.asyncHints,
+			manifest: oManifest,
+			componentId: oConfig.id
+		});
+
+		// manifest descriptor changes for ABAP mixed mode can only be applied in this hook,
+		// because at this point all libs have been loaded (in contrast to the first Component._fnPreprocessManifest hook), but the manifest is still adaptable
+		return AppDescriptorApplier.applyChangesIncludedInManifest(oManifest, ApplyStrategyFactory.getRuntimeStrategy());
+	}
+
+	// the current sinon version used in UI5 does not support stubbing the constructor
+	ComponentLifecycleHooks._createVariantModel = function(oFlexController, oAppComponent) {
+		return new VariantModel({}, {
+			flexController: oFlexController,
+			appComponent: oAppComponent
+		});
+	};
+
+	/**
+	 * Gets the changes and in case of existing changes, prepare the applyChanges function already with the changes.
+	 *
+	 * @param {object} oComponent - Component instance that is currently loading
+	 * @param {object} vConfig - Configuration of loaded component
+	 * @returns {Promise} Promise which resolves when all relevant tasks for changes propagation have been processed
+	 */
+	ComponentLifecycleHooks.instanceCreatedHook = function() {
+		return getChangesAndPropagate.apply(undefined, arguments);
+	};
+
+	/**
+	 * Callback which is called within the early state of Component processing.
+	 * Already triggers the loading of the flexibility changes if the loaded manifest is an application variant.
+	 * The processing is only done for components of the type "application"
+	 *
+	 * @param {object} oConfig - Copy of the configuration of loaded component
+	 * @param {object} oConfig.asyncHints - Async hints passed from the app index to the core Component processing
+	 * @param {object} oManifest - Copy of the manifest of loaded component
+	 * @returns {Promise} Resolves after all Manifest changes are applied
+	 */
+	ComponentLifecycleHooks.componentLoadedHook = function() {
+		return onLoadComponent.apply(undefined, arguments);
+	};
+
+	return ComponentLifecycleHooks;
+});

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

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @experimental Since 1.27.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.core

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

@@ -14,7 +14,7 @@ sap.ui.define(["sap/ui/core/Core"], function(oCore) {
 	 * @alias sap.ui.fl.apply._internal.preprocessors.EventHistory
 	 * @experimental Since 1.47.0
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal.preprocessors.RegistrationDelegator

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

@@ -13,11 +13,10 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/changes/descriptor/Preprocessor",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/apply/_internal/preprocessors/EventHistory",
+	"sap/ui/fl/apply/_internal/preprocessors/ComponentLifecycleHooks",
 	"sap/ui/fl/apply/_internal/DelegateMediator",
 	"sap/ui/fl/apply/api/DelegateMediatorAPI",
 	"sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerRegistration",
-	"sap/ui/fl/ChangePersistenceFactory",
-	"sap/ui/fl/FlexControllerFactory",
 	"sap/ui/core/Configuration",
 	// 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",
@@ -30,11 +29,10 @@ sap.ui.define([
 	Preprocessor,
 	ManifestUtils,
 	EventHistory,
+	ComponentLifecycleHooks,
 	DelegateMediator,
-	DelegateMadiatorAPI,
+	DelegateMediatorAPI,
 	ChangeHandlerRegistration,
-	ChangePersistenceFactory,
-	FlexControllerFactory,
 	Configuration
 ) {
 	"use strict";
@@ -46,14 +44,14 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @experimental Since 1.43.0
 	 */
 	var RegistrationDelegator = {};
 
 
 	function registerChangesInComponent() {
-		Component._fnOnInstanceCreated = FlexControllerFactory.getChangesAndPropagate;
+		Component._fnOnInstanceCreated = ComponentLifecycleHooks.instanceCreatedHook;
 	}
 
 	function registerChangeHandlers() {
@@ -62,7 +60,7 @@ sap.ui.define([
 	}
 
 	function registerLoadComponentEventHandler() {
-		Component._fnLoadComponentCallback = ChangePersistenceFactory._onLoadComponent.bind(ChangePersistenceFactory);
+		Component._fnLoadComponentCallback = ComponentLifecycleHooks.componentLoadedHook;
 	}
 
 	function registerExtensionProvider() {
@@ -98,7 +96,7 @@ sap.ui.define([
 	}
 
 	function registerDefaultDelegate() {
-		DelegateMadiatorAPI.registerDefaultDelegate({
+		DelegateMediatorAPI.registerDefaultDelegate({
 			modelType: "sap.ui.model.odata.v4.ODataModel",
 			delegate: "sap/ui/fl/write/_internal/delegates/ODataV4ReadDelegate",
 			delegateType: DelegateMediator.types.READONLY

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

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @experimental Since 1.27.0
 	 */
 	var XmlPreprocessor = function() {};

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

@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply.api.ControlVariantApplyAPI
 	 * @experimental Since 1.67
 	 * @since 1.67
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @public
 	 */
 	var ControlVariantApplyAPI = /** @lends sap.ui.fl.apply.api.ControlVariantApplyAPI */{

package/src/sap/ui/fl/changeHandler/AddIFrame.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.AddIFrame
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @since 1.72
 	 * @private
 	 */

package/src/sap/ui/fl/changeHandler/AddXML.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.AddXML
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @since 1.54
 	 * @private
 	 * @experimental Since 1.54. This class is experimental and provides only limited functionality. Also the API might be changed in future.

package/src/sap/ui/fl/changeHandler/AddXMLAtExtensionPoint.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.AddXMLAtExtensionPoint
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @since 1.75
 	 * @private
 	 * @experimental Since 1.75. This class is experimental and provides only limited functionality. Also the API might be changed in future.

package/src/sap/ui/fl/changeHandler/Base.js

@@ -14,7 +14,7 @@ sap.ui.define([
 	/**
 	 * Base functionality for all change handlers, which provides some reuse methods
 	 * @namespace sap.ui.fl.changeHandler.Base
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted change handlers
 	 */

package/src/sap/ui/fl/changeHandler/BaseAddViaDelegate.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.changeHandler.BaseAddViaDelegate
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 */
 	var BaseAddViaDelegate = {

package/src/sap/ui/fl/changeHandler/BaseAddXml.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.BaseAddXml
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @since 1.75
 	 * @private
 	 * @experimental Since 1.75. This class is experimental and provides only limited functionality. Also the API might be changed in future.

package/src/sap/ui/fl/changeHandler/BaseRename.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.changeHandler.BaseRename
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @experimental Since 1.46
 	 */
 	var BaseRename = {

package/src/sap/ui/fl/changeHandler/HideControl.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * Change handler for hiding of a control.
 	 * @alias sap.ui.fl.changeHandler.HideControl
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @experimental Since 1.27.0
 	 */
 	var HideControl = {};

package/src/sap/ui/fl/changeHandler/MoveControls.js

@@ -21,7 +21,7 @@ function(
 	 *
 	 * @alias sap.ui.fl.changeHandler.MoveControls
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @experimental Since 1.46
 	 */
 	var MoveControls = { };
@@ -418,6 +418,11 @@ function(
 			},
 			getTargetIndex: function(oChange) {
 				return oChange.getContent().movedElements[0].targetIndex;
+			},
+			setIndexInRevertData: function(oChange, iIndex) {
+				var aRevertData = oChange.getRevertData();
+				aRevertData[0].index = iIndex;
+				oChange.setRevertData(aRevertData);
 			}
 		};
 	};

package/src/sap/ui/fl/changeHandler/MoveElements.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.MoveElements
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @experimental Since 1.34.0
 	 */
 	var MoveElements = { };

package/src/sap/ui/fl/changeHandler/PropertyBindingChange.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.PropertyBindingChange
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @since 1.38
 	 * @private
 	 * @experimental Since 1.38. This class is experimental and provides only limited functionality. Also the API might be changed in future.

package/src/sap/ui/fl/changeHandler/PropertyChange.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.PropertyChange
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @since 1.36
 	 * @private
 	 * @experimental Since 1.36. This class is experimental and provides only limited functionality. Also the API might be changed in future.

package/src/sap/ui/fl/changeHandler/StashControl.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * Change handler for stashing of a control.
 	 * @alias sap.ui.fl.changeHandler.StashControl
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @experimental Since 1.27.0
 	 */
 	var StashControl = {};

package/src/sap/ui/fl/changeHandler/UnhideControl.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * Change handler for unhiding of a control.
 	 * @alias sap.ui.fl.changeHandler.UnhideControl
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @experimental Since 1.27.0
 	 */
 	var UnhideControl = {};

package/src/sap/ui/fl/changeHandler/UnstashControl.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 * Change handler for unstashing of a control.
 	 * @alias sap.ui.fl.changeHandler.UnstashControl
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @experimental Since 1.27.0
 	 */
 	var UnstashControl = {};

package/src/sap/ui/fl/changeHandler/UpdateIFrame.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.UpdateIFrame
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @since 1.72
 	 * @private
 	 */

package/src/sap/ui/fl/descriptorRelated/api/DescriptorChangeFactory.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.fl.descriptorRelated
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.fl.descriptorRelated.api
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorChange
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -124,7 +124,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorChangeFactory
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/descriptorRelated/api/DescriptorInlineChangeFactory.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorInlineChangeFactory
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @deprecated Since version 1.76
 	 * @ui5-restricted sap.ui.rta, smart business

package/src/sap/ui/fl/descriptorRelated/api/DescriptorVariantFactory.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorVariantFactory
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @deprecated Since version 1.73
 	 * @ui5-restricted sap.ui.rta, smart business

package/src/sap/ui/fl/initial/_internal/Storage.js

@@ -59,7 +59,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.initial._internal.Storage
 	 * @since 1.67
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -144,6 +144,8 @@ sap.ui.define([
 	 * @param {string} [mPropertyBag.componentName] componentName of the application which may differ from the reference in case of an app variant
 	 * @param {string} [mPropertyBag.cacheKey] cacheKey which can be used to etag / cachebuster the request
 	 * @param {number} [mPropertyBag.version] - Number of the version for which the data should be loaded
+	 * @param {boolean} [mPropertyBag.allContexts] Includes also restricted context
+	 * @param {string} [mPropertyBag.adaptationId] - Context-based adaptation to be loaded
 	 * @returns {Promise<object>} Resolves with the responses from all configured connectors merged into one object
 	 */
 	Storage.loadFlexData = function (mPropertyBag) {

package/src/sap/ui/fl/initial/_internal/StorageResultMerger.js

@@ -76,23 +76,6 @@ sap.ui.define([
 		}, "") || null;
 	}
 
-	/**
-	 * Concatenates all allContextsProvided from a list of flex data request responses headers into a passed result string.
-	 *
-	 * @param {object[]} aResponses List of responses containing allContextsProvided header to be concatenated
-	 * @param {string} [aResponses.allContextsProvided] allContextsProvided value
-	 * @returns {boolean | undefined} Returns allContextsProvided value if response has allContextsProvided true or false, otherwise returns undefined
-	 * @private
-	 * @ui5-restricted sap.ui.fl.Cache
-	 */
-	function isAllContextsProvided(aResponses) {
-		for (var i = 0; i < aResponses.length; i++) {
-			if (aResponses[i].info) {
-				return aResponses[i].info.allContextsProvided;
-			}
-		}
-	}
-
 	/**
 	 * Merges the results from all involved connectors.
 	 *
@@ -119,11 +102,9 @@ sap.ui.define([
 			variantManagementChanges: concatFlexObjects(aResponses, "variantManagementChanges"),
 			cacheKey: _concatEtag(aResponses)
 		};
-		var bAllContextsProvided = isAllContextsProvided(aResponses);
-		if (bAllContextsProvided !== undefined) {
-			oResult.info = {
-				allContextsProvided: bAllContextsProvided
-			};
+		var oInfoObject = concatFlexObjects(aResponses, "info");
+		if (oInfoObject.length > 0) {
+			oResult.info = oInfoObject[0];
 		}
 		return oResult;
 	};

package/src/sap/ui/fl/initial/_internal/StorageUtils.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.initial._internal.StorageUtils
 	 * @since 1.74
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal.Storage, sap.ui.fl.write._internal.Storage,
 	 * 	sap.ui.fl.initial._internal.connectors.ObjectStorageConnector, sap.ui.fl.initial._internal.connectors.ObjectPathConnector

package/src/sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerRegistration.js

@@ -84,7 +84,7 @@ sap.ui.define([
 		 * @alias sap.ui.fl.registry.ChangeHandlerRegistration
 		 *
 		 * @author SAP SE
-		 * @version 1.114.0
+		 * @version 1.115.1
 		 * @private
 		 * @ui5-restricted sap.ui.fl
 		 *
@@ -92,6 +92,7 @@ sap.ui.define([
 		 */
 		getChangeHandlersOfLoadedLibsAndRegisterOnNewLoadedLibs: function () {
 			var oAlreadyLoadedLibraries = Core.getLoadedLibraries();
+			Core.attachLibraryChanged(handleLibraryRegistrationAfterFlexLibraryIsLoaded);
 			var aPromises = [];
 
 			Object.values(oAlreadyLoadedLibraries).forEach(function(oLibrary) {
@@ -100,8 +101,6 @@ sap.ui.define([
 				}
 			});
 
-			Core.attachLibraryChanged(handleLibraryRegistrationAfterFlexLibraryIsLoaded);
-
 			return Promise.all(aPromises);
 		},
 

package/src/sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerStorage.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.registry.ChangeHandlerStorage
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 *

package/src/sap/ui/fl/initial/_internal/connectors/LrepConnector.js

@@ -83,6 +83,7 @@ sap.ui.define([
 		 * @param {string} [mPropertyBag.preview.reference] Reference of the base application for building the preview request
 		 * @param {sap.ui.fl.Layer} [mPropertyBag.preview.maxLayer] Limit to which layer the preview data has to be requested
 		 * @param {boolean} [mPropertyBag.allContexts] Includes also restricted context
+		 * @param {string} [mPropertyBag.version] Version to be loaded
 		 * @param {string} [mPropertyBag.adaptationId] - Context-based adaptation to be loaded
 		 * @returns {Promise<object>} Promise resolving with the JSON parsed server response of the flex data request
 		 * or resolves with undefined in case cache bustering determines that no data is present