@openui5/sap.ui.fl 1.139.0 → 1.141.0

package/src/sap/ui/fl/apply/api/UI2PersonalizationApplyAPI.js

@@ -7,7 +7,8 @@
 sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/UI2Personalization/UI2PersonalizationState",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils"
+	"sap/ui/fl/initial/_internal/ManifestUtils",
+	"sap/ui/fl/apply/_internal/init"
 ], function(
 	UI2PersonalizationState,
 	FlexState,

package/src/sap/ui/fl/changeHandler/AddIFrame.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.AddIFrame
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @since 1.72
 	 * @private
 	 */

package/src/sap/ui/fl/changeHandler/AddXML.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.AddXML
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @since 1.54
 	 * @private
 	 */
@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @param {object} mPropertyBag.view Root view
 	 * @returns {boolean} <true> if the change got applied successfully
 	 * @private
-	 * @ui5-restricted sap.ui.fl.apply.changes.Applyer
+	 * @ui5-restricted sap.ui.fl.apply.changes.Applier
 	 * @name sap.ui.fl.changeHandler.AddXML#applyChange
 	 */
 	AddXML.applyChange = function(oChange, oControl, mPropertyBag) {

package/src/sap/ui/fl/changeHandler/AddXMLAtExtensionPoint.js

@@ -5,10 +5,10 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/apply/api/ExtensionPointRegistryAPI",
+	"sap/ui/fl/apply/_internal/extensionPoint/Registry",
 	"sap/ui/fl/changeHandler/BaseAddXml"
 ], function(
-	ExtensionPointRegistryAPI,
+	ExtensionPointRegistry,
 	BaseAddXml
 ) {
 	"use strict";
@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.AddXMLAtExtensionPoint
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @since 1.75
 	 * @private
 	 */
@@ -79,7 +79,7 @@ sap.ui.define([
 			// Confirm with ready function in sync apply scenario (preprocessing with JSView)
 			mExtensionPointInfo.ready(aNewControls);
 		}
-		ExtensionPointRegistryAPI.addCreatedControlsToExtensionPointInfo({
+		ExtensionPointRegistry.addCreatedControls({
 			name: oSelector.name,
 			viewId: sViewId,
 			createdControlsIds: aNewControls.map((oNewControl) => oModifier.getId(oNewControl))

package/src/sap/ui/fl/changeHandler/Base.js

@@ -14,7 +14,7 @@ sap.ui.define([
 	/**
 	 * Base functionality for all change handlers, which provides some reuse methods
 	 * @namespace sap.ui.fl.changeHandler.Base
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted change handlers
 	 */
@@ -66,7 +66,8 @@ sap.ui.define([
 
 			const oModifier = mPropertyBag.modifier;
 			const oView = mPropertyBag.view;
-			const sFragment = LoaderExtensions.loadResource(sModuleName, {dataType: "text"});
+			const sFragment = mPropertyBag.fragment || LoaderExtensions.loadResource(sModuleName, {dataType: "text"});
+
 			try {
 				return await oModifier.instantiateFragment(sFragment, sIdPrefix, oView);
 			} catch (oError) {

package/src/sap/ui/fl/changeHandler/BaseAddViaDelegate.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.changeHandler.BaseAddViaDelegate
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted change handlers
 	 */

package/src/sap/ui/fl/changeHandler/BaseAddXml.js

@@ -5,13 +5,15 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/changeHandler/Base",
 	"sap/base/util/LoaderExtensions",
-	"sap/ui/fl/changeHandler/common/revertAddedControls"
+	"sap/ui/fl/apply/_internal/DelegateMediator",
+	"sap/ui/fl/changeHandler/common/revertAddedControls",
+	"sap/ui/fl/changeHandler/Base"
 ], function(
-	Base,
 	LoaderExtensions,
-	revertAddedControls
+	DelegateMediator,
+	revertAddedControls,
+	Base
 
 ) {
 	"use strict";
@@ -21,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.BaseAddXml
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @since 1.75
 	 * @private
 	 * @ui5-restricted change handlers
@@ -36,7 +38,7 @@ sap.ui.define([
 	 * @param {object} mPropertyBag - Property bag
 	 * @param {object} mPropertyBag.modifier - Modifier for the controls
 	 * @param {object} mPropertyBag.view - Root view
-	 * @param {object} mChangeInfo - Change Informantion map
+	 * @param {object} mChangeInfo - Change Information map
 	 * @param {number} mChangeInfo.index - Index defines the position at witch the xml fragment is added
 	 * @param {string} mChangeInfo.aggregationName - Aggregation name of the control to be extended by the xml fragment
 	 * @param {boolean} [mChangeInfo.skipAdjustIndex] - True in case of inserting an XML node or element at an extension point, needed only in XML case
@@ -48,14 +50,24 @@ sap.ui.define([
 	BaseAddXml.applyChange = async function(oChange, oControl, mPropertyBag, mChangeInfo) {
 		const oModifier = mPropertyBag.modifier;
 		const sAggregationName = mChangeInfo.aggregationName;
-		const sModuleName = oChange.getFlexObjectMetadata().moduleName;
+		const oFlexObjectMetadata = oChange.getFlexObjectMetadata();
+		const sModuleName = oFlexObjectMetadata.moduleName;
 
 		const oAggregationDefinition = await oModifier.findAggregation(oControl, sAggregationName);
 		if (!oAggregationDefinition) {
 			throw Error(`The given Aggregation is not available in the given control: ${oModifier.getId(oControl)}`);
 		}
-		const sFragment = await LoaderExtensions.loadResource(sModuleName, {dataType: "text"});
-		const aNewControls = await Base.instantiateFragment(oChange, mPropertyBag);
+		let sFragment = await LoaderExtensions.loadResource(sModuleName, {dataType: "text"}); // complete xml fragment as string
+
+		const oAdjustFragmentHandlers = DelegateMediator.getAddXMLAdjustFragmentHandlers();
+		if (oAdjustFragmentHandlers) {
+			for (const sKey in oAdjustFragmentHandlers) {
+				sFragment = await oAdjustFragmentHandlers[sKey](sFragment, mPropertyBag);
+			}
+		}
+
+		// now the real UI5 controls are created from the XML string
+		const aNewControls = await Base.instantiateFragment(oChange, { ...mPropertyBag, fragment: sFragment });
 
 		let iIterator = 0;
 		for (const oNewControl of aNewControls) {

package/src/sap/ui/fl/changeHandler/BaseRename.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.changeHandler.BaseRename
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @since 1.46
 	 *
 	 * @private

package/src/sap/ui/fl/changeHandler/ChangeAnnotation.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 * Default change handler for annotations.
 	 * @alias sap.ui.fl.changeHandler.ChangeAnnotation
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @since 1.132
 	 * @public
 	 */
@@ -41,7 +41,12 @@ sap.ui.define([
 
 		const oObjectTemplateInfo = oContent.objectTemplateInfo;
 		if (oObjectTemplateInfo) {
-			oReturn.value = JSON.parse(oObjectTemplateInfo.templateAsString.replace(oObjectTemplateInfo.placeholder, sValue));
+			// Parse the object before replacing the placeholder to avoid issues with escaped special characters
+			const oParsedTemplate = JSON.parse(oObjectTemplateInfo.templateAsString);
+			Object.keys(oParsedTemplate).forEach((sKey) => {
+				oParsedTemplate[sKey] = oParsedTemplate[sKey].replace(oObjectTemplateInfo.placeholder, sValue);
+			});
+			oReturn.value = oParsedTemplate;
 		} else {
 			oReturn.value = sValue;
 		}

package/src/sap/ui/fl/changeHandler/HideControl.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * Change handler for hiding of a control.
 	 * @alias sap.ui.fl.changeHandler.HideControl
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @since 1.27.0
 	 */
 	const HideControl = {};

package/src/sap/ui/fl/changeHandler/MoveControls.js

@@ -19,7 +19,7 @@ function(
 	 *
 	 * @alias sap.ui.fl.changeHandler.MoveControls
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @since 1.46
 	 */
 	const MoveControls = { };

package/src/sap/ui/fl/changeHandler/MoveElements.js

@@ -12,7 +12,7 @@ sap.ui.define([], function() {
 	 *
 	 * @alias sap.ui.fl.changeHandler.MoveElements
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @since 1.34.0
 	 */
 	var MoveElements = { };

package/src/sap/ui/fl/changeHandler/PropertyBindingChange.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.PropertyBindingChange
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @since 1.38
 	 * @private
 	 */

package/src/sap/ui/fl/changeHandler/PropertyChange.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.PropertyChange
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @since 1.36
 	 * @private
 	 */

package/src/sap/ui/fl/changeHandler/StashControl.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * Change handler for stashing of a control.
 	 * @alias sap.ui.fl.changeHandler.StashControl
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @since 1.27.0
 	 */
 	const StashControl = {};

package/src/sap/ui/fl/changeHandler/UnhideControl.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * Change handler for revealing of a control.
 	 * @alias sap.ui.fl.changeHandler.UnhideControl
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @since 1.27.0
 	 */
 	const UnhideControl = {};

package/src/sap/ui/fl/changeHandler/UnstashControl.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 * Change handler for unstashing of a control.
 	 * @alias sap.ui.fl.changeHandler.UnstashControl
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @since 1.27.0
 	 */
 	const UnstashControl = {};

package/src/sap/ui/fl/changeHandler/UpdateIFrame.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.UpdateIFrame
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @since 1.72
 	 * @private
 	 */

package/src/sap/ui/fl/changeHandler/common/createIFrame.js

@@ -4,10 +4,7 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define([
-	"sap/ui/fl/util/IFrame"
-], function(
-) {
+sap.ui.define([], function() {
 	"use strict";
 
 	/**

package/src/sap/ui/fl/descriptorRelated/api/DescriptorChange.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.fl.descriptorRelated
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.fl.descriptorRelated.api
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorChange
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/descriptorRelated/api/DescriptorChangeFactory.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.fl.descriptorRelated
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.fl.descriptorRelated.api
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorChangeFactory
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/descriptorRelated/api/DescriptorInlineChangeFactory.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorInlineChangeFactory
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @private
 	 * @deprecated Since version 1.76
 	 * @ui5-restricted sap.ui.rta, smart business

package/src/sap/ui/fl/descriptorRelated/api/DescriptorVariantFactory.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorVariantFactory
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @private
 	 * @deprecated Since version 1.73
 	 * @ui5-restricted sap.ui.rta, smart business

package/src/sap/ui/fl/designtime/variants/VariantManagement.designtime.js

@@ -15,7 +15,8 @@ sap.ui.define([
 	flUtils
 ) {
 	"use strict";
-	var fnSetControlAttributes = function(oVariantManagement, bDesignTimeMode) {
+
+	async function fnSetControlAttributes(oVariantManagement, bDesignTimeMode) {
 		var oAppComponent = flUtils.getAppComponentForControl(oVariantManagement);
 		var sControlId = oVariantManagement.getId();
 		var oModel = oAppComponent.getModel(ControlVariantApplyAPI.getVariantModelName());
@@ -26,15 +27,15 @@ sap.ui.define([
 		}
 
 		if (bDesignTimeMode) {
-			oModel.waitForVMControlInit(sVariantManagementReference).then(function() {
-			    oModel.setModelPropertiesForControl(sVariantManagementReference, bDesignTimeMode, oVariantManagement);
-			    oModel.checkUpdate(true);
-		    });
+			await oVariantManagement.waitForInit();
+			oModel.setModelPropertiesForControl(sVariantManagementReference, bDesignTimeMode, oVariantManagement);
+			oModel.checkUpdate(true);
 		} else {
 			oModel.setModelPropertiesForControl(sVariantManagementReference, bDesignTimeMode, oVariantManagement);
 			oModel.checkUpdate(true);
 		}
-	};
+	}
+
 	return {
 		annotations: {},
 		properties: {
@@ -85,17 +86,18 @@ sap.ui.define([
 		},
 		actions: {
 			controlVariant(oVariantManagement) {
-				var oAppComponent = flUtils.getAppComponentForControl(oVariantManagement);
-				var sControlId = oVariantManagement.getId();
-				var oModel = oAppComponent.getModel(ControlVariantApplyAPI.getVariantModelName());
-				var sVariantManagementReference = oAppComponent.getLocalId(sControlId) || sControlId;
 				return {
 					validators: [
 						"noEmptyText",
 						{
 							validatorFunction(sNewText) {
-								var iDuplicateCount = oModel._getVariantTitleCount(sNewText, sVariantManagementReference) || 0;
-								return iDuplicateCount === 0;
+								// Avoid duplicate titles
+								return !oVariantManagement.getVariants().some(function(oVariant) {
+									if (oVariant.getKey() === oVariantManagement.getCurrentVariantKey()) {
+										return false;
+									}
+									return sNewText.toLowerCase() === oVariant.getTitle().toLowerCase() && oVariant.getVisible();
+								});
 							},
 							errorMessage: Lib.getResourceBundleFor("sap.m").getText("VARIANT_MANAGEMENT_ERROR_DUPLICATE")
 						}

package/src/sap/ui/fl/initial/_internal/FlexConfiguration.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * The flexibility Configuration.
 	 *
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @private
 	 * @alias module:sap/ui/fl/initial/_internal/FlexConfiguration
 	 * @namespace