@openui5/sap.ui.fl 1.93.3 → 1.96.1

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/dialog/CustomFieldCAPDialog.js

@@ -12,7 +12,8 @@ sap.ui.define([
 	"sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/getEditorConfig",
 	"sap/base/util/ObjectPath",
 	"sap/base/util/deepClone",
-	"sap/ui/model/resource/ResourceModel"
+	"sap/ui/model/resource/ResourceModel",
+	"sap/ui/model/json/JSONModel"
 ], function(
 	ManagedObject,
 	Fragment,
@@ -20,7 +21,8 @@ sap.ui.define([
 	getEditorConfig,
 	ObjectPath,
 	deepClone,
-	ResourceModel
+	ResourceModel,
+	JSONModel
 ) {
 	"use strict";
 
@@ -34,38 +36,51 @@ sap.ui.define([
 	}
 
 	function prepareJsonOutput(oOriginalJson) {
-		if (!oOriginalJson) {
+		if (!oOriginalJson || !oOriginalJson.element) {
 			return {};
 		}
 		var oJson = deepClone(oOriginalJson);
 
+		// Set label
+		if (!ObjectPath.get(["element", "@Common.Label"], oJson)) {
+			var sName = ObjectPath.get(["element", "name"], oJson);
+			ObjectPath.set(["element", "@Common.Label"], sName, oJson);
+		}
+
 		// Format enum input validation
-		var vRange = ObjectPath.get(["@assert.range"], oJson);
+		var vRange = ObjectPath.get(["element", "@assert.range"], oJson);
 		if (
-			oJson.type === "cds.String"
+			ObjectPath.get(["element", "type"], oJson) === "cds.String"
 			&& Array.isArray(vRange)
 		) {
-			ObjectPath.set(["enum"], vRange.reduce(function (enumMap, enumOption) {
+			ObjectPath.set(["element", "enum"], vRange.reduce(function (enumMap, enumOption) {
 				enumMap[enumOption] = {};
 				return enumMap;
 			}, {}), oJson);
-			ObjectPath.set(["@assert.range"], true, oJson);
+			ObjectPath.set(["element", "@assert.range"], true, oJson);
 		}
 
 		// Flatten additional annotations
-		if (oJson.annotations) {
-			oJson = Object.assign({}, oJson, oJson.annotations);
-			delete oJson.annotations;
+		if (oJson.element.annotations) {
+			oJson.element = Object.assign({}, oJson.element, oJson.element.annotations);
+			delete oJson.element.annotations;
 		}
 
-		return oJson;
+		// Format CSN extension
+		var oCsnOutput = {
+			extend: oJson.extend,
+			elements: {}
+		};
+		oCsnOutput.elements[oJson.element.name] = oJson.element;
+
+		return oCsnOutput;
 	}
 
 	/**
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.dialog.CustomFieldCAPDialog
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @since 1.93
 	 * @experimental Since 1.93
 	 * @private
@@ -85,9 +100,11 @@ sap.ui.define([
 
 	CustomFieldCAPDialog.prototype.open = function(mEntitySetInformation, sRtaStyleClassName) {
 		var oInitialJson = {
-			name: "NewField",
-			type: "cds.String",
-			entityType: mEntitySetInformation.boundEntitySet.$Type
+			element: {
+				name: "NewField",
+				type: "cds.String"
+			},
+			extend: mEntitySetInformation.boundEntitySet.$Type
 		};
 
 		var oDialog = this.getProperty("_dialog");
@@ -99,6 +116,11 @@ sap.ui.define([
 				name: "sap.ui.fl.write._internal.fieldExtensibility.cap.dialog.CustomFieldCAPDialog",
 				controller: this
 			}).then(function(oAddCustomFieldCAPDialog) {
+				this._oDialogModel = new JSONModel({
+					isValid: true
+				});
+				this._oDialogModel.setDefaultBindingMode("OneWay");
+				oAddCustomFieldCAPDialog.setModel(this._oDialogModel, "dialog");
 				oAddCustomFieldCAPDialog.setModel(new ResourceModel({
 					bundle: oTextBundle
 				}), "i18n");
@@ -109,7 +131,13 @@ sap.ui.define([
 					entityTypes: mEntitySetInformation.entityTypes
 				});
 				this._oEditor.attachJsonChange(function(oEvent) {
-					this._oJson = prepareJsonOutput(oEvent.getParameter("json"));
+					this._oJson = oEvent.getParameter("json");
+				}.bind(this));
+				this._oEditor.attachValidationErrorChange(function(oEvent) {
+					var bHasError = oEvent.getParameter("hasError");
+					this._oDialogModel.setData({
+						isValid: !bHasError
+					});
 				}.bind(this));
 				oAddCustomFieldCAPDialog.open();
 			}.bind(this));
@@ -127,13 +155,14 @@ sap.ui.define([
 	};
 
 	CustomFieldCAPDialog.prototype.onSave = function() {
+		var oCsnOutput = prepareJsonOutput(this._oJson);
 		var oPayload = {
-			definition: JSON.stringify(this._oJson)
+			extensions: [JSON.stringify(oCsnOutput)]
 		};
 
 		var oAddFieldPromise = new Promise(function(resolve, reject) {
 			var oXhr = new XMLHttpRequest();
-			oXhr.open("POST", "http://localhost:4004/extensibility/addField");
+			oXhr.open("POST", "/-/cds/extensibility/addExtension");
 			oXhr.setRequestHeader("Content-Type", "application/json");
 			oXhr.onload = function() {
 				if (oXhr.status >= 200 && oXhr.status < 400) {

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/getEditorConfig.js

@@ -12,30 +12,49 @@ sap.ui.define([
 
 	return function(oCustomConfig) {
 		return {
-			context: "/",
+			context: "/element",
 			properties: {
 				entityType: {
 					tags: ["general"],
 					label: "Entity Type",
-					path: "entityType",
+					path: "/extend",
 					type: "select",
 					items: (oCustomConfig.entityTypes || []).map(function(sEntityType) {
 						return {
 							key: sEntityType
 						};
-					})
+					}),
+					allowCustomValues: false,
+					validators: {
+						isRequired: {
+							type: "isRequired"
+						}
+					}
 				},
 				name: {
 					tags: ["general"],
 					label: "Name",
 					path: "name",
-					type: "string"
+					type: "string",
+					validators: {
+						isRequired: {
+							type: "isRequired"
+						},
+						namePattern: {
+							type: "pattern",
+							errorMessage: "CAP_ERR_WHITESPACE",
+							config: {
+								pattern: "^\\S+$"
+							}
+						}
+					}
 				},
 				label: {
 					tags: ["general"],
 					label: "Label",
 					path: "@Common.Label",
-					type: "string"
+					type: "string",
+					placeholder: "{/element/name}"
 				},
 				type: {
 					tags: ["general"],
@@ -71,7 +90,13 @@ sap.ui.define([
 							key: "cds.Boolean",
 							title: "Boolean"
 						}
-					]
+					],
+					allowCustomValues: false,
+					validators: {
+						isRequired: {
+							type: "isRequired"
+						}
+					}
 				},
 				numberPrecision: {
 					tags: ["general"],
@@ -79,7 +104,7 @@ sap.ui.define([
 					path: "precision",
 					type: "number",
 					defaultValue: "",
-					visible: "{= ${/type} === 'cds.Decimal' }"
+					visible: "{= ${/element/type} === 'cds.Decimal' }"
 				},
 				numberScale: {
 					tags: ["general"],
@@ -87,7 +112,7 @@ sap.ui.define([
 					path: "scale",
 					type: "number",
 					defaultValue: "",
-					visible: "{= ${/type} === 'cds.Decimal' }"
+					visible: "{= ${/element/type} === 'cds.Decimal' }"
 				},
 				stringLength: {
 					tags: ["general"],
@@ -95,14 +120,14 @@ sap.ui.define([
 					path: "length",
 					type: "number",
 					defaultValue: "",
-					visible: "{= ${/type} === 'cds.String' }"
+					visible: "{= ${/element/type} === 'cds.String' }"
 				},
 				defaultValue: {
 					tags: ["general"],
 					label: "Default",
 					path: "default/val",
 					defaultValue: "",
-					type: "{/type}" //"{path: '/type', formatter: '._getEditorForType'}"
+					type: "{/element/type}" //"{path: '/element/type', formatter: '._getEditorForType'}"
 				},
 				readonly: {
 					tags: ["validation"],
@@ -122,33 +147,35 @@ sap.ui.define([
 					path: "@assert.format",
 					type: "string",
 					defaultValue: "",
-					visible: "{= ${/type} === 'cds.String' }"
+					visible: "{= ${/element/type} === 'cds.String' }"
 				},
 				stringRange: {
 					tags: ["validation"],
 					label: "Allowed Values",
 					path: "@assert.range",
 					type: "list",
-					visible: "{= ${/type} === 'cds.String' }",
-					active: "{= ${/type} === 'cds.String' }"
+					visible: "{= ${/element/type} === 'cds.String' }",
+					active: "{= ${/element/type} === 'cds.String' }"
 				},
 				arrayRange: {
 					tags: ["validation"],
 					label: "Range",
 					path: "@assert.range",
 					type: "range",
-					rangeType: "{/type}",
+					rangeType: "{/element/type}",
 					// TODO: Once expression bindings are supported, check for ordinal types differently
-					visible: "{= ${/type} === 'cds.Integer' || ${/type} === 'cds.Decimal' || ${/type} === 'cds.DateTime' || ${/type} === 'cds.Date' || ${/type} === 'cds.Time'}",
-					active: "{= ${/type} === 'cds.Integer' || ${/type} === 'cds.Decimal' || ${/type} === 'cds.DateTime' || ${/type} === 'cds.Date' || ${/type} === 'cds.Time'}"
+					visible: "{= ${/element/type} === 'cds.Integer' || ${/element/type} === 'cds.Decimal' || ${/element/type} === 'cds.DateTime' || ${/element/type} === 'cds.Date' || ${/element/type} === 'cds.Time'}",
+					active: "{= ${/element/type} === 'cds.Integer' || ${/element/type} === 'cds.Decimal' || ${/element/type} === 'cds.DateTime' || ${/element/type} === 'cds.Date' || ${/element/type} === 'cds.Time'}"
 				},
 				annotations: {
 					tags: ["advanced"],
 					label: "Additional Annotations",
-					allowedTypes: ["string", "json"],
+					allowedTypes: ["json"],
 					path: "annotations",
-					type: "annotations",
-					allowTypeChange: false
+					type: "map",
+					allowTypeChange: false,
+					addItemLabelI18n: "CAP_ADD_FIELD_EDITOR.ANNOTATION",
+					defaultType: "json"
 				}
 			},
 			layout: {
@@ -190,7 +217,6 @@ sap.ui.define([
 				integer: "sap/ui/integration/designtime/baseEditor/propertyEditor/integerEditor/IntegerEditor",
 				number: "sap/ui/integration/designtime/baseEditor/propertyEditor/numberEditor/NumberEditor",
 				map: "sap/ui/integration/designtime/baseEditor/propertyEditor/mapEditor/MapEditor",
-				annotations: "sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/annotationsEditor/AnnotationsEditor",
 				list: "sap/ui/integration/designtime/baseEditor/propertyEditor/listEditor/ListEditor",
 				bool: "sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/booleanEditor/BooleanEditor",
 				range: "sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/rangeEditor/RangeEditor",
@@ -199,10 +225,22 @@ sap.ui.define([
 				"cds.String": "sap/ui/integration/designtime/baseEditor/propertyEditor/stringEditor/StringEditor",
 				"cds.Integer": "sap/ui/integration/designtime/baseEditor/propertyEditor/integerEditor/IntegerEditor",
 				"cds.Decimal": "sap/ui/integration/designtime/baseEditor/propertyEditor/numberEditor/NumberEditor",
-				"cds.Date": "sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/dateEditor/DateEditor",
+				"cds.Date": "sap/ui/integration/designtime/baseEditor/propertyEditor/dateEditor/DateEditor",
 				"cds.Time": "sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/timeEditor/TimeEditor",
-				"cds.DateTime": "sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/dateTimeEditor/DateTimeEditor",
+				"cds.DateTime": "sap/ui/integration/designtime/baseEditor/propertyEditor/dateTimeEditor/DateTimeEditor",
 				"cds.Boolean": "sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/booleanEditor/BooleanEditor"
+			},
+			i18n: "sap/ui/fl/messagebundle.properties",
+			validators: {
+				isRequired: "sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/validators/IsRequired"
+			},
+			propertyEditorConfigs: {
+				"cds.Date": {
+					pattern: "YYYY-MM-dd"
+				},
+				"cds.DateTime": {
+					pattern: "YYYY-MM-dd'T'HH:mm:ss'Z'"
+				}
 			}
 		};
 	};

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/booleanEditor/BooleanEditor.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.booleanEditor.BooleanEditor
 	 * @author SAP SE
 	 * @since 1.93
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @private
 	 * @experimental 1.93

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/rangeEditor/RangeEditor.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.rangeEditor.RangeEditor
 	 * @author SAP SE
 	 * @since 1.93
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @private
 	 * @experimental 1.93

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/timeEditor/TimeEditor.fragment.xml

@@ -4,7 +4,7 @@
 >
 	<TimePicker
 		value="{displayValue}"
-		valueFormat="HH:mm:ss"
+		valueFormat="HH:mm:ss.SSSS"
 		change="_onChange"
 	/>
 </core:FragmentDefinition>

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/timeEditor/TimeEditor.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.timeEditor.TimeEditor
 	 * @author SAP SE
 	 * @since 1.93
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @private
 	 * @experimental 1.93
@@ -36,34 +36,27 @@ sap.ui.define([
 		renderer: BasePropertyEditor.getMetadata().getRenderer().render
 	});
 
+	TimeEditor.configMetadata = Object.assign({}, DateEditor.configMetadata, {
+		pattern: {
+			defaultValue: "HH:mm:ss"
+		},
+		// By default, ignore timezones due to winter/summer time etc. as 1st Jan 1970 is set as date
+		utc: {
+			defaultValue: false
+		}
+	});
+
 	TimeEditor.prototype.getDefaultValidators = function () {
 		return Object.assign(
 			{},
-			BasePropertyEditor.prototype.getDefaultValidators.call(this)
+			DateEditor.prototype.getDefaultValidators.call(this)
 		);
 	};
 
-	TimeEditor.prototype.formatValue = function (sValue) {
-		return sValue;
-	};
-
-	TimeEditor.prototype._parse = function (sValue) {
-		if (sValue === "") {
-			return undefined;
-		}
-
-		// For now use a hardcoded format, move to default config later
-		var oTimeFormatterInstance = DateFormat.getTimeInstance({
-			pattern: "HH:mm:ss"
+	TimeEditor.prototype.getFormatterInstance = function (mOptions) {
+		return DateFormat.getTimeInstance(mOptions || {
+			pattern: "HH:mm:ss.SSSS"
 		});
-		var oParsedDate = oTimeFormatterInstance.parse(sValue);
-		return this._isValidDate(oParsedDate)
-			? oTimeFormatterInstance.format(oParsedDate)
-			: sValue;
-	};
-
-	TimeEditor.prototype.getFormatterInstance = function () {
-		return DateFormat.getTimeInstance();
 	};
 
 	return TimeEditor;

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/validators/IsRequired.js

@@ -0,0 +1,20 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+sap.ui.define([], function () {
+	"use strict";
+
+	return {
+		async: false,
+		errorMessage: "CAP_ERR_REQUIRED",
+		validate: function (vValue) {
+			return (
+				vValue === false
+				|| vValue === 0
+				|| !!vValue
+			);
+		}
+	};
+});

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

@@ -32,7 +32,7 @@ sap.ui.define([
 	/**
 	 * @namespace sap.ui.fl.apply._internal.flexState.FlexObjectState
 	 * @since 1.83
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState.js

@@ -11,10 +11,10 @@ sap.ui.define([
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/Change",
 	"sap/ui/fl/apply/_internal/flexObjects/UpdatableChange",
-	"sap/ui/fl/ChangePersistenceFactory",
 	"sap/ui/fl/apply/_internal/flexObjects/CompVariant",
 	"sap/ui/fl/apply/_internal/flexObjects/RevertData",
 	"sap/ui/fl/apply/_internal/flexObjects/CompVariantRevertData",
+	"sap/ui/fl/apply/_internal/flexObjects/States",
 	"sap/ui/fl/Utils",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger",
@@ -27,10 +27,10 @@ sap.ui.define([
 	Layer,
 	Change,
 	UpdatableChange,
-	ChangePersistenceFactory,
 	CompVariant,
 	RevertData,
 	CompVariantRevertData,
+	States,
 	Utils,
 	FlexState,
 	CompVariantMerger,
@@ -85,7 +85,7 @@ sap.ui.define([
 			if (result && result.response) {
 				oFlexObject.setResponse(result.response);
 			} else {
-				oFlexObject.setState(Change.states.PERSISTED);
+				oFlexObject.setState(States.PERSISTED);
 			}
 
 			return oStoredResponse;
@@ -132,7 +132,7 @@ sap.ui.define([
 
 	function needsPersistencyCall(oFlexObject) {
 		return oFlexObject &&
-			[Change.states.NEW, Change.states.DIRTY, Change.states.DELETED].includes(oFlexObject.getPendingAction());
+			[States.NEW, States.DIRTY, States.DELETED].includes(oFlexObject.getState());
 	}
 
 	function getAllCompVariantObjects(mCompVariantsMapByPersistencyKey) {
@@ -220,7 +220,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.flexState.compVariants.CompVariantState
 	 * @since 1.83
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -730,7 +730,7 @@ sap.ui.define([
 				if (result && result.response && result.response[0]) {
 					oFlexObject.setResponse(result.response[0]);
 				} else {
-					oFlexObject.setState(Change.states.PERSISTED);
+					oFlexObject.setState(States.PERSISTED);
 				}
 
 				return oStoredResponse;
@@ -750,14 +750,14 @@ sap.ui.define([
 		var aPromises = getAllCompVariantObjects(mCompVariantsMapByPersistencyKey)
 			.filter(needsPersistencyCall)
 			.map(function (oFlexObject) {
-				switch (oFlexObject.getPendingAction()) {
-					case Change.states.NEW:
+				switch (oFlexObject.getState()) {
+					case States.NEW:
 						ifVariantClearRevertData(oFlexObject);
 						return writeObjectAndAddToState(oFlexObject, oStoredResponse);
-					case Change.states.DIRTY:
+					case States.DIRTY:
 						ifVariantClearRevertData(oFlexObject);
 						return updateObjectAndStorage(oFlexObject, oStoredResponse);
-					case Change.states.DELETED:
+					case States.DELETED:
 						ifVariantClearRevertData(oFlexObject);
 						return deleteObjectAndRemoveFromStorage(oFlexObject, mCompVariantsMapByPersistencyKey, oStoredResponse);
 					default:

package/src/sap/ui/fl/write/_internal/transport/TransportSelection.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.transport.TransportSelection
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @since 1.74.0
 	 * Helper object to select an ABAP transport for an LREP object. This is not a generic utility to select a transport request, but part
 	 *        of the SmartVariant control.

package/src/sap/ui/fl/write/_internal/transport/Transports.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * Entity that handles ABAP transport related information.
 	 * @alias sap.ui.fl.write._internal.transport.Transports
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @since 1.74.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.transport

package/src/sap/ui/fl/write/api/ChangesWriteAPI.js

@@ -125,8 +125,7 @@ sap.ui.define([
 		 * @ui5-restricted
 		 */
 		apply: function(mPropertyBag) {
-			// eslint-disable-next-line no-unsafe-negation
-			if (!mPropertyBag.element instanceof Element) {
+			if (!(mPropertyBag.element instanceof Element)) {
 				return Promise.reject("Please provide an Element");
 			}
 

package/src/sap/ui/fl/write/api/FieldExtensibility.js

@@ -7,11 +7,15 @@
 sap.ui.define([
 	"sap/ui/fl/write/_internal/fieldExtensibility/ABAPAccess",
 	"sap/ui/fl/write/_internal/fieldExtensibility/cap/CAPAccess",
-	"sap/base/util/UriParameters"
+	"sap/base/util/UriParameters",
+	"sap/ui/base/ManagedObject",
+	"sap/ui/fl/Utils"
 ], function(
 	ABAPAccess,
 	CAPAccess,
-	UriParameters
+	UriParameters,
+	ManagedObject,
+	FlUtils
 ) {
 	"use strict";
 
@@ -20,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write.api.FieldExtensibility
 	 * @since 1.87
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.rta
 	 */
@@ -28,11 +32,19 @@ sap.ui.define([
 	var FieldExtensibility = {};
 
 	var _oCurrentScenario;
-	// we can add parameters here, but the assumption is that this is not dependent on a single control
-	function getImplementationForCurrentScenario() {
+
+	function getImplementationForCurrentScenario(oControl) {
 		if (!_oCurrentScenario) {
+			if (!(oControl instanceof ManagedObject)) {
+				return undefined;
+			}
+			var oAppComponent = FlUtils.getAppComponentForControl(oControl);
+			var oManifestConfig = (oAppComponent && oAppComponent.getManifestEntry("/sap.ui5/config")) || {};
 			var oUriParams = UriParameters.fromQuery(window.location.search);
-			if (oUriParams.get("sap-ui-fl-xx-capScenario") === "true") {
+			if (
+				oManifestConfig.experimentalCAPScenario
+				|| oUriParams.get("sap-ui-fl-xx-capScenario") === "true"
+			) {
 				_oCurrentScenario = CAPAccess;
 			} else {
 				_oCurrentScenario = ABAPAccess;
@@ -44,7 +56,10 @@ sap.ui.define([
 	function callFunctionInImplementation() {
 		var aArgs = Array.from(arguments);
 		var sFunctionName = aArgs.shift();
-		var oImplementation = getImplementationForCurrentScenario();
+		var oImplementation = getImplementationForCurrentScenario.apply(null, aArgs);
+		if (!oImplementation) {
+			return Promise.reject("Could not determine field extensibility scenario");
+		}
 		return Promise.resolve(oImplementation[sFunctionName].apply(null, aArgs));
 	}