@openui5/sap.ui.fl 1.93.3 → 1.96.2

package/src/sap/ui/fl/write/_internal/Versions.js

@@ -8,7 +8,6 @@ sap.ui.define([
 	"sap/ui/fl/registry/Settings",
 	"sap/ui/fl/ChangePersistenceFactory",
 	"sap/ui/fl/write/_internal/Storage",
-	"sap/base/util/UriParameters",
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/fl/Utils",
 	"sap/ui/model/BindingMode"
@@ -16,7 +15,6 @@ sap.ui.define([
 	Settings,
 	ChangePersistenceFactory,
 	Storage,
-	UriParameters,
 	JSONModel,
 	Utils,
 	BindingMode
@@ -45,65 +43,71 @@ sap.ui.define([
 			}
 		});
 
-		var sPersistedBasisForDisplayedVersion = Utils.getParameter(sap.ui.fl.Versions.UrlParameter);
-		var nPersistedBasisForDisplayedVersion;
-		if (sPersistedBasisForDisplayedVersion) {
-			nPersistedBasisForDisplayedVersion = parseInt(sPersistedBasisForDisplayedVersion);
-		} else if (aVersions.length > 0) {
-			nPersistedBasisForDisplayedVersion = aVersions[0].version;
-		} else {
-			nPersistedBasisForDisplayedVersion = sap.ui.fl.Versions.Original;
-		}
+		return Utils.getUShellService("URLParsing")
+			.then(function (oURLParsingService) {
+				var sPersistedBasisForDisplayedVersion = Utils.getParameter(
+					sap.ui.fl.Versions.UrlParameter,
+					oURLParsingService
+				);
+				var nPersistedBasisForDisplayedVersion;
+				if (sPersistedBasisForDisplayedVersion) {
+					nPersistedBasisForDisplayedVersion = parseInt(sPersistedBasisForDisplayedVersion);
+				} else if (aVersions.length > 0) {
+					nPersistedBasisForDisplayedVersion = aVersions[0].version;
+				} else {
+					nPersistedBasisForDisplayedVersion = sap.ui.fl.Versions.Original;
+				}
 
-		var oModel = new JSONModel({
-			versioningEnabled: bVersioningEnabled,
-			versions: aVersions,
-			activeVersion: nActiveVersion,
-			backendDraft: bBackendDraft,
-			dirtyChanges: false,
-			draftAvailable: bBackendDraft,
-			activateEnabled: bBackendDraft,
-			persistedVersion: nPersistedBasisForDisplayedVersion,
-			displayedVersion: nPersistedBasisForDisplayedVersion
-		});
+				var oModel = new JSONModel({
+					versioningEnabled: bVersioningEnabled,
+					versions: aVersions,
+					activeVersion: nActiveVersion,
+					backendDraft: bBackendDraft,
+					dirtyChanges: false,
+					draftAvailable: bBackendDraft,
+					activateEnabled: bBackendDraft,
+					persistedVersion: nPersistedBasisForDisplayedVersion,
+					displayedVersion: nPersistedBasisForDisplayedVersion
+				});
 
-		oModel.setDefaultBindingMode(BindingMode.OneWay);
-		oModel.setSizeLimit(MODEL_SIZE_LIMIT);
+				oModel.setDefaultBindingMode(BindingMode.OneWay);
+				oModel.setSizeLimit(MODEL_SIZE_LIMIT);
 
-		// TODO: currently called by sap.ui.rta.RuntimeAuthoring but should be by a ChangesState
-		oModel.setDirtyChanges = function (bDirtyChanges) {
-			oModel.setProperty("/dirtyChanges", bDirtyChanges);
-			oModel.updateDraftVersion();
-			oModel.updateBindings(true);
-		};
+				// TODO: currently called by sap.ui.rta.RuntimeAuthoring but should be by a ChangesState
+				oModel.setDirtyChanges = function (bDirtyChanges) {
+					oModel.setProperty("/dirtyChanges", bDirtyChanges);
+					oModel.updateDraftVersion();
+					oModel.updateBindings(true);
+				};
 
-		oModel.updateDraftVersion = function () {
-			var aVersions = oModel.getProperty("/versions");
-			var bVersioningEnabled = oModel.getProperty("/versioningEnabled");
-			var bDirtyChanges = oModel.getProperty("/dirtyChanges");
-			var bBackendDraft = oModel.getProperty("/backendDraft");
-			var bDraftAvailable = bVersioningEnabled && (bDirtyChanges || bBackendDraft);
-			oModel.setProperty("/draftAvailable", bDraftAvailable);
+				oModel.updateDraftVersion = function () {
+					var aVersions = oModel.getProperty("/versions");
+					var bVersioningEnabled = oModel.getProperty("/versioningEnabled");
+					var bDirtyChanges = oModel.getProperty("/dirtyChanges");
+					var bBackendDraft = oModel.getProperty("/backendDraft");
+					var bDraftAvailable = bVersioningEnabled && (bDirtyChanges || bBackendDraft);
+					oModel.setProperty("/draftAvailable", bDraftAvailable);
 
-			var nDisplayedVersion = bDirtyChanges ? sap.ui.fl.Versions.Draft : oModel.getProperty("/persistedVersion");
-			oModel.setProperty("/displayedVersion", nDisplayedVersion);
+					var nDisplayedVersion = bDirtyChanges ? sap.ui.fl.Versions.Draft : oModel.getProperty("/persistedVersion");
+					oModel.setProperty("/displayedVersion", nDisplayedVersion);
 
-			// add draft
-			if (!_doesDraftExistInVersions(aVersions) && bDraftAvailable) {
-				aVersions.splice(0, 0, {version: sap.ui.fl.Versions.Draft, type: "draft"});
-			}
+					// add draft
+					if (!_doesDraftExistInVersions(aVersions) && bDraftAvailable) {
+						aVersions.splice(0, 0, {version: sap.ui.fl.Versions.Draft, type: "draft"});
+					}
 
-			// remove draft
-			if (_doesDraftExistInVersions(aVersions) && !bDraftAvailable) {
-				aVersions.shift();
-				oModel.setProperty("/displayedVersion", oModel.getProperty("/persistedVersion"));
-			}
+					// remove draft
+					if (_doesDraftExistInVersions(aVersions) && !bDraftAvailable) {
+						aVersions.shift();
+						oModel.setProperty("/displayedVersion", oModel.getProperty("/persistedVersion"));
+					}
 
-			var bActivateEnabled = oModel.getProperty("/displayedVersion") !== oModel.getProperty("/activeVersion");
-			oModel.setProperty("/activateEnabled", bActivateEnabled);
-		};
+					var bActivateEnabled = oModel.getProperty("/displayedVersion") !== oModel.getProperty("/activeVersion");
+					oModel.setProperty("/activateEnabled", bActivateEnabled);
+				};
 
-		return oModel;
+				return oModel;
+			});
 	}
 
 	// TODO: the handling should move to the FlexState as soon as it is ready
@@ -154,7 +158,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.Versions
 	 * @since 1.74
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -179,9 +183,12 @@ sap.ui.define([
 				var aVersionsPromise = bVersionsEnabled ? Storage.versions.load(mPropertyBag) : Promise.resolve([]);
 				return aVersionsPromise
 					.then(function (aVersions) {
+						return createModel(mPropertyBag, bVersionsEnabled, aVersions);
+					})
+					.then(function (oModel) {
 						_mInstances[sReference] = _mInstances[sReference] || {};
 						_mInstances[sReference][sLayer] = _mInstances[sReference][sLayer] || {};
-						_mInstances[sReference][sLayer] = createModel(mPropertyBag, bVersionsEnabled, aVersions);
+						_mInstances[sReference][sLayer] = oModel;
 						return _mInstances[sReference][sLayer];
 					});
 			});

package/src/sap/ui/fl/write/_internal/appVariant/AppVariant.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariant
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/write/_internal/appVariant/AppVariantFactory.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariantFactory
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/write/_internal/appVariant/AppVariantInlineChange.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariantInlineChange
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/write/_internal/appVariant/AppVariantInlineChangeFactory.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariantInlineChangeFactory
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -926,5 +926,24 @@ sap.ui.define([
 		return _createAppVariantInlineChange(mPropertyBag);
 	};
 
+	/**
+	 * Creates an inline change of change type <code>appdescr_fiori_setAbstract</code>.
+	 *
+	 * @param {object} mPropertyBag - Parameters of the change type
+	 * @param {string} mPropertyBag.changeType - Inline change type of an app variant
+	 * @param {object} mPropertyBag.content - Content of an inline change
+	 * @param {boolean} mPropertyBag.content.abstract - Abstract property to be disabled (only allowd value is <code>false</code>)
+	 *
+	 * @return {Promise} Resolving when the descriptor inline change was created successfully (without back-end access)
+	 *
+	 * @private
+	 * @ui5-restricted WebIDE
+	 */
+	 AppVariantInlineChangeFactory.create_fiori_setAbstract = function(mPropertyBag) {
+		Utils.checkParameterAndType(mPropertyBag.content, "abstract", "boolean");
+		Utils.checkParameterAndType(mPropertyBag, "changeType", "string");
+		return _createAppVariantInlineChange(mPropertyBag);
+	};
+
 	return AppVariantInlineChangeFactory;
 });

package/src/sap/ui/fl/write/_internal/condenser/Condenser.js

@@ -41,7 +41,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.condenser.Condenser
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 */
 	var Condenser = {};
 
@@ -57,15 +57,20 @@ sap.ui.define([
 		reverse: Reverse
 	};
 
+	var PROPERTIES_WITH_SELECTORS = ["affectedControl", "sourceContainer", "targetContainer"];
+
 	/**
-	 * Verify 'move' subtype has already been added to the data structure before 'create' subtype
+	 * Verify 'move' subtype has already been added to the data structure before 'create' subtype and they both belong to the same targetContainer
 	 *
 	 * @param {Map} mSubtypes - Map of properties that holds key-value pairs. A key is a unique identifier. A value is an array object that contains changes
 	 * @param {object} oCondenserInfo - Condenser specific information that is delivered by the change handler
 	 * @returns {boolean} <code>true</code> if the 'move' subtype has been added to the data structure before 'create' subtype
 	 */
 	function isCreateAfterMoveSubtype(mSubtypes, oCondenserInfo) {
-		return oCondenserInfo.classification === sap.ui.fl.condenser.Classification.Create && mSubtypes[sap.ui.fl.condenser.Classification.Move];
+		var aMoveSubType = mSubtypes[sap.ui.fl.condenser.Classification.Move];
+		return oCondenserInfo.classification === sap.ui.fl.condenser.Classification.Create
+			&& aMoveSubType
+			&& aMoveSubType[aMoveSubType.length - 1].targetContainer === oCondenserInfo.targetContainer;
 	}
 
 	/**
@@ -202,6 +207,15 @@ sap.ui.define([
 				}
 				return undefined;
 			})
+			.then(function(oCondenserInfo) {
+				// changes in templates get the binding holder as selector but have the original selector
+				// inside the template as dependent selector. As there might be multiple different controls in the template
+				// the selectors have to be changed back before the maps gets created
+				if (oCondenserInfo && mControl.bTemplateAffected) {
+					replaceTemplateSelector(oCondenserInfo, oChange);
+				}
+				return oCondenserInfo;
+			})
 			.catch(function() {
 				return undefined;
 			});
@@ -210,6 +224,16 @@ sap.ui.define([
 		return Promise.resolve();
 	}
 
+	function replaceTemplateSelector(oCondenserInfo, oChange) {
+		var oOriginalSelector = oChange.getOriginalSelector();
+		var oTemplateSelector = oChange.getSelector();
+		PROPERTIES_WITH_SELECTORS.forEach(function(sPropertyName) {
+			if (oCondenserInfo[sPropertyName] && oCondenserInfo[sPropertyName] === oTemplateSelector) {
+				oCondenserInfo[sPropertyName] = oOriginalSelector;
+			}
+		});
+	}
+
 	/**
 	 * Retrieves the classification types map.
 	 *
@@ -301,7 +325,7 @@ sap.ui.define([
 	}
 
 	function changeSelectorsToIdsInCondenserInfo(oCondenserInfo, oAppComponent) {
-		["affectedControl", "sourceContainer", "targetContainer"].forEach(function(sPropertyName) {
+		PROPERTIES_WITH_SELECTORS.forEach(function(sPropertyName) {
 			if (oCondenserInfo && oCondenserInfo[sPropertyName]) {
 				oCondenserInfo[sPropertyName] = JsControlTreeModifier.getControlIdBySelector(oCondenserInfo[sPropertyName], oAppComponent);
 			}
@@ -380,6 +404,12 @@ sap.ui.define([
 		});
 	}
 
+	function sortCondenserInfosByInitialOrder(aChanges, aCondenserInfos) {
+		aCondenserInfos.sort(function(a, b) {
+			return aChanges.indexOf(a.change) - aChanges.indexOf(b.change);
+		});
+	}
+
 	function addAllIndexRelatedChanges(aReducedChanges, aIndexRelatedChanges) {
 		var aReducedChangeIds = aReducedChanges.map(function(oChange) {
 			return oChange.getId();
@@ -480,6 +510,7 @@ sap.ui.define([
 
 				var bSuccess = true;
 				var aCondenserInfos = getCondenserInfos(mReducedChanges, []);
+				sortCondenserInfosByInitialOrder(aChanges, aCondenserInfos);
 				try {
 					Measurement.start("Condenser_sort", "sort index related changes - CondenserClass", ["sap.ui.fl", "Condenser"]);
 					var aReducedIndexRelatedChanges = UIReconstruction.sortIndexRelatedChanges(mUIReconstructions, aCondenserInfos);

package/src/sap/ui/fl/write/_internal/condenser/UIReconstruction.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.condenser.UIReconstruction
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 */
 	var UIReconstruction = {};
 

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

@@ -61,7 +61,13 @@ sap.ui.define([
 
 			var iCurrentSourceIndex = aContainerElements.indexOf(sAffectedControlId);
 			var iTargetIndex = oCondenserInfo.getTargetIndex(oCondenserInfo.change);
-			aContainerElements.splice(iTargetIndex, 0, aContainerElements.splice(iCurrentSourceIndex, 1)[0]);
+
+			// if the move was done from a different container the element can't be found
+			if (iInitialSourceIndex === -1) {
+				aContainerElements.splice(iTargetIndex, 0, sAffectedControlId);
+			} else {
+				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.93.3
+	 * @version 1.96.2
 	 * @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.93.3
+	 * @version 1.96.2
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

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.93.3
+	 * @version 1.96.2
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */
@@ -469,7 +469,7 @@ sap.ui.define([
 				var sAppVariantManifestUrl = mPropertyBag.appVarUrl;
 				var oRequestOption = WriteUtils.getRequestOptions(
 					InitialConnector,
-					undefined,
+					Utils.getLrepUrl() + ROUTES.TOKEN,
 					undefined,
 					"application/json; charset=utf-8", "json"
 				);
@@ -479,7 +479,7 @@ sap.ui.define([
 				var sAppVariantUrl = InitialUtils.getUrl(ROUTES.APPVARIANTS, mPropertyBag);
 				var oRequestOption = WriteUtils.getRequestOptions(
 					InitialConnector,
-					undefined,
+					Utils.getLrepUrl() + ROUTES.TOKEN,
 					undefined,
 					"application/json; charset=utf-8", "json"
 				);

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.93.3
+	 * @version 1.96.2
 	 * @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.93.3
+	 * @version 1.96.2
 	 * @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.93.3
+	 * @version 1.96.2
 	 * @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.93.3
+	 * @version 1.96.2
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.connectors, sap.ui.fl.write._internal.transport
 	 */

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

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

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.extensionPoint.Registry
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

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.93.3
+	 * @version 1.96.2
 	 */
 	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.93.3
+	 * @version 1.96.2
 	 * @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.93.3
+	 * @version 1.96.2
 	 */
 	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.93.3
+	 * @version 1.96.2
 	 * @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.93.3
+	 * @version 1.96.2
 	 */
 	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.93.3
+	 * @version 1.96.2
 	 * @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.93.3
+	 * @version 1.96.2
 	 */
 	var UriParser = {};
 

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

@@ -8,11 +8,13 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/base/security/encodeURL",
 	"sap/ui/core/Core",
+	"sap/ui/fl/Utils",
 	"sap/ui/thirdparty/jquery"
 ], function(
 	Log,
 	encodeURL,
 	Core,
+	FlexUtils,
 	jQuery
 ) {
 	"use strict";
@@ -198,7 +200,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.Utils
 	 * @experimental Since 1.87.0
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 */
 	var Utils = {};
 
@@ -295,20 +297,6 @@ sap.ui.define([
 		return Promise.resolve(null);
 	};
 
-	/**
-	 * Gets the cross app navigation service.
-	 *
-	 * @public
-	 * @returns {sap.ushell.services.ContainerInterface|null} cross app navigation service or null
-	 */
-	Utils.getCrossAppNavigationService = function() {
-		if (sap.ushell && sap.ushell.Container) {
-			return sap.ushell.Container.getServiceAsync("CrossApplicationNavigation");
-		}
-
-		return Promise.resolve(null);
-	};
-
 	/**
 	 * Gets the navigation URI for a given Intent
 	 *
@@ -317,7 +305,7 @@ sap.ui.define([
 	 * @returns {Promise<string|null>} Resolves with navigation URI or null
 	 */
 	Utils.getNavigationUriForIntent = function(mIntent) {
-		return Utils.getCrossAppNavigationService().then(function(oCrossAppNavigationService) {
+		return FlexUtils.getUShellService("CrossApplicationNavigation").then(function(oCrossAppNavigationService) {
 			if (oCrossAppNavigationService && oCrossAppNavigationService.hrefForExternal) {
 				return oCrossAppNavigationService.hrefForExternal(mIntent);
 			}
@@ -381,7 +369,7 @@ sap.ui.define([
 	 * @returns {Promise<Array<Boolean>>} Resolves with an array of booleans
 	 */
 	Utils.isNavigationSupportedForIntents = function(aIntents) {
-		return Utils.getCrossAppNavigationService().then(function(oCrossAppNavigationService) {
+		return FlexUtils.getUShellService("CrossApplicationNavigation").then(function(oCrossAppNavigationService) {
 			if (oCrossAppNavigationService && oCrossAppNavigationService.isNavigationSupported) {
 				return oCrossAppNavigationService.isNavigationSupported(aIntents).then(function(aResults) {
 					return aResults.map(function(oResult) {

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @experimental Since 1.93
 	 * @private
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 */
 	var CAPAccess = {};
 

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

@@ -17,6 +17,7 @@
 		</content>
 		<beginButton>
 			<Button
+				enabled="{dialog>/isValid}"
 				type="Emphasized"
 				text="{i18n>CAP_ADD_FIELD_CREATE}"
 				press="onSave"