@openui5/sap.ui.fl 1.120.22 → 1.120.24

package/THIRDPARTY.txt

@@ -6,7 +6,7 @@ The full text of all referenced licenses is appended at the end of this file.
 
 Library: sap.m:
 
-Component: purify.js, version: 2.3.8
+Component: purify.js, version: 3.1.7
 Copyright: Mario Heiderich
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.fl",
-  "version": "1.120.22",
+  "version": "1.120.24",
   "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.120.22",
-    "@openui5/sap.ui.core": "1.120.22"
+    "@openui5/sap.m": "1.120.24",
+    "@openui5/sap.ui.core": "1.120.24"
   }
 }

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

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

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

@@ -74,7 +74,7 @@ sap.ui.define([
 	 *
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 * @since 1.25.0
 	 * @private
 	 * @param {object} mComponent - Component data to initiate <code>ChangePersistence</code> instance

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.ChangePersistenceFactory
 	 * @since 1.27.0
 	 * @author SAP SE
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -20,7 +20,7 @@ function(
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 *
 	 * @private
 	 * @since 1.48

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

@@ -20,7 +20,7 @@ function(
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 *
 	 * @private
 	 * @since 1.58

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

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 *
 	 * @private
 	 * @since 1.48

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

@@ -77,7 +77,7 @@ sap.ui.define([
 	 * @since 1.27.0
 	 * @private
 	 * @author SAP SE
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 */
 	var FlexController = function(sComponentName) {
 		this._oChangePersistence = undefined;

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.FlexControllerFactory
 	 * @since 1.27.0
 	 * @author SAP SE
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 *
 	 * @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.120.22
+	 * @version 1.120.24
 	 */
 	var LayerUtils = {
 		_mLayersIndex: mLayersIndex,

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

@@ -66,7 +66,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.Utils
 	 * @author SAP SE
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.rta

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 *
 	 */
 	var DelegateMediator = {};

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

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @since 1.61.0
 	 * @private
 	 * @author SAP SE
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 */
 	var FlexCustomData = {};
 

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.Utils
 	 * @since 1.70
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal, sap.ui.fl.write._internal
 	 */

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.Preprocessor
 	 * @since 1.74
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

@@ -17,7 +17,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.Registration
 	 * @since 1.74
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild
 	 * @since 1.77
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

@@ -135,7 +135,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.app.AddAnnotationsToOData
 	 * @since 1.87
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

@@ -34,7 +34,7 @@ sap.ui.define([
 	*
 	* @namespace
 	* @alias sap.ui.fl.apply._internal.changes.descriptor.app.AddNewInbound
-	* @version 1.120.22
+	* @version 1.120.24
 	* @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
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.app.ChangeDataSource
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 * @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
 	* @alias sap.ui.fl.apply._internal.changes.descriptor.app.ChangeInbound
-	* @version 1.120.22
+	* @version 1.120.24
 	* @private
 	* @ui5-restricted sap.ui.fl.apply._internal
 	*/

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

@@ -44,7 +44,7 @@ sap.ui.define([
      *
      * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.app.RemoveAllInboundsExceptOne
-     * @version 1.120.22
+     * @version 1.120.24
      * @private
      * @ui5-restricted sap.ui.fl.apply._internal
      */

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * Available for both runtime and build {@link sap.ui.fl.apply._internal.changes.descriptor.Registration}.
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.app.SetTitle
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 * @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
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.fiori.SetAbstract
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 * @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
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.fiori.SetRegistrationIds
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 * @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
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.ovp.AddNewCard
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 * @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
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.ovp.ChangeCard
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * Available for both runtime and build {@link sap.ui.fl.apply._internal.changes.descriptor.Registration}.
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ovp.DeleteCard
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.AddComponentUsages
 	 * @since 1.86
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

@@ -48,7 +48,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.ui5.AddLibrary
 	 * @since 1.74
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

@@ -95,7 +95,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.ui5.AddNewModel
 	 * @since 1.87
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.ui5.AddNewModelEnhanceWith
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 * @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
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.ui5.SetFlexExtensionPointEnabled
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 *
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.ui5.SetMinUI5Version
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 * @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.120.22
+	 * @version 1.120.24
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal, sap.ui.fl.write._internal
 	 */

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

@@ -34,7 +34,7 @@ function(
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 */
 	var Processor;
 

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.120.22
+	 * @version 1.120.24
 	 * @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.120.22
+	 * @version 1.120.24
 	 * @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.120.22
+	 * @version 1.120.24
 	 * @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.120.22
+	 * @version 1.120.24
 	 * @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.120.22
+	 * @version 1.120.24
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -97,7 +97,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexObjects.FlexObjectFactory
 	 * @since 1.100
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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.120.22
+	 * @version 1.120.24
 	 * @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.120.22
+	 * @version 1.120.24
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -6,6 +6,7 @@
 
 sap.ui.define([
 	"sap/base/util/restricted/_omit",
+	"sap/base/util/Deferred",
 	"sap/base/util/each",
 	"sap/base/util/merge",
 	"sap/base/util/ObjectPath",
@@ -25,6 +26,7 @@ sap.ui.define([
 	"sap/ui/fl/requireAsync"
 ], function(
 	_omit,
+	Deferred,
 	each,
 	merge,
 	ObjectPath,
@@ -85,7 +87,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.FlexState
 	 * @since 1.73
-	 * @version 1.120.22
+	 * @version 1.120.24
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
@@ -353,27 +355,26 @@ sap.ui.define([
 		return mFilteredReturn;
 	}
 
-	function loadFlexData(mPropertyBag) {
-		_mInitPromises[mPropertyBag.reference] = Loader.loadFlexData(mPropertyBag)
-		.then(function(mResponse) {
-			// The following line is used by the Flex Support Tool to set breakpoints - please adjust the tool if you change it!
-			_mInstances[mPropertyBag.reference] = merge({}, {
-				unfilteredStorageResponse: mResponse,
-				preparedMaps: {},
-				componentId: mPropertyBag.componentId,
-				componentData: mPropertyBag.componentData,
-				partialFlexState: mPropertyBag.partialFlexState
-			});
+	async function loadFlexData(mPropertyBag) {
+		const mResponse = await Loader.loadFlexData(mPropertyBag);
+		storeInfoInSession(mPropertyBag.reference, mResponse);
 
-			storeInfoInSession(mPropertyBag.reference, mResponse);
+		return mResponse;
+	}
 
-			// no further changes to storageResponse properties allowed
-			Object.freeze(_mInstances[mPropertyBag.reference].storageResponse);
-			Object.freeze(_mInstances[mPropertyBag.reference].unfilteredStorageResponse);
-			return mResponse;
+	function prepareNewInstance(mResponse, mPropertyBag) {
+		// The following line is used by the Flex Support Tool to set breakpoints - please adjust the tool if you change it!
+		_mInstances[mPropertyBag.reference] = merge({}, {
+			unfilteredStorageResponse: mResponse,
+			preparedMaps: {},
+			componentId: mPropertyBag.componentId,
+			componentData: mPropertyBag.componentData,
+			partialFlexState: mPropertyBag.partialFlexState
 		});
 
-		return _mInitPromises[mPropertyBag.reference];
+		// no further changes to storageResponse properties allowed
+		Object.freeze(_mInstances[mPropertyBag.reference].storageResponse);
+		Object.freeze(_mInstances[mPropertyBag.reference].unfilteredStorageResponse);
 	}
 
 	function storeInfoInSession(sReference, mResponse) {
@@ -434,30 +435,31 @@ sap.ui.define([
 	 * @param {boolean} [mPropertyBag.partialFlexState=false] - if true state is initialized partially and does not include flex bundles
 	 * @returns {Promise<undefined>} Resolves a promise as soon as FlexState is initialized
 	 */
-	FlexState.initialize = function(mPropertyBag) {
-		return Promise.all([
-			lazyLoadModules()
-		])
-		.then(function() {
-			enhancePropertyBag(mPropertyBag);
-			var sFlexReference = mPropertyBag.reference;
-
-			if (_mInitPromises[sFlexReference]) {
-				return _mInitPromises[sFlexReference]
-				.then(checkPartialFlexState.bind(null, mPropertyBag))
-				.then(checkComponentId)
-				.then(function(mEvaluatedProperties) {
-					return mEvaluatedProperties.reInitialize
-						? loadFlexData(mEvaluatedProperties)
-						: _mInstances[sFlexReference].unfilteredStorageResponse;
-				});
+	FlexState.initialize = async function(mPropertyBag) {
+		const mProperties = merge({}, mPropertyBag);
+		enhancePropertyBag(mProperties);
+		const sFlexReference = mProperties.reference;
+
+		const oOldInitPromise = _mInitPromises[sFlexReference];
+		const oNewInitPromise = new Deferred();
+		_mInitPromises[sFlexReference] = oNewInitPromise;
+		await lazyLoadModules();
+
+		if (oOldInitPromise) {
+			await oOldInitPromise.promise;
+			checkPartialFlexState(mProperties);
+			checkComponentId(mProperties);
+			if (mProperties.reInitialize) {
+				const oResponse = await loadFlexData(mProperties);
+				prepareNewInstance(oResponse, mProperties);
 			}
+		} else {
+			const oResponse = await loadFlexData(mProperties);
+			prepareNewInstance(oResponse, mProperties);
+		}
 
-			return loadFlexData(mPropertyBag);
-		})
-		.then(function(mPropertyBag) {
-			initializeNewInstance(mPropertyBag);
-		}.bind(null, mPropertyBag));
+		initializeNewInstance(mProperties);
+		oNewInitPromise.resolve();
 	};
 
 	/**
@@ -503,7 +505,7 @@ sap.ui.define([
 	 * @param {string} [mPropertyBag.adaptationId] - Context-based adaptation for which the state should be updated
 	 * @returns {Promise<undefined>} Resolves when the data is loaded and the runtime persistence is updated
 	 */
-	FlexState.update = function(mPropertyBag) {
+	FlexState.update = async function(mPropertyBag) {
 		enhancePropertyBag(mPropertyBag);
 		var sReference = mPropertyBag.reference;
 		var oCurrentRuntimePersistence = _mInstances[sReference].runtimePersistence;
@@ -517,19 +519,22 @@ sap.ui.define([
 			_oChangePersistenceFactory._instanceCache[sReference].removeDirtyChanges();
 		}
 
-		return (_mInitPromises[sReference] || Promise.resolve())
-		.then(loadFlexData.bind(this, mPropertyBag))
-		.then(function() {
-			_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mInstances[sReference].unfilteredStorageResponse);
-			var bUpdated = updateRuntimePersistence(
-				sReference,
-				_mInstances[sReference].storageResponse,
-				oCurrentRuntimePersistence
-			);
-			if (bUpdated) {
-				oFlexObjectsDataSelector.checkUpdate({ reference: sReference });
-			}
-		});
+		const oOldInitPromise = _mInitPromises[sReference].promise;
+		const oNewInitPromise = new Deferred();
+		_mInitPromises[sReference] = oNewInitPromise;
+		await oOldInitPromise;
+		const oResponse = await loadFlexData(mPropertyBag);
+		prepareNewInstance(oResponse, mPropertyBag);
+		_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mInstances[sReference].unfilteredStorageResponse);
+		const bUpdated = updateRuntimePersistence(
+			sReference,
+			_mInstances[sReference].storageResponse,
+			oCurrentRuntimePersistence
+		);
+		if (bUpdated) {
+			oFlexObjectsDataSelector.checkUpdate({ reference: sReference });
+		}
+		oNewInitPromise.resolve();
 	};
 
 	function getChangeCategory(oChangeDefinition) {
@@ -753,7 +758,7 @@ sap.ui.define([
 	// TODO: also used by the CompVariantState to mutate the storage response, this has to be changed
 	FlexState.getStorageResponse = function(sReference) {
 		if (_mInitPromises[sReference]) {
-			return _mInitPromises[sReference].then(function() {
+			return _mInitPromises[sReference].promise.then(function() {
 				return _mInstances[sReference].unfilteredStorageResponse;
 			});
 		}