@openui5/sap.ui.fl 1.120.7 → 1.121.0

package/src/sap/ui/fl/messagebundle_mk.properties

@@ -15,7 +15,7 @@ TRANSPORT_DIALOG_TRANSPORT_TT=\u0418\u0437\u0431\u0435\u0440\u0438 \u043F\u0440\
 
 TRANSPORT_DIALOG_PACKAGE_TT=\u0418\u0437\u0431\u0435\u0440\u0438 \u043F\u0430\u043A\u0435\u0442
 
-TRANSPORT_DIALOG_NO_TRANSPORT=\u0421\u043E\u0437\u0434\u0430\u0458 \u0431\u0430\u0440\u0430\u045A\u0435 \u0437\u0430 \u043F\u0440\u0435\u043D\u043E\u0441
+TRANSPORT_DIALOG_NO_TRANSPORT=\u0421\u043E\u0437\u0434\u0430\u0458 \u0431\u0430\u0440\u0430\u045A\u0435 \u0437\u0430 \u0442\u0440\u0430\u043D\u0441\u043F\u043E\u0440\u0442
 
 TRANSPORT_DIALOG_LOCAL_OBJECT=\u041B\u043E\u043A\u0430\u043B\u0435\u043D \u043E\u0431\u0458\u0435\u043A\u0442
 
@@ -73,6 +73,6 @@ CAP_ERR_WHITESPACE=\u041D\u0430\u0437\u0438\u0432\u043E\u0442 \u043D\u0435 \u044
 
 BUSINESS_OBJECT_NODE_TITLE=\u0414\u043E\u0441\u0442\u0430\u043F\u043D\u0438 \u0434\u0435\u043B\u043E\u0432\u043D\u0438 \u0458\u0430\u0437\u043B\u0438 \u043D\u0430 \u043E\u0431\u0458\u0435\u043A\u0442\u043E\u0442\:
 
-MSG_DEPENDENT_CHANGE_ERROR=\u0421\u043B\u0435\u0434\u043D\u0430\u0432\u0430 \u043F\u0440\u043E\u043C\u0435\u043D\u0430 \u043D\u0435 \u043C\u043E\u0436\u0435 \u0434\u0430 \u0441\u0435 \u043F\u0440\u0438\u043C\u0435\u043D\u0438\: {0}.\n\u0422\u043E\u0430 \u0435 \u043F\u043E\u0441\u043B\u0435\u0434\u0438\u0446\u0430 \u043D\u0430 \u0441\u043B\u0435\u0434\u043D\u0438\u0432\u0435 \u043E\u0442\u0432\u043E\u0440\u0435\u043D\u0438 \u0437\u0430\u0432\u0438\u0441\u043D\u043E\u0441\u0442\u0438\: {1}
+MSG_DEPENDENT_CHANGE_ERROR=\u0421\u043B\u0435\u0434\u043D\u0438\u0432\u0435 \u043F\u0440\u043E\u043C\u0435\u043D\u0438 \u043D\u0435 \u043C\u043E\u0436\u0430\u0442 \u0434\u0430 \u0441\u0435 \u043F\u0440\u0438\u043C\u0435\u043D\u0430\u0442\: {0}.\n\u0422\u043E\u0430 \u0435 \u043F\u043E\u0441\u043B\u0435\u0434\u0438\u0446\u0430 \u043D\u0430 \u0441\u043B\u0435\u0434\u043D\u0438\u0442\u0435 \u043E\u0442\u0432\u043E\u0440\u0435\u043D\u0438 \u0437\u0430\u0432\u0438\u0441\u043D\u043E\u0441\u0442\u0438\: {1}
 
 CBA_MIGRATED_ADAPTATION_TITLE={0} (\u043C\u0438\u0433\u0440\u0438\u0440\u0430\u043D\u043E \u043E\u0434 \u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D \u043F\u0440\u0438\u043A\u0430\u0437)

package/src/sap/ui/fl/messagebundle_no.properties

@@ -73,6 +73,6 @@ CAP_ERR_WHITESPACE=Navnet kan ikke inneholde blanktegn
 
 BUSINESS_OBJECT_NODE_TITLE=Tilgjengelige businessobjektknutepunkt\:
 
-MSG_DEPENDENT_CHANGE_ERROR=F\u00F8lgende endring kan ikke brukes\: {0}.\nDette er p\u00E5 grunn av f\u00F8lgende \u00E5pne avhengigheter\: {1}
+MSG_DEPENDENT_CHANGE_ERROR=F\u00F8lgende endring kan ikke gj\u00F8res\: {0}.\nDette er p\u00E5 grunn av f\u00F8lgende \u00E5pne avhengigheter\: {1}
 
 CBA_MIGRATED_ADAPTATION_TITLE={0} (migrert fra begrenset visning)

package/src/sap/ui/fl/registry/Settings.js

@@ -5,7 +5,7 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/write/_internal/Storage",
+	"sap/ui/fl/initial/_internal/Storage",
 	"sap/ui/fl/Utils",
 	"sap/base/Log"
 ], function(
@@ -116,11 +116,13 @@ sap.ui.define([
 					isPublicLayerAvailable: false,
 					isLocalResetEnabled: false,
 					isVariantAdaptationEnabled: false,
+					isVariantAuthorNameAvailable: false,
 					versioning: {},
 					_bFlexChangeMode: false,
 					_bFlexibilityAdaptationButtonAllowed: false
 				};
 			}
+			// The following line is used by the Flex Support Tool to set breakpoints - please adjust the tool if you change it!
 			oSettings.userId = sUserId;
 			return Settings._storeInstance(oSettings);
 		});
@@ -327,6 +329,15 @@ sap.ui.define([
 		return this._getBooleanProperty("isVariantPersonalizationEnabled");
 	};
 
+	/**
+	 * Checks whether full names of variants' authors are available or not.
+	 *
+	 * @returns {boolean} <code>true</code> if personalization of variants is enabled
+	 */
+	Settings.prototype.isVariantAuthorNameAvailable = function() {
+		return this._getBooleanProperty("isVariantAuthorNameAvailable");
+	};
+
 	/**
 	 * Checks whether condensing of changes is enabled for the used backend.
 	 *

package/src/sap/ui/fl/support/_internal/extractChangeDependencies.js

@@ -8,12 +8,12 @@ sap.ui.define([
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/core/Element",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
-	"sap/ui/thirdparty/jquery"
+	"sap/ui/fl/apply/_internal/flexState/changes/UIChangesState"
 ], function(
 	JsControlTreeModifier,
 	Element,
 	ManifestUtils,
-	jQuery
+	UIChangesState
 ) {
 	"use strict";
 
@@ -45,6 +45,10 @@ sap.ui.define([
 		return oCorrectAppComponent;
 	}
 
+	// TODO with regards to variants, what is the expected outcome here? All UI Changes, all vm-independent + current variant UI Changes,
+	// all vm-independent + all vm-dependent UI Changes?
+	// as of now, _mChangesEntries is extremely unreliable. After creating a variant it includes all variants and all vm-dependent changes,
+	// after a reload only the initial vm-dependent change is available.
 	function enhanceExportWithChangeData(oChangePersistence, oExport) {
 		var oAppComponent = getAppComponentInstance(oExport.sComponentName);
 		for (var sChangeId in oChangePersistence._mChangesEntries) {
@@ -70,25 +74,18 @@ sap.ui.define([
 			}
 		}
 
-		enhanceExportWithDependencyData(oChangePersistence, oExport);
+		enhanceExportWithDependencyData(oExport.sComponentName, oExport);
 	}
 
-	function enhanceExportWithDependencyData(oChangePersistence, oExport) {
-		for (var sChangeId in oChangePersistence._mChangesInitial.mDependencies) {
-			var mChangeSpecificDependencies = oChangePersistence._mChangesInitial.mDependencies[sChangeId];
+	function enhanceExportWithDependencyData(sReference, oExport) {
+		const mInitialDependencies = UIChangesState.getCompleteDependencyMap(sReference);
+		for (var sChangeId in mInitialDependencies) {
+			var mChangeSpecificDependencies = mInitialDependencies[sChangeId];
 			oExport.mChangesEntries[sChangeId].aControlsDependencies = mChangeSpecificDependencies.controlsDependencies;
 			oExport.mChangesEntries[sChangeId].aDependencies = mChangeSpecificDependencies.dependencies;
 		}
 	}
 
-	function enhanceExportWithVariantChangeData(oChangePersistence, oExport) {
-		jQuery.each(oChangePersistence._mVariantsChanges, function(sChangeId, oChange) {
-			oExport.mVariantsChanges[sChangeId] = {
-				mDefinition: oChange._oDefinition
-			};
-		});
-	}
-
 	function enhanceWithChangetypeSpecificData(oExport, sExportParameterName, mControlData, sControlDataParameterName, aCustomDataChanges) {
 		if (aCustomDataChanges) {
 			mControlData[sControlDataParameterName] = aCustomDataChanges;
@@ -115,7 +112,7 @@ sap.ui.define([
 	function enhanceExportWithControlData(oChangePersistence, oExport) {
 		// collect applied changes
 
-		for (var sControlId in oChangePersistence._mChanges.mChanges) {
+		for (var sControlId in oChangePersistence.getDependencyMapForComponent().mChanges) {
 			var mControlData = {
 				bPresent: false,
 				aAppliedChanges: [],
@@ -128,10 +125,34 @@ sap.ui.define([
 
 			if (oControl) {
 				mControlData.bPresent = true;
-				enhanceWithChangetypeSpecificData(oExport, "aAppliedChanges", mControlData, "aAppliedChanges", getChangesForControlFromCustomData(oControl, "sap.ui.fl.appliedChanges."));
-				enhanceWithChangetypeSpecificData(oExport, "aFailedChanges", mControlData, "aFailedChangesJs", getChangesForControlFromCustomData(oControl, "sap.ui.fl.failedChanges.js."));
-				enhanceWithChangetypeSpecificData(oExport, "aFailedChanges", mControlData, "aFailedChangesXml", getChangesForControlFromCustomData(oControl, "sap.ui.fl.failedChanges.xml."));
-				enhanceWithChangetypeSpecificData(oExport, "aNotApplicableChanges", mControlData, "aNotApplicableChanges", getChangesForControlFromCustomData(oControl, "sap.ui.fl.notApplicableChanges."));
+				enhanceWithChangetypeSpecificData(
+					oExport,
+					"aAppliedChanges",
+					mControlData,
+					"aAppliedChanges",
+					getChangesForControlFromCustomData(oControl, "sap.ui.fl.appliedChanges.")
+				);
+				enhanceWithChangetypeSpecificData(
+					oExport,
+					"aFailedChanges",
+					mControlData,
+					"aFailedChangesJs",
+					getChangesForControlFromCustomData(oControl, "sap.ui.fl.failedChanges.js.")
+				);
+				enhanceWithChangetypeSpecificData(
+					oExport,
+					"aFailedChanges",
+					mControlData,
+					"aFailedChangesXml",
+					getChangesForControlFromCustomData(oControl, "sap.ui.fl.failedChanges.xml.")
+				);
+				enhanceWithChangetypeSpecificData(
+					oExport,
+					"aNotApplicableChanges",
+					mControlData,
+					"aNotApplicableChanges",
+					getChangesForControlFromCustomData(oControl, "sap.ui.fl.notApplicableChanges.")
+				);
 			}
 			oExport.mControlData[sControlId] = mControlData;
 		}
@@ -155,7 +176,6 @@ sap.ui.define([
 		};
 
 		enhanceExportWithChangeData(oChangePersistence, oExport);
-		enhanceExportWithVariantChangeData(oChangePersistence, oExport);
 		enhanceExportWithControlData(oChangePersistence, oExport);
 
 		return oExport;

package/src/sap/ui/fl/support/_internal/getAllUIChanges.js

@@ -0,0 +1,93 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	"sap/base/Log",
+	"sap/ui/core/ComponentRegistry",
+	"sap/ui/fl/apply/_internal/flexState/changes/UIChangesState",
+	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/Utils"
+], function(
+	Log,
+	ComponentRegistry,
+	UIChangesState,
+	ManifestUtils,
+	Utils
+) {
+	"use strict";
+
+	/**
+	 * Returns an array with all UI Changes for the application.
+	 *
+	 * @namespace sap.ui.fl.support._internal.getAllUIChanges
+	 * @since 1.121
+	 * @version 1.121.0
+	 * @private
+	 * @ui5-restricted sap.ui.fl.support.api.SupportAPI
+	 */
+
+	function getAllUIChangesFromChangesState(oCurrentAppContainerObject) {
+		const oAppComponent = oCurrentAppContainerObject.oContainer.getComponentInstance();
+		const sReference = ManifestUtils.getFlexReferenceForControl(oAppComponent);
+		return UIChangesState.getAllUIChanges(sReference);
+	}
+
+	return function() {
+		return Utils.getUShellService("AppLifeCycle").then(function(oAppLifeCycleService) {
+			if (oAppLifeCycleService) {
+				const oCurrentApp = oAppLifeCycleService.getCurrentApplication();
+				if (oCurrentApp.componentInstance) {
+					return getAllUIChangesFromChangesState(oCurrentApp.componentInstance);
+				}
+
+				// potential cFLP scenario with the instance running in an iFrame where the top has no access to the componentInstance
+				return oCurrentApp.getIntent().then(function(oIntent) {
+					// The iFrame ID is not public API and may change in the future.
+					// Until there is an API, this is the way how to get any hold on the app at all
+					var iFrame = document.getElementById(`application-${oIntent.semanticObject}-${oIntent.action}`);
+					if (!iFrame) {
+						Log.error("the iFrame in the cFLP scenario could not be determined");
+						return undefined;
+					}
+
+					// to use the iFrame scope, the code has to be called via eval
+					return iFrame.contentWindow.eval("" +
+"							new Promise(function (resolve) {" +
+"								sap.ui.require([" +
+'									"sap/ui/fl/apply/_internal/flexState/ManifestUtils",' +
+'									"sap/ui/fl/Utils",' +
+'									"sap/ui/fl/apply/_internal/flexState/changes/UIChangesState"' +
+"								], function (" +
+"									ManifestUtils," +
+"									Utils," +
+"									UIChangesState" +
+"								) {" +
+'									Utils.getUShellService("AppLifeCycle").then(function (oAppLifeCycleService) {' +
+"										return oAppLifeCycleService.getCurrentApplication().componentInstance;" +
+"									}).then(function (oCurrentAppContainerObject) {" +
+"										if (oCurrentAppContainerObject) {" +
+"											const sReference = ManifestUtils.getFlexReferenceForControl(oAppComponent);" +
+"											resolve(return UIChangesState.getAllUIChanges(sReference));" +
+"										};" +
+"								});" +
+"							});" +
+"						});");
+				});
+			}
+
+			// standalone case
+			const aApplications = ComponentRegistry.filter(function(oComponent) {
+				return oComponent.getManifestObject().getRawJson()["sap.app"].type === "application";
+			});
+
+			if (aApplications.length === 1) {
+				return getAllUIChangesFromChangesState(aApplications[0]);
+			}
+
+			return undefined;
+		});
+	};
+});

package/src/sap/ui/fl/support/_internal/getChangeDependencies.js

@@ -6,14 +6,14 @@
 
 sap.ui.define([
 	"sap/base/Log",
-	"sap/ui/core/Component",
+	"sap/ui/core/ComponentRegistry",
 	"sap/ui/fl/ChangePersistenceFactory",
 	"sap/ui/fl/apply/_internal/changes/FlexCustomData",
 	"sap/ui/fl/support/_internal/extractChangeDependencies",
 	"sap/ui/fl/Utils"
 ], function(
 	Log,
-	Component,
+	ComponentRegistry,
 	ChangePersistenceFactory,
 	FlexCustomData,
 	extractChangeDependencies,
@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.support._internal.getChangeDependencies
 	 * @since 1.98
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.support.api.SupportAPI
 	 */
@@ -83,7 +83,7 @@ sap.ui.define([
 			}
 
 			// standalone case
-			var aApplications = Component.registry.filter(function(oComponent) {
+			var aApplications = ComponentRegistry.filter(function(oComponent) {
 				return oComponent.getManifestObject().getRawJson()["sap.app"].type === "application";
 			});
 

package/src/sap/ui/fl/support/_internal/getFlexSettings.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.support._internal.getFlexSettings
 	 * @since 1.99
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.support.api.SupportAPI
 	 */

package/src/sap/ui/fl/support/api/SupportAPI.js

@@ -5,9 +5,11 @@
  */
 
 sap.ui.define([
+	"sap/ui/fl/support/_internal/getAllUIChanges",
 	"sap/ui/fl/support/_internal/getFlexSettings",
 	"sap/ui/fl/support/_internal/getChangeDependencies"
 ], function(
+	getAllUIChanges,
 	getFlexSettings,
 	getChangeDependencies
 ) {
@@ -18,14 +20,15 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.support.api.SupportAPI
 	 * @since 1.98
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 * @private
 	 * @ui5-restricted ui5 support tools
 	 */
 	var SupportAPI = /** @lends sap.ui.fl.support.api.SupportAPI */{
+		getAllUIChanges,
 		getChangeDependencies,
 		getFlexSettings
 	};
 
 	return SupportAPI;
-});
+});

package/src/sap/ui/fl/support/apps/contentbrowser/controller/ContentDetails.controller.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.ContentDetails
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/controller/ContentDetailsEdit.controller.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.ContentDetailsEdit
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/controller/LayerContentMaster.controller.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.LayerContentMaster
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/controller/Layers.controller.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.Layers
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/lrepConnector/LRepConnector.js

@@ -13,7 +13,7 @@ sap.ui.define(["sap/ui/fl/Utils", "sap/ui/thirdparty/jquery"], function(Utils, j
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.lrepConnector.LRepConnector
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/utils/DataUtils.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.utils.DataUtils
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/utils/ErrorUtils.js

@@ -17,7 +17,7 @@ function(MessageItem, MessagePopover, JSONModel) {
 		 * @constructor
 		 * @alias sap.ui.fl.support.apps.contentbrowser.utils.ErrorUtils
 		 * @author SAP SE
-		 * @version 1.120.7
+		 * @version 1.121.0
 		 * @since 1.45
 		 * @private
 		 */

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

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.transport.TransportSelection
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 * @since 1.38.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/util/DescriptorChangeCheck.js

@@ -5,22 +5,18 @@
  */
 
 sap.ui.define([
-	"sap/base/util/includes",
 	"sap/ui/fl/Layer"
 ], function(
-	includes,
 	Layer
 ) {
 	"use strict";
 
-	function checkChange(oEntityPropertyChange, aSupportedProperties, aSupportedOperations) {
-		if (Array.isArray(oEntityPropertyChange)) {
-			oEntityPropertyChange.forEach(function(change) {
-				formatEntityCheck(change, aSupportedProperties, aSupportedOperations);
-			});
-		} else {
-			formatEntityCheck(oEntityPropertyChange, aSupportedProperties, aSupportedOperations);
-		}
+	function checkChange(oEntityPropertyChange, aSupportedProperties, aSupportedOperations, oSupportedPropertyPattern) {
+		const aEntityPropertyChanges = Array.isArray(oEntityPropertyChange) ? oEntityPropertyChange : [oEntityPropertyChange];
+		aEntityPropertyChanges.forEach(function(oChange) {
+			formatEntityCheck(oChange, aSupportedProperties, aSupportedOperations);
+			checkPropertyValuePattern(oChange, oSupportedPropertyPattern);
+		});
 	}
 
 	/**
@@ -72,10 +68,10 @@ sap.ui.define([
 				throw new Error("Invalid change format: The mandatory 'propertyValue' is not defined. Please define the mandatory property 'propertyValue'");
 			}
 		}
-		if (!includes(aSupportedProperties, oChangeEntity.propertyPath) && !isGenericPropertyPathSupported(aSupportedProperties, oChangeEntity.propertyPath)) {
+		if (!aSupportedProperties.includes(oChangeEntity.propertyPath) && !isGenericPropertyPathSupported(aSupportedProperties, oChangeEntity.propertyPath)) {
 			throw new Error(`Changing ${oChangeEntity.propertyPath} is not supported. The supported 'propertyPath' is: ${aSupportedProperties.join("|")}`);
 		}
-		if (!includes(aSupportedOperations, oChangeEntity.operation)) {
+		if (!aSupportedOperations.includes(oChangeEntity.operation)) {
 			throw new Error(`Operation ${oChangeEntity.operation} is not supported. The supported 'operation' is ${aSupportedOperations.join("|")}`);
 		}
 	}
@@ -87,21 +83,22 @@ sap.ui.define([
 	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange - Changes to be merged
 	 * @param {Array} aSupportedProperties - Array of supported properties by change merger
 	 * @param {Array} aSupportedOperations - Array of supported operations by change merger
+	 * @param {Object} oSupportedPropertyPattern - Object with supported pattern as regex
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.suite.ui.generic.template
 	 */
-	function checkEntityPropertyChange(oChange, aSupportedProperties, aSupportedOperations) {
-		var id = Object.keys(oChange).filter(function(key) {
-			return key.endsWith("Id");
+	function checkEntityPropertyChange(oChange, aSupportedProperties, aSupportedOperations, oSupportedPropertyPattern) {
+		var sId = Object.keys(oChange).filter(function(sKey) {
+			return sKey.endsWith("Id");
 		}).shift();
-		if (!oChange[id]) {
-			throw new Error(`Mandatory "${id}" parameter is not provided.`);
+		if (!oChange[sId]) {
+			throw new Error(`Mandatory "${sId}" parameter is not provided.`);
 		}
 		if (!oChange.entityPropertyChange) {
-			throw new Error(`Changes for "${oChange[id]}" are not provided.`);
+			throw new Error(`Changes for "${oChange[sId]}" are not provided.`);
 		}
 
-		checkChange(oChange.entityPropertyChange, aSupportedProperties, aSupportedOperations);
+		checkChange(oChange.entityPropertyChange, aSupportedProperties, aSupportedOperations, oSupportedPropertyPattern);
 	}
 
 	var layer_prefixes = {};
@@ -150,6 +147,24 @@ sap.ui.define([
 		return sPrefix;
 	}
 
+	/**
+	 * Checks the format consistency for change mergers (ChangeDataSource and ChangeInbound)
+	 * and other mergers with the prefix "change". The format of a change is valid if it includes the ID as well as <code>entityPropertyChange</code>.
+	 *
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange - Changes to be merged
+	 * @param {object} oSupportedPattern - Object with pattern for limited property values
+	 * @private
+	 * @ui5-restricted sap.ui.fl, sap.suite.ui.generic.template
+	 */
+	function checkPropertyValuePattern(oChange, oSupportedPattern) {
+		// if no pattern is provided, everything is allowed
+		if (!Object.keys(oSupportedPattern).includes(oChange.propertyPath)) { return; }
+		if (!oChange.propertyValue.match(oSupportedPattern[oChange.propertyPath])) {
+			throw new Error(`Not supported format for propertyPath ${oChange.propertyPath}. ` +
+							`The supported pattern is ${oSupportedPattern[oChange.propertyPath]}`);
+		}
+	}
+
 	return {
 		checkEntityPropertyChange,
 		checkIdNamespaceCompliance,

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

@@ -53,7 +53,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @private
@@ -162,7 +162,7 @@ sap.ui.define([
 			// Make sure that it was not encoded before
 			var sEncodedUrl = decodeURI(sUrl) === sUrl ? encodeURI(sUrl) : sUrl;
 
-			if (IFrame.isValidUrl(sEncodedUrl)) {
+			if (IFrame.isValidUrl(sEncodedUrl).result) {
 				if (this.getUseLegacyNavigation()) {
 					// Set by pushing to the history
 					this._setUrlLegacy(sEncodedUrl);
@@ -241,24 +241,56 @@ sap.ui.define([
 		return new URL(sUrl, oDocumentLocation.href);
 	};
 
+	IFrame.VALIDATION_ERROR = {
+		UNSAFE_PROTOCOL: "unsafeProtocol",
+		MIXED_CONTENT: "mixedContent",
+		FORBIDDEN_URL: "forbiddenUrl",
+		INVALID_URL: "invalidUrl"
+	};
+
 	IFrame.isValidUrl = function(sUrl) {
 		try {
 			const oUrl = IFrame._toUrl(sUrl);
-			return (
-				// Forbid dangerous javascript pseudo protocol
-				!/javascript/i.test(oUrl.protocol)
-				&& (
-					// Forbid unsafe http embedding within https to conform with mixed content security restrictions
-					!/http(?!s)/.test(oUrl.protocol)
-					// Exception: Host is using http, no protocol downgrade happening
-					// Required for local testing and onPrem systems
-					|| /http(?!s)/.test(IFrame._getDocumentLocation().protocol)
-				)
-				// Take further customer restrictions into account
-				&& URLListValidator.validate(sUrl)
-			);
+
+			// Forbid dangerous javascript pseudo protocol
+			if (/javascript/i.test(oUrl.protocol)) {
+				return {
+					result: false,
+					error: IFrame.VALIDATION_ERROR.UNSAFE_PROTOCOL
+				};
+			}
+
+			if (
+				// Forbid unsafe http embedding within https to conform with mixed content security restrictions
+				/http(?!s)/.test(oUrl.protocol)
+				// Exception: Host is using http, no protocol downgrade happening
+				// Required for local testing and onPrem systems
+				&& !/http(?!s)/.test(IFrame._getDocumentLocation().protocol)
+			) {
+				return {
+					result: false,
+					error: IFrame.VALIDATION_ERROR.MIXED_CONTENT
+				};
+			}
+
+			// Take further customer restrictions into account
+			// Since the validator doesn't return an error, use a generic error message
+			if (!URLListValidator.validate(sUrl)) {
+				return {
+					result: false,
+					error: IFrame.VALIDATION_ERROR.FORBIDDEN_URL
+				};
+			}
+
+			return {
+				result: true
+			};
 		} catch {
-			return false;
+			// URL parsing failed
+			return {
+				result: false,
+				error: IFrame.VALIDATION_ERROR.INVALID_URL
+			};
 		}
 	};
 

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.120.7
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @private

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

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