@sapui5/sap.fe.templates 1.97.0 → 1.100.0

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

@@ -1,6 +1,7 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 
 sap.ui.define(
@@ -35,7 +36,8 @@ sap.ui.define(
 		"sap/fe/core/controllerextensions/KPIManagement",
 		"sap/fe/templates/TableScroller",
 		"sap/fe/core/controllerextensions/Placeholder",
-		"sap/ui/fl/write/api/ControlPersonalizationWriteAPI"
+		"sap/ui/fl/write/api/ControlPersonalizationWriteAPI",
+		"sap/fe/core/controllerextensions/MassEdit"
 	],
 	function(
 		PageController,
@@ -68,7 +70,8 @@ sap.ui.define(
 		KPIManagement,
 		TableScroller,
 		Placeholder,
-		ControlPersonalizationWriteAPI
+		ControlPersonalizationWriteAPI,
+		MassEdit
 	) {
 		"use strict";
 		var TemplateContentView = CoreLibrary.TemplateContentView,
@@ -118,6 +121,7 @@ sap.ui.define(
 			viewState: ViewState.override(ViewStateOverrides),
 			kpiManagement: KPIManagement,
 			placeholder: Placeholder,
+			massEdit: MassEdit,
 
 			getExtensionAPI: function() {
 				if (!this.extensionAPI) {
@@ -145,11 +149,6 @@ sap.ui.define(
 				}
 				//TODO: This is only a temporary approach and will be removed once app state behaviour is finalized.
 
-				var oUrlParser = sap.ushell && sap.ushell.Container.getService("URLParsing");
-				var oUrlParams = oUrlParser && oUrlParser.parseParameters(window.location.search);
-				if (oUrlParams && oUrlParams["sap-fe-test-appState"]) {
-					this.bTestAppState = true;
-				}
 				oInternalModelContext.setProperty("hasPendingFilters", true);
 				oInternalModelContext.setProperty("appliedFilters", "");
 				oInternalModelContext.setProperty("hideDraftInfo", false);
@@ -177,12 +176,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;
@@ -200,6 +195,10 @@ sap.ui.define(
 						if (!this.sUpdateTimer) {
 							this.sUpdateTimer = setTimeout(function() {
 								oTableBinding.refresh();
+								if (that._isMultiMode()) {
+									that._setCountsOutDated();
+									that._updateCounts();
+								}
 								delete that.sUpdateTimer;
 							}, 0);
 						}
@@ -262,6 +261,11 @@ sap.ui.define(
 						oFilterBar.setFocusOnFirstErroneousField();
 					}
 				}
+
+				// Remove the handler on back navigation that displays Draft confirmation
+				this.getAppComponent()
+					.getShellServices()
+					.setBackNavigation(undefined);
 			},
 
 			/**
@@ -347,19 +351,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());
@@ -443,8 +442,13 @@ sap.ui.define(
 						}
 					});
 					return aControls;
+				} else if (sKey === "Chart") {
+					var oChart = this._getChart();
+					return oChart ? [oChart] : [];
+				} else {
+					var oTable = this._getTable();
+					return oTable ? [oTable] : [];
 				}
-				return sKey === "Chart" ? [this._getChart()] : [this._getTable()];
 			},
 			_getDefaultPath: function() {
 				var defaultPath = this.getView()
@@ -529,7 +533,7 @@ sap.ui.define(
 			 * requests when FilterBar is changed or LR is initialized
 			 * Best workflow would be to suspend table binding but
 			 * if the user switch quickly between tabs the batch response of previous
-			 * is recevied when previous tab is already disabled (binding is suspended) and
+			 * is received when previous tab is already disabled (binding is suspended) and
 			 * generates error.
 			 * A temporary solution (if we find better workflow) is to set a customData and don't trigger
 			 * rebindTable if this customData is set to true.
@@ -551,9 +555,11 @@ sap.ui.define(
 			 * @param {sap.ui.model.context} oInternalModelContext The internal model context
 			 * @param {sap.ui.mdc.FilterBar} oFilterBar MDC filter bar
 			 */
-			_updateMultiNotApplicableFields: function(oInternalModelContext, oFilterBar) {
+			_updateMultiTabNotApplicableFields: function(oInternalModelContext, oFilterBar) {
+				var that = this;
 				var mCache = {};
 				var ignoredFields = {},
+					ignoredFieldsTitle = {},
 					aTables = this._getControls("table"),
 					aCharts = this._getControls("Chart");
 				aTables.forEach(function(oTable) {
@@ -563,11 +569,16 @@ sap.ui.define(
 							.getParent()
 							.getParent()
 							.getKey(),
+						sTabTitle = oTable
+							.getParent()
+							.getParent()
+							.getText(),
 						sCacheKey = sTableEntitySet + (oTable.data("enableAnalytics") === "true" ? "Analytical" : "Regular");
 					if (!mCache[sCacheKey]) {
 						mCache[sCacheKey] = FilterUtils.getNotApplicableFilters(oFilterBar, oTable);
 					}
 					ignoredFields[sTabId] = mCache[sCacheKey];
+					ignoredFieldsTitle[sTabId] = that.formatters.setTabMessageStrip.call(that, mCache[sCacheKey], sTabTitle);
 				});
 				aCharts.forEach(function(oChart) {
 					var sChartEntityPath = oChart.data("targetCollectionPath"),
@@ -576,13 +587,48 @@ sap.ui.define(
 							.getParent()
 							.getParent()
 							.getKey(),
+						sTabTitle = oChart
+							.getParent()
+							.getParent()
+							.getText(),
 						sCacheKey = sChartEntitySet + "Chart";
 					if (!mCache[sCacheKey]) {
 						mCache[sCacheKey] = FilterUtils.getNotApplicableFilters(oFilterBar, oChart);
 					}
 					ignoredFields[sTabId] = mCache[sCacheKey];
+					ignoredFieldsTitle[sTabId] = that.formatters.setTabMessageStrip.call(that, mCache[sCacheKey], sTabTitle);
 				});
 				oInternalModelContext.setProperty("tabs/ignoredFields", ignoredFields);
+				oInternalModelContext.setProperty("tabs/ignoredFieldsTitle", ignoredFieldsTitle);
+			},
+			/**
+			 * Method to update the local UI model of the page with the fields that are not applicable to the filter bar (this is specific to the ALP scenario).
+			 *
+			 * @param {sap.ui.model.context} oInternalModelContext The internal model context
+			 * @param {sap.ui.mdc.FilterBar} oFilterBar MDC filter bar
+			 */
+			_updateALPNotApplicableFields: function(oInternalModelContext, oFilterBar) {
+				var mCache = {};
+				var ignoredFields = {},
+					aTables = this._getControls("table"),
+					aCharts = this._getControls("Chart");
+
+				if (!aTables.length || !aCharts.length) {
+					// If there's not a table and a chart, we're not in the ALP case
+					return;
+				}
+
+				// For the moment, there's nothing for tables...
+				aCharts.forEach(function(oChart) {
+					var sChartEntityPath = oChart.data("targetCollectionPath"),
+						sChartEntitySet = sChartEntityPath.slice(1),
+						sCacheKey = sChartEntitySet + "Chart";
+					if (!mCache[sCacheKey]) {
+						mCache[sCacheKey] = FilterUtils.getNotApplicableFilters(oFilterBar, oChart);
+					}
+					ignoredFields[sCacheKey] = mCache[sCacheKey];
+				});
+				oInternalModelContext.setProperty("controls/ignoredFields", ignoredFields);
 			},
 			_updateMultiModeSelectedControl: function() {
 				this._sEntitySet = undefined;
@@ -603,6 +649,17 @@ sap.ui.define(
 				var oMultiModeControl = this._getMultiModeControl();
 				return oMultiModeControl && oMultiModeControl.getSelectedKey().indexOf("::CustomTab::") > -1;
 			},
+			_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 = [];
@@ -616,7 +673,7 @@ sap.ui.define(
 						var oControl = that.getView().byId(oItem.getKey());
 						if (
 							oControl &&
-							!oControl.isA("sap.ui.mdc.ChartNew") &&
+							!oControl.isA("sap.ui.mdc.Chart") &&
 							(oItem.data("outdatedCounts") || oControl.getId() === sDisplayedControlId)
 						) {
 							aCompliantTabs.push({
@@ -649,17 +706,22 @@ sap.ui.define(
 						});
 				}
 			},
+			_isFilterBarHidden: function() {
+				return this.getView().getViewData().hideFilterBar;
+			},
 			_shouldAutoTriggerSearch: function(oVM) {
 				if (
 					this.getView().getViewData().initialLoad === InitialLoadMode.Auto &&
 					(!oVM || oVM.getStandardVariantKey() === oVM.getCurrentVariantKey())
 				) {
-					var oFilterBar = this._getFilterBarControl(),
-						oConditions = oFilterBar.getConditions();
-					for (var sKey in oConditions) {
-						// ignore filters starting with $ (e.g. $search, $editState)
-						if (!sKey.startsWith("$") && Array.isArray(oConditions[sKey]) && oConditions[sKey].length) {
-							return true;
+					var oFilterBar = this._getFilterBarControl();
+					if (oFilterBar) {
+						var oConditions = oFilterBar.getConditions();
+						for (var sKey in oConditions) {
+							// ignore filters starting with $ (e.g. $search, $editState)
+							if (!sKey.startsWith("$") && Array.isArray(oConditions[sKey]) && oConditions[sKey].length) {
+								return true;
+							}
 						}
 					}
 				}
@@ -668,62 +730,62 @@ sap.ui.define(
 			},
 			_updateTable: function(oTable) {
 				if (!oTable.isTableBound() || this.hasPendingChartChanges) {
-					oTable.rebindTable();
+					oTable.rebind();
 					this.hasPendingChartChanges = false;
 				}
 			},
 			_updateChart: function(oChart) {
 				var oInnerChart = oChart.getControlDelegate()._getChart(oChart);
 				if (!(oInnerChart && oInnerChart.isBound("data")) || this.hasPendingTableChanges) {
-					oChart.getControlDelegate().rebindChart(oChart, oInnerChart.getBindingInfo("data"));
+					oChart.getControlDelegate().rebind(oChart, oInnerChart.getBindingInfo("data"));
 					this.hasPendingTableChanges = false;
 				}
 			},
 			handlers: {
 				onTabMultiModeChange: function(oEvent) {
-					if (oEvent && oEvent.mParameters && oEvent.mParameters.previousKey != oEvent.mParameters.selectedKey) {
-						this._updateMultiModeSelectedControl();
-						this._updateMultiControlHiddenStatus();
-						var oFilterBar = this._getFilterBarControl();
-						var oInternalModelContext = this.getView().getBindingContext("internal");
-						var oDisplayedControl = this._getCurrentControl();
-						var oMultiModeControl = this._getMultiModeControl();
-						var sSelectedKey = oMultiModeControl.getSelectedKey();
-
-						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: sSelectedKey,
-									refreshCause: "tabChanged"
-								});
-							} else if (
-								!oDisplayedControl.isA("sap.ui.mdc.ChartNew") &&
-								(!oDisplayedControl.getRowBinding() || // first time the tab/table is displayed
-									oDisplayedControl.data("outdatedRows") === true)
-							) {
-								// Search has been triggered on a different tab {}
-								oDisplayedControl.rebindTable();
-								oDisplayedControl.data("outdatedRows", false);
-							} else if (
-								oDisplayedControl.isA("sap.ui.mdc.ChartNew") &&
-								(!oDisplayedControl
-									.getControlDelegate()
-									._getChart(oDisplayedControl)
-									.getBinding("data") || // first time the tab/chart is displayed
-									oDisplayedControl.data("outdatedRows") === true)
-							) {
-								var oInnerChart = oDisplayedControl.getControlDelegate()._getChart(oDisplayedControl);
-								oDisplayedControl.getControlDelegate().rebindChart(oDisplayedControl, oInnerChart.getBindingInfo("data"));
-								oDisplayedControl.data("outdatedRows", false);
-							}
+					this._updateMultiModeSelectedControl();
+					this._updateMultiControlHiddenStatus();
+
+					var oFilterBar = this._getFilterBarControl();
+					var oInternalModelContext = this.getView().getBindingContext("internal");
+					var oDisplayedControl = this._getCurrentControl();
+					var oMultiModeControl = this._getMultiModeControl();
+					var sSelectedKey = oMultiModeControl.getSelectedKey();
+					var sPreviousSelectedKey = oEvent && oEvent.mParameters ? oEvent.mParameters.previousKey : undefined;
+
+					oInternalModelContext.setProperty("tabs/selected", sSelectedKey);
+					if (oInternalModelContext.getProperty("hasPendingFilters") !== true) {
+						// No pending filters into FilterBar
+						if (oFilterBar && this._isCustomTab()) {
+							var oFilterConditions = oFilterBar.getFilterConditions();
+							this.onViewNeedsRefresh({
+								filterConditions: oFilterConditions,
+								currentTabId: sSelectedKey,
+								refreshCause: "tabChanged"
+							});
+						} else if (
+							!oDisplayedControl.isA("sap.ui.mdc.Chart") &&
+							(!oDisplayedControl.getRowBinding() || // first time the tab/table is displayed
+								oDisplayedControl.data("outdatedRows") === true)
+						) {
+							// Search has been triggered on a different tab {}
+							oDisplayedControl.rebind();
+							oDisplayedControl.data("outdatedRows", false);
+						} else if (
+							oDisplayedControl.isA("sap.ui.mdc.Chart") &&
+							(!oDisplayedControl
+								.getControlDelegate()
+								._getChart(oDisplayedControl)
+								.getBinding("data") || // first time the tab/chart is displayed
+								oDisplayedControl.data("outdatedRows") === true)
+						) {
+							var oInnerChart = oDisplayedControl.getControlDelegate()._getChart(oDisplayedControl);
+							oDisplayedControl.getControlDelegate().rebind(oDisplayedControl, oInnerChart.getBindingInfo("data"));
+							oDisplayedControl.data("outdatedRows", false);
 						}
-						/* Need to disable it because of IconTabBar regression : BCP 2170302705
-						var sPreviousSelectedKey = oEvent && oEvent.mParameters ? oEvent.mParameters.previousKey : undefined;
+					}
 
+					if (oEvent && oEvent.mParameters && sPreviousSelectedKey !== oEvent.mParameters.selectedKey) {
 						ControlPersonalizationWriteAPI.add({
 							changes: [
 								{
@@ -738,19 +800,19 @@ sap.ui.define(
 								}
 							]
 						});
-						*/
-						this.getExtensionAPI().updateAppState();
 					}
+					this.getExtensionAPI().updateAppState();
 				},
 				onFiltersChanged: function(oEvent) {
-					var oFilterBar = this._getFilterBarControl(),
-						oInternalModelContext = this.getView().getBindingContext("internal");
-					// 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();
+					var oFilterBar = this._getFilterBarControl();
+					if (oFilterBar) {
+						var oInternalModelContext = this.getView().getBindingContext("internal");
+						// Pending filters into FilterBar to be used for custom views
+						this.onPendingFilters();
+						oInternalModelContext.setProperty("appliedFilters", oFilterBar.getAssignedFiltersText().filtersText);
+						if (oEvent.getParameter("conditionsBased")) {
+							oInternalModelContext.setProperty("hasPendingFilters", true);
+						}
 					}
 				},
 				onVariantSelected: function(oEvent) {
@@ -787,17 +849,13 @@ sap.ui.define(
 					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);
+							this._updateMultiTabNotApplicableFields(oInternalModelContext, oFilterBar);
+							// This should be done outside the search event handler of the filter bar.
+							// The same logic is required when filter bar is hidden and multiple tables exist on the LR.
+							// This is currently done in ListReport/overrides/ViewState.js#onAfterStateApplied()
 							aControls.forEach(function(oControl) {
 								oControl.data("outdatedRows", oControl.getId() !== sDisplayedControlId);
 							});
@@ -809,6 +867,8 @@ sap.ui.define(
 								refreshCause: "search"
 							});
 						}
+					} else {
+						this._updateALPNotApplicableFields(oInternalModelContext, oFilterBar);
 					}
 					if (oMdcChart) {
 						// disable bound actions TODO: this clears everything for the chart?
@@ -836,6 +896,11 @@ sap.ui.define(
 					if (this.getView().getViewData().liveMode === false) {
 						this.getExtensionAPI().updateAppState();
 					}
+
+					if (Device.system.phone) {
+						var oDynamicPage = this.getView().byId("fe::ListReport");
+						oDynamicPage.setHeaderExpanded(false);
+					}
 				},
 				/**
 				 * Triggers an outbound navigation when a user chooses the chevron.
@@ -871,7 +936,7 @@ sap.ui.define(
 					if (sTemplateContentView === TemplateContentView.Chart) {
 						this.hasPendingChartChanges = true;
 					} else {
-						oTable && oTable.rebindTable();
+						oTable && oTable.rebind();
 						this.hasPendingChartChanges = false;
 					}
 				},
@@ -935,31 +1000,11 @@ sap.ui.define(
 							.setVisible(true);
 					}
 				},
-				onTableStateChanged: function(oEvent) {
-					if (this.bTestAppState) {
-						this.getExtensionAPI().updateAppState();
-					}
+				onStateChanged: function(oEvent) {
+					this.getExtensionAPI().updateAppState();
 				}
 			},
 			formatters: {
-				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 multiple entity sets when fields in the FilterBar need to be ignored.
 				 *
@@ -968,10 +1013,10 @@ sap.ui.define(
 				 * @returns {string} Message text
 				 */
 				setTabMessageStrip: function(aIgnoredFields, sTabTitle) {
-					var sText = "";
-					if (Array.isArray(aIgnoredFields) && aIgnoredFields.length > 0 && sTabTitle) {
-						var oFilterBar = this._getFilterBarControl(),
-							sFilterBarEntityPath = oFilterBar.data("entityType"),
+					var sText = "",
+						oFilterBar = this._getFilterBarControl();
+					if (oFilterBar && Array.isArray(aIgnoredFields) && aIgnoredFields.length > 0 && sTabTitle) {
+						var sFilterBarEntityPath = oFilterBar.data("entityType"),
 							oMetaModel = this.getView()
 								.getModel()
 								.getMetaModel(),
@@ -997,6 +1042,42 @@ sap.ui.define(
 						}
 					}
 					return sText;
+				},
+				/**
+				 * Formatter for the message text for the chart when fields in the FilterBar need to be ignored.
+				 *
+				 * @param {Array} aIgnoredFields Array of ignored fields in the FilterBar for the current tab (multiple entity sets)
+				 * @returns {string} Message text
+				 */
+				setChartMessageStrip: function(aIgnoredFields) {
+					var sText = "";
+					if (Array.isArray(aIgnoredFields) && aIgnoredFields.length > 0) {
+						var oFilterBar = this._getFilterBarControl(),
+							sFilterBarEntityPath = oFilterBar.data("entityType"),
+							oMetaModel = this.getView()
+								.getModel()
+								.getMetaModel(),
+							oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.fe.templates"),
+							aIgnoredLabels = aIgnoredFields.map(function(sProperty) {
+								if (sProperty === "$search") {
+									var oMacroResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.fe.macros");
+									return oMacroResourceBundle ? oMacroResourceBundle.getText("M_FILTERBAR_SEARCH") : "";
+								}
+								var sLabel = oMetaModel.getObject(
+									sFilterBarEntityPath + sProperty + "@com.sap.vocabularies.Common.v1.Label"
+								);
+								return DelegateUtil.getLocalizedText(sLabel, oFilterBar);
+							});
+						if (oResourceBundle) {
+							var sResource =
+								"C_LR_MULTIVIZ_CHART_" +
+								(aIgnoredLabels.length === 1 ? "SINGLE" : "MULTI") +
+								"_IGNORED_FILTER_" +
+								(Device.system.desktop ? "LARGE" : "SMALL");
+							sText = oResourceBundle.getText(sResource, [aIgnoredLabels.join(", ")]);
+						}
+					}
+					return sText;
 				}
 			}
 		});

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

@@ -1,20 +1,22 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (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) {
+			var oView = this.getView(),
+				oController = oView.getController(),
+				oFilterBar = oController._getFilterBarControl();
 			// Adding filter bar values to the navigation does not make sense if no context has been selected.
-			// Hence only consider filter bar values when SelectionVaraint is not empty
-			if (!oSelectionVariant.isEmpty()) {
-				var oView = this.getView(),
-					oViewData = oView.getViewData(),
-					oController = oView.getController(),
-					sRootPath = oViewData.fullContextPath + oViewData.entitySet;
-				var oFilterBarConditions = Object.assign({}, this.base.getView().getController().filterBarConditions);
-				var aParameters = [];
+			// Hence only consider filter bar values when SelectionVariant is not empty
+			if (oFilterBar && !oSelectionVariant.isEmpty()) {
+				var oViewData = oView.getViewData(),
+					sRootPath = oViewData.fullContextPath + oViewData.entitySet,
+					oFilterBarConditions = Object.assign({}, this.base.getView().getController().filterBarConditions),
+					aParameters = [];
 
 				if (oViewData.contextPath) {
 					var oMetaModel = oView.getModel().getMetaModel(),
@@ -28,8 +30,11 @@ sap.ui.define(["sap/fe/core/CommonUtils"], function(CommonUtils) {
 					sRootPath,
 					aParameters
 				);
+				var oFilterInfo = FilterUtils.getFilterInfo(oFilterBar, {
+					targetControl: oController._getTable()
+				}).filters;
 				var oInternalModelContext = oView.getBindingContext("internal");
-				var mTabs = oInternalModelContext.getProperty("tabs");
+				var mTabs = oInternalModelContext && oInternalModelContext.getProperty("tabs");
 				// Do we need to exclude Fields (mutli tables mode)?
 				if (mTabs) {
 					var aIgnoredFieldsForTab = mTabs.ignoredFields[mTabs.selected];
@@ -40,7 +45,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;
 			}
 		},