@sapui5/sap.suite.ui.generic.template 1.136.13 → 1.136.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.136.13",
+  "version": "1.136.15",
   "description": "SAPUI5 Library sap.suite.ui.generic.template",
   "keywords": [
     "sapui5",

package/src/sap/suite/ui/generic/template/.library

@@ -7,7 +7,7 @@
 
 		(c) Copyright 2009-2015 SAP SE. All rights reserved
 	</copyright>
-	<version>1.136.13</version>
+	<version>1.136.15</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/i18n/i18n_it.properties

@@ -208,9 +208,9 @@ NODATA_ADAPTFILTERDIALOG=Nessun dato
 
 
 
-NODATA_SMARTCHART_ALP=Per iniziare, impostare i filtri e selezionare "Avvio".
+NODATA_SMARTCHART_ALP=Per iniziare, imposta i filtri rilevanti e seleziona "Avvio".
 
-NODATA_SMARTTABLE_ALP=Per iniziare, impostare i filtri e selezionare "Avvio".
+NODATA_SMARTTABLE_ALP=Per iniziare, imposta i filtri rilevanti e seleziona "Avvio".
 
 MESSAGE_MULTIPLE_VALUES_L_FORM=Alcuni filtri non sono ril. per tab "{1}" ({0}). L\u2019impostazione di questi filtri non incide sui ris.
 

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

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

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

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.136.13"
+			"version": "1.136.15"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

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

@@ -1,5 +1,6 @@
 sap.ui.define([
 	"sap/ui/model/Filter",
+	"sap/ui/model/FilterOperator",
 	"sap/suite/ui/generic/template/ListReport/extensionAPI/ExtensionAPI",
 	"sap/suite/ui/generic/template/listTemplates/listUtils",
 	"sap/suite/ui/generic/template/listTemplates/controller/MessageStripHelper",
@@ -24,12 +25,12 @@ sap.ui.define([
 	"sap/suite/ui/generic/template/js/AnnotationHelperHiddenTermSupport",
 	"sap/m/IllustratedMessageType",
 	"sap/suite/ui/generic/template/lib/ai/EasyFilterBarHandler",
-	"sap/ui/model/FilterOperator",
 	"sap/ui/core/message/MessageType",
 	"sap/ui/core/Element",
 	"sap/suite/ui/generic/template/genericUtilities/testableHelper"
 ], function (
 	Filter,
+	FilterOperator,
 	ExtensionAPI,
 	listUtils,
 	MessageStripHelper,
@@ -54,7 +55,6 @@ sap.ui.define([
 	AnnotationHelperHiddenTermSupport,
 	IllustratedMessageType,
 	EasyFilterBarHandler,
-	FilterOperator,
 	MessageType,
 	Element,
 	testableHelper
@@ -554,10 +554,89 @@ sap.ui.define([
 				return restoreFocusHelper;
 			}
 
-			// // Expose selected private functions to unit tests
-			// var getDownloadUrl = testableHelper.testable(getDownloadUrl, "getDownloadUrl");
+			/**
+			 * Helper function to get missing navigation properties from the current variant.
+			 * This logic was moved from SmartFilterBarWrapper to avoid control-specific
+			 * business logic in the wrapper layer.
+			 * @param {object} oSmartFilterBar - The SmartFilterBar control
+			 * @returns {Array} Array of missing navigation property filters
+			 */
+			function fnGetMissingNavProperties(oSmartFilterBar) {
+				//Fetch the navigation properties
+				const oMetaModel = oSmartFilterBar.getModel().getMetaModel(),
+					sEntitySet = oSmartFilterBar.getEntitySet(),
+					oDataEntitySet = oMetaModel.getODataEntitySet(sEntitySet),
+					oDataEntityType = oMetaModel.getODataEntityType(oDataEntitySet.entityType),
+					aNavigationProperties = oDataEntityType['navigationProperty'];
+				//Fetch the added filters in the current variant
+				const sCurrentVariantID = oSmartFilterBar.getVariantManagement().getCurrentVariantId(),
+					oCurrentVariant = oSmartFilterBar.getVariantManagement().getAllVariants().find(function(variant) {
+						return variant.getId() === sCurrentVariantID;
+					});
+				if (!oCurrentVariant
+					|| !oCurrentVariant.getContent()
+					|| !oCurrentVariant.getContent().searchListReportVariant
+					|| !oCurrentVariant.getContent().searchListReportVariant.filterBarVariant
+					|| !aNavigationProperties
+					|| !aNavigationProperties.length
+				) {
+					return [];
+				}
+				const oManifestNavigationProperties = oSmartFilterBar.getNavigationProperties() ?
+					oSmartFilterBar.getNavigationProperties().split(",").reduce(function(accumulator, currentValue){
+						accumulator[currentValue] = true;
+						return accumulator;
+					}, {}) : {},
+					oNavigationProperties = aNavigationProperties.reduce(function(accumulator, currentValue){
+						accumulator[currentValue.name] = true;
+						return accumulator;
+					}, {}),
+					oSmartFilterBarVariant = JSON.parse(oCurrentVariant.getContent().searchListReportVariant.filterBarVariant),
+					aMissing = [];
+				delete oSmartFilterBarVariant["_CUSTOM"];
+
+				// Compare the filter source and navigation properties
+				// Take into account if parameter is already specified in page setting in manifest.json - settings->filterSettings->navigationProperties
+				// If parameter exist in navigationProperties -> SFB will handle specific parameter and code ignore it
+				for (const sFilterKey in oSmartFilterBarVariant) {
+					const sParamName = sFilterKey.split(".")[0]; // take first part from navigation parameter. Example: to_Currency.Currency_Code -> to_Currency
+					if (!oNavigationProperties[sParamName] || oManifestNavigationProperties[sParamName]
+					) {
+						// Parameter is
+						// 1) not navigation property -> we don't process it
+						// 2) is defined in manifest.json - settings->filterSettings->navigationProperties -> value will be handled by SFB
+						continue;
+					}
+					if (oSmartFilterBarVariant[sFilterKey].items && oSmartFilterBarVariant[sFilterKey].items.length) {
+						aMissing.push(oSmartFilterBarVariant[sFilterKey].items.map(function(entry) {
+							return {
+								exclude: false,
+								field: sFilterKey,
+								operation: FilterOperator.EQ,
+								value1: entry.key
+							};
+						}));
+						continue;
+					}
+					if (oSmartFilterBarVariant[sFilterKey].ranges && oSmartFilterBarVariant[sFilterKey].ranges.length) {
+						aMissing.push(oSmartFilterBarVariant[sFilterKey].ranges.map(function(entry) {
+							return {
+								exclude: entry.exclude,
+								field: entry.keyField,
+								operation: entry.operation,
+								value1: entry.value1,
+								value2: entry.value2
+							};
+						}));
+					}
+				}
+				return aMissing;
+			}
+
+			// Expose selected private functions to unit tests
 			/* eslint-enable */
 			testableHelper.testableStatic(onShareListReportActionButtonPressImpl, "ControllerImplementation_onShareListReportActionButtonPressImpl");
+			testableHelper.testable(fnGetMissingNavProperties, "fnGetMissingNavProperties");
 
 			// Generation of Event Handlers
 			return {
@@ -707,8 +786,11 @@ sap.ui.define([
 						onShareListReportActionButtonPressImpl(oMenuButton);
 					});
 				},
-				
+
 				handlers: {
+					onAfterVariantInitialise: function(oEvent) {
+						oTemplateUtils.oCommonUtils.getControlStateWrapper(oEvent.getSource()).onAfterVariantInitialise();
+					},
 					addEntry: addEntry,
 					addEntryWithFilters: addEntryWithFilters,
 					deleteEntries: fnDeleteEntries,
@@ -754,6 +836,8 @@ sap.ui.define([
 					onAfterSFBVariantLoad: function (oEvent) {
 						oState.oIappStateHandler.onAfterSFBVariantLoad(oEvent);
 						oState.oEasyFilterBarHandler && oState.oEasyFilterBarHandler.handleVariantLoad(oEvent);
+						// Cache missing navigation property filters for performance
+						oState.aMissingNavFilters = fnGetMissingNavProperties(oState.oSmartFilterbar);
 					},
 					onSmartListDataReceived: function (oEvent) {
 						var oSmartList = oEvent.getSource();
@@ -802,11 +886,8 @@ sap.ui.define([
 						// However, this connection is not there in the multi view multi table scenario which is the only case in which this snapshot
 						// will be used later.
 						var aFiltersFromRebindEvent = oBindingParams.filters.slice(0);
-						// To get the missing navigation properties from the user variant
-						var oSmartFilterBarId = oState.oSmartFilterbar.getId(),
-							oSmartFilterBarWrapper = oTemplateUtils.oCommonUtils.getControlStateWrapperById(oSmartFilterBarId, "SmartFilterBar"),
-							aMissingFilters = oSmartFilterBarWrapper.getMissingNavProperties();
-						if (aMissingFilters.length) {
+						// To get the missing navigation properties from the user variant (cached from last variant load)
+						if (oState.aMissingNavFilters && oState.aMissingNavFilters.length) {
 							// Display message to the user, which filters currently are not visible
 							var sCurrentVariant =  oState.oSmartFilterbar.getVariantManagement().getId(),
 								sCurrentVariantId =  oState.oSmartFilterbar.getCurrentVariantId(),
@@ -822,7 +903,7 @@ sap.ui.define([
 										}
 										return accumulator;
 									}, {}),
-								aMissingPropertyNames = aMissingFilters.reduce(function(accumulator, currentValue) {
+								aMissingPropertyNames = oState.aMissingNavFilters.reduce(function(accumulator, currentValue) {
 									var sName = currentValue[0].field.split(".")[0];
 									if (oMappedProperty[sName]) {
 										accumulator.push(oMappedProperty[sName]);
@@ -840,7 +921,7 @@ sap.ui.define([
 							// Generate filters and set them into binding parameters
 							// use same logic as in sap.ui.comp.smartfilterbar.FilterProviderUtils, method generateFilters()
 							var aFilters = [];
-							aMissingFilters.forEach(function(oEntry) {
+							oState.aMissingNavFilters.forEach(function(oEntry) {
 								var aIncludeFilters = [],
 									aExcludeFilters = [];
 								oEntry.forEach(function(oFilterEntry) {

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:
@@ -229,14 +223,19 @@ sap.ui.define([
 		var oSmartVariantManagement = oState.oSmartFilterbar.getSmartVariant();
 		if (oSmartVariantManagement){
 			var oSmartVariantManagementWrapper = oTemplateUtils.oCommonUtils.getControlStateWrapper(oSmartVariantManagement, {
-				managedControlWrappers: aPageVariantControlStateWrappers.concat([oSmartFilterBarWrapper]),
-				dynamicPageWrapper: oDynamicPageWrapper
+				managedControlWrappers: aPageVariantControlStateWrappers.concat([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 +773,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 +909,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/i18n/i18n_it.properties

@@ -61,7 +61,7 @@ MESSAGE_MULTIPLE_VALUES_S_FORM=Non \u00E8 possibile utilizzare i seguenti filtri
 
 OBJECT_NOT_EDITABLE=Impossibile modificare questo oggetto.
 
-NODATA_SMARTTABLE_LR=Per iniziare, impostare i filtri e selezionare "Avvio".
+NODATA_SMARTTABLE_LR=Per iniziare, imposta i filtri rilevanti e seleziona "Avvio".
 
 SEARCH_FILTERS_KEYBOARD_SHORTCUT_DESC=Avvio
 

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.136.13"
+			"version": "1.136.15"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

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

@@ -8,7 +8,8 @@
 
 	<template:with path="entityType>com.sap.vocabularies.UI.v1.HeaderInfo" var="header">
 		<smartChart:SmartChart
-			id="listReport{= ${parameter>/settings/quickVariantSelectionX} ? ${path: 'tabItem>', formatter: 'AH.getSuffixFromIconTabFilterKey'} : ''}" 
+			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

@@ -2396,8 +2396,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/controller/RelatedAppsHandler.js

@@ -91,7 +91,12 @@ sap.ui.define([
 								}
 							}
 						}
-						
+
+						var oAppComponent = oController.getOwnerComponent().getAppComponent();
+						// Preparing the array of semantic objects to fetch links.
+						// Initialize the array with the current app's semantic object.
+						var aSemanticObjects = [sCurrentSemObj];
+
 						//Get all semantic object from manifest setting
 						var oSettings = oTemplateUtils.oComponentUtils.getSettings();
 						var oRelatedAppsSettings = oSettings.relatedAppsSettings;
@@ -99,42 +104,29 @@ sap.ui.define([
                         oRelatedAppsSettings = oController.modifyRelatedAppsSettings(oRelatedAppsSettings, sCurrentSemObj);
 						var bHasRelatedAppSettings = oRelatedAppsSettings && Object.keys(oRelatedAppsSettings).length > 0;
 
-						var oLinksPromise;
 						var bHasRelatedAppSettings = oRelatedAppsSettings && Object.keys(oRelatedAppsSettings).length > 0;
-						
-						
-						if (bHasRelatedAppSettings) {
-							// Create a set to hold string data types
-							const oSemanticObjectSet = new Set();
-
-							// Add the current semantic object into the set
-							oSemanticObjectSet.add(sCurrentSemObj);
 
+						if (bHasRelatedAppSettings) {
 							// Iterate through oRelatedAppSettings and add all related apps into the set
 							for (const sKey in oRelatedAppsSettings) {
 								if (oRelatedAppsSettings.hasOwnProperty(sKey)) {
 									const sSemanticObject = oRelatedAppsSettings[sKey].semanticObject;
-									oSemanticObjectSet.add(sSemanticObject); // Set will handle duplicates
+									aSemanticObjects.push(sSemanticObject);
 								}
 							}
-
-							// Create an array from the set
-							let aSemanticObjects = Array.from(oSemanticObjectSet);
-
-							// Use the map method to convert the array of strings into an array of objects
-							aSemanticObjects = aSemanticObjects.map(sSemObj => ({ semanticObject: sSemObj }));
-
-							// aSemanticObjects now contains the desired format
-							oLinksPromise = oNavigationService.getLinks(aSemanticObjects);
-						} else {
-							var oAppComponent = oController.getOwnerComponent().getAppComponent();
-							oLinksPromise = oNavigationService.getLinks([{
-								semanticObject: sCurrentSemObj,
+						}
+						// Remove duplicates
+						aSemanticObjects = Array.from(new Set(aSemanticObjects));
+						// Add parameters to semantic objects
+						var aSemanticObjectsWithParams = aSemanticObjects.map(sSemanticObject => {
+							return {
+								semanticObject: sSemanticObject,
 								params: oParam,
 								ui5Component: oAppComponent
-							}]);
-						}
-						oLinksPromise.then(function (aResult) {
+							};
+						});
+
+						oNavigationService.getLinks(aSemanticObjectsWithParams).then(function (aResult) {
 							// Convert the response into a single dimension array by flattening it
 							var aLinks = aResult.flat(Infinity);
 							// Get structured links

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_pt.properties

@@ -15,7 +15,7 @@ SAVED_VERSION=Vers\u00E3o gravada
 
 DRAFT_VERSION=Esbo\u00E7o
 
-SAVE=Gravar
+SAVE=Salvar
 
 SAVE_AND_EDIT=Salvar e editar
 

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_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.136.13"
+			"version": "1.136.15"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

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/QuickCreate/manifest.json

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

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

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

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

@@ -214,7 +214,12 @@ sap.ui.define([
 					}
 				},
 				"sap.uxap.ObjectPageSubSection": {
-					actions: ["rename", "remove", "reveal"]
+					actions: ["rename", "remove", "reveal"],
+					aggregations: {
+						actions: {
+							actions: ["remove"]
+						}
+					}
 				},
 				"sap.ui.comp.smartform.SmartForm": {				// not documented in allow list, but checked by RTA OPA test
 					actions: ["localReset", "annotation"],