@sapui5/sap.suite.ui.generic.template 1.130.1 → 1.131.0

package/src/sap/suite/ui/generic/template/designtime/floorplans/ObjectPage.designtime.js

@@ -61,6 +61,15 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 							actions: ["move"]
 						}
 					}
+				},
+				"sap.ui.table.Table": {
+					properties: ["scrollThreshold"]
+				},
+				"sap.ui.table.AnalyticalTable": {
+					properties: ["scrollThreshold"]
+				},
+				"sap.ui.table.TreeTable": {
+					properties: ["scrollThreshold"]
 				}
 			};
 
@@ -258,16 +267,15 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 			"sap.ui.comp.smartchart.SmartChart": {
 				actions: ["compVariant"]		// allows table personalization (same as for end user)
 			},
-			"sap.ui.comp.navpopover.SmartLink" : {
+			"sap.ui.comp.navpopover.SmartLink": {
 				actions: ["settings"]
 			}
 		};
 		// there's no reliable way to differentiate designtime adaptation and key user adaptation. However
 		// - property changes are possible only in designtime adaptation
 		// - for any other changes (using change handlers), we anyway need to be prepared for the change if it is allowed in one mode, so it shouldn't matter if it's also possible in the other mode
-		return designtimeHelper.getRtaModeValue()
-			.then(function (sRtaModeValue) {
-				var mAllow = sRtaModeValue === designtimeHelper.FioriToolsRtaMode.True ? mAllowVariantManagement : designtimeHelper.getMergedAllowList([mAllowLevel0, mGreyLevel0, mAllowKeyUser]);
+		const sRtaModeValue = designtimeHelper.getRtaModeValue();
+		const mAllow = sRtaModeValue === designtimeHelper.FioriToolsRtaMode.True ? mAllowVariantManagement : designtimeHelper.getMergedAllowList([mAllowLevel0, mGreyLevel0, mAllowKeyUser]);
 				return designtimeHelper.getViewDesignTime(mAllow, sRtaModeValue);
+
 			});
-});

package/src/sap/suite/ui/generic/template/designtime/utils/designtimeHelper.js

@@ -1,6 +1,6 @@
 sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/util/merge", "sap/suite/ui/generic/template/genericUtilities/FeLogger",
 	"sap/suite/ui/generic/template/designtime/controls/SmartTable.designtime"
-], function (extend, deepExtend, merge, FeLogger,SmartTableDesigntimeHelper) {
+], function (extend, deepExtend, merge, FeLogger, SmartTableDesigntimeHelper) {
 	"use strict";
 
 	/*
@@ -41,18 +41,18 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 
 	var mControlInfo = {};
 	var aViews = [];
-	var oLogger = new FeLogger("designtime.utils.designTimeHelper").getLogger();
+	// var oLogger = new FeLogger("designtime.utils.designTimeHelper").getLogger();
 	var RTA_MODE_URL_PARAM_KEY = "fiori-tools-rta-mode";
 	var oMutationObserver;
 	/**
 	 * get effective designtime for all controls on current active view
 	 * @return {Promise} promise resolving to a map, with key = control id, value = designtime
 	 */
-	function loadBaseDesigntime(){
+	function loadBaseDesigntime() {
 		var aPromises = [];
 
-		function addToControlInfo(oControl){
-			if (mControlInfo[oControl.getId()]){
+		function addToControlInfo(oControl) {
+			if (mControlInfo[oControl.getId()]) {
 				return;
 			}
 
@@ -60,24 +60,24 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 			mControlInfo[oControl.getId()] = oControlInfo;
 			oControlInfo.designTimePromise = oControl.getMetadata().loadDesignTime(oControl);
 			aPromises.push(oControlInfo.designTimePromise);
-			oControlInfo.designTimePromise.then(function(oDesignTime){
+			oControlInfo.designTimePromise.then(function (oDesignTime) {
 				oControlInfo.designTime = oDesignTime;
 			});
 		}
 
-		function findPreceedingKnownNode(oNode){
+		function findPreceedingKnownNode(oNode) {
 			// ignore empty node or id. If node is not known and has no parent, we cannot find control it belongs to (can hopefully not be relevant)
 			return !oNode || !oNode.id || mControlInfo[oNode.id] ? oNode : oNode.parentNode && findPreceedingKnownNode(oNode.parentNode);
 		}
 
 		// Assumption: Enough to start with template views and find all aggregated objects
 		// for later added controls: enough to add listener on those views, react if related Node is a known control, and recheck all aggregated objects of that control
-		document.querySelectorAll(".sapUiXMLView").forEach(function(oTopNode){
+		document.querySelectorAll(".sapUiXMLView").forEach(function (oTopNode) {
 			var oView = sap.ui.getCore().byId(oTopNode.id);
 			// defensive programming, as any error here would be caught by UI adaptation and lead to just ignoring designtime provided here - which would open up for any UI adaptation provided from
 			// deeper layers
 			// first two conditions should actually not occur, but if so, evaluating the third would break
-			if (!oView || !(oView instanceof  sap.ui.core.mvc.XMLView) || !(oView.getController() instanceof sap.suite.ui.generic.template.lib.TemplateViewController)){return;}
+			if (!oView || !(oView instanceof sap.ui.core.mvc.XMLView) || !(oView.getController() instanceof sap.suite.ui.generic.template.lib.TemplateViewController)) { return; }
 
 			aViews.push(oView);
 
@@ -115,40 +115,12 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 	}
 	/**
 	 * Parses the URL parameters and returns the value of RTA mode URL parameter (fiori-tools-rta-mode)
-	 * @returns {Promise<boolean>} A promise which returns a value of RTA mode
+	 * @returns {string | null} A promise which returns a value of RTA mode
 	 */
 	function getRtaModeValue() {
-		var UShellContainer = sap.ui.require("sap/ushell/Container");
-		return new Promise(function (fnResolve){
-			if (!UShellContainer) {
-				oLogger.error("UShell Container not found");
-				fnResolve(false);
-				return;
-			}
-			var oUrlParserPromise = UShellContainer.getServiceAsync("URLParsing"),
-				oFLPUrlPromise = UShellContainer.getFLPUrlAsync(true);
-
-			Promise.allSettled([oUrlParserPromise, oFLPUrlPromise]).then(function (aResult){
-				var oUrlParser = aResult[0].value,
-					sFLPUrl = aResult[1].value;
-
-				if (!oUrlParser) {
-					oLogger.error("Problem while getting URLParsing service", aResult[0].reason);
-					fnResolve(false);
-					return;
-				}
-
-				if (!sFLPUrl) {
-					oLogger.error("Problem while getting FLP URL", aResult[1].reason);
-					fnResolve(false);
-					return;
-				}
-
-				var oUrlParams = oUrlParser.parseParameters(sFLPUrl),
-					sRtaModeValue = oUrlParams[RTA_MODE_URL_PARAM_KEY] && oUrlParams[RTA_MODE_URL_PARAM_KEY][0];
-				fnResolve(sRtaModeValue);
-			});
-		});
+		const oUrlParams = new URLSearchParams(window.location.search);
+		const sRtaModeValue = oUrlParams.get(RTA_MODE_URL_PARAM_KEY);
+		return sRtaModeValue;
 	}
 
 	/*
@@ -156,19 +128,19 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 	 * control itself, the last one is an XMLView (with a controller of type TemplateViewController). "direct" means, no other XMLViews are in between.
 	 * If control is not relevant (i.e. not part of a view, or part of a different view), returns undefined.
 	 */
-	function getAncestors(oControl){
+	function getAncestors(oControl) {
 		var aAncestors = [oControl];
 
-		while (!(oControl instanceof sap.ui.core.mvc.XMLView)){
+		while (!(oControl instanceof sap.ui.core.mvc.XMLView)) {
 			oControl = oControl.getParent();
-			if (!oControl){
+			if (!oControl) {
 				// control not in view hierarchy => not relevant
 				return;
 			}
 			aAncestors.push(oControl);
 		}
 
-		if (!(oControl.getController() instanceof sap.suite.ui.generic.template.lib.TemplateViewController)){
+		if (!(oControl.getController() instanceof sap.suite.ui.generic.template.lib.TemplateViewController)) {
 			// next view up the hierarchy not a template component (could e.g. be an extension) => no need to propagate designtime
 			return;
 		}
@@ -179,7 +151,7 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 	/*
 	 * check, whether oDescendant is contained in the subtree starting with oAncestor (including oAncestor)
 	 */
-	function isAggregated(oDescendant, oAncestor){
+	function isAggregated(oDescendant, oAncestor) {
 		// in some cases (e.g. table with no data), oAncestor is not a control (but simply a string) - in that case, it cannot be the one we are searching for
 		return oAncestor === oDescendant || (oAncestor.findAggregatedObjects && oAncestor.findAggregatedObjects(true).includes(oDescendant));
 	}
@@ -187,7 +159,7 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 	/*
 	 * Determine name of aggregation of oAncestor to which (the subtree containing) oDescendant belongs
 	 */
-	function getAncestorAggregationName(oAncestorInfo, oDescendant){
+	function getAncestorAggregationName(oAncestorInfo, oDescendant) {
 		/*
 		 * Metadata propagation can be done directly from any ancestor to any descendant (skipping any levels in between - like we also do directly from view down to the controls). Thus, to build the
 		 * base designtime (the resulting designtime if we would not interfere), we need to analyze propagation from any layer in between. Propagation is bound to an aggregation, so we need to find the
@@ -198,7 +170,7 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 		// aggregations not mentioned in designtime are anyway not used for propagation
 		var aAllAggregations = Object.keys(mControlInfo[oAncestorInfo.sAncestorId].designTime.aggregations);
 
-		return aAllAggregations.find(function(sAggregation){
+		return aAllAggregations.find(function (sAggregation) {
 			// Remark: generic getter getAggregation on control instance is not reliable - but generic getter on metadata (passing control instance) is!
 			// howver, generic getter is not available, if aggregation is not declared in metadata => in that case, fall back to getAggregation on control instance
 			var oAggregation = oAncestorInfo.oAncestor.getMetadata().getAggregation(sAggregation);
@@ -212,8 +184,8 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 	}
 
 
-	function getBaseDesignTime(oControl){
-		if (oControl instanceof sap.ui.core.mvc.XMLView){
+	function getBaseDesignTime(oControl) {
+		if (oControl instanceof sap.ui.core.mvc.XMLView) {
 			/*
 			 * There's no (relevant) designtime for views:
 			 * - For a view of a template component, we are defining the designtime directly, so no need to propagate to it (and actually waiting for a base designtime would cause infinite waiting)
@@ -226,7 +198,7 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 
 		var oControlInfo = mControlInfo[oControl.getId()];
 
-		if (!oControlInfo || (oControlInfo.designTimePromise && !oControlInfo.designTime)){
+		if (!oControlInfo || (oControlInfo.designTimePromise && !oControlInfo.designTime)) {
 			// either the control is not known at all to us (i.e. not even added to the DOM) or we are still waiting to retrieve its designtime. Assumption: This can only happen, if
 			// the control is just added by UI adaptation. In this case, we don't need to interfere - thus we should just return an empty designtime. This can be achieved by
 			// returning faulthy here - an empty object in contrast would an empty base designTime, which would be matched with an empty allow list - thus not allowing anything.
@@ -243,7 +215,7 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 		/* If no ancestors found, control is not relevant for FE, thus we must not change the designtime. This can be achieved by taking empty designtime as base. Don't take empty array instead - this
 		 * would only ignore everything propagated to the control, but still take designtime defined on control itself as base, thus disallow everything defined directly.
 		 */
-		if (!aAncestors) {return;}
+		if (!aAncestors) { return; }
 
 		// We need only those ancestors propagting metadata to the aggregation containing the given control.
 		// The control itself obviously cannot propagate
@@ -252,7 +224,7 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 		aAncestors.pop();
 
 		// build map with information about ancestors - as a 1. step only id is added
-		var aAncestorInfo = aAncestors.map(function(oAncestor){
+		var aAncestorInfo = aAncestors.map(function (oAncestor) {
 			return {
 				oAncestor: oAncestor,
 				sAncestorId: oAncestor.getId()
@@ -260,23 +232,23 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 		});
 
 		// only those ancestors can be relevant designtime is provided for, and only if designtime defines aggregations
-		aAncestorInfo = aAncestorInfo.filter(function(oAncestorInfo){
+		aAncestorInfo = aAncestorInfo.filter(function (oAncestorInfo) {
 			return mControlInfo[oAncestorInfo.sAncestorId] && mControlInfo[oAncestorInfo.sAncestorId].designTime && mControlInfo[oAncestorInfo.sAncestorId].designTime.aggregations;
 		});
 
 		// determine corresponding aggregation name
-		aAncestorInfo.forEach(function(oAncestorInfo){
+		aAncestorInfo.forEach(function (oAncestorInfo) {
 			oAncestorInfo.sAggregation = getAncestorAggregationName(oAncestorInfo, oControl);
 		});
 
 		// filter for those ancestors actually propagating metadata to the corresponding aggregation
-		oControlInfo.pedigree = aAncestorInfo.filter(function(oAncestorInfo){
+		oControlInfo.pedigree = aAncestorInfo.filter(function (oAncestorInfo) {
 			return mControlInfo[oAncestorInfo.sAncestorId] && mControlInfo[oAncestorInfo.sAncestorId].designTime.aggregations && mControlInfo[oAncestorInfo.sAncestorId].designTime.aggregations[oAncestorInfo.sAggregation]
-					&& mControlInfo[oAncestorInfo.sAncestorId].designTime.aggregations[oAncestorInfo.sAggregation].propagateMetadata;
+				&& mControlInfo[oAncestorInfo.sAncestorId].designTime.aggregations[oAncestorInfo.sAggregation].propagateMetadata;
 		});
 
 		//
-		oBaseDesignTime = oControlInfo.pedigree.reduce(function(oDesignTime, oAncestorInfo){
+		oBaseDesignTime = oControlInfo.pedigree.reduce(function (oDesignTime, oAncestorInfo) {
 			/* Todo: Theoretically, also indirect propagation coudl be possible, i.e. A could propgate metadata to B, including propagation to C. In general, this seems to be superfluous (A could
 			 * directly propagate the same to C, as propagation is deep), and not used. If it would be used however, to be on the save side, we should not use the designtime directly defined on the
 			 * ancestor (i.e. from mControlInfo), but rather the resulting designtime after propagation from above.
@@ -295,20 +267,20 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 		return oBaseDesignTime;
 	}
 
-	function getReducedDesignTime(oControl, oAllow){
+	function getReducedDesignTime(oControl, oAllow) {
 		var oBaseDesignTime = getBaseDesignTime(oControl);
 		/*
 		 * If no base designTime at all, control is not relevant for FE (part of extension/reuse component (or not added to the view at all)): In this case, we must not reduce any possibilities, thus
 		 * not returning a desginTime at all (not even for properties)
 		 */
-		if (!oBaseDesignTime) {return;}
+		if (!oBaseDesignTime) { return; }
 
 		var oResult = Object.create(null);
 
-		if (oBaseDesignTime.actions && typeof oBaseDesignTime.actions === "object"){ // typeof null is object, but we need to treat it  like no object
+		if (oBaseDesignTime.actions && typeof oBaseDesignTime.actions === "object") { // typeof null is object, but we need to treat it  like no object
 			oResult.actions = Object.create(null);
 			// if "real" object, we can take over all actions according to our allow list. Setting all others to "not-adaptable" (although this might not be an expected string at this place)
-			for (var sAction in oBaseDesignTime.actions){
+			for (var sAction in oBaseDesignTime.actions) {
 				oResult.actions[sAction] = oAllow && oAllow.actions && oAllow.actions.includes(sAction) ? oBaseDesignTime.actions[sAction] : null;
 			}
 		} else {
@@ -321,16 +293,16 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 		}
 
 		oResult.aggregations = Object.create(null);
-		for (var sAggregation in oBaseDesignTime.aggregations){
+		for (var sAggregation in oBaseDesignTime.aggregations) {
 			oResult.aggregations[sAggregation] = {
-					actions: Object.create(null)
+				actions: Object.create(null)
 			};
-			for (var sAction in oBaseDesignTime.aggregations[sAggregation].actions){
-				oResult.aggregations[sAggregation].actions[sAction] =  oAllow
-																	&& oAllow.aggregations
-																	&& oAllow.aggregations[sAggregation]
-																	&& oAllow.aggregations[sAggregation].actions
-																	&& oAllow.aggregations[sAggregation].actions.includes(sAction) ? oBaseDesignTime.aggregations[sAggregation].actions[sAction] : null;
+			for (var sAction in oBaseDesignTime.aggregations[sAggregation].actions) {
+				oResult.aggregations[sAggregation].actions[sAction] = oAllow
+					&& oAllow.aggregations
+					&& oAllow.aggregations[sAggregation]
+					&& oAllow.aggregations[sAggregation].actions
+					&& oAllow.aggregations[sAggregation].actions.includes(sAction) ? oBaseDesignTime.aggregations[sAggregation].actions[sAction] : null;
 			}
 		}
 
@@ -339,7 +311,7 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 		 * only what is mentioned in original designtime. However, if a property is already ignored from original designtime, we should not override this.
 		 */
 		oResult.properties = Object.create(null);
-		for (var sProperty in oControl.getMetadata().getAllProperties()){
+		for (var sProperty in oControl.getMetadata().getAllProperties()) {
 			oResult.properties[sProperty] = {
 				ignore: !oAllow || !oAllow.properties || !oAllow.properties.includes(sProperty) || (oBaseDesignTime.properties && oBaseDesignTime.properties[sProperty] && oBaseDesignTime.properties[sProperty].ignore)
 			};
@@ -348,8 +320,8 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 		return oResult;
 	}
 
-	function getViewDesignTime(mAllow, sFioriToolsRtaMode){
-		return loadBaseDesigntime().then(function(){
+	function getViewDesignTime(mAllow, sFioriToolsRtaMode) {
+		return loadBaseDesigntime().then(function () {
 
 			// provide propagation function for all controls contained allowing only what we want to allow
 			var oDesignTime = {
@@ -385,7 +357,7 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 			// Nevertheless, we need to ensure only allowed properties to be changeable.
 
 			// There might be several views. Different properties could exist (if inheritance is used) - to be sure, all properties of all views should not be alowed to change
-			return aViews.reduce(function(oDesignTime, oView){
+			return aViews.reduce(function (oDesignTime, oView) {
 				return merge(getReducedDesignTime(oView, mAllow[oView.getMetadata().getElementName()]), oDesignTime);
 			}, oDesignTime);
 		});
@@ -393,26 +365,26 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 
 	// merge objects concatenating any contained arrays
 	// open: if same property is array in one source, but not in the other one - currently resulting property will be "true" (which will probably never be expected)
-	function deepMergeWithArray(aSource){
-		return aSource.reduce(function(vResult, vSource){
-			if (!vSource){
+	function deepMergeWithArray(aSource) {
+		return aSource.reduce(function (vResult, vSource) {
+			if (!vSource) {
 				// ignore undefined sources (rather not relevant on top level, but definitely in recursion as not properties need to exist in all source (objects)) => keep current result
 				return vResult;
 			}
-			if (!vResult){
+			if (!vResult) {
 				// first source undefined => ignore and initialize result with next entry
 				return vSource;
 			}
-			if (Array.isArray(vSource) !== Array.isArray(vResult)){
+			if (Array.isArray(vSource) !== Array.isArray(vResult)) {
 				// (type of) vResult is deviates from current source => conflict. Currently not expected, skip merging (to be adapted if need arises)
 				// returning true to avoid overriding in next iteration
 				return true;
 			}
 
-			if (Array.isArray(vResult)){
+			if (Array.isArray(vResult)) {
 				return vResult.concat(vSource);
 			} else {
-				for (var sProperty in vSource){
+				for (var sProperty in vSource) {
 					vResult[sProperty] = deepMergeWithArray([vResult[sProperty], vSource[sProperty]]);
 				}
 				return vResult;

package/src/sap/suite/ui/generic/template/designtime/utils/designtimeUtils.js

@@ -7,8 +7,9 @@
 
 sap.ui.define([
 	"sap/base/util/ObjectPath",
+	"sap/ui/core/Component",
 	"sap/suite/ui/generic/template/genericUtilities/testableHelper"
-], function (ObjectPath, testableHelper) {
+], function (ObjectPath, Component, testableHelper) {
 	"use strict";
 	/**
 	 * Creates the adaptation dialog content based on the provided settings, property values, and unchanged data.
@@ -164,12 +165,8 @@ sap.ui.define([
 		});
 	}
 
-	function getComponent(oElement) {
-		let oComponent = oElement;
-		while (oComponent && !oComponent.getRootControl) {
-			oComponent = oComponent.getParent();
-		}
-		return oComponent;
+	function getOwnerComponentFor(oElement) {
+		return Component.getOwnerComponentFor(oElement);
 	}
 	/**
 	 * @typedef {Object} PathParameters
@@ -184,7 +181,7 @@ sap.ui.define([
 	 *
 	 * @param {Object} mRuntimeSettings - An object containing the current runtime settings.
 	 * @param {Array<Object>} aManifestSettingsData - An array of objects representing the manifest settings data.
-	 * @returns {Array<Object>} An array of Settings objects, which can then be used to create the adaptation dialog content.
+	 * @returns {Array<Settings>} An array of Settings objects, which can then be used to create the adaptation dialog content.
 	 *
 	 * @typedef {Object} Settings
 	 * @property {string} label - The name of the setting.
@@ -258,7 +255,7 @@ sap.ui.define([
 		};
 	};
 
-	async function fnOpenAdaptionDialog(items, propertyValues, unchangedData, title, size) {
+	async function fnOpenAdaptionDialog(items, propertyValues, unchangedData, title, size, oResourceModel) {
 		const list = await fnCreateAdaptionDialogContent(items, propertyValues, unchangedData);
 		return new Promise(function (resolve, reject) {
 			sap.ui.require([
@@ -268,38 +265,68 @@ sap.ui.define([
 			], function (Dialog, Button, MessageStrip) {
 				const informationText = new MessageStrip({
 					type: "Information",
-					text: "Changes made in this dialog may not directly result in visible changes in the application, because some settings don’t work in combination with others."
+					showIcon: true,
+					text: "{i18n>RTA_CONFIGURATION_INFO_MESSAGE}"
 				});
+				informationText.addStyleClass("sapUiSmallMarginBottom");
 				const dialog = new Dialog({
 					title: title,
 					contentWidth: size ? size.width : "550px",
 					contentHeight: size ? size.height : "300px",
 					content: [informationText, list],
+					resizable: true,
 					buttons: [
 						new Button({
-							text: "Close",
+							text: "{i18n>RTA_CONFIGURATION_APPLY}",
+							type: "Emphasized",
 							press: function () {
 								dialog.close();
-								reject();
+								resolve(propertyValues);
 							}
 						}),
 						new Button({
-							text: "Apply",
+							text: "{i18n>RTA_CONFIGURATION_CANCEL}",
 							press: function () {
 								dialog.close();
-								resolve(propertyValues);
+								reject();
 							}
 						})
 					]
 				});
+				dialog.setModel(oResourceModel, 'i18n');
+				dialog.addStyleClass("sapUiContentPadding");
+				dialog.addStyleClass("sapUiRTABorder");
 				dialog.open();
 			});
 		});
 	}
 
+	/**
+	 * @typedef {Object} DesigntimeSetting
+	 * @property {string} id - The ID of the designtime setting.
+	 * @property {string} name - The name of the designtime setting.
+	 * @property {string} description - The description of the designtime setting.
+	 * @property {PropertyValue} value - The default value of the designtime setting.
+	 * @property {string} type - The type of the designtime setting.
+	 * @property {Array.<Enum>} [enums] - The array of possible enum values for the designtime setting.
+	 * @property {(mControlDetails: PathParameters) => string} [getPath] - The path to the designtime setting in the manifest.
+	 * @property {boolean} [bSupportsGlobalScope] - Indicates if the setting supports global scope. (Default: false)
+	 * @property {string[]} [restrictedTo] - The array of components for which the setting is restricted.
+	 * @property {DesigntimeSetting[]} [writeObject] - An array of DesigntimeSetting objects.
+	 * @property {string} [writeObjectFor] - The value of the setting for which the Object should be constructed.
+	 * @property {boolean} [skipChange] - Indicates if the change should be skipped.
+
+	* @typedef {string | boolean | string[] } PropertyValue
+
+	* @typedef {Object} Enum
+	* @property {string} id - The ID of the enum value.
+	* @property {string} name - The name of the enum value.
+	*/
+
+
 	/**
 	 * Retrieves the changed property values.
-	 * @param {Array} designtimeSettings - The array of designtime settings.
+	 * @param {DesigntimeSetting[]} designtimeSettings - The array of designtime settings.
 	 * @param {Object} unchangedData - The unchanged data.
 	 * @param {Object} propertyValues - The property values.
 	 * @param {PathParameters} mPathParameters - The path parameters.
@@ -313,10 +340,25 @@ sap.ui.define([
 				(typeof unchangedData[setting.id] === "object" && JSON.stringify(unchangedData[setting.id]) !== JSON.stringify(propertyValues[setting.id]))
 			) {
 				const propertyChangeKey = setting.getPath ? setting.getPath(mPathParameters) : setting.id;
-				propertyChanges[propertyChangeKey] = {
-					value: propertyValues[setting.id],
-					bIsGlobalChange: !!setting.bSupportsGlobalScope && mPathParameters.sScope === SettingScope.Application
-				};
+				const changeObject = {};
+				const bIsGlobalChange = !!setting.bSupportsGlobalScope && mPathParameters.sScope === SettingScope.Application;
+				if (setting.writeObject?.length && setting.writeObjectFor === propertyValues[setting.id]) {
+					setting.writeObject.forEach(function (settingsTogether) {
+						changeObject[settingsTogether.getPath ? settingsTogether.getPath(mPathParameters) : settingsTogether.id] =
+							propertyValues[settingsTogether.id];
+
+					});
+					propertyChanges[propertyChangeKey] = {
+						value: changeObject,
+						bIsGlobalChange
+					};
+
+				} else if (!setting.skipChange) {
+					propertyChanges[propertyChangeKey] = {
+						value: propertyValues[setting.id],
+						bIsGlobalChange
+					};
+				}
 			}
 		});
 		return propertyChanges;
@@ -348,7 +390,7 @@ sap.ui.define([
 	}
 
 	function getLocalId(oElement) {
-		const oComponent = getComponent(oElement);
+		const oComponent = getOwnerComponentFor(oElement);
 		return oComponent.getRootControl().getLocalId(oElement.getId());
 	}
 
@@ -385,7 +427,7 @@ sap.ui.define([
 		openAdaptionDialog: fnOpenAdaptionDialog,
 		getSettings,
 		extractChanges: fnExtractChanges,
-		getComponent,
+		getOwnerComponentFor,
 		createAdaptionDialogContent: fnCreateAdaptionDialogContent,
 		getLocalId,
 		SettingScope,

package/src/sap/suite/ui/generic/template/detailTemplates/i18n/i18n_es.properties

@@ -9,4 +9,4 @@ MESSAGE_BUTTON_TYPE=Mensajes
 
 ST_DETAIL_TITLE_VALIDATION=Mensajes de validaci\u00F3n
 
-ST_DETAIL_TITLE_DELETE=Eliminar
+ST_DETAIL_TITLE_DELETE=Borrar

package/src/sap/suite/ui/generic/template/fragments/MessagePopover.fragment.xml

@@ -5,7 +5,7 @@
 		<MessageItem  description="{msg>description}" type="{msg>type}"  title="{msg>message}"
 					subtitle="{parts:[{path: 'msg>id'}, {path: 'msg>controlIds'}, {path: 'msg>additionalText'}, {path: 'helper>/isPopoverOpen'}, {path: 'helper>/heartBeat'}], formatter: '.getSubtitle'}"
 					longtextUrl="{msg>descriptionUrl}"
-					markupDescription="true"
+					markupDescription="{helper>/isAIErrorExplanationEnabled}"
 					activeTitle="{parts:[{path: 'msg>id'}, {path: 'msg>controlIds'}, {path: 'helper>/isPopoverOpen'}], formatter: '.isPositionable'}"
 					groupName="{= ${helper>/messageToGroupName}[${msg>id}] }">
 					<Link

package/src/sap/suite/ui/generic/template/fragments/SmartFormDataField.fragment.xml

@@ -35,7 +35,7 @@
 							visible="{path: 'dataField>', formatter: 'AH.getVisibiltyBasedOnImportanceAndHidden'}"
 							binding="{path: 'dataField>Target'}, formatter: 'AH.getNavigationPathWithExpand'}">
 							<fe:customData>
-								<core:CustomData key="SideEffects" value="{parts: [{path: 'entitySet>'}, {path: 'dataField>'}], formatter: 'AH.getPropsForLinkFields'}"/>
+								<core:CustomData key="SideEffects" value="{parts: [{path: 'entitySet>'}, {path: 'dataField>'}, {path: 'contact>fn/Path'}], formatter: 'AH.getPropsForLinkFields'}"/>
 								<core:CustomData key="Location" value="Section" />
 								<core:CustomData key="contactDetails" value="{= ${path: 'contact>', formatter: 'AH.getCustomDataForContactPopup'}}"/>
 							</fe:customData>

package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartTableChartCommon.js

@@ -82,7 +82,7 @@ sap.ui.define([
                 getState: fnGetState,
                 setState: fnSetState,
                 getLocalId: fnGetLocalId,
-                bVMConnection: false,
+                bVMConnection: oControl && oControl.getSmartVariant && !!oControl.getSmartVariant(),
                 attachStateChanged: fnAttachStateChanged
             };
         }

package/src/sap/suite/ui/generic/template/js/AnnotationHelper.js

@@ -12,9 +12,10 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 	"sap/suite/ui/generic/template/genericUtilities/metadataAnalyser",
 	"sap/ui/base/ManagedObject",
 	"sap/suite/ui/generic/template/lib/SideEffectUtil",
-	"sap/suite/ui/generic/template/js/RuntimeFormatters" // just to make sure that it is loaded
+	"sap/base/util/isEmptyObject",
+	"sap/suite/ui/generic/template/js/RuntimeFormatters"// just to make sure that it is loaded
 ], function (AnnotationHelperModel, AnnotationHelperModelBasics, SmartField, FeLogger, formatMessage, deepExtend, StableIdHelper, utils, Device,
-	SapMLibrary, SapCoreLibrary, metadataAnalyser, ManagedObject, SideEffectUtil) {
+	SapMLibrary, SapCoreLibrary, metadataAnalyser, ManagedObject, SideEffectUtil, isEmptyObject) {
 	"use strict";
 
 	// shortcut for sap.ui.core.ValueState
@@ -384,8 +385,8 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		getCustomDataForContactPopup: function (oContactDetails) {
 			return ((JSON.stringify(oContactDetails)).replace(/\}/g, "\\}").replace(/\{/g, "\\{")); //check bindingParser.escape
 		},
-		getPropsForLinkFields: function(oEntitySet, oTarget) {
-			return SideEffectUtil.getPropsForLinkFields(oEntitySet, oTarget);
+		getPropsForLinkFields: function(oEntitySet, oTarget, sFieldName) {
+			return SideEffectUtil.getPropsForLinkFields(oEntitySet, oTarget, sFieldName);
 		},
 		checkIsEmailAddress: function (oInterface, sEntityType, oDataField) {
 			var oMetaModel = oInterface.getInterface(1).getModel();
@@ -4263,7 +4264,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 					"*": false
 				};
 			}
-			if (mColumnWidthIncludingColumnHeader) {
+			if (!isEmptyObject(mColumnWidthIncludingColumnHeader)) {
 				oCustomizeConfig["autoColumnWidth"] = mColumnWidthIncludingColumnHeader;
 			}
 			sCustomizeConfig = JSON.stringify(oCustomizeConfig);