@sapui5/sap.fe.templates 1.93.3 → 1.97.0

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

@@ -8,14 +8,11 @@ sap.ui.define(
 		"sap/fe/core/PageController",
 		"sap/fe/core/controllerextensions/SideEffects",
 		"sap/fe/core/controllerextensions/EditFlow",
-		"sap/fe/macros/field/FieldRuntime",
 		"sap/base/Log",
 		"sap/base/util/ObjectPath",
-		"sap/fe/navigation/SelectionVariant",
 		"sap/fe/core/CommonUtils",
 		"sap/ui/mdc/p13n/StateUtil",
 		"sap/fe/macros/table/Utils",
-		"sap/fe/macros/ResourceModel",
 		"sap/fe/core/controllerextensions/InternalRouting",
 		"sap/ui/Device",
 		"sap/fe/core/controllerextensions/IntentBasedNavigation",
@@ -25,33 +22,30 @@ sap.ui.define(
 		"sap/fe/templates/ListReport/ExtensionAPI",
 		"sap/fe/macros/filter/FilterUtils",
 		"sap/fe/macros/chart/ChartUtils",
-		"sap/fe/macros/visualfilters/VisualFilterUtils",
 		"sap/fe/macros/DelegateUtil",
 		"sap/ui/core/mvc/OverrideExecution",
 		"sap/fe/core/controllerextensions/ViewState",
 		"./overrides/ViewState",
 		"sap/fe/templates/RootContainer/overrides/EditFlow",
 		"sap/fe/core/helpers/EditState",
-		"sap/ui/model/json/JSONModel",
 		"sap/fe/core/library",
-		"sap/fe/core/helpers/SemanticDateOperators",
 		"sap/fe/core/controllerextensions/Share",
 		"./overrides/Share",
 		"sap/fe/macros/CommonHelper",
-		"sap/fe/core/controllerextensions/KPIManagement"
+		"sap/fe/core/controllerextensions/KPIManagement",
+		"sap/fe/templates/TableScroller",
+		"sap/fe/core/controllerextensions/Placeholder",
+		"sap/ui/fl/write/api/ControlPersonalizationWriteAPI"
 	],
 	function(
 		PageController,
 		SideEffects,
 		EditFlow,
-		FieldRuntime,
 		Log,
 		ObjectPath,
-		SelectionVariant,
 		CommonUtils,
 		StateUtil,
 		TableUtils,
-		ResourceModel,
 		InternalRouting,
 		Device,
 		IntentBasedNavigation,
@@ -61,20 +55,20 @@ sap.ui.define(
 		ExtensionAPI,
 		FilterUtils,
 		ChartUtils,
-		VisualFilterUtils,
 		DelegateUtil,
 		OverrideExecution,
 		ViewState,
 		ViewStateOverrides,
 		EditFlowOverrides,
 		EditState,
-		JSONModel,
 		CoreLibrary,
-		SemanticDateOperators,
 		Share,
 		ShareOverrides,
 		CommonHelper,
-		KPIManagement
+		KPIManagement,
+		TableScroller,
+		Placeholder,
+		ControlPersonalizationWriteAPI
 	) {
 		"use strict";
 		var TemplateContentView = CoreLibrary.TemplateContentView,
@@ -123,6 +117,7 @@ sap.ui.define(
 			editFlow: EditFlow.override(EditFlowOverrides),
 			viewState: ViewState.override(ViewStateOverrides),
 			kpiManagement: KPIManagement,
+			placeholder: Placeholder,
 
 			getExtensionAPI: function() {
 				if (!this.extensionAPI) {
@@ -134,26 +129,34 @@ sap.ui.define(
 			onInit: function() {
 				PageController.prototype.onInit.apply(this);
 				var that = this;
-				var aTables = this._getTables();
+				var aControls = this._getControls();
 				var oInternalModelContext = this.getView().getBindingContext("internal");
 				if (that._isMultiMode()) {
 					var oMultiModeTab = that._getMultiModeControl();
 					oInternalModelContext.setProperty("tabs", {
 						selected: oMultiModeTab.getSelectedKey() || oMultiModeTab.getItems()[0].getKey()
 					});
-					aTables.forEach(function(oTable) {
+					aControls.forEach(function(oControl) {
 						var oUpdateCounts = function() {
 							that._updateCounts();
 						};
-						TableUtils.addEventToBindingInfo(oTable, "dataRequested", oUpdateCounts);
+						CommonUtils.addEventToBindingInfo(oControl, "dataRequested", oUpdateCounts);
 					});
 				}
+				//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);
 				oInternalModelContext.setProperty("uom", {});
 				oInternalModelContext.setProperty("scalefactor", {});
 				oInternalModelContext.setProperty("scalefactorNumber", {});
+				oInternalModelContext.setProperty("currency", {});
 
 				if (this._hasMultiVisualizations()) {
 					var alpContentView = this._getDefaultPath();
@@ -173,7 +176,7 @@ sap.ui.define(
 					.getRouterProxy()
 					.waitForRouteMatchBeforeNavigation();
 
-				this._updateMultiTableHiddenStatus();
+				this._isMultiMode() && this._updateMultiControlHiddenStatus();
 
 				FilterUtils.attachConditionHandling(this._getFilterBarControl());
 			},
@@ -189,7 +192,7 @@ sap.ui.define(
 			},
 
 			_onAfterBinding: function() {
-				var aTables = this._getTables();
+				var aTables = this._getControls("table");
 				var that = this;
 				if (EditState.isEditStateDirty()) {
 					var oTableBinding = this._getTableBinding();
@@ -222,6 +225,10 @@ sap.ui.define(
 				);
 			},
 
+			onBeforeRendering: function() {
+				PageController.prototype.onBeforeRendering.apply(this);
+			},
+
 			onAfterRendering: function(oEvent) {
 				var that = this;
 				this.getView()
@@ -229,7 +236,7 @@ sap.ui.define(
 					.getResourceBundle()
 					.then(function(response) {
 						that.oResourceBundle = response;
-						var aTables = that._getTables();
+						var aControls = that._getControls();
 						var sEntitySet = that.getView().getViewData().entitySet;
 						var sText = CommonUtils.getTranslatedText(
 							"T_OP_TABLE_AND_CHART_NO_DATA_TEXT",
@@ -237,34 +244,23 @@ sap.ui.define(
 							undefined,
 							sEntitySet
 						);
-						aTables.forEach(function(oTable) {
-							oTable.setNoDataText(sText);
+						aControls.forEach(function(oControl) {
+							oControl.setNoDataText(sText);
 						});
-						if (that._hasMultiVisualizations()) {
-							var oChart = that.getChartControl();
-							oChart.setNoDataText(sText);
-						}
 					})
 					.catch(function(oError) {
 						Log.error("Error while retrieving the resource bundle", oError);
 					});
 			},
 			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();
+					}
 				}
 			},
 
@@ -310,34 +306,31 @@ sap.ui.define(
 			onPendingFilters: function() {},
 			getCurrentEntitySet: function() {
 				if (!this._sEntitySet) {
-					var oTable = this._getCurrentTable();
-					this._sEntitySet = oTable.data("targetCollectionPath").slice(1);
+					var oDisplayedControl = (this._isMultiMode() && this._getCurrentControl()) || this._getTable();
+					this._sEntitySet = oDisplayedControl.data("targetCollectionPath").slice(1);
 				}
 				return this._sEntitySet;
 			},
 
 			/**
-			 * This method initiates update of enabled state of DataFieldForAction and visible state of DataFieldForIBN buttons.
-			 * @param aTables Array of tables in the List report
+			 * This method initiates the update of the enabled state of the DataFieldForAction and the visible state of the DataFieldForIBN buttons.
+			 * @param aTables Array of tables in the list report
 			 * @private
 			 */
 			_updateTableActions: function(aTables) {
 				var aIBNActions = [];
-				aTables.forEach(
-					function(oTable) {
-						aIBNActions = CommonUtils.getIBNActions(oTable, aIBNActions);
-						TableUtils.getSemanticTargetsFromTable(this, oTable);
-						// Update 'enabled' property of DataFieldForAction buttons on table toolbar
-						// The same is also performed on Table selectionChange event
-						var oInternalModelContext = oTable.getBindingContext("internal"),
-							oActionOperationAvailableMap = JSON.parse(
-								CommonHelper.parseCustomData(DelegateUtil.getCustomData(oTable, "operationAvailableMap"))
-							),
-							aSelectedContexts = oTable.getSelectedContexts();
-
-						CommonUtils.setActionEnablement(oInternalModelContext, oActionOperationAvailableMap, aSelectedContexts);
-					}.bind(this)
-				);
+				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());
 			},
 
@@ -346,36 +339,12 @@ sap.ui.define(
 			 *
 			 * @function
 			 * @name sap.fe.templates.ListReport.ListReportController.controller#_scrollTablesToRow
-			 * @param {string} sRowPath The path of the table row context to be scrolled
+			 * @param {string} sRowPath The path of the table row context to be scrolled to
 			 */
 			_scrollTablesToRow: function(sRowPath) {
-				var aTables, oTable, oTableRow, oTableRowBinding;
-				if (this._getTables && this._getTables().length > 0) {
-					aTables = this._getTables();
-					for (var i = 0; i < aTables.length; i++) {
-						oTable = aTables[i];
-						oTableRowBinding = oTable.getRowBinding();
-						if (oTableRowBinding) {
-							var oTableRowBindingContexts;
-							switch (oTable.data().tableType) {
-								case "GridTable":
-									oTableRowBindingContexts = oTableRowBinding.getContexts(0);
-									break;
-								case "ResponsiveTable":
-									oTableRowBindingContexts = oTableRowBinding.getCurrentContexts();
-									break;
-								default:
-							}
-							oTableRow = oTableRowBindingContexts.find(function(item) {
-								return item && item.getPath().indexOf(sRowPath) !== -1;
-							});
-						}
-						if (oTableRow) {
-							var iPos = oTableRow.iIndex;
-							oTable.scrollToIndex(iPos);
-						}
-					}
-				}
+				this._getControls("table").forEach(function(oTable) {
+					TableScroller.scrollTableToRow(oTable, sRowPath);
+				});
 			},
 			_getPageTitleInformation: function() {
 				var that = this;
@@ -400,9 +369,9 @@ sap.ui.define(
 			},
 			_getSegmentedButtonId: function(sControl) {
 				if (sControl === "Chart") {
-					return this.getChartControl().data("segmentedButtonId");
+					return this._getChart().data("segmentedButtonId");
 				} else {
-					return this._getCurrentTable().data("segmentedButtonId");
+					return this._getTable().data("segmentedButtonId");
 				}
 			},
 			_getFilterBarControlId: function() {
@@ -435,39 +404,47 @@ sap.ui.define(
 					.getContent()[0]
 					.data("singleTableId");
 			},
-			_getCurrentTable: function() {
+			_getCurrentControl: function() {
 				if (!this._oListReportControl) {
 					var oMultiModeTab = this._getMultiModeControl();
-					if (oMultiModeTab) {
-						this._oListReportControl = this.getView().byId(
-							oMultiModeTab.getSelectedKey() || oMultiModeTab.getItems()[0].getKey()
-						);
-					} else {
-						this._oListReportControl = this.getView().byId(this._getTableControlId());
-					}
+					this._oListReportControl = this.getView().byId(oMultiModeTab.getSelectedKey() || oMultiModeTab.getItems()[0].getKey());
 				}
 				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() {
+				return this.getView().byId(this._getChartControlId());
+			},
 			_getTableBinding: function(sTableId) {
-				var oTableControl = sTableId ? this.getView().byId(sTableId) : this._getCurrentTable(),
+				var oTableControl = sTableId ? this.getView().byId(sTableId) : this._getTable(),
 					oBinding = oTableControl && oTableControl._getRowBinding();
 
 				return oBinding;
 			},
-			_getTables: function() {
+			_getControls: function(sKey) {
 				var that = this;
 				if (this._isMultiMode()) {
-					var aTables = [];
+					var aControls = [];
 					var oTabMultiMode = this._getMultiModeControl();
 					oTabMultiMode.getItems().forEach(function(oItem) {
-						var oTable = that.getView().byId(oItem.getKey());
-						if (oTable) {
-							aTables.push(oTable);
+						var oControl = that.getView().byId(oItem.getKey());
+						if (sKey) {
+							if (oItem.getKey().indexOf("fe::" + sKey) > -1) {
+								oControl && aControls.push(oControl);
+							}
+						} else {
+							oControl && aControls.push(oControl);
 						}
 					});
-					return aTables;
+					return aControls;
 				}
-				return [this._getCurrentTable()];
+				return sKey === "Chart" ? [this._getChart()] : [this._getTable()];
 			},
 			_getDefaultPath: function() {
 				var defaultPath = this.getView()
@@ -557,27 +534,28 @@ sap.ui.define(
 			 * 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.
 			 */
-			_updateMultiTableHiddenStatus: function() {
-				var oDisplayedTable = this._getCurrentTable();
-				if (this._isMultiMode() && oDisplayedTable) {
-					var sDisplayTableId = oDisplayedTable.getId();
-					var aTables = this._getTables();
-					aTables.forEach(function(oTable) {
-						var sTableId = oTable.getId();
-						oTable.data("tableHidden", sTableId !== sDisplayTableId);
+			_updateMultiControlHiddenStatus: function() {
+				var oDisplayedControl = this._getCurrentControl();
+				if (this._isMultiMode() && oDisplayedControl) {
+					var sDisplayControlId = oDisplayedControl.getId();
+					var aControls = this._getControls();
+					aControls.forEach(function(oControl) {
+						var sControlId = oControl.getId();
+						oControl.data("controlHidden", sControlId !== sDisplayControlId);
 					});
 				}
 			},
 			/**
-			 * Method to update Page local UI Model with Filter Bar not applicable fields (specific to Multi Tables scenario).
+			 * 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 multiple table scenario).
 			 *
-			 * @param {sap.ui.model.context} oInternalModelContext Internal Model Context
-			 * @param {sap.ui.mdc.FilterBar} oFilterBar MDC FilterBar
+			 * @param {sap.ui.model.context} oInternalModelContext The internal model context
+			 * @param {sap.ui.mdc.FilterBar} oFilterBar MDC filter bar
 			 */
 			_updateMultiNotApplicableFields: function(oInternalModelContext, oFilterBar) {
 				var mCache = {};
 				var ignoredFields = {},
-					aTables = this._getTables();
+					aTables = this._getControls("table"),
+					aCharts = this._getControls("Chart");
 				aTables.forEach(function(oTable) {
 					var sTableEntityPath = oTable.data("targetCollectionPath"),
 						sTableEntitySet = sTableEntityPath.slice(1),
@@ -587,45 +565,62 @@ sap.ui.define(
 							.getKey(),
 						sCacheKey = sTableEntitySet + (oTable.data("enableAnalytics") === "true" ? "Analytical" : "Regular");
 					if (!mCache[sCacheKey]) {
-						mCache[sCacheKey] = FilterUtils.getNotApplicableFiltersForTable(oFilterBar, oTable);
+						mCache[sCacheKey] = FilterUtils.getNotApplicableFilters(oFilterBar, oTable);
+					}
+					ignoredFields[sTabId] = mCache[sCacheKey];
+				});
+				aCharts.forEach(function(oChart) {
+					var sChartEntityPath = oChart.data("targetCollectionPath"),
+						sChartEntitySet = sChartEntityPath.slice(1),
+						sTabId = oChart
+							.getParent()
+							.getParent()
+							.getKey(),
+						sCacheKey = sChartEntitySet + "Chart";
+					if (!mCache[sCacheKey]) {
+						mCache[sCacheKey] = FilterUtils.getNotApplicableFilters(oFilterBar, oChart);
 					}
 					ignoredFields[sTabId] = mCache[sCacheKey];
 				});
 				oInternalModelContext.setProperty("tabs/ignoredFields", ignoredFields);
 			},
-			_updateTableControl: function() {
+			_updateMultiModeSelectedControl: function() {
 				this._sEntitySet = undefined;
 				this._oListReportControl = undefined;
-				this._getCurrentTable();
+				this._getCurrentControl();
 			},
 			_updateCounts: function() {
-				this._updateMutliModeCounts();
+				this._updateMultiModeCounts();
 			},
 			/**
-			 * Method to determine if a tab from the list report is custom.
+			 * Method to determine if a tab from the list report is a custom tab.
 			 *
 			 * @function
 			 * @name _isCustomTab
-			 * @returns {boolean} Determines if the tab is custom or not.
+			 * @returns {boolean} Determines if the tab is a custom tab.
 			 */
 			_isCustomTab: function() {
 				var oMultiModeControl = this._getMultiModeControl();
 				return oMultiModeControl && oMultiModeControl.getSelectedKey().indexOf("::CustomTab::") > -1;
 			},
-			_updateMutliModeCounts: function() {
+			_updateMultiModeCounts: function() {
 				var that = this;
 				var aBindingPromises = [];
 				var oMultiModeControl = this._getMultiModeControl();
 				if (oMultiModeControl && oMultiModeControl.data("showCounts") === "true" && !this._isCustomTab()) {
-					var oDisplayedTable = this._getCurrentTable();
-					var sDisplayedTableId = oDisplayedTable.getId();
+					var oDisplayedControl = this._getCurrentControl();
+					var sDisplayedControlId = oDisplayedControl.getId();
 					var aCompliantTabs = [];
 					var aItems = oMultiModeControl.getItems();
 					aItems.forEach(function(oItem) {
-						var oTable = that.getView().byId(oItem.getKey());
-						if (oTable && (oItem.data("outdatedCounts") || oTable.getId() === sDisplayedTableId)) {
+						var oControl = that.getView().byId(oItem.getKey());
+						if (
+							oControl &&
+							!oControl.isA("sap.ui.mdc.ChartNew") &&
+							(oItem.data("outdatedCounts") || oControl.getId() === sDisplayedControlId)
+						) {
 							aCompliantTabs.push({
-								table: oTable,
+								control: oControl,
 								item: oItem
 							});
 						}
@@ -633,10 +628,10 @@ sap.ui.define(
 
 					aBindingPromises = aCompliantTabs.map(function(mTab) {
 						mTab.item.setCount("...");
-						var oTable = mTab.table;
-						var oFilterInfos = TableUtils.getFiltersInfoForSV(oTable, mTab.item.data("selectionVariant"));
-						return TableUtils.getListBindingForCount(oTable, that.getView().getBindingContext(), {
-							batchGroupId: oTable.getId() === sDisplayedTableId ? oTable.data("batchGroupId") : "$auto",
+						var oControl = mTab.control;
+						var oFilterInfos = TableUtils.getFiltersInfoForSV(oControl, mTab.item.data("selectionVariant"));
+						return TableUtils.getListBindingForCount(oControl, that.getView().getBindingContext(), {
+							batchGroupId: oControl.getId() === sDisplayedControlId ? oControl.data("batchGroupId") : "$auto",
 							additionalFilters: oFilterInfos.filters
 						});
 					});
@@ -678,44 +673,79 @@ 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;
 				}
 			},
 			handlers: {
 				onTabMultiModeChange: function(oEvent) {
-					this._updateTableControl();
-					this._updateMultiTableHiddenStatus();
-					var oFilterBar = this._getFilterBarControl();
-					var oInternalModelContext = this.getView().getBindingContext("internal");
-					var oDisplayedTable = this._getCurrentTable();
-					var oMultiModeControl = this._getMultiModeControl();
-					oInternalModelContext.setProperty("tabs/selected", oMultiModeControl.getSelectedKey());
-					if (oFilterBar && oInternalModelContext.getProperty("hasPendingFilters") !== true) {
-						// No pending filters into FitlerBar
-						if (this._isCustomTab()) {
-							var oFilterConditions = oFilterBar.getFilterConditions();
-							this.onViewNeedsRefresh({
-								filterConditions: oFilterConditions,
-								currentTabId: oMultiModeControl.getSelectedKey(),
-								refreshCause: "tabChanged"
-							});
-						} else if (
-							!oDisplayedTable.getRowBinding() || // first time the tab/table is displayed
-							oDisplayedTable.data("outdatedRows") === true
-						) {
-							// Search has been triggered on a different tab {}
-							oDisplayedTable.rebindTable();
-							oDisplayedTable.data("outdatedRows", false);
+					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);
+							}
 						}
+						/* Need to disable it because of IconTabBar regression : BCP 2170302705
+						var sPreviousSelectedKey = oEvent && oEvent.mParameters ? oEvent.mParameters.previousKey : undefined;
+
+						ControlPersonalizationWriteAPI.add({
+							changes: [
+								{
+									changeSpecificData: {
+										changeType: "selectIconTabBarFilter",
+										content: {
+											selectedKey: sSelectedKey,
+											previousSelectedKey: sPreviousSelectedKey
+										}
+									},
+									selectorElement: oMultiModeControl
+								}
+							]
+						});
+						*/
+						this.getExtensionAPI().updateAppState();
 					}
-					this.getExtensionAPI().updateAppState();
 				},
 				onFiltersChanged: function(oEvent) {
-					var oFilterBar = oEvent.getSource(),
+					var oFilterBar = this._getFilterBarControl(),
 						oInternalModelContext = this.getView().getBindingContext("internal");
-					// Pending filters into FitlerBar to be used for custom views
+					// Pending filters into FilterBar to be used for custom views
 					this.onPendingFilters();
 					oInternalModelContext.setProperty("appliedFilters", oFilterBar.getAssignedFiltersText().filtersText);
 					oInternalModelContext.setProperty("hasPendingFilters", true);
@@ -728,6 +758,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,24 +778,28 @@ sap.ui.define(
 				},
 				onSearch: function(oEvent) {
 					var that = this;
-					var oFilterBar = oEvent.getSource();
+					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 aTables = this._getTables(),
+						var aControls = this._getControls(),
 							oMultiModeControl = this._getMultiModeControl();
 						if (oMultiModeControl && oMultiModeControl.data("showCounts") === "true") {
 							var aItems = oMultiModeControl.getItems();
 							aItems.forEach(function(oItem) {
-								oItem.data("outdatedCounts", true);
+								if (!oItem.getKey().indexOf("fe::Chart") > -1) {
+									oItem.data("outdatedCounts", true);
+								}
 							});
 						}
 						if (!this._isCustomTab()) {
-							var sDisplayedTableId = this._getCurrentTable().getId();
+							var sDisplayedControlId = this._getCurrentControl().getId();
 							this._updateMultiNotApplicableFields(oInternalModelContext, oFilterBar);
-							aTables.forEach(function(oTable) {
-								oTable.data("outdatedRows", oTable.getId() !== sDisplayedTableId);
+							aControls.forEach(function(oControl) {
+								oControl.data("outdatedRows", oControl.getId() !== sDisplayedControlId);
 							});
 						} else {
 							var oFilterConditions = oFilterBar.getFilterConditions();
@@ -801,40 +838,30 @@ 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
-				 * @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
 				 */
-				onChevronPressNavigateOutBound: function(oController, sOutboundTarget, oContext) {
-					// TODO: remove this to directly use the intent based navigation controller in the macro.
-					var oOutbounds = oController
-							.getAppComponent()
-							.getRoutingService()
-							.getOutbounds(),
-						oDisplayOutbound = oOutbounds[sOutboundTarget];
-					if (oDisplayOutbound && oDisplayOutbound.semanticObject && oDisplayOutbound.action) {
-						oContext = oContext && oContext.isA && oContext.isA("sap.ui.model.odata.v4.Context") ? [oContext] : oContext;
-						oController._intentBasedNavigation.navigate(oDisplayOutbound.semanticObject, oDisplayOutbound.action, {
-							navigationContexts: oContext
-						});
-
-						//TODO: check why returning a promise is required
-						return Promise.resolve();
-					} else {
-						throw new Error("outbound target " + sOutboundTarget + " not found in cross navigation definition of manifest");
-					}
+				onChevronPressNavigateOutBound: function(oController, sOutboundTarget, oContext, sCreatePath) {
+					return oController._intentBasedNavigation.onChevronPressNavigateOutBound(
+						oController,
+						sOutboundTarget,
+						oContext,
+						sCreatePath
+					);
 				},
 				onChartSelectionChanged: function(oEvent) {
-					var oMdcChart = oEvent.getSource(),
-						oTable = this._getCurrentTable(),
-						oDataContext = oEvent.getParameter("dataContext"),
+					var oMdcChart = oEvent.getSource().getContent(),
+						oTable = this._getTable(),
+						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
@@ -853,8 +880,8 @@ sap.ui.define(
 					var oInternalModelContext = this.getView().getBindingContext("internal");
 					oInternalModelContext.setProperty("alpContentView", sSelectedKey);
 					var oSegmentedButton;
-					var oChart = this.getChartControl();
-					var oTable = this._getCurrentTable();
+					var oChart = this._getChart();
+					var oTable = this._getTable();
 					var oSegmentedButtonDelegate = {
 						onAfterRendering: function() {
 							var aItems = oSegmentedButton.getItems();
@@ -908,39 +935,35 @@ sap.ui.define(
 							.setVisible(true);
 					}
 				},
-				onVisualFilterDataReceived: function(oEvent) {
-					var oVisualFilterBar = this._getFilterBarControl();
-					var oVisualFilter = VisualFilterUtils.getVisualFilterControl(oVisualFilterBar, oEvent.getSource());
-					var oInternalModelContext = this.getView().getBindingContext("internal");
-					var sId = oVisualFilter.getId().split("fe::VisualFilter");
-					var sChartId = "fe::VisualFilter" + sId[1];
-					var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.fe.macros");
-					var vUOM = oVisualFilter.data("uom");
-					VisualFilterUtils.updateChartScaleFactorTitle(oVisualFilter, this.getView());
-					if (oEvent.getParameter("error")) {
-						var s18n = oResourceBundle.getText("M_VISUAL_FILTERS_ERROR_DATA_TEXT");
-						VisualFilterUtils.applyOverLay(s18n, sChartId, this.getView());
-					} else if (oEvent.getParameter("data")) {
-						var oData = oEvent.getSource().getCurrentContexts();
-						if (oData && oData.length === 0) {
-							VisualFilterUtils.setNoDataMessage(sChartId, oResourceBundle, this.getView());
-						} else {
-							oInternalModelContext.setProperty(sChartId, {});
-						}
-						VisualFilterUtils.setMultiUOMMessage(oData, oVisualFilter, sChartId, oResourceBundle, this.getView());
-					}
-					if (vUOM && ((vUOM["ISOCurrency"] && vUOM["ISOCurrency"].$Path) || (vUOM["Unit"] && vUOM["Unit"].$Path))) {
-						var oContexts = oEvent.getSource().getContexts();
-						var oContextData = oContexts && oContexts[0].getObject();
-						VisualFilterUtils.applyUOMToTitle(oVisualFilter, oContextData, this.getView());
+				onTableStateChanged: function(oEvent) {
+					if (this.bTestAppState) {
+						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 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
 				 */
@@ -974,14 +997,6 @@ sap.ui.define(
 						}
 					}
 					return sText;
-				},
-				scaleVisualFilterValue: function(oValue, scaleFactor) {
-					if (scaleFactor) {
-						var nScaledValue = VisualFilterUtils.getFormattedNumber(oValue, scaleFactor);
-						return nScaledValue;
-					} else {
-						return oValue;
-					}
 				}
 			}
 		});