@openui5/sap.ui.fl 1.122.0 → 1.123.0

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.122.0
+	 * @version 1.123.0
 	 * @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.122.0
+	 * @version 1.123.0
 	 * @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.122.0
+	 * @version 1.123.0
 	 * @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.122.0
+	 * @version 1.123.0
 	 * @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.122.0
+	 * @version 1.123.0
 	 * @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.122.0
+	 * @version 1.123.0
 	 * @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.122.0
+	 * @version 1.123.0
 	 * @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.122.0
+	 * @version 1.123.0
 	 * @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.122.0
+	 * @version 1.123.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

@@ -5,11 +5,15 @@
  */
 
 sap.ui.define([
+	"sap/base/util/merge",
 	"sap/ui/fl/apply/_internal/connectors/ObjectStorageUtils",
-	"sap/ui/fl/initial/_internal/StorageUtils"
+	"sap/ui/fl/initial/_internal/StorageUtils",
+	"sap/ui/fl/interfaces/BaseLoadConnector"
 ], function(
+	merge,
 	ObjectStorageUtils,
-	StorageUtils
+	StorageUtils,
+	BaseConnector
 ) {
 	"use strict";
 
@@ -33,7 +37,7 @@ sap.ui.define([
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal.Storage, sap.ui.fl.write._internal.Storage, SAP Web IDE
 	 */
-	var ObjectStorageConnector = {
+	var ObjectStorageConnector = merge({}, BaseConnector, {
 		/**
 		 * can be either window.sessionStorage or window.localStorage
 		 */
@@ -59,7 +63,7 @@ sap.ui.define([
 				return StorageUtils.filterAndSortResponses(mGroupedFlexObjects);
 			});
 		}
-	};
+	});
 
 	ObjectStorageConnector.storage = ObjectStorageConnector.oStorage;
 

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.122.0
+	 * @version 1.123.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal, sap.ui.fl.write._internal
 	 */

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

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.122.0
+	 * @version 1.123.0
 	 */
 	var Processor;
 

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

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.apply._internal.extensionPoint.Registry
 	 *
 	 * @author SAP SE
-	 * @version 1.122.0
+	 * @version 1.123.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

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

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

@@ -22,7 +22,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.122.0
+	 * @version 1.123.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.122.0
+	 * @version 1.123.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -11,9 +11,9 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexObjects/ControllerExtensionChange",
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObject",
 	"sap/ui/fl/apply/_internal/flexObjects/FlVariant",
+	"sap/ui/fl/apply/_internal/flexObjects/getVariantAuthor",
 	"sap/ui/fl/apply/_internal/flexObjects/States",
 	"sap/ui/fl/apply/_internal/flexObjects/UIChange",
-	"sap/ui/fl/apply/_internal/flexObjects/getVariantAuthor",
 	"sap/ui/fl/registry/Settings",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/LayerUtils",
@@ -26,9 +26,9 @@ sap.ui.define([
 	ControllerExtensionChange,
 	FlexObject,
 	FlVariant,
+	getVariantAuthor,
 	States,
 	UIChange,
-	getVariantAuthor,
 	Settings,
 	Layer,
 	LayerUtils,
@@ -97,7 +97,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexObjects.FlexObjectFactory
 	 * @since 1.100
-	 * @version 1.122.0
+	 * @version 1.123.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -208,10 +208,8 @@ sap.ui.define([
 				type: "XFLD"
 			}
 		};
-
-		const oFlVariant = new FlVariant(mProperties);
-		oFlVariant.setAuthor(getVariantAuthor(oFlVariant, mPropertyBag.authors));
-		return oFlVariant;
+		mProperties.author = getVariantAuthor(mProperties.supportInformation.user, mProperties.layer, mPropertyBag.authors);
+		return new FlVariant(mProperties);
 	};
 
 	/**
@@ -268,10 +266,8 @@ sap.ui.define([
 				mCompVariantContent.content.executeOnSelection
 			);
 		}
-
-		const oCompVariant = new CompVariant(mCompVariantContent);
-		oCompVariant.setAuthor(getVariantAuthor(oCompVariant, mAuthors));
-		return oCompVariant;
+		mCompVariantContent.author = getVariantAuthor(mCompVariantContent.supportInformation.user, mCompVariantContent.layer, mAuthors);
+		return new CompVariant(mCompVariantContent);
 	};
 
 	return FlexObjectFactory;

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.122.0
+	 * @version 1.123.0
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -4,8 +4,10 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
+	"sap/ui/fl/apply/_internal/flexObjects/getVariantAuthor",
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObject"
 ], function(
+	getVariantAuthor,
 	FlexObject
 ) {
 	"use strict";
@@ -17,7 +19,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.122.0
+	 * @version 1.123.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -80,7 +82,9 @@ sap.ui.define([
 			if (!this.getVariantId()) {
 				this.setVariantId(this.getId());
 			}
-			this.setAuthor(this.getSupportInformation().user || "");
+			if (!this.getAuthor()) {
+				this.setAuthor(getVariantAuthor(this.getSupportInformation().user, this.getLayer(), {}));
+			}
 		}
 	});
 

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

@@ -21,24 +21,25 @@ sap.ui.define([
 	 *
 	 * @function
 	 * @since 1.121
-	 * @version 1.122.0
+	 * @version 1.123.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 * @alias module:sap/ui/fl/apply/_internal/flexState/compVariants/getVariantAuthor
 	 *
-	 * @param {sap.ui.fl.apply.flexObjects.Variant} oVariant - A variant object for which the Author should be retrieved
+	 * @param {string} sUserId - UserId of variant author
+	 * @param {sap.ui.fl.Layer} sLayer - Layer in which the variant should be stored
 	 * @param {object} mMapIdsNames - Map of user IDs and users' names
 	 * @returns {string} The resolved author of variant
 	 */
-	return (oVariant, mMapIdsNames) => {
-		const sAuthor = oVariant.getSupportInformation().user || "";
+	return (sUserId, sLayer, mMapIdsNames) => {
+		const sAuthor = sUserId || "";
 		const oSettings = Settings.getInstanceOrUndef();
 
-		if (oVariant.getLayer() === Layer.USER || sAuthor === oSettings?.getUserId()) {
+		if (sLayer === Layer.USER || sAuthor === oSettings?.getUserId()) {
 			return Lib.getResourceBundleFor("sap.ui.fl").getText("VARIANT_SELF_OWNER_NAME");
 		}
 
-		if (![Layer.PUBLIC, Layer.CUSTOMER].includes(oVariant.getLayer())) {
+		if (![Layer.PUBLIC, Layer.CUSTOMER].includes(sLayer)) {
 			return sAuthor;
 		}
 

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

@@ -77,7 +77,8 @@ sap.ui.define([
 	 * 			runtimeOnlyData: {
 	 * 				liveDependencyMap: {...}
 	 * 			}
-	 * 		}
+	 * 		},
+	 * 		maxLayer: <string>,
 	 * 		emptyState: <boolean>,
 	 *		partialFlexState: <boolean>,
 	 *		componentId: "<componentId>",
@@ -86,7 +87,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.FlexState
 	 * @since 1.73
-	 * @version 1.122.0
+	 * @version 1.123.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
@@ -162,6 +163,10 @@ sap.ui.define([
 		mPropertyBag.componentData ||= (oComponent && oComponent.getComponentData()) || {};
 		mPropertyBag.manifest ||= mPropertyBag.rawManifest || (oComponent && oComponent.getManifestObject()) || {};
 		mPropertyBag.reference ||= ManifestUtils.getFlexReference(mPropertyBag);
+		const oFlexInfoSession = FlexInfoSession.getByReference(mPropertyBag.reference);
+		mPropertyBag.version ||= oFlexInfoSession.version;
+		mPropertyBag.adaptationId ||= oFlexInfoSession.displayedAdaptationId;
+		mPropertyBag.allContextsProvided ||= oFlexInfoSession.allContextsProvided;
 	}
 
 	function createFlexObjects(oStorageResponse) {
@@ -316,6 +321,7 @@ sap.ui.define([
 		}
 		if (!_mInstances[sReference].storageResponse) {
 			_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mInstances[sReference].unfilteredStorageResponse);
+			_mInstances[sReference].maxLayer = FlexInfoSession.getByReference(sReference).maxLayer;
 			// Flex objects need to be recreated
 			delete _mInstances[sReference].runtimePersistence;
 			bDataUpdated = true;
@@ -358,14 +364,18 @@ sap.ui.define([
 	function loadFlexData(mPropertyBag) {
 		_mInitPromises[mPropertyBag.reference] = Loader.loadFlexData(mPropertyBag)
 		.then(async (mResponse) => {
-			mResponse.authors = await Loader.loadVariantsAuthors(mPropertyBag.reference);
+			if (!mPropertyBag.partialFlexState) {
+				mResponse.authors = await Loader.loadVariantsAuthors(mPropertyBag.reference);
+			}
 			// 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
+				partialFlexState: mPropertyBag.partialFlexState,
+				version: mPropertyBag.version,
+				allContextsProvided: mPropertyBag.allContextsProvided
 			});
 
 			storeInfoInSession(mPropertyBag.reference, mResponse);
@@ -405,6 +415,18 @@ sap.ui.define([
 		}
 	}
 
+	function checkVersionAndAllContexts(mInitProperties) {
+		var sFlexInstanceVersion = _mInstances[mInitProperties.reference].version;
+		if (!mInitProperties.reInitialize && sFlexInstanceVersion !== mInitProperties.version) {
+			mInitProperties.reInitialize = true;
+		}
+
+		const bFlexInstanceAllContexts = _mInstances[mInitProperties.reference].allContextsProvided;
+		if (!mInitProperties.reInitialize && bFlexInstanceAllContexts !== mInitProperties.allContextsProvided) {
+			mInitProperties.reInitialize = true;
+		}
+	}
+
 	// TODO: get rid of the following module dependencies as soon as the change state
 	// is migrated from changePersistenceFactory to the FlexState
 	function lazyLoadModules() {
@@ -416,6 +438,12 @@ sap.ui.define([
 		});
 	}
 
+	function rebuildResponseIfMaxLayerChanged(sReference) {
+		if (_mInstances[sReference]?.maxLayer !== FlexInfoSession.getByReference(sReference).maxLayer) {
+			FlexState.rebuildFilteredResponse(sReference);
+		}
+	}
+
 	function initializeEmptyState(sReference) {
 		_mInstances[sReference] = {
 			unfilteredStorageResponse: { changes: StorageUtils.getEmptyFlexDataResponse() },
@@ -463,8 +491,11 @@ sap.ui.define([
 			await _mInitPromises[sFlexReference];
 			checkPartialFlexState(mProperties);
 			checkComponentId(mProperties);
+			checkVersionAndAllContexts(mProperties);
 			if (mProperties.reInitialize) {
 				await loadFlexData(mProperties);
+			} else {
+				rebuildResponseIfMaxLayerChanged(mPropertyBag.reference);
 			}
 		} else {
 			await loadFlexData(mProperties);
@@ -486,24 +517,6 @@ sap.ui.define([
 		return !!_mInstances[sReference];
 	};
 
-	/**
-	 * Clears the cache and then triggers a call to the backend to fetch new data
-	 *
-	 * @param {object} mPropertyBag - Contains additional data needed for reading and storing changes
-	 * @param {string} mPropertyBag.componentId - ID of the component
-	 * @param {string} [mPropertyBag.reference] - Flex reference of the app
-	 * @param {object} [mPropertyBag.manifest] - Manifest that belongs to actual component
-	 * @param {string} [mPropertyBag.componentData] - Component data of the current component
-	 * @param {string} [mPropertyBag.version] - Number of the version in which the state should be initialized
-	 * @param {string} [mPropertyBag.adaptationId] - Context-based adaptation for which the state should be initialized
-	 * @returns {Promise<undefined>} Resolves a promise as soon as FlexState is initialized again
-	 */
-	FlexState.clearAndInitialize = function(mPropertyBag) {
-		enhancePropertyBag(mPropertyBag);
-		FlexState.clearState(mPropertyBag.reference);
-		return FlexState.initialize(mPropertyBag);
-	};
-
 	/**
 	 * Triggers a call to the backend to fetch new data and update the runtime persistence
 	 *
@@ -533,6 +546,7 @@ sap.ui.define([
 		await _mInitPromises[sReference];
 		await loadFlexData(mPropertyBag);
 		_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mInstances[sReference].unfilteredStorageResponse);
+		_mInstances[sReference].maxLayer = FlexInfoSession.getByReference(sReference).maxLayer;
 		var bUpdated = updateRuntimePersistence(
 			sReference,
 			_mInstances[sReference].storageResponse,
@@ -706,6 +720,7 @@ sap.ui.define([
 		if (_mInstances[sReference]) {
 			_mInstances[sReference].preparedMaps = {};
 			_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mInstances[sReference].unfilteredStorageResponse);
+			_mInstances[sReference].maxLayer = FlexInfoSession.getByReference(sReference).maxLayer;
 			// Storage response has changed, recreate the flex objects
 			_mInstances[sReference].runtimePersistence = buildRuntimePersistence(
 				_mInstances[sReference],
@@ -725,7 +740,7 @@ sap.ui.define([
 		if (!_mInstances[sReference]) {
 			initializeEmptyState(sReference);
 		}
-		const sAdaptationLayer = FlexInfoSession.getByReference(sReference)?.adaptationLayer;
+		const sAdaptationLayer = FlexInfoSession.getByReference(sReference).adaptationLayer;
 		const bFlexObjectsOverAdaptationLayer = !!sAdaptationLayer
 			&& LayerUtils.isOverLayer(oFlexObject.getLayer(), sAdaptationLayer);
 		// FIXME: Currently called from the ChangePersistence which might be
@@ -751,7 +766,7 @@ sap.ui.define([
 		if (!_mInstances[sReference]) {
 			initializeEmptyState(sReference);
 		}
-		const sAdaptationLayer = FlexInfoSession.getByReference(sReference)?.adaptationLayer;
+		const sAdaptationLayer = FlexInfoSession.getByReference(sReference).adaptationLayer;
 		aFlexObjects = !sAdaptationLayer ? aFlexObjects : aFlexObjects
 		.filter((oFlexObject) => !LayerUtils.isOverLayer(oFlexObject.getLayer(), sAdaptationLayer));
 

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

@@ -34,7 +34,7 @@ sap.ui.define([
 		// Exchange author  of fl variant from userID to user's name
 		mPropertyBag.flexObjects.forEach((oFlexObject) => {
 			if (oFlexObject.getFileType() === "ctrl_variant") {
-				oFlexObject.setAuthor(getVariantAuthor(oFlexObject, mPropertyBag.storageResponse.authors));
+				oFlexObject.setAuthor(getVariantAuthor(oFlexObject.getSupportInformation().user, oFlexObject.getLayer(), mPropertyBag.storageResponse.authors));
 			}
 		});
 		const aVariantIds = (mPropertyBag.storageResponse.changes.variants || [])

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

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

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

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

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.UI2Personalization.UI2PersonalizationState
 	 * @since 1.75
-	 * @version 1.122.0
+	 * @version 1.123.0
 	 * @private
 	 * @ui5-restricted
 	 */

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

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

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

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

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

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.flexState.changes.UIChangesState
 	 * @since 1.121
-	 * @version 1.122.0
+	 * @version 1.123.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.122.0
+	 * @version 1.123.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -208,7 +208,7 @@ sap.ui.define([
 		 *
 		 * @function
 		 * @since 1.89
-		 * @version 1.122.0
+		 * @version 1.123.0
 		 * @private
 		 * @ui5-restricted sap.ui.fl
 		 *

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

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

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

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

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

@@ -143,9 +143,6 @@ sap.ui.define([
 		// 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

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

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

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

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.122.0
+	 * @version 1.123.0
 	 * @since 1.43.0
 	 * @private
 	 */
@@ -95,6 +95,16 @@ sap.ui.define([
 			delegate: "sap/ui/fl/write/_internal/delegates/ODataV4ReadDelegate",
 			delegateType: DelegateMediator.types.READONLY
 		});
+		DelegateMediatorAPI.registerReadDelegate({
+			modelType: "sap.ui.model.odata.v2.ODataModel",
+			delegate: "sap/ui/fl/write/_internal/delegates/ODataV2ReadDelegate",
+			delegateType: DelegateMediator.types.READONLY
+		});
+		DelegateMediatorAPI.registerReadDelegate({
+			modelType: "sap.ui.model.odata.ODataModel",
+			delegate: "sap/ui/fl/write/_internal/delegates/ODataV2ReadDelegate",
+			delegateType: DelegateMediator.types.READONLY
+		});
 	}
 
 	/**