@openui5/sap.ui.fl 1.92.0 → 1.93.3

package/src/sap/ui/fl/write/_internal/condenser/classifications/Destroy.js

@@ -17,19 +17,22 @@ sap.ui.define([
 		 *
 		 * @param {Map} mUIReconstructions - Map of UI reconstructions
 		 * @param {object} oCondenserInfo - Condenser specific information
+ 		 * @returns {Promise} resolves when a destroy change is added to UI Reconstruction Map
 		 */
 		addToReconstructionMap: function(mUIReconstructions, oCondenserInfo) {
-			var aTargetContainerElementIds = CondenserUtils.getContainerElementIds(oCondenserInfo.targetContainer, oCondenserInfo.targetAggregation);
-			var aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(mUIReconstructions, oCondenserInfo.targetContainer, oCondenserInfo.targetAggregation, aTargetContainerElementIds);
-			if (aContainerElementIds.length - 1 < oCondenserInfo.sourceIndex) {
-				while (aContainerElementIds.length - 1 < oCondenserInfo.sourceIndex) {
-					var iIndex = aContainerElementIds.length;
-					aContainerElementIds.splice(aContainerElementIds.length, 0, CondenserUtils.PLACEHOLDER + iIndex);
-				}
-				aContainerElementIds[oCondenserInfo.sourceIndex] = oCondenserInfo.affectedControl;
-			} else {
-				aContainerElementIds.splice(oCondenserInfo.sourceIndex, 0, oCondenserInfo.affectedControl);
-			}
+			return CondenserUtils.getContainerElementIds(oCondenserInfo.targetContainer, oCondenserInfo.targetAggregation)
+				.then(function (aTargetContainerElementIds) {
+					var aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(mUIReconstructions, oCondenserInfo.targetContainer, oCondenserInfo.targetAggregation, aTargetContainerElementIds);
+					if (aContainerElementIds.length - 1 < oCondenserInfo.sourceIndex) {
+						while (aContainerElementIds.length - 1 < oCondenserInfo.sourceIndex) {
+							var iIndex = aContainerElementIds.length;
+							aContainerElementIds.splice(aContainerElementIds.length, 0, CondenserUtils.PLACEHOLDER + iIndex);
+						}
+						aContainerElementIds[oCondenserInfo.sourceIndex] = oCondenserInfo.affectedControl;
+					} else {
+						aContainerElementIds.splice(oCondenserInfo.sourceIndex, 0, oCondenserInfo.affectedControl);
+					}
+				});
 		},
 
 		/**

package/src/sap/ui/fl/write/_internal/condenser/classifications/Move.js

@@ -17,27 +17,33 @@ sap.ui.define([
 		 *
 		 * @param {Map} mUIReconstructions - Map of UI reconstructions
 		 * @param {object} oCondenserInfo - Condenser specific information
+		 * @returns {Promise} resolves when a create change is added to UI Reconstruction Map
 		 */
 		addToReconstructionMap: function(mUIReconstructions, oCondenserInfo) {
-			var aSourceContainerElementIds = CondenserUtils.getContainerElementIds(oCondenserInfo.sourceContainer, oCondenserInfo.sourceAggregation);
-			var aTargetContainerElementIds = CondenserUtils.getContainerElementIds(oCondenserInfo.targetContainer, oCondenserInfo.targetAggregation);
+			return Promise.all([
+				CondenserUtils.getContainerElementIds(oCondenserInfo.sourceContainer, oCondenserInfo.sourceAggregation),
+				CondenserUtils.getContainerElementIds(oCondenserInfo.targetContainer, oCondenserInfo.targetAggregation)
+			]).then(function (aSourceTargetElementIds) {
+				var aSourceContainerElementIds = aSourceTargetElementIds[0];
+				var aTargetContainerElementIds = aSourceTargetElementIds[1];
 
-			var aContainerElementIds;
-			var iTargetIndex;
-			if (
-				oCondenserInfo.targetContainer === oCondenserInfo.sourceContainer
-				&& oCondenserInfo.targetAggregation === oCondenserInfo.sourceAggregation
-			) {
-				aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(mUIReconstructions, oCondenserInfo.targetContainer, oCondenserInfo.targetAggregation, aTargetContainerElementIds);
-				iTargetIndex = aContainerElementIds.indexOf(oCondenserInfo.affectedControl);
-				CondenserUtils.shiftElement(aContainerElementIds, iTargetIndex, oCondenserInfo.sourceIndex);
-			} else {
-				aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(mUIReconstructions, oCondenserInfo.targetContainer, oCondenserInfo.targetAggregation, aTargetContainerElementIds);
-				iTargetIndex = aContainerElementIds.indexOf(oCondenserInfo.affectedControl);
-				aContainerElementIds.splice(iTargetIndex, 1);
-				aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(mUIReconstructions, oCondenserInfo.sourceContainer, oCondenserInfo.sourceAggregation, aSourceContainerElementIds);
-				aContainerElementIds.splice(oCondenserInfo.sourceIndex, 0, oCondenserInfo.affectedControl);
-			}
+				var aContainerElementIds;
+				var iTargetIndex;
+				if (
+					oCondenserInfo.targetContainer === oCondenserInfo.sourceContainer
+					&& oCondenserInfo.targetAggregation === oCondenserInfo.sourceAggregation
+				) {
+					aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(mUIReconstructions, oCondenserInfo.targetContainer, oCondenserInfo.targetAggregation, aTargetContainerElementIds);
+					iTargetIndex = aContainerElementIds.indexOf(oCondenserInfo.affectedControl);
+					CondenserUtils.shiftElement(aContainerElementIds, iTargetIndex, oCondenserInfo.sourceIndex);
+				} else {
+					aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(mUIReconstructions, oCondenserInfo.targetContainer, oCondenserInfo.targetAggregation, aTargetContainerElementIds);
+					iTargetIndex = aContainerElementIds.indexOf(oCondenserInfo.affectedControl);
+					aContainerElementIds.splice(iTargetIndex, 1);
+					aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(mUIReconstructions, oCondenserInfo.sourceContainer, oCondenserInfo.sourceAggregation, aSourceContainerElementIds);
+					aContainerElementIds.splice(oCondenserInfo.sourceIndex, 0, oCondenserInfo.affectedControl);
+				}
+			});
 		},
 
 		/**
@@ -49,8 +55,13 @@ sap.ui.define([
 		 */
 		simulate: function(aContainerElements, oCondenserInfo, aInitialUIElementIds) {
 			var sAffectedControlId = oCondenserInfo.affectedControl;
-			var iSourceIndex = aInitialUIElementIds.indexOf(sAffectedControlId);
-			CondenserUtils.extendElementsArray(aContainerElements, iSourceIndex, undefined, sAffectedControlId);
+			var iInitialSourceIndex = aInitialUIElementIds.indexOf(sAffectedControlId);
+			// the move itself should not extend the array, just replace the placeholder
+			CondenserUtils.extendElementsArray(aContainerElements, iInitialSourceIndex, undefined, sAffectedControlId);
+
+			var iCurrentSourceIndex = aContainerElements.indexOf(sAffectedControlId);
+			var iTargetIndex = oCondenserInfo.getTargetIndex(oCondenserInfo.change);
+			aContainerElements.splice(iTargetIndex, 0, aContainerElements.splice(iCurrentSourceIndex, 1)[0]);
 		}
 	};
 });

package/src/sap/ui/fl/write/_internal/connectors/BackendConnector.js

@@ -74,7 +74,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.BackendConnector
 	 * @since 1.72
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.connectors
 	 */

package/src/sap/ui/fl/write/_internal/connectors/KeyUserConnector.js

@@ -48,7 +48,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.KeyUserConnector
 	 * @since 1.70
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/LocalStorageConnector.js

@@ -30,7 +30,9 @@ sap.ui.define([
 		return ObjectStorageConnector.loadFeatures.apply(this, arguments).then(function(oFeatures) {
 			return merge({
 				isPublicLayerAvailable: true,
-				isVariantAdaptationEnabled: true
+				isPublicFlVariantEnabled: true,
+				isVariantAdaptationEnabled: true,
+				isCondensingEnabled: false
 			}, oFeatures);
 		});
 	};

package/src/sap/ui/fl/write/_internal/connectors/LrepConnector.js

@@ -146,7 +146,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.LrepConnector
 	 * @since 1.67
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/NeoLrepConnector.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.NeoLrepConnector
 	 * @since 1.81
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/ObjectPathConnector.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.ObjectPathConnector
 	 * @since 1.73
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/PersonalizationConnector.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.PersonalizationConnector
 	 * @since 1.70
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.Utils
 	 * @since 1.70
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.connectors, sap.ui.fl.write._internal.transport
 	 */

package/src/sap/ui/fl/write/_internal/delegates/ODataV4ReadDelegate.js

@@ -196,7 +196,7 @@ sap.ui.define([], function() {
 				}
 			}
 		}
-		return Promise.resolve({});
+		return Promise.resolve([]);
 	}
 	var Delegate = {
 		/**

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

@@ -28,7 +28,7 @@ function(
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 */
 	var Processor = {
 		applyExtensionPoint: function(oExtensionPoint) {

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

@@ -5,10 +5,12 @@
  */
 sap.ui.define([
 	"sap/ui/base/ManagedObjectObserver",
-	"sap/ui/core/util/reflection/JsControlTreeModifier"
+	"sap/ui/core/util/reflection/JsControlTreeModifier",
+	"sap/ui/fl/Utils"
 ], function(
 	ManagedObjectObserver,
-	JsControlTreeModifier
+	JsControlTreeModifier,
+	FlUtils
 ) {
 	"use strict";
 
@@ -18,7 +20,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.extensionPoint.Registry
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl
@@ -41,7 +43,7 @@ sap.ui.define([
 		mExtensionPointsByParent[sParentId].forEach(function(oExtensionPoint) {
 			var sAggregationName = oExtensionPoint.aggregationName;
 			if (sAggregationName === oEvent.name) {
-				var vControlIds = JsControlTreeModifier.getAggregation(oEvent.object, sAggregationName);
+				var vControlIds = FlUtils.getAggregation(oEvent.object, sAggregationName);
 				var aControlIds = [].concat(vControlIds || []).map(function(oControl) {
 					return oControl.getId();
 				});
@@ -91,7 +93,7 @@ sap.ui.define([
 
 	function addExtensionPoint(oParent, sAggregationName, mExtensionPointInfo) {
 		var sViewId = mExtensionPointInfo.view.getId();
-		var vAggregation = JsControlTreeModifier.getAggregation(oParent, sAggregationName);
+		var vAggregation = FlUtils.getAggregation(oParent, sAggregationName);
 		var aControlIds = [].concat(vAggregation || []).map(function(oControl) {
 			return oControl.getId();
 		});

package/src/sap/ui/fl/write/_internal/fieldExtensibility/ABAPAccess.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ABAPAccess
 	 * @experimental Since 1.87.0
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 */
 	var ABAPAccess = {};
 

package/src/sap/ui/fl/write/_internal/fieldExtensibility/ABAPExtensibilityVariant.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @class
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ABAPExtensibilityVariant
 	 * @since 1.87
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 * @public
 	 * @param {sap.ui.base.ManagedObject} oControl - Control to add extensions
 	 */

package/src/sap/ui/fl/write/_internal/fieldExtensibility/ABAPExtensibilityVariantFactory.js

@@ -117,7 +117,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ABAPExtensibilityVariantFactory
 	 * @experimental Since 1.87.0
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 */
 	var ABAPExtensibilityVariantFactory = {};
 

package/src/sap/ui/fl/write/_internal/fieldExtensibility/MultiTenantABAPExtensibilityVariant.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.MultiTenantABAPExtensibilityVariant
 	 * @since 1.87
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 * @public
 	 */
 

package/src/sap/ui/fl/write/_internal/fieldExtensibility/ServiceValidation.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ServiceValidation
 	 * @experimental Since 1.87.0
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 */
 	var ServiceValidation = {};
 

package/src/sap/ui/fl/write/_internal/fieldExtensibility/SingleTenantABAPExtensibilityVariant.js

@@ -43,7 +43,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.SingleTenantABAPExtensibilityVariant
 	 * @since 1.87
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 * @public
 	 */
 

package/src/sap/ui/fl/write/_internal/fieldExtensibility/UriParser.js

@@ -134,7 +134,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.UriParser
 	 * @experimental Since 1.87.0
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 */
 	var UriParser = {};
 

package/src/sap/ui/fl/write/_internal/fieldExtensibility/Utils.js

@@ -198,7 +198,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.Utils
 	 * @experimental Since 1.87.0
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.93.3
 	 */
 	var Utils = {};
 
@@ -207,7 +207,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @param {sap.ui.base.ManagedObject} oControl - Control to add extensions
-	 * @returns {Boolean} true, if prerequisites are met
+	 * @returns {boolean} true, if prerequisites are met
 	 */
 	Utils.checkControlPrerequisites = function(oControl) {
 		if (oControl) {

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

@@ -0,0 +1,129 @@
+/*!
+ * 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([
+	"sap/ui/fl/write/_internal/fieldExtensibility/ServiceValidation",
+	"sap/ui/fl/write/_internal/fieldExtensibility/cap/dialog/CustomFieldCAPDialog"
+], function(
+	ServiceValidation,
+	CustomFieldCAPDialog
+) {
+	"use strict";
+
+	var oCurrentControl = null;
+	var oCAPDialog = null;
+	var oTextBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.fl");
+
+	/**
+	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.CAPAccess
+	 * @experimental Since 1.93
+	 * @private
+	 * @author SAP SE
+	 * @version 1.93.3
+	 */
+	var CAPAccess = {};
+
+	/**
+	 * @inheritDoc
+	 */
+	CAPAccess.getTexts = function() {
+		return {
+			headerText: oTextBundle.getText("BUSINESS_CONTEXT_TITLE"),
+			tooltip: oTextBundle.getText("BTN_ADD_FIELD")
+		};
+	};
+
+	/**
+	 * @inheritDoc
+	 */
+	CAPAccess.isExtensibilityEnabled = function() {
+		// For now, always enable CAP extensibility as it is controlled
+		// via the parameter in FieldExtensibility
+		return true;
+	};
+
+	/**
+	 * @inheritDoc
+	 */
+	CAPAccess.getExtensionData = function() {
+		// For now collect all info here
+		// Should reuse existing utils, e.g. getBoundEntitySet in the future
+		var oModel = oCurrentControl.getModel();
+		var sPath = oCurrentControl.getBindingContext().getPath();
+
+		if (oModel.isA("sap.ui.model.odata.v2.ODataModel")) {
+			// v2 Models not supported yet
+			return Promise.reject();
+		} else if (oModel.isA("sap.ui.model.odata.v4.ODataModel")) {
+			var oMetaModel = oModel.getMetaModel();
+			var sMetaPath = oMetaModel.getMetaPath(sPath);
+
+			return oMetaModel.requestObject(sMetaPath).then(function(oEntitySet) {
+				var mScope = oMetaModel.fetchEntityContainer().getResult();
+				var mEntityContainer = mScope[mScope.$EntityContainer];
+				return {
+					boundEntitySet: oEntitySet,
+					entityTypes: Object.values(mEntityContainer).map(function(oEntitySet) {
+						return oEntitySet.$Type;
+					}).filter(Boolean)
+				};
+			});
+		}
+		return Promise.reject();
+	};
+
+	/**
+	 * @inheritDoc
+	 */
+	CAPAccess.onControlSelected = function(oControl) {
+		oCurrentControl = oControl;
+	};
+
+	/**
+	 * @inheritDoc
+	 */
+	CAPAccess.onTriggerCreateExtensionData = function(aBusinessContextInfos, sRtaStyleClassName) {
+		if (!oCAPDialog) {
+			oCAPDialog = new CustomFieldCAPDialog();
+		}
+		oCAPDialog.open(aBusinessContextInfos, sRtaStyleClassName);
+	};
+
+	/**
+	 * Checks if a given service is outdated
+	 *
+	 * @public
+	 * @param  {string|map} vServiceInfo - service uri or service info map containing <code>serviceName</code>, <code>serviceVersion</code> and <code>serviceType</code>
+	 * @return {boolean}    returns true if the service is outdated
+	 */
+	CAPAccess.isServiceOutdated = function(vServiceInfo) {
+		return ServiceValidation.isServiceOutdated(vServiceInfo);
+	};
+
+	/**
+	 * Sets a given service valid.
+	 *
+	 * @public
+	 * @param  {string|map} vServiceInfo - service uri or service info map containing <code>serviceName</code>, <code>serviceVersion</code> and <code>serviceType</code>
+	 * @return {void}
+	 */
+	CAPAccess.setServiceValid = function(vServiceInfo) {
+		ServiceValidation.setServiceValid(vServiceInfo);
+	};
+
+	/**
+	 * Invalidates a given service. Once a service has been validated or invalidation period is over the service becomes valid again
+	 *
+	 * @public
+	 * @param  {string|map} vServiceInfo - service uri or service info map containing <code>serviceName</code>, <code>serviceVersion</code> and <code>serviceType</code>
+	 * @return {void}
+	 */
+	CAPAccess.setServiceInvalid = function(vServiceInfo) {
+		ServiceValidation.setServiceInvalid(vServiceInfo);
+	};
+
+	return CAPAccess;
+});

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

@@ -0,0 +1,33 @@
+<core:FragmentDefinition
+	xmlns="sap.m"
+	xmlns:core="sap.ui.core"
+	xmlns:editor="sap.ui.integration.designtime.baseEditor"
+>
+	<Dialog
+		class="sapUiContentPadding"
+		title="{i18n>CAP_ADD_FIELD_TITLE}"
+		verticalScrolling="true"
+		resizable="false"
+		draggable="true"
+		contentWidth="42rem"
+		contentHeight="80vh"
+	>
+		<content>
+			<editor:BaseEditor layout="form" />
+		</content>
+		<beginButton>
+			<Button
+				type="Emphasized"
+				text="{i18n>CAP_ADD_FIELD_CREATE}"
+				press="onSave"
+			/>
+		</beginButton>
+		<endButton>
+			<Button
+				type="Transparent"
+				text="{i18n>CAP_ADD_FIELD_CANCEL}"
+				press="onCancel"
+			/>
+		</endButton>
+	</Dialog>
+</core:FragmentDefinition>

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

@@ -0,0 +1,163 @@
+
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+/* global XMLHttpRequest */
+sap.ui.define([
+	"sap/ui/base/ManagedObject",
+	"sap/ui/core/Fragment",
+	"sap/m/MessageToast",
+	"sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/getEditorConfig",
+	"sap/base/util/ObjectPath",
+	"sap/base/util/deepClone",
+	"sap/ui/model/resource/ResourceModel"
+], function(
+	ManagedObject,
+	Fragment,
+	MessageToast,
+	getEditorConfig,
+	ObjectPath,
+	deepClone,
+	ResourceModel
+) {
+	"use strict";
+
+	var oTextBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.fl");
+
+	function setupEditor(oDialog, oInitialJson, oCustomConfig) {
+		var oEditor = oDialog.getContent()[0];
+		oEditor.setJson(deepClone(oInitialJson));
+		oEditor.setConfig(getEditorConfig(oCustomConfig));
+		return oEditor;
+	}
+
+	function prepareJsonOutput(oOriginalJson) {
+		if (!oOriginalJson) {
+			return {};
+		}
+		var oJson = deepClone(oOriginalJson);
+
+		// Format enum input validation
+		var vRange = ObjectPath.get(["@assert.range"], oJson);
+		if (
+			oJson.type === "cds.String"
+			&& Array.isArray(vRange)
+		) {
+			ObjectPath.set(["enum"], vRange.reduce(function (enumMap, enumOption) {
+				enumMap[enumOption] = {};
+				return enumMap;
+			}, {}), oJson);
+			ObjectPath.set(["@assert.range"], true, oJson);
+		}
+
+		// Flatten additional annotations
+		if (oJson.annotations) {
+			oJson = Object.assign({}, oJson, oJson.annotations);
+			delete oJson.annotations;
+		}
+
+		return oJson;
+	}
+
+	/**
+	 * @extends sap.ui.base.ManagedObject
+	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.dialog.CustomFieldCAPDialog
+	 * @author SAP SE
+	 * @version 1.93.3
+	 * @since 1.93
+	 * @experimental Since 1.93
+	 * @private
+	 * @ui5-restricted
+	 */
+	var CustomFieldCAPDialog = ManagedObject.extend("sap.ui.fl.write._internal.fieldExtensibility.cap.dialog.CustomFieldCAPDialog", {
+		metadata: {
+			library: "sap.ui.fl",
+			properties: {
+				_dialog: {
+					type: "sap.m.Dialog",
+					visibility: "hidden"
+				}
+			}
+		}
+	});
+
+	CustomFieldCAPDialog.prototype.open = function(mEntitySetInformation, sRtaStyleClassName) {
+		var oInitialJson = {
+			name: "NewField",
+			type: "cds.String",
+			entityType: mEntitySetInformation.boundEntitySet.$Type
+		};
+
+		var oDialog = this.getProperty("_dialog");
+		if (oDialog) {
+			this._oEditor.setJson(deepClone(oInitialJson));
+			oDialog.open();
+		} else {
+			Fragment.load({
+				name: "sap.ui.fl.write._internal.fieldExtensibility.cap.dialog.CustomFieldCAPDialog",
+				controller: this
+			}).then(function(oAddCustomFieldCAPDialog) {
+				oAddCustomFieldCAPDialog.setModel(new ResourceModel({
+					bundle: oTextBundle
+				}), "i18n");
+				oAddCustomFieldCAPDialog.addStyleClass(sRtaStyleClassName);
+				this.setProperty("_dialog", oAddCustomFieldCAPDialog);
+				this._oJson = deepClone(oInitialJson);
+				this._oEditor = setupEditor(oAddCustomFieldCAPDialog, this._oJson, {
+					entityTypes: mEntitySetInformation.entityTypes
+				});
+				this._oEditor.attachJsonChange(function(oEvent) {
+					this._oJson = prepareJsonOutput(oEvent.getParameter("json"));
+				}.bind(this));
+				oAddCustomFieldCAPDialog.open();
+			}.bind(this));
+		}
+	};
+
+	CustomFieldCAPDialog.prototype.exit = function() {
+		var oDialog = this.getProperty("_dialog");
+		if (oDialog) {
+			oDialog.destroy();
+		}
+		if (this.oEditor) {
+			this.oEditor.destroy();
+		}
+	};
+
+	CustomFieldCAPDialog.prototype.onSave = function() {
+		var oPayload = {
+			definition: JSON.stringify(this._oJson)
+		};
+
+		var oAddFieldPromise = new Promise(function(resolve, reject) {
+			var oXhr = new XMLHttpRequest();
+			oXhr.open("POST", "http://localhost:4004/extensibility/addField");
+			oXhr.setRequestHeader("Content-Type", "application/json");
+			oXhr.onload = function() {
+				if (oXhr.status >= 200 && oXhr.status < 400) {
+					resolve(oXhr.response);
+				} else {
+					reject({
+						status: oXhr.status,
+						message: oXhr.statusText
+					});
+				}
+			};
+			oXhr.send(JSON.stringify(oPayload));
+		});
+
+		oAddFieldPromise.then(function() {
+			MessageToast.show(oTextBundle.getText("CAP_ADD_FIELD_SUCCESS"));
+		});
+
+		this.getProperty("_dialog").close();
+	};
+
+	CustomFieldCAPDialog.prototype.onCancel = function() {
+		this.getProperty("_dialog").close();
+	};
+
+	return CustomFieldCAPDialog;
+});