@sapui5/sap.fe.templates 1.92.0 → 1.93.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.fe.templates",
-	"version": "1.92.0",
+	"version": "1.93.3",
 	"description": "SAPUI5 Library sap.fe.templates",
 	"license": "SEE LICENSE IN LICENSE.txt",
 	"author": "SAP SE (https://www.sap.com)",
@@ -16,7 +16,6 @@
 	],
 	"devDependencies": {
 		"@babel/cli": "7.8.4",
-		"@ui5/cli": "^2.10.0",
-		"yarn": "1.22.10"
+		"@ui5/cli": "^2.10.0"
 	}
 }

package/src/sap/fe/templates/.library

@@ -6,7 +6,7 @@
     <copyright>SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     </copyright>
-    <version>1.92.0</version>
+    <version>1.93.3</version>
 
     <documentation>UI5 library: sap.fe.templates</documentation>
 

package/src/sap/fe/templates/ListReport/Component.js

@@ -22,6 +22,13 @@ sap.ui.define(
 					 */
 					views: {
 						type: "object"
+					},
+
+					/**
+					 * KPIs to display
+					 */
+					keyPerformanceIndicators: {
+						type: "object"
 					}
 				},
 				library: "sap.fe.templates",

package/src/sap/fe/templates/ListReport/ListReport.view.xml

@@ -6,6 +6,7 @@
 	xmlns:macro="sap.fe.macros"
 	xmlns:control="sap.fe.core.controls"
 	xmlns:core="sap.ui.core"
+	xmlns:l="sap.ui.layout"
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
 	xmlns:unittest="http://schemas.sap.com/sapui5/preprocessorextension/sap.fe.unittesting/1"
 	xmlns:customData="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
@@ -32,6 +33,7 @@
 				customData:isMultiEntitySets="{converterContext>isMultiEntitySets}"
 				customData:hasMultiVisualizations="{converterContext>hasMultiVisualizations}"
 				customData:ListReportSubtitle="{= ${manifest>/sap.app/appSubTitle} || '' }"
+				customData:KPIData="{= COMMON.stringifyCustomData(${converterContext>kpiDefinitions})}"
 				showFooter="false"
 				busy="{ui>/busy}"
 				busyIndicatorDelay="0"
@@ -40,35 +42,79 @@
 				<f:title>
 					<f:DynamicPageTitle>
 						<f:heading>
-							<template:if test="{= ${viewData>/variantManagement} === 'Page'}">
+							<template:with path="converterContext>kpiDefinitions" var="definitions">
+								<template:if test="{definitions>length}">
 								<template:then>
-									<v:VariantManagement
-										id="fe::PageVariantManagement"
-										unittest:id="listReportVMPageTest"
-										for="{converterContext>variantManagement/targetControlIds}"
-										showSetAsDefault="true"
-										select=".handlers.onVariantSelected"
-										save=".handlers.onVariantSaved"
-										displayTextForExecuteOnSelectionForStandardVariant="{= ${viewData>/initialLoad} === 'Auto' ? ${sap.fe.i18n>T_LR_VARIANT_APPLY_AUTOMATICALLY_WHEN_FILTER_SET} : undefined }"
-										executeOnSelectionForStandardDefault="{= ${viewData>/initialLoad} === 'Enabled'}"
-									/>
+									<l:HorizontalLayout class="sapUiContentPadding">
+										<template:if test="{= ${viewData>/variantManagement} === 'Page'}">
+										<template:then>
+											<v:VariantManagement
+														id="fe::PageVariantManagement"
+														unittest:id="listReportVMPageTest"
+														for="{converterContext>variantManagement/targetControlIds}"
+														showSetAsDefault="true"
+														select=".handlers.onVariantSelected"
+														save=".handlers.onVariantSaved"
+														displayTextForExecuteOnSelectionForStandardVariant="{= ${viewData>/initialLoad} === 'Auto' ? ${sap.fe.i18n>T_LR_VARIANT_APPLY_AUTOMATICALLY_WHEN_FILTER_SET} : undefined }"
+														executeOnSelectionForStandardDefault="{= ${viewData>/initialLoad} === 'Enabled'}"
+													/>
+										</template:then>
+										<template:elseif test="{= ${viewData>/variantManagement} === 'Control'}">
+											<v:VariantManagement
+														id="{= ID.generate([ ${converterContext>filterBarId}, 'VariantManagement']) }"
+														unittest:id="listReportVMControlTest"
+														for="{converterContext>filterBarId}"
+														showSetAsDefault="true"
+														select=".handlers.onVariantSelected"
+														save=".handlers.onVariantSaved"
+														displayTextForExecuteOnSelectionForStandardVariant="{= ${viewData>/initialLoad} === 'Auto' ? ${sap.fe.i18n>T_LR_VARIANT_APPLY_AUTOMATICALLY_WHEN_FILTER_SET} : undefined }"
+														executeOnSelectionForStandardDefault="{= ${viewData>/initialLoad} === 'Enabled'}"
+													/>
+										</template:elseif>
+										<template:else>
+											<Title unittest:id="listReportTitleTest" text="{= ${manifest>/sap.app/subTitle} || ${manifest>/sap.app/title} }" />
+										</template:else>
+										</template:if>
+										<template:repeat list="{converterContext>kpiDefinitions}" var="kpi">
+											<template:with path="kpi>datapoint" var="datapoint">
+												<macro:KPITag id="{kpi>id}" metaPath="{datapoint>annotationPath}" hasUnit="{= ${datapoint>unit} !== undefined}" />
+											</template:with>
+										</template:repeat>
+									</l:HorizontalLayout>
 								</template:then>
-								<template:elseif test="{= ${viewData>/variantManagement} === 'Control'}">
-									<v:VariantManagement
-										id="{= ID.generate([ ${converterContext>filterBarId}, 'VariantManagement']) }"
-										unittest:id="listReportVMControlTest"
-										for="{converterContext>filterBarId}"
-										showSetAsDefault="true"
-										select=".handlers.onVariantSelected"
-										save=".handlers.onVariantSaved"
-										displayTextForExecuteOnSelectionForStandardVariant="{= ${viewData>/initialLoad} === 'Auto' ? ${sap.fe.i18n>T_LR_VARIANT_APPLY_AUTOMATICALLY_WHEN_FILTER_SET} : undefined }"
-										executeOnSelectionForStandardDefault="{= ${viewData>/initialLoad} === 'Enabled'}"
-									/>
-								</template:elseif>
 								<template:else>
-									<Title unittest:id="listReportTitleTest" text="{= ${manifest>/sap.app/subTitle} || ${manifest>/sap.app/title} }" />
+									<template:if test="{= ${viewData>/variantManagement} === 'Page'}">
+									<template:then>
+										<v:VariantManagement
+													id="fe::PageVariantManagement"
+													unittest:id="listReportVMPageTest"
+													for="{converterContext>variantManagement/targetControlIds}"
+													showSetAsDefault="true"
+													select=".handlers.onVariantSelected"
+													save=".handlers.onVariantSaved"
+													displayTextForExecuteOnSelectionForStandardVariant="{= ${viewData>/initialLoad} === 'Auto' ? ${sap.fe.i18n>T_LR_VARIANT_APPLY_AUTOMATICALLY_WHEN_FILTER_SET} : undefined }"
+													executeOnSelectionForStandardDefault="{= ${viewData>/initialLoad} === 'Enabled'}"
+												/>
+									</template:then>
+									<template:elseif test="{= ${viewData>/variantManagement} === 'Control'}">
+										<v:VariantManagement
+													id="{= ID.generate([ ${converterContext>filterBarId}, 'VariantManagement']) }"
+													unittest:id="listReportVMControlTest"
+													for="{converterContext>filterBarId}"
+													showSetAsDefault="true"
+													select=".handlers.onVariantSelected"
+													save=".handlers.onVariantSaved"
+													displayTextForExecuteOnSelectionForStandardVariant="{= ${viewData>/initialLoad} === 'Auto' ? ${sap.fe.i18n>T_LR_VARIANT_APPLY_AUTOMATICALLY_WHEN_FILTER_SET} : undefined }"
+													executeOnSelectionForStandardDefault="{= ${viewData>/initialLoad} === 'Enabled'}"
+												/>
+									</template:elseif>
+									<template:else>
+										<Title unittest:id="listReportTitleTest" text="{= ${manifest>/sap.app/subTitle} || ${manifest>/sap.app/title} }" />
+									</template:else>
+									</template:if>
 								</template:else>
-							</template:if>
+								</template:if>
+							</template:with>
 						</f:heading>
 						<f:snappedContent>
 							<Text text="{internal>appliedFilters}" />

package/src/sap/fe/templates/ListReport/ListReportController.controller.js

@@ -37,7 +37,8 @@ sap.ui.define(
 		"sap/fe/core/helpers/SemanticDateOperators",
 		"sap/fe/core/controllerextensions/Share",
 		"./overrides/Share",
-		"sap/fe/macros/CommonHelper"
+		"sap/fe/macros/CommonHelper",
+		"sap/fe/core/controllerextensions/KPIManagement"
 	],
 	function(
 		PageController,
@@ -72,7 +73,8 @@ sap.ui.define(
 		SemanticDateOperators,
 		Share,
 		ShareOverrides,
-		CommonHelper
+		CommonHelper,
+		KPIManagement
 	) {
 		"use strict";
 		var TemplateContentView = CoreLibrary.TemplateContentView,
@@ -120,6 +122,7 @@ sap.ui.define(
 			share: Share.override(ShareOverrides),
 			editFlow: EditFlow.override(EditFlowOverrides),
 			viewState: ViewState.override(ViewStateOverrides),
+			kpiManagement: KPIManagement,
 
 			getExtensionAPI: function() {
 				if (!this.extensionAPI) {
@@ -184,36 +187,33 @@ sap.ui.define(
 				this.extensionAPI && this.extensionAPI.destroy();
 				delete this.extensionAPI;
 			},
+
 			_onAfterBinding: function() {
 				var aTables = this._getTables();
 				var that = this;
 				if (EditState.isEditStateDirty()) {
 					var oTableBinding = this._getTableBinding();
-					if (!this.sUpdateTimer) {
-						this.sUpdateTimer = setTimeout(function() {
-							if (oTableBinding) {
+					if (oTableBinding) {
+						if (!this.sUpdateTimer) {
+							this.sUpdateTimer = setTimeout(function() {
 								oTableBinding.refresh();
-							}
-							delete that.sUpdateTimer;
-						}, 0);
+								delete that.sUpdateTimer;
+							}, 0);
+						}
+
+						// Update action enablement and visibility upon table data update.
+						var fnUpdateTableActions = function() {
+							that._updateTableActions(aTables);
+							oTableBinding.detachDataReceived(fnUpdateTableActions);
+						};
+						oTableBinding.attachDataReceived(fnUpdateTableActions);
 					}
 					EditState.setEditStateProcessed();
 				}
-				var aIBNActions = [];
-				aTables.forEach(function(oTable) {
-					aIBNActions = CommonUtils.getIBNActions(oTable, aIBNActions);
-					TableUtils.getSemanticTargetsFromTable(that, oTable);
-					// Update 'enabled' property of DataFieldForAction buttons on table toolbar
-					// The same is also performed on Table selectionChange event
-					var oInternalModelContext = oTable.getBindingContext("internal"),
-						oActionOperationAvailableMap = JSON.parse(
-							CommonHelper.parseCustomData(DelegateUtil.getCustomData(oTable, "operationAvailableMap"))
-						),
-						aSelectedContexts = oTable.getSelectedContexts();
-
-					CommonUtils.setActionEnablement(oInternalModelContext, oActionOperationAvailableMap, aSelectedContexts);
-				});
-				CommonUtils.updateDataFieldForIBNButtonsVisibility(aIBNActions, this.getView());
+
+				if (!this.sUpdateTimer) {
+					this._updateTableActions(aTables);
+				}
 
 				this.pageReady.waitFor(
 					this.getAppComponent()
@@ -221,6 +221,7 @@ sap.ui.define(
 						.applyAppState()
 				);
 			},
+
 			onAfterRendering: function(oEvent) {
 				var that = this;
 				this.getView()
@@ -314,6 +315,32 @@ sap.ui.define(
 				}
 				return this._sEntitySet;
 			},
+
+			/**
+			 * This method initiates update of enabled state of DataFieldForAction and visible state of DataFieldForIBN buttons.
+			 * @param aTables Array of tables in the List report
+			 * @private
+			 */
+			_updateTableActions: function(aTables) {
+				var aIBNActions = [];
+				aTables.forEach(
+					function(oTable) {
+						aIBNActions = CommonUtils.getIBNActions(oTable, aIBNActions);
+						TableUtils.getSemanticTargetsFromTable(this, oTable);
+						// Update 'enabled' property of DataFieldForAction buttons on table toolbar
+						// The same is also performed on Table selectionChange event
+						var oInternalModelContext = oTable.getBindingContext("internal"),
+							oActionOperationAvailableMap = JSON.parse(
+								CommonHelper.parseCustomData(DelegateUtil.getCustomData(oTable, "operationAvailableMap"))
+							),
+							aSelectedContexts = oTable.getSelectedContexts();
+
+						CommonUtils.setActionEnablement(oInternalModelContext, oActionOperationAvailableMap, aSelectedContexts);
+					}.bind(this)
+				);
+				CommonUtils.updateDataFieldForIBNButtonsVisibility(aIBNActions, this.getView());
+			},
+
 			/**
 			 * This method scrolls to a specific row on all the available tables.
 			 *

package/src/sap/fe/templates/ListReport/overrides/IntentBasedNavigation.js

@@ -2,7 +2,7 @@
  * SAPUI5
  * (c) Copyright 2009-2021 SAP SE. All rights reserved.
  */
-sap.ui.define(["sap/fe/core/CommonUtils"], function(CommonUtils) {
+sap.ui.define(["sap/fe/core/CommonUtils", "sap/fe/macros/filter/FilterUtils"], function(CommonUtils, FilterUtils) {
 	"use strict";
 	return {
 		adaptNavigationContext: function(oSelectionVariant, oTargetInfo) {
@@ -28,6 +28,10 @@ sap.ui.define(["sap/fe/core/CommonUtils"], function(CommonUtils) {
 					sRootPath,
 					aParameters
 				);
+				var oFilterBar = oController._getFilterBarControl();
+				var oFilterInfo = FilterUtils.getFilterInfo(oFilterBar, {
+					targetControl: oController._getCurrentTable()
+				}).filters;
 				var oInternalModelContext = oView.getBindingContext("internal");
 				var mTabs = oInternalModelContext.getProperty("tabs");
 				// Do we need to exclude Fields (mutli tables mode)?
@@ -40,7 +44,7 @@ sap.ui.define(["sap/fe/core/CommonUtils"], function(CommonUtils) {
 					}
 				}
 				// TODO: move this also into the intent based navigation controller extension
-				CommonUtils.addExternalStateFiltersToSelectionVariant(oSelectionVariant, oFilterBarConditions, oTargetInfo);
+				CommonUtils.addExternalStateFiltersToSelectionVariant(oSelectionVariant, oFilterBarConditions, oTargetInfo, oFilterInfo);
 				delete oTargetInfo.propertiesWithoutConflict;
 			}
 		},

package/src/sap/fe/templates/ListReport/overrides/Share.js

@@ -51,15 +51,15 @@ sap.ui.define(
 			return baseUrl + aSupportedParams.join("&");
 		}
 
-		function getCustomUrl() {
-			var sCustomUrl;
+		function getShareUrl() {
+			var sShareUrl;
 			var sHash = HashChanger.getInstance().getHash();
 			var sBasePath = HashChanger.getInstance().hrefForAppSpecificHash ? HashChanger.getInstance().hrefForAppSpecificHash("") : "";
-			sCustomUrl = sHash ? sBasePath + sHash : window.location.href;
-			return sCustomUrl;
+			sShareUrl = sHash ? sBasePath + sHash : window.location.hash;
+			return sShareUrl;
 		}
 
-		function getServiceUrl(oController) {
+		function getSaveAsTileServiceUrl(oController) {
 			var oFilterBar = oController.getView().byId(
 				oController
 					.getView()
@@ -67,46 +67,56 @@ sap.ui.define(
 					.data("filterBarId")
 			);
 			var oConditions = oFilterBar.getFilterConditions();
-			var bServiceUrlAllowed = SemanticDateOperators.hasSemanticDateOperations(oConditions);
-			if (bServiceUrlAllowed) {
+			var bsaveAsTileServiceUrlAllowed = SemanticDateOperators.hasSemanticDateOperations(oConditions);
+			if (bsaveAsTileServiceUrlAllowed) {
 				return getCountUrl(oController);
 			} else {
 				return "";
 			}
 		}
 
-		return {
-			adaptShareData: function(oShareData) {
-				var oAppComponent = CommonUtils.getAppComponent(this.base.getView());
-				var oMetadata = oAppComponent.getMetadata();
-				var oUIManifest = oMetadata.getManifestEntry("sap.ui");
-				var sIcon = (oUIManifest && oUIManifest.icons && oUIManifest.icons.icon) || "";
-				var oAppManifest = oMetadata.getManifestEntry("sap.app");
-				var sTitle = (oAppManifest && oAppManifest.title) || "";
-				var that = this;
-				var oGetResourceBundle = this.base
-					.getView()
-					.getModel("sap.fe.i18n")
-					.getResourceBundle();
-				var sEmailSubject;
-				return oGetResourceBundle
-					.then(function(oBundle) {
-						sEmailSubject = oBundle.getText("T_SHARE_UTIL_HELPER_SAPFE_EMAIL_SUBJECT", [document.title]);
-						// TODO: check if there is any semantic date used before adding serviceURL as BLI:FIORITECHP1-18023
-						oShareData = {
-							icon: sIcon,
-							title: sTitle,
-							serviceUrl: getServiceUrl(that.base),
-							shareEmailUrl: document.URL,
-							emailSubject: sEmailSubject,
-							jamText: document.title
-						};
-						oShareData.customUrl = getCustomUrl();
-						return oShareData;
+		function getJamUrl() {
+			var sJamUrl;
+			var sHash = HashChanger.getInstance().getHash();
+			var sBasePath = HashChanger.getInstance().hrefForAppSpecificHash ? HashChanger.getInstance().hrefForAppSpecificHash("") : "";
+			sJamUrl = sHash ? sBasePath + sHash : window.location.hash;
+			// in case we are in cFLP scenario, the application is running
+			// inside an iframe, and there for we need to get the cFLP URL
+			// and not 'document.URL' that represents the iframe URL
+			if (sap.ushell && sap.ushell.Container && sap.ushell.Container.runningInIframe && sap.ushell.Container.runningInIframe()) {
+				sap.ushell.Container.getFLPUrl(true)
+					.then(function(sUrl) {
+						return sUrl.substr(0, sUrl.indexOf("#")) + sJamUrl;
 					})
-					.catch(function(oError) {
-						Log.error("Error while getting the resource bundle", oError);
+					.catch(function(sError) {
+						Log.error("Could not retrieve cFLP URL for the sharing dialog (dialog will not be opened)", sError);
 					});
+			} else {
+				return window.location.origin + window.location.pathname + sJamUrl;
+			}
+		}
+
+		return {
+			adaptShareMetadata: function(oShareMetadata) {
+				var that = this;
+				return Promise.resolve(getJamUrl()).then(function(sJamUrl) {
+					var oAppComponent = CommonUtils.getAppComponent(that.base.getView());
+					var oMetadata = oAppComponent.getMetadata();
+					var oUIManifest = oMetadata.getManifestEntry("sap.ui");
+					var sIcon = (oUIManifest && oUIManifest.icons && oUIManifest.icons.icon) || "";
+					var oAppManifest = oMetadata.getManifestEntry("sap.app");
+					var sTitle = (oAppManifest && oAppManifest.title) || "";
+					// TODO: check if there is any semantic date used before adding serviceURL as BLI:FIORITECHP1-18023
+					oShareMetadata.tile = {
+						icon: sIcon,
+						title: sTitle,
+						queryUrl: getSaveAsTileServiceUrl(that.base)
+					};
+					oShareMetadata.title = document.title;
+					oShareMetadata.url = getShareUrl();
+					oShareMetadata.jam.url = sJamUrl;
+					return oShareMetadata;
+				});
 			}
 		};
 	}