@sapui5/sap.fe.templates 1.95.0 → 1.98.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.fe.templates",
-	"version": "1.95.0",
+	"version": "1.98.0",
 	"description": "SAPUI5 Library sap.fe.templates",
 	"license": "SEE LICENSE IN LICENSE.txt",
 	"author": "SAP SE (https://www.sap.com)",
@@ -8,14 +8,17 @@
 	"scripts": {
 		"build": "tsc -v && tsc --project tsconfig-build.json",
 		"prepare-npm-sources": "babel target/npm-sources/src --out-dir target/npm-sources/src --extensions \".ts\" --config-file ../../.babelrc",
-		"test": "echo 'nothing to do'"
+		"test": "jest --runInBand",
+		"test-refs": "jest --runInBand --config jest.config-refs.js",
+		"test-updateSnapshots": "jest --runInBand -u"
 	},
 	"keywords": [
 		"sapui5",
 		"ui5"
 	],
 	"devDependencies": {
+		"ts-node": "^9.1.1",
 		"@babel/cli": "^7.14.8",
-		"@ui5/cli": "^2.10.0"
+		"@ui5/cli": "^2.14.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.95.0</version>
+    <version>1.98.0</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
@@ -18,7 +18,7 @@ sap.ui.define(
 		 * data in chart and table must be synchronised. every
 		 * time the chart refreshes, the table must be refreshed too.
 		 */
-		ChartDelegate.rebindChart = function(oMDCChart, oBindingInfo) {
+		ChartDelegate.rebind = function(oMDCChart, oBindingInfo) {
 			//	var oComponent = flUtils.getAppComponentForControl(oMDCChart);
 			//	var bIsSearchTriggered = oComponent.getAppStateHandler().getIsSearchTriggered();
 			// workaround in place to prevent chart from loading when go button is present and initial load is false
@@ -26,7 +26,7 @@ sap.ui.define(
 			var oInternalModelContext = oMDCChart.getBindingContext("pageInternal");
 			var sTemplateContentView = oInternalModelContext.getProperty(oInternalModelContext.getPath() + "/alpContentView");
 			if (!sTemplateContentView || sTemplateContentView !== "Table") {
-				BaseChartDelegate.rebindChart(oMDCChart, oBindingInfo);
+				BaseChartDelegate.rebind(oMDCChart, oBindingInfo);
 			}
 		};
 

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,

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

@@ -64,7 +64,7 @@
 											<v:VariantManagement
 														id="{= ID.generate([ ${converterContext>filterBarId}, 'VariantManagement']) }"
 														unittest:id="listReportVMControlTest"
-														for="{converterContext>filterBarId}"
+														for="{converterContext>variantManagement/targetControlIds}"
 														showSetAsDefault="true"
 														select=".handlers.onVariantSelected"
 														save=".handlers.onVariantSaved"
@@ -101,7 +101,7 @@
 										<v:VariantManagement
 													id="{= ID.generate([ ${converterContext>filterBarId}, 'VariantManagement']) }"
 													unittest:id="listReportVMControlTest"
-													for="{converterContext>filterBarId}"
+													for="{converterContext>variantManagement/targetControlIds}"
 													showSetAsDefault="true"
 													select=".handlers.onVariantSelected"
 													save=".handlers.onVariantSaved"
@@ -146,7 +146,7 @@
 									</items>
 								</SegmentedButton>
 							</template:if>
-							<macro:Share id="fe::Share" shortCutExists="true" visible="{= ${fclhelper>/} ? ${fclhelper>/showShareIcon} : true }" />
+							<macro:Share id="fe::Share" visible="{= ${fclhelper>/} ? ${fclhelper>/showShareIcon} : true }" />
 						</f:actions>
 					</f:DynamicPageTitle>
 				</f:title>
@@ -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}"
@@ -171,6 +172,7 @@
 									suspendSelection="true"
 									toggleControlId="{= ${converterContext>/filterLayout} === 'compactvisual' ? ID.generate([ ${converterContext>filterBarId}, 'LayoutToggle']) : undefined }"
 									initialLayout="{= ${converterContext>/filterLayout} === 'compactvisual' ? ${converterContext>/filterInitialLayout} : undefined }"
+									stateChanged=".handlers.onStateChanged"
 								/>
 							</VBox>
 						</f:DynamicPageHeader>

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(
@@ -34,7 +34,10 @@ sap.ui.define(
 		"sap/fe/macros/CommonHelper",
 		"sap/fe/core/controllerextensions/KPIManagement",
 		"sap/fe/templates/TableScroller",
-		"sap/fe/core/controllerextensions/Placeholder"
+		"sap/fe/core/controllerextensions/Placeholder",
+		"sap/ui/fl/write/api/ControlPersonalizationWriteAPI",
+		"sap/fe/core/controllerextensions/MassEdit",
+		"./overrides/MassEdit"
 	],
 	function(
 		PageController,
@@ -66,7 +69,10 @@ sap.ui.define(
 		CommonHelper,
 		KPIManagement,
 		TableScroller,
-		Placeholder
+		Placeholder,
+		ControlPersonalizationWriteAPI,
+		MassEdit,
+		MassEditOverrides
 	) {
 		"use strict";
 		var TemplateContentView = CoreLibrary.TemplateContentView,
@@ -116,6 +122,7 @@ sap.ui.define(
 			viewState: ViewState.override(ViewStateOverrides),
 			kpiManagement: KPIManagement,
 			placeholder: Placeholder,
+			massEdit: MassEdit.override(MassEditOverrides),
 
 			getExtensionAPI: function() {
 				if (!this.extensionAPI) {
@@ -141,9 +148,11 @@ sap.ui.define(
 						CommonUtils.addEventToBindingInfo(oControl, "dataRequested", oUpdateCounts);
 					});
 				}
+				//TODO: This is only a temporary approach and will be removed once app state behaviour is finalized.
 
 				oInternalModelContext.setProperty("hasPendingFilters", true);
 				oInternalModelContext.setProperty("appliedFilters", "");
+				oInternalModelContext.setProperty("hideDraftInfo", false);
 				oInternalModelContext.setProperty("uom", {});
 				oInternalModelContext.setProperty("scalefactor", {});
 				oInternalModelContext.setProperty("scalefactorNumber", {});
@@ -168,12 +177,8 @@ sap.ui.define(
 					.waitForRouteMatchBeforeNavigation();
 
 				this._isMultiMode() && this._updateMultiControlHiddenStatus();
-
-				FilterUtils.attachConditionHandling(this._getFilterBarControl());
 			},
 			onExit: function() {
-				FilterUtils.detachConditionHandling(this._getFilterBarControl());
-
 				delete this._sEntitySet;
 				delete this.filterBarConditions;
 				delete this._oListReportControl;
@@ -191,6 +196,10 @@ sap.ui.define(
 						if (!this.sUpdateTimer) {
 							this.sUpdateTimer = setTimeout(function() {
 								oTableBinding.refresh();
+								if (that._isMultiMode()) {
+									that._setCountsOutDated();
+									that._updateCounts();
+								}
 								delete that.sUpdateTimer;
 							}, 0);
 						}
@@ -244,22 +253,20 @@ 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
+				if (mParameters.forceFocus) {
+					var oFilterBar = this._getFilterBarControl();
+
+					if (oFilterBar && !oFilterBar.getShowMessages()) {
+						oFilterBar.setShowMessages(true);
+						oFilterBar.setFocusOnFirstErroneousField();
 					}
 				}
 
-				// Enabling mandatory filter fields message dialog and focusing on them
-				var oFilterBar = this._getFilterBarControl();
-				if (oFilterBar && !oFilterBar.getShowMessages()) {
-					oFilterBar.setShowMessages(true);
-					oFilterBar.setFocusOnFirstErroneousField();
-				}
+				// Remove the handler on back navigation that displays Draft confirmation
+				this.getAppComponent()
+					.getShellServices()
+					.setBackNavigation(undefined);
 			},
 
 			/**
@@ -317,21 +324,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());
 			},
 
@@ -348,19 +352,14 @@ sap.ui.define(
 				});
 			},
 			_getPageTitleInformation: function() {
-				var that = this;
-				return new Promise(function(resolve, reject) {
-					var oTitleInfo = { title: "", subtitle: "", intent: "", icon: "" };
-					oTitleInfo.title = that
-						.getView()
-						.getContent()[0]
-						.data().ListReportTitle;
-					oTitleInfo.subtitle = that
-						.getView()
-						.getContent()[0]
-						.data().ListReportSubtitle;
-					resolve(oTitleInfo);
-				});
+				var oTitleInfo = { title: "", subtitle: "", intent: "", icon: "" };
+				oTitleInfo.title = this.getView()
+					.getContent()[0]
+					.data().ListReportTitle;
+				oTitleInfo.subtitle = this.getView()
+					.getContent()[0]
+					.data().ListReportSubtitle;
+				return oTitleInfo;
 			},
 			_getFilterBarControl: function() {
 				return this.getView().byId(this._getFilterBarControlId());
@@ -413,6 +412,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 +572,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);
@@ -584,10 +590,10 @@ sap.ui.define(
 				this._getCurrentControl();
 			},
 			_updateCounts: function() {
-				this._updateMutliModeCounts();
+				this._updateMultiModeCounts();
 			},
 			/**
-			 * Method to determine if a tab from the list report is a custom tab..
+			 * Method to determine if a tab from the list report is a custom tab.
 			 *
 			 * @function
 			 * @name _isCustomTab
@@ -597,7 +603,18 @@ sap.ui.define(
 				var oMultiModeControl = this._getMultiModeControl();
 				return oMultiModeControl && oMultiModeControl.getSelectedKey().indexOf("::CustomTab::") > -1;
 			},
-			_updateMutliModeCounts: function() {
+			_setCountsOutDated: function() {
+				var oMultiModeControl = this._getMultiModeControl();
+				if (oMultiModeControl && oMultiModeControl.data("showCounts") === "true") {
+					var aItems = oMultiModeControl.getItems();
+					aItems.forEach(function(oItem) {
+						if (!oItem.getKey().indexOf("fe::Chart") > -1) {
+							oItem.data("outdatedCounts", true);
+						}
+					});
+				}
+			},
+			_updateMultiModeCounts: function() {
 				var that = this;
 				var aBindingPromises = [];
 				var oMultiModeControl = this._getMultiModeControl();
@@ -662,13 +679,14 @@ sap.ui.define(
 			},
 			_updateTable: function(oTable) {
 				if (!oTable.isTableBound() || this.hasPendingChartChanges) {
-					oTable.rebindTable();
+					oTable.rebind();
 					this.hasPendingChartChanges = false;
 				}
 			},
 			_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().rebind(oChart, oInnerChart.getBindingInfo("data"));
 					this.hasPendingTableChanges = false;
 				}
 			},
@@ -676,18 +694,22 @@ sap.ui.define(
 				onTabMultiModeChange: function(oEvent) {
 					this._updateMultiModeSelectedControl();
 					this._updateMultiControlHiddenStatus();
+
 					var oFilterBar = this._getFilterBarControl();
 					var oInternalModelContext = this.getView().getBindingContext("internal");
 					var oDisplayedControl = this._getCurrentControl();
 					var oMultiModeControl = this._getMultiModeControl();
-					oInternalModelContext.setProperty("tabs/selected", oMultiModeControl.getSelectedKey());
+					var sSelectedKey = oMultiModeControl.getSelectedKey();
+					var sPreviousSelectedKey = oEvent && oEvent.mParameters ? oEvent.mParameters.previousKey : undefined;
+
+					oInternalModelContext.setProperty("tabs/selected", sSelectedKey);
 					if (oFilterBar && oInternalModelContext.getProperty("hasPendingFilters") !== true) {
 						// No pending filters into FilterBar
 						if (this._isCustomTab()) {
 							var oFilterConditions = oFilterBar.getFilterConditions();
 							this.onViewNeedsRefresh({
 								filterConditions: oFilterConditions,
-								currentTabId: oMultiModeControl.getSelectedKey(),
+								currentTabId: sSelectedKey,
 								refreshCause: "tabChanged"
 							});
 						} else if (
@@ -696,17 +718,38 @@ sap.ui.define(
 								oDisplayedControl.data("outdatedRows") === true)
 						) {
 							// Search has been triggered on a different tab {}
-							oDisplayedControl.rebindTable();
+							oDisplayedControl.rebind();
 							oDisplayedControl.data("outdatedRows", false);
 						} else if (
 							oDisplayedControl.isA("sap.ui.mdc.Chart") &&
-							(!oDisplayedControl.getBinding("data") || // first time the tab/chart is displayed
+							(!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().rebind(oDisplayedControl, oInnerChart.getBindingInfo("data"));
 							oDisplayedControl.data("outdatedRows", false);
 						}
 					}
+
+					if (oEvent && oEvent.mParameters && sPreviousSelectedKey != oEvent.mParameters.selectedKey) {
+						ControlPersonalizationWriteAPI.add({
+							changes: [
+								{
+									changeSpecificData: {
+										changeType: "selectIconTabBarFilter",
+										content: {
+											selectedKey: sSelectedKey,
+											previousSelectedKey: sPreviousSelectedKey
+										}
+									},
+									selectorElement: oMultiModeControl
+								}
+							]
+						});
+					}
 					this.getExtensionAPI().updateAppState();
 				},
 				onFiltersChanged: function(oEvent) {
@@ -715,9 +758,8 @@ sap.ui.define(
 					// Pending filters into FilterBar to be used for custom views
 					this.onPendingFilters();
 					oInternalModelContext.setProperty("appliedFilters", oFilterBar.getAssignedFiltersText().filtersText);
-					oInternalModelContext.setProperty("hasPendingFilters", true);
 					if (oEvent.getParameter("conditionsBased")) {
-						this.getExtensionAPI().updateAppState();
+						oInternalModelContext.setProperty("hasPendingFilters", true);
 					}
 				},
 				onVariantSelected: function(oEvent) {
@@ -725,6 +767,9 @@ sap.ui.define(
 						oVM = oEvent.getSource();
 					// setTimeout cause the variant needs to be applied before judging the auto search or updating the app state
 					setTimeout(function() {
+						if (that._isMultiMode()) {
+							that.handlers.onTabMultiModeChange.apply(that);
+						}
 						if (that._shouldAutoTriggerSearch(oVM)) {
 							// the app state will be updated via onSearch handler
 							return that._getFilterBarControl().triggerSearch();
@@ -745,18 +790,13 @@ sap.ui.define(
 					var oFilterBar = this._getFilterBarControl();
 					var oInternalModelContext = this.getView().getBindingContext("internal");
 					var oMdcChart = this.getChartControl();
+					var bHideDraft = FilterUtils.getEditStateIsHideDraft(oFilterBar.getConditions());
 					oInternalModelContext.setProperty("hasPendingFilters", false);
+					oInternalModelContext.setProperty("hideDraftInfo", bHideDraft);
 					if (this._isMultiMode()) {
 						var aControls = this._getControls(),
 							oMultiModeControl = this._getMultiModeControl();
-						if (oMultiModeControl && oMultiModeControl.data("showCounts") === "true") {
-							var aItems = oMultiModeControl.getItems();
-							aItems.forEach(function(oItem) {
-								if (!oItem.getKey().indexOf("fe::Chart") > -1) {
-									oItem.data("outdatedCounts", true);
-								}
-							});
-						}
+						this._setCountsOutDated();
 						if (!this._isCustomTab()) {
 							var sDisplayedControlId = this._getCurrentControl().getId();
 							this._updateMultiNotApplicableFields(oInternalModelContext, oFilterBar);
@@ -800,13 +840,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 {sap.ui.model.odata.v4.Context} oContext The context that contains the data for the target app
+				 * @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 +859,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
@@ -833,7 +873,7 @@ sap.ui.define(
 					if (sTemplateContentView === TemplateContentView.Chart) {
 						this.hasPendingChartChanges = true;
 					} else {
-						oTable && oTable.rebindTable();
+						oTable && oTable.rebind();
 						this.hasPendingChartChanges = false;
 					}
 				},
@@ -896,20 +936,34 @@ sap.ui.define(
 							)
 							.setVisible(true);
 					}
+				},
+				onStateChanged: function(oEvent) {
+					this.getExtensionAPI().updateAppState();
 				}
 			},
 			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;
 					}
 				},
 				/**
-				 * Method to set the message text for the multi-EntitySet scenario when fields in the FilterBar need to be ignored.
+				 * Method to set the message text for the multiple entity sets when fields in the FilterBar need to be ignored.
 				 *
-				 * @param {Array} aIgnoredFields Array of ignored fields in the FilterBar for the current tab (multi EntitySet scenario)
+				 * @param {Array} aIgnoredFields Array of ignored fields in the FilterBar for the current tab (multiple entity sets)
 				 * @param {string} sTabTitle Tab title
 				 * @returns {string} Message text
 				 */
@@ -943,9 +997,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;
 			}
 		},