@sapui5/sap.fe.templates 1.95.0 → 1.96.4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.fe.templates",
-	"version": "1.95.0",
+	"version": "1.96.4",
 	"description": "SAPUI5 Library sap.fe.templates",
 	"license": "SEE LICENSE IN LICENSE.txt",
 	"author": "SAP SE (https://www.sap.com)",

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.95.0</version>
+    <version>1.96.4</version>
 
     <documentation>UI5 library: sap.fe.templates</documentation>
 

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	["sap/fe/templates/ListComponent"],

package/src/sap/fe/templates/AnalyticalListPage/chart/FEChartDelegate.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 // ---------------------------------------------------------------------------------------
 // Helper class used to help create content in the chart/item and fill relevant metadata

package/src/sap/fe/templates/ListComponent.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	["sap/fe/core/TemplateComponent", "sap/fe/core/library"],

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	["sap/fe/templates/ListComponent"],

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["sap/fe/core/ExtensionAPI", "sap/fe/macros/filter/FilterUtils", "sap/fe/macros/chart/ChartUtils"], function(
 	ExtensionAPI,
@@ -59,7 +59,7 @@ sap.ui.define(["sap/fe/core/ExtensionAPI", "sap/fe/macros/filter/FilterUtils", "
 		 */
 		getSelectedContexts: function() {
 			var oControl = (this._controller._isMultiMode() && this._controller._getCurrentControl()) || this._controller._getTable();
-			if (oControl.isA("sap.ui.mdc.Chart")) {
+			if (oControl.isA("sap.ui.mdc.ChartNew")) {
 				var aSelectedContexts = [];
 				if (oControl && oControl.get_chart()) {
 					var aSelectedDataPoints = ChartUtils.getChartSelectedData(oControl.get_chart());

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

@@ -157,10 +157,11 @@
 								<macroInternal:FilterBar
 									unittest:id="listReportFilterBarTest"
 									id="{converterContext>filterBarId}"
+									_applyIdToContent="true"
 									contextPath="{entityType>}"
 									variantBackreference="{= CORE.getVariantBackReference(${viewData>}, ${converterContext>} )}"
 									selectionFields="{filterBarContext>selectionFields}"
-									filtersChanged=".handlers.onFiltersChanged"
+									filterChanged=".handlers.onFiltersChanged"
 									filterConditions="{parts:[{path:'converterContext>filterConditions'}, {path:'entitySet>'}], formatter: 'FILTER.getFilterConditions'}"
 									search=".handlers.onSearch"
 									hideBasicSearch="{filterBarContext>hideBasicSearch}"

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 sap.ui.define(
@@ -144,6 +144,7 @@ sap.ui.define(
 
 				oInternalModelContext.setProperty("hasPendingFilters", true);
 				oInternalModelContext.setProperty("appliedFilters", "");
+				oInternalModelContext.setProperty("hideDraftInfo", false);
 				oInternalModelContext.setProperty("uom", {});
 				oInternalModelContext.setProperty("scalefactor", {});
 				oInternalModelContext.setProperty("scalefactorNumber", {});
@@ -244,21 +245,14 @@ sap.ui.define(
 					});
 			},
 			onPageReady: function(mParameters) {
-				var oLastFocusedControl = mParameters.lastFocusedControl;
-				var oView = this.getView();
-				// set the focus to the first action button, or to the first editable input if in editable mode
-				if (oLastFocusedControl && oLastFocusedControl.controlId && oLastFocusedControl.focusInfo) {
-					var oFocusControl = oView.byId(oLastFocusedControl.controlId);
-					if (oFocusControl) {
-						oFocusControl.applyFocusInfo(oLastFocusedControl.focusInfo);
-					}
-				}
-
 				// Enabling mandatory filter fields message dialog and focusing on them
-				var oFilterBar = this._getFilterBarControl();
-				if (oFilterBar && !oFilterBar.getShowMessages()) {
-					oFilterBar.setShowMessages(true);
-					oFilterBar.setFocusOnFirstErroneousField();
+				if (mParameters.forceFocus) {
+					var oFilterBar = this._getFilterBarControl();
+
+					if (oFilterBar && !oFilterBar.getShowMessages()) {
+						oFilterBar.setShowMessages(true);
+						oFilterBar.setFocusOnFirstErroneousField();
+					}
 				}
 			},
 
@@ -317,21 +311,18 @@ sap.ui.define(
 			 */
 			_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)
-				);
+				aTables.forEach(function(oTable) {
+					aIBNActions = CommonUtils.getIBNActions(oTable, aIBNActions);
+					// 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());
 			},
 
@@ -413,6 +404,10 @@ sap.ui.define(
 				return this._oListReportControl;
 			},
 			_getTable: function() {
+				if (this._isMultiMode()) {
+					var oControl = this._getCurrentControl();
+					return oControl && oControl.isA("sap.ui.mdc.Table") ? oControl : undefined;
+				}
 				return this.getView().byId(this._getTableControlId());
 			},
 			_getChart: function() {
@@ -569,7 +564,10 @@ sap.ui.define(
 				aCharts.forEach(function(oChart) {
 					var sChartEntityPath = oChart.data("targetCollectionPath"),
 						sChartEntitySet = sChartEntityPath.slice(1),
-						sTabId = oChart.getParent().getKey(),
+						sTabId = oChart
+							.getParent()
+							.getParent()
+							.getKey(),
 						sCacheKey = sChartEntitySet + "Chart";
 					if (!mCache[sCacheKey]) {
 						mCache[sCacheKey] = FilterUtils.getNotApplicableFilters(oFilterBar, oChart);
@@ -610,7 +608,7 @@ sap.ui.define(
 						var oControl = that.getView().byId(oItem.getKey());
 						if (
 							oControl &&
-							!oControl.isA("sap.ui.mdc.Chart") &&
+							!oControl.isA("sap.ui.mdc.ChartNew") &&
 							(oItem.data("outdatedCounts") || oControl.getId() === sDisplayedControlId)
 						) {
 							aCompliantTabs.push({
@@ -667,8 +665,9 @@ sap.ui.define(
 				}
 			},
 			_updateChart: function(oChart) {
-				if (!oChart.isInnerChartBound() || this.hasPendingTableChanges) {
-					oChart.getControlDelegate().rebindChart(oChart, oChart.getBindingInfo("data"));
+				var oInnerChart = oChart.getControlDelegate()._getChart(oChart);
+				if (!(oInnerChart && oInnerChart.isBound("data")) || this.hasPendingTableChanges) {
+					oChart.getControlDelegate().rebindChart(oChart, oInnerChart.getBindingInfo("data"));
 					this.hasPendingTableChanges = false;
 				}
 			},
@@ -691,7 +690,7 @@ sap.ui.define(
 								refreshCause: "tabChanged"
 							});
 						} else if (
-							!oDisplayedControl.isA("sap.ui.mdc.Chart") &&
+							!oDisplayedControl.isA("sap.ui.mdc.ChartNew") &&
 							(!oDisplayedControl.getRowBinding() || // first time the tab/table is displayed
 								oDisplayedControl.data("outdatedRows") === true)
 						) {
@@ -699,11 +698,15 @@ sap.ui.define(
 							oDisplayedControl.rebindTable();
 							oDisplayedControl.data("outdatedRows", false);
 						} else if (
-							oDisplayedControl.isA("sap.ui.mdc.Chart") &&
-							(!oDisplayedControl.getBinding("data") || // first time the tab/chart is displayed
+							oDisplayedControl.isA("sap.ui.mdc.ChartNew") &&
+							(!oDisplayedControl
+								.getControlDelegate()
+								._getChart(oDisplayedControl)
+								.getBinding("data") || // first time the tab/chart is displayed
 								oDisplayedControl.data("outdatedRows") === true)
 						) {
-							oDisplayedControl.getControlDelegate().rebindChart(oDisplayedControl, oDisplayedControl.getBindingInfo("data"));
+							var oInnerChart = oDisplayedControl.getControlDelegate()._getChart(oDisplayedControl);
+							oDisplayedControl.getControlDelegate().rebindChart(oDisplayedControl, oInnerChart.getBindingInfo("data"));
 							oDisplayedControl.data("outdatedRows", false);
 						}
 					}
@@ -714,8 +717,10 @@ sap.ui.define(
 						oInternalModelContext = this.getView().getBindingContext("internal");
 					// Pending filters into FilterBar to be used for custom views
 					this.onPendingFilters();
+					var bHideDraft = FilterUtils.getEditStateIsHideDraft(oFilterBar.getConditions());
 					oInternalModelContext.setProperty("appliedFilters", oFilterBar.getAssignedFiltersText().filtersText);
 					oInternalModelContext.setProperty("hasPendingFilters", true);
+					oInternalModelContext.setProperty("hideDraftInfo", bHideDraft);
 					if (oEvent.getParameter("conditionsBased")) {
 						this.getExtensionAPI().updateAppState();
 					}
@@ -800,13 +805,13 @@ sap.ui.define(
 					}
 				},
 				/**
-				 * Triggers an outbound navigation on Chevron Press.
+				 * Triggers an outbound navigation when a user chooses the chevron.
 				 *
 				 * @param {object} oController
 				 * @param {string} sOutboundTarget Name of the outbound target (needs to be defined in the manifest)
 				 * @param {sap.ui.model.odata.v4.Context} oContext The context that contain the data for the target app
-				 * @param {string} sCreatePath Create path in case of chevron create.
-				 * @returns {Promise} Promise which is resolved once the navigation is triggered (??? maybe only once finished?)
+				 * @param {string} sCreatePath Create path when the chevron is created.
+				 * @returns {Promise} Promise which is resolved once the navigation is triggered
 				 * @ui5-restricted
 				 * @final
 				 */
@@ -819,11 +824,11 @@ sap.ui.define(
 					);
 				},
 				onChartSelectionChanged: function(oEvent) {
-					var oMdcChart = oEvent.getSource(),
+					var oMdcChart = oEvent.getSource().getContent(),
 						oTable = this._getTable(),
-						oDataContext = oEvent.getParameter("dataContext"),
+						aData = oEvent.getParameter("data"),
 						oInternalModelContext = this.getView().getBindingContext("internal");
-					if (oDataContext && oDataContext.data) {
+					if (aData) {
 						// update action buttons enablement / disablement
 						ChartRuntime.fnUpdateChart(oEvent);
 						// update selections on selection or deselection
@@ -899,8 +904,19 @@ sap.ui.define(
 				}
 			},
 			formatters: {
-				isDraftIndicatorVisible: function(sPropertyPath, sSemanticKeyHasDraftIndicator, HasDraftEntity, IsActiveEntity) {
-					if (IsActiveEntity !== undefined && HasDraftEntity !== undefined && (!IsActiveEntity || HasDraftEntity)) {
+				isDraftIndicatorVisible: function(
+					sPropertyPath,
+					sSemanticKeyHasDraftIndicator,
+					HasDraftEntity,
+					IsActiveEntity,
+					hideDraftInfo
+				) {
+					if (
+						IsActiveEntity !== undefined &&
+						HasDraftEntity !== undefined &&
+						(!IsActiveEntity || HasDraftEntity) &&
+						!hideDraftInfo
+					) {
 						return sPropertyPath === sSemanticKeyHasDraftIndicator;
 					} else {
 						return false;
@@ -943,9 +959,6 @@ sap.ui.define(
 						}
 					}
 					return sText;
-				},
-				compareTitleFromTableAndTab: function(headerVisible, tableTitle, tabTitle) {
-					return this.commonFormatters.compareTitleFromTableAndTab(headerVisible, tableTitle, tabTitle, this);
 				}
 			}
 		});

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

@@ -1,8 +1,8 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 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._getTable()
+				}).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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	["sap/fe/core/helpers/SemanticDateOperators", "sap/ui/core/routing/HashChanger", "sap/fe/core/CommonUtils", "sap/base/Log"],
@@ -52,11 +52,19 @@ sap.ui.define(
 		}
 
 		function getShareUrl() {
-			var sShareUrl;
-			var sHash = HashChanger.getInstance().getHash();
-			var sBasePath = HashChanger.getInstance().hrefForAppSpecificHash ? HashChanger.getInstance().hrefForAppSpecificHash("") : "";
-			sShareUrl = sHash ? sBasePath + sHash : window.location.hash;
-			return sShareUrl;
+			var oUShellContainer = sap.ushell && sap.ushell.Container;
+			if (oUShellContainer) {
+				return oUShellContainer
+					.getFLPUrlAsync(true)
+					.then(function(sFLPUrl) {
+						return sFLPUrl;
+					})
+					.catch(function(sError) {
+						Log.error("Could not retrieve cFLP URL for the sharing dialog (dialog will not be opened)", sError);
+					});
+			} else {
+				return Promise.resolve(document.URL);
+			}
 		}
 
 		function getSaveAsTileServiceUrl(oController) {
@@ -99,22 +107,29 @@ sap.ui.define(
 		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;
+				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.jam.url = sJamUrl;
+					})
+					.catch(function(error) {
+						Log.error(error);
+					});
+
+				return Promise.resolve(getShareUrl()).then(function(sFLPUrl) {
+					oShareMetadata.url = sFLPUrl;
 					return oShareMetadata;
 				});
 			}

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[
@@ -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,
@@ -121,28 +122,109 @@ sap.ui.define(
 			},
 			applyNavigationParameters: function(oNavigationParameter, aResults) {
 				var oView = this.getView(),
+					that = this,
+					oController = oView.getController(),
+					oAppComponent = oController.getAppComponent(oView),
+					oComponentData = oAppComponent.getComponentData(),
+					oStartupParameters = (oComponentData && oComponentData.startupParameters) || {},
+					oVariantPromise = that.handleVariantIdPassedViaURLParams(oStartupParameters),
+					bFilterVariantApplied;
+				aResults.push(
+					oVariantPromise
+						.then(function(aVariants) {
+							if (aVariants && aVariants.length > 0) {
+								if (aVariants[0] === true || aVariants[1] === true) {
+									bFilterVariantApplied = true;
+								}
+							}
+							return that._applySelectionVariant(oView, oNavigationParameter, bFilterVariantApplied).then(function() {
+								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);
+							});
+						})
+						.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) {
@@ -170,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) {
@@ -186,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) {
@@ -199,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();

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 sap.ui.define(
@@ -359,7 +359,7 @@ sap.ui.define(
 					entitySetName: CommonHelper.addSingleQuotes(sEntitySetName),
 					invocationGrouping: CommonHelper.addSingleQuotes(sInvocationGroup),
 					model: "${$source>/}.getModel()",
-					label: CommonHelper.addSingleQuotes(oDataField && oDataField.Label),
+					label: CommonHelper.addSingleQuotes(oDataField && oDataField.Label, true),
 					isNavigable: oHeaderAction && oHeaderAction.isNavigable,
 					defaultValuesExtensionFunction:
 						oHeaderAction && oHeaderAction.defaultValuesExtensionFunction
@@ -392,7 +392,7 @@ sap.ui.define(
 					entitySetName: CommonHelper.addSingleQuotes(sEntitySetName),
 					invocationGrouping: CommonHelper.addSingleQuotes(sInvocationGroup),
 					model: "${$source>/}.getModel()",
-					label: CommonHelper.addSingleQuotes(oDataField && oDataField.Label),
+					label: CommonHelper.addSingleQuotes(oDataField && oDataField.Label, true),
 					isNavigable: oHeaderAction && oHeaderAction.isNavigable,
 					defaultValuesExtensionFunction:
 						oHeaderAction && oHeaderAction.defaultValuesExtensionFunction
@@ -447,6 +447,26 @@ sap.ui.define(
 						return undefined;
 					}
 				}
+			},
+			isSubSectionTitleVisible: function(sSubSectionvisible, sSubSectiontitle, sSubSectionshowTitle) {
+				if (sSubSectionvisible.indexOf("{=") === 0) {
+					// Dynamic expression
+					var sExpressionResult = sSubSectionvisible.substring(
+						sSubSectionvisible.indexOf("{=") + 2,
+						sSubSectionvisible.lastIndexOf("}")
+					);
+					return (
+						"{= (" +
+						sExpressionResult +
+						") && ('" +
+						sSubSectiontitle +
+						"' !=='undefined') && (" +
+						sSubSectionshowTitle +
+						" ? true : false) }"
+					);
+				} else {
+					return sSubSectionvisible && sSubSectiontitle !== "undefined" && (sSubSectionshowTitle ? true : false);
+				}
 			}
 		};