@openui5/sap.ui.fl 1.136.3 → 1.139.0

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.VariantManagementChange
 	 * @since 1.135
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -6,12 +6,12 @@
 
 sap.ui.define([
 	"sap/ui/core/Lib",
-	"sap/ui/fl/Layer",
-	"sap/ui/fl/registry/Settings"
+	"sap/ui/fl/initial/_internal/Settings",
+	"sap/ui/fl/Layer"
 ], function(
 	Lib,
-	Layer,
-	Settings
+	Settings,
+	Layer
 ) {
 	"use strict";
 
@@ -21,7 +21,7 @@ sap.ui.define([
 	 *
 	 * @function
 	 * @since 1.121
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 * @alias module:sap/ui/fl/apply/_internal/flexState/compVariants/getVariantAuthor

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

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.flexState.FlexObjectState
 	 * @since 1.83
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -73,7 +73,6 @@ sap.ui.define([
 	 * 			},
 	 * 			loadModules: <boolean>
 	 * 		},
-	 * 		unfilteredStorageResponse: {...}, // same as above but without layer filtering
 	 * 		runtimePersistence: {
 	 * 			flexObjects: [...],
 	 * 			runtimeOnlyData: {
@@ -82,22 +81,23 @@ sap.ui.define([
 	 * 		},
 	 * 		maxLayer: <string>,
 	 * 		emptyState: <boolean>,
-	 *		partialFlexState: <boolean>,
+	 *		skipLoadBundle: <boolean>,
 	 *		componentId: "<componentId>",
 	 *		componentData: {...}
 	 *	}
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.FlexState
 	 * @since 1.73
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
-	var FlexState = {};
+	const FlexState = {};
 
-	var _mInstances = {};
-	var _mInitPromises = {};
-	var _mFlexObjectInfo = {
+	const _mInstances = {};
+	const _mCachedFlexData = {};
+	const _mInitPromises = {};
+	const _mFlexObjectInfo = {
 		appDescriptorChanges: {
 			pathInResponse: []
 		},
@@ -120,7 +120,7 @@ sap.ui.define([
 	// some runtime data is only fetched once (e.g. during control init) and has to survive an invalidation of the FlexState
 	// TODO: Move to runtime persistence as soon as flex objects are no longer deleted during cache invalidation
 	// but instead updated with the new data from the flex response
-	var _mExternalData = {
+	const _mExternalData = {
 		compVariants: {},
 		flexObjects: {}
 	};
@@ -245,7 +245,7 @@ sap.ui.define([
 
 		if (!_mInstances[sReference].preparedMaps[sMapName]) {
 			var mPropertyBag = {
-				unfilteredStorageResponse: _mInstances[sReference].unfilteredStorageResponse,
+				unfilteredStorageResponse: _mCachedFlexData[sReference],
 				storageResponse: _mInstances[sReference].storageResponse,
 				componentId: _mInstances[sReference].componentId,
 				componentData: _mInstances[sReference].componentData,
@@ -357,7 +357,7 @@ sap.ui.define([
 			bDataUpdated = true;
 		}
 		if (!_mInstances[sReference].storageResponse) {
-			_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mInstances[sReference].unfilteredStorageResponse);
+			_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mCachedFlexData[sReference]);
 			// Flex objects need to be recreated
 			delete _mInstances[sReference].runtimePersistence;
 			bDataUpdated = true;
@@ -399,31 +399,28 @@ sap.ui.define([
 		return mFilteredReturn;
 	}
 
-	async function loadFlexData(mPropertyBag) {
+	async function loadAndCacheFlexData(mPropertyBag) {
 		const mResponse = await Loader.loadFlexData(mPropertyBag);
-		if (!mPropertyBag.partialFlexState) {
+		if (!mPropertyBag.skipLoadBundle) {
 			mResponse.authors = await Loader.loadVariantsAuthors(mPropertyBag.reference);
 		}
+		_mCachedFlexData[mPropertyBag.reference] = merge({}, mResponse);
 		storeInfoInSession(mPropertyBag.reference, mResponse);
-
-		return mResponse;
 	}
 
-	function prepareNewInstance(mResponse, mPropertyBag) {
+	function prepareNewInstance(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,
+			skipLoadBundle: mPropertyBag.skipLoadBundle,
 			version: mPropertyBag.version,
 			allContextsProvided: mPropertyBag.allContextsProvided
 		});
 
 		// no further changes to storageResponse properties allowed
 		Object.freeze(_mInstances[mPropertyBag.reference].storageResponse);
-		Object.freeze(_mInstances[mPropertyBag.reference].unfilteredStorageResponse);
 	}
 
 	function storeInfoInSession(sReference, mResponse) {
@@ -437,19 +434,17 @@ sap.ui.define([
 
 	function checkPartialFlexState(mInitProperties) {
 		var oFlexInstance = _mInstances[mInitProperties.reference];
-		if (oFlexInstance.partialFlexState === true && mInitProperties.partialFlexState !== true) {
-			oFlexInstance.partialFlexState = false;
-			mInitProperties.partialFlexData = merge({}, oFlexInstance.unfilteredStorageResponse.changes);
+		if (oFlexInstance.skipLoadBundle === true && mInitProperties.skipLoadBundle !== true) {
+			oFlexInstance.skipLoadBundle = false;
+			mInitProperties.partialFlexData = merge({}, _mCachedFlexData[mInitProperties.reference].changes);
 			mInitProperties.reInitialize = true;
 		}
 	}
 
-	function checkComponentId(mInitProperties) {
+	function checkComponentIdChanged(mInitProperties) {
 		var sFlexInstanceComponentId = _mInstances[mInitProperties.reference].componentId;
 		// if the component with the same reference was rendered with a new ID - clear existing state
-		if (!mInitProperties.reInitialize && sFlexInstanceComponentId !== mInitProperties.componentId) {
-			mInitProperties.reInitialize = true;
-		}
+		return sFlexInstanceComponentId !== mInitProperties.componentId;
 	}
 
 	function checkVersionAndAllContexts(mInitProperties) {
@@ -471,7 +466,6 @@ sap.ui.define([
 
 	function initializeEmptyState(sReference) {
 		_mInstances[sReference] = {
-			unfilteredStorageResponse: { changes: StorageUtils.getEmptyFlexDataResponse() },
 			storageResponse: { changes: StorageUtils.getEmptyFlexDataResponse() },
 			preparedMaps: {},
 			emptyState: true,
@@ -479,6 +473,7 @@ sap.ui.define([
 			reInitialize: true,
 			componentId: ""
 		};
+		_mCachedFlexData[sReference] = { changes: StorageUtils.getEmptyFlexDataResponse() };
 		const oNewInitPromise = new Deferred();
 		_mInitPromises[sReference] = oNewInitPromise;
 		oNewInitPromise.resolve();
@@ -505,7 +500,7 @@ sap.ui.define([
 	 * @param {object} [mPropertyBag.asyncHints] - Async hints passed from the app index to the component processing
 	 * @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
-	 * @param {boolean} [mPropertyBag.partialFlexState=false] - if true state is initialized partially and does not include flex bundles
+	 * @param {boolean} [mPropertyBag.skipLoadBundle=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 = async function(mPropertyBag) {
@@ -520,17 +515,19 @@ sap.ui.define([
 		if (oOldInitPromise) {
 			await oOldInitPromise.promise;
 			checkPartialFlexState(mProperties);
-			checkComponentId(mProperties);
 			checkVersionAndAllContexts(mProperties);
 			if (mProperties.reInitialize) {
-				const oResponse = await loadFlexData(mProperties);
-				prepareNewInstance(oResponse, mProperties);
+				await loadAndCacheFlexData(mProperties);
+				prepareNewInstance(mProperties);
+			} else if (checkComponentIdChanged(mProperties)) {
+				// a changed component Id does not invalidate the cached flex data, only the instance
+				prepareNewInstance(mProperties);
 			} else {
 				rebuildResponseIfMaxLayerChanged(mPropertyBag.reference);
 			}
 		} else {
-			const oResponse = await loadFlexData(mProperties);
-			prepareNewInstance(oResponse, mProperties);
+			await loadAndCacheFlexData(mProperties);
+			prepareNewInstance(mProperties);
 		}
 
 		initializeNewInstance(mProperties);
@@ -582,9 +579,9 @@ sap.ui.define([
 		}
 		const oInstance = _mInstances[mPropertyBag.reference];
 		Object.entries(mPropertyBag.newData).forEach(([sKey, vValue]) => {
-			oInstance.unfilteredStorageResponse.changes[sKey].push(...vValue);
+			_mCachedFlexData[mPropertyBag.reference].changes[sKey].push(...vValue);
 		});
-		oInstance.storageResponse = filterByMaxLayer(mPropertyBag.reference, oInstance.unfilteredStorageResponse);
+		oInstance.storageResponse = filterByMaxLayer(mPropertyBag.reference, _mCachedFlexData[mPropertyBag.reference]);
 		oInstance.runtimePersistence.flexObjects =
 		[
 			...oInstance.runtimePersistence.flexObjects,
@@ -614,9 +611,9 @@ sap.ui.define([
 		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);
+		await loadAndCacheFlexData(mPropertyBag);
+		prepareNewInstance(mPropertyBag);
+		_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mCachedFlexData[sReference]);
 		const bUpdated = updateRuntimePersistence(
 			sReference,
 			_mInstances[sReference].storageResponse,
@@ -664,11 +661,11 @@ sap.ui.define([
 		const aFlexObjectUpdates = [];
 		aUpdates.forEach((oUpdate) => {
 			if (oUpdate.type === "ui2") {
-				_mInstances[sReference].unfilteredStorageResponse.changes.ui2personalization = oUpdate.newData;
+				_mCachedFlexData[sReference].changes.ui2personalization = oUpdate.newData;
 			} else {
 				const vPath = getChangeCategory(oUpdate.flexObject);
 				const sFileName = oUpdate.flexObject.fileName;
-				const aUnfiltered = ObjectPath.get(vPath, _mInstances[sReference].unfilteredStorageResponse.changes);
+				const aUnfiltered = ObjectPath.get(vPath, _mCachedFlexData[sReference].changes);
 				const aFiltered = ObjectPath.get(vPath, _mInstances[sReference].storageResponse.changes);
 				const iExistingFlexObjectIdx = _mInstances[sReference].runtimePersistence.flexObjects.findIndex(
 					(oFlexObject) => oFlexObject.getId() === sFileName
@@ -717,8 +714,8 @@ sap.ui.define([
 			delete _mInitPromises[sReference];
 			oFlexObjectsDataSelector.clearCachedResult({ reference: sReference });
 		} else {
-			_mInstances = {};
-			_mInitPromises = {};
+			Object.keys(_mInstances).forEach((sReference) => delete _mInstances[sReference]);
+			Object.keys(_mInitPromises).forEach((sReference) => delete _mInitPromises[sReference]);
 			oFlexObjectsDataSelector.clearCachedResult();
 		}
 	};
@@ -786,7 +783,7 @@ sap.ui.define([
 	FlexState.rebuildFilteredResponse = function(sReference) {
 		if (_mInstances[sReference]) {
 			_mInstances[sReference].preparedMaps = {};
-			_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mInstances[sReference].unfilteredStorageResponse);
+			_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mCachedFlexData[sReference]);
 			// Storage response has changed, recreate the flex objects
 			_mInstances[sReference].runtimePersistence = buildRuntimePersistence(
 				_mInstances[sReference],
@@ -831,11 +828,7 @@ sap.ui.define([
 
 	FlexState.removeDirtyFlexObjects = function(sReference, aFlexObjects) {
 		const aRemovedFlexObjects = [];
-		// FIXME: Currently called from the ChangePersistence which might be
-		// independent of FlexState in some test cases
-		// Once the ChangePersistence is no longer used
-		// make sure to remove the safeguard
-		if (_mInstances[sReference] && aFlexObjects.length > 0) {
+		if (aFlexObjects.length > 0) {
 			const aCurrentFlexObjects = _mInstances[sReference].runtimePersistence.flexObjects;
 			aFlexObjects.forEach(function(oFlexObject) {
 				const iIndex = aCurrentFlexObjects.indexOf(oFlexObject);
@@ -873,7 +866,7 @@ sap.ui.define([
 	};
 
 	FlexState.getUI2Personalization = function(sReference) {
-		return merge({}, _mInstances[sReference].unfilteredStorageResponse.changes.ui2personalization);
+		return merge({}, _mCachedFlexData[sReference].changes.ui2personalization);
 	};
 
 	FlexState.getCompVariantsMap = function(sReference) {
@@ -884,12 +877,11 @@ sap.ui.define([
 		return _mFlexObjectInfo[sMapName].prepareFunction(mPropertyBag);
 	};
 
-	// temporary function until ChangePersistence.getChangesForComponent is gone
-	// TODO: also used by the CompVariantState to mutate the storage response, this has to be changed
+	// TODO: used by the CompVariantState to mutate the storage response, this has to be changed
 	FlexState.getStorageResponse = function(sReference) {
 		if (_mInitPromises[sReference]) {
 			return _mInitPromises[sReference].promise.then(function() {
-				return _mInstances[sReference].unfilteredStorageResponse;
+				return _mCachedFlexData[sReference];
 			});
 		}
 		return Promise.resolve();

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

@@ -8,16 +8,16 @@ sap.ui.define([
 	"sap/base/util/ObjectPath",
 	"sap/ui/base/ManagedObject",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/initial/_internal/Settings",
 	"sap/ui/fl/initial/_internal/Storage",
-	"sap/ui/fl/initial/_internal/StorageUtils",
-	"sap/ui/fl/registry/Settings"
+	"sap/ui/fl/initial/_internal/StorageUtils"
 ], function(
 	ObjectPath,
 	ManagedObject,
 	ManifestUtils,
-	ApplyStorage,
-	StorageUtils,
-	Settings
+	Settings,
+	Storage,
+	StorageUtils
 ) {
 	"use strict";
 
@@ -135,7 +135,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.Loader
 	 * @since 1.74
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal.flexState
 	 */
@@ -155,15 +155,16 @@ sap.ui.define([
 		 * @param {object} [mPropertyBag.asyncHints] - Async hints passed from the app index to the component processing
 		 * @param {number} [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
-		 * @param {object} [mPropertyBag.partialFlexData] - Contains current flexstate for this reference, indicator to reload bundles from storage
+		 * @param {boolean} [mPropertyBag.skipLoadBundle=false] - If true only the partial flex data is loaded, without the bundle
 		 * @param {boolean} [mPropertyBag.allContexts] - Includes also restricted context
+		 * @param {object} [mPropertyBag.partialFlexData] - Already loaded data if only the bundle has to be loaded
 		 * @returns {Promise<object>} resolves with the change file for the given component from the Storage
 		 */
 		loadFlexData(mPropertyBag) {
 			var sComponentName = ManifestUtils.getBaseComponentNameFromManifest(mPropertyBag.manifest);
 
 			if (mPropertyBag.partialFlexData) {
-				return ApplyStorage.completeFlexData({
+				return Storage.completeFlexData({
 					reference: mPropertyBag.reference,
 					componentName: sComponentName,
 					partialFlexData: mPropertyBag.partialFlexData
@@ -173,7 +174,7 @@ sap.ui.define([
 			// the cache key cannot be used in case of a reinitialization
 			var sCacheKey = mPropertyBag.reInitialize ? undefined : ManifestUtils.getCacheKeyFromAsyncHints(mPropertyBag.reference, mPropertyBag.asyncHints);
 
-			return ApplyStorage.loadFlexData({
+			return Storage.loadFlexData({
 				preview: ManifestUtils.getPreviewSectionFromAsyncHints(mPropertyBag.asyncHints),
 				reference: mPropertyBag.reference,
 				componentName: sComponentName,
@@ -182,7 +183,8 @@ sap.ui.define([
 				appDescriptor: mPropertyBag.manifest.getRawJson ? mPropertyBag.manifest.getRawJson() : mPropertyBag.manifest,
 				version: mPropertyBag.version,
 				allContexts: mPropertyBag.allContexts,
-				adaptationId: mPropertyBag.adaptationId
+				adaptationId: mPropertyBag.adaptationId,
+				skipLoadBundle: mPropertyBag.skipLoadBundle
 			})
 			.then(applyDeactivateChanges.bind())
 			.then(filterInvalidFileNames.bind())
@@ -200,7 +202,7 @@ sap.ui.define([
 			// the settings are available due to previous loadFlexData calls or
 			// not available due to an async hint stating that no changes are available, thus also no author mapping needed
 			const oSettings = Settings.getInstanceOrUndef();
-			return oSettings?.isVariantAuthorNameAvailable() ? ApplyStorage.loadVariantsAuthors(sReference) : Promise.resolve({});
+			return oSettings?.getIsVariantAuthorNameAvailable() ? Storage.loadVariantsAuthors(sReference) : Promise.resolve({});
 		}
 	};
 });

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

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

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

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.flexState.changes.UIChangesState
 	 * @since 1.121
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantManagementState.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.compVariants.CompVariantManagementState
 	 * @since 1.129
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger.js

@@ -125,7 +125,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.compVariants.CompVariantMerger
 	 * @since 1.86
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -215,7 +215,7 @@ sap.ui.define([
 		 *
 		 * @function
 		 * @since 1.89
-		 * @version 1.136.3
+		 * @version 1.139.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.136.3
+	 * @version 1.139.0
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -55,7 +55,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.VariantManagementState
 	 * @since 1.74
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -542,11 +542,11 @@ sap.ui.define([
 	 * @param {string} mPropertyBag.vmReference - Variant management reference
 	 * @param {string} mPropertyBag.reference - Component reference
 	 * @param {string} [mPropertyBag.vReference] - Variant reference
-	 * @returns {object} All variant changes of the variant
+	 * @returns {object[]} All variant changes of the variant
 	 */
 	VariantManagementState.getVariantChangesForVariant = function(mPropertyBag) {
 		var oVariant = VariantManagementState.getVariant(mPropertyBag);
-		return oVariant && oVariant.variantChanges || {};
+		return oVariant?.variantChanges || [];
 	};
 
 	/**

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

@@ -16,7 +16,6 @@ sap.ui.define([
 	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 	"sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerRegistration",
 	"sap/ui/fl/variants/VariantModel",
-	"sap/ui/fl/FlexControllerFactory",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/Utils",
 	"sap/ui/model/json/JSONModel",
@@ -34,7 +33,6 @@ sap.ui.define([
 	ControlVariantApplyAPI,
 	ChangeHandlerRegistration,
 	VariantModel,
-	FlexControllerFactory,
 	Layer,
 	Utils,
 	JSONModel,
@@ -126,7 +124,6 @@ sap.ui.define([
 
 	async function propagateChangesForAppComponent(oAppComponent) {
 		// only manifest with type = "application" will fetch changes
-		var oFlexController = FlexControllerFactory.createForControl(oAppComponent);
 		const sReference = ManifestUtils.getFlexReferenceForControl(oAppComponent);
 		var oVariantModel;
 		var fnPropagationListener = ChangesApplier.applyAllChangesForControl.bind(
@@ -134,9 +131,9 @@ sap.ui.define([
 			oAppComponent,
 			sReference
 		);
-		fnPropagationListener._bIsSapUiFlFlexControllerApplyChangesOnControl = true;
+		fnPropagationListener._bIsFlexApplyChangesFunction = true;
 		oAppComponent.addPropagationListener(fnPropagationListener);
-		oVariantModel = ComponentLifecycleHooks._createVariantModel(oFlexController, oAppComponent);
+		oVariantModel = ComponentLifecycleHooks._createVariantModel(oAppComponent);
 		await oVariantModel.initialize();
 		Measurement.end("flexProcessing");
 		oAppComponent.setModel(oVariantModel, ControlVariantApplyAPI.getVariantModelName());
@@ -204,9 +201,8 @@ sap.ui.define([
 	}
 
 	// the current sinon version used in UI5 does not support stubbing the constructor
-	ComponentLifecycleHooks._createVariantModel = function(oFlexController, oAppComponent) {
+	ComponentLifecycleHooks._createVariantModel = function(oAppComponent) {
 		return new VariantModel({}, {
-			flexController: oFlexController,
 			appComponent: oAppComponent
 		});
 	};
@@ -254,13 +250,13 @@ sap.ui.define([
 			componentData: oComponentData
 		});
 		try {
-			// partialFlexState has to be true as there is no guarantee that the flex bundle is already available at this point
+			// skipLoadBundle has to be true as there is no guarantee that the flex bundle is already available at this point
 			await FlexState.initialize({
 				componentData: oComponentData,
 				asyncHints: oPropertyBag.owner?.config.asyncHints || oPropertyBag.factoryConfig.asyncHints,
 				componentId: sAppComponentId,
 				reference: sReference,
-				partialFlexState: true
+				skipLoadBundle: true
 			});
 			const sServiceUrl = ODataUtils.removeOriginSegmentParameters(oPropertyBag.model.getServiceUrl());
 			const aRelevantAnnotationChanges = FlexState.getAnnotationChanges(sReference)

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

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

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

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 * @since 1.43.0
 	 * @private
 	 */

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

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 * @since 1.27.0
 	 * @private
 	 */

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

@@ -14,7 +14,7 @@ sap.ui.define([
 	"sap/ui/fl/initial/_internal/FlexConfiguration",
 	"sap/ui/fl/initial/_internal/FlexInfoSession",
 	"sap/ui/fl/initial/api/InitialFlexAPI",
-	"sap/ui/fl/registry/Settings",
+	"sap/ui/fl/initial/_internal/Settings",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/Utils",
 	"sap/ui/VersionInfo"
@@ -251,6 +251,11 @@ sap.ui.define([
 			};
 		},
 
+		// Used for stubbing in tests
+		_getHostname() {
+			return document.location.hostname;
+		},
+
 		/**
 		 * Checks if the Settings are available and if so returns if the system is a customer system
 		 *
@@ -259,7 +264,21 @@ sap.ui.define([
 		 * @ui5-restricted sap.ui.rta
 		 */
 		isCustomerSystem() {
-			return Settings.getInstanceOrUndef()?.isCustomerSystem();
+			const oSettings = Settings.getInstanceOrUndef();
+			const sSystemType = oSettings?.getSystemType();
+			const bIsCustomerSystem = {
+				CUSTOMER: true,
+				SAP: false
+			}[sSystemType];
+			const sHostname = this._getHostname();
+
+			return bIsCustomerSystem !== undefined
+				? bIsCustomerSystem
+				// Fallback if back end has no info, guess based on hostname
+				: !(
+					sHostname === "localhost"
+					|| sHostname === "127.0.0.1"
+				);
 		},
 
 		/**
@@ -270,7 +289,7 @@ sap.ui.define([
 		 * @ui5-restricted sap.ui.rta
 		 */
 		isAtoEnabled() {
-			return Settings.getInstanceOrUndef()?.isAtoEnabled();
+			return Settings.getInstanceOrUndef()?.getIsAtoEnabled();
 		},
 
 		/**

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.136.3
+	 * @version 1.139.0
 	 * @since 1.72
 	 * @private
 	 */