@sapui5/sap.suite.ui.generic.template 1.120.33 → 1.120.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.120.33",
+  "version": "1.120.35",
   "description": "SAPUI5 Library sap.suite.ui.generic.template",
   "keywords": [
     "sapui5",
@@ -16,6 +16,7 @@
     "testsuite-qunit" : "ui5 serve  --config ./ui5-local.yaml --open \"/test-resources/sap/suite/ui/generic/template/qunit/testsuite.qunit.html\""
   },
   "devDependencies": {
-    "sonarqube-scanner": "3.5.0"
+    "sonarqube-scanner": "3.5.0",
+    "@sap/ux-ui5-tooling": "latest"
   }
-}
+}

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

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

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

@@ -258,12 +258,12 @@ sap.ui.define(["sap/fe/navigation/SelectionVariant",
 						var sEntityTypeName = oMetaModel.getODataEntitySet(oPresentationControlHandler.getEntitySet()).entityType;
 						var oTable = oState.oSmartTable.getTable();
 						var oBinding = oTable.getBinding("rows") || oTable.getBinding("items");
-						var sServiceUrl = oBinding && oBinding.getDownloadUrl();
+						var sServiceUrl = oBinding ? oBinding.getDownloadUrl() : "";
 						// - For Analytical Binding.
 						// we recv. aApplicationFilter and aApplicationFilters binding both but aApplicationFilter have actual filters operator value.
 						// - For List Binding.
 						// we recv. only aApplicationFilters contains filter operator.
-						var aFilters = oBinding.aApplicationFilter || oBinding.aApplicationFilters;
+						var aFilters = oBinding ? (oBinding.aApplicationFilter || oBinding.aApplicationFilters) : [];
 						// non-draft case when no filter is applied
 						if (!aFilters.length) {
 							return Promise.resolve({

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.120.33"
+			"version": "1.120.35"
 		},
 		"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.120.33"
+			"version": "1.120.35"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

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

@@ -306,12 +306,12 @@ sap.ui.define([
 						var oMetaModel = oPresentationControlHandler.getModel().getMetaModel();
 						var sEntityTypeName = oMetaModel.getODataEntitySet(oPresentationControlHandler.getEntitySet()).entityType;
 						var oBinding = oPresentationControlHandler.getBinding(oState);
-						var sServiceUrl = oBinding.getDownloadUrl();
+						var sServiceUrl = oBinding ? oBinding.getDownloadUrl() : "";
 						// - For Analytical Binding.
 						// we recv. aApplicationFilter and aApplicationFilters binding both but aApplicationFilter have actual filters operator value.
 						// - For List Binding.
 						// we recv. only aApplicationFilters contains filter operator.
-						var aFilters = oBinding.aApplicationFilter || oBinding.aApplicationFilters;
+						var aFilters = oBinding ? (oBinding.aApplicationFilter || oBinding.aApplicationFilters) : [];
 						// non-draft case when no filter is applied
 						if (!aFilters.length) {
 							return Promise.resolve({

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

@@ -79,12 +79,12 @@ sap.ui.define([
 		var aPageVariantControlStateWrappers = []; // controls handled from page variant management if used: smartTable, searchfield, partly multiple views
 
 		// SmartTable state: Table Settings and (in case of control level variant management) selected variant and whether it's dirty
-		// In case of multipleViews with multiple tables (mode "multi"), each tab has an own table or chart, which has an own state, so multipleViewsHandler has to take care of 
+		// In case of multipleViews with multiple tables (mode "multi"), each tab has an own table or chart, which has an own state, so multipleViewsHandler has to take care of
 		// storing/restoring their states (in its part of the appState stored in genericData.tableTabData)
-		// In this case, mutliViewsHandler exchanges oState.oPresentationControlHandler (setting it always to the current visible one), so don't rely on that to get the wrapper. 
+		// In this case, mutliViewsHandler exchanges oState.oPresentationControlHandler (setting it always to the current visible one), so don't rely on that to get the wrapper.
 		// Using the id (without providing optional parameter sQuickVariantKey) returns the smartTable only in single table case.
 		var oSmartTable = oController.byId(StableIdHelper.getStableId({type: "ListReportTable", subType: "SmartTable"}));
-		if (oSmartTable){ // in multipleViews case (with multiple tables) currently multipleViews handler handles complete state information 
+		if (oSmartTable){ // in multipleViews case (with multiple tables) currently multipleViews handler handles complete state information
 			aControlStateWrappers.push(oTemplateUtils.oCommonUtils.getControlStateWrapper(oSmartTable));
 		}
 
@@ -123,7 +123,7 @@ sap.ui.define([
 
 		// List of handlers to react on (app or adaptation) extension state changes. Only one entry expected (handler in  SFB wrapper). Currently, extensions are only possible in
 		// SFB - if extensions at other places are needed, the similar handler might differ depending on whether page variant management is used.
-		var aExtensionStateChangeHandlers = []; 
+		var aExtensionStateChangeHandlers = [];
 		function customAppStateChange() {
 			aExtensionStateChangeHandlers.forEach(function(fnHandler) {
 				fnHandler();
@@ -234,7 +234,7 @@ sap.ui.define([
 
 
 		// Wrapper to control whether data is loaded
-		
+
 		function fnGetDataLoadedWrapper(){
 			// Wrapper to control whether data is expected to be loaded - controls the state, but does not trigger loading data on restore!
 			var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
@@ -242,15 +242,15 @@ sap.ui.define([
 			// - startup with iAppState: anyway setState will be called
 			// - other startup cases: applyInitialLoadBehavior calls setState explicitly
 			// - navigation
-			
+
 			function fnSetState(bState){
 				oTemplatePrivateModel.setProperty("/generic/bDataAreShownInTable", bState);
 			}
-			
+
 			function fnGetState(){
 				return oTemplatePrivateModel.getProperty("/generic/bDataAreShownInTable");
 			}
-			
+
 			function fnSetDataShown(bDataShown, fnHandler){
 				if (bDataShown === fnGetState()){
 					return;
@@ -258,7 +258,7 @@ sap.ui.define([
 				fnSetState(bDataShown);
 				fnHandler();
 			}
-			
+
 			return {
 				getLocalId: function(){
 					return "$dataLoaded";
@@ -266,7 +266,7 @@ sap.ui.define([
 				setState: fnSetState,
 				getState: fnGetState,
 				attachStateChanged: function(fnHandler){
-					// changing from data not loaded to data loaded: 
+					// changing from data not loaded to data loaded:
 					// - when SFB triggers search
 					oState.oSmartFilterbar.attachSearch(fnSetDataShown.bind(null, true, fnHandler));
 
@@ -281,7 +281,7 @@ sap.ui.define([
 				}
 			};
 		}
-		
+
 		var oDataLoadedWrapper = fnGetDataLoadedWrapper();
 		aControlStateWrappers.push(oDataLoadedWrapper);
 //		oDataLoadedWrapper.attachStateChanged(changeIappState);
@@ -390,7 +390,7 @@ sap.ui.define([
 			if (Device.system.phone) {
 				collapseHeader();
 			}
-			// Ideally, oDataLoadedWrapper should ensure to keep its state correct. However, currently we have no means to attach to the command - i.e. oDataLoadedWrapper only 
+			// Ideally, oDataLoadedWrapper should ensure to keep its state correct. However, currently we have no means to attach to the command - i.e. oDataLoadedWrapper only
 			// attaches to SFB's search event, which is only triggered when user presses the go button. When keyboard shortcut is used instead, this handler would be called (as it
 			// is attached to the command), but SFB's search event would not be triggered. As workaround, we additionally set data loaded state to true here and inform explicitly
 			// the the state has changed.
@@ -434,7 +434,7 @@ sap.ui.define([
 				}
 			}
 		}
-		
+
 		/*
 			This method is called when an LR app is the target of an external navigation and the XAppState data contains a presentationVariant.
 			The sorting from this presentationVariant is then applied to the table.
@@ -454,13 +454,13 @@ sap.ui.define([
 			fnAdaptOtherControlsToAppState(oAppData.controlStates);
 			if (areDataShownInTable()){
 				// fnAdaptOtherControlsToAppState only (synchronously) sets the state including the information whether data should be loaded - if this is the case, the actual loading
-				// (which happens asynchronous of course) still needs to be triggered 
+				// (which happens asynchronous of course) still needs to be triggered
 				loadData();
 			} else {
 				// hide placeholder already here, if no data is to be loaded - in case data is loaded, it will be hidden in data received event
 				oTemplateUtils.oComponentUtils.hidePlaceholder();
-			} 
-			
+			}
+
 			// special case: when restoring an old app state with data loaded, but in the meantime a filter not set in that state has been changed to mandatory, SFB.search would not
 			// trigger a request (but instead only mark that filter) - thus hiding placeholder now to avoid it to stay forever
 			// TODO: refactor: Still in that case our internal data shows data are loaded - ideally, that should not be the case
@@ -597,7 +597,7 @@ sap.ui.define([
 
 		function fnAdaptToAppStateStartUpWithParameters(oAppData, oURLParameters, sPreferredQuickVariantSelectionKey){
 			handleVariantIdPassedViaURLParams(oURLParameters);
-			
+
 			var oSFBUiState = oState.oSmartFilterbar.getUiState();
 			var oSFBSemanticDates = oSFBUiState.getSemanticDates();
 			//oStartupObject to be passed to the extension where urlParameters and selectedQuickVariantSelectionKey are optional
@@ -760,23 +760,24 @@ sap.ui.define([
 			default:
 				throw new FeError(sClassName, "Invalid navigation type: " + sNavType);
 			}
-			
+
 			// common to all startup cases (except iAppState)
 			if (areDataShownInTable()){
 				// trigger search if needed
 				oState.oSmartFilterbar.search();
-				// For desktop devices, expand the header for Standard and Custom variants and for tablet and mobile devices, 
+				// 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);
 				} else {
 					collapseHeader();
 				}
-			} else {
-				// if no data are loaded, place holder has to be hidden now - otherwise it will be hidden when data is received 
+			}
+			if (!areDataShownInTable() || Object.keys(oState.oSmartFilterbar.verifySearchAllowed()).length > 0) {
+				// if no data are loaded or search is not allowed, place holder has to be hidden now - otherwise it will be hidden when data is received
 				oTemplateUtils.oComponentUtils.hidePlaceholder();
 			}
-			
+
 			// ensure first iAppState is created
 			changeIappState();
 		}
@@ -977,14 +978,14 @@ sap.ui.define([
 		}
 
 		// provide data load settings including defaulting
-		// ideally, this should be implemented in a generic way in template assembler, so that generated getters also return default values for objects if not explicitely set in 
+		// ideally, this should be implemented in a generic way in template assembler, so that generated getters also return default values for objects if not explicitely set in
 		// manifest (i.e. it should be sufficient to define the default in component - no need to individually implement defaulting!)
 		function getDataLoadSettings(){
 			// general default
 			var oDefaultDataLoadSettings = {loadDataOnAppLaunch: "ifAnyFilterExist"};
 
 			// intension is boolean, but unfortunately faulty values are (historically) not treated consistently
-			var bEnableAutoBindingMultiViews = oState.oMultipleViewsHandler.getOriginalEnableAutoBinding(); 
+			var bEnableAutoBindingMultiViews = oState.oMultipleViewsHandler.getOriginalEnableAutoBinding();
 
 			// if multiple views settings is not defined (also the case in single views case), general default is taken. Unlike other faulty values, null is treated like undefined
 			if (bEnableAutoBindingMultiViews !== undefined && bEnableAutoBindingMultiViews !== null){
@@ -994,13 +995,13 @@ sap.ui.define([
 
 			var oManifestDataLoadSettings = oController.getOwnerComponent().getDataLoadSettings();
 			// (historically) explicit setting empty string (not an allowed value according to definition in component!) is treated like undefined (including adopting multiple views
-			// settings. Other not allowed values (any other sting) were ignored, i.e. returning undefined from getInitialLoadBehaviourSettings, thus setting undefined to 
-			// oSmartVariantManagement.setExecuteOnStandard (which actually only sets the default) and finally using the value returned from 
+			// settings. Other not allowed values (any other sting) were ignored, i.e. returning undefined from getInitialLoadBehaviourSettings, thus setting undefined to
+			// oSmartVariantManagement.setExecuteOnStandard (which actually only sets the default) and finally using the value returned from
 			// oSmartVariantManagement.getExecuteOnStandard (only different from overall default (false), if user has explicitly set it)
 			if (oManifestDataLoadSettings && oManifestDataLoadSettings.loadDataOnAppLaunch === ""){
 				oManifestDataLoadSettings.loadDataOnAppLaunch = undefined;
 			}
-			
+
 			// explicit setting has highest priority
 			return extend(oDefaultDataLoadSettings, oManifestDataLoadSettings);
 		}
@@ -1009,7 +1010,7 @@ sap.ui.define([
 		// - sets default value for flag whether standard variant should be execute on select
 		// - determines whether we actually should load data
 		function applyInitialLoadBehavior(bDataLoadCausedByNavigation){
-			// cases definitely determining to load data initially 
+			// cases definitely determining to load data initially
 			// - worklist
 			// - livemode
 			// - master detail (i.e. bLoadListAndFirstEntryOnStartup is set)
@@ -1018,17 +1019,17 @@ sap.ui.define([
 
 			var sLoadBehaviour = getDataLoadSettings().loadDataOnAppLaunch;
 			if (!oSmartVariantManagement || oController.getOwnerComponent().getVariantManagementHidden()){
-				// No VM -> 
+				// No VM ->
 				bShouldDataBeLoaded = bShouldDataBeLoaded || sLoadBehaviour === "always";
 				bShouldDataBeLoaded = bShouldDataBeLoaded || (sLoadBehaviour === "ifAnyFilterExist" && oSmartFilterbar.getFiltersWithValues().length > 0);
 				// behavior of last patch set would translate to the following - seems not to be correct (in case of setting ifAnyFilterExist but no filters provided)
 				//				bShouldDataBeLoaded = bShouldDataBeLoaded || sLoadBehaviour !== "never";
 			} else {
-				// in case of a (visible) SVM, we need to set the default value 
-				// default value for standard variant 
+				// in case of a (visible) SVM, we need to set the default value
+				// default value for standard variant
 				// - true if one of the conditions above is fulfilled
-				// - or for any manifest setting but "never" 
-				//		(Remark: "ifAnyFilterExist" leads to mark the standard variant true, even if no filter is provided - this looks ok for startup, as the text shown to the user 
+				// - or for any manifest setting but "never"
+				//		(Remark: "ifAnyFilterExist" leads to mark the standard variant true, even if no filter is provided - this looks ok for startup, as the text shown to the user
 				//		contains the condition, but if reselecting the standard variant, it  will also select without filters!
 				//		TODO: check, how to solve that inconsistency)
 				// - but in both cases not, if a mandatory filter is missing

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

@@ -41,7 +41,7 @@ MESSAGE_SINGLE_VALUE_L_FORM=O filtro "{0}" n\u00E3o \u00E9 relevante para a fich
 
 MESSAGE_SINGLE_VALUE_S_FORM=N\u00E3o \u00E9 poss\u00EDvel filtrar por "{0}" na ficha "{1}".
 
-MULTI_EDIT=Processar
+MULTI_EDIT=Editar
 
 MULTI_EDIT_DIALOG_TITLE=Editar ({0})
 

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

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

@@ -89,18 +89,26 @@ sap.ui.define([
 
 						var oLinksDeferred;
 						var bHasRelatedAppSettings = oRelatedAppsSettings && Object.keys(oRelatedAppsSettings).length > 0;
+					
 						if (bHasRelatedAppSettings) {
-							var aSemanticObjects = [[{
-								semanticObject: sCurrentSemObj
-							}]];
+							const oSemanticObjectSet = new Set();
+						   // Add the current semantic object into the set
+							oSemanticObjectSet.add(sCurrentSemObj);
 
-							for (var sKey in oRelatedAppsSettings) {
-								if (sKey) {
-									aSemanticObjects.push([{
-										semanticObject: oRelatedAppsSettings[sKey].semanticObject
-									}]);
+							// Iterate through oRelatedAppSettings and add all related apps into the set
+							for (const sKey in oRelatedAppsSettings) {
+								if (sKey && oRelatedAppsSettings.hasOwnProperty(sKey)) {
+									const sSemanticObject = oRelatedAppsSettings[sKey].semanticObject;
+									oSemanticObjectSet.add(sSemanticObject); // Set will handle duplicates
 								}
 							}
+							// 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
 							oLinksDeferred = oXApplNavigation.getLinks(aSemanticObjects);
 						} else {
 							var oAppComponent = oController.getOwnerComponent().getAppComponent();

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

@@ -25,7 +25,7 @@ sap.ui.define([
 						return accBlock;
 					}, [])
 					.forEach(function(entry) {
-						if (!oSubSectionInfoObject) {
+						if (!oSubSectionInfoObject || (entry.getGroups().length === 1 && entry.getGroups()[0].getTitle && !entry.getGroups()[0].getTitle())) {
 							// Case: header is editable. manifest.json, editableHeaderContent=true
 							var sInvisibleTextID = `${entry.getId()}-ariaLabelBy-InvisibleText`,
 								oInvisibleText = Element.getElementById(sInvisibleTextID);

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

@@ -142,7 +142,7 @@ CREATE_DIALOG_TITLE=Item novo
 
 DELETE_WITH_OBJECTINFO=Eliminar este objeto ({1} {2})?
 
-DELETE_WITH_OBJECTTITLE=Eliminar objeto {0}?
+DELETE_WITH_OBJECTTITLE=Excluir objeto {0}?
 
 SHOW_SIDE_CONTENT=Exibir detalhes
 

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

@@ -182,8 +182,8 @@ ENTER_MANDATORY=Nh\u00E2\u0323p gia\u0301 tri\u0323 cho tr\u01B0\u01A1\u0300ng {
 
 REQUIRED_PROP_ERROR=Nh\u1EADp gi\u00E1 tr\u1ECB.
 
-REQUIRED_PROP_COLUMN_HIDDEN_ERROR=Ba\u0309ng ch\u01B0\u0301a l\u00F4\u0303i. {0} la\u0300 gi\u00E1 tr\u1ECB b\u0103\u0301t bu\u00F4\u0323c nh\u01B0ng kh\u00F4ng \u0111\u01B0\u01A1\u0323c hi\u00EA\u0309n thi\u0323 trong ba\u0309ng. Vui lo\u0300ng th\u00EAm gi\u00E1 tr\u1ECB trong thi\u00EA\u0301t l\u00E2\u0323p ba\u0309ng.
-REQUIRED_PROP_COLUMN_HIDDEN_ERROR_PLURAL=Ba\u0309ng ch\u01B0\u0301a l\u00F4\u0303i. {0} la\u0300 gi\u00E1 tr\u1ECB b\u0103\u0301t bu\u00F4\u0323c nh\u01B0ng kh\u00F4ng \u0111\u01B0\u01A1\u0323c hi\u00EA\u0309n thi\u0323 trong ba\u0309ng. Vui lo\u0300ng th\u00EAm gi\u00E1 tr\u1ECB trong thi\u00EA\u0301t l\u00E2\u0323p ba\u0309ng.
+REQUIRED_PROP_COLUMN_HIDDEN_ERROR=Ba\u0309ng ch\u01B0\u0301a l\u00F4\u0303i. {0} la\u0300 gi\u00E1 tr\u1ECB b\u0103\u0301t bu\u00F4\u0323c nh\u01B0ng kh\u00F4ng \u0111\u01B0\u01A1\u0323c hi\u00EA\u0309n thi\u0323 trong ba\u0309ng. Vui lo\u0300ng th\u00EAm gi\u00E1 tr\u1ECB trong thi\u00EA\u0301t l\u00E2\u0323p m\u00E0n h\u00ECnh.
+REQUIRED_PROP_COLUMN_HIDDEN_ERROR_PLURAL=Ba\u0309ng ch\u01B0\u0301a l\u00F4\u0303i. {0} la\u0300 gi\u00E1 tr\u1ECB b\u0103\u0301t bu\u00F4\u0323c nh\u01B0ng kh\u00F4ng \u0111\u01B0\u01A1\u0323c hi\u00EA\u0309n thi\u0323 trong ba\u0309ng. Vui lo\u0300ng th\u00EAm gi\u00E1 tr\u1ECB trong thi\u00EA\u0301t l\u00E2\u0323p m\u00E0n h\u00ECnh.
 
 T_PAGINATOR_CONTROL_PAGINATOR_TOOLTIP_UP=Mu\u0323c tr\u01B0\u01A1\u0301c
 

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

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

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

@@ -159,7 +159,7 @@ sap.ui.define([
 					// Currently, we keep it here, as we use fnNormalizeSections on all levels (-> should be split, targetAnnotation only needed on block level)
 					oBlock.targetAnnotation = fnGetTargetAnnotation(oMetaModel.getContext(sPath + "/" + i));
 					// if facet annotation is inconsistent, targetAnnotation would be undefined. Keep it here anyway, as extension might refer to it
-	
+					fnProcessPresentationVariant(oBlock);
 					var oSubSection;
 	
 					switch (iLevel) {
@@ -201,6 +201,35 @@ sap.ui.define([
 			});
 			return aResult;
 		}
+
+		function fnProcessPresentationVariant(oBlock) {
+			if (!oBlock.annotations.Facet.annotation.Target
+				|| !oBlock.annotations.Facet.annotation.Target.AnnotationPath
+				|| oBlock.annotations.Facet.annotation.Target.AnnotationPath.indexOf('com.sap.vocabularies.UI.v1.PresentationVariant') < 0) {
+				return;
+			}
+			// PresentationVariant detected. Try to find LineItem and get it's target annotations
+			var sTargetAnnotationTerm = oBlock.annotations.Facet.annotation.Target && oBlock.annotations.Facet.annotation.Target.AnnotationPath && oBlock.annotations.Facet.annotation.Target.AnnotationPath.split("@")[1],
+				sEntitySetName = oMetaModel.getObject(AHModel.gotoEntitySet(oMetaModel.getContext(oBlock.metaModelPath + "/Target"))).name,
+				oEntitySet = oMetaModel.getODataEntitySet(sEntitySetName),
+				oEntityType = oMetaModel.getODataEntityType(oEntitySet.entityType);
+			if (!oEntityType[sTargetAnnotationTerm]
+				|| !oEntityType[sTargetAnnotationTerm].Visualizations
+				|| !oEntityType[sTargetAnnotationTerm].Visualizations.length
+				|| !oEntityType[sTargetAnnotationTerm].Visualizations[0]
+				|| !oEntityType[sTargetAnnotationTerm].Visualizations[0].AnnotationPath
+				|| oEntityType[sTargetAnnotationTerm].Visualizations[0].AnnotationPath.indexOf('com.sap.vocabularies.UI.v1.LineItem') < 0) {
+				return;
+			}
+			// We have LineItem in Visualizations
+			// check if it's exist in Entity annotation and set it's content in oBlock.targetAnnotation for further processing
+			var sLineItemAnnotation = oEntityType[sTargetAnnotationTerm].Visualizations[0].AnnotationPath.split("@")[1];
+			if (!oEntityType[sLineItemAnnotation]) {
+				return;
+			}
+			oBlock.temporaryData.presentationVariantHasLineItem = true;
+			oBlock.targetAnnotation = oEntityType[sLineItemAnnotation];
+		}
 	
 		var mTargetEntities = {};
 		function fnSetTargetEntity(oEntitySet, oSettings) {
@@ -233,6 +262,75 @@ sap.ui.define([
 			}
 		}
 
+		/**
+		 * Retrieve LineItem qualifier for black table.
+		 * For LineItem - get qualifier from LineItem annotation
+		 * For PresentationVariant - get LineItem from Visualizations
+		 * @param {*} oSettings  block settings
+		 * @param {*} sEntitySet current block entity set
+		 * @returns {string} LineItem qualifier for the table
+		 */
+		function fnGetLineItemQualifier(oSettings, sEntitySet) {
+			if (!oSettings.annotations.Facet.annotation.Target
+				|| !oSettings.annotations.Facet.annotation.Target.AnnotationPath) {
+				return "";
+			}
+			var sLineItem = "";
+			if (oSettings.annotations.Facet.annotation.Target.AnnotationPath.indexOf('com.sap.vocabularies.UI.v1.LineItem') >= 0) {
+				sLineItem = oSettings.annotations.Facet.annotation.Target.AnnotationPath;
+			} else if (oSettings.annotations.Facet.annotation.Target.AnnotationPath.indexOf('com.sap.vocabularies.UI.v1.PresentationVariant') >= 0) {
+				var sTargetAnnotationTerm = oSettings.annotations.Facet.annotation.Target.AnnotationPath.split("@")[1],
+					oEntitySet = oMetaModel.getODataEntitySet(sEntitySet),
+					oEntityType = oMetaModel.getODataEntityType(oEntitySet.entityType);
+					if (!oEntityType[sTargetAnnotationTerm]
+						|| !oEntityType[sTargetAnnotationTerm].Visualizations
+						|| !oEntityType[sTargetAnnotationTerm].Visualizations.length
+						|| !oEntityType[sTargetAnnotationTerm].Visualizations[0]
+						|| !oEntityType[sTargetAnnotationTerm].Visualizations[0].AnnotationPath
+						|| oEntityType[sTargetAnnotationTerm].Visualizations[0].AnnotationPath.indexOf('com.sap.vocabularies.UI.v1.LineItem') < 0) {
+						return "";
+					}
+				sLineItem = oEntityType[sTargetAnnotationTerm].Visualizations[0].AnnotationPath;
+			}
+			if (!sLineItem) {
+				return "";
+			}
+			var aLineItemParts = sLineItem.split("#");
+			if (aLineItemParts.length !== 2) {
+				return "";
+			}
+			return aLineItemParts[1];
+		}
+
+		/**
+		 * Retrieve sort order information for specific table
+		 * @param {*} oSettings  block settings
+		 * @param {*} sEntitySet current block entity set
+		 * @returns {string} sort order information from com.sap.vocabularies.UI.v1.PresentationVariant
+		 */
+		function fnGetLineItemSortOrder(oSettings, sEntitySet) {
+			if (!oSettings.annotations.Facet.annotation.Target
+				|| !oSettings.annotations.Facet.annotation.Target.AnnotationPath) {
+				return "";
+			}
+			// Default PresentationVariant to use to get sorting information
+			var sPresentationVariant = "com.sap.vocabularies.UI.v1.PresentationVariant";
+			if (oSettings.annotations.Facet.annotation.Target.AnnotationPath.indexOf('com.sap.vocabularies.UI.v1.PresentationVariant') >= 0) {
+				// Override default variant with value from facet
+				sPresentationVariant = oSettings.annotations.Facet.annotation.Target.AnnotationPath.split("@")[1];
+			}
+			var oEntitySet = oMetaModel.getODataEntitySet(sEntitySet),
+				oEntityType = oMetaModel.getODataEntityType(oEntitySet.entityType);
+			if (!oEntityType[sPresentationVariant]
+				|| !oEntityType[sPresentationVariant].SortOrder
+				|| !oEntityType[sPresentationVariant].SortOrder.length
+			) {
+				// PresentationVariant is missing in EntityType or there is no sorting order information
+				return "";
+			}
+			return AnnotationHelper.getSortOrder(oEntityType[sPresentationVariant].SortOrder);
+		}
+
 		function fnGetNormalizedTableSettings(oSettings) {
 			function fnGetTableLevelStandardActions() {
 				/*  Collection of standard actions available on OP at table level. Maps the logical action name to an object containing the relevant properties i.e.
@@ -344,6 +442,8 @@ sap.ui.define([
 
 			oResult.commandExecution = fnGetTableLevelStandardActions();
 			oResult.persistencyKeyState = fnGetPersistencyKeyState(oSettings.tableSettings);
+			oResult.lineItemQualifier = fnGetLineItemQualifier(oSettings, sEntitySet);
+			oResult.lineItemSortOrder = fnGetLineItemSortOrder(oSettings, sEntitySet);
 
 			return oResult;
 		}
@@ -777,6 +877,13 @@ sap.ui.define([
 			case "com.sap.vocabularies.UI.v1.LineItem":
 				oBlockData.additionalData.type = "SmartTable";
 				break;
+			case "com.sap.vocabularies.UI.v1.PresentationVariant":
+				if (oBlockData.temporaryData.presentationVariantHasLineItem) {
+					// PresentationVariant have valid LineItem in it. Set block type to SmartTable
+					// It will trigger all necessary code for block configuration
+					oBlockData.additionalData.type = "SmartTable";
+				}
+				break;
 			case "com.sap.vocabularies.UI.v1.Chart":
 				oBlockData.additionalData.type = "SmartChart";
 				break;

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

@@ -16,17 +16,21 @@
 				-->
 				<template:if test="{path: 'facet>Target', formatter: 'AHModel.isMultiple'}">
 					<template:then>
-						<template:if test="{=${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.UI.v1.LineItem') > -1}">
-							<template:then>
-								<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.SmartTable" type="XML"/>
-							</template:then>
-							<template:elseif test="{=${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.Communication.v1.Contact') > -1}">
-								<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.Contacts" type="XML"/>
-							</template:elseif>
-							<template:elseif test="{=${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.UI.v1.Chart') > -1}">
-								<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.SmartChart" type="XML" />
-							</template:elseif>
-						</template:if>
+						<template:with path="facet>Target" helper="AHModel.gotoEntitySet" var="listEntitySet">
+							<template:with path="listEntitySet>entityType" helper="AHModel.gotoEntityType" var="listEntityType">
+								<template:if test="{parts:[{path: 'facet>Target/AnnotationPath'}, {path: 'listEntityType>'}], formatter: 'AH.checkFacetHasLineItemAnnotations'}">
+									<template:then>
+										<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.SmartTable" type="XML"/>
+									</template:then>
+									<template:elseif test="{=${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.Communication.v1.Contact') > -1}">
+										<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.Contacts" type="XML"/>
+									</template:elseif>
+									<template:elseif test="{=${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.UI.v1.Chart') > -1}">
+										<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.SmartChart" type="XML" />
+									</template:elseif>
+								</template:if>
+							</template:with>
+						</template:with>
 					</template:then>
 					<template:elseif test="{= ${facet>RecordType}.indexOf('com.sap.vocabularies.UI.v1.CollectionFacet') > -1 ||
 												(${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.UI.v1.FieldGroup') > -1

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

@@ -21,7 +21,7 @@
 			<core:CustomData key="defaultDropDownDisplayBehaviour" value="descriptionOnly" />
 			<core:CustomData key="defaultTextInEditModeSource" value="ValueListNoValidation" />
 			<core:CustomData key="dateFormatSettings" value='\{"UTC":true,"style":"medium"\}' />
-			<core:CustomData key="smartFormAriaLabel" value="{parts: [{path: 'facet>'}, {path: 'entitySet>name'}], formatter: 'AH.getSmartFormTitle'}" />
+			<core:CustomData key="smartFormAriaLabel" value="{parts: [{path: 'facet>'}, {path: 'entitySet>name'},  {path: 'block>'}, {path: 'subSectionData>'}], formatter: 'AH.getSmartFormTitle'}" />
 		</sfo:customData>
 		<sfo:layout>
 			<template:if test="{= ${appSettings>/useColumnLayoutForSmartForm} !== false}">

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

@@ -8,7 +8,7 @@
 	<template:with path="facet>Target" var="target">
 		<template:with path="target>" helper="AHModel.gotoEntitySet" var="listEntitySet">
 			<template:with path="listEntitySet>entityType" helper="AHModel.gotoEntityType" var="listEntityType">
-				<template:with path="target>" helper="AHModel.resolvePath" var="collection">
+				<template:with path="target>" helper="AH.getListItemCollection" var="collection">
 					<template:with path="listEntityType>com.sap.vocabularies.UI.v1.HeaderInfo" var="header">
 						<template:with path="parameter>/" helper="sap.suite.ui.generic.template.js.StableIdHelper.preparePathForStableId" var="smartControlId">
 							<template:with path="parameter>/" helper="sap.suite.ui.generic.template.js.StableIdHelper.preparePathForStableId" var="facetId">
@@ -56,18 +56,14 @@
 										<core:CustomData key="useSmartField" value="true" />
 										<core:CustomData key="dateFormatSettings"
 											value='\{"UTC":true,"style":"medium"\}' />
-										<template:if test="{= ${facet>Target/AnnotationPath}.split('#')[1]}">
+										<template:if test="{= ${objectPageTableSettings>value/lineItemQualifier}}">
 											<core:CustomData key="lineItemQualifier"
-												value="{= ${facet>Target/AnnotationPath}.split('#')[1]}" />
+												value="{= ${objectPageTableSettings>value/lineItemQualifier}}" />
+										</template:if>
+										<template:if test="{= ${objectPageTableSettings>value/lineItemSortOrder}}">
+											<core:CustomData key="TemplateSortOrder"
+												value="{= ${objectPageTableSettings>value/lineItemSortOrder}}" />
 										</template:if>
-										<template:with
-											path="listEntityType>com.sap.vocabularies.UI.v1.PresentationVariant"
-											var="variant">
-											<template:if test="{= ${variant>SortOrder}}">
-												<core:CustomData key="TemplateSortOrder"
-													value="{path: 'variant>SortOrder', formatter: 'AH.getSortOrder'}" />
-											</template:if>
-										</template:with>
 									</st:customData>
 									<st:semanticObjectController>
 										<!-- Fragment SemanticObjectControllerForDataField uses variable 'entitySet to address the entoty set. Currently entitySet points to the entity set of whole OP. Reset pointer to the entity set of the table.-->

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

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.120.33"
+			"version": "1.120.35"
 		},
 		"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.120.33"
+		"version": "1.120.35"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

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

@@ -193,6 +193,19 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		}
 	}
 
+	var getLineItemAnnotationFromPresentationVariant = function(oPresentationVariant) {
+		if (!oPresentationVariant
+			|| !oPresentationVariant.Visualizations
+			|| !oPresentationVariant.Visualizations.length
+			|| !oPresentationVariant.Visualizations[0].AnnotationPath
+			// First entry in Visualizations should be 'com.sap.vocabularies.UI.v1.LineItem'
+			|| oPresentationVariant.Visualizations[0].AnnotationPath.indexOf('com.sap.vocabularies.UI.v1.LineItem') < 0
+		) {
+			return undefined;
+		}
+		return oPresentationVariant.Visualizations[0].AnnotationPath;
+	};
+
 	var oAnnotationHelper = {
 		formatMessage: formatMessage,
 		getNewVariable: function (oContext){
@@ -4105,6 +4118,50 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			}
 		},
 
+		checkFacetHasLineItemAnnotations: function(annotationPath, listEntityType) {
+			if (!annotationPath) {
+				return false;
+			}
+			if (annotationPath.indexOf('com.sap.vocabularies.UI.v1.LineItem') > -1) {
+				return true;
+			}
+			if (annotationPath.indexOf('com.sap.vocabularies.UI.v1.PresentationVariant') > -1) {
+				var aPresentationVariantAnnotations = annotationPath.split("/@");
+				if (aPresentationVariantAnnotations.length < 2) {
+					return false;
+				}
+				if (!listEntityType
+					|| !getLineItemAnnotationFromPresentationVariant(listEntityType[aPresentationVariantAnnotations[1]])) {
+						return false;
+				}
+				return true;
+			}
+			return false;
+		},
+
+		getListItemCollection: function(target) {
+			if (!target) {
+				return target;
+			}
+			var oTarget = target.getObject();
+			if (!oTarget || !oTarget.AnnotationPath) {
+				return target;
+			}
+			if (oTarget.AnnotationPath.indexOf('com.sap.vocabularies.UI.v1.LineItem') >= 0) {
+				return AnnotationHelperModel.resolvePath(target);
+			}
+			if (oTarget.AnnotationPath.indexOf('com.sap.vocabularies.UI.v1.PresentationVariant') >= 0) {
+				var oPresentationVariant = target.getProperty(AnnotationHelperModel.resolvePath(target)),
+					sLineItem = getLineItemAnnotationFromPresentationVariant(oPresentationVariant);
+				if (!sLineItem || sLineItem.indexOf('@') !== 0) {
+					return target;
+				}
+				var oEntityType = target.getModel().getODataEntityType(target.getProperty(AnnotationHelperModel.gotoEntitySet(target)).entityType);
+				return oEntityType.$path + "/" + sLineItem.slice(1);
+			}
+			return target;
+		},
+
 		getSaveAndNextButtonVisibility: function(oManifest) {
 			var sEditFlow = oManifest["sap.ui.generic.app"].pages[0].component.settings && oManifest["sap.ui.generic.app"].pages[0].component.settings.editFlow;
 			if (sEditFlow === "direct") {
@@ -4286,10 +4343,31 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			};
 		},
 
-		getSmartFormTitle: function(oInterface, oFacet, sEntitySetName) {
+		getSmartFormTitle: function(oInterface, oFacet, sEntitySetName, oBlock, oSubSectionData) {
 			if (!oFacet) {
+				return oAnnotationHelper.getTitleForSectionsForms(oBlock, oSubSectionData);
+			}
+			return oAnnotationHelper.getTitleForHeaderForm(oInterface, oFacet, sEntitySetName);
+		},
+
+		getTitleForSectionsForms: function(oBlock, oSubSectionData) {
+			if (oSubSectionData?.annotations?.Facet?.annotation?.Facets?.length > 1
+				|| oSubSectionData?.annotations?.Facet?.annotation?.Label?.String !== oBlock?.aggregations?.groups[0]?.annotations?.Facet?.annotation?.Label?.String
+			) {
+				// In case Section -> SubSection have more than one form, SmartForm will have it's titles visible
+				// or
+				// SubSectin title !== SmartForm title, SmartForm title will also be visible
 				return;
 			}
+			if (oBlock?.aggregations?.groups[0]?.annotations?.Facet?.annotation?.Label?.String !==  oBlock?.aggregations?.groups[0]?.targetAnnotation?.Label?.String) {
+				// Compare SmartForm title !== FiledGroup title
+				// if they differs -> use FiledGoup title
+				return oBlock?.aggregations?.groups[0]?.targetAnnotation?.Label?.String;
+			}
+			return;
+		},
+
+		getTitleForHeaderForm: function(oInterface, oFacet, sEntitySetName) {
 			if (oFacet.Target && oFacet.Target.AnnotationPath && oFacet.Target.AnnotationPath.indexOf("com.sap.vocabularies.UI.v1.DataPoint") > -1) {
 				// Process DataPoint case
 				var { sAnnotationPath, oEntityType } = oAnnotationHelper.getModelData(oInterface, oFacet.Target.AnnotationPath, sEntitySetName);

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

@@ -922,7 +922,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.UIComponent
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.120.33
+	 * @version 1.120.35
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	return UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {

package/src/sap/suite/ui/generic/template/lib/i18n/i18n_da.properties

@@ -37,7 +37,7 @@ DATA_LOSS_DISCARD_CHANGES=Kass\u00E9r \u00E6ndringer
 
 ST_KEEP_DRAFT_BTN=Behold udkast
 
-ST_DISCARD_DRAFT_BTN=Kass\u00E9r udkast
+ST_DISCARD_DRAFT_BTN=Kasser udkast
 
 ST_UNSAVED_CHANGES_TITLE=Ikkegemte \u00E6ndringer
 

package/src/sap/suite/ui/generic/template/lib/i18n/i18n_pt.properties

@@ -237,7 +237,7 @@ ST_GENERIC_DELETE_SELECTED=Eliminar este objeto?
 
 DELETE_WITH_OBJECTINFO=Eliminar este objeto ({1} {2})?
 
-DELETE_WITH_OBJECTTITLE=Eliminar objeto {0}?
+DELETE_WITH_OBJECTTITLE=Excluir objeto {0}?
 
 ST_GENERIC_OBJECT_DELETED=O objeto foi exclu\u00EDdo.
 

package/src/sap/suite/ui/generic/template/lib/navigation/NavigationController.js

@@ -3089,7 +3089,7 @@ sap.ui.define(["sap/ui/base/Object",
 	 * @param {sap.suite.ui.generic.template.lib.AppComponent} oAppComponent The AppComponent instance
 	 * @public
 	 * @extends sap.ui.base.Object
-	 * @version 1.120.33
+	 * @version 1.120.35
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

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

@@ -60,7 +60,7 @@ sap.ui.define([
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.120.33",
+		version: "1.120.35",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {