@openui5/sap.ui.fl 1.138.0 → 1.140.0

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

@@ -6,47 +6,19 @@
 
 sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantManagementState",
-	"sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger",
 	"sap/ui/fl/apply/_internal/flexState/compVariants/Utils",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
-	"sap/ui/fl/LayerUtils",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/Utils"
 ], function(
 	CompVariantManagementState,
-	CompVariantMerger,
 	CompVariantUtils,
 	FlexState,
 	ManifestUtils,
-	LayerUtils,
 	Utils
 ) {
 	"use strict";
 
-	function getCompEntities(mPropertyBag) {
-		var oControl = mPropertyBag.control;
-		var oVMControl = oControl.getVariantManagement?.() || oControl;
-		var sSVMControlId = oVMControl.getId();
-
-		return FlexState.initialize({
-			reference: mPropertyBag.reference,
-			componentData: {},
-			manifest: Utils.getAppDescriptor(oControl),
-			componentId: Utils.getAppComponentForControl(oControl).getId()
-		}).then(function() {
-			var mCompVariantsMap = FlexState.getCompVariantsMap(mPropertyBag.reference);
-			// Store external input data to FlexState so they can be restored after invalidating cache
-			FlexState.setInitialNonFlCompVariantData(
-				mPropertyBag.reference,
-				mPropertyBag.persistencyKey,
-				mPropertyBag.standardVariant,
-				mPropertyBag.variants,
-				sSVMControlId
-			);
-			return mCompVariantsMap._initialize(mPropertyBag.persistencyKey, mPropertyBag.variants, sSVMControlId);
-		});
-	}
-
 	/**
 	 * Object containing data for a SmartVariantManagement control.
 	 *
@@ -101,7 +73,7 @@ sap.ui.define([
 		 * 	sap.ui.comp.smarttable.SmartTable|
 		 * 	sap.ui.comp.smartchart.SmartChart} mPropertyBag.control - Variant management control to load variants for
 		 * @param {sap.ui.fl.apply.api.SmartVariantManagementApplyAPI.LoadVariantsInput} mPropertyBag.standardVariant - The standard variant of the control;
-		 * a standard variant is created into the response but may be replaced later if data is loaded afterwards
+		 * a standard variant is created into the response but may be replaced later if data is loaded afterward
 		 * instructing the SVM to do so
 		 * @param {sap.ui.fl.apply.api.SmartVariantManagementApplyAPI.LoadVariantsInput[]} mPropertyBag.variants - Variant data from other data providers like an OData service
 		 * @returns {Promise<sap.ui.fl.apply.api.SmartVariantManagementApplyAPI.LoadVariantsResponse>} Object with the standard variant and the variants
@@ -110,24 +82,51 @@ sap.ui.define([
 		 * @ui5-restricted sap.ui.comp
 		 */
 		async loadVariants(mPropertyBag) {
-			mPropertyBag.reference = ManifestUtils.getFlexReferenceForControl(mPropertyBag.control);
-			mPropertyBag.persistencyKey = CompVariantUtils.getPersistencyKey(mPropertyBag.control);
+			const oControl = mPropertyBag.control;
+			const sReference = ManifestUtils.getFlexReferenceForControl(oControl);
+			const sPersistencyKey = CompVariantUtils.getPersistencyKey(oControl);
 
-			const mCompMaps = await getCompEntities(mPropertyBag);
+			const mProperties = Object.assign({
+				reference: sReference,
+				persistencyKey: sPersistencyKey,
+				componentId: Utils.getAppComponentForControl(oControl).getId()
+			}, mPropertyBag);
 
-			const mMergedCompVariants = CompVariantMerger.merge(
-				mPropertyBag.persistencyKey,
-				mCompMaps,
-				mPropertyBag.standardVariant,
-				mPropertyBag.control
-			);
+			await FlexState.initialize({
+				componentId: mProperties.componentId
+			});
+			FlexState.addSVMControl(sReference, oControl);
+			CompVariantManagementState.addExternalVariants(mProperties);
 
-			mMergedCompVariants.defaultVariantId = CompVariantManagementState.getDefaultVariantId({
-				persistencyKey: mPropertyBag.persistencyKey,
-				reference: mPropertyBag.reference,
-				variants: mMergedCompVariants.variants
+			const aVariants = CompVariantManagementState.assembleVariantList(mProperties);
+
+			const sDefaultVariantId = CompVariantManagementState.getDefaultVariantId({
+				persistencyKey: sPersistencyKey,
+				reference: sReference,
+				variants: aVariants
 			});
-			return mMergedCompVariants;
+
+			const aVariantsWithoutStandard = [];
+			let oStandardVariant;
+
+			aVariants.forEach((oVariant) => {
+				if (oVariant.getStandardVariant()) {
+					oStandardVariant = oVariant;
+				} else {
+					aVariantsWithoutStandard.push(oVariant);
+				}
+
+				// the default is always visible and thus a favorite
+				if (oVariant.getVariantId() === sDefaultVariantId) {
+					oVariant.setFavorite(true);
+				}
+			});
+
+			return {
+				defaultVariantId: sDefaultVariantId,
+				variants: aVariantsWithoutStandard,
+				standardVariant: oStandardVariant
+			};
 		}
 	};
 

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

@@ -7,7 +7,7 @@
 sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/UI2Personalization/UI2PersonalizationState",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils"
+	"sap/ui/fl/initial/_internal/ManifestUtils"
 ], function(
 	UI2PersonalizationState,
 	FlexState,

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

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.AddXML
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @since 1.54
 	 * @private
 	 */

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

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.AddXMLAtExtensionPoint
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @since 1.75
 	 * @private
 	 */

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

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

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.changeHandler.BaseAddViaDelegate
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted change handlers
 	 */

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.BaseAddXml
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @since 1.75
 	 * @private
 	 * @ui5-restricted change handlers

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

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.changeHandler.BaseRename
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @since 1.46
 	 *
 	 * @private

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

@@ -15,7 +15,7 @@ sap.ui.define([
 	 * Default change handler for annotations.
 	 * @alias sap.ui.fl.changeHandler.ChangeAnnotation
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @since 1.132
 	 * @public
 	 */

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * Change handler for hiding of a control.
 	 * @alias sap.ui.fl.changeHandler.HideControl
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @since 1.27.0
 	 */
 	const HideControl = {};

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

@@ -19,7 +19,7 @@ function(
 	 *
 	 * @alias sap.ui.fl.changeHandler.MoveControls
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @since 1.46
 	 */
 	const MoveControls = { };

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

@@ -12,7 +12,7 @@ sap.ui.define([], function() {
 	 *
 	 * @alias sap.ui.fl.changeHandler.MoveElements
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @since 1.34.0
 	 */
 	var MoveElements = { };

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

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.PropertyBindingChange
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @since 1.38
 	 * @private
 	 */

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.PropertyChange
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @since 1.36
 	 * @private
 	 */

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * Change handler for stashing of a control.
 	 * @alias sap.ui.fl.changeHandler.StashControl
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @since 1.27.0
 	 */
 	const StashControl = {};

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * Change handler for revealing of a control.
 	 * @alias sap.ui.fl.changeHandler.UnhideControl
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @since 1.27.0
 	 */
 	const UnhideControl = {};

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

@@ -15,7 +15,7 @@ sap.ui.define([
 	 * Change handler for unstashing of a control.
 	 * @alias sap.ui.fl.changeHandler.UnstashControl
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @since 1.27.0
 	 */
 	const UnstashControl = {};

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

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

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.fl.descriptorRelated
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.fl.descriptorRelated.api
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorChange
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

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

@@ -15,7 +15,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.fl.descriptorRelated
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.fl.descriptorRelated.api
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorChangeFactory
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

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

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

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

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

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * The flexibility Configuration.
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @alias module:sap/ui/fl/initial/_internal/FlexConfiguration
 	 * @namespace

package/src/sap/ui/fl/{apply/_internal/flexState → initial/_internal}/Loader.js

@@ -7,7 +7,7 @@
 sap.ui.define([
 	"sap/base/util/ObjectPath",
 	"sap/ui/base/ManagedObject",
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/initial/_internal/Settings",
 	"sap/ui/fl/initial/_internal/Storage",
 	"sap/ui/fl/initial/_internal/StorageUtils"
@@ -16,7 +16,7 @@ sap.ui.define([
 	ManagedObject,
 	ManifestUtils,
 	Settings,
-	ApplyStorage,
+	Storage,
 	StorageUtils
 ) {
 	"use strict";
@@ -135,7 +135,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.Loader
 	 * @since 1.74
-	 * @version 1.138.0
+	 * @version 1.140.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,10 +183,11 @@ 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())
+			.then(applyDeactivateChanges)
+			.then(filterInvalidFileNames)
 			.then(migrateSelectorFlags.bind(undefined, isMigrationNeeded(mPropertyBag.manifest)))
 			.then(formatFlexData);
 		},
@@ -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?.getIsVariantAuthorNameAvailable() ? ApplyStorage.loadVariantsAuthors(sReference) : Promise.resolve({});
+			return oSettings?.getIsVariantAuthorNameAvailable() ? Storage.loadVariantsAuthors(sReference) : Promise.resolve({});
 		}
 	};
 });

package/src/sap/ui/fl/{apply/_internal/flexState → initial/_internal}/ManifestUtils.js

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

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

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.fl.initial._internal.Settings
 	 * @since 1.137
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -99,6 +99,18 @@ sap.ui.define([
 			delete oSettingsProperties.isZeroDowntimeUpgradeRunning;
 			delete oSettingsProperties.isAtoAvailable;
 
+			// to avoid failing assertions, remove any unknown properties
+			const aUnknownPropertyNames = Object.keys(oSettingsProperties)
+			.map((sProperty) => {
+				if (!Settings.getMetadata().getAllProperties()[sProperty]) {
+					delete oSettingsProperties[sProperty];
+					return sProperty;
+				}
+				return null;
+			})
+			.filter(Boolean);
+			Log.warning(`Unknown settings received from the backend: ${aUnknownPropertyNames.join(", ")}`);
+
 			// The following line is used by the Flex Support Tool to set breakpoints - please adjust the tool if you change it!
 			oSettingsInstance = new Settings(oSettingsProperties);
 			return oSettingsInstance;

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

@@ -28,7 +28,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.initial._internal.Storage
 	 * @since 1.67
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -204,6 +204,7 @@ sap.ui.define([
 	 * @param {number} [mPropertyBag.version] - Number of the version for which the data should be loaded
 	 * @param {boolean} [mPropertyBag.allContexts] Includes also restricted context
 	 * @param {string} [mPropertyBag.adaptationId] - Context-based adaptation to be loaded
+	 * @param {string} [mPropertyBag.skipLoadBundle=false] - If true only the partial flex data is loaded, without the bundle
 	 * @returns {Promise<object>} Resolves with the responses from all configured connectors merged into one object
 	 */
 	Storage.loadFlexData = function(mPropertyBag) {
@@ -211,7 +212,7 @@ sap.ui.define([
 			return Promise.reject("No reference was provided");
 		}
 
-		return StorageUtils.getLoadConnectors()
+		return StorageUtils.getLoadConnectors(mPropertyBag.skipLoadBundle)
 		.then(_loadFlexDataFromConnectors.bind(this, mPropertyBag))
 		.then(_flattenAndMergeResultPromise);
 	};

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.intial._internal.StorageFeaturesMerger
 	 * @since 1.70
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal.Storage
 	 */

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.initial._internal.StorageUtils
 	 * @since 1.74
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal.Storage, sap.ui.fl.write._internal.Storage,
 	 * 	sap.ui.fl.initial._internal.connectors.ObjectStorageConnector, sap.ui.fl.initial._internal.connectors.ObjectPathConnector
@@ -140,14 +140,15 @@ sap.ui.define([
 	/**
 	 * Provides all mandatory connectors required to apply or write data depending on the given namespace.
 	 *
-	 * @param {string} sNameSpace Namespace to determine the path to the configured connectors
-	 * @param {boolean} bLoadConnectors Flag to determine if the loading scenario is used and the StaticFileConnector should be included
+	 * @param {string} sNameSpace - Namespace to determine the path to the configured connectors
+	 * @param {boolean} bLoadConnectors - Flag to determine if the loading scenario is used and the StaticFileConnector should be included
+	 * @param {boolean} bSkipAddStaticFileConnector - Flag to determine if the StaticFileConnector should be added
 	 * @returns {Promise<map[]>} Resolving with a list of maps for all configured connectors and their requested modules
 	 */
-	StorageUtils.getConnectors = function(sNameSpace, bLoadConnectors) {
+	StorageUtils.getConnectors = function(sNameSpace, bLoadConnectors, bSkipAddStaticFileConnector) {
 		var aConfiguredConnectors = FlexConfiguration.getFlexibilityServices();
 		var mConnectors = [];
-		if (bLoadConnectors) {
+		if (bLoadConnectors && !bSkipAddStaticFileConnector) {
 			mConnectors = [STATIC_FILE_CONNECTOR_CONFIGURATION];
 		}
 
@@ -160,10 +161,11 @@ sap.ui.define([
 	 * Provides all mandatory connectors required to read data for the initial case; these are the static
 	 * file connector as well as all connectors mentioned in the core-Configuration.
 	 *
+	 * @param {boolean} bSkipAddStaticFileConnector - Flag to determine if the StaticFileConnector should be added
 	 * @returns {Promise<map[]>} Resolving with a list of maps for all configured initial connectors and their requested modules
 	 */
-	StorageUtils.getLoadConnectors = function() {
-		return this.getConnectors(INITIAL_CONNECTOR_NAME_SPACE, true);
+	StorageUtils.getLoadConnectors = function(bSkipAddStaticFileConnector) {
+		return this.getConnectors(INITIAL_CONNECTOR_NAME_SPACE, true, bSkipAddStaticFileConnector);
 	};
 
 	/**

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

@@ -84,7 +84,7 @@ sap.ui.define([
 		 * @alias sap.ui.fl.registry.ChangeHandlerRegistration
 		 *
 		 * @author SAP SE
-		 * @version 1.138.0
+		 * @version 1.140.0
 		 * @private
 		 * @ui5-restricted sap.ui.fl
 		 *

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.registry.ChangeHandlerStorage
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 *

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

@@ -62,7 +62,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.initial._internal.connectors.Utils
 	 * @since 1.70
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal.connectors, sap.ui.fl.write._internal.connectors, sap.ui.fl.write._internal.transport
 	 */

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

@@ -51,7 +51,7 @@ function(
 	 * @name sap.ui.fl.initial._internal.storageResultDisassemble
 	 * @function
 	 * @since 1.70
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal.Storage
 	 * Disassembles a response with a variant section into one or more plain responses.

package/src/sap/ui/fl/initial/api/InitialFlexAPI.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias module:sap/ui/fl/initial/api/InitialFlexAPI
 	 * @since 1.132
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/interfaces/BaseLoadConnector.js

@@ -12,7 +12,7 @@ sap.ui.define([], function() {
 	 *
 	 * @name sap.ui.fl.interfaces.BaseLoadConnector
 	 * @since 1.79
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 *
 	 * @private
 	 * @ui5-restricted SAP Web IDE (Visual Editor), UX Tools

package/src/sap/ui/fl/interfaces/Delegate.js

@@ -106,7 +106,7 @@ sap.ui.define([
 	 * @private
 	 * @ui5-restricted
 	 * @since 1.78
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 *
 	 * @private
 	 * @ui5-restricted