@sapui5/sap.suite.ui.generic.template 1.135.0 → 1.136.0

package/src/sap/suite/ui/generic/template/designtime/controls/SmartTable.designtime.js

@@ -155,6 +155,12 @@ sap.ui.define([
 					case "selectionLimit":
 						mPropertyValues[sProperty] = oTableSettings.selectionLimit ?? oSetting.value;
 						break;
+					case "threshold":
+						mPropertyValues[sProperty] = oTableSettings.threshold ?? oSetting.value;
+						break;
+					case "scrollThreshold":
+						mPropertyValues[sProperty] = oTableSettings.scrollThreshold ?? oSetting.value;
+						break;
 					default:
 						break;
 				}
@@ -170,12 +176,11 @@ sap.ui.define([
 			if (!oSmartTable.isA("sap.ui.comp.smarttable.SmartTable")) {
 				throw new Error("The SmartTable control could not be found");
 			}
-
 			const oResourceModel = oSmartTable.getModel("i18n");
 			const oComponent = designtimeUtils.getOwnerComponentFor(oSmartTable);
 			const sComponentName = oComponent.getMetadata().getComponentName();
 			// Get the allowed designtime settings for the SmartTable
-			const aAllDesigntimeSettings = getAllDesigntimeSettings(oSmartTable);
+			const aAllDesigntimeSettings = getAllDesigntimeSettings(oSmartTable, oControl);
 
 			/**
 			 * @type {DesigntimeSetting[]}
@@ -215,8 +220,8 @@ sap.ui.define([
 			};
 			const aChangeScopeOption = [
 				{
-					label: "Scope of the changes",
-					tooltip: "Scope of the changes",
+					label: oResourceModel.getResourceBundle().getText("RTA_SCOPE_OF_THE_CHANGES"),
+					tooltip:  oResourceModel.getResourceBundle().getText("RTA_SCOPE_OF_THE_CHANGES_TOOLTIP"),
 					control: [
 						oScopeControlData
 					]
@@ -312,17 +317,20 @@ sap.ui.define([
 
 		/**
 		 * Retrieves the designtime settings for the SmartTable.
-		 * @param {object} oSmartTable - The SmartTable object.
+		 * @param {sap.ui.core.Control} oControl - The control for which the dialog should be opened.
+		 * @param {object} oSmartTable
 		 * @returns {DesigntimeSetting[]} - The designtime settings for the SmartTable.
 		 */
-		let getAllDesigntimeSettings = function getAllDesigntimeSettings(oSmartTable) {
+		let getAllDesigntimeSettings = function getAllDesigntimeSettings(oSmartTable, oControl) {
+			let oResourceBundle = oControl.getModel("i18n").getResourceBundle();
+
 			/**
 			 * @type {DesigntimeSetting}
 			 */
 			const tableType = {
 				id: "type",
-				name: "Table Type",
-				description: "Define which table type should be used",
+				name: oResourceBundle.getText('RTA_TABLE_TYPE_CONFIG'),
+				description: oResourceBundle.getText('RTA_TABLE_TYPE_DESC_CONFIG'),
 				value: "ResponsiveTable",
 				type: "string",
 				getPath: getPathForTableSettings("type"),
@@ -342,8 +350,8 @@ sap.ui.define([
 
 			const selectionMode = {
 				id: "multiSelect",
-				name: "Selection Mode",
-				description: "Define the selection mode",
+				name: oResourceBundle.getText('RTA_SELECTION_MODE'),
+				description: oResourceBundle.getText('RTA_SELECTION_MODE_DESC'),
 				value: false,
 				type: "booleanOrString",
 				getPath: getPathForTableSettings("multiSelect"),
@@ -360,8 +368,8 @@ sap.ui.define([
 			 */
 			const selectAll = {
 				id: "selectAll",
-				name: "Enable Select All",
-				description: "Define if the table should support select all",
+				name: oResourceBundle.getText('RTA_SELECT_ALL'),
+				description: oResourceBundle.getText('RTA_SELECT_ALL_DESC'),
 				value: false,
 				type: "boolean",
 				getPath: getPathForTableSettings("selectAll"),
@@ -374,8 +382,8 @@ sap.ui.define([
 			 */
 			const createMode = {
 				id: "createMode",
-				name: "Create Mode",
-				description: "Define the create mode",
+				name: oResourceBundle.getText('RTA_CREATE_MODE'),
+				description: oResourceBundle.getText('RTA_CREATE_MODE_DESC'),
 				value: "creationRows",
 				type: "string",
 				getPath: (mSmartTableInfo) => `component/settings/sections/${mSmartTableInfo.sSectionKey}/createMode`,
@@ -395,8 +403,8 @@ sap.ui.define([
 			 */
 			const condensedTableLayout = {
 				id: "condensedTableLayout",
-				name: "Condensed Table Layout",
-				description: "Define if the table should have a condensed layout",
+				name: oResourceBundle.getText('RTA_CONDENSED_TABLE_LAYOUT'),
+				description: oResourceBundle.getText('RTA_CONDENSED_TABLE_LAYOUT_DESC'),
 				value: false,
 				type: "boolean",
 				getPath: () => "component/settings/condensedTableLayout",
@@ -409,8 +417,8 @@ sap.ui.define([
 			 */
 			const widthIncludingColumnHeader = {
 				id: "widthIncludingColumnHeader",
-				name: "Width Including Column Header",
-				description: "Define if the table should have a width including column header",
+				name: oResourceBundle.getText('RTA_WIDTH_INCLUDING_COLUMN_HEADER'),
+				description: oResourceBundle.getText('RTA_WIDTH_INCLUDING_COLUMN_HEADER_DESC'),
 				value: false,
 				type: "boolean",
 				getPath: getPathForTableSettings("widthIncludingColumnHeader"),
@@ -424,8 +432,8 @@ sap.ui.define([
 			 */
 			const addCardtoInsightsHidden = {
 				id: "addCardtoInsightsHidden",
-				name: "Hide \"Add Card to Insights\"",
-				description: "Define if the table should have a insights button",
+				name: oResourceBundle.getText('RTA_DISABLE_ADD_CARD_TO_INSIGHTS'),
+				description: oResourceBundle.getText('RTA_DISABLE_ADD_CARD_TO_INSIGHTS_DESC'),
 				value: false,
 				type: "boolean",
 				getPath: getPathForTableSettings("addCardtoInsightsHidden"),
@@ -438,14 +446,43 @@ sap.ui.define([
 			 */
 			const selectionLimit = {
 				id: "selectionLimit",
-				name: "Selection Limit",
-				description: "Define the selection limit",
+				name: oResourceBundle.getText('RTA_SELECTION_LIMIT'),
+				description: oResourceBundle.getText('RTA_SELECTION_LIMIT_DESC'),
 				value: 300,
 				type: "number",
 				getPath: getPathForTableSettings("selectionLimit"),
 				keyUser: true
 			};
 
+			/**
+			 * @type {DesigntimeSetting}
+			 */
+			const threshold = {
+				id: "threshold",
+				name: oResourceBundle.getText('RTA_THRESHOLD_FOR_TABLE_CONFIG'),
+				description: oResourceBundle.getText('RTA_THRESHOLD_DESC_FOR_TABLE_CONFIG'),
+				value: 100,
+				type: "number",
+				getPath: getPathForTableSettings("threshold"),
+				// bSupportsGlobalScope: true,
+				// bGlobalSettingsOnly: true,
+				keyUser: true
+			};
+
+			/**
+			 * @type {DesigntimeSetting}
+			 */
+			const scrollThreshold = {
+				id: "scrollThreshold",
+				name: oResourceBundle.getText('RTA_SCROLLTHRESHOLD_FOR_TABLE_CONFIG'),
+				description: oResourceBundle.getText('RTA_SCROLLTHRESHOLD_DESC_FOR_TABLE_CONFIG'),
+				value: 300,
+				type: "number",
+				getPath: getPathForTableSettings("scrollThreshold"),
+				// bSupportsGlobalScope: true,
+				// bGlobalSettingsOnly: true,
+				keyUser: true
+			};
 			const designtimeSettings = [
 				tableType,
 				condensedTableLayout,
@@ -454,6 +491,8 @@ sap.ui.define([
 				selectAll,
 				createMode,
 				selectionLimit,
+				threshold,
+				scrollThreshold,
 				addCardtoInsightsHidden
 			];
 

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

@@ -26,7 +26,7 @@ sap.ui.define([
 				},
 				"sap.ui.comp.smarttable.SmartTable": {
 					properties: ["useExportToExcel", "showRowCount", "exportType", "showTablePersonalisation"],
-					actions: ["settings"]
+					actions: ["settings", "annotation"]
 				},
 				"sap.ui.table.AnalyticalColumn": {
 					properties: ["visible", "width", "autoResizable", "inResult", "resizable", "showSortMenuEntry", "sortOrder", "sorted", "summed"]
@@ -52,15 +52,6 @@ sap.ui.define([
 				},
 				"sap.ui.table.Column": {
 					properties: ["width", "hAlign"]
-				},
-				"sap.ui.table.Table": {
-					properties: ["scrollThreshold"]
-				},
-				"sap.ui.table.AnalyticalTable": {
-					properties: ["scrollThreshold"]
-				},
-				"sap.ui.table.TreeTable": {
-					properties: ["scrollThreshold"]
 				}
 			};
 
@@ -97,7 +88,7 @@ sap.ui.define([
 				actions: ["compVariant", "annotation"]		
 			},
 			"sap.ui.comp.smarttable.SmartTable": {
-				actions: ["compVariant"]		// allows table personalization (same as for end user)
+				actions: ["compVariant", "annotation"]		// allows table personalization (same as for end user)
 			},
 			"sap.ui.comp.smartchart.SmartChart": {
 				actions: ["compVariant"]		// allows table personalization (same as for end user)

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

@@ -23,7 +23,7 @@ sap.ui.define([
 				},
 				"sap.ui.comp.smarttable.SmartTable": {
 					properties: ["useExportToExcel"],
-					actions: ["settings"]
+					actions: ["settings", "annotation"]
 				},
 				"sap.m.Table": {
 					properties: ["popinLayout", "includeItemInSelection", "growingThreshold", "rememberSelections"]
@@ -54,15 +54,6 @@ sap.ui.define([
 				},
 				"sap.m.IconTabFilter": {
 					properties: ["text"]
-				},
-				"sap.ui.table.Table": {
-					properties: ["scrollThreshold"]
-				},
-				"sap.ui.table.AnalyticalTable": {
-					properties: ["scrollThreshold"]
-				},
-				"sap.ui.table.TreeTable": {
-					properties: ["scrollThreshold"]
 				}
 			};
 
@@ -162,7 +153,7 @@ sap.ui.define([
 					actions: ["compVariant", "annotation"]
 				},
 				"sap.ui.comp.smarttable.SmartTable": {
-					actions: ["compVariant"]		// allows table personalization (same as for end user)
+					actions: ["compVariant", "annotation"]		// allows table personalization (same as for end user)
 				},
 				"sap.ui.comp.smartchart.SmartChart": {
 					actions: ["compVariant"]		// allows table personalization (same as for end user)

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

@@ -40,7 +40,7 @@ sap.ui.define([
 				},
 				"sap.ui.comp.smarttable.SmartTable": {
 					properties: ["useExportToExcel", "editable", "showPasteButton"],
-					actions: ["settings"]
+					actions: ["settings", "annotation"]
 				},
 				"sap.m.Table": {
 					properties: ["growingThreshold", "popinLayout", "includeItemInSelection", "rememberSelections"]		// growingThreshold should not be possible in single section with single subsection
@@ -64,15 +64,6 @@ sap.ui.define([
 							actions: ["move"]
 						}
 					}
-				},
-				"sap.ui.table.Table": {
-					properties: ["scrollThreshold"]
-				},
-				"sap.ui.table.AnalyticalTable": {
-					properties: ["scrollThreshold"]
-				},
-				"sap.ui.table.TreeTable": {
-					properties: ["scrollThreshold"]
 				}
 			};
 
@@ -250,7 +241,7 @@ sap.ui.define([
 					actions: ["compVariant"]		// allows to adapt filters (same as adapt filters for end user)
 				},
 				"sap.ui.comp.smarttable.SmartTable": {
-					actions: ["compVariant"]		// allows table personalization (same as for end user)
+					actions: ["compVariant", "annotation"]		// allows table personalization (same as for end user)
 				},
 				"sap.ui.comp.smartchart.SmartChart": {
 					actions: ["compVariant"]		// allows table personalization (same as for end user)

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

@@ -334,10 +334,14 @@ sap.ui.define([
 						propagateMetadata: function (oElement) {
 							// propagateMetadata is also called for (reuse) components - but they don't have a method getElementName. Anyway, no need to provide (modified) designtime in this case, so just
 							// ignore.
-							var oReducedDesigntime = oElement.getMetadata().getElementName && getReducedDesignTime(oElement, mAllow[oElement.getMetadata().getElementName()]);
+							if (!oElement.getMetadata().getElementName) {
+								return null;
+							}
+							var sElementName = oElement.getMetadata().getElementName();
+							var oReducedDesigntime = getReducedDesignTime(oElement, mAllow[sElementName]);
 
 							var oCustomDesigntime = {};
-							switch (oElement.getMetadata().getElementName()) {
+							switch (sElementName) {
 								case "sap.uxap.ObjectPageLayout":
 									oCustomDesigntime = ObjectPageLayoutDesigntimeHelper.getDesigntime(
 										oElement

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

@@ -8,8 +8,9 @@
 sap.ui.define([
 	"sap/base/util/ObjectPath",
 	"sap/ui/core/Component",
+	"sap/ui/core/message/MessageType",
 	"sap/suite/ui/generic/template/genericUtilities/testableHelper"
-], function (ObjectPath, Component, testableHelper) {
+], function (ObjectPath, Component, MessageType, testableHelper) {
 	"use strict";
 	/**
 	 * Creates the adaptation dialog content based on the provided settings, property values, and unchanged data.
@@ -301,17 +302,17 @@ sap.ui.define([
 				"sap/m/Button",
 				"sap/m/MessageStrip"
 			], function (Dialog, Button, MessageStrip) {
-				const informationText = new MessageStrip({
-					type: "Information",
+				const warningText = new MessageStrip({
+					type: MessageType.Warning,
 					showIcon: true,
 					text: "{i18n>RTA_CONFIGURATION_INFO_MESSAGE}"
 				});
-				informationText.addStyleClass("sapUiSmallMarginBottom");
+				warningText.addStyleClass("sapUiSmallMarginBottom");
 				const dialog = new Dialog({
 					title: title,
 					contentWidth: size ? size.width : "550px",
 					contentHeight: size ? size.height : "300px",
-					content: [informationText, list],
+					content: [warningText, list],
 					resizable: true,
 					buttons: [
 						new Button({

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

@@ -2,12 +2,13 @@
     <!-- to check how to use a common model property instead of listReport/filterMode  which is specific to LR-->
     <VBox  visible="{= ${_templPriv>/listReport/filterMode} === 'easyFilter'}">
          <feControls:EasyFilterBarContainer id="template::easyFilterContainer"
-			showValueHelp="._templateEventHandlers.onEasyFilterShowValueHelp"
-			queryChanged="._templateEventHandlers.onEasyFilterQueryChanged"
-			tokensChanged="._templateEventHandlers.onEasyFilterTokensChanged"
-			beforeQueryProcessing="._templateEventHandlers.onEasyFilterBeforeQueryProcessing"
-			afterQueryProcessing="._templateEventHandlers.onEasyFilterAfterQueryProcessing"
-			clearFilters="._templateEventHandlers.onEasyFilterClearFilters"
-		/>
+            showValueHelp="._templateEventHandlers.onEasyFilterShowValueHelp"
+            queryChanged="._templateEventHandlers.onEasyFilterQueryChanged"
+            tokensChanged="._templateEventHandlers.onEasyFilterTokensChanged"
+            beforeQueryProcessing="._templateEventHandlers.onEasyFilterBeforeQueryProcessing"
+            afterQueryProcessing="._templateEventHandlers.onEasyFilterAfterQueryProcessing"
+            clearFilters="._templateEventHandlers.onEasyFilterClearFilters"
+            dataFetcher="._templateEventHandlers.onEasyFilterDataFetcher"
+        />
     </VBox>
 </core:FragmentDefinition>

package/src/sap/suite/ui/generic/template/fragments/MessagePage.view.xml

@@ -3,6 +3,6 @@
         id="messagePage" 
         title="{_templPrivGlobal>/generic/messagePage/text}"
         description="{_templPrivGlobal>/generic/messagePage/description}"
-        illustrationSize="Scene"
+        illustrationSize="Large"
         illustrationType="{_templPrivGlobal>/generic/messagePage/messageType}"/>
 </mvc:View>

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

@@ -60,10 +60,10 @@
 	                                        ariaLabelledBy="{columnId>id}"/>
 									</template:else>
 								</template:if>
-								<FormattedText 
-									core:require="{encodeXML: 'sap/base/security/encodeXML'}"
-									htmlText="&lt;em&gt;{path:'i18n>NEW_OBJECT', formatter:'encodeXML'}&lt;/em&gt;"
-									visible="{parts: [{path: 'dataFieldValue>'}, {path: 'dataField>'}, {path: 'entityType>'}], formatter: 'AH.getHeaderVisibility'}"/>
+								<FormattedText
+									core:require="{RuntimeFormatters: 'sap/suite/ui/generic/template/js/RuntimeFormatters'}"
+									htmlText="&lt;em&gt;{parts:[{path:'HasActiveEntity'},{path:'IsActiveEntity'},{path:'i18n>NEW_OBJECT'},{path:'i18n>UNNAMED_OBJECT'}], formatter:'RuntimeFormatters.getDraftObjectDisplayText.bind($control)'}&lt;/em&gt;"
+									visible="{parts: [{path: 'dataFieldValue>'}, {path: 'dataField>'}, {path: 'entityType>'}], formatter: 'AH.getHeaderVisibility'}" />
 								<Text class="sapUiTinyMarginTop"
 									renderWhitespace="true"
 									text="{parts: [{path: 'dataFieldValue>'}, {path: 'dataField>'}, {path: 'entityType>'}], formatter: 'AH.getColumnCellSecondText'}"

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

@@ -4,22 +4,22 @@ sap.ui.define([
 
 	/**
 	 * Constructor for SmartVariantManagementWrapper
-	 * @param {sap.ui.comp.smartvariants.SmartVariantManagement} vTarget - The SmartVariantManagement control 
+	 * @param {sap.ui.comp.smartvariants.SmartVariantManagement} vTarget - The SmartVariantManagement control
 	 * or the Id of control for which this wrapper is created
-	 * @param {object} oController - the controller of the current component 
+	 * @param {object} oController - the controller of the current component
 	 * @param {object} oFactory - the controlStateWrapperFactory
-	 * @param {object} mParams 
-	 * @param {array} mParams.managedControlWrappers - array of controlStateWrappers for controls handled by the SVM 
-	 * (currently also including SFB wrapper - to be removed) 
+	 * @param {object} mParams
+	 * @param {array} mParams.managedControlWrappers - array of controlStateWrappers for controls handled by the SVM
+	 * (currently also including SFB wrapper - to be removed)
 	 * @param {Object} mParams.dynamicPageWrapper - dynamicPageWrapper instance handled by SVM
 	 * @returns {object}
 	 */
-	
+
 	function SmartVariantManagementWrapper(vTarget, oController, oFactory, mParams) {
 		// Special handling of SmartFilterBarWrapper for several reasons:
 		// - Suppress selection when restoring a variant. Selection is solely triggered according to information in appState. Otherwise, erroneous selection could be triggered in
 		//		a few situations:
-		//		- Variant marked as execute on select, but no data selected in appState (execute on select marked when saving variant without selecting, or changed after state was 
+		//		- Variant marked as execute on select, but no data selected in appState (execute on select marked when saving variant without selecting, or changed after state was
 		//			stored)
 		//		- Fallback to standard variant in case of dirty variant in state
 		//		- Fallback to standard variant if variant cannot be read (logic of SVM)
@@ -42,11 +42,11 @@ sap.ui.define([
 		// - not available at this point in time, and no corresponding event to attach to available
 		// - provides only those controls with directly connection to SVM implemented (i.e. with wrappers marked with bVMConnection)
 
-		// ensure managed state wrappers do not trigger change event when applying state to them. 
+		// ensure managed state wrappers do not trigger change event when applying state to them.
 		// Todo: rethink, whether this is the right place to do this (or rather when the wrappers get created)
 		mParams.managedControlWrappers = mParams.managedControlWrappers.map(oFactory.getSuppressChangeEventWhenApplyingWrapper);
 
-		// Any change of managed control should also mark variant as modified. However, this is not true for controls with direct connection to SVM (SFB, SmartTable, SmartChart). 
+		// Any change of managed control should also mark variant as modified. However, this is not true for controls with direct connection to SVM (SFB, SmartTable, SmartChart).
 		// For these controls, a real user changes are already handled by the direct connection. On the other hand, these controls also fire their change events, if their state is
 		// changed from SVM (by the same connection) - setting variant dirty here would be wrong.
 		mParams.managedControlWrappers.forEach(function(oWrapper){
@@ -56,18 +56,18 @@ sap.ui.define([
 				});
 			}
 		});
-		
-		
+
+
 
 		function fnSetControl(oControl) {
 			oSmartVariantManagement = oControl;
 			fnResolveControlAssigned(oSmartVariantManagement);
 		}
-		
+
 		var oSmartFilterBarWrapper = mParams.managedControlWrappers.find(function(oWrapper){
 			return oWrapper.setSVMWrapperCallbacks;
 		});
-		
+
 		// provide callbacks needed for SFB wrapper to store/restore extnesion state with variant
 		if (oSmartFilterBarWrapper){
 			oSmartFilterBarWrapper.setSVMWrapperCallbacks({
@@ -105,28 +105,28 @@ sap.ui.define([
 				oControl.attachAfterVariantInitialise(function() {
 					//set currentVariantId only when sVariantId is not standard (as it might be overriding existing
 					//different currentVariantId) or smartTable's (oControl) currentVariantId is not equal to sVariantId.
-					if (sVariantId !== '*standard*') {
+					if (sVariantId !== '*standard*' && sVariantId !== '') {
 						if (oControl.getCurrentVariantId && oControl.getCurrentVariantId() !== sVariantId) {
 							oControl.setCurrentVariantId(sVariantId);
 						}
 						oSmartVariantManagement.setModified(false);
 					}
 				});
-			} 
+			}
 			oSmartVariantManagement.setCurrentVariantId(sVariantId);
 			if (oSmartFilterBarWrapper){
 				oSmartFilterBarWrapper.suppressSelection(false);
 			}
 		}
 
-		// Restore state of all managed controls 
+		// Restore state of all managed controls
 		function fnSetManagedControlStates(oState){
-			// Usually, looping through mParams.managedControlWrappers or through oState.managedControlStates should be equivalent, but in exceptional cases, their might be 
-			// differences, if application has changed (changing the controls managed by the SVM - in LR, this could be achieved by changing setting SmartVariantManagement). 
+			// Usually, looping through mParams.managedControlWrappers or through oState.managedControlStates should be equivalent, but in exceptional cases, their might be
+			// differences, if application has changed (changing the controls managed by the SVM - in LR, this could be achieved by changing setting SmartVariantManagement).
 			// mParams.managedControlWrappers reflects current state, while oState.managedControlStates reflects state at the time iAppState was written
 			// - when adding a control (in LR changing setting SmartVariantManagement from false to true), state for that control would not be contained  - calling the wrapper with
 			//		undefined to ensure initial state
-			// - when removing a control, state would be contained that should not be applied here 
+			// - when removing a control, state would be contained that should not be applied here
 			mParams.managedControlWrappers.forEach(function(oWrapper){
 				oWrapper.setState(oState.managedControlStates[oWrapper.getLocalId()]);
 			});
@@ -164,8 +164,8 @@ sap.ui.define([
 					// set (which is achieved by empty string)
 					fnSetVariant("");
 					// Usually restoring the state of any of the managed controls should mark the variant as dirty, but there might be edge cases (state from an old release not containing information for any
-					// managed control now relevant), so to be on the safe side, we set modified=true explicitly. 
-					oSmartVariantManagement.currentVariantSetModified(true); 
+					// managed control now relevant), so to be on the safe side, we set modified=true explicitly.
+					oSmartVariantManagement.currentVariantSetModified(true);
 					fnSetManagedControlStates(oPreliminaryState);
 				} else {
 					fnSetVariant(oPreliminaryState.variantId);
@@ -177,7 +177,7 @@ sap.ui.define([
 							oSmartFilterBarWrapper.setState(oPreliminaryState.managedControlStates[oSmartFilterBarWrapper.getLocalId()]);
 						}
 						if (oPreliminaryState.variantId !== oSmartVariantManagement.getCurrentVariantId()){
-							// variant could not be set because it is not known, i.e. it could be private and URL was shared, or could be deleted after page was bookmarked. In this case, 
+							// variant could not be set because it is not known, i.e. it could be private and URL was shared, or could be deleted after page was bookmarked. In this case,
 							// standard variant is set (by VM). Additionally, it should be marked as modified.
 							oSmartVariantManagement.currentVariantSetModified(true);
 						}
@@ -193,19 +193,19 @@ sap.ui.define([
 			oControlAssignedPromise.then(function() {
 				// state change when user selects a different variant
 				oSmartVariantManagement.attachSelect(fnHandler);
-				
+
 				// when user saves current state as a new variant, this is also a state change (as the variant id is part of the state)
 				// note: Even if new (SFB) variant is marked as execute on select, and currently no data is selected, no need to select data here (and thus also not to collapse header).
-				// This is one of the possible ways to get into a state with a clean variant with execute on select, but no data loaded - see also comment to identify SFB wrapper.  
+				// This is one of the possible ways to get into a state with a clean variant with execute on select, but no data loaded - see also comment to identify SFB wrapper.
 				oSmartVariantManagement.attachAfterSave(fnHandler);
-				
+
 				// any change of a managed control is state change
 				mParams.managedControlWrappers.forEach(function(oWrapper){
 					oWrapper.attachStateChanged(fnHandler);
 				});
 			});
 		}
-		
+
 		return {
 			getState : getState,
 			setState : setState,
@@ -215,4 +215,4 @@ sap.ui.define([
 	}
 
 	return SmartVariantManagementWrapper;
-});
+});

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

@@ -3041,6 +3041,37 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			}
 			return sTextArrangement;
 		},
+		getTextArrangementPath: function (oField) {
+			return oField["com.sap.vocabularies.Common.v1.Text"] && oField["com.sap.vocabularies.Common.v1.Text"].Path;
+		},
+		isValueHelpTableAvailable: function (oField) {
+			return !!oField.extensions?.find((extension)=> extension.name === "value-list");
+		},
+		getTextArrangementFinalString: function(result,idPath,descriptionPath,textArrangementType) {
+			var id = result[idPath];
+			var description = result[descriptionPath];
+
+			if (description) {
+				var result = "";
+				switch (textArrangementType) {
+					case "descriptionAndId":
+						result = `${description} (${id})`;
+						break;
+					case "idAndDescription":
+						result = `${id} (${description})`;
+						break;
+					case "descriptionOnly":
+						result = `${description}`;
+						break;
+					default:
+						result = `${id}`;
+						break;
+				}
+				return result;
+			} else {
+				return id;
+			}
+		},
 		getTitleTextArrangementBindingPath: function (sTextArrangement, sPropertyPath, sTextPath) {
 			var sPropertyBinding = "{" + sPropertyPath + "}";
 			var sTextBinding = "{" + sTextPath + "}";
@@ -3447,8 +3478,8 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		},
 
 		// applicable for both types of action i.e., standard and custom actions
-		getActionCommandVisibility: function (sButtonId) {
-			return !sButtonId || "{= " + oAnnotationHelper.getControlVisibleTerm(sButtonId) + " && " + oAnnotationHelper.getControlEnabledTerm(sButtonId) + "}";
+		getActionCommandVisibility: function (sButtonId, bVisible) {
+			return !sButtonId || bVisible || "{= " + oAnnotationHelper.getControlVisibleTerm(sButtonId) + " && " + oAnnotationHelper.getControlEnabledTerm(sButtonId) + "}";
 		},
 
 		buildVisibilityExprOfDataFieldForIntentBasedNaviButton: function (oDataField) {
@@ -4541,6 +4572,9 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 	oAnnotationHelper.getLinkTextForDFwithEmail.requiresIContext = true;
 	oAnnotationHelper.checkIsEmailAddress.requiresIContext = true;
 	oAnnotationHelper.isEmailAddressAndMuliplicity.requiresIContext = true;
+	oAnnotationHelper.getTextArrangementPath.requiresIContext = true;
+	oAnnotationHelper.isValueHelpTableAvailable.requiresIContext = true;
+	oAnnotationHelper.getTextArrangementFinalString.requiresIContext = true;
 
 	return oAnnotationHelper;
 }, /* bExport= */ true);

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

@@ -7,7 +7,8 @@ sap.ui.define([
 	"sap/m/RatingIndicator",
 	"sap/suite/ui/generic/template/genericUtilities/FeLogger", 
 	"sap/suite/ui/generic/template/genericUtilities/testableHelper", 
-	"sap/suite/ui/generic/template/genericUtilities/utils"
+	"sap/suite/ui/generic/template/genericUtilities/utils",
+        "sap/base/security/encodeXML"
 ], function (
 	Formatting,
 	Locale,
@@ -17,7 +18,8 @@ sap.ui.define([
 	RatingIndicator,
 	FeLogger,
 	testableHelper,
-	utils
+	utils,
+        encodeXML
 ) {
 	"use strict";
 
@@ -308,7 +310,42 @@ sap.ui.define([
 		 */
 		formatCurrency: function (vAmount, sCurrency) {
 			return getCurrencyFormatter().format(vAmount, sCurrency);
+		},
+
+		/**
+		 * Determines what text to be displayed for draft objects without title 
+		 * 
+		 * @param {boolean} hasActiveEntity
+		 * @param {boolean} isActiveEntity 
+		 * @param {boolean} newObject , i18n text for newly created draft object
+		 * @param {boolean} unnamedObject , i18n text for active object
+		 * @returns {string}
+		 */
+
+		getDraftObjectDisplayText: function (hasActiveEntity, isActiveEntity, newObject, unnamedObject) {
+			var oComponent = sap.ui.core.Component.getOwnerComponentFor(this);
+			// When both HasActiveEntity and IsActiveEntity are false, it indicates a new object.
+			// In this case, display the text 'New Object' or the app-specific override text for the key 'NEW_OBJECT' if available.
+			// Otherwise, if it's an active entity, display 'Unnamed Object' or the override text for the key 'UNNAMED_OBJECT' if provided by the app.		
+			var text = (!hasActiveEntity && !isActiveEntity) ? newObject : unnamedObject;
+
+			// As a fallback to maintain backward compatibility, if the app already defines the 'NEW_OBJECT' key (from previous behavior),
+			// use the app-specific overridden text for both newly created objects and active objects.
+			if (oComponent) {
+				var oModelApplicationListReport = oComponent.getAppComponent().getModel("i18n|" + oComponent.getMetadata().getComponentName() + "|" + oComponent.getEntitySet());
+				var oModelApplication = oComponent.getAppComponent().getModel("i18n");
+				var bHasAppNewObjectText = ((oModelApplication ? oModelApplication.getResourceBundle().hasText("NEW_OBJECT") : false) || (oModelApplicationListReport ? oModelApplicationListReport.getResourceBundle().hasText("NEW_OBJECT") : false));
+				var bHasAppUnnamedObjectText = ((oModelApplication ? oModelApplication.getResourceBundle().hasText("UNNAMED_OBJECT") : false) || (oModelApplicationListReport ? oModelApplicationListReport.getResourceBundle().hasText("UNNAMED_OBJECT") : false));
+				if (bHasAppNewObjectText && !bHasAppUnnamedObjectText) {
+					var text = newObject;
+				}
+
+			}
+			// Encode the text to ensure HTML special characters are escaped
+			// This prevents XSS and rendering issues in HTML context
+			return encodeXML(text);
 		}
+ 
 	};
 
 	return oRuntimeFormatters;