@sapui5/sap.suite.ui.generic.template 1.146.0 → 1.147.0

package/src/sap/suite/ui/generic/template/ListReport/controller/IappStateHandler.js

@@ -214,12 +214,6 @@ sap.ui.define([
 		// However, for iAppState case, SVM wrapper also needs to contain SFB wrapper (and not oCustomFiltersWrapper directly)
 
 
-		// DynamicPage state: header pinned
-		var oDynamicPage = oController.byId(StableIdHelper.getStableId({type: "ListReportPage", subType: "DynamicPage"}));
-		// TODO: Discuss: should this state (header pinned) be part of variant (only page variant or SFB variant)? Assumption: no
-		var oDynamicPageWrapper = oTemplateUtils.oCommonUtils.getControlStateWrapper(oDynamicPage);
-		aControlStateWrappers.push(oDynamicPageWrapper);
-
 		// SmartVariantManagement state: Selected Variant and whether it's dirty, including wrappers for managed controls (all controls, for which the corresponding state
 		// information should be part of the variant)
 		// Due to direct connection between SVM and SFB, also their wrappers need to each other directly. Remarks:
@@ -230,13 +224,19 @@ sap.ui.define([
 		if (oSmartVariantManagement){
 			var oSmartVariantManagementWrapper = oTemplateUtils.oCommonUtils.getControlStateWrapper(oSmartVariantManagement, {
 				managedControlWrappers: aPageVariantControlStateWrappers.concat([oSmartFilterBarWrapper]),
-				dynamicPageWrapper: oDynamicPageWrapper
+				smartFilterBarWrapper: oSmartFilterBarWrapper
 			});
 			aControlStateWrappers.push(oSmartVariantManagementWrapper);
 		} else {
 			aControlStateWrappers.push(oSmartFilterBarWrapper);
 		}
 
+		// DynamicPage state: header pinned
+		var oDynamicPage = oController.byId(StableIdHelper.getStableId({type: "ListReportPage", subType: "DynamicPage"}));
+		// The DynamicPage state (header pinned) is intentionally stored only in iAppState and not included in any variant (neither page variant nor SFB variant).
+		var oDynamicPageWrapper = oTemplateUtils.oCommonUtils.getControlStateWrapper(oDynamicPage);
+		aControlStateWrappers.push(oDynamicPageWrapper);
+
 
 		// Wrapper to control whether data is loaded
 
@@ -774,7 +774,8 @@ sap.ui.define([
 				// For desktop devices, expand the header for Standard and Custom variants and for tablet and mobile devices,
 				// collapse the header only if search is triggered.
 				if (Device.system.desktop) {
-					oTemplateUtils.oCommonUtils.getControlStateWrapper(oController.byId(StableIdHelper.getStableId({type: "ListReportPage", subType: "DynamicPage"}))).setHeaderState(oController, true);
+					var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
+					oTemplatePrivateModel.setProperty("/listReport/isHeaderExpanded", true);
 				} else {
 					collapseHeader();
 				}
@@ -909,6 +910,16 @@ sap.ui.define([
                 }
                 sap.ui.getCore().getMessageManager().removeMessages(removedMessages);
             }
+
+			// Restore header collapse logic (originally removed in change 5641712)
+			// Collapse header when user manually selects a variant (context === undefined) that has executeOnSelect set to true
+			var oContext = oEvent.getParameter("context");
+			var bExecuteOnSelect = oEvent.getParameter("executeOnSelect");
+
+			if (oContext === undefined && bExecuteOnSelect) {
+				collapseHeader();
+			}
+
 			fnRestoreExtendedFilterDataOnAfterSFBVariantLoad(oEvent);
 		}
 

package/src/sap/suite/ui/generic/template/ListReport/controllerFrameworkExtensions.js

@@ -22,6 +22,7 @@ sap.ui.define([
 					onBeforeRebindChartExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After},
 					adaptNavigationParameterExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After},
 					onListNavigationExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After},
+					onListNavigationExtensionFromContextMenu: { "public": true, "final": false, overrideExecution: OverrideExecution.After},
 					getPredefinedValuesForCreateExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After},
 					adaptTransientMessageExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After},
 					onSaveAsTileExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After},
@@ -177,7 +178,6 @@ sap.ui.define([
 			 * @param {sap.ui.model.Context} oBindingContext - The context of the corresponding table row
 			 * @param {boolean} bReplaceInHistory - This parameter should be considered if the method triggers an internal 
 			 * navigation. Pass this parameter to <code>oNavigationData.replaceInHistory</code> in this case
-			 * 
 			 * @returns {boolean} Method should return <code>true</code> if framework navigation should be suppressed 
 			 * (that means: extension code has taken over navigation)
 			 * @protected
@@ -185,7 +185,21 @@ sap.ui.define([
 			onListNavigationExtension: function(oEvent, oBindingContext, bReplaceInHistory) {
 				return false;
 			},
-			
+
+			/**
+			 * This method is called by SAP Fiori elements when a Contextmenu open in a new tab is triggered from a table. Application
+			 * developers can override this method and perform conditional (internal or external) navigation from different
+			 * rows of a table. Such custom navigation should be triggered via corresponding methods of
+			 * {@link sap.suite.ui.generic.template.extensionAPI.NavigationController NavigationController}.
+			 *
+			 * @returns {boolean} Method should return <code>true</code> if framework navigation should be suppressed
+			 * @param {Array<sap.ui.model.Context>} aContext - The context of the corresponding table row
+			 * @protected
+			 */
+			onListNavigationExtensionFromContextMenu: function(aContext) {
+				return false;
+			},
+
 			/**
 			 * This method is called by SAP Fiori elements when the Create with Filters is executed. Application developers
 			 * can enable this feature in the LR component by adding createWithFilters in the settings object of the 

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_fr.properties

@@ -63,7 +63,7 @@ OBJECT_NOT_EDITABLE=Impossible de modifier cet objet
 
 NODATA_SMARTTABLE_LR=Pour commencer, activez les filtres appropri\u00E9s et cliquez sur "Lancer".
 
-NODATA_SMARTTABLE_LR_ILLUSTRATION_TITLE=Voyons certains r\u00E9sultats.
+NODATA_SMARTTABLE_LR_ILLUSTRATION_TITLE=Voyons les r\u00E9sultats.
 NODATA_SMARTTABLE_LR_ILLUSTRATION_DESCRIPTION=Commencez par indiquer vos crit\u00E8res de recherche ou de filtre.
 
 SEARCH_FILTERS_KEYBOARD_SHORTCUT_DESC=Lancer

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_fr_CA.properties

@@ -63,7 +63,7 @@ OBJECT_NOT_EDITABLE=Impossible de modifier cet objet.
 
 NODATA_SMARTTABLE_LR=Activez les filtres appropri\u00E9s, puis s\u00E9lectionnez Lancer.
 
-NODATA_SMARTTABLE_LR_ILLUSTRATION_TITLE=Voyons certains r\u00E9sultats.
+NODATA_SMARTTABLE_LR_ILLUSTRATION_TITLE=Faisons une recherche.
 NODATA_SMARTTABLE_LR_ILLUSTRATION_DESCRIPTION=Commencez par indiquer vos crit\u00E8res de recherche ou de filtre.
 
 SEARCH_FILTERS_KEYBOARD_SHORTCUT_DESC=Lancer

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_sk.properties

@@ -64,7 +64,7 @@ OBJECT_NOT_EDITABLE=Tento objekt nie je mo\u017En\u00E9 upravi\u0165.
 NODATA_SMARTTABLE_LR=Pre spustenie nastavte relevantn\u00E9 filtre a zvo\u013Ete Spusti\u0165.
 
 NODATA_SMARTTABLE_LR_ILLUSTRATION_TITLE=Pozrime si v\u00FDsledky
-NODATA_SMARTTABLE_LR_ILLUSTRATION_DESCRIPTION=Za\u010Dnite zadan\u00EDm svojich krit\u00E9ri\u00ED h\u013Eadania.
+NODATA_SMARTTABLE_LR_ILLUSTRATION_DESCRIPTION=Za\u010Dnite zadan\u00EDm krit\u00E9ri\u00ED vyh\u013Ead\u00E1vania alebo filtrovania.
 
 SEARCH_FILTERS_KEYBOARD_SHORTCUT_DESC=Spusti\u0165
 

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_uk.properties

@@ -64,7 +64,7 @@ OBJECT_NOT_EDITABLE=\u0426\u0435\u0439 \u043E\u0431'\u0454\u043A\u0442 \u043D\u0
 NODATA_SMARTTABLE_LR=\u0429\u043E\u0431 \u0440\u043E\u0437\u043F\u043E\u0447\u0430\u0442\u0438, \u0432\u0441\u0442\u0430\u043D\u043E\u0432\u0456\u0442\u044C \u0440\u0435\u043B\u0435\u0432\u0430\u043D\u0442.\u0444\u0456\u043B\u044C\u0442\u0440\u0438 \u0439 \u043E\u0431\u0435\u0440\u0456\u0442\u044C"\u041F\u0443\u0441\u043A".
 
 NODATA_SMARTTABLE_LR_ILLUSTRATION_TITLE=\u0414\u0430\u0432\u0430\u0439\u0442\u0435 \u043E\u0442\u0440\u0438\u043C\u0430\u0454\u043C\u043E \u0440\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442\u0438
-NODATA_SMARTTABLE_LR_ILLUSTRATION_DESCRIPTION=\u041F\u043E\u0447\u043D\u0456\u0442\u044C \u0437 \u043D\u0430\u0434\u0430\u043D\u043D\u044F \u0441\u0432\u043E\u0457\u0445 \u043A\u0440\u0438\u0442\u0435\u0440\u0456\u0457\u0432 \u043F\u043E\u0448\u0443\u043A\u0443 \u0430\u0431\u043E \u0444\u0456\u043B\u044C\u0442\u0440\u0430\u0446\u0456\u0457.
+NODATA_SMARTTABLE_LR_ILLUSTRATION_DESCRIPTION=\u0420\u043E\u0437\u043F\u043E\u0447\u043D\u0456\u0442\u044C \u0437 \u043D\u0430\u0434\u0430\u043D\u043D\u044F \u0441\u0432\u043E\u0457\u0445 \u043A\u0440\u0438\u0442\u0435\u0440\u0456\u0457\u0432 \u043F\u043E\u0448\u0443\u043A\u0443 \u0430\u0431\u043E \u0444\u0456\u043B\u044C\u0442\u0440\u0430\u0446\u0456\u0457.
 
 SEARCH_FILTERS_KEYBOARD_SHORTCUT_DESC=\u041F\u0443\u0441\u043A
 

package/src/sap/suite/ui/generic/template/ListReport/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.146.0"
+			"version": "1.147.0"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/ListReport/view/fragments/DeleteConfirmation.fragment.xml

@@ -11,13 +11,13 @@
 			</VBox>
 		</content>
 		<beginButton>
-			<Button text="{i18n>DELETE}" press="onDelete"
+			<Button text="{i18n>DELETE}" press=".onDelete"
 					visible="{= ((${delete>/lockedItemsCount} + ${delete>/undeletableCount}) !== ${delete>/itemsCount}) }"
 					type="Emphasized"/>
 		</beginButton>
 		<endButton>
 			<Button text="{= ((${delete>/lockedItemsCount} + ${delete>/undeletableCount}) !== ${delete>/itemsCount}) ? ${i18n>CANCEL} : ${i18n>CLOSE} }"
-					press="onCancel"/>
+					press=".onCancel"/>
 		</endButton>
 	</Dialog>
 </core:FragmentDefinition>

package/src/sap/suite/ui/generic/template/ListReport/view/fragments/SmartChart.fragment.xml

@@ -9,6 +9,7 @@
 	<template:with path="entityType>com.sap.vocabularies.UI.v1.HeaderInfo" var="header">
 		<smartChart:SmartChart
 			id="listReport{= ${parameter>/settings/quickVariantSelectionX} ? ${path: 'tabItem>', formatter: 'AH.getSuffixFromIconTabFilterKey'} : ''}"
+			afterVariantInitialise="._templateEventHandlers.onAfterVariantInitialise"
 			visible="{path: 'tabItem>', formatter: 'AHMultipleViews.getVisibleForTableTabs'}"
 			smartFilterId=""
 			persistencyKey="listReportChart{= ${parameter>/settings/quickVariantSelectionX} ? ${path: 'tabItem>', formatter: 'AH.getSuffixFromIconTabFilterKey'} : ''}"

package/src/sap/suite/ui/generic/template/ListReport/view/fragments/SmartTable.fragment.xml

@@ -17,8 +17,9 @@
 			<template:with path="tableAnnotationPath>" helper="AH.searchForFirstSemKey_Title_Description" var="targetColumn">
 				<template:with path="parameter>/" helper="StableIdHelper.preparePathForStableId" var="smartControlId">
 					<template:if test="{= ${smartControlId>}.buildStableId({type: 'ListReportTable', subType: 'SmartTable', sQuickVariantKey: ${tabItem>key}})}" />
-					<smarttable:SmartTable id="{smartControlId>id}" useDateRangeType="{= ${parameter>/settings/filterSettings/dateSettings/useDateRange} }"
-						smartFilterId="{= ${parameter>/settings/quickVariantSelectionX} ? '' : 'listReportFilter'}"
+				<smarttable:SmartTable id="{smartControlId>id}" useDateRangeType="{= ${parameter>/settings/filterSettings/dateSettings/useDateRange} }"
+					afterVariantInitialise="._templateEventHandlers.onAfterVariantInitialise"
+					smartFilterId="{= ${parameter>/settings/quickVariantSelectionX} ? '' : 'listReportFilter'}"
 						visible="{path: 'tabItem>', formatter: 'AHMultipleViews.getVisibleForTableTabs'}"
 						initialise="._templateEventHandlers.onTableInit"
 						persistencyKey="{= ${path: 'parameter>/settings/routeConfig/', formatter: 'AH.getPersistencyKeyForSmartTable'} }{= ${parameter>/settings/quickVariantSelectionX} ? ${path: 'tabItem>', formatter: 'AH.getSuffixFromIconTabFilterKey'} : ''}"

package/src/sap/suite/ui/generic/template/ObjectPage/controller/ControllerImplementation.js

@@ -2523,8 +2523,11 @@ sap.ui.define([
 					}
 
 				},
-				handlers: {
-					onEditAndActiveToggle: function () { // Implementation of draft toggle for static header
+			handlers: {
+				onAfterVariantInitialise: function(oEvent) {
+					oTemplateUtils.oCommonUtils.getControlStateWrapper(oEvent.getSource()).onAfterVariantInitialise();
+				},
+				onEditAndActiveToggle: function () { // Implementation of draft toggle for static header
 						var oUIModel = oObjectPage.getModel("ui");
 						var bIsEditable = oUIModel.getProperty("/editable");
 

package/src/sap/suite/ui/generic/template/ObjectPage/controllerFrameworkExtensions.js

@@ -30,7 +30,8 @@ sap.ui.define([
 				beforeSmartLinkPopoverOpensExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After },
 				onBeforeExportTableExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After },
 				focusOnEditExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After },
-				modifyRelatedAppsSettings: { "public": true, "final": false, overrideExecution: OverrideExecution.After }
+				modifyRelatedAppsSettings: { "public": true, "final": false, overrideExecution: OverrideExecution.After },
+				onListNavigationExtensionFromContextMenu: { "public": true, "final": false, overrideExecution: OverrideExecution.After }
 			}
 		},
 
@@ -82,13 +83,26 @@ sap.ui.define([
 		 * @param {sap.ui.model.Context} oBindingContext - The context of the corresponding table row
 		 * @param {boolean} bReplaceInHistory - This parameter should be considered if the method triggers an internal 
 		 * navigation. Pass this parameter to <code>oNavigationData.replaceInHistory</code> in this case
-		 * 
 		 * @returns {boolean} Method should return <code>true</code> if framework navigation should be suppressed 
 		 * (that means: extension code has taken over navigation)
 		 * @protected
 		 */
 		onListNavigationExtension: function (oEvent, oBindingContext, bReplaceInHistory) { },
 
+		/**
+		 * This method is called by SAP Fiori elements when a Contextmenu open in a new tab is triggered from a table. Application
+		 * developers can override this method and perform conditional (internal or external) navigation from different
+		 * rows of a table. Such custom navigation should be triggered via corresponding methods of
+		 * {@link sap.suite.ui.generic.template.extensionAPI.NavigationController NavigationController}.
+		 *
+		 * @returns {boolean} Method should return <code>true</code> if framework navigation should be suppressed
+		 * @param {Array<sap.ui.model.Context>} aContext - The context of the corresponding table row
+		 * @protected
+		 */
+		onListNavigationExtensionFromContextMenu: function(aContext) {
+			return false;
+		},
+
 		/**
 		 * This method will be called by SAP Fiori elements before persisting the AppState. Application developers can
 		 * override this method for persisting the state of custom controls. State of the custom controls

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_cnr.properties

@@ -19,7 +19,7 @@ SAVE=Sa\u010Duvaj
 
 SAVE_AND_EDIT=Sa\u010Duvaj i uredi
 
-SAVE_AND_NEXT=Sa\u010Duvaj i sljede\u0107e
+SAVE_AND_NEXT=Sa\u010Duvaj i idi na sljede\u0107e
 
 VALIDATE_DRAFT=Validiraj
 

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_mk.properties

@@ -19,7 +19,7 @@ SAVE=\u0417\u0430\u0447\u0443\u0432\u0430\u0458
 
 SAVE_AND_EDIT=\u0417\u0430\u0447\u0443\u0432\u0430\u0458 \u0438 \u0443\u0440\u0435\u0434\u0438
 
-SAVE_AND_NEXT=\u0417\u0430\u0447\u0443\u0432\u0430\u0458 \u0438 \u0441\u043B\u0435\u0434\u043D\u043E
+SAVE_AND_NEXT=\u0417\u0430\u0447\u0443\u0432\u0430\u0458 \u0438 \u043E\u0434\u0438 \u0441\u043B\u0435\u0434\u043D\u043E
 
 VALIDATE_DRAFT=\u041F\u043E\u0442\u0432\u0440\u0434\u0438
 

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_sh.properties

@@ -19,7 +19,7 @@ SAVE=Sa\u010Duvaj
 
 SAVE_AND_EDIT=Sa\u010Duvaj i uredi
 
-SAVE_AND_NEXT=Sa\u010Duvaj i slede\u0107e
+SAVE_AND_NEXT=Sa\u010Duvaj i idi na slede\u0107e
 
 VALIDATE_DRAFT=Validiraj
 

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_sl.properties

@@ -5,7 +5,7 @@ DESCRIPTION=Stran objekta
 
 EDIT=Obdelava
 
-CREATE_OBJECT=Ustvari
+CREATE_OBJECT=Kreiraj
 
 DISPLAY_ACTIVE_VERSION=Prikaz shranjene verzije
 
@@ -23,7 +23,7 @@ SAVE_AND_NEXT=Shrani in naprej
 
 VALIDATE_DRAFT=Validacija
 
-CREATE=Ustvari
+CREATE=Kreiraj
 
 CLOSE=Zapiranje
 
@@ -33,7 +33,7 @@ ADD=Dodajanje
 
 SEG_BUTTON_TEXT={0} ({1})
 
-CREATE_DRAFT_MESSAGE_TEXT=Ustvarite objekt.
+CREATE_DRAFT_MESSAGE_TEXT=Kreirajte objekt.
 
 SAVE_DRAFT_MESSAGE_TEXT=Uporabite spremembe za shranjeno verzijo.
 

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_sr.properties

@@ -19,7 +19,7 @@ SAVE=\u0421\u0430\u0447\u0443\u0432\u0430\u0458
 
 SAVE_AND_EDIT=\u0421\u0430\u0447\u0443\u0432\u0430\u0458 \u0438 \u0443\u0440\u0435\u0434\u0438
 
-SAVE_AND_NEXT=\u0421\u0430\u0447\u0443\u0432\u0430\u0458 \u0438 \u0441\u043B\u0435\u0434\u0435\u045B\u0435
+SAVE_AND_NEXT=\u0421\u0430\u0447\u0443\u0432\u0430\u0458 \u0438 \u0438\u0434\u0438 \u043D\u0430 \u0441\u043B\u0435\u0434\u0435\u045B\u0435
 
 VALIDATE_DRAFT=\u0412\u0430\u043B\u0438\u0434\u0438\u0440\u0430\u0458
 

package/src/sap/suite/ui/generic/template/ObjectPage/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.146.0"
+			"version": "1.147.0"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/DraftConfirmationPopup.fragment.xml

@@ -36,8 +36,8 @@
 			</List>
 		</content>
 		<buttons>
-			<Button text="{i18n>OK}" type="Emphasized" press="onDraftPopupOk" />
-			<Button text="{i18n>CANCEL}" press="onDraftPopupCancel" />
+			<Button text="{i18n>OK}" type="Emphasized" press=".onDraftPopupOk" />
+			<Button text="{i18n>CANCEL}" press=".onDraftPopupCancel" />
 		</buttons>
 	</Dialog>
 </core:FragmentDefinition>

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/DraftResumeDialog.fragment.xml

@@ -1,11 +1,11 @@
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core">
-	<Dialog id="draftResumeDialog" title="{i18n>WARNING}" state="Warning" type="Message" afterClose="onResumeDialogClosed">
+	<Dialog id="draftResumeDialog" title="{i18n>WARNING}" state="Warning" type="Message" afterClose=".onResumeDialogClosed">
 		<content>
 			<Text id="draftResumeText" text="{Dialog>/draftResumeText}" />
 		</content>
 		<buttons>
-			<Button id="draftResumeResumeButton" text="{i18n>RESUME}" press="onDraftResume" type="Emphasized"/>
-			<Button id="draftResumeDiscardButton" text="{i18n>DISCARD}" press="onDraftDiscard" />
+			<Button id="draftResumeResumeButton" text="{i18n>RESUME}" press=".onDraftResume" type="Emphasized"/>
+			<Button id="draftResumeDiscardButton" text="{i18n>DISCARD}" press=".onDraftDiscard" />
 		</buttons>
 	</Dialog>
 </core:FragmentDefinition>

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/RelatedAppsSheet.fragment.xml

@@ -1,7 +1,7 @@
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core">
 	<ActionSheet id="realtedAppsSheet" buttons="{buttons>/buttons}" showCancelButton="true" class="sapSmartTemplatesObjectPageRelatedAppsPopover sapSmartTemplatesObjectPageActionSheetButton">
 		<buttons>
-			<Button id="relatedAppsButton" enabled="{buttons>enabled}" text="{buttons>text}" press="buttonPressed" class="sapMFlexBox" width="100%" />
+			<Button id="relatedAppsButton" enabled="{buttons>enabled}" text="{buttons>text}" press=".buttonPressed" class="sapMFlexBox" width="100%" />
 		</buttons>
 	</ActionSheet>
 </core:FragmentDefinition>

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/SmartChart.fragment.xml

@@ -11,8 +11,9 @@
 					<template:if test="{:= ${smartChartId>}.set(AH.getStableIdPartFromFacet(${facet>}) + '::Chart') }"/>
 					<!-- Header Level for Smart Chart is hardcoded here with "H5" for fallback scenarios, After Section Title hiding logic, if required the level is calculated on the class /ObjectPage/controller/SectionTitleHandler.js-->
 					<!-- Header Style for Smart Chart is hardcoded here with "H5" for all Scenarios.-->
-					<smartChart:SmartChart
-						id="{smartChartId>value}"
+				<smartChart:SmartChart
+					id="{smartChartId>value}"
+					afterVariantInitialise="._templateEventHandlers.onAfterVariantInitialise"
 						header="{chartAnnotation>Title/String}"
 						initialized="._templateEventHandlers.onChartInit"
 						requestAtLeastFields="{parts: [{path: 'chartAnnotation>'}, {path: 'entitySet>entityType'}], formatter: 'AH.getApplicablePathForChartToolbarActions'}"

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/SmartTable.fragment.xml

@@ -16,8 +16,9 @@
 								<template:if test="{= ${smartControlId>}.buildStableId({type: 'ObjectPageTable', subType: 'SmartTable', sFacet: ${facetId>id}})}" />
 								<!-- Header Level for Smart Table is hardcoded here with "H5" for fallback scenarios, After Section Title hiding logic, if required the level is calculated on the class /ObjectPage/controller/SectionTitleHandler.js-->
 								<!-- Header Style for Smart Table is hardcoded here with "H5" for all Scenarios.-->
-								<st:SmartTable id="{smartControlId>id}"
-									initialise="._templateEventHandlers.onTableInit($event, '{facetId>id}')"
+							<st:SmartTable id="{smartControlId>id}"
+								afterVariantInitialise="._templateEventHandlers.onAfterVariantInitialise"
+								initialise="._templateEventHandlers.onTableInit($event, '{facetId>id}')"
 									persistencyKey="{parts: [{path: 'smartControlId>id'}, {path: 'objectPageTableSettings>value/persistencyKeyState'}], formatter: 'AH.getPersistencyKey'}"
 									tableBindingPath="{= ${path: 'target>AnnotationPath'}.slice(0, ${path: 'target>AnnotationPath'}.lastIndexOf('/')) }"
 									fitContainer="false"

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/SwitchDraftAndActiveObjectPopOver.fragment.xml

@@ -6,7 +6,7 @@
 		class="sapUiNoContentPadding">
 		<SelectList
 			selectedKey="{= ${HasDraftEntity} ? 'SwitchToActive' : 'SwitchToDraft'}"
-			itemPress="onEditAndActiveToggle($event, ${HasDraftEntity})">
+			itemPress=".onEditAndActiveToggle($event, ${HasDraftEntity})">
 			<core:Item text="{i18n>SAVED_VERSION}" key="SwitchToActive"/>
 			<core:Item text="{i18n>DRAFT_VERSION}" key="SwitchToDraft"/>
 		</SelectList>

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/TableDeleteConfirmation.fragment.xml

@@ -9,12 +9,12 @@
 		<beginButton>
 			<Button text="{i18n>DELETE}"
 					visible="{= ${delete>/tableMode} !== 'Delete' || ${delete>/undeletableCount} === 0 }"
-					press="onDelete"
+					press=".onDelete"
 					type="Emphasized"/>
 		</beginButton>
 		<endButton>
 			<Button text="{= (${delete>/tableMode} !== 'Delete' || ${delete>/undeletableCount} === 0) ? ${i18n>CANCEL} : ${i18n>CLOSE} }"
-					press="onCancel"/>
+					press=".onCancel"/>
 		</endButton>
 	</Dialog>
 </core:FragmentDefinition>

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/UnsavedChangesDialog.fragment.xml

@@ -4,8 +4,8 @@
 			<Text id="unsavedChangesQuestionText" text="{Dialog>/unsavedChangesQuestion}" />
 		</content>
 		<buttons>
-			<Button id="unsavedChangesEditButton" text="{i18n>EDIT}" press="onEdit" type="Emphasized"/>
-			<Button id="unsavedChangesCancelButton" text="{i18n>CANCEL}" press="onCancel" />
+			<Button id="unsavedChangesEditButton" text="{i18n>EDIT}" press=".onEdit" type="Emphasized"/>
+			<Button id="unsavedChangesCancelButton" text="{i18n>CANCEL}" press=".onCancel" />
 		</buttons>
 	</Dialog>
 </core:FragmentDefinition>

package/src/sap/suite/ui/generic/template/QuickCreate/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.146.0"
+			"version": "1.147.0"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickCreate/view/QuickCreate.view.xml

@@ -65,7 +65,7 @@
 											contextEditable="true"
 											change=".onChange"
 											value="{path: 'dataField>Value', formatter: 'AHModel.format'}"
-											innerControlsCreated="onSmartFieldsCreated"
+											innerControlsCreated=".onSmartFieldsCreated"
 											width="100%"/>
 									</smartForm:GroupElement>
 								</smartForm:Group>
@@ -78,15 +78,15 @@
 								<template:with path="facet>Target" helper="AHModel.resolvePath" var="target">
 									<HBox visible="{quickCreate>/draftExists}" width="100%" alignItems="Center" justifyContent="Center" class="sapUiSmallMarginEnd sapQuickCreateLineItemTable">
 										<Table
-											updateStarted="onTableUpdateStarted"
-											updateFinished="onTableUpdateFinished"
+											updateStarted=".onTableUpdateStarted"
+											updateFinished=".onTableUpdateFinished"
 											backgroundDesign="Translucent"
 											items="{parts:[{path:'entitySet>entityType'}, {path: 'parameter>/isDraftEnabled'}], formatter: 'AHQuickTemplates.formatBindingPathForLineItems'}">
 											<headerToolbar>
 												<Toolbar>
 													<Title text="{path: 'facet>Label', formatter: 'AH.formatWithExpandSimple'}" level="h6"/>
 													<ToolbarSpacer/>
-													<Button icon="sap-icon://add" press="onAddLineItemPress" visible="{ui>/enabled}"/>
+													<Button icon="sap-icon://add" press=".onAddLineItemPress" visible="{ui>/enabled}"/>
 												</Toolbar>
 											</headerToolbar>
 											<columns>
@@ -112,9 +112,9 @@
 																contextEditable="true"
 																value="{path: 'columnItemFieldValue>Value', formatter: 'AHModel.format'}"
 																change=".onChange"
-																innerControlsCreated="onSmartFieldsCreated"/>
+																innerControlsCreated=".onSmartFieldsCreated"/>
 														</template:repeat>
-														<c:Icon visible="{ui>/enabled}" src="sap-icon://delete" class="hoverIcon" press="onRemoveLineItemPress" tooltip="{i18n>QuickCreate_DeleteLineItem}"/>
+														<c:Icon visible="{ui>/enabled}" src="sap-icon://delete" class="hoverIcon" press=".onRemoveLineItemPress" tooltip="{i18n>QuickCreate_DeleteLineItem}"/>
 													</cells>
 												</ColumnListItem>
 											</items>
@@ -129,7 +129,7 @@
 		</content>
 	</Panel>
 	<HBox visible="{quickCreate>/draftExists}" width="100%" alignItems="Center" justifyContent="Center" class="sapQuickActionCreateButtonContainer">
-		<Button enabled="{ui>/createenabled}" type="Emphasized" text="{i18n>QuickCreate_CreateButtonText}" press="onCreatePress" visible="{ui>/enabled}"/>
+		<Button enabled="{ui>/createenabled}" type="Emphasized" text="{i18n>QuickCreate_CreateButtonText}" press=".onCreatePress" visible="{ui>/enabled}"/>
 	</HBox>
 
 </mvc:View>

package/src/sap/suite/ui/generic/template/QuickView/manifest.json

@@ -6,7 +6,7 @@
 	"type": "component",
 	"i18n": "i18n/i18n.properties",
 	"applicationVersion": {
-		"version": "1.146.0"
+		"version": "1.147.0"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickView/view/QuickView.view.xml

@@ -29,7 +29,7 @@
 					<template:if test="{badge>ImageUrl}">
 						<template:then>
 							<FlexBox alignItems="Start" justifyContent="Center">
-								<Avatar 
+								<Avatar
 									src="{path: 'badge>ImageUrl', formatter: 'AHModel.format'}"
 									class="sapUiSmallMarginEnd sapQuickViewBadgeImageBorder"
 									displaySize="L"
@@ -58,7 +58,7 @@
 	<FlexBox visible="{=${badge>/badgeVisible}}" width="100%" alignItems="Start" justifyContent="Start">
 		<HBox alignItems="Left" justifyContent="Left" width="100%">
 			<FlexBox visible="{=${badge>/imgUrlDefined}}" alignItems="Start" justifyContent="Center">
-				<Avatar 
+				<Avatar
 					src="{badge>/imgUrl}"
 					class="sapUiSmallMarginEnd sapQuickViewBadgeImageBorder"
 					displaySize="L"
@@ -100,14 +100,14 @@
 								<template:then>
 									<Label
 										labelFor="field::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}"
-										
+
 										text="{path: 'dataField>Label', formatter: 'AH.formatWithExpandSimple'}" class="sapQuickViewSmartFieldLabel"/>
 								</template:then>
 								<template:else>
 									<smart:SmartLabel labelFor="field::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}" class="sapQuickViewSmartFieldLabel"/>
 								</template:else>
 							</template:if>
-							
+
 							<template:if test="{= ${dataField>RecordType} === 'com.sap.vocabularies.UI.v1.DataFieldWithUrl'}">
 								<template:then>
 									<fe:Link id="field::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}"
@@ -125,7 +125,7 @@
 										clientSideMandatoryCheck="false"
 										value="{path: 'dataField>Value', formatter: 'AHModel.format'}"
 										url="{= ${dataField>Url} ? ${path: 'dataField>Url', formatter: 'AHModel.format'} : ''}"
-										innerControlsCreated="onSmartFieldsCreated"
+										innerControlsCreated=".onSmartFieldsCreated"
 										class="sapQuickViewTextTitle"/>
 								</template:else>
 							</template:if>
@@ -184,7 +184,7 @@
 														contextEditable="false"
 														value="{path: 'columnItemFieldValue>Value', formatter: 'AHModel.format'}"
 														url="{= ${columnItemFieldValue>Url} ? ${path: 'columnItemFieldValue>Url', formatter: 'AHModel.format'} : ''}"
-														innerControlsCreated="onSmartFieldsCreated"/>
+														innerControlsCreated=".onSmartFieldsCreated"/>
 												</template:repeat>
 											</cells>
 										</ColumnListItem>

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

@@ -164,7 +164,24 @@ sap.ui.define([	"sap/suite/ui/generic/template/genericUtilities/FeLogger", "sap/
 			function fnApplyAndUp(oEvent) {
 				var oControl = oEvent.getSource();
 				var oCRUDActionHandler = oTemplateUtils.oComponentUtils.getCRUDActionHandler();
-				oCRUDActionHandler.handleCRUDScenario(2, fnApplyAndUpImpl.bind(null, oControl));
+
+				// Pre-check validation to decide navigation
+				var oAppComponent = oController.getOwnerComponent().getAppComponent();
+				var oManifestSettings = oAppComponent.getManifest()["sap.ui.generic.app"];
+				var bNavigateImmediately = oManifestSettings &&
+										oManifestSettings.settings &&
+										oManifestSettings.settings.applyButtonNavigatesImmediately;
+				if (bNavigateImmediately) {
+					oCRUDActionHandler.hasValidationMessageOnDetailsViews().then(function(bHasValidationErrors) {
+						if (!bHasValidationErrors) {
+							// No frontend errors - navigate immediately
+							fnNavigateUp();
+							oTemplateUtils.oServices.oApplicationController.synchronizeDraftAsync();
+						}
+					});
+				} else  {
+					oCRUDActionHandler.handleCRUDScenario(2, fnApplyAndUpImpl.bind(null, oControl));
+				}
 			}
 
 			var oDiscardEditHandler; // singleton, initialized on demand

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

@@ -17,7 +17,7 @@
             <ToolbarSpacer />
             <Button
                 text="{i18n>ST_GENERIC_DIALOG_CLOSE_BUT}"
-                press="onCloseAiPopover" />
+                press=".onCloseAiPopover" />
         </OverflowToolbar>
     </footer>
 </Popover>

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

@@ -2,7 +2,7 @@
 	<Dialog id="actionConfirmationDialog" title="{list>/dialogTitle}" class="sapUiContentPadding" state="Warning" ariaLabelledBy="warningText">
 		<content>
 			<Text id="warningText" text="{list>/warningText}" />
-			<VBox> 
+			<VBox>
 				<List items = "{path: 'list>/aInApplicableItems'}" >
 					<items>
 						<StandardListItem title = "{list>sKey}" class="sapSmartTemplatesSLIBold" />
@@ -16,10 +16,10 @@
 			</VBox>
 		</content>
 		<beginButton>
-			<Button text="{i18n>ST_GENERIC_DIALOG_CONTINUE_BUT}" press="onContinue" visible="true" type="Emphasized"/>
+			<Button text="{i18n>ST_GENERIC_DIALOG_CONTINUE_BUT}" press=".onContinue" visible="true" type="Emphasized"/>
 		</beginButton>
 		<endButton>
-			<Button text="{i18n>CANCEL}" press="onCancel"/>
+			<Button text="{i18n>CANCEL}" press=".onCancel"/>
 		</endButton>
 	</Dialog>
 </core:FragmentDefinition>