@sapui5/sap.suite.ui.generic.template 1.133.0 → 1.134.1

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

@@ -18,10 +18,10 @@ sap.ui.define([
 
 	/* This method returns an object with the following properties:
 	 * 	sections: See method fnGetSections for description
-	 * 	...: todo 
+	 * 	...: todo
 	*/
 	function fnGetTemplateSpecificParameters(oComponentUtils, oMetaModel, oOriginalSettings, oDevice, sLeadingEntitySet, oInternalManifest) {
-		
+
 		function fnGetAnnotationWithDefaults(sAnnotationName, oAnnotation) {
 			// Provide optional properties of annotation with defaults according to vocabulary
 			// should best be done in metaModel itself
@@ -42,7 +42,7 @@ sap.ui.define([
 			}
 			return oResult;
 		}
-	
+
 		function fnGetTargetAnnotation(oReferenceFacetContext) {
 			if (!oReferenceFacetContext.getObject().Target) {
 				// clarify how to deal with reference facet without target
@@ -51,7 +51,7 @@ sap.ui.define([
 			var sMetaModelPath = AHModel.resolvePath(oMetaModel.getContext(oReferenceFacetContext.sPath + "/Target"));
 			return sMetaModelPath && oMetaModel.getContext(sMetaModelPath).getObject();
 		}
-	
+
 		function fnEnsureSectionAsSubsection(oSection){
 			// ensures, that the Section has a SubSection pointing to the same annotation and with the same data, except:
 			// - the subSection should not contain subSections again
@@ -60,7 +60,7 @@ sap.ui.define([
 			// - referenceFacet on 2nd level (subSection should be created referring to the collectionFacet on top level)
 			// - empty collectionFacet on top level, that should be replaced with ReplaceFacet extension (although this is rather
 			//   replacing the whole section, we expect the extension not to contain a subSection, but we create the subSection)
-	
+
 			oSection.subSections = oSection.subSections || [];
 			// if subSection already exists, do nothing
 			if (oSection.subSections.find(function(oSubSection){
@@ -68,13 +68,13 @@ sap.ui.define([
 			})) {
 				return;
 			}
-	
+
 			var oSubSection = extend({}, oSection);
 			delete oSubSection.subSections;
 			oSubSection.blocks = [];
 			oSection.subSections.push(oSubSection);
 		}
-	
+
 		var iMissingIdCounter = 0;
 		function fnGetSectionsFromAnnotations(sPath, bHeaderFacet, iLevel, oParentFacet) {
 			// Analysis of facets. Needs to be tolerant, as sometimes facets are defined in a way that seems to be meaningless,
@@ -114,12 +114,12 @@ sap.ui.define([
 						},
 						metaModelPath: sPath + "/" + i
 				};
-	
+
 				// as intermediate step provide id also as an object with property id to simplify switching from generating facetId during templating
 				oFacetCurrentLevel.facetIdAsObject = {
-						id: oFacetCurrentLevel.additionalData.facetId 
+						id: oFacetCurrentLevel.additionalData.facetId
 				};
-	
+
 				// Note: fallbackIdByEnumerationForRuntime is not guaranteed to be stable, even from one session to the other, so don't use it in the view (as in
 				// view cache it would be kept, but in next session, a different one could be created). In fact, as this class is static, the missingIdCounter is shared
 				// between OPs, so depending on the order OP instances are loaded, the ids are different.
@@ -127,7 +127,7 @@ sap.ui.define([
 				// releases, this needs to be changed (either be using separate counters per OP instance, or maybe a completely different approach, e.g. stringifying the corresponding
 				// subObject in metaModel). This might make sense to be able to create all infoObjects upfront, or to get rid of infoObjects completely.
 				oFacetCurrentLevel.fallbackIdByEnumerationForRuntime = oFacetCurrentLevel.additionalData.facetId || "missingStableId#" + iMissingIdCounter++;
-	
+
 				if (oFacet.RecordType === "com.sap.vocabularies.UI.v1.CollectionFacet") {
 					var aNextLevel = fnGetSectionsFromAnnotations(sPath + "/" + i + "/Facets", bHeaderFacet, iLevel + 1, oFacetCurrentLevel);
 					// in case of empty collectionFacet at top level, create also subSection to be used for ReplaceFacet extension
@@ -149,19 +149,20 @@ sap.ui.define([
 						bIsHeaderFacet: bHeaderFacet,
 						sAnnotationPath: oFacet.Target && oFacet.Target.AnnotationPath
 					});
-	
+
 					oFacetCurrentLevel.annotations.Facet.annotation = fnGetAnnotationWithDefaults("com.sap.vocabularies.UI.v1.ReferenceFacet", oFacet);
 					// oBlock describes what is actually build out of the reference facet (except the section/subsection structure). Naming comes from ObjectPageSubSections default aggregation
 					// - think of whether this is the best naming here
 					var oBlock = extend({}, oFacetCurrentLevel);
-	
+
 					// Todo: targetAnnotation is not really needed here (when just analyzing sections structure), but only later, when normalizing specific properties. Thus, it should be moved there.
 					// 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) {
 					case 0:
 						// ignore reference facet with wrong target on first level (compatibility)
@@ -201,12 +202,41 @@ 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) {
 			//Process only if not already processed
 			if (!mTargetEntities[oEntitySet.entityType]) {
-				mTargetEntities[oEntitySet.entityType] = preparationHelper.getTargetEntityForQuickView(oMetaModel, oEntitySet); 
+				mTargetEntities[oEntitySet.entityType] = preparationHelper.getTargetEntityForQuickView(oMetaModel, oEntitySet);
 			}
 		}
 
@@ -214,7 +244,7 @@ sap.ui.define([
 
 		/**
 		 * Returns the persistencyKeyState for a smart control (table/chart) which represents the action which should be taken WRT its persistencyKey property. From
-		 * UI5 v1.109, variant management is enabled (by default) and thus, to avoid the issue of having multiple duplicate implicit variants created by SVM (named as 
+		 * UI5 v1.109, variant management is enabled (by default) and thus, to avoid the issue of having multiple duplicate implicit variants created by SVM (named as
 		 * Personalization), persistencyKey has to be changed in certain scenarios.
 		 * 		New: New persistencyKey required.
 		 * 		Retain: No change required i.e., it will continue to be the id of the smarttable.
@@ -233,6 +263,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.
@@ -247,14 +346,14 @@ sap.ui.define([
 					If a custom action is defined with a valid 'logicalAction', then there could be two cases:
 
 					Case 1: Custom action has an ID
-						In this case, the corresponding standard button does not get created and instead an extension button 
+						In this case, the corresponding standard button does not get created and instead an extension button
 						gets created, which takes over some standard functionality, especially the keyboard shortcut and the following properties:
 							enabled, text, importance, callbackName (if not defined in the manifest)
 
 					Case 2: Custom action does not have an ID
-						Here, the corresponding standard button gets created and takes over everything defined explicitly in the manifest. 
-						
-					In both the cases, isStandardAction is set to false. 
+						Here, the corresponding standard button gets created and takes over everything defined explicitly in the manifest.
+
+					In both the cases, isStandardAction is set to false.
 					TODO: isStandardAction is only used to set different types of CustomData and OverflowToolbarLayoutData in the respective fragments.
 						However, additional CustomData should not harm, and regarding OverflowToolbarLayoutData, importance should always be the default
 						(if not defined otherwise) and so, it should be removed and the places where these CustomData are being consumed should be refactored (if required). */
@@ -281,11 +380,11 @@ sap.ui.define([
 					}
 				};
 			}
-			
+
 			// for ObjectPage, unfortunately an additional settings allTableMultiSelect had been introduced, that just has the same meaning as setting
 			// multiSelect on component level, but needs to be supported for compatibility
 			oSettings.multiSelect = oSettings.multiSelect || oSettings.allTableMultiSelect;
-	
+
 			// tolerance if reference facet points to a not existent navigation property: assume no navigation, i.e. use entityset of page
 			var sTargetMetaModelPath = AHModel.gotoEntitySet(oMetaModel.getContext(oSettings.metaModelPath + "/Target"));
 			var sEntitySet = sTargetMetaModelPath && oMetaModel.getObject(sTargetMetaModelPath).name || sLeadingEntitySet;
@@ -295,7 +394,7 @@ sap.ui.define([
 			var fnGetSearchFieldId = function() {
 				return oSettings.additionalData.facetId + "::Table::Toolbar::SearchField";
 			};
-			
+
 			var oResult = preparationHelper.getNormalizedTableSettings(oMetaModel, oSettings, oDevice, sEntitySet, oExtensionActions, oSettings.targetAnnotation, fnGetSearchFieldId);
 			// By default, variant management is enabled but corresponding manifest settings (if defined) would also be respected
 			oResult.variantManagement = !(oSettings.tableSettings && oSettings.tableSettings.variantManagement) || oSettings.tableSettings.variantManagement;
@@ -315,7 +414,7 @@ sap.ui.define([
 				staticChecksHelper.checkErrorforCreateWithDialog(oMetaModel.getODataEntityType(oEntitySet.entityType), oResult);
 				oResult.createWithParameterDialog.id = StableIdHelper.getStableId({ type: 'ObjectPageAction', subType: 'CreateWithDialog', sFacet: oSettings.additionalData.facetId });
 			}
-	
+
 			// set quickview Target Entity
 			fnSetTargetEntity(oEntitySet);
 
@@ -327,6 +426,8 @@ sap.ui.define([
 			oResult.vShowPasteButton = fnGetPasteButtonVisibility(oEntitySet);
 			oResult.commandExecution = fnGetTableLevelStandardActions();
 			oResult.persistencyKeyState = fnGetPersistencyKeyState(oSettings.tableSettings);
+			oResult.lineItemQualifier = fnGetLineItemQualifier(oSettings, sEntitySet);
+			oResult.lineItemSortOrder = fnGetLineItemSortOrder(oSettings, sEntitySet);
 
 			return oResult;
 		}
@@ -356,7 +457,7 @@ sap.ui.define([
 			if (bAnyBooleanTrue) {
 				return "{ui>/editable}";
 			}
-			
+
 			// Now the remaining cases are either
 			// 1. Both are path expressions or
 			// 2. One path expression and one boolean value "false"
@@ -374,23 +475,23 @@ sap.ui.define([
 		}
 
 		/**
-		 * Checks the navigation restriction on the parent entity set or current entity set 
+		 * Checks the navigation restriction on the parent entity set or current entity set
 		 * and returns the boolean value or path for the restriction
-		 * 
+		 *
 		 * 1. If NavigationRestriction is available on parent entity set
 		 * 	a. Restricted by boolean value - returns the boolean value
 		 *  b. Restricted by path - Checks the data type of path and returns it
-		 * 
+		 *
 		 * 2. If Restriction is available on table's entity set
 		 *  a. Restricted by boolean value - returns the boolean value
 		 *  b. Restricted by path - ignores it
 		 *  Important: Reason for ignoring the path. As path value refers to the individual records on the table, it can't control the whole table's paste functionality
-		 * 
+		 *
 		 * 3. If no restriction available, returns true
-		 * 
+		 *
 		 * @param {object} oEntitySet Table's entity set info
 		 * @param {string} sRestrictionType "Insertable" or "Updatable"
-		 * @returns {boolean|string} Boolean value or path for the restriction 
+		 * @returns {boolean|string} Boolean value or path for the restriction
 		 */
 		function fnGetRestrictionForPaste (oEntitySet, sRestrictionType) {
 			var mAnnotation = {
@@ -425,9 +526,9 @@ sap.ui.define([
 			// If no annotation found, return true
 			return true;
 		}
-		
+
 		// used in the process of determining the visibility of export to excel and paste button depending on certain restrictions/conditions.
-		function fnGetTableToolbarButtonVisibility(oSettings, oEntitySet, sTableType) {	
+		function fnGetTableToolbarButtonVisibility(oSettings, oEntitySet, sTableType) {
 			var oInsertableAnnotation, sEntityType, oSectionInsertRestriction;
 			var sSemantics = oMetaModel.getODataEntityType(oEntitySet.entityType) && oMetaModel.getODataEntityType(oEntitySet.entityType)["sap:semantics"];
 			if (sTableType === 'TreeTable' || (sTableType === 'AnalyticalTable' && sSemantics === "aggregate")) {
@@ -448,21 +549,21 @@ sap.ui.define([
 			if (!oInsertableAnnotation) {
 				return true;
 			}
-	
+
 			// bValidAnnotation is true, if annotation has either Bool or Path property(path must resolve to boolean). bValidAnnotation is false if both Bool & Path exists or both does not exists or Path doesn't resolve to boolean.
 			var bValidAnnotation = oInsertableAnnotation.Bool ? !oInsertableAnnotation.Path : !!(oInsertableAnnotation.Path && AnnotationHelper._isPropertyPathBoolean(oMetaModel, sEntityType, oInsertableAnnotation.Path));
-			
+
 			// if invalid annotation log error in the console
 			if (!bValidAnnotation) {
 				oLogger.error("Service Broken: Restrictions annotations for entity type " + oEntitySet.entityType + " for section Insertable are invalid.");
 			}
-	
+
 			if (oInsertableAnnotation.Bool === "false") {
 				return false;
 			}
 			return bValidAnnotation;
 		}
-	
+
 		function fnGetNormalizedChartSettings(oSettings) {
 			return {
 				// By default, variant management is enabled but corresponding manifest settings (if defined) would also be respected
@@ -471,15 +572,15 @@ sap.ui.define([
 				persistencyKeyState: fnGetPersistencyKeyState(oSettings.chartSettings)
 			};
 		}
-		
+
 		function fnIsAction(oDataField){
 			return oDataField.RecordType === "com.sap.vocabularies.UI.v1.DataFieldForAction" || oDataField.RecordType === "com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation";
 		}
-		
+
 		function fnNegate(fnTest){
 			// expects a function returning a boolean and negates the result - useful for array functions like find or filter, if test function returning the opposite exists
 			// -> can be used like array.find(fnNegate.bind(this, fnTest)) to find the first entry, where fnTest returns false. "this" is not needed here, but passed to fnTest
-			
+
 			// call fnTest with the same arguments except the first one. As arguments is not a real array, we cannot call slice directly.
 			return !fnTest.apply(this, Array.prototype.slice.apply(arguments, [1]));
 		}
@@ -489,22 +590,22 @@ sap.ui.define([
 			// and the id framework generates thus avoid breaking the possibility to define the settings either way.
 			var oMergedSectionSettings = oOriginalSettings.sections &&
 			extend({}, oOriginalSettings.sections[oFacetData.additionalData.facetId], oOriginalSettings.sections[oFacetData.fallbackIdByAnnotationPathForManifest]);
-	
+
 			extend(oFacetData, oMergedSectionSettings, oFacetData);
 
 			// Prio 3: any settings on page level: Maybe only relevant depending on annotation (e.g. tableSettings only relevant for LineItem annotation)
 			// With valid target, the Block is of course relevant.
 			// In case of broken target (i.e. reference facet pointing to non-existent LineItem or chart annotation), it depends on whether the navigation path exists, and qualifies for a table/chart
-			// (that means: last segment has multiplicity *, and all segments before have multiplicity 0..1 or 1). If this is given, we create a SmartTable or SmartChart. As the target is broken, this would 
+			// (that means: last segment has multiplicity *, and all segments before have multiplicity 0..1 or 1). If this is given, we create a SmartTable or SmartChart. As the target is broken, this would
 			// of course not show anything meaningful, but this could be healed by use of extensions (at least in case of SmartTable by column extensions).
 			// Todo:
 			// - check, whether this is really also relevant for smartChart
-			// - check, whether this also relevant for other types (contacts?)			
+			// - check, whether this also relevant for other types (contacts?)
 			if (oFacetData.targetAnnotation || ((oFacetData.additionalData.type === "SmartTable" || oFacetData.additionalData.type === "SmartChart") && AHModel.isMultiple(oMetaModel.getContext(oFacetData.metaModelPath + "/Target")))){
-				var oSettings = deepExtend({}, oOriginalSettings, oFacetData);		
+				var oSettings = deepExtend({}, oOriginalSettings, oFacetData);
 				// specific analysis for anything defined in the annotation a reference facet is referring to
 				// only needed on block level - on sections and subSections level, targetAnnotation is not defined
-		
+
 				switch (oFacetData.additionalData.type) {
 					case "SmartTable":
 						oFacetData.tableSettings = fnGetNormalizedTableSettings(oSettings);
@@ -524,7 +625,7 @@ sap.ui.define([
 				}
 			}
 		}
-	
+
 		function getExtensionSectionAndSubsection(sExtensionPointNamePrefix, oFacetViewExtension) {
 			var oStableIdTypesAndSubTypeForFacetExtensionSectionsAndSubSections = {
 					BeforeFacet: {
@@ -572,19 +673,19 @@ sap.ui.define([
 						}
 					}
 			};
-	
+
 			var oStableIdParameterDefinition = oStableIdTypesAndSubTypeForFacetExtensionSectionsAndSubSections[sExtensionPointNamePrefix][oFacetViewExtension.sKey ? "withKey" : "withoutKey"];
-			
+
 			var oStableIdParameter = extend({}, oStableIdParameterDefinition.section);
 			oStableIdParameter.sEntitySet = oFacetViewExtension.sEntitySet;
 			oStableIdParameter.sFacet = oFacetViewExtension.sFacetId;
 			// in case key is explicitly defined by application, use that one - otherwise use key derived from extension point name (4th part of split by |)
 			oStableIdParameter.sFacetExtensionKey = oFacetViewExtension.oExtensionDefinition.key || oFacetViewExtension.sKey;
 			var sSectionId = StableIdHelper.getStableId(oStableIdParameter);
-			
+
 			oStableIdParameter.type = oStableIdParameterDefinition.subSection.type;
 			oStableIdParameter.subType = oStableIdParameterDefinition.subSection.subType;
-			
+
 			return {
 				id: sSectionId,
 				additionalData: {
@@ -593,7 +694,7 @@ sap.ui.define([
 				extensionPointName: oFacetViewExtension.sExtensionPointName,
 				extensionPointNamePrefix: oFacetViewExtension.sExtensionPointNamePrefix,
 				subSections: [getExtensionSubsection(oFacetViewExtension, oStableIdParameter)]
-			}; 
+			};
 		}
 
 		/**
@@ -604,13 +705,13 @@ sap.ui.define([
 			var oStableIdSubTypeForSubSectionFacetExtension = {
 				ReplaceSubSection: "ReplaceSubSectionExtensionSubSection"
 			};
-			oStableIdParameter = oStableIdParameter || { 
+			oStableIdParameter = oStableIdParameter || {
 				type: "ObjectPageSection",
 				subType: oStableIdSubTypeForSubSectionFacetExtension[oFacetViewExtension.sExtensionPointNamePrefix],
 				sEntitySet: oFacetViewExtension.sEntitySet,
 				sFacet: oFacetViewExtension.sFacetId
 			};
-			
+
 			return {
 				id: StableIdHelper.getStableId(oStableIdParameter),
 				additionalData: {
@@ -620,9 +721,9 @@ sap.ui.define([
 				extensionPointName: oFacetViewExtension.sExtensionPointName,
 				extensionPointNamePrefix: oFacetViewExtension.sExtensionPointNamePrefix,
 				blocks: []
-			}; 
+			};
 		}
-	
+
 		var aViewExtensions;
 		function fnGetViewExtensions(){
 			if (!aViewExtensions) {
@@ -655,11 +756,11 @@ sap.ui.define([
 			if (sHeaderOrSection === "Header") {
 				return oControllerExtensions && oControllerExtensions.Header && oControllerExtensions.Header.Actions || [];
 			}
-		} 
-		
+		}
+
 		function fnAddSectionsAndSubsectionsFromExtensions(aSectionsFromAnnotations){
 			var aViewExtensions = fnGetViewExtensions();
-			
+
 			var aResultSections = [];
 			aSectionsFromAnnotations.forEach(function (oSectionData) {
 				var aBeforeFacetExtensions = aViewExtensions.filter(function(oViewExtension){
@@ -694,10 +795,10 @@ sap.ui.define([
 
 			return aResultSections;
 		}
-	
+
 		function fnAddSmartFormExtensions(oBlockData){
 			var aViewExtensions = fnGetViewExtensions();
-			
+
 			var oSmartFormExtension = aViewExtensions.find(function(oViewExtension){
 				return oViewExtension.sFacetId === oBlockData.additionalData.facetId && oViewExtension.sExtensionPointNamePrefix === "SmartFormExtension";
 			});
@@ -708,14 +809,14 @@ sap.ui.define([
 				// If annotation term is not FieldGroup or Identification, but target exists, it could either be a different type (then SmartFormExtension would be ignored in xml)
 				// or sth. completely unknown (not allowed from vocabulary (e.g. UI.Facets) or at least not implemented by us.
 				// In that case, we would create a SmartForm just to enable the SmartFormExtension.
-				// If however the target is an array (like UI.Facets - this is actually an existing example from an app!) this would lead to trying us to create SmartFields per entry 
+				// If however the target is an array (like UI.Facets - this is actually an existing example from an app!) this would lead to trying us to create SmartFields per entry
 				// - if the entries do not fit, that would break (if multiple entries have no value property, we would create duplicate (broken) ids)
 				// This could be again avoided if also a replaceFacet extension exists for this facet (like in the app using UI.Facets here) - then the SmartForm (including extension)
-				// would be ignored anyway, we just should make sure not to filter the block completely (as replaceFacet is still evaluated in xml) 
-				oBlockData.additionalData.type = oBlockData.additionalData.type || "SmartForm"; 
+				// would be ignored anyway, we just should make sure not to filter the block completely (as replaceFacet is still evaluated in xml)
+				oBlockData.additionalData.type = oBlockData.additionalData.type || "SmartForm";
 			}
 		}
-		
+
 		function fnNormalizeBlock(oBlockData){
 			// determine type of Block
 			// oBlockData.annotations.Facet.annotation definitely is an object, as build by us in fnGetSections
@@ -728,8 +829,8 @@ sap.ui.define([
 			// additional possible (no occurrence known and not taken care of so far):
 			// - AnnotationPath not being a string (but an object)
 			var sTargetAnnotationTerm = oBlockData.annotations.Facet.annotation.Target && oBlockData.annotations.Facet.annotation.Target.AnnotationPath && oBlockData.annotations.Facet.annotation.Target.AnnotationPath.split("@")[1];
-			sTargetAnnotationTerm = sTargetAnnotationTerm && sTargetAnnotationTerm.split("#")[0]; 
-			
+			sTargetAnnotationTerm = sTargetAnnotationTerm && sTargetAnnotationTerm.split("#")[0];
+
 			switch (sTargetAnnotationTerm){
 			case "com.sap.vocabularies.UI.v1.FieldGroup":
 			case "com.sap.vocabularies.UI.v1.Identification":
@@ -738,6 +839,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;
@@ -748,18 +856,18 @@ sap.ui.define([
 				oBlockData.additionalData.type = "Contact";
 				break;
 			default:
-				// todo: 
+				// todo:
 				// - check other possible annotations, e.g.
 				//						case "com.sap.vocabularies.UI.v1.DataPoint":
 				// - check how to correctly react on unknown (or maybe wrong spelled) annotations in target - could they (like non-existent ones) be used
 				//   as anchor for extensions? (Assumption: yes, for SmartFormExtension - but maybe also depending on (existent) navigation property for columns?)
-				//oBlockData.additionalData.type = "SmartForm"; 
+				//oBlockData.additionalData.type = "SmartForm";
 			}
-			
+
 			fnNormalizeSectionSettings(oBlockData);
 			fnAddSmartFormExtensions(oBlockData);
 		}
-		
+
 		function fnIsBlockRelevant(oBlockData){
 			if (oBlockData.annotations.Facet.annotation.RecordType !== "com.sap.vocabularies.UI.v1.ReferenceFacet"){
 				// no reference facet
@@ -811,13 +919,13 @@ sap.ui.define([
 			});
 		}
 
-		/* Returns the passed DataField (DataFieldForAction/DataFieldForIntentBasedNavigation which belongs to a sub-section) details required 
+		/* Returns the passed DataField (DataFieldForAction/DataFieldForIntentBasedNavigation which belongs to a sub-section) details required
 		   to put in the corresponding sub-section template settings */
 		function fnGetDataFieldDetails(oDataField, sMetaModelPathContentPrefix, nIndex, oOpSettings, sActionId) {
 			var oActionDataFieldDetails = {};
 			var sPressHandler = "._templateEventHandlers.";
 			// calling AHModel.format is needed, as action could be defined as string or path
-			// as AHModel.format is defined to require interface context, we need to provide the context (not just the value). This works for formatters with requiresIContext = true and only 1 additional parameter. 
+			// as AHModel.format is defined to require interface context, we need to provide the context (not just the value). This works for formatters with requiresIContext = true and only 1 additional parameter.
 			var sDataFieldAction = AHModel.format(oMetaModel.getContext(sMetaModelPathContentPrefix + nIndex + "/Action"));
 			switch (oDataField.RecordType) {
 				case "com.sap.vocabularies.UI.v1.DataFieldForAction":
@@ -885,18 +993,18 @@ sap.ui.define([
 			oSubSectionData.blocks.forEach(fnNormalizeBlock);
 
 			// Check whether SideContent is maintained for the SubSection in manifest
-			var sSideContentExtensionName = AHSideContent.getSideContentExtensionPoint(sLeadingEntitySet, 
+			var sSideContentExtensionName = AHSideContent.getSideContentExtensionPoint(sLeadingEntitySet,
 									oSubSectionData.additionalData.facetId, oComponentUtils.getViewExtensions());
 			if (sSideContentExtensionName) {
 				oSubSectionData.sideContentSettings = {
-					id: StableIdHelper.getStableId({ 
+					id: StableIdHelper.getStableId({
 						type: "ObjectPageSection",
 						subType: "DynamicSideContent",
 						sFacet: oSubSectionData.additionalData.facetId
 					})
 				};
 			}
-			
+
 			// add actions to subsection
 			oSubSectionData.actions = [];
 			var oOpSettings = oComponentUtils.getSettings();
@@ -922,7 +1030,7 @@ sap.ui.define([
 						oSubSectionData.actions.push(oFormAction);
 					});
 				}
-				
+
 				if (oBlock.additionalData.type === "SmartTable" && oBlock.tableSettings) {
 					var oExtensionsTableActions = fnGetExtensionAction(oBlock.additionalData.facetId, "Section");
 					if (oExtensionsTableActions) {
@@ -959,7 +1067,7 @@ sap.ui.define([
 
 				var sMetaModelPathTarget = AHModel.resolvePath(oMetaModel.getContext(oBlock.metaModelPath + "/Target"));
 				// FieldGroup has a Property "Data" containing the content, while Identification consist only of the content - so metaModelPath looks slightly different
-				// beginning part can be build here, last segment (position in array) can only be added inside the loop 
+				// beginning part can be build here, last segment (position in array) can only be added inside the loop
 				var sMetaModelPathContentPrefix = sMetaModelPathTarget + (oBlock.targetAnnotation.Data ? "/Data/" : "/" );
 				oBlock.temporaryData.content.forEach(function(oDataField, iIndex){
 					if (!oDataField || !oDataField.Action || (oDataField.RecordType !== "com.sap.vocabularies.UI.v1.DataFieldForAction" && oDataField.RecordType !== "com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation")){
@@ -991,17 +1099,17 @@ sap.ui.define([
 					});
 				});
 			});
-			
+
 			// remove superfluous blocks
 			oSubSectionData.blocks = oSubSectionData.blocks.filter(fnIsBlockRelevant);
-			
+
 			// restore behaviour from 1.84 and before: only separate SmartForms is 3 level hierarchy and at least 1 reference Facet pointing to sth. not feasible for SmartForm (lineItem or chart)
 			// otherwise, create only one SmartForm containing groups per referenceFacet
 			if (oSubSectionData.temporaryData.potentiallySeparateForms && !oSubSectionData.blocks.every(fnPointsToSmartForm)){
 				// keep separated SmartForms, distribute properties on needed level
 				oSubSectionData.blocks = oSubSectionData.blocks.map(function(oBlockData){
 					if (fnPointsToSmartForm(oBlockData)){
-						// move everything one level down (to group) 
+						// move everything one level down (to group)
 						return {
 							additionalData: {
 								type: oBlockData.additionalData.type,
@@ -1039,10 +1147,10 @@ sap.ui.define([
 						return oBlockData.annotations.Facet.annotation["com.sap.vocabularies.UI.v1.PartOfPreview"].Bool === "true";
 					}
 				});
-				
-				
+
+
 			} else {
-				// aggregate all blocks pointing to FieldGroup or similar to one, but keep others 
+				// aggregate all blocks pointing to FieldGroup or similar to one, but keep others
 				var oSmartFormData = {
 					additionalData: {
 						type: "SmartForm",
@@ -1082,14 +1190,14 @@ sap.ui.define([
 							})
 						}
 					};
-				
+
 				oSubSectionData.moreBlocks = oSubSectionData.blocks.filter(function(oBlockData){
 					return !fnPointsToSmartForm(oBlockData) && oBlockData.annotations.Facet.annotation["com.sap.vocabularies.UI.v1.PartOfPreview"].Bool === "false";
 				});
 				oSubSectionData.blocks = oSubSectionData.blocks.filter(function(oBlockData){
 					return !fnPointsToSmartForm(oBlockData) && oBlockData.annotations.Facet.annotation["com.sap.vocabularies.UI.v1.PartOfPreview"].Bool === "true";
 				});
-				
+
 				// add SmartForm as first entry
 				// clarify: add SmartForm even when no content? (1.84: in 2 level hierarchy yes, in 3 level hierarchy no)
 				// if yes: also for facet-extensions? Not really meaningful there...
@@ -1103,12 +1211,12 @@ sap.ui.define([
 
 			/*
 			Store the RenderingBehavior which currently support enabling of View Lazy Loading. No configuration would
-			mean View Lazy Loading is disabled 
+			mean View Lazy Loading is disabled
 			*/
 			oSubSectionData.additionalData.useViewLazyLoading = oComponentUtils.isRenderingWaitingForViewportEntered();
 			/*
 			Set the LazyLoading behavior for SubSection object
-			TODO: Avoid recalculation of the same & assign it as custom data 
+			TODO: Avoid recalculation of the same & assign it as custom data
 			*/
 			fnSetLoadingStrategy(oSectionData, oSubSectionData);
 		}
@@ -1128,7 +1236,7 @@ sap.ui.define([
 					if (oViewExtension) {
 						// SubSection has extension view defined. LoadingStrategy needs to be determined
 						// from the extension data
-						var oExtensionGenericInfo = oViewExtension.oExtensionDefinition 
+						var oExtensionGenericInfo = oViewExtension.oExtensionDefinition
 							&& oViewExtension.oExtensionDefinition["sap.ui.generic.app"];
 
 						if (oExtensionGenericInfo && oExtensionGenericInfo.enableLazyLoading) {
@@ -1140,7 +1248,7 @@ sap.ui.define([
 						return;
 					}
 				}
-				
+
 				// SubSection is an annotated section. Check whether a loading strategy is configured
 				// else return the default loading strategy (LazyLoading).
 				if (oSectionData) {
@@ -1160,57 +1268,57 @@ sap.ui.define([
 				oSubSectionData.loadingStrategy = "lazyLoading";
 			}
 		}
-		
+
 		function fnIsSubSectionRelevant(){
 			return true;
 		}
-	
+
 		function fnNormalizeSection(oSectionData){
 			fnNormalizeSectionSettings(oSectionData);
 			oSectionData.subSections.forEach(fnNormalizeSubSection.bind(null, oSectionData));
 			oSectionData.subSections = oSectionData.subSections.filter(fnIsSubSectionRelevant);
 		}
-		
+
 		function fnIsSectionRelevant(){
 			return true;
 		}
-	
-		/* This method returns an array describing relevant information for (nearly) all the sections to be created on the OP. The order is the order in which we create the 
+
+		/* This method returns an array describing relevant information for (nearly) all the sections to be created on the OP. The order is the order in which we create the
 		 * sections, but be aware that UI adaptation could change the visible order in the final UI.
-		 * 
+		 *
 		 * Exception: currently, in case of editable header one special section is created in section fragment, that is not reflected in this array.
-		 * 
+		 *
 		 * Ideal structure: Ideally, we expect a deep nested structure. It does not need to reflect the full control tree, but can build an abstraction, i.e. controls added with
 		 * hard coded properties (like grid in facet fragment) can be left out. On each level, data related to one control should be described by the following common properties:
-		 * 	id: the local stable id for that control. Can be used to lookup the entry in the structure (e.g. in an event handler of that control), or to find the control using 
+		 * 	id: the local stable id for that control. Can be used to lookup the entry in the structure (e.g. in an event handler of that control), or to find the control using
 		 * 			byId when iterating through this structure
 		 * 	metaModelPath: Path in the metamodel pointing to the annotation responsible for creating the control. Can be used with helper getMetaModelBinding to get a reference to
 		 * 			the annotation. Remark: There is no clear 1:1 relationship between annotations and controls. However, original implementation was based on iterating through
-		 * 			annotations, thus there's always one most specific annotation. This path should point to that annotation to allow stepwise transformation of fragments. Once no 
-		 * 			direct evaluation of annotations is done within the fragments, but everything is prepared into this structure, metaModelPath would not be needed anymore.  
-		 * 	controlName: Name of the control to be put. Esp. useful in aggregations, where we put different controls in different situations (e.g. aggregation blocks of 
-		 * 			SubSections). 
+		 * 			annotations, thus there's always one most specific annotation. This path should point to that annotation to allow stepwise transformation of fragments. Once no
+		 * 			direct evaluation of annotations is done within the fragments, but everything is prepared into this structure, metaModelPath would not be needed anymore.
+		 * 	controlName: Name of the control to be put. Esp. useful in aggregations, where we put different controls in different situations (e.g. aggregation blocks of
+		 * 			SubSections).
 		 * 	controlProperties: Map of fully prepared properties to be set to this control. (Key = PropertyName, value can be a fixed value or a binding string to be evaluated at
 		 * 			runtime)
 		 * 	aggregations: Map of those aggregations of the control used by us (i.e. we put controls to in our fragments). Key should be the name of the corresponding aggregation,
-		 * 			value should be an (array of) object(s) of the same structure. (In most cases, the relevant aggregation are of cardinality 0..n - in case of cardinality 0..1, 
+		 * 			value should be an (array of) object(s) of the same structure. (In most cases, the relevant aggregation are of cardinality 0..n - in case of cardinality 0..1,
 		 * 			value could just be an object of the given structure.
 		 * 	additionalData: Any further data to be provided in relation to that control. Structure to be defined case by case. Can be used in two ways:
 		 * 		- during template processing: In case of partial pre-analysis. Should not be needed, once analysis is completely transferred. Typical example could be tableSettings
 		 * 					or facetId (to be used to generate ids for aggregated controls)
 		 * 		- to replace customData so far filled during template processing to be used at runtime.
-		 * 
+		 *
 		 * Unfortunately, what is described above is currently not reality - currently the structure looks like following:
 		 * Properties of elements in this array:
 		 * 	metaModelPath: Path in the metamodel pointing to the facet annotation being for this section. Can be used with helper getMetaModelBinding to get a reference to
 		 * 			the annotation
 		 * 	id: local stable Id of the section control to be created. Currently only used in ExtensionFacetLayout.fragment.
-		 * 			Ideally, id should always be provided, and then also be used in ControllerImplementation to lookup entry in this structure from given control or vice versa.  
+		 * 			Ideally, id should always be provided, and then also be used in ControllerImplementation to lookup entry in this structure from given control or vice versa.
 		 * 	extensionPointName
-		 * 	facetIdAsObject: Object with same structure as built be StableIdHelper.preparePathForStableId, i.e. with only one property id for easier transition from pure templating based approach 
+		 * 	facetIdAsObject: Object with same structure as built be StableIdHelper.preparePathForStableId, i.e. with only one property id for easier transition from pure templating based approach
 		 * 		id: facetId (see below)
 		 * 	additionalData
-		 * 		facetId: Id created for the facet either defined in facet annotation or created out of target annotation path, used as parameter for controls put on this section 
+		 * 		facetId: Id created for the facet either defined in facet annotation or created out of target annotation path, used as parameter for controls put on this section
 		 * 	annotations
 		 * 		Facet
 		 * 	subSections: an array describing relevant information for all the subSections in the current section. Properties of elements:
@@ -1228,12 +1336,12 @@ sap.ui.define([
 		 * 			tableSettings
 		 * 			chartSettings
 		 * 			controlProperties: Should contain all those properties of the control we put into the block, that are already fully prepared, i.e. in the view we should just see an element binding {block>controlProperties/<PropertyName>}
-		 * 						Currently only used for the id of SmartForm. 
+		 * 						Currently only used for the id of SmartForm.
 		 * 				id
 		 * 			aggregations
 		 * 				groups: an array describing relevant information for all the groups in the current block (if its type is SmartForm). Properties of elements:
 		 * 			additionalData
-		 * 				type: Type of the block to be created. Currently possible types are SmartForm, SmartTable, SmartChart, Address, Contact. 
+		 * 				type: Type of the block to be created. Currently possible types are SmartForm, SmartTable, SmartChart, Address, Contact.
 		 * 		moreBlocks: an array describing relevant information for the blocks not being part of preview. Elements are structured like the one in blocks
 		 * 		actions: an array describing relevant information for all the actions for the current subSection. Properties of elements:
 		 * 			command
@@ -1245,9 +1353,9 @@ sap.ui.define([
 		 * 			semanticObject
 		 * 			text
 		 * 	extensionPointNamePrefix
-		 * 
+		 *
 		 */
-		
+
 		function fnGetSections(){
 			var sEntityTypePath = oMetaModel.getMetaContext("/" + sLeadingEntitySet).getPath();
 			var aSectionsFromAnnotations = fnGetSectionsFromAnnotations(sEntityTypePath + "/com.sap.vocabularies.UI.v1.Facets", false);
@@ -1281,13 +1389,13 @@ sap.ui.define([
 			if (oDataField.Value && oDataField.Value.Path) {
 				var sDataFieldValuePath = oDataField.Value.Path;
 				var oAssociation;
-				
+
 				if (sDataFieldValuePath.indexOf('/') > -1) {
 					var sNavigationProperty = sDataFieldValuePath.split("/")[0];
 					oAssociation = oMetaModel.getODataAssociationEnd(oEntityType, sNavigationProperty);
-					oEntityType = oMetaModel.getODataEntityType(oAssociation && oAssociation.type) || oEntityType;	
+					oEntityType = oMetaModel.getODataEntityType(oAssociation && oAssociation.type) || oEntityType;
 					return sNavigationProperty;
-				} 
+				}
 				return;
 			}
 		}
@@ -1307,10 +1415,10 @@ sap.ui.define([
 							var oAssociation = oMetaModel.getODataAssociationEnd(oEntityType, sNavigationProperty);
 							oEntityType = oMetaModel.getODataEntityType(oAssociation && oAssociation.type);
 						}
-						return oEntityType && oEntityType.hasStream === "true";		
-					} 			
-				}			 
-					
+						return oEntityType && oEntityType.hasStream === "true";
+					}
+				}
+
 			}
 			return false;
 		}
@@ -1328,21 +1436,21 @@ sap.ui.define([
 						press => triggers the action defined in the command execution
 						isStandardAction =>	represents whether the action is a standard action or overridden by the custom action,
 						determining => represents whether action is determining i.e., displayed in the footer
-						
+
 					If a custom action is defined with a valid 'logicalAction', then there could be two cases:
 
 					Case 1: Custom action has an ID
-						In this case, the corresponding standard button does not get created and instead an extension button 
+						In this case, the corresponding standard button does not get created and instead an extension button
 						gets created, which takes over some standard functionality, especially the keyboard shortcut and the following properties:
 							visible, text, importance, callbackName (if not defined in the manifest)
 
 					Case 2: Custom action does not have an ID
-						Here, the corresponding standard button gets created and takes over everything defined explicitly in the manifest. 
-						
+						Here, the corresponding standard button gets created and takes over everything defined explicitly in the manifest.
+
 					In both the cases, isStandardAction is set to false.
 					TODO: isStandardAction is only used to set different types of CustomData and OverflowToolbarLayoutData in the respective fragments.
 						However, additional CustomData should not harm, and regarding OverflowToolbarLayoutData, importance should always be the default
-						(if not defined otherwise) and so, it should be removed and the places where these CustomData are being consumed should be refactored (if required). 
+						(if not defined otherwise) and so, it should be removed and the places where these CustomData are being consumed should be refactored (if required).
 				*/
 				var oStandardActions = {
 					Delete: {
@@ -1395,7 +1503,7 @@ sap.ui.define([
 					}
 				};
 
-				// For mobile and tablet devices, a menu button containing Save and Validate button is rendered instead of the below standard Save button. Logic WRT visibility of 
+				// For mobile and tablet devices, a menu button containing Save and Validate button is rendered instead of the below standard Save button. Logic WRT visibility of
 				// said menu button is present in the footer fragment.
 				if (oDevice.system.desktop || !oComponentUtils.isDraftEnabled()) {
 					oStandardActions.Save = {