@openui5/sap.ui.fl 1.96.4 → 1.96.7

package/THIRDPARTY.txt

@@ -197,7 +197,7 @@ License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/sinon-qunit.js
 
-Component: URI.js, version: 1.19.7
+Component: URI.js, version: 1.19.10
 Copyright: Rodney Rehm
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.fl",
-  "version": "1.96.4",
+  "version": "1.96.7",
   "description": "OpenUI5 UI Library sap.ui.fl",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,7 +14,7 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.m": "1.96.4",
-    "@openui5/sap.ui.core": "1.96.4"
+    "@openui5/sap.m": "1.96.7",
+    "@openui5/sap.ui.core": "1.96.7"
   }
 }

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

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.96.4</version>
+  <version>1.96.7</version>
 
   <documentation>SAPUI5 library with sap.ui.fl controls.</documentation>
 

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

@@ -24,7 +24,7 @@ function(
 	 * @alias sap.ui.fl.Cache
 	 * @experimental Since 1.25.0
 	 * @author SAP SE
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

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

@@ -907,6 +907,20 @@ sap.ui.define([
 		return (oObject.getRequest() === "$TMP" || oObject.getRequest() === "") && oObject.getLayer() === sLayer;
 	}
 
+	function isPersistedAndInLayer(sLayer, oObject) {
+		return oObject.getState() === Change.states.PERSISTED && oObject.getLayer() === sLayer;
+	}
+
+	function getAllCompVariantsEntities() {
+		var aCompVariantEntities = [];
+		var mCompVariantsMap = FlexState.getCompVariantsMap(this.getComponentName());
+		for (var sPersistencyKey in mCompVariantsMap) {
+			for (var sId in mCompVariantsMap[sPersistencyKey].byId) {
+				aCompVariantEntities.push(mCompVariantsMap[sPersistencyKey].byId[sId]);
+			}
+		}
+		return aCompVariantEntities;
+	}
 	/**
 	 * Transports all the UI changes and app variant descriptor (if exists) to the target system
 	 *
@@ -917,19 +931,8 @@ sap.ui.define([
 	 * @returns {Promise} promise that resolves when all the artifacts are successfully transported
 	 */
 	ChangePersistence.prototype.transportAllUIChanges = function(oRootControl, sStyleClass, sLayer, aAppVariantDescriptors) {
-		return Promise.all([
-			this.getChangesForComponent({currentLayer: sLayer, includeCtrlVariants: true}),
-			FlexState.getCompVariantsMap(this.getComponentName())// FIXME: also transport comp changes via compState
-		]).then(function(aResponses) {
-			var aLocalChanges = aResponses[0];
-			var mCompVariantsMap = aResponses[1];
-			var aCompVariantEntities = [];
-			for (var sPersistencyKey in mCompVariantsMap) {
-				for (var sId in mCompVariantsMap[sPersistencyKey].byId) {
-					aCompVariantEntities.push(mCompVariantsMap[sPersistencyKey].byId[sId]);
-				}
-			}
-
+		return this.getChangesForComponent({currentLayer: sLayer, includeCtrlVariants: true}).then(function(aLocalChanges) {
+			var aCompVariantEntities = getAllCompVariantsEntities.call(this);
 			aLocalChanges = aLocalChanges.concat(
 				aCompVariantEntities.filter(isLocalAndInLayer.bind(this, sLayer)));
 
@@ -960,10 +963,10 @@ sap.ui.define([
 	};
 
 	/**
-	 * Removes unsaved changes and reverts these.
+	 * Removes unsaved changes.
 	 *
-	 * @param {string|string[]} vLayer - Layer or multiple layers for which changes shall be deleted
-	 * @param {sap.ui.core.Component} oComponent - Component instance
+	 * @param {string|string[]} [vLayer] - Layer or multiple layers for which changes shall be deleted. If omitted, changes on all layers are considered.
+	 * @param {sap.ui.core.Component} [oComponent] - Component instance, required if oControl is specified
 	 * @param {string} [oControl] - Control for which the changes should be deleted. If omitted, all changes for the app component are considered.
 	 * @param {string} [sGenerator] - Generator of changes (optional)
 	 * @param {string[]} [aChangeTypes] - Types of changes (optional)
@@ -971,13 +974,13 @@ sap.ui.define([
 	 * @returns {Promise} Promise that resolves after the deletion took place
 	 */
 	ChangePersistence.prototype.removeDirtyChanges = function(vLayer, oComponent, oControl, sGenerator, aChangeTypes) {
-		var aLayers = [].concat(vLayer);
+		var aLayers = [].concat(vLayer || []);
 		var aDirtyChanges = this._aDirtyChanges;
 
 		var aChangesToBeRemoved = aDirtyChanges.filter(function (oChange) {
 			var bChangeValid = true;
 
-			if (!aLayers.includes(oChange.getLayer())) {
+			if (aLayers.length && !aLayers.includes(oChange.getLayer())) {
 				return false;
 			}
 
@@ -1022,10 +1025,16 @@ sap.ui.define([
 		var bSelectorIdsProvided = aSelectorIds && aSelectorIds.length > 0;
 		var bChangeTypesProvided = aChangeTypes && aChangeTypes.length > 0;
 
-		return this.getChangesForComponent({
-			currentLayer: sLayer,
-			includeCtrlVariants: true
-		}).then(function(aChanges) {
+		//In case of application reset and PUBLIC layer available, also includes comp variant entities
+		var isPublicLayerAvailable = Settings.getInstanceOrUndef() && Settings.getInstanceOrUndef().isPublicLayerAvailable();
+		var isApplicationReset = sGenerator === undefined && aSelectorIds === undefined && aChangeTypes === undefined;
+		var aCompVariantsEntries = [];
+		if (isPublicLayerAvailable && isApplicationReset) {
+			aCompVariantsEntries = getAllCompVariantsEntities.call(this).filter(isPersistedAndInLayer.bind(this, sLayer));
+		}
+
+		return this.getChangesForComponent({ currentLayer: sLayer, includeCtrlVariants: true}).then(function(aChanges) {
+			aChanges = aChanges.concat(aCompVariantsEntries);
 			var mParams = {
 				reference: this.getComponentName(),
 				layer: sLayer,

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

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.ChangePersistenceFactory
 	 * @experimental Since 1.27.0
 	 * @author SAP SE
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @experimental Since 1.56
 	 * @since 1.56
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -14,7 +14,7 @@ sap.ui.define(function () {
 	 * @alias sap.ui.fl.EventHistory
 	 * @experimental Since 1.47.0
 	 * @author SAP SE
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl.RegistrationDelegator

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

@@ -20,7 +20,7 @@ function(
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 *
 	 * @private
 	 * @static

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

@@ -20,7 +20,7 @@ function(
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 *
 	 * @private
 	 * @static

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 *
 	 * @private
 	 * @static

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

@@ -83,7 +83,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.FlexController
 	 * @experimental Since 1.27.0
 	 * @author SAP SE
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 */
 	var FlexController = function(sComponentName) {
 		this._oChangePersistence = undefined;

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

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.FlexControllerFactory
 	 * @experimental Since 1.27.0
 	 * @author SAP SE
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

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

@@ -41,7 +41,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.LayerUtils
 	 * @author SAP SE
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 */
 	var LayerUtils = {
 		_mLayersIndex: mLayersIndex,

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

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

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

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @experimental Since 1.43.0
 	 */
 	var RegistrationDelegator = {

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

@@ -47,7 +47,7 @@ function(
 	 * @namespace
 	 * @alias sap.ui.fl.Utils
 	 * @author SAP SE
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @experimental Since 1.25.0
 	 */
 	var Utils = {

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

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @class Variant class.
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @alias sap.ui.fl.Variant
 	 * @experimental Since 1.52.0
 	 */

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

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @experimental Since 1.27.0
 	 */
 	var XmlPreprocessorImpl = function() {

package/src/sap/ui/fl/apply/_internal/DelegateMediator.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 *
 	 * @experimental Since 1.80 This class is experimental and provides only limited functionality. Also the API might be
 	 *               changed in future.

package/src/sap/ui/fl/apply/_internal/changes/FlexCustomData.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.FlexCustomData
 	 * @experimental Since 1.61.0
 	 * @author SAP SE
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 */
 	var FlexCustomData = {};
 	FlexCustomData.sync = {};

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.connectors.changes.Utils
 	 * @since 1.70
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal, sap.ui.fl.write._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/Preprocessor.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.Preprocessor
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/Registration.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.Registration
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/RegistrationBuild.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild
 	 * @experimental
 	 * @since 1.77
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/AddAnnotationsToOData.js

@@ -139,7 +139,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.app.AddAnnotationsToOData
 	 * @experimental
 	 * @since 1.87
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeDataSource.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.app.ChangeDataSouce
 	 * @experimental
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeInbound.js

@@ -25,7 +25,7 @@ sap.ui.define([
      *
      * @namespace sap.ui.fl.apply._internal.changes.descriptor.app.ChangeInbound
      * @experimental
-     * @version 1.96.4
+     * @version 1.96.7
      * @private
      * @ui5-restricted sap.ui.fl.apply._internal
      */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/SetTitle.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.app.SetTitle
 	 * @experimental
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetAbstract.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.fiori.SetAbstract
 	 * @experimental
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetRegistrationIds.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.fiori.SetRegistrationIds
 	 * @experimental
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/AddNewCard.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ovp.AddNewCard
 	 * @experimental
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/ChangeCard.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ovp.ChangeCard
 	 * @experimental
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/DeleteCard.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ovp.DeleteCard
 	 * @experimental
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddComponentUsages.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.AddComponentUsages
 	 * @experimental
 	 * @since 1.86
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddLibrary.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.AddLibrary
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddNewModel.js

@@ -97,7 +97,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.AddNewModel
 	 * @experimental
 	 * @since 1.87
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddNewModelEnhanceWith.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.AddNewModelEnhanceWith
 	 * @experimental
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetFlexExtensionPointEnabled.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.SetFlexExtensionPointEnabled
 	 * @experimental
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetMinUI5Version.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.SetMinUI5Version
 	 * @experimental
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/connectors/ObjectStorageUtils.js

@@ -12,7 +12,7 @@ sap.ui.define([], function () {
 	 *
 	 * @namespace sap.ui.fl.initial._internal.connectors.Utils
 	 * @since 1.70
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal, sap.ui.fl.write._internal
 	 */

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

@@ -32,7 +32,7 @@ function(
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 */
 	var Processor;
 

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

@@ -72,7 +72,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.FlexState
 	 * @experimental
 	 * @since 1.73
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
@@ -84,7 +84,6 @@ sap.ui.define([
 	var _oShellNavigationService;
 	var _oURLParsingService;
 	var _oChangePersistenceFactory;
-	var _oFlexControllerFactory;
 	var _mFlexObjectInfo = {
 		appDescriptorChanges: {
 			prepareFunction: prepareAppDescriptorMap,
@@ -300,12 +299,10 @@ sap.ui.define([
 	//       is migrated from changePersistenceFactory to the FlexState
 	function lazyLoadModules() {
 		return Promise.all([
-			Utils.requireAsync("sap/ui/fl/ChangePersistenceFactory"),
-			Utils.requireAsync("sap/ui/fl/FlexControllerFactory")
+			Utils.requireAsync("sap/ui/fl/ChangePersistenceFactory")
 		])
 			.then(function(aModules) {
 				_oChangePersistenceFactory = aModules[0];
-				_oFlexControllerFactory = aModules[1];
 			})
 			.catch(function(oError) {
 				Log.error("Error loading modules: " + oError.message);
@@ -385,11 +382,11 @@ sap.ui.define([
 			delete _mInitPromises[sReference];
 			// TODO: get rid of the following deletes as far as the change state
 			//       is migrated from changePersistenceFactory to the FlexState
-			if (_oChangePersistenceFactory && _oChangePersistenceFactory._instanceCache) {
-				delete _oChangePersistenceFactory._instanceCache[sReference];
-			}
-			if (_oFlexControllerFactory && _oFlexControllerFactory._instanceCache) {
-				delete _oFlexControllerFactory._instanceCache[sReference];
+			if (
+				_oChangePersistenceFactory
+				&& (_oChangePersistenceFactory._instanceCache || {}).hasOwnProperty(sReference)
+			) {
+				_oChangePersistenceFactory._instanceCache[sReference].removeDirtyChanges();
 			}
 		} else {
 			Object.keys(_mInstances).forEach(function(sReference) {

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

@@ -81,7 +81,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.Loader
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal.flexState
 	 */
@@ -119,6 +119,7 @@ sap.ui.define([
 			var sCacheKey = mPropertyBag.reInitialize ? undefined : ManifestUtils.getCacheKeyFromAsyncHints(mPropertyBag.reference, mPropertyBag.asyncHints);
 
 			return ApplyStorage.loadFlexData({
+				preview: ManifestUtils.getPreviewSectionFromAsyncHints(mPropertyBag.asyncHints),
 				reference: mPropertyBag.reference,
 				componentName: sComponentName,
 				cacheKey: sCacheKey,

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

@@ -20,15 +20,11 @@ function(
 	}
 
 	function getFlAsyncHint(oAsyncHints) {
-		var oFlAsyncHint;
-
-		oAsyncHints.requests.some(function(oAsyncHint) {
-			if (oAsyncHint.name === "sap.ui.fl.changes") {
-				oFlAsyncHint = oAsyncHint;
-			}
-		});
-
-		return oFlAsyncHint;
+		if (oAsyncHints && oAsyncHints.requests && Array.isArray(oAsyncHints.requests)) {
+			return oAsyncHints.requests.find(function(oAsyncHint) {
+				return oAsyncHint.name === "sap.ui.fl.changes";
+			});
+		}
 	}
 
 	/**
@@ -37,7 +33,7 @@ function(
 	 * @namespace sap.ui.fl.apply._internal.flexState.ManifestUtils
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.96.4
+	 * @version 1.96.7
 	 * @private
 	 */
 	var ManifestUtils = {
@@ -85,21 +81,24 @@ function(
 		},
 
 		getCacheKeyFromAsyncHints: function(sReference, oAsyncHints) {
-			if (oAsyncHints && oAsyncHints.requests && Array.isArray(oAsyncHints.requests)) {
-				var oFlAsyncHint = getFlAsyncHint(oAsyncHints);
-				if (oFlAsyncHint && oFlAsyncHint.reference === sReference) {
-					return oFlAsyncHint.cachebusterToken || "<NO CHANGES>";
-				}
+			var oFlAsyncHint = getFlAsyncHint(oAsyncHints);
+			if (oFlAsyncHint && oFlAsyncHint.reference === sReference) {
+				return oFlAsyncHint.cachebusterToken || "<NO CHANGES>";
+			}
+		},
+
+		getPreviewSectionFromAsyncHints: function(oAsyncHints) {
+			var oFlAsyncHint = getFlAsyncHint(oAsyncHints);
+			if (oFlAsyncHint) {
+				return oFlAsyncHint.preview;
 			}
 		},
 
 		getChangeManifestFromAsyncHints: function(oAsyncHints) {
 			// whenever there is a back end providing a fl async hint it is also not necessary to merge on client side
-			if (oAsyncHints && oAsyncHints.requests && Array.isArray(oAsyncHints.requests)) {
-				var oFlAsyncHint = getFlAsyncHint(oAsyncHints);
-				if (oFlAsyncHint) {
-					return false;
-				}
+			var oFlAsyncHint = getFlAsyncHint(oAsyncHints);
+			if (oFlAsyncHint) {
+				return false;
 			}
 
 			return true;