@sapui5/sap.suite.ui.generic.template 1.113.0 → 1.115.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.113.0",
+  "version": "1.115.0",
   "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.113.0</version>
+	<version>1.115.0</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/Component.js

@@ -10,7 +10,8 @@ sap.ui.define(["sap/ui/core/mvc/OverrideExecution",
 	"sap/suite/ui/generic/template/js/AnnotationHelper",
 	"sap/base/util/isEmptyObject",
 	"sap/suite/ui/generic/template/AnalyticalListPage/util/AnnotationHelper",
-	"sap/insights/CardHelper"
+	"sap/insights/CardHelper",
+	"sap/suite/ui/generic/template/AnalyticalListPage/util/FilterUtil" // // just to make sure that this class containing runtime formatters is loaded
 ], function(OverrideExecution, TemplateAssembler, ControllerImplementation, JSONModel, controllerFrameworkExtensions, preparationHelper, deepExtend,
 	filterSettingsPreparationHelper, StableIdHelper, AnnotationHelper, isEmptyObject, ALPAnnotationHelper, CardHelper) {
 	"use strict";
@@ -195,6 +196,7 @@ sap.ui.define(["sap/ui/core/mvc/OverrideExecution",
 				oAlpSettings.isSelflinkRequired = false;
 				oAlpSettings.isIndicatorRequired = false;
 				oAlpSettings.isSemanticallyConnected = true;
+				oAlpSettings.rowHighligths = "None";
 				oAlpSettings.controlConfigurationSettings = filterSettingsPreparationHelper.getControlConfigurationSettings(oAlpSettings, oEntityType, oEntitySet,  oModel);
 
 				function checkIfSmartChart(sEntitySet, oTabItem) {
@@ -337,13 +339,17 @@ sap.ui.define(["sap/ui/core/mvc/OverrideExecution",
 				}
 
 				oAlpSettings.bInsightsEnabled = false;
-				CardHelper.getServiceAsync("UIService").then(function(oInstance){
-					oAlpSettings.bInsightsEnabled = true;
-					var oTemplatePrivate = oComponent.getModel("_templPriv");
-					oTemplatePrivate.setProperty("/oInsightsInstance", oInstance);
-				}).catch(function(response) {
-					oAlpSettings.bInsightsEnabled = false;
-				});
+				// If app is running in Microsoft Teams environment then Insight should not execute
+				var oTemplatePrivateGlobal = oComponent.getModel("_templPrivGlobal");
+				if (!oTemplatePrivateGlobal.getProperty("/generic/isTeamsModeActive")) {
+					CardHelper.getServiceAsync("UIService").then(function(oInstance){
+						oAlpSettings.bInsightsEnabled = true;
+						var oTemplatePrivate = oComponent.getModel("_templPriv");
+						oTemplatePrivate.setProperty("/oInsightsInstance", oInstance);
+					}).catch(function(response) {
+						oAlpSettings.bInsightsEnabled = false;
+					});
+				}
 
 				return oAlpSettings;
 			},
@@ -480,6 +486,10 @@ sap.ui.define(["sap/ui/core/mvc/OverrideExecution",
 							showDataLabel: {
 								type: "boolean",
 								defaultValue: false
+							},
+							addCardtoInsightsHidden: {
+								type: "boolean",
+								defaultValue: false
 							}
 						}
 					},

package/src/sap/suite/ui/generic/template/AnalyticalListPage/control/visualfilterbar/SmartVisualFilterBar.js

@@ -1443,7 +1443,7 @@ sap.ui.define([
 		var oCtrlConf = this._smartFilterContext.getAggregation("filterGroupItems").filter(function (ctrlConf) {
 			return ctrlConf.getName() === sFilterKey;
 		})[0];
-		return oCtrlConf.getControl().getOptions();
+		return oCtrlConf.getControl().getStandardOptions();
 	};
 
 	return SmartVisualFilterBar;

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

@@ -32,12 +32,13 @@ sap.ui.define(["sap/ui/generic/app/navigation/service/SelectionVariant",
 	"sap/ui/model/json/JSONModel",
 	"sap/suite/ui/generic/template/listTemplates/controller/DetailController",
 	"sap/ui/comp/personalization/Util",
-	"sap/suite/ui/generic/template/lib/AddCardsHelper"
+	"sap/suite/ui/generic/template/lib/AddCardsHelper",
+	"sap/m/MessageBox"
 ], function(SelectionVariant, ExtensionAPI,
 			FilterBarController, ToolbarController, VisualFilterBarController, VisualFilterDialogController, AnalyticGridController, AnalyticalTable,
 			ODataAnnotationHelper, Analytics, ContentAreaController, IappStateHandler, Device, SegmentedButtonItem, SegmentedButton,
 			OverflowToolbar, ToolbarSpacer, SapMLibrary, Context, ALPHelper, controlHelper, FeLogger, FilterUtil, ObjectPath, ShareUtils, merge, deepExtend,
-			ListUtils, MultipleViewsHandler, StableIdHelper, MessageStripHelper, JSONModel, DetailController, PersonalizationControllerUtil, AddCardsHelper) {
+			ListUtils, MultipleViewsHandler, StableIdHelper, MessageStripHelper, JSONModel, DetailController, PersonalizationControllerUtil, AddCardsHelper, MessageBox) {
 
 		"use strict";
 
@@ -265,9 +266,6 @@ sap.ui.define(["sap/ui/generic/app/navigation/service/SelectionVariant",
 							var sSubject = oTemplateUtils.oServices.oApplication.getAppTitle();
 							var oTriggerPromise = ShareUtils.getCurrentUrl().then(function(sCurrentUrl){
 								switch (target) {
-									case "MicrosoftTeams":
-										ShareUtils.openMSTeamsShareDialog(sSubject, sCurrentUrl);
-										break;
 									case "Email":
 										sSubject = oTemplateUtils.oCommonUtils.getText("EMAIL_HEADER", [ sSubject ]);
 										sap.m.URLHelper.triggerEmail(null, sSubject, sCurrentUrl);
@@ -336,6 +334,7 @@ sap.ui.define(["sap/ui/generic/app/navigation/service/SelectionVariant",
 					// 	oButton.focus();
 					// });
 				}
+
 				// Generation of Event Handlers
 				return {
 					onInit: function() {
@@ -1197,7 +1196,7 @@ sap.ui.define(["sap/ui/generic/app/navigation/service/SelectionVariant",
 						dataStateClose: function(){
 							oState.oMessageStripHelper.onClose();
 						},
-						onAddCardsToRepository: function(oEvent){
+						onAddCardsToRepository: function(oEvent) {
 							var oPresentationControlHandler = oTemplateUtils.oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oState.oSmartChart);
 							var oComponent = oState.oController.getOwnerComponent();
 							var oModel = oPresentationControlHandler.getModel();
@@ -1205,17 +1204,32 @@ sap.ui.define(["sap/ui/generic/app/navigation/service/SelectionVariant",
 							var oView = oState.oController.getView();
 							var oEntitySet = oModel.getMetaModel().getODataEntitySet(sEntitySet);
 							var oEntityType = oModel.getMetaModel().getODataEntityType(oEntitySet.entityType);
+							var oRb = oComponent.getModel("i18n").getResourceBundle();
 							var oCardDefinition = {};
-							oCardDefinition['currentControlHandler'] = oPresentationControlHandler;
-							oCardDefinition['component'] = oComponent;
-							oCardDefinition['view'] = oView;
-							oCardDefinition['entitySet'] = oEntitySet;
-							oCardDefinition['entityType'] = oEntityType;
-							oCardDefinition['oSmartFilterbar'] = oState.oSmartFilterbar;
-							var oAnalyticalCardManifest = AddCardsHelper.createAnalyticalCardForPreview(oCardDefinition);
-							var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
-							var oInsightsInstance = oTemplatePrivateModel.getProperty("/oInsightsInstance");
-							oInsightsInstance.showCardPreview(oAnalyticalCardManifest);
+							if (oState.oSmartFilterbar.getUiState().getSemanticDates()) {
+								MessageBox.error(oRb.getText("ST_CARD_CREATION_FAILURE"), {
+									onClose: function () {
+										throw new Error("Insights is not supported");
+									},
+									details: "<strong>" + oRb.getText("ST_CARD_POSSIBLE_CAUSES") + "</strong>" +
+									"<ul>" +
+									"<li>" + oRb.getText("ST_CARD_FAILURE_REASON_DATE_RANGE_FILTERS") + "</li>" +
+									"<li>" + oRb.getText("ST_CARD_FAILURE_CHART_REASON_CHART_LEVEL_FILTERS") + "</li>" +
+									"</ul>" + oRb.getText("ST_CARD_FOOTER_INFO")
+								});
+							} else {
+								oCardDefinition['currentControlHandler'] = oPresentationControlHandler;
+								oCardDefinition['component'] = oComponent;
+								oCardDefinition['view'] = oView;
+								oCardDefinition['entitySet'] = oEntitySet;
+								oCardDefinition['entityType'] = oEntityType;
+								oCardDefinition['oSmartFilterbar'] = oState.oSmartFilterbar;
+								oCardDefinition['oTemplateUtils'] = oTemplateUtils;
+								var oAnalyticalCardManifest = AddCardsHelper.createCardForPreview(oCardDefinition);
+								var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
+								var oInsightsInstance = oTemplatePrivateModel.getProperty("/oInsightsInstance");
+								oInsightsInstance.showCardPreview(oAnalyticalCardManifest, true);
+							}
 						},
 						onBeforeExport: function (oExportEvent) {
 							oTemplateUtils.oCommonEventHandlers.onBeforeExport(oExportEvent);

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

@@ -23,7 +23,7 @@ sap.ui.define([
 
 	sap.suite.ui.generic.template.AnalyticalListPage.controller.DynamicDateRangeController.createDynamicDateRange = function (aControlOptions) {
 		this._oDynamicDateRange = new DynamicDateRange({
-			options: aControlOptions,
+			standardOptions: aControlOptions,
 			hideInput: true
 		});
 		return this._oDynamicDateRange;

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

@@ -12,6 +12,7 @@ sap.ui.define(["sap/m/SegmentedButtonItem", "sap/m/Button", "sap/m/Text", "sap/m
 		"use strict";
 
 		var FILTER_MODE_VISUAL = "visual",
+			FILTER_MODE_COMPACT = "compact",
 			FILTER_DIALOG_MODE_COMPACT = "group",
 			customDataPropertyName  = "sap.suite.ui.generic.template.customData",
 			genericDataPropertyName = "sap.suite.ui.generic.template.genericData",
@@ -185,9 +186,12 @@ sap.ui.define(["sap/m/SegmentedButtonItem", "sap/m/Button", "sap/m/Text", "sap/m
 			handleFilterSwitch:function(mode, bApplyingVariant) {
 				var oComponent = this.oState.oController.getOwnerComponent();
 				var oTemplatePrivate = oComponent.getModel("_templPriv");
+				var oModel = this.oState.alr_visualFilterBar && this.oState.alr_visualFilterBar.getModel();
 
-				//in case app loading in compact filter mode
-				if (this.oState.alr_visualFilterBar && !this.oState.alr_visualFilterBar.getAssociateValueListsCalled()) {
+				if ((oModel && oModel.mMetadataUrlParams && oModel.mMetadataUrlParams["sap-value-list"] === "none") && (this.oState.alr_visualFilterBar && !this.oState.alr_visualFilterBar.getAssociateValueListsCalled())) {
+					this.oState.alr_visualFilterBar.setAssociateValueListsCalled(true);
+					this.oState.oSmartFilterbar.associateValueLists();
+				} else if (oTemplatePrivate.getProperty('/alp/filterMode')  === FILTER_MODE_COMPACT && (this.oState.alr_visualFilterBar && !this.oState.alr_visualFilterBar.getAssociateValueListsCalled())) { //in case app loading in compact filter mode
 					this.oState.alr_visualFilterBar.setAssociateValueListsCalled(true);
 					this.oState.oSmartFilterbar.associateValueLists();
 				}

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

@@ -1,4 +1,6 @@
-sap.ui.define([ ], function() {
+sap.ui.define([
+	"sap/ui/core/mvc/OverrideExecution"
+], function(OverrideExecution) {
 		"use strict";
 		/**
 		 * This class contains all extension functions that can be implemented by Application 
@@ -8,6 +10,29 @@ sap.ui.define([ ], function() {
 		 * @public
 		 */
 		 return /** @lends sap.suite.ui.generic.template.AnalyticalListPage.controllerFrameworkExtensions */ {
+			metadata: {
+				methods: {
+					getVisibleSelectionsWithDefaults: { "public": true, "final": false, overrideExecution: OverrideExecution.After},
+					onInitSmartFilterBarExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After},
+					getCustomAppStateDataExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After},
+					restoreCustomAppStateDataExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After},
+					onBeforeRebindTableExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After},
+					onBeforeRebindChartExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After},
+					onClearFilterExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After},
+					adaptNavigationParameterExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After},
+					onAfterCustomModelCreation: { "public": true, "final": false, overrideExecution: OverrideExecution.After},
+					onBeforeRebindFilterableKPIExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After},
+					adaptTransientMessageExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After},
+					onListNavigationExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After},
+					onSaveAsTileExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After},
+					modifyStartupExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After},
+					onLeaveAppExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After},
+					onBeforeRebindVisualFilterExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After},
+					onChildOpenedExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After},
+					beforeSmartLinkPopoverOpensExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After},
+					onBeforeExportTableExtension: { "public": true, "final": false, overrideExecution: OverrideExecution.After}
+				}
+			},
 
 			/**
 			 * This method is called by Fiori elements on the initialization of View. Application developers  

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

@@ -188,7 +188,7 @@ DP_SINGLE_SELECTED={1} posici\u00F3n seleccionada por {0}
 
 DP_WITHOUT_SELECTIONS=Seleccionar fecha
 
-NOT_ASSIGNED=Sin asignar
+NOT_ASSIGNED=No asignado
 
 FILTER_BAR_SHOW_MORE_FILTERS=Otros filtros ({0})
 

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

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

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

@@ -1,11 +1,12 @@
-<mvc:View xmlns:mvc="sap.ui.core.mvc" xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1" xmlns="sap.m" xmlns:f="sap.f"
-	xmlns:core="sap.ui.core" xmlns:semantic="sap.m.semantic" xmlns:ushell="sap.ushell.ui" xmlns:build="sap.build"
-	xmlns:st="sap.suite.ui.generic.template"
+<mvc:View xmlns="sap.m" xmlns:mvc="sap.ui.core.mvc" xmlns:core="sap.ui.core" xmlns:f="sap.f" xmlns:l="sap.ui.layout" xmlns:smartVariantManagement="sap.ui.comp.smartvariants"
+	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
 	template:require="{ AH: 'sap/suite/ui/generic/template/js/AnnotationHelper',
+						AHModel: 'sap/ui/model/odata/AnnotationHelper',
+						ALPHelper: 'sap/suite/ui/generic/template/AnalyticalListPage/util/AnnotationHelper',
 						AHALP: 'sap/suite/ui/generic/template/AnalyticalListPage/util/AnnotationHelper',
 						AHFilterUtil: 'sap/suite/ui/generic/template/AnalyticalListPage/util/FilterUtil',
-						AHStableId: 'sap/suite/ui/generic/template/js/StableIdHelper'}"
-	xmlns:l="sap.ui.layout" xmlns:smartVariantManagement="sap.ui.comp.smartvariants">
+						AHStableId: 'sap/suite/ui/generic/template/js/StableIdHelper'}" >
+
 	<!--
 		@classdesc
 		@name: Name: sap.ui.generic.template.fragments.AnalyticalListPage.view.xml
@@ -20,80 +21,75 @@
 			"entityType",
 			"sap-ui-debug"
 		}-->
-	<template:alias name=".ALPHelper" value="sap.suite.ui.generic.template.AnalyticalListPage.util.AnnotationHelper">
-		<template:with path="parameter>/" helper=".ALPHelper.createWorkingContext" var="workingContext">
-			<template:with path="entitySet>dummy" var="tabItem">
-				<template:with path="parameter>/variables" helper="AH.getNewVariable" var="tableSettings">
-				<template:if test="{:= ${tableSettings>}.set(${parameter>/templateSpecific/tableSettings})}"/>
-			
-			<!-- TODO simplify the showFooter determination by just passing "parameter>" and evaluate everything inside -->
-			<f:DynamicPage 
-					class="sapSmartTemplatesAnalyticalListPageDynamicPage" id="template::Page" headerExpanded="{= ${device>/system/phone} ? 'false' : '{_templPriv>/listReport/isHeaderExpanded}' }" showFooter="{= ${parts: [{path: 'workingContext>lineItem'},{path: 'workingContext>chart/Actions'},{path: 'parameter>/entitySet'}, {path: 'parameter>/manifest/sap.ui5/extends/extensions/sap.ui.controllerExtensions'}], formatter: '.ALPHelper.hasDeterminingActionsForALP'} }">
-				<f:dependents>
-					<core:Fragment fragmentName="sap.suite.ui.generic.template.AnalyticalListPage.view.fragments.HeaderCommands" type="XML"/>
-				</f:dependents>
-				<f:title>
-					<f:DynamicPageTitle areaShrinkRatio="{= ${parts: [{path: 'workingContext>lineItem'},{path: 'workingContext>chart/Actions'},{path: 'parameter>/entitySet'}, {path: 'parameter>/manifest/sap.ui5/extends/extensions/sap.ui.controllerExtensions'}], formatter: '.ALPHelper.getAreaShrinkRatio'} }" class="sapSmartTemplatesAnalyticalListPageDynamicPageTitle sapSmartTemplatesAnalyticalListPageDynamicPageTitleMargin">
-						<f:heading>
-							<l:VerticalLayout class="sapSmartTemplatesAnalyticalListPageFilterContainer">
-								<l:HorizontalLayout class="sapSmartTemplatesAnalyticalListPageAlignVariantTitle sapUIContentPadding">
-									<smartVariantManagement:SmartVariantManagement id="template::PageVariant"
-										persistencyKey="{= (${parameter>/settings/smartVariantManagement} || ${parameter>/settings/smartVariantManagement} === undefined) ? 'searchAnalyticalListPageVariant' : '_ST_SmartVariantManagement'}"
-										showShare="true" showExecuteOnSelection="{= ${parameter>/settings/showGoButtonOnFilterBar} }"
-										displayTextForExecuteOnSelectionForStandardVariant="{= (${parameter>/settings/dataLoadSettings/loadDataOnAppLaunch} === 'ifAnyFilterExist' || ${parameter>/settings/dataLoadSettings/loadDataOnAppLaunch} === undefined) ? '{i18n>ST_LIST_DISPLAY_TEXT_FOR_EXECUTE_ON_SELECTION}' : undefined}" />
-								</l:HorizontalLayout>
-							</l:VerticalLayout>
-						</f:heading>
-						<f:content>
-							<template:if
-								test="{= ${parameter>/settings/keyPerformanceIndicators} !== undefined &amp;&amp; Object.keys(${parameter>/settings/keyPerformanceIndicators}).length > 0 &amp;&amp; !${device>/system/phone} }">
-								<template:then>
-											<template:with path="parameter>/settings/keyPerformanceIndicators" helper=".ALPHelper.getFilterableKPIs"  var="kpiContext">
-													<template:with path="kpiContext>globalKPIs" var="kpis">
-														<template:if test="{= Object.keys(${kpis>}).length > 0}">
-															<OverflowToolbar class= "sapSmartTemplatesAnalyticalListPageKpiTagContainer sapSmartTemplatesAnalyticalListPageKpiTagOverflow" id="template::KPITagContainer::globalKPIs">
-																<core:Fragment fragmentName="sap.suite.ui.generic.template.AnalyticalListPage.view.fragments.KPITagList" type="XML"/>
-															</OverflowToolbar>
-														</template:if>
-													</template:with>
-												</template:with>
-								</template:then>
-							</template:if>
-						</f:content>
-						<f:actions class="sapSmartTemplatesAnalyticalListPageVisualFilterToolbar">
+	<template:with path="parameter>/" helper="ALPHelper.createWorkingContext" var="workingContext">
+		<template:with path="entitySet>dummy" var="tabItem">
+			<template:with path="parameter>/variables" helper="AH.getNewVariable" var="tableSettings">
+				<template:if test="{:= ${tableSettings>}.set(${parameter>/templateSpecific/tableSettings})}"/>			
+				<!-- TODO simplify the showFooter determination by just passing "parameter>" and evaluate everything inside -->
+				<f:DynamicPage 
+					class="sapSmartTemplatesAnalyticalListPageDynamicPage" id="template::Page" headerExpanded="{= ${device>/system/phone} ? 'false' : '{_templPriv>/listReport/isHeaderExpanded}' }" showFooter="{= ${parts: [{path: 'workingContext>lineItem'}, {path: 'workingContext>chart/Actions'},{path: 'parameter>/entitySet'}, {path: 'parameter>/manifest/sap.ui5/extends/extensions/sap.ui.controllerExtensions'}], formatter: 'ALPHelper.hasDeterminingActionsForALP'} }">
+					<f:dependents>
+						<core:Fragment fragmentName="sap.suite.ui.generic.template.AnalyticalListPage.view.fragments.HeaderCommands" type="XML"/>
+					</f:dependents>
+					<f:title>
+						<f:DynamicPageTitle areaShrinkRatio="{= ${parts: [{path: 'workingContext>lineItem'}, {path: 'workingContext>chart/Actions'}, {path: 'parameter>/entitySet'}, {path: 'parameter>/manifest/sap.ui5/extends/extensions/sap.ui.controllerExtensions'}], formatter: 'ALPHelper.getAreaShrinkRatio'} }" class="sapSmartTemplatesAnalyticalListPageDynamicPageTitle sapSmartTemplatesAnalyticalListPageDynamicPageTitleMargin">
+							<f:heading>
+								<l:VerticalLayout class="sapSmartTemplatesAnalyticalListPageFilterContainer">
+									<l:HorizontalLayout class="sapSmartTemplatesAnalyticalListPageAlignVariantTitle sapUIContentPadding">
+										<smartVariantManagement:SmartVariantManagement id="template::PageVariant"
+											persistencyKey="{= (${parameter>/settings/smartVariantManagement} || ${parameter>/settings/smartVariantManagement} === undefined) ? 'searchAnalyticalListPageVariant' : '_ST_SmartVariantManagement'}"
+											showShare="true" showExecuteOnSelection="{= ${parameter>/settings/showGoButtonOnFilterBar} }"
+											displayTextForExecuteOnSelectionForStandardVariant="{= (${parameter>/settings/dataLoadSettings/loadDataOnAppLaunch} === 'ifAnyFilterExist' || ${parameter>/settings/dataLoadSettings/loadDataOnAppLaunch} === undefined) ? '{i18n>ST_LIST_DISPLAY_TEXT_FOR_EXECUTE_ON_SELECTION}' : undefined}" />
+									</l:HorizontalLayout>
+								</l:VerticalLayout>
+							</f:heading>
+							<f:content>
+								<template:if
+									test="{= ${parameter>/settings/keyPerformanceIndicators} !== undefined &amp;&amp; Object.keys(${parameter>/settings/keyPerformanceIndicators}).length > 0 &amp;&amp; !${device>/system/phone} }">
+									<template:then>
+										<template:with path="parameter>/settings/keyPerformanceIndicators" helper="ALPHelper.getFilterableKPIs" var="kpiContext">
+											<template:with path="kpiContext>globalKPIs" var="kpis">
+												<template:if test="{= Object.keys(${kpis>}).length > 0}">
+													<OverflowToolbar class= "sapSmartTemplatesAnalyticalListPageKpiTagContainer sapSmartTemplatesAnalyticalListPageKpiTagOverflow" id="template::KPITagContainer::globalKPIs">
+														<core:Fragment fragmentName="sap.suite.ui.generic.template.AnalyticalListPage.view.fragments.KPITagList" type="XML"/>
+													</OverflowToolbar>
+												</template:if>
+											</template:with>
+										</template:with>
+									</template:then>
+								</template:if>
+							</f:content>
+							<f:actions class="sapSmartTemplatesAnalyticalListPageVisualFilterToolbar">
 								<ToolbarSpacer/>
 								<core:Fragment fragmentName="sap.suite.ui.generic.template.listTemplates.fragments.ActionsFragment" type="XML"/>
-								<template:if test="{= !${parameter>/settings/hideVisualFilter} === true}">
+								<template:if test="{= !${parameter>/settings/hideVisualFilter} }">
 									<template:then>
-									<SegmentedButton
-										id = "template::FilterSwitchButton"
-										selectedKey="{_templPriv>/alp/filterMode}" width="inherit" visible="{_templPriv>/listReport/isHeaderExpanded}" select="._templateEventHandlers.onFilterModeSegmentedButtonChange">
-										<layoutData>
-										<OverflowToolbarLayoutData priority="NeverOverflow"/>
-										</layoutData>
-										<items>
-											<SegmentedButtonItem
-												icon="sap-icon://filter-fields" tooltip="{i18n>FILTER_COMPACT}" key="compact"/>
-											<SegmentedButtonItem
-												icon="sap-icon://filter-analytics" tooltip="{i18n>FILTER_VISUAL}" key="visual"/>
-										</items>
-									</SegmentedButton>
-								</template:then>
+										<SegmentedButton
+											id = "template::FilterSwitchButton"
+											selectedKey="{_templPriv>/alp/filterMode}" width="inherit" visible="{_templPriv>/listReport/isHeaderExpanded}" select="._templateEventHandlers.onFilterModeSegmentedButtonChange">
+											<layoutData>
+												<OverflowToolbarLayoutData priority="NeverOverflow"/>
+											</layoutData>
+											<items>
+												<SegmentedButtonItem icon="sap-icon://filter-fields" tooltip="{i18n>FILTER_COMPACT}" key="compact"/>
+												<SegmentedButtonItem icon="sap-icon://filter-analytics" tooltip="{i18n>FILTER_VISUAL}" key="visual"/>
+											</items>
+										</SegmentedButton>
+									</template:then>
 								</template:if>
 								<MenuButton id="{:= ${parameter>/stableId}.getStableId({type: 'ALPAction', subType: 'Share'}) }"
 									icon="sap-icon://action"
 									tooltip="{i18n>SHARE} (Shift+Ctrl+S)"
 									text=""
-									visible="{parts: [{path: 'appSettings>/flexibleColumnLayout'}], formatter: 'AH.getShareOptionVisibility'}"
+									visible="{path: 'appSettings>/flexibleColumnLayout', formatter: 'AH.getShareOptionVisibility'}"
 									type="Transparent">
 									<layoutData>
-										<OverflowToolbarLayoutData closeOverflowOnInteraction="false"
-											priority = "{= ${device>/system/phone} ? 'AlwaysOverflow' : 'High'}"/>
+										<OverflowToolbarLayoutData closeOverflowOnInteraction="false" priority="{= ${device>/system/phone} ? 'AlwaysOverflow' : 'High'}"/>
 									</layoutData>
 								</MenuButton>
 						</f:actions>
 						<f:snappedContent>
-							<Text id="template::FilterText" class="sapSmartTemplatesAnalyticalListPageSnappedContentText"></Text>
+							<Text id="template::FilterText" class="sapSmartTemplatesAnalyticalListPageSnappedContentText"/>
 						</f:snappedContent>
 					</f:DynamicPageTitle>
 				</f:title>
@@ -111,8 +107,7 @@
 						<core:Fragment fragmentName="sap.suite.ui.generic.template.AnalyticalListPage.view.fragments.ContentContainer" type="XML"/>
 						<!-- Helper -->
 						<customData>
-							<core:CustomData key="entityTypeName" writeToDom="false"
-								value="{path: 'entityType>com.sap.vocabularies.UI.v1.HeaderInfo/TypeName', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}"/>
+							<core:CustomData key="entityTypeName" writeToDom="false" value="{path: 'entityType>com.sap.vocabularies.UI.v1.HeaderInfo/TypeName', formatter: 'AHModel.format'}"/>
 						</customData>
 					</VBox>
 				</f:content>
@@ -123,8 +118,8 @@
 							list="{parameter>/manifest/sap.ui5/extends/extensions/sap.ui.controllerExtensions/sap.suite.ui.generic.template.AnalyticalListPage.view.AnalyticalListPage/sap.ui.generic.app}"
 							var="tmpEntitySet">
 							<template:repeat list="{tmpEntitySet>Actions}" var="customaction">
-								<template:if test="{= (!!${customaction>determining}) &amp;&amp; (!${customaction>global}) &amp;&amp; (${customaction>filter} === 'chart')}">
-										<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.DeterminingActions" type="XML"/>
+								<template:if test="{= !!${customaction>determining} &amp;&amp; !${customaction>global} &amp;&amp; ${customaction>filter} === 'chart'}">
+									<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.DeterminingActions" type="XML"/>
 								</template:if>
 							</template:repeat>
 						</template:repeat>
@@ -132,13 +127,13 @@
 							list="{parameter>/manifest/sap.ui5/extends/extensions/sap.ui.controllerExtensions/sap.suite.ui.generic.template.AnalyticalListPage.view.AnalyticalListPage/sap.ui.generic.app}"
 							var="tmpEntitySet">
 							<template:repeat list="{tmpEntitySet>Actions}" var="customaction">
-								<template:if test="{= (!!${customaction>determining}) &amp;&amp; (!${customaction>global}) &amp;&amp; (!${customaction>filter} || ${customaction>filter} === 'table')}">
-										<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.DeterminingActions" type="XML"/>
+								<template:if test="{= !!${customaction>determining} &amp;&amp; !${customaction>global} &amp;&amp; (!${customaction>filter} || ${customaction>filter} === 'table')}">
+									<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.DeterminingActions" type="XML"/>
 								</template:if>
 							</template:repeat>
 						</template:repeat>
 						<template:with path="entitySet>dummy" var="facet">
-							<template:with path="workingContext>chartPath" helper=".ALPHelper.resolveMetaModelPath" var="chart">
+							<template:with path="workingContext>chartPath" helper="ALPHelper.resolveMetaModelPath" var="chart">
 								<template:repeat list="{chart>Actions}" var="dataField">
 									<template:if
 										test="{= (${dataField>RecordType} === 'com.sap.vocabularies.UI.v1.DataFieldForAction' || ${dataField>RecordType} === 'com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation') &amp;&amp; ${dataField>Determining/Bool} === 'true'}">
@@ -146,7 +141,7 @@
 									</template:if>
 								</template:repeat>
 							</template:with>
-							<template:with path="workingContext>lineItemPath" helper=".ALPHelper.resolveMetaModelPath" var="lineItem">
+							<template:with path="workingContext>lineItemPath" helper="ALPHelper.resolveMetaModelPath" var="lineItem">
 								<template:repeat list="{lineItem>}" var="dataField">
 									<template:if
 										test="{= (${dataField>RecordType} === 'com.sap.vocabularies.UI.v1.DataFieldForAction' || ${dataField>RecordType} === 'com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation') &amp;&amp; ${dataField>Determining/Bool} === 'true'}">
@@ -161,5 +156,4 @@
 			</template:with>
 		</template:with>
 	</template:with>
-	</template:alias>
 </mvc:View>

package/src/sap/suite/ui/generic/template/AnalyticalListPage/view/KpiCardSizeM.view.xml

@@ -1,6 +1,3 @@
-<mvc:View xmlns:mvc="sap.ui.core.mvc" controllerName="sap.suite.ui.generic.template.AnalyticalListPage.controller.KpiCardController" xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
-		   xmlns="sap.m" xmlns:core="sap.ui.core" xmlns:semantic="sap.m.semantic" xmlns:ushell="sap.ushell.ui"
-		   xmlns:build="sap.build" xmlns:st="sap.suite.ui.generic.template"
-		   >
-			<core:Fragment fragmentName="sap.suite.ui.generic.template.AnalyticalListPage.view.fragments.KpiCard" type="XML"/>
+<mvc:View xmlns:mvc="sap.ui.core.mvc" xmlns:core="sap.ui.core" controllerName="sap.suite.ui.generic.template.AnalyticalListPage.controller.KpiCardController" >
+	<core:Fragment fragmentName="sap.suite.ui.generic.template.AnalyticalListPage.view.fragments.KpiCard" type="XML"/>
 </mvc:View>

package/src/sap/suite/ui/generic/template/AnalyticalListPage/view/fragments/AnalyticGrid.fragment.xml

@@ -1,11 +1,11 @@
-<core:FragmentDefinition xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
-	xmlns="sap.m" xmlns:core="sap.ui.core"
-	xmlns:customData="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
-	xmlns:build="sap.build">
-	<template:with path="parameter>/settings/keyPerformanceIndicators" helper=".ALPHelper.getFilterableKPIs"  var="kpiContext">
+<core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core"
+	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
+	template:require="{ALPHelper: 'sap/suite/ui/generic/template/AnalyticalListPage/util/AnnotationHelper'}" >	
+
+	<template:with path="parameter>/settings/keyPerformanceIndicators" helper="ALPHelper.getFilterableKPIs" var="kpiContext">
 		<template:with path="kpiContext>filterableKPIs" var="kpis">
-			<template:if test="{= (Object.keys(${kpis>}).length === 0) &amp;&amp; (!${parameter>/settings/contentTitle}) }">
-				<OverflowToolbar id="template::analyticGridToolbar"  design="Transparent">
+			<template:if test="{= Object.keys(${kpis>}).length === 0 &amp;&amp; !${parameter>/settings/contentTitle} }">
+				<OverflowToolbar id="template::analyticGridToolbar" design="Transparent">
 					<ToolbarSpacer/>
 					<template:if test="{= !${parameter>/settings/quickVariantSelectionX}}">
 						<template:then>
@@ -16,6 +16,6 @@
 			</template:if>
 		</template:with>
 	</template:with>
-	<VBox id="template::AnalyticGridContainer" visible="{= (${_templPriv>/alp/contentView} === 'crosstable')}">
+	<VBox id="template::AnalyticGridContainer" visible="{= ${_templPriv>/alp/contentView} === 'crosstable'}">
 	</VBox>
 </core:FragmentDefinition>

package/src/sap/suite/ui/generic/template/AnalyticalListPage/view/fragments/ContentAreaViewExtension.fragment.xml

@@ -1,11 +1,11 @@
-<core:FragmentDefinition xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
-	xmlns="sap.m" xmlns:core="sap.ui.core"
-	xmlns:customData="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
-	xmlns:build="sap.build">
-	<template:with path="parameter>/settings/keyPerformanceIndicators" helper=".ALPHelper.getFilterableKPIs"  var="kpiContext">
+<core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core"
+	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
+	template:require="{ALPHelper: 'sap/suite/ui/generic/template/AnalyticalListPage/util/AnnotationHelper'}" >
+
+	<template:with path="parameter>/settings/keyPerformanceIndicators" helper="ALPHelper.getFilterableKPIs" var="kpiContext">
 		<template:with path="kpiContext>filterableKPIs" var="kpis">
-			<template:if test="{= (Object.keys(${kpis>}).length === 0) &amp;&amp; (!${parameter>/settings/contentTitle}) }">
-				<OverflowToolbar id="template::contentViewExtensionToolbar"  design="Transparent">
+			<template:if test="{= Object.keys(${kpis>}).length === 0 &amp;&amp; !${parameter>/settings/contentTitle} }">
+				<OverflowToolbar id="template::contentViewExtensionToolbar" design="Transparent">
 					<ToolbarSpacer/>
 					<template:if test="{= !${parameter>/settings/quickVariantSelectionX}}">
 						<template:then>
@@ -16,6 +16,5 @@
 			</template:if>
 		</template:with>
 	</template:with>
-	<ExtensionPoint name="AnalyticalListPageContentViewExtension" xmlns="sap.ui.core">
-	</ExtensionPoint>
+	<core:ExtensionPoint name="AnalyticalListPageContentViewExtension" />
 </core:FragmentDefinition>

package/src/sap/suite/ui/generic/template/AnalyticalListPage/view/fragments/ContentAreaViewExtension2.fragment.xml

@@ -1,21 +1,20 @@
-<core:FragmentDefinition xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
-	xmlns="sap.m" xmlns:core="sap.ui.core"
-	xmlns:customData="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
-	xmlns:build="sap.build">
-	<template:with path="parameter>/settings/keyPerformanceIndicators" helper=".ALPHelper.getFilterableKPIs"  var="kpiContext">
+<core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core"
+	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
+	template:require="{ALPHelper: 'sap/suite/ui/generic/template/AnalyticalListPage/util/AnnotationHelper'}">
+
+	<template:with path="parameter>/settings/keyPerformanceIndicators" helper="ALPHelper.getFilterableKPIs" var="kpiContext">
 		<template:with path="kpiContext>filterableKPIs" var="kpis">
-			<template:if test="{= (Object.keys(${kpis>}).length === 0) &amp;&amp; (!${parameter>/settings/contentTitle}) }">
-				<OverflowToolbar id="template::contentViewExtension2Toolbar"  design="Transparent">
+			<template:if test="{= Object.keys(${kpis>}).length === 0 &amp;&amp; !${parameter>/settings/contentTitle} }">
+				<OverflowToolbar id="template::contentViewExtension2Toolbar" design="Transparent">
 					<ToolbarSpacer/>
 					<template:if test="{= !${parameter>/settings/quickVariantSelectionX}}">
 						<template:then>
-						<core:Fragment fragmentName="sap.suite.ui.generic.template.AnalyticalListPage.view.fragments.ContentViewButtons" type="XML"/>
+							<core:Fragment fragmentName="sap.suite.ui.generic.template.AnalyticalListPage.view.fragments.ContentViewButtons" type="XML"/>
 						</template:then>
 					</template:if>
 				</OverflowToolbar>
 			</template:if>
 		</template:with>
 	</template:with>
-	<ExtensionPoint name="AnalyticalListPageContentViewExtension2" xmlns="sap.ui.core">
-	</ExtensionPoint>
+	<core:ExtensionPoint name="AnalyticalListPageContentViewExtension2" />
 </core:FragmentDefinition>