@openui5/sap.ui.fl 1.123.1 → 1.124.1

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

@@ -7,13 +7,13 @@
 sap.ui.define([
 	"sap/ui/core/Component",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
-	"sap/ui/fl/ChangePersistenceFactory",
+	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/Utils",
 	"sap/base/Log"
 ], function(
 	Component,
 	ManifestUtils,
-	ChangePersistenceFactory,
+	FlexState,
 	Utils,
 	Log
 ) {
@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @since 1.27.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.core
@@ -43,10 +43,6 @@ sap.ui.define([
 	}
 
 	function getExtensionModules(aCodeExtModuleNames) {
-		if (aCodeExtModuleNames.length === 0) {
-			return Promise.resolve([]);
-		}
-
 		return new Promise(function(resolve) {
 			sap.ui.require(
 				aCodeExtModuleNames,
@@ -74,7 +70,6 @@ sap.ui.define([
 	ControllerExtension.prototype.getControllerExtensions = function(sControllerName, sComponentId, bAsync) {
 		if (bAsync) {
 			if (!sComponentId) {
-				Log.warning("No component ID for determining the anchor of the code extensions was passed.");
 				// always return a promise if async
 				return Promise.resolve([]);
 			}
@@ -83,18 +78,17 @@ sap.ui.define([
 			var oAppComponent = Utils.getAppComponentForControl(oComponent);
 			// In case an application of a component can not be identified, ex: FLP plugins components, return a promise of no extension
 			if (!oAppComponent) {
-				Log.warning("No application component for determining the anchor of the code extensions was identified.");
 				return Promise.resolve([]);
 			}
 			if (!Utils.isApplication(oAppComponent.getManifestObject())) {
-				// we only consider components whose type is application. Otherwise, we might send request for components that can never have changes.
+				// we only consider components whose type is application
 				return Promise.resolve([]);
 			}
 			var sFlexReference = ManifestUtils.getFlexReferenceForControl(oAppComponent);
 
-			var oChangePersistence = ChangePersistenceFactory.getChangePersistenceForComponent(sFlexReference);
-			return oChangePersistence.getChangesForComponent().then(function(aChanges) {
-				var aExtensionModules = aChanges.filter(function(oChange) {
+			return FlexState.waitForInitialization(sFlexReference).then(() => {
+				const aFlexObjects = FlexState.getFlexObjectsDataSelector().get({reference: sFlexReference});
+				var aExtensionModules = aFlexObjects.filter(function(oChange) {
 					return isCodeExt(oChange) && isForController(sControllerName, oChange);
 				}).map(function(oChange) {
 					return oChange.getModuleName();
@@ -104,9 +98,8 @@ sap.ui.define([
 			});
 		}
 
-		Log.warning("Synchronous extensions are not supported via UI5 Flexibility");
 		return [];
 	};
 
 	return ControllerExtension;
-});
+});

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

@@ -13,7 +13,6 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/changes/descriptor/Preprocessor",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/apply/_internal/preprocessors/ComponentLifecycleHooks",
-	"sap/ui/fl/apply/_internal/DelegateMediator",
 	"sap/ui/fl/apply/api/DelegateMediatorAPI",
 	"sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerRegistration",
 	"sap/ui/base/DesignTime",
@@ -28,7 +27,6 @@ sap.ui.define([
 	Preprocessor,
 	ManifestUtils,
 	ComponentLifecycleHooks,
-	DelegateMediator,
 	DelegateMediatorAPI,
 	ChangeHandlerRegistration,
 	DesignTime
@@ -42,7 +40,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @since 1.43.0
 	 * @private
 	 */
@@ -89,21 +87,18 @@ sap.ui.define([
 		ExtensionPoint.registerExtensionProvider(getExtensionPointProvider);
 	}
 
-	function registerDefaultDelegate() {
-		DelegateMediatorAPI.registerDefaultDelegate({
+	function registerModelSpecificReadDelegates() {
+		DelegateMediatorAPI.registerReadDelegate({
 			modelType: "sap.ui.model.odata.v4.ODataModel",
-			delegate: "sap/ui/fl/write/_internal/delegates/ODataV4ReadDelegate",
-			delegateType: DelegateMediator.types.READONLY
+			delegate: "sap/ui/fl/write/_internal/delegates/ODataV4ReadDelegate"
 		});
 		DelegateMediatorAPI.registerReadDelegate({
 			modelType: "sap.ui.model.odata.v2.ODataModel",
-			delegate: "sap/ui/fl/write/_internal/delegates/ODataV2ReadDelegate",
-			delegateType: DelegateMediator.types.READONLY
+			delegate: "sap/ui/fl/write/_internal/delegates/ODataV2ReadDelegate"
 		});
 		DelegateMediatorAPI.registerReadDelegate({
 			modelType: "sap.ui.model.odata.ODataModel",
-			delegate: "sap/ui/fl/write/_internal/delegates/ODataV2ReadDelegate",
-			delegateType: DelegateMediator.types.READONLY
+			delegate: "sap/ui/fl/write/_internal/delegates/ODataV2ReadDelegate"
 		});
 	}
 
@@ -120,7 +115,7 @@ sap.ui.define([
 		registerXMLPreprocessor();
 		registerDescriptorChangeHandler();
 		registerExtensionPointProvider();
-		registerDefaultDelegate();
+		registerModelSpecificReadDelegates();
 	};
 
 	return RegistrationDelegator;

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

@@ -8,24 +8,24 @@ sap.ui.define([
 	"sap/base/util/merge",
 	"sap/ui/core/util/reflection/XmlTreeModifier",
 	"sap/ui/core/Component",
+	"sap/ui/fl/apply/_internal/changes/Applier",
 	"sap/ui/fl/apply/_internal/changes/Utils",
 	"sap/ui/fl/apply/_internal/flexState/changes/UIChangesState",
+	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
-	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
-	"sap/ui/fl/apply/_internal/changes/Applier",
 	"sap/ui/fl/Utils",
 	"sap/base/Log"
 ], function(
 	merge,
 	XmlTreeModifier,
 	Component,
+	Applier,
 	ChangesUtils,
 	UIChangesState,
+	VariantManagementState,
 	FlexState,
 	ManifestUtils,
-	ControlVariantApplyAPI,
-	Applier,
 	Utils,
 	Log
 ) {
@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @since 1.27.0
 	 * @private
 	 */
@@ -104,6 +104,9 @@ sap.ui.define([
 			}
 
 			const sReference = ManifestUtils.getFlexReferenceForControl(oAppComponent);
+
+			await FlexState.waitForInitialization(sReference);
+
 			const mPropertyBag = merge({
 				appComponent: oAppComponent,
 				modifier: XmlTreeModifier,
@@ -145,35 +148,28 @@ sap.ui.define([
 	 * @public
 	 */
 	XmlPreprocessor.getCacheKey = async function(mProperties) {
-		var oComponent = Component.getComponentById(mProperties.componentId);
-		var oAppComponent = Utils.getAppComponentForControl(oComponent);
+		const oComponent = Component.getComponentById(mProperties.componentId);
+		const oAppComponent = Utils.getAppComponentForControl(oComponent);
 
 		// no caching possible with startup parameter based variants
 		if (Utils.isVariantByStartupParameter(oAppComponent)) {
 			return undefined;
 		}
 
-		var sFlexReference = ManifestUtils.getFlexReferenceForControl(oAppComponent);
-
+		const sFlexReference = ManifestUtils.getFlexReferenceForControl(oAppComponent);
 		let sCacheKey = XmlPreprocessor.NOTAG;
 		if (sFlexReference) {
 			const oWrappedChangeFileContent = await FlexState.getStorageResponse(sFlexReference);
 			if (oWrappedChangeFileContent?.cacheKey) {
 				sCacheKey = trimEtag(oWrappedChangeFileContent.cacheKey);
 
-				const oVariantModel = await ControlVariantApplyAPI.getVariantModel(oAppComponent);
 				// If there are no changes, the standard variant is created after the variant management control is instantiated
 				// When the cache key is calculated before this happens, the standard variant id is unknown
 				// To avoid inconsistencies between page load and navigation scenarios, all standard variants are filtered
-				var aVariantManagementControlIds = oVariantModel.getVariantManagementControlIds();
-				var aCurrentControlVariantIds = oVariantModel.getCurrentControlVariantIds()
-				.filter(function(sVariantId) {
-					// FIXME: The standard variant flag should be part of the variant instance
-					// This can be changed once the variant data selector is ready
-					// For now rely on the fact that standard variants have the same name as the vm control
-					return !aVariantManagementControlIds.includes(sVariantId);
-				});
-				sCacheKey = concatControlVariantIdWithCacheKey(sCacheKey, aCurrentControlVariantIds.join("-"));
+				const aFilteredCurrentControlVariantIds = VariantManagementState.getAllCurrentVariants(sFlexReference)
+				.filter((oVariant) => !oVariant.getStandardVariant())
+				.map((oVariant) => oVariant.getId());
+				sCacheKey = concatControlVariantIdWithCacheKey(sCacheKey, aFilteredCurrentControlVariantIds.join("-"));
 			}
 		}
 

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

@@ -44,7 +44,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply.api.ControlVariantApplyAPI
 	 * @since 1.67
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @public
 	 */
 	var ControlVariantApplyAPI = /** @lends sap.ui.fl.apply.api.ControlVariantApplyAPI */{

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

@@ -5,11 +5,9 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/apply/_internal/DelegateMediator",
-	"sap/ui/fl/apply/_internal/DelegateMediatorNew"
+	"sap/ui/fl/apply/_internal/DelegateMediator"
 ], function(
-	DelegateMediator,
-	DelegateMediatorNew
+	DelegateMediator
 ) {
 	"use strict";
 
@@ -22,85 +20,42 @@ sap.ui.define([
 	 * @ui5-restricted
 	 */
 	const DelegateMediatorAPI = /** @lends sap.ui.fl.apply.api.DelegateMediatorAPI */{
-		// @deprecated
-		types: {
-			READONLY: DelegateMediator.types.READONLY,
-			WRITEONLY: DelegateMediator.types.WRITEONLY,
-			COMPLETE: DelegateMediator.types.COMPLETE
-		},
-
 		/**
-		 * Registers the default delegate by model type.
-		 *
-		 * @param {object} mPropertyBag - Property bag for default delegate
-		 * @param {object} mPropertyBag.modelType - Default delegate model type
-		 * @param {object} mPropertyBag.delegate - Path to default delegate
-		 * @param {object} mPropertyBag.delegateType - Defines the type of the default delegate.
-		 * Please look at <code>DelegageMediatorAPI.types</code> for possible entries
-	 	 * @param {object} [mPropertyBag.requiredLibraries] - Map of required libraries
-		 * @deprecated since 1.123.0
-		 */
-		registerDefaultDelegate(mPropertyBag) {
-			DelegateMediator.registerDefaultDelegate(mPropertyBag);
-		},
-
-		/**
-		 * Register model specific read delegate by the model type.
+		 * Register model-specific read delegate by the model type.
 		 *
 		 * @param {object} mPropertyBag - Property bag for read delegate
 		 * @param {object} mPropertyBag.modelType - Read delegate model type
 		 * @param {object} mPropertyBag.delegate - Path to read delegate
 		 */
 		registerReadDelegate(mPropertyBag) {
-			DelegateMediatorNew.registerReadDelegate(mPropertyBag);
+			DelegateMediator.registerReadDelegate(mPropertyBag);
 		},
 
 		/**
-		 * Registers a control specific write delegate by control type.
+		 * Registers a control-specific write delegate by control type.
 		 *
-		 * @param {object} mPropertyBag - Property bag for control specific delegate
+		 * @param {object} mPropertyBag - Property bag for control-specific delegate
 		 * @param {object} mPropertyBag.controlType - Control type
-		 * @param {object} mPropertyBag.delegate - path to control specific delegate
+		 * @param {object} mPropertyBag.delegate - Path to control-specific delegate
 		 * @param {object} [mPropertyBag.requiredLibraries] - Map of required libraries
 		 * @param {object} [mPropertyBag.payload] - Payload for the delegate
 		 */
 		registerWriteDelegate(mPropertyBag) {
-			DelegateMediatorNew.registerWriteDelegate(mPropertyBag);
-		},
-
-		/**
-		 * Returns the delegate object for the requested control.
-		 *
-		 * @param {object} mPropertyBag - Property bag
-		 * @param {sap.ui.core.Element|DomNode} mPropertyBag.control - Control for which the corresponding delegate should be returned
-		 * @param {sap.ui.core.util.reflection.BaseTreeModifier} mPropertyBag.modifier - Control tree modifier
-		 * @param {string} [mPropertyBag.modelType] - Model type; required in case you passed the <code>XmlTreeModifier</code>
-		 * @param {boolean} [mPropertyBag.supportsDefault] - Include default delegate if no instance specific delegate is available
-		 * @returns {Promise.<sap.ui.core.util.reflection.FlexDelegateInfo>} Delegate information including the lazy loaded instance of the delegate
-		 * @deprecated since 1.123.0
-		 */
-		getDelegateForControl(mPropertyBag) {
-			return DelegateMediator.getDelegateForControl(
-				mPropertyBag.control,
-				mPropertyBag.modifier,
-				mPropertyBag.modelType,
-				mPropertyBag.supportsDefault
-			);
+			DelegateMediator.registerWriteDelegate(mPropertyBag);
 		},
 
 		/**
-		 * Returns the model specific read delegate for the requested control.
-		 * The instancespcific read delegate is returned if available.
+		 * Returns the model-specific read delegate for the requested control.
+		 * The instance-specific read delegate is returned if available.
 		 *
 		 * @param {object} mPropertyBag - Property bag
 		 * @param {sap.ui.core.Element|DomNode} mPropertyBag.control - Control for which the corresponding delegate should be returned
 		 * @param {sap.ui.core.util.reflection.BaseTreeModifier} mPropertyBag.modifier - Control tree modifier
 		 * @param {string} [mPropertyBag.modelType] - Model type; required in case you passed the <code>XmlTreeModifier</code>
-		 * @param {boolean} [mPropertyBag.supportsDefault] - Include default delegate if no instance specific delegate is available
 		 * @returns {Promise.<sap.ui.core.util.reflection.FlexDelegateInfo>} Delegate information including the lazy loaded instance of the delegate
 		 */
 		getReadDelegateForControl(mPropertyBag) {
-			return DelegateMediatorNew.getReadDelegateForControl(
+			return DelegateMediator.getReadDelegateForControl(
 				mPropertyBag.control,
 				mPropertyBag.modifier,
 				mPropertyBag.modelType,
@@ -110,7 +65,7 @@ sap.ui.define([
 
 		/**
 		 * Returns the write delegate for the requested control.
-	 	 * The instancespecific write delegate is returned if available.
+	 	 * The instance-specific write delegate is returned if available.
 		 *
 		 * @param {object} mPropertyBag - Property bag
 		 * @param {sap.ui.core.Element|DomNode} mPropertyBag.control - Control for which the corresponding delegate should be returned
@@ -118,38 +73,10 @@ sap.ui.define([
 		 * @returns {Promise.<sap.ui.core.util.reflection.FlexDelegateInfo>} Delegate information including the lazy loaded instance of the delegate
 		 */
 		getWriteDelegateForControl(mPropertyBag) {
-			return DelegateMediatorNew.getWriteDelegateForControl(
+			return DelegateMediator.getWriteDelegateForControl(
 				mPropertyBag.control,
 				mPropertyBag.modifier
 			);
-		},
-
-		/**
-		 * Returns a list of library names which needs to be required to get default delegates loaded.
-		 * @returns {array} List of library names
-		 * @deprecated since 1.123.0
-		 */
-		getKnownDefaultDelegateLibraries() {
-			return DelegateMediator.getKnownDefaultDelegateLibraries();
-		},
-
-		/**
-		 * Returns a list of required libraries for the given default delegate.
-		 * If it is not a default delegate, an empty list is returned.
-		 *
-		 * @param {object} mPropertyBag - Property bag
-		 * @param {string} mPropertyBag.sDelegateName - Name of the delegate
-		 * @param {sap.ui.core.Element} mPropertyBag.oControl - Control for which the corresponding delegate was returned
-		 * @param {string} [mPropertyBag.sModelType] - Model type, if none is provided the default model of oControl is taken instead
-		 * @returns {string[]} Required libraries
- 		 * @deprecated since 1.123.0
-		 */
-		getRequiredLibrariesForDefaultDelegate(mPropertyBag) {
-			return DelegateMediator.getRequiredLibrariesForDefaultDelegate(
-				mPropertyBag.delegateName,
-				mPropertyBag.control,
-				mPropertyBag.modelType
-			);
 		}
 	};
 

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

@@ -8,10 +8,10 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/fl/apply/_internal/controlVariants/Utils",
+	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/initial/_internal/FlexConfiguration",
 	"sap/ui/fl/initial/_internal/FlexInfoSession",
-	"sap/ui/fl/ChangePersistenceFactory",
 	"sap/ui/fl/FlexControllerFactory",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/Utils",
@@ -20,10 +20,10 @@ sap.ui.define([
 	Log,
 	JsControlTreeModifier,
 	VariantUtils,
+	FlexState,
 	ManifestUtils,
 	FlexConfiguration,
 	FlexInfoSession,
-	ChangePersistenceFactory,
 	FlexControllerFactory,
 	Layer,
 	Utils,
@@ -58,6 +58,10 @@ sap.ui.define([
 				return Promise.reject(sMessage);
 			}
 
+			function filterByLayer(oChange) {
+				return oChange.getLayer() === Layer.USER;
+			}
+
 			function filterByValidFileType(oChange) {
 				return oChange.getFileType() === "change";
 			}
@@ -86,15 +90,14 @@ sap.ui.define([
 				return logAndReject("App Component could not be determined");
 			}
 
-			var oChangePersistence = ChangePersistenceFactory.getChangePersistenceForControl(oAppComponent);
-			return oChangePersistence.getChangesForComponent({currentLayer: Layer.USER, includeCtrlVariants: true})
-			.then(function(aChanges) {
-				return aChanges
-				.filter(filterByValidFileType)
-				.filter(filterBySelectors.bind(this, oAppComponent, mPropertyBag.selectors))
-				.filter(filterByChangeType.bind(this, mPropertyBag.changeTypes))
-				.length > 0;
-			}.bind(this));
+			const sFlexReference = ManifestUtils.getFlexReferenceForControl(oAppComponent);
+			const aFlexObjects = FlexState.getFlexObjectsDataSelector().get({reference: sFlexReference})
+			.filter(filterByValidFileType)
+			.filter(filterByLayer)
+			.filter(filterBySelectors.bind(this, oAppComponent, mPropertyBag.selectors))
+			.filter(filterByChangeType.bind(this, mPropertyBag.changeTypes));
+
+			return Promise.resolve(aFlexObjects.length > 0);
 		},
 
 		/**

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.123.1
+	 * @version 1.124.1
 	 * @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.123.1
+	 * @version 1.124.1
 	 * @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.123.1
+	 * @version 1.124.1
 	 * @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.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted change handlers
 	 */

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

@@ -23,24 +23,13 @@ sap.ui.define([
 		return typeof fn === "function";
 	}
 
-	function getModelType(mChangeContent) {
-		if (mChangeContent.modelType) {
-			return mChangeContent.modelType;
-		} else if (mChangeContent.oDataServiceVersion) {
-			// fallback for changes created with old addODataProperty action
-			// that was replaced by default OData V2 delegate
-			return "sap.ui.model.odata.v2.ODataModel";
-		}
-		return undefined;
-	}
-
 	/**
 	 * Base Change Handler for AddViaDelegate
 	 *
 	 * @constructor
 	 * @alias sap.ui.fl.changeHandler.BaseAddViaDelegate
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 */
 	const BaseAddViaDelegate = {
@@ -56,7 +45,6 @@ sap.ui.define([
 		 * @param  {string} mAddViaDelegateSettings.fieldSuffix - Aggregation name to be passed to the delegate
 		 * @param  {boolean|function} [mAddViaDelegateSettings.skipCreateLabel] - Skip delegate method, is a function is passed it has to return a boolean
 		 * @param  {boolean|function} [mAddViaDelegateSettings.skipCreateLayout] - Skip delegate method, is a function is passed it has to return a boolean
-		 * @param  {boolean} [mAddViaDelegateSettings.supportsDefault] - Are default delegates supported?
 		 * @return {any} The addViaDelegate change handler object
 		 * @public
 		 */
@@ -88,14 +76,11 @@ sap.ui.define([
 				// or the handler opts out
 
 				const oControl = mPropertyBag.modifier.bySelector(mChange.getSelector(), mPropertyBag.appComponent);
-				const sModelType = getModelType(mChange.getContent());
 
 				const DelegateMediatorAPI = await requireAsync("sap/ui/fl/apply/api/DelegateMediatorAPI");
-				const oDelegate = await DelegateMediatorAPI.getDelegateForControl({
+				const oDelegate = await DelegateMediatorAPI.getWriteDelegateForControl({
 					control: oControl,
-					modifier: mPropertyBag.modifier,
-					modelType: sModelType,
-					supportsDefault: mAddViaDelegateSettings.supportsDefault
+					modifier: mPropertyBag.modifier
 				});
 				const bCondensingSupported = !isFunction(oDelegate.instance.createLayout);
 				return bCondensingSupported || skipCreateLayout(mChange.getSupportInformation().oDataInformation);
@@ -119,6 +104,9 @@ sap.ui.define([
 			}
 
 			async function getControlsFromDelegate(oChangeContent, mDelegate, mPropertyBag, oChangeODataInformation) {
+				if (!mDelegate) {
+					return undefined;
+				}
 				const mDelegatePropertyBag = merge({
 					aggregationName: mAddViaDelegateSettings.aggregationName,
 					payload: mDelegate.payload || {},
@@ -180,15 +168,17 @@ sap.ui.define([
 					// so that the addProperty-hook can access it and enhance it
 					oChange.setRevertData(oRevertData);
 
-					const sModelType = getModelType(oChangeContent);
-
 					const DelegateMediatorAPI = await requireAsync("sap/ui/fl/apply/api/DelegateMediatorAPI");
-					const mDelegate = await DelegateMediatorAPI.getDelegateForControl({
+					const mDelegate = await DelegateMediatorAPI.getWriteDelegateForControl({
 						control: oControl,
-						modifier: mPropertyBag.modifier,
-						modelType: sModelType,
-						supportsDefault: mAddViaDelegateSettings.supportsDefault
+						modifier: mPropertyBag.modifier
 					});
+					if (!mDelegate) {
+						Base.markAsNotApplicable(
+							`No delegate found for control ${mPropertyBag.modifier.getId(oControl)}`,
+							/* bAsync */false
+						);
+					}
 					const mInnerControls = await getControlsFromDelegate(
 						oChangeContent,
 						mDelegate,
@@ -274,7 +264,6 @@ sap.ui.define([
 				 * @param {string} mSpecificChangeInfo.parentId FormContainer where the new control will be added
 				 * @param {number} mSpecificChangeInfo.index The index where the field will be added
 				 * @param {string} [mSpecificChangeInfo.oDataServiceVersion] The OData service version
-				 * @param {string} [mSpecificChangeInfo.modelType] Then UI5 model type name, only pass it if default delegate should be taken
 				 * @param {Object} mPropertyBag The property bag containing the App Component
 				 * @param {object} mPropertyBag.modifier Modifier for the controls
 				 * @param {object} mPropertyBag.appComponent Application component
@@ -319,10 +308,6 @@ sap.ui.define([
 						// used to connect to change handler mediator
 						oContent.oDataServiceVersion = mSpecificChangeInfo.oDataServiceVersion;
 					}
-					if (mSpecificChangeInfo.modelType && mAddViaDelegateSettings.supportsDefault) {
-						// used to connect to default delegate
-						oContent.modelType = mSpecificChangeInfo.modelType;
-					}
 					oChange.setContent(oContent);
 				},
 

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.BaseAddXml
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @since 1.75
 	 * @private
 	 */

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.123.1
+	 * @version 1.124.1
 	 * @since 1.46
 	 *
 	 */

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.123.1
+	 * @version 1.124.1
 	 * @since 1.27.0
 	 */
 	var 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.123.1
+	 * @version 1.124.1
 	 * @since 1.46
 	 */
 	var 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.123.1
+	 * @version 1.124.1
 	 * @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.123.1
+	 * @version 1.124.1
 	 * @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.123.1
+	 * @version 1.124.1
 	 * @since 1.36
 	 * @private
 	 */