@sapui5/sap.fe.templates 1.93.3 → 1.96.2

package/src/sap/fe/templates/ListReport/manifest.json

@@ -23,6 +23,16 @@
 				}
 			}
 		},
-		"handleValidation": true
+		"handleValidation": true,
+		"dependencies": {
+			"minUI5Version": "${sap.ui5.core.version}",
+			"libs": {
+				"sap.fe.core": {},
+				"sap.ui.mdc": {},
+				"sap.fe.macros": {},
+				"sap.ui.fl": {},
+				"sap.fe.navigation": {}
+			}
+		}
 	}
 }

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

@@ -30,7 +30,7 @@ sap.ui.define(["sap/fe/core/CommonUtils", "sap/fe/macros/filter/FilterUtils"], f
 				);
 				var oFilterBar = oController._getFilterBarControl();
 				var oFilterInfo = FilterUtils.getFilterInfo(oFilterBar, {
-					targetControl: oController._getCurrentTable()
+					targetControl: oController._getTable()
 				}).filters;
 				var oInternalModelContext = oView.getBindingContext("internal");
 				var mTabs = oInternalModelContext.getProperty("tabs");

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

@@ -10,9 +10,10 @@ sap.ui.define(
 		"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 		"sap/ui/mdc/p13n/StateUtil",
 		"sap/ui/Device",
-		"sap/ui/mdc/enum/ConditionValidated"
+		"sap/ui/mdc/enum/ConditionValidated",
+		"sap/base/Log"
 	],
-	function(CoreLibrary, NavLibrary, CommonUtils, ControlVariantApplyAPI, StateUtil, Device, ConditionValidated) {
+	function(CoreLibrary, NavLibrary, CommonUtils, ControlVariantApplyAPI, StateUtil, Device, ConditionValidated, Log) {
 		"use strict";
 
 		var NavType = NavLibrary.NavType,
@@ -28,7 +29,7 @@ sap.ui.define(
 				var oView = this.getView(),
 					oController = oView.getController(),
 					oFilterBar = oController._getFilterBarControl(),
-					aTables = oController._getTables();
+					aTables = oController._getControls("table");
 
 				oFilterBar.setSuspendSelection(true);
 				aTables.forEach(function(oTable) {
@@ -43,6 +44,14 @@ sap.ui.define(
 					oController = oView.getController();
 				oController._getFilterBarControl().setSuspendSelection(false);
 			},
+			adaptBindingRefreshControls: function(aControls) {
+				var oView = this.getView(),
+					oController = oView.getController(),
+					aViewControls = oController._getControls(),
+					aControlsToRefresh = CommonUtils.getControlsForRefresh(oView, aViewControls);
+
+				Array.prototype.push.apply(aControls, aControlsToRefresh);
+			},
 			adaptStateControls: function(aStateControls) {
 				var oView = this.getView(),
 					oController = oView.getController(),
@@ -57,7 +66,7 @@ sap.ui.define(
 				if (oFilterBarVM) {
 					aStateControls.push(oFilterBarVM);
 				}
-				oController._getTables().forEach(function(oTable) {
+				oController._getControls("table").forEach(function(oTable) {
 					var oQuickFilter = oTable.getQuickFilter();
 					if (oQuickFilter) {
 						aStateControls.push(oQuickFilter);
@@ -113,28 +122,109 @@ sap.ui.define(
 			},
 			applyNavigationParameters: function(oNavigationParameter, aResults) {
 				var oView = this.getView(),
+					that = this,
+					oController = oView.getController(),
+					oComponent = oController.getOwnerComponent(),
+					oAppComponent = sap.ui.core.Component.getOwnerComponentFor(oComponent),
+					oComponentData = oAppComponent.getComponentData(),
+					oStartupParameters = (oComponentData && oComponentData.startupParameters) || {},
+					oVariantPromise = that.handleVariantIdPassedViaURLParams(oStartupParameters),
+					bFilterVariantApplied;
+				oVariantPromise
+					.then(function(aVariants) {
+						if (aVariants && aVariants.length > 0) {
+							if (aVariants[0] === true || aVariants[1] === true) {
+								bFilterVariantApplied = true;
+							}
+						}
+						var oRes = that._applySelectionVariant(oView, oNavigationParameter, bFilterVariantApplied).then(function() {
+							var oController = oView.getController();
+							var oDynamicPage = oView.byId("fe::ListReport");
+							var bPreventInitialSearch = false;
+							var oFilterBarVM = that._getFilterBarVM(oView);
+							var oFilterBarControl = oController._getFilterBarControl();
+							if (
+								(oNavigationParameter.navigationType !== NavType.initial && oNavigationParameter.requiresStandardVariant) ||
+								(!oFilterBarVM && oView.getViewData().initialLoad === InitialLoadMode.Enabled) ||
+								oController._shouldAutoTriggerSearch(oFilterBarVM)
+							) {
+								oFilterBarControl.triggerSearch();
+							} else {
+								bPreventInitialSearch = that._preventInitialSearch(oFilterBarVM);
+							}
+							that._bSearchTriggered = !bPreventInitialSearch;
+							oDynamicPage.setHeaderExpanded(Device.system.desktop || bPreventInitialSearch);
+						});
+						aResults.push(oRes);
+					})
+					.catch(function() {
+						Log.error("Variant ID cannot be applied");
+					});
+			},
+
+			handleVariantIdPassedViaURLParams: function(oUrlParams) {
+				var aPageVariantId = oUrlParams["sap-ui-fe-variant-id"],
+					aFilterBarVariantId = oUrlParams["sap-ui-fe-filterbar-variant-id"],
+					aTableVariantId = oUrlParams["sap-ui-fe-table-variant-id"],
+					oVariant;
+				if (aPageVariantId || aFilterBarVariantId || aTableVariantId) {
+					oVariant = {
+						sPageVariantId: aPageVariantId && aPageVariantId[0],
+						sFilterBarVariantId: aFilterBarVariantId && aFilterBarVariantId[0],
+						sTableVariantId: aTableVariantId && aTableVariantId[0]
+					};
+				}
+				return this._handleControlVariantId(oVariant);
+			},
+
+			_handleControlVariantId: function(oVariantIDs) {
+				var oView = this.getView(),
+					aPromises = [],
 					that = this;
-				var oRes = this._applySelectionVariant(oView, oNavigationParameter).then(function() {
-					var oController = oView.getController();
-					var oDynamicPage = oView.byId("fe::ListReport");
-					var bPreventInitialSearch = false;
-					var oFilterBarVM = that._getFilterBarVM(oView);
-					var oFilterBarControl = oController._getFilterBarControl();
-					if (
-						oNavigationParameter.navigationType !== NavType.initial ||
-						(!oFilterBarVM && oView.getViewData().initialLoad === InitialLoadMode.Enabled) ||
-						oController._shouldAutoTriggerSearch(oFilterBarVM)
-					) {
-						oFilterBarControl.triggerSearch();
-					} else {
-						bPreventInitialSearch = that._preventInitialSearch(oFilterBarVM);
+				var sVariantManagement = oView.getViewData().variantManagement;
+				if (oVariantIDs && oVariantIDs.sPageVariantId && sVariantManagement === "Page") {
+					var oVM = oView.byId("fe::PageVariantManagement");
+					oVM.getVariants().forEach(function(oVariant) {
+						if (oVariant.key === oVariantIDs.sPageVariantId) {
+							aPromises.push(that._applyControlVariant(oVM, oVariantIDs.sPageVariantId, true));
+						}
+					});
+				} else if (oVariantIDs && sVariantManagement === "Control") {
+					if (oVariantIDs.sFilterBarVariantId) {
+						var oVM = oView.byId(oView.getContent()[0].data("filterBarVariantId"));
+						oVM.getVariants().forEach(function(oVariant) {
+							if (oVariant.key === oVariantIDs.sFilterBarVariantId) {
+								aPromises.push(that._applyControlVariant(oVM, oVariantIDs.sFilterBarVariantId, true));
+							}
+						});
 					}
-					that._bSearchTriggered = !bPreventInitialSearch;
-					oDynamicPage.setHeaderExpanded(Device.system.desktop || bPreventInitialSearch);
-				});
-				aResults.push(oRes);
+					if (oVariantIDs.sTableVariantId) {
+						var oController = oView.getController(),
+							aTables = oController._getControls("table");
+						aTables.forEach(function(oTable) {
+							var oTableVariant = oTable.getVariant();
+							if (oTable && oTableVariant) {
+								oTableVariant.getVariants().forEach(function(oVariant) {
+									if (oVariant.key === oVariantIDs.sTableVariantId) {
+										aPromises.push(that._applyControlVariant(oTableVariant, oVariantIDs.sTableVariantId));
+									}
+								});
+							}
+						});
+					}
+				}
+				return Promise.all(aPromises);
 			},
 
+			_applyControlVariant: function(oVariant, sVariantID, bFilterVariantApplied) {
+				var oVM = ControlVariantApplyAPI.activateVariant({
+					element: oVariant,
+					variantReference: sVariantID
+				});
+				return oVM.then(function() {
+					return bFilterVariantApplied;
+				});
+			},
 			/************************************* private helper *****************************************/
 
 			_getFilterBarVM: function(oView) {
@@ -162,7 +252,7 @@ sap.ui.define(
 				return !oCurrentVariant.executeOnSelect;
 			},
 
-			_applySelectionVariant: function(oView, oNavigationParameter) {
+			_applySelectionVariant: function(oView, oNavigationParameter, bFilterVariantApplied) {
 				var oSelectionVariant = oNavigationParameter.selectionVariant,
 					oSelectionVariantDefaults = oNavigationParameter.selectionVariantDefaults;
 				if (!oSelectionVariant) {
@@ -178,6 +268,9 @@ sap.ui.define(
 					oVariant,
 					bRequiresStandardVariant = oNavigationParameter.requiresStandardVariant;
 
+				if (bFilterVariantApplied) {
+					oConditions = oFilterBar.getConditions();
+				}
 				CommonUtils.addDefaultDisplayCurrency(aMandatoryFilterFields, oSelectionVariant, oSelectionVariantDefaults);
 				CommonUtils.addSelectionVariantToConditions(oSelectionVariant, oConditions, oMetaModel, sContextPath);
 				switch (oViewData.variantManagement) {
@@ -191,13 +284,13 @@ sap.ui.define(
 					default:
 						break;
 				}
-				return this._activateSelectionVariant(oFilterBar, oConditions, oVariant, bRequiresStandardVariant);
+				return this._activateSelectionVariant(oFilterBar, oConditions, oVariant, bRequiresStandardVariant, bFilterVariantApplied);
 			},
-			_activateSelectionVariant: function(oFilterBar, oConditions, oVariant, bRequiresStandardVariant) {
+			_activateSelectionVariant: function(oFilterBar, oConditions, oVariant, bRequiresStandardVariant, bFilterVariantApplied) {
 				var that = this,
 					oPromise;
 
-				if (oVariant) {
+				if (oVariant && !bFilterVariantApplied) {
 					var oVariantKey = bRequiresStandardVariant ? oVariant.getStandardVariantKey() : oVariant.getDefaultVariantKey();
 					if (oVariantKey === null) {
 						oVariantKey = oVariant.getId();
@@ -247,6 +340,10 @@ sap.ui.define(
 								}
 								if (oPropertyInfo.hasValueHelp) {
 									mFilter[oPropertyInfo.path].forEach(fnAdjustValueHelpCondition);
+								} else {
+									mFilter[oPropertyInfo.path].forEach(function(oCondition) {
+										oCondition.validated = ConditionValidated.NotValidated;
+									});
 								}
 							} else {
 								mFilter[oPropertyInfo.path] = [];

package/src/sap/fe/templates/ListReport/view/fragments/MultipleMode.fragment.xml

@@ -19,7 +19,7 @@
 					<template:with path="view>presentation" var="presentationContext">
 						<IconTabFilter
 						text="{view>title}"
-						key="{= ${view>tableControlId} || ${view>customTabId} }"
+						key="{= ${view>tableControlId} || ${view>customTabId} || ${view>chartControlId}}"
 						customData:selectionVariant="{view>selectionVariantPath}"
 					>
 							<content>
@@ -29,12 +29,12 @@
 									</template:then>
 									<template:else>
 										<MessageStrip
-										text="{= '{parts: [{path: \'internal>tabs/ignoredFields/' + ${view>tableControlId} + '\'}, {path: \'\', value: \'' + ${view>title} + '\' }], formatter: \'.formatters.setTabMessageStrip\'}' }"
+										text="{= '{parts: [{path: \'internal>tabs/ignoredFields/' + (${view>tableControlId} || ${view>chartControlId}) + '\'}, {path: \'\', value: \'' + ${view>title} + '\' }], formatter: \'.formatters.setTabMessageStrip\'}' }"
 										type="Information"
 										showIcon="true"
 										showCloseButton="true"
 										class="sapUiSmallMargin"
-										visible="{= '{= (${internal>tabs/ignoredFields/' + ${view>tableControlId} + '} || []).length>0 }' }"
+										visible="{= '{= (${internal>tabs/ignoredFields/' +(${view>tableControlId} || ${view>chartControlId}) + '} || []).length>0 }' }"
 									>
 										</MessageStrip>
 										<core:Fragment fragmentName="sap.fe.templates.ListReport.view.fragments.CollectionVisualization" type="XML" />

package/src/sap/fe/templates/ObjectPage/AnnotationHelper.js

@@ -69,16 +69,32 @@ sap.ui.define(
 			},
 
 			/**
-			 * Function to format the 'enable' property for the Delete button in the object page or subobject page in case of Command Execution.
-			 * @param {object} oDeletable Current 'delete' restriction value for the entity set.
-			 * @param {Array}	aConverterContextHeaderActions Array of 'header' actions on the object page.
-			 * @returns {string} Returns the expression binding or Boolean value based on oDeleteHidden, viewLevel.
+			 * Function to find an action from the array of header actions in the converter context.
+			 *
+			 * @param {object[]} aConverterContextHeaderActions Array of 'header' actions on the object page.
+			 * @param {string} sActionType The action type
+			 * @returns {object | undefined} The action with the matching action type
+			 * @private
 			 */
-			getDeleteCommandExecutionEnabled: function(oDeletable, aConverterContextHeaderActions) {
-				var oDeleteAction = aConverterContextHeaderActions.find(function(oAction) {
-					return oAction.type === "Secondary";
-				});
-				return this.getDeleteButtonEnabled(oDeletable, oDeleteAction.parentEntityDeleteEnabled);
+			_findAction: function(aConverterContextHeaderActions, sActionType) {
+				var oAction;
+				if (aConverterContextHeaderActions && aConverterContextHeaderActions.length) {
+					oAction = aConverterContextHeaderActions.find(function(oHeaderAction) {
+						return oHeaderAction.type === sActionType;
+					});
+				}
+				return oAction;
+			},
+
+			/**
+			 * Function to format the 'enabled' property for the Delete button on the object page or subobject page in case of a Command Execution.
+			 *
+			 * @param {Array} aConverterContextHeaderActions Array of header actions on the object page
+			 * @returns {string} Returns expression binding or Boolean value from the converter output
+			 */
+			getDeleteCommandExecutionEnabled: function(aConverterContextHeaderActions) {
+				var oDeleteAction = AnnotationHelper._findAction(aConverterContextHeaderActions, "Secondary");
+				return oDeleteAction ? oDeleteAction.enabled : "true";
 			},
 			/**
 			 * Function to format the 'visible' property for the Delete button on the object page or subobject page in case of a Command Execution.
@@ -87,10 +103,7 @@ sap.ui.define(
 			 * @returns {string} Returns expression binding or Boolean value from the converter output
 			 */
 			getDeleteCommandExecutionVisible: function(aConverterContextHeaderActions) {
-				var oDeleteAction = aConverterContextHeaderActions.find(function(oAction) {
-					return oAction.type === "Secondary";
-				});
-
+				var oDeleteAction = AnnotationHelper._findAction(aConverterContextHeaderActions, "Secondary");
 				return oDeleteAction ? oDeleteAction.visible : "true";
 			},
 			/**
@@ -100,38 +113,18 @@ sap.ui.define(
 			 * @returns {string} Returns expression binding or Boolean value from the converter output
 			 */
 			getEditCommandExecutionVisible: function(aConverterContextHeaderActions) {
-				var oEditAction = aConverterContextHeaderActions.find(function(oAction) {
-					return oAction.type === "Primary";
-				});
-
+				var oEditAction = AnnotationHelper._findAction(aConverterContextHeaderActions, "Primary");
 				return oEditAction ? oEditAction.visible : "true";
 			},
 			/**
-			 * Function to get the enablement for the Delete button on the object page or subobject page.
+			 * Function to format the 'enabled' property for the Edit button on the object page or subobject page in case of a Command Execution.
 			 *
-			 * @param {object} [oDeletable] Delete restrictions on the entity set
-			 * @returns {string} Returns expression binding or Boolean value based on oDeletable
-			 */
-			fnGetDeleteButtonEnabled: function(oDeletable) {
-				if (oDeletable === "false") {
-					return false;
-				} else if (oDeletable && oDeletable !== "true") {
-					return "{= $" + oDeletable + "}";
-				} else {
-					return true;
-				}
-			},
-
-			/**
-			 * Function to get the enablement for the Delete button in the object page/sub-object page based on current and parent entity-set restrictions.
-			 *
-			 * @param {object} [oDeletable] Current Entity Set delete restriction value.
-			 * @param {object} [bParentDeleteRestrictionEnabled] The parent entity's delete restriction value via navigation restriction.
-			 * @returns {string} Returns expression binding or boolean value based on oDeletable
+			 * @param {Array} aConverterContextHeaderActions Array of header actions on the object page
+			 * @returns {string} Returns expression binding or Boolean value from the converter output
 			 */
-			getDeleteButtonEnabled: function(oDeletable, bParentDeleteRestrictionEnabled) {
-				var bDeletable = AnnotationHelper.fnGetDeleteButtonEnabled(oDeletable);
-				return bParentDeleteRestrictionEnabled ? bParentDeleteRestrictionEnabled : bDeletable;
+			getEditCommandExecutionEnabled: function(aConverterContextHeaderActions) {
+				var oEditAction = AnnotationHelper._findAction(aConverterContextHeaderActions, "Primary");
+				return oEditAction ? oEditAction.enabled : "true";
 			},
 			/**
 			 * Function to get the EditAction from the Entityset based on Draft or sticky based application.
@@ -307,63 +300,6 @@ sap.ui.define(
 					? "{fclhelper>/breadCrumbIsVisible}"
 					: oViewData.showBreadCrumbs;
 			},
-			/*
-			 * Get expression for header action's enable property.
-			 *
-			 * @function
-			 * @param {Object} [operationAvailable] operationAvailable object,
-			 * @param {object} [oEntitySet] entity set information
-			 * @param {string} [sOperationAvailableFormatted] formatted value of operational available
-			 * returns {*} Expression or boolean values true if operationAvailable is not path based
-			 */
-			getEnabledExpressionForHeaderActions: function(operationAvailable, oEntitySet, sOperationAvailableFormatted) {
-				if (operationAvailable === null) {
-					var oEditAction =
-						(oEntitySet["@com.sap.vocabularies.Common.v1.DraftRoot"] &&
-							oEntitySet["@com.sap.vocabularies.Common.v1.DraftRoot"].EditAction) ||
-						(oEntitySet["@com.sap.vocabularies.Common.v1.StickySessionSupported"] &&
-							oEntitySet["@com.sap.vocabularies.Common.v1.StickySessionSupported"].EditAction);
-					if (oEditAction) {
-						return "{= ${#" + oEditAction + "} ? true : false }";
-					}
-				}
-				if (operationAvailable && operationAvailable.$Path) {
-					return sOperationAvailableFormatted;
-				} else {
-					return true;
-				}
-			},
-
-			/*
-			 * Gets the expression for the enablement of the action annotation.
-			 *
-			 * @function
-			 * @param {object} [oBound] The Bound action context
-			 * @param {object} [oActionContext] The object of the action context
-			 * @param {object} [oDataField] The object of the data field
-			 * @param {string} [sFormattedValueOperationalAvailable] The string value of the available operation
-			 * returns {*}  returns {*} both Boolean and expression with the following logic:
-			 * if none of the conditions is met, the button is enabled
-			 * if bound is false, then 'true' is returned as a string
-			 * in all other cases a runtime binding expression is returned
-			 */
-			getButtonEnabledForAnnotationAction: function(oBound, oActionContext, oDataField, sFormattedValueOperationalAvailable) {
-				if (oBound && oBound.$IsBound !== true) {
-					return "true";
-				}
-				if (oActionContext && oActionContext["@Org.OData.Core.V1.OperationAvailable"] === null && oDataField) {
-					return "{= !${#" + oDataField.Action + "} ? false : true } }";
-				}
-				if (
-					oActionContext &&
-					oActionContext["@Org.OData.Core.V1.OperationAvailable"] &&
-					oActionContext["@Org.OData.Core.V1.OperationAvailable"].$Path
-				) {
-					return "{= $" + sFormattedValueOperationalAvailable + "}";
-				}
-				return true;
-			},
-
 			getShareButtonVisibility: function(viewData) {
 				var sShareButtonVisibilityExp = "!${ui>createMode}";
 				if (viewData.fclEnabled) {
@@ -395,8 +331,8 @@ sap.ui.define(
 			 */
 			getPressExpressionForDelete: function(sEntitySetName) {
 				var sDeletableContexts = "${$view>/getBindingContext}",
-					sTitle = "${$view>/#fe::ObjectPage/getHeaderTitle/getExpandedHeading/getItems/1/getItems/0/getText}",
-					sDescription = "${$view>/#fe::ObjectPage/getHeaderTitle/getExpandedHeading/getItems/1/getItems/1/getText}";
+					sTitle = "${$view>/#fe::ObjectPage/getHeaderTitle/getExpandedHeading/getItems/1/getText}",
+					sDescription = "${$view>/#fe::ObjectPage/getHeaderTitle/getExpandedContent/0/getItems/0/getText}";
 				var oParams = {
 					title: sTitle,
 					entitySetName: CommonHelper.addSingleQuotes(sEntitySetName),

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

@@ -68,12 +68,6 @@ sap.ui.define(
 						prepareOnEdit: {
 							type: "boolean",
 							defaultValue: false
-						},
-						/**
-						 * Temporary fix to avoid activating all bindings when a message doesn't have a controlId at first
-						 */
-						_disableLazyLoadingForMessages: {
-							type: "boolean"
 						}
 					},
 					library: "sap.fe.templates",

package/src/sap/fe/templates/ObjectPage/ExtensionAPI.js

@@ -93,12 +93,27 @@ sap.ui.define(["sap/fe/core/ExtensionAPI", "sap/fe/core/CommonUtils", "sap/fe/co
 				oBindingContext
 			);
 		},
+
+		/**
+		 * Gets the list entries currently selected for the table.
+		 *
+		 * @alias sap.fe.templates.ObjectPage.ExtensionAPI#getSelectedContexts
+		 * @param {string} sTableId The ID identifying the table the selected context is requested for
+		 * @returns {sap.ui.model.odata.v4.Context[]} Array containing the selected contexts
+		 *
+		 * @public
+		 */
+		getSelectedContexts: function(sTableId) {
+			var oTable = this._view.byId(sTableId);
+			return (oTable && oTable.isA("sap.ui.mdc.Table") && oTable.getSelectedContexts()) || [];
+		},
+
 		/**
-		 * Displays / Hides the Side Content of an Object Page Block.
+		 * Displays or hides the side content of an object page block.
 		 *
 		 * @alias sap.fe.templates.ObjectPage.ExtensionAPI#showSideContent
-		 * @param {string} sSubSectionKey Key of the Side Content fragment as defined in manifest.json
-		 * @param {boolean} [bShow] Optional boolean flag to show / hide side content
+		 * @param {string} sSubSectionKey Key of the side content fragment as defined in the manifest.json
+		 * @param {boolean} [bShow] Optional Boolean flag to show or hide the side content
 		 *
 		 * @public
 		 */