@sapui5/sap.suite.ui.generic.template 1.153.0 → 1.154.0

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

@@ -191,13 +191,40 @@ sap.ui.define([
 				keyUser: true
 			};
 
+			/**
+			 * @type {DesigntimeSetting}
+			 * App-level setting: controls the Smart Summarization button visibility across all pages.
+			 * Always written as a global manifest change (settings/aiConfiguration/smartSummarization/visibility).
+			 */
+			const smartSummarizationVisibility = {
+				id: "smartSummarizationVisibility",
+				name: oResourceBundle.getText('RTA_SMART_SUMMARIZATION_VISIBILITY'),
+				description: oResourceBundle.getText('RTA_SMART_SUMMARIZATION_VISIBILITY_DESC'),
+				type: "string",
+				value: "ShowOnAllPages",
+				enums: [
+					{
+						id: "ShowOnAllPages",
+						name: oResourceBundle.getText("RTA_SMART_SUMMARIZATION_OPTION_AVAILABLE_FOR_ALL_PAGES")
+					},
+					{
+						id: "HideOnAllPages",
+						name: oResourceBundle.getText("RTA_SMART_SUMMARIZATION_OPTION_NOT_AVAILABLE_FOR_ALL_PAGES")
+					}
+				],
+				getPath: () => "settings/aiConfiguration/smartSummarization/visibility",
+				bSupportsGlobalScope: true,
+				keyUser: true
+			};
+
 			return [
 				smartVariantManagement,
 				hideVariantManagement,
 				enableTableFilterInPageVariant,
 				initialLoad,
 				openInEditMode,
-				defaultContentView
+				defaultContentView,
+				smartSummarizationVisibility
 			];
 
 		}
@@ -240,6 +267,9 @@ sap.ui.define([
 					case "defaultContentView":
 						mPropertyValues[sProperty] = mLrOrALPSettings.defaultContentView ?? oSetting.value;
 						break;
+					case "smartSummarizationVisibility":
+						mPropertyValues[sProperty] = ObjectPath.get("aiConfiguration.smartSummarization.visibility", mLrOrALPSettings) ?? oSetting.value;
+						break;
 					default:
 						break;
 				}
@@ -262,6 +292,11 @@ sap.ui.define([
 			const sComponentName = oComponent.getMetadata().getComponentName();
 			const mLrOrALPSettings = oComponent.mProperties;
 
+			// Merge app-level aiConfiguration into the settings for reading smartSummarizationVisibility
+			const oAppComponent = oComponent.getAppComponent();
+			const oGlobalSettings = oAppComponent.getManifestEntry("sap.ui.generic.app")?.settings;
+			const mSettingsWithGlobal = Object.assign({}, mLrOrALPSettings, { aiConfiguration: oGlobalSettings?.aiConfiguration });
+
 			// Get all the designtime settings
 			const aAllDesigntimeSettings = getAllDesigntimeSettings(oControl);
 			// Get the allowed designtime settings based on the floorplan
@@ -276,7 +311,7 @@ sap.ui.define([
 
 
 			// Get the current values of the properties
-			const mRuntimeAdaptationPropertyValues = getRuntimeAdapationProperties(aAllowedDesigntimeSettings, mLrOrALPSettings);
+			const mRuntimeAdaptationPropertyValues = getRuntimeAdapationProperties(aAllowedDesigntimeSettings, mSettingsWithGlobal);
 			// Save the unchanged data to compare later
 			const mUnchangedData = deepClone(mRuntimeAdaptationPropertyValues);
 			// Get the settings of the dialog from the designtime settings using which the dialog will be created
@@ -293,7 +328,8 @@ sap.ui.define([
 			 * @type {ControlChangeParams}
 			 */
 			const mPathParameters = {
-				sChangeType: designtimeUtils.ChangeType.ChangePageConfiguration
+				sChangeType: designtimeUtils.ChangeType.ChangePageConfiguration,
+				sScope: designtimeUtils.SettingScope.Application
 			};
 			return designtimeUtils.extractChanges(mPropertyValuesEntered, mUnchangedData, aAllowedDesigntimeSettings, oComponent, mPathParameters);
 

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

@@ -75,6 +75,9 @@ sap.ui.define([
 					case "showRelatedApps":
 						mPropertyValues[sProperty] = mSettings[sProperty] ?? oSetting.value;
 						break;
+					case "smartSummarizationVisibility":
+						mPropertyValues[sProperty] = ObjectPath.get("aiConfiguration.smartSummarization.visibility", mSettings) ?? oSetting.value;
+						break;
 					default:
 						break;
 				}
@@ -140,23 +143,52 @@ sap.ui.define([
 				keyUser: true
 			};
 
+			/**
+			 * @type {DesigntimeSetting}
+			 * App-level setting: controls the Smart Summarization button visibility across all pages.
+			 * Always written as a global manifest change (settings/aiConfiguration/smartSummarization/visibility).
+			 */
+			const smartSummarizationVisibility = {
+				id: "smartSummarizationVisibility",
+				name: oResourceBundle.getText('RTA_SMART_SUMMARIZATION_VISIBILITY'),
+				description: oResourceBundle.getText('RTA_SMART_SUMMARIZATION_VISIBILITY_DESC'),
+				type: "string",
+				value: "ShowOnAllPages",
+				enums: [
+					{
+						id: "ShowOnAllPages",
+						name: oResourceBundle.getText("RTA_SMART_SUMMARIZATION_OPTION_AVAILABLE_FOR_ALL_PAGES")
+					},
+					{
+						id: "HideOnAllPages",
+						name: oResourceBundle.getText("RTA_SMART_SUMMARIZATION_OPTION_NOT_AVAILABLE_FOR_ALL_PAGES")
+					}
+				],
+				getPath: () => "settings/aiConfiguration/smartSummarization/visibility",
+				bSupportsGlobalScope: true,
+				keyUser: true
+			};
+
 			return [
 				editableHeaderContent,
 				tableVariantManagement,
 				chartVariantManagement,
-				showRelatedApps
+				showRelatedApps,
+				smartSummarizationVisibility
 			];
 
 		};
 
 
 
-		function getObjectPageSettings(oComponent) {
+		function getObjectPageSettings(oComponent, oAppComponent) {
+			const oGlobalSettings = oAppComponent.getManifestEntry("sap.ui.generic.app")?.settings;
 			return {
 				editableHeaderContent: JSON.parse(oComponent.getEditableHeaderContent()),
 				tableVariantManagement: ObjectPath.get(["variantManagement"], oComponent.getTableSettings()),
 				chartVariantManagement: ObjectPath.get(["variantManagement"], oComponent.getChartSettings()),
-				showRelatedApps: JSON.parse(oComponent.getShowRelatedApps())
+				showRelatedApps: JSON.parse(oComponent.getShowRelatedApps()),
+				aiConfiguration: oGlobalSettings?.aiConfiguration
 			};
 		}
 
@@ -172,8 +204,9 @@ sap.ui.define([
 		async function fnOpenObjectPageConfigurationDialog(oControl, mPropertyBag) {
 			const oResourceModel = oControl.getModel("i18n");
 			const oComponent = designtimeUtils.getOwnerComponentFor(oControl);
+			const oAppComponent = oComponent.getAppComponent();
 
-			const mObjectPageSettings = getObjectPageSettings(oComponent);
+			const mObjectPageSettings = getObjectPageSettings(oComponent, oAppComponent);
 
 			// Get all the designtime settings
 			const aAllDesigntimeSettings = getAllDesigntimeSettings(oControl);
@@ -203,7 +236,8 @@ sap.ui.define([
 			 * @type {ControlChangeParams}
 			 */
 			const mPathParameters = {
-				sChangeType: designtimeUtils.ChangeType.ChangePageConfiguration
+				sChangeType: designtimeUtils.ChangeType.ChangePageConfiguration,
+				sScope: designtimeUtils.SettingScope.Application
 			};
 			return designtimeUtils.extractChanges(mPropertyValuesEntered, mUnchangedData, aAllowedDesigntimeSettings, oComponent, mPathParameters);
 

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

@@ -604,6 +604,23 @@ sap.ui.define([
 
 		const oHelper = {
 			getDesigntime: function (oSmartTable) {
+				const oComponent = designtimeUtils.getOwnerComponentFor(oSmartTable);
+				const sComponentName = oComponent.getMetadata().getComponentName();
+				// Tables in reuse/extension components have no FE manifest settings to configure.
+				if (sComponentName !== sObjectPageComponentName && sComponentName !== sListReportComponentName) {
+					return {};
+				}
+				if (sComponentName === sObjectPageComponentName) {
+					const sLocalId = designtimeUtils.getLocalId(oSmartTable);
+					// Null means the table is not part of the FE-owned view.
+					if (!sLocalId) {
+						return {};
+					}
+					// No manifest section means the table was added by the application, not by FE.
+					if (!oComponent.getSections()?.[getSectionKey(oSmartTable)]) {
+						return {};
+					}
+				}
 				return {
 					actions: {
 						settings: {

package/src/sap/suite/ui/generic/template/detailTemplates/detailUtils.js

@@ -160,9 +160,10 @@ sap.ui.define([	"sap/suite/ui/generic/template/genericUtilities/FeLogger", "sap/
 				oBusyHelper.setBusy(oApplyPromise);
 			}
 
-			// Event handler for the Apply button. Only visible in draft scenarios and not on the object root.
+			// Called from the Apply button (draft sub-object pages) and from the PrimaryAction keyboard shortcut.
+			// oEvent is present when triggered by a button; absent (null/undefined) when triggered by the shortcut.
 			function fnApplyAndUp(oEvent) {
-				var oControl = oEvent.getSource();
+				var oControl = oEvent && oEvent.getSource();
 				var oCRUDActionHandler = oTemplateUtils.oComponentUtils.getCRUDActionHandler();
 
 				// Pre-check validation to decide navigation

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=Borrar
+ST_DETAIL_TITLE_DELETE=Eliminar

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

@@ -10,6 +10,7 @@
             afterQueryProcessing="._templateEventHandlers.onEasyFilterAfterQueryProcessing"
             clearFilters="._templateEventHandlers.onEasyFilterClearFilters"
             dataFetcher="._templateEventHandlers.onEasyFilterDataFetcher"
+            complexFilterApplied="._templateEventHandlers.onEasyFilterComplexFilterApplied"
         />
     </VBox>
 </core:FragmentDefinition>

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

@@ -8,6 +8,7 @@
 			selectionChange="._templateEventHandlers.onMultiSelectionChange"
 			selectionMode="{tableSettings>mode}" />
 		<plugins.ContextMenuSetting scope="Selection"/>
+		<core:CommandExecution execute="._templateEventHandlers.onNavigateToDetails" command="NavigateToDetails"/>
 	</table:dependents>
 	<table:rowSettingsTemplate>
 		<table:RowSettings 

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

@@ -31,6 +31,9 @@
 						type="{parts: [{path: 'listEntitySet>'}, {path: 'parameter>/settings/subPages/'}, {path: 'parameter>/manifest/'}, {path: 'parameter>/treeNode/'}, {path:'parameter>/isDraftEnabled'}, {path: 'facet>Target/AnnotationPath'}], formatter: 'AH.getColumnListItemType'}"
 						navigated="{parts: [{path: '_templPriv>/generic/currentActiveChildContext'}, {path: ''}], formatter: 'RuntimeFormatters.setRowNavigated.bind($control)'}" 
 						detailPress="._templateEventHandlers.onEdit">
+					<dependents>
+						<core:CommandExecution execute="._templateEventHandlers.onNavigateToDetails" command="NavigateToDetails"/>
+					</dependents>
 					<template:if test="{parts: [{path: 'listEntitySet>name'}, {path: 'parameter>/settings/subPages/'}, {path: 'facet>Target/AnnotationPath'}], formatter: 'AH.getDisplayNavigationIntent'}">
 						<customData>
 							<core:CustomData key="CrossNavigation"

package/src/sap/suite/ui/generic/template/genericUtilities/controlHelper.js

@@ -126,6 +126,9 @@ sap.ui.define([
 		if (oControlHelper.isObjectPageSubSection(oControl)){
 			return oControl.getBlocks().concat(oControl.getMoreBlocks());
 		}
+		if (isControlOfType("sap/ui/layout/form/Form", oControl)){
+			return oControl.getFormContainers();
+		}
 		if (isControlOfType("sap/ui/comp/smartform/Group", oControl)){
 			return oControl.getFormElements();
 		}

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

@@ -166,6 +166,13 @@ sap.ui.define([
                 oState.variantId = oState.sVariantId;
             }
 
+            // Compare current passed and control states. If states are same, setting state make no change, but trigger table refresh.
+            // For performance reason we compare object stringified versions. Object key order should not change as it only get applied at runtime.
+            var oControlState = bVariantManagementActive ? oVariantManagementStateWrapper.getState() : oSmartControlStateWrapper.getState();
+            if (JSON.stringify(oState) === JSON.stringify(oControlState)) {
+                return;
+            }
+
             if (bVariantManagementActive) {
                 // In case VariantManagement is configured
                 oVariantManagementStateWrapper.setState(oState);

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

@@ -151,52 +151,44 @@ sap.ui.define([
 			};
 		}
 
-		function fnApplyVariantState() {
-			bIsApplyingVariant = true;
-			if (!oPreliminaryState) {
-				// if no state is provided set default variant (not modified)
-				// use cases:
-				// - LR: if appStateKey in the URL that cannot be read
-				// - OP: if switching to different object instance (in discovery mode always, in persistency mode when page was not shown)
-				fnSetVariant(oSmartVariantManagement.getDefaultVariantId());
-			} else if (oPreliminaryState.modified) {
-				// Special logic according to UX: If variant was modified anyway, there's no benefit for the user to see the name (but it could be confusing), so standard variant (not default!) should be
-				// set (which is achieved by empty string)
-				fnSetVariant("");
-				oSmartVariantManagement.currentVariantSetModified(true);
-				// 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.
-				fnSetManagedControlStates(oPreliminaryState);
-			} else {
-				fnSetVariant(oPreliminaryState.variantId);
-				// if managedControlStates is not provided (legacy or maybe broken state), applying VM state should not break
-				// don't apply undefined to managedControlWrappers, but just leave them untouched
-				if (oPreliminaryState.managedControlStates){
-					if (oSmartFilterBarWrapper) {
-						// SmartFilterBarWrapper.setState is invoked to apply the state changes modified by "modifyStartupExtension"
-						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,
-						// standard variant is set (by VM). Additionally, it should be marked as modified.
-						oSmartVariantManagement.currentVariantSetModified(true);
-					}
-				}
-			}
-			bIsApplyingVariant = false;
-		}
-
 		function setState(oState) {
 			oPreliminaryState = oState;
 
-			// If all managed controls are already initialized (e.g., during iAppState restoration on back-navigation),
-			// apply state synchronously to avoid race condition with loadData() in IappStateHandler.
-			// When controls are not yet initialized (initial app load), defer as before.
-			if (bAllControlsInitialized) {
-				fnApplyVariantState();
-			} else {
-				oAllControlsInitializedPromise.then(fnApplyVariantState);
-			}
+			// Wait for all managed controls to be initialized before applying state
+			return oAllControlsInitializedPromise.then(function() {
+				bIsApplyingVariant = true;
+				if (!oPreliminaryState) {
+					// if no state is provided set default variant (not modified)
+					// use cases:
+					// - LR: if appStateKey in the URL that cannot be read
+					// - OP: if switching to different object instance (in discovery mode always, in persistency mode when page was not shown)
+					fnSetVariant(oSmartVariantManagement.getDefaultVariantId());
+				} else if (oPreliminaryState.modified) {
+					// Special logic according to UX: If variant was modified anyway, there's no benefit for the user to see the name (but it could be confusing), so standard variant (not default!) should be
+					// set (which is achieved by empty string)
+					fnSetVariant("");
+					oSmartVariantManagement.currentVariantSetModified(true);
+					// 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.
+					fnSetManagedControlStates(oPreliminaryState);
+				} else {
+					fnSetVariant(oPreliminaryState.variantId);
+					// if managedControlStates is not provided (legacy or maybe broken state), applying VM state should not break
+					// don't apply undefined to managedControlWrappers, but just leave them untouched
+					if (oPreliminaryState.managedControlStates){
+						if (oSmartFilterBarWrapper) {
+							// SmartFilterBarWrapper.setState is invoked to apply the state changes modified by "modifyStartupExtension"
+							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,
+							// standard variant is set (by VM). Additionally, it should be marked as modified.
+							oSmartVariantManagement.currentVariantSetModified(true);
+						}
+					}
+				}
+				bIsApplyingVariant = false;
+			});
 		}
 
 		function attachStateChanged(fnHandler) {

package/src/sap/suite/ui/generic/template/lib/AppComponent.js

@@ -293,15 +293,18 @@ sap.ui.define([
 		function setGlobalTemplateModels() {
 			var oGenericApp = oAppComponent.getManifestEntry("sap.ui.generic.app");
 			var oGlobalSettings = oGenericApp && oGenericApp.settings;
-			var bGlobalHideSummarizationButton = false;
-			if (oGlobalSettings && oGlobalSettings.hideSummarizationButton !== undefined) {
-				if (typeof oGlobalSettings.hideSummarizationButton !== "boolean") {
-					oLogger.warning("Manifest setting 'hideSummarizationButton' must be a boolean. Falling back to default: false.");
+			var sSummarizationVisibility = oGlobalSettings?.aiConfiguration?.smartSummarization?.visibility;
+			var bShowSummarizationButton = true;
+			if (sSummarizationVisibility !== undefined) {
+				var aValidVisibilityValues = ["ShowOnAllPages", "HideOnAllPages"];
+				if (!aValidVisibilityValues.includes(sSummarizationVisibility)) {
+					oLogger.warning("Manifest setting 'aiConfiguration.smartSummarization.visibility' has invalid value '" + sSummarizationVisibility + "'. Valid values: ShowOnAllPages | HideOnAllPages. Falling back to default: ShowOnAllPages.");
 				} else {
-					bGlobalHideSummarizationButton = oGlobalSettings.hideSummarizationButton;
+					bShowSummarizationButton = (sSummarizationVisibility === "ShowOnAllPages");
 				}
 			}
-			oTemplateContract.oTemplatePrivateGlobalModel.setProperty("/generic", {
+			oAppComponent.setModel(oTemplateContract.oTemplatePrivateGlobalModel, "_templPrivGlobal");
+			oAppComponent.getModel("_templPrivGlobal").setProperty("/generic", {
 					// Since draft saving is done globally, there is a global state which applies to all DraftIndicators
 					draftIndicatorState: DraftIndicatorState.Clear,
 					// if the ShellService is unavailable some of its tasks have to be done by ourselves. Assume that this is not the case.
@@ -314,10 +317,9 @@ sap.ui.define([
 						isEasyFilterEnabled : false,
 						isErrorExplanationEnabled : false,
 						isEasyFillEnabled: false,
-						hideSummarizationButtonGlobal: bGlobalHideSummarizationButton
+						summarizationButtonVisibility: bShowSummarizationButton
 					}
 			});
-			oAppComponent.setModel(oTemplateContract.oTemplatePrivateGlobalModel, "_templPrivGlobal");
 			oTemplateContract.oShellServicePromise.catch(function(){
 				// it turns out that the ShellService is not available
 				oTemplateContract.oTemplatePrivateGlobalModel.setProperty("/generic/shellServiceUnavailable", true);
@@ -471,6 +473,7 @@ sap.ui.define([
 			oTemplateContract.appSettings = new ManagedObjectModel(oAppComponent);
 			oTemplateContract.oBusyHelper.setBusy(oTemplateContract.oShellServicePromise, undefined, undefined, true);
 			fnDeregister = fnRegisterAppComponent(oAppRegistryEntry);
+			setGlobalTemplateModels();
 
 			var oModel = oAppComponent.getModel();
 			oTemplateContract.bCreateRequestsCanonical = true;
@@ -486,7 +489,6 @@ sap.ui.define([
 				}
 				// workaround until Modules Factory is available
 				oApplicationController = new ApplicationController(oModel);
-				setGlobalTemplateModels();
 				oNavigationController = new NavigationController(oTemplateContract);
 				attachToApplicationController();
 				CRUDHelper.enableAutomaticDraftSaving(oTemplateContract);
@@ -778,7 +780,7 @@ sap.ui.define([
 		}
 
 		function fnNormalizeQuickVariantSelectionXEntitySets(oConfig){
-			fnAddMissingEntitySetsToQuickVariantSelectionX(oConfig.pages[0]);
+			fnAddMissingEntitySetsToQuickVariantSelectionX(oConfig.pages && oConfig.pages[0]);
 		}
 
 		// handling of deprecated properties which are still supported for compatibility reasons
@@ -972,7 +974,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.153.0
+	 * @version 1.154.0
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	var oAppComponent = UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {
@@ -1085,10 +1087,13 @@ sap.ui.define([
 					type: "string",
 					defaultValue: "illustration" // Possible values: 'illustration', 'illustrationWithFallback' and 'textOnly'
 				},
-				// Hide Smart Summarization button globally in the application object page
-				hideSummarizationButton: {
-					type: "boolean",
-					defaultValue: false
+				aiConfiguration: {
+					type: "object",
+					defaultValue: {
+						smartSummarization: {
+							visibility: "ShowOnAllPages" // Possible values ShowOnAllPages or HideOnAllPages,
+						}
+					}
 				}
 			},
 			events: {

package/src/sap/suite/ui/generic/template/lib/CommonEventHandlers.js

@@ -1818,6 +1818,73 @@ sap.ui.define(["sap/ui/base/Object",
 
 		}
 
+		/**
+		 * Handles Alt+Enter keyboard shortcut on a focused row in a UI Table or Responsive Table.
+		 * For UI Table: finds the RowActionItem for the focused row and fires its press event.
+		 * For Responsive Table: finds the focused ColumnListItem and fires its press event.
+		 * Both paths trigger the same navigation as clicking the chevron/row, preserving
+		 * cross-app navigation and all existing navigation logic.
+		 * Does nothing if the table has no navigation configured or the focused row is not navigable.
+		 * @param {sap.ui.base.Event} oEvent - execute event from the CommandExecution placed in the table dependents
+		 */
+		function onNavigateToDetails(oEvent) {
+			var oParent = oEvent.getSource().getParent();
+			var oTable = oParent.isA("sap.m.ListItemBase") ? oParent.getParent() : oParent;
+			var oFocusedDom = document.activeElement;
+			if (controlHelper.isUiTable(oTable)) {
+				if (oTable.getRowActionCount() === 0) {
+					return;
+				}
+				var oFocusedRow = oTable.getRows().find(function(oRow) {
+					var oDomRef = oRow.getDomRef();
+					return oDomRef && oDomRef.contains(oFocusedDom);
+				});
+				if (!oFocusedRow || !oFocusedRow.getBindingContext()) {
+					return;
+				}
+				// Find the per-row RowAction clone using only public APIs (findAggregatedObjects + isA).
+				// sap.ui.table.Row offers no public getter for its RowAction instance, and
+				// getRowActionTemplate() returns only the template which has no row binding.
+				var oRowAction = oFocusedRow.findAggregatedObjects(false, function(oChild) {
+					return oChild.isA("sap.ui.table.RowAction");
+				})[0];
+				if (!oRowAction || !oRowAction.getVisible()) {
+					return;
+				}
+				var oNavItem = oRowAction.getItems().find(function(oItem) {
+					return oItem.getType() === "Navigation" && oItem.getVisible();
+				});
+				if (!oNavItem) {
+					return;
+				}
+				// Fire press on the RowActionItem — triggers the same onListNavigate handler as a chevron click,
+				// preserving cross-app navigation (CrossNavigation custom data) and all existing navigation logic.
+				oNavItem.firePress({
+					row: oFocusedRow,
+					item: oNavItem
+				});
+			} else if (controlHelper.isMTable(oTable)) {
+				// CommandExecution is on the row; oParent IS the focused ColumnListItem.
+				var oFocusedItem = oParent;
+				// Only navigate if the item has type Navigation and has a binding context
+				if (!oFocusedItem || !oFocusedItem.getBindingContext() ||
+						oFocusedItem.getType() !== "Navigation") {
+					return;
+				}
+				// ListReport/ObjectPage wire onListNavigate to the table's itemPress event.
+				// ALP wires it to the ColumnListItem's press event instead (no itemPress on table).
+				// hasListeners distinguishes the two patterns without touching private APIs.
+				if (oTable.hasListeners("itemPress")) {
+					oTable.fireItemPress({
+						listItem: oFocusedItem,
+						srcControl: oFocusedItem
+					});
+				} else {
+					oFocusedItem.firePress();
+				}
+			}
+		}
+
 		/**
 		 * Navigation from table
 		 * @param {sap.ui.base.EventProvider} oEventOrSource - either event triggering navigation, or it's source control (if the event needs to be faked - then the control should be a ColumnListItem or mTable)
@@ -3008,12 +3075,14 @@ sap.ui.define(["sap/ui/base/Object",
 		var fnApplyCellHiddenBindings = testableHelper.testable(fnApplyCellHiddenBindings, "fnApplyCellHiddenBindings");
 		var fnAttachRowsUpdateHandler = testableHelper.testable(fnAttachRowsUpdateHandler, "fnAttachRowsUpdateHandler");
 		var fnHandleTableCellVisibility = testableHelper.testable(fnHandleTableCellVisibility, "fnHandleTableCellVisibility");
+		var onNavigateToDetails = testableHelper.testable(onNavigateToDetails, "onNavigateToDetails");
 		/* eslint-enable */
 
 		return {
 			onDataReceived: onDataReceived,
 			onBeforeRebindTable: onBeforeRebindTable,
 			onListNavigate: onListNavigate,
+			onNavigateToDetails: onNavigateToDetails,
 			onEditNavigateIntent: fnNavigateIntentManifest,
 			onRelatedAppNavigation: onRelatedAppNavigation,
 			onDataFieldWithNavigationPath: onDataFieldWithNavigationPath,

package/src/sap/suite/ui/generic/template/lib/CommonUtils.js

@@ -1791,6 +1791,36 @@ sap.ui.define(["sap/ui/base/Object",
 		var fnRemovePropertiesFromNavigationContext = testableHelper.testable(fnRemovePropertiesFromNavigationContext, "removePropertiesFromNavigationContext");
 		/* eslint-enable */
 
+		/**
+		 * Returns the first visible, enabled custom Emphasized button in the view, or null.
+		 * Skips excluded controls and their children, framework buttons (template:: IDs),
+		 * buttons inside dialogs or popovers (including closed ones), buttons in hidden containers,
+		 * and the internal buttons of a sap.m.PDFViewer.
+		 * Used by Ctrl+Enter on LR (live mode or worklist), ALP (live mode) and OP.
+		 * @param {sap.ui.core.mvc.View} oView The view to scan
+		 * @param {sap.ui.core.Control[]} aExcludedControls Controls to skip together with their children
+		 * @returns {sap.m.Button|null} The button, or null
+		 */
+		function fnFindCustomEmphasizedButton(oView, aExcludedControls) {
+			var aButtons = oView.findAggregatedObjects(true, function(oControl) {
+				if (!oControl.isA("sap.m.Button") || oControl.getType() !== "Emphasized" ||
+						!oControl.getVisible() || !oControl.getEnabled() ||
+						aExcludedControls.indexOf(oControl) >= 0 || oControl.getId().indexOf("template::") !== -1) {
+					return false;
+				}
+				for (var oParent = oControl.getParent(); oParent && oParent !== oView; oParent = oParent.getParent()) {
+					if (aExcludedControls.indexOf(oParent) >= 0 ||
+							oParent.isA("sap.m.Dialog") || oParent.isA("sap.m.Popover") ||
+							oParent.isA("sap.m.PDFViewer") ||
+							(oParent.getVisible && !oParent.getVisible())) {
+						return false;
+					}
+				}
+				return true;
+			});
+			return aButtons[0] || null;
+		}
+
 		return {
 			getPositionableControlId: getPositionableControlId,
 			getMetaModelEntityType: getMetaModelEntityType,
@@ -2101,7 +2131,8 @@ sap.ui.define(["sap/ui/base/Object",
 			transformTechnicalPropsOnExportedFile: fnTransformTechnicalPropsOnExportedFile,
 			includeEntitySetParametersToExportedFile: fnIncludeEntitySetParametersToExportedFile,
 			openContextInNewTabFromListItem: fnOpenContextInNewTabFromListItem,
-			getCustomizedTextFromApp: getCustomizedTextFromApp
+			getCustomizedTextFromApp: getCustomizedTextFromApp,
+			findCustomEmphasizedButton: fnFindCustomEmphasizedButton
 		};
 	}
 

package/src/sap/suite/ui/generic/template/lib/ContextMenuHandler.js

@@ -228,7 +228,7 @@ sap.ui.define([
 
 		function fnAddToolbarButtonToContextMenu(sPathToItems, oFocusInfo, oToolbarControlsData, aItems, oButton, bStartsNewSection){
 			// Case 1: If button has the stable id, use it to find local id.
-			// Case 2: If the button was created using design time adaption, use the custom data "originalButtonId" to find local id. 
+			// Case 2: If the button was created using design time adaption, use the custom data "originalButtonId" to find local id.
 			var sButtonLocalId = oView.getLocalId(oButton.getId()) || oView.getLocalId(oButton.data("originalButtonId"));
 
 			var oHandlePromise = null;
@@ -254,6 +254,45 @@ sap.ui.define([
 			return false;
 		}
 
+		// Returns a raw entry object for a toolbar button child without writing to the model.
+		// Generates a key and registers the handler in mHandlers so clicks on sub-menu items
+		// resolve correctly via onContextMenu. The parent fnAddMenuItem Promise.all owns all
+		// child enabled-flag writes; no setProperty call is made here.
+		function fnGetToolbarButtonContextMenuEntry(oFocusInfo, oToolbarControlsData, oButton, bStartsSection) {
+			var sButtonLocalId = oView.getLocalId(oButton.getId()) || oView.getLocalId(oButton.data("originalButtonId"));
+
+			var oStandardControlData = oToolbarControlsData.standardActions.find(function(oControlData){
+				return oControlData.ID === sButtonLocalId;
+			});
+			var oBreakoutControlData = oConfiguration.findBreakoutActionByLocalId(oToolbarControlsData.breakoutActions, sButtonLocalId);
+
+			var oHandlePromise = null;
+			if (oStandardControlData) {
+				oHandlePromise = getHandlePromiseForStandardAction(oFocusInfo, oStandardControlData, oButton);
+			} else if (oBreakoutControlData) {
+				oHandlePromise = getHandlePromiseForBreakoutAction(oFocusInfo, oBreakoutControlData, oButton);
+			}
+
+			if (!oHandlePromise) {
+				return null;
+			}
+			iCreatedMenuItemsCounter++;
+			var sKey = "ContextMenuKey" + iCreatedMenuItemsCounter;
+			oHandlePromise.then(function(fnHandler) {
+				if (fnHandler) {
+					mHandlers[sKey] = fnHandler;
+				}
+			});
+			return {
+				text: oButton.getText(),
+				icon: oButton.getIcon(),
+				key: sKey,
+				enabled: false,
+				startsSection: bStartsSection,
+				handlerPromise: oHandlePromise
+			};
+		}
+
 		/**
 		 * 
 		 * Evaluates the menu items in a menu button and adds them to the context menu based on the following rules:
@@ -271,7 +310,11 @@ sap.ui.define([
 			var aChildContextMenuEntries = [];
 			aMenuItems.forEach(function (oMenuItem) {
 				var bStartsSectionOnSubMenu = oMenuItem.getStartsSection();
-				fnAddToolbarButtonToContextMenu(sItemsPath, oFocusInfo, oToolbarControlsData, aChildContextMenuEntries, oMenuItem, bStartsSectionOnSubMenu);
+				var oEntry = fnGetToolbarButtonContextMenuEntry(oFocusInfo, oToolbarControlsData, oMenuItem, bStartsSectionOnSubMenu);
+				if (oEntry) {
+					oEntry.startsSection = oEntry.startsSection && aChildContextMenuEntries.length > 0;
+					aChildContextMenuEntries.push(oEntry);
+				}
 			});
 
 			if (aChildContextMenuEntries.length === 1) {