@openui5/sap.ui.fl 1.123.1 → 1.124.1

package/src/sap/ui/fl/util/IFrame.js

@@ -6,23 +6,18 @@
 
 // Provides control sap.ui.fl.util.IFrame
 sap.ui.define([
-	"../library",
 	"sap/ui/core/Control",
 	"sap/ui/model/json/JSONModel",
 	"./getContainerUserInfo",
-	"sap/base/util/extend",
-	"sap/base/util/restricted/_CancelablePromise",
 	"sap/base/security/URLListValidator",
 	"sap/base/Log",
 	"./IFrameRenderer",
+	"../library",
 	"sap/ui/core/library"
 ], function(
-	library,
 	Control,
 	JSONModel,
 	getContainerUserInfo,
-	extend,
-	CancelablePromise,
 	URLListValidator,
 	Log,
 	IFrameRenderer
@@ -53,7 +48,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 *
 	 * @constructor
 	 * @private
@@ -95,11 +90,18 @@ sap.ui.define([
 				renameInfo: {type: "object", group: "Data", defaultValue: null},
 
 				/**
-				 * Define whether to set the URL by creating a new history entry (legacy) or replacing the current one.
+				 * Contains the Iframe sandbox attributes
 				 */
-				useLegacyNavigation: {
-					type: "boolean",
-					defaultValue: false
+				advancedSettings: {
+					type: "object",
+					defaultValue: {
+						allowForms: true,
+						allowPopups: true,
+						allowScripts: true,
+						allowModals: true,
+						allowSameOrigin: true,
+						additionalSandboxParameters: []
+					}
 				},
 
 				/**
@@ -108,7 +110,11 @@ sap.ui.define([
 				 *  @private
 				 *  @ui5-restricted sap.ui.fl
 				 */
-				_settings: {type: "object", group: "Data", defaultValue: null}
+				_settings: {
+					type: "object",
+					group: "Data",
+					defaultValue: null
+				}
 			},
 
 			designtime: "sap/ui/fl/designtime/util/IFrame.designtime"
@@ -129,59 +135,26 @@ sap.ui.define([
 			return this._oInitializePromise ? this._oInitializePromise : Promise.reject();
 		},
 
-		_setUrlLegacy(sEncodedUrl) {
-			// Setting the url of the IFrame directly can lead to issues
-			// if the change doesn't result in a reload of the embedded page
-			// e.g. when a navigation parameter is changed
-			// To avoid problems with the ushell and the embedded apps, it is safer
-			// to unload the iframe content first and thus force a full browser reload
-
-			if (this._oSetUrlPromise) {
-				this._oSetUrlPromise.cancel();
-				delete this._oSetUrlPromise;
-			}
-
-			this.setProperty("url", "");
-
-			this._oSetUrlPromise = new CancelablePromise(function(fnResolve, fnReject, onCancel) {
-				onCancel.shouldReject = false;
-				// Use a timeout here to avoid issues with browser caching in Chrome
-				// that seem to lead to a mismatch between IFrame content and src,
-				// see Chromium issue 324102
-				setTimeout(fnResolve, 0);
-			});
-
-			this._oSetUrlPromise.then(function() {
-				delete this._oSetUrlPromise;
-				this.setProperty("url", sEncodedUrl);
-			}.bind(this));
-		},
-
 		setUrl(sUrl) {
 			// Could contain special characters from bindings that need to be encoded
 			// Make sure that it was not encoded before
 			var sEncodedUrl = decodeURI(sUrl) === sUrl ? encodeURI(sUrl) : sUrl;
 
 			if (IFrame.isValidUrl(sEncodedUrl).result) {
-				if (this.getUseLegacyNavigation()) {
-					// Set by pushing to the history
-					this._setUrlLegacy(sEncodedUrl);
-				} else {
-					// Set by replacing the last entry
-					const oNewUrl = IFrame._toUrl(sEncodedUrl);
-					const oOldUrl = IFrame._toUrl(this.getUrl() || "about:blank");
-					if (
-						oOldUrl.origin === oNewUrl.origin
-						&& oOldUrl.pathname === oNewUrl.pathname
-						&& oOldUrl.search === oNewUrl.search
-						&& oOldUrl.hash !== oNewUrl.hash
-					) {
-						// Only the hash changed, site is not going to reload automatically
-						// Set an artificial frame buster search parameter to force a refresh
-						oNewUrl.searchParams.append("sap-ui-xx-fl-forceEmbeddedContentRefresh", Date.now());
-					}
-					this.setProperty("url", oNewUrl.toString());
+				// Set by replacing the last entry
+				const oNewUrl = IFrame._toUrl(sEncodedUrl);
+				const oOldUrl = IFrame._toUrl(this.getUrl() || "about:blank");
+				if (
+					oOldUrl.origin === oNewUrl.origin
+					&& oOldUrl.pathname === oNewUrl.pathname
+					&& oOldUrl.search === oNewUrl.search
+					&& oOldUrl.hash !== oNewUrl.hash
+				) {
+					// Only the hash changed, site is not going to reload automatically
+					// Set an artificial frame buster search parameter to force a refresh
+					oNewUrl.searchParams.append("sap-ui-xx-fl-forceEmbeddedContentRefresh", Date.now());
 				}
+				this.setProperty("url", oNewUrl.toString());
 			} else {
 				Log.error("Provided URL is not valid as an IFrame src");
 			}
@@ -195,9 +168,23 @@ sap.ui.define([
 		},
 
 		onAfterRendering() {
-			if (!this.getUseLegacyNavigation()) {
-				this._replaceIframeLocation(this.getUrl());
-			}
+			this._replaceIframeLocation(this.getUrl());
+
+			// The contentWindow might change without causing a rerender, e.g.
+			// when the parent element changes due to an appendChild call
+			// This will cause the iframe src to change and we need to replace the
+			// location again to ensure the correct content
+			this._oLastContentWindow = this.getDomRef().contentWindow;
+			this.getDomRef().addEventListener("load", () => {
+				if (!this.getDomRef()) {
+					// The iframe was removed before the load event was triggered
+					return;
+				}
+				if (this._oLastContentWindow !== this.getDomRef().contentWindow) {
+					this._oLastContentWindow = this.getDomRef().contentWindow;
+					this._replaceIframeLocation(this.getUrl());
+				}
+			});
 		},
 
 		applySettings(mSettings, ...aOtherArgs) {
@@ -205,9 +192,9 @@ sap.ui.define([
 			Control.prototype.applySettings.apply(this, [mOtherSettings, ...aOtherArgs]);
 			Control.prototype.applySettings.apply(this, [{ url }, ...aOtherArgs]);
 			if (mSettings) {
-				var mMergedSettings = this.getProperty("_settings") || {};
+				let mMergedSettings = {...this.getProperty("_settings") || {}};
 				if (mSettings._settings) {
-					extend(mMergedSettings, mSettings._settings);
+					mMergedSettings = {...mMergedSettings, ...mSettings._settings};
 				} else {
 					Object.keys(mSettings)
 					.filter(function(sPropertyName) {
@@ -217,7 +204,7 @@ sap.ui.define([
 						mMergedSettings[sPropertyName] = unbind(mSettings[sPropertyName]);
 					});
 				}
-				this.setProperty("_settings", mMergedSettings);
+				this.setProperty("_settings", { ...mMergedSettings });
 			}
 		},
 

package/src/sap/ui/fl/util/IFrameRenderer.js

@@ -15,6 +15,13 @@ sap.ui.define([
 		}
 	}
 
+	 function createsSandboxAttributesString(oAdvancedSettings) {
+		return Object.keys(oAdvancedSettings)
+		.filter((sKey) => oAdvancedSettings[sKey])
+		.map((sKey) => sKey.replace(/[A-Z]/g, "-$&").toLowerCase())
+		.join(" ");
+	}
+
 	/**
 	 * IFrame renderer.
 	 * @namespace
@@ -39,15 +46,14 @@ sap.ui.define([
 		oRm.style("display", "block");
 		oRm.style("border", "none");
 
-		oRm.attr("sandbox", "allow-forms allow-popups allow-scripts allow-same-origin allow-modals");
-
-		if (oIFrame.getUseLegacyNavigation()) {
-			oRm.attr("src", oIFrame.getUrl());
-		} else {
-			// With the new location.replace approach, the actual
-			// target url will be set onAfterRendering
-			oRm.attr("src", "about:blank");
-		}
+		const oAdvancedSettings = oIFrame.getAdvancedSettings();
+		const { additionalSandboxParameters: aAdditionalSandboxParameters, ...oFilteredAdvancedSettings } = oAdvancedSettings;
+		const sAdditionalSandboxParameters = aAdditionalSandboxParameters?.join(" ");
+		const sSandboxAttributes = createsSandboxAttributesString(oFilteredAdvancedSettings);
+		const sCombinedSandboxAttributes = sAdditionalSandboxParameters ? `${sSandboxAttributes} ${sAdditionalSandboxParameters}` : sSandboxAttributes;
+		oRm.attr("sandbox", sCombinedSandboxAttributes);
+		// Always set the src to about:blank to avoid adding history entries when parameters are resolved
+		oRm.attr("src", "about:blank");
 
 		var sTitle = oIFrame.getTitle();
 		if (sTitle) {

package/src/sap/ui/fl/util/ManagedObjectModel.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/fl/util/resolveBinding.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 *
 	 * @function
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @alias sap.ui.fl.util.resolveBinding
 	 * @since 1.91
 	 * @private

package/src/sap/ui/fl/variants/VariantModel.js

@@ -218,7 +218,7 @@ sap.ui.define([
 		var oSettings = Settings.getInstanceOrUndef();
 		var bUserIsAuthorized = oSettings &&
 			(oSettings.isKeyUser() || !oSettings.getUserId() ||
-			(oSettings.isPublicFlVariantEnabled() && oSettings.getUserId().toUpperCase() === oVariant.author.toUpperCase()));
+			(oSettings.isPublicFlVariantEnabled() && oSettings.getUserId().toUpperCase() === oVariant.instance.getSupportInformation().user.toUpperCase()));
 		oVariant.remove = bUserIsAuthorized;
 		oVariant.rename = bUserIsAuthorized;
 		oVariant.change = bUserIsAuthorized;
@@ -253,14 +253,14 @@ sap.ui.define([
 				Utils.getUShellService("UserInfo"),
 				Utils.getUShellService("URLParsing"),
 				Utils.getUShellService("Navigation"),
-				Utils.getUShellService("ShellNavigation")
+				Utils.getUShellService("ShellNavigationInternal")
 			];
 			return Promise.all(aServicePromises)
 			.then(function(aServices) {
 				setUShellService("UserInfo", aServices[0]);
 				setUShellService("URLParsing", aServices[1]);
 				setUShellService("Navigation", aServices[2]);
-				setUShellService("ShellNavigation", aServices[3]);
+				setUShellService("ShellNavigationInternal", aServices[3]);
 			})
 			.catch(function(vError) {
 				throw new Error(`Error getting service from Unified Shell: ${vError}`);
@@ -290,7 +290,7 @@ sap.ui.define([
 	 * @class Variant model implementation for JSON format.
 	 * @extends sap.ui.model.json.JSONModel
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @param {object} oData - Either the URL where to load the JSON from or a JS object
 	 * @param {object} mPropertyBag - Map of properties required for the constructor
 	 * @param {sap.ui.fl.FlexController} mPropertyBag.flexController - <code>FlexController</code> instance for the component which uses the variant model
@@ -333,7 +333,7 @@ sap.ui.define([
 			this.updateData();
 
 			const oLiveDependencyMap = UIChangesState.getLiveDependencyMap(this.sFlexReference);
-			VariantManagementState.getInitialChanges(
+			VariantManagementState.getInitialUIChanges(
 				{reference: this.sFlexReference},
 				this.oAppComponent.getId(),
 				this.sFlexReference

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.Storage
 	 * @since 1.67
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -198,7 +198,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.Versions
 	 * @since 1.74
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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.123.1
+	 * @version 1.124.1
 	 * @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.123.1
+	 * @version 1.124.1
 	 * @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.123.1
+	 * @version 1.124.1
 	 * @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.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -774,7 +774,7 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
 	AppVariantInlineChangeFactory.create_ui5_setMinUI5Version = function(mPropertyBag) {
-		Utils.checkParameterAndType(mPropertyBag.content, "minUI5Version", "string");
+		Utils.checkParameterAndType(mPropertyBag.content, "minUI5Version", ["string", "array"]);
 		return _createAppVariantInlineChange(mPropertyBag);
 	};
 

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

@@ -51,7 +51,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.condenser.Condenser
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 */
 	var Condenser = {};
 

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

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

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.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.connectors
 	 */

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * Connector for saving and deleting data from SAPUI5 Flexibility KeyUser service - including personalization.
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.BtpServiceConnector
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

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

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

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

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

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.NeoLrepConnector
 	 * @since 1.81
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @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.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.PersonalizationConnector
 	 * @since 1.70
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @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.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.connectors, sap.ui.fl.write._internal.transport
 	 */

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

@@ -166,12 +166,12 @@ sap.ui.define(["sap/ui/model/ListBinding"], function(ListBinding) {
 	 * @return {string} the binding path
 	 */
 	function getBindingPath(oElement, sAggregationName, mPayload) {
-		if (mPayload.path) {
-			return mPayload.path;
+		if (mPayload?.path) {
+			return mPayload?.path;
 		}
 		return checkForAbsoluteAggregationBinding(oElement, sAggregationName)
-			? getDefaultModelBindingData(oElement, true, sAggregationName).path
-			: getDefaultModelBindingData(oElement, false, sAggregationName).getPath();
+			? getDefaultModelBindingData(oElement, true, sAggregationName)?.path
+			: getDefaultModelBindingData(oElement, false, sAggregationName)?.getPath();
 	}
 
 	/**
@@ -182,7 +182,7 @@ sap.ui.define(["sap/ui/model/ListBinding"], function(ListBinding) {
 	 * @return {Promise} A Promise that resolves with the OData meta model or null if not found
 	 */
 	async function loadODataMetaModel(oElement, mPayload) {
-		const oModel = oElement.getModel(mPayload.modelName);
+		const oModel = oElement.getModel(mPayload?.modelName);
 		if (oModel && ["sap.ui.model.odata.ODataModel", "sap.ui.model.odata.v2.ODataModel"].includes(oModel.getMetadata().getName())) {
 			const oMetaModel = oModel.getMetaModel();
 			await oMetaModel.loaded();

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

@@ -35,7 +35,7 @@ function(
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 */
 	var Processor = {
 		applyExtensionPoint(oExtensionPoint) {

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

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ABAPAccess
 	 * @since 1.87.0
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 */
 	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.123.1
+	 * @version 1.124.1
 	 * @public
 	 * @param {sap.ui.base.ManagedObject} oControl - Control to add extensions
 	 */

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

@@ -115,7 +115,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ABAPExtensibilityVariantFactory
 	 * @since 1.87.0
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 */
 	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.123.1
+	 * @version 1.124.1
 	 * @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
 	 * @since 1.87.0
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 */
 	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.123.1
+	 * @version 1.124.1
 	 * @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
 	 * @since 1.87.0
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 */
 	var UriParser = {};

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

@@ -245,7 +245,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.Utils
 	 * @since 1.87.0
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 */
 	var Utils = {};
@@ -351,14 +351,9 @@ sap.ui.define([
 	 * @param {Map} mIntent Given intent
 	 * @returns {Promise<string|null>} Resolves with navigation URI or null
 	 */
-	Utils.getNavigationUriForIntent = function(mIntent) {
-		return FlexUtils.getUShellService("Navigation").then(function(oUshellNavigationService) {
-			if (oUshellNavigationService && oUshellNavigationService.getHref) {
-				return oUshellNavigationService.getHref(mIntent);
-			}
-
-			return Promise.resolve(null);
-		});
+	Utils.getNavigationUriForIntent = async function(mIntent) {
+		const oNavigationService = await FlexUtils.getUShellService("Navigation");
+		return oNavigationService?.getHref?.(mIntent) || null;
 	};
 
 	/**
@@ -415,21 +410,15 @@ sap.ui.define([
 	 * @param {Array} aIntents Given intents
 	 * @returns {Promise<Array<boolean>>} Resolves with an array of booleans
 	 */
-	Utils.isNavigationSupportedForIntents = function(aIntents) {
-		return FlexUtils.getUShellService("Navigation").then(function(oUshellNavigationService) {
-			if (oUshellNavigationService && oUshellNavigationService.isNavigationSupported) {
-				return oUshellNavigationService.isNavigationSupported(aIntents).then(function(aResults) {
-					return aResults.map(function(oResult) {
-						return oResult && oResult.supported === true;
-					});
-				});
-			}
+	Utils.isNavigationSupportedForIntents = async function(aIntents) {
+		const oNavigationService = await FlexUtils.getUShellService("Navigation");
+		if (oNavigationService?.isNavigationSupported) {
+			const aResults = await oNavigationService.isNavigationSupported(aIntents);
+			return aResults.map((oResult) => oResult && oResult.supported === true);
+		}
 
-			// we assume no navigation support
-			return Promise.resolve(aIntents.map(function() {
-				return false;
-			}));
-		});
+		// we assume no navigation support
+		return aIntents.map(() => false);
 	};
 
 	return Utils;

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @since 1.93
 	 * @private
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 */
 	var CAPAccess = {};
 

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

@@ -82,7 +82,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.dialog.CustomFieldCAPDialog
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @since 1.93
 	 * @private
 	 * @ui5-restricted