@sapui5/sap.fe.templates 1.102.2 → 1.104.1

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

@@ -1,7 +1,7 @@
-import ResourceBundle from "sap/base/i18n/ResourceBundle";
+import type ResourceBundle from "sap/base/i18n/ResourceBundle";
 import Log from "sap/base/Log";
 import ObjectPath from "sap/base/util/ObjectPath";
-import DynamicPage from "sap/f/DynamicPage";
+import type DynamicPage from "sap/f/DynamicPage";
 import CommonUtils from "sap/fe/core/CommonUtils";
 import EditFlow from "sap/fe/core/controllerextensions/EditFlow";
 import IntentBasedNavigation from "sap/fe/core/controllerextensions/IntentBasedNavigation";
@@ -13,7 +13,7 @@ import Placeholder from "sap/fe/core/controllerextensions/Placeholder";
 import Share from "sap/fe/core/controllerextensions/Share";
 import SideEffects from "sap/fe/core/controllerextensions/SideEffects";
 import ViewState from "sap/fe/core/controllerextensions/ViewState";
-import FilterBar from "sap/fe/core/controls/FilterBar";
+import type FilterBar from "sap/fe/core/controls/FilterBar";
 import {
 	defineUI5Class,
 	extensible,
@@ -23,6 +23,7 @@ import {
 	usingExtension
 } from "sap/fe/core/helpers/ClassSupport";
 import EditState from "sap/fe/core/helpers/EditState";
+import MessageStrip from "sap/fe/core/helpers/MessageStrip";
 import { InternalModelContext } from "sap/fe/core/helpers/ModelHelper";
 import CoreLibrary from "sap/fe/core/library";
 import PageController from "sap/fe/core/PageController";
@@ -31,22 +32,21 @@ import ChartUtils from "sap/fe/macros/chart/ChartUtils";
 import CommonHelper from "sap/fe/macros/CommonHelper";
 import DelegateUtil from "sap/fe/macros/DelegateUtil";
 import FilterUtils from "sap/fe/macros/filter/FilterUtils";
-import TableUtils from "sap/fe/macros/table/Utils";
+import MultipleModeControl from "sap/fe/templates/ListReport/controls/MultipleModeControl";
 import ExtensionAPI from "sap/fe/templates/ListReport/ExtensionAPI";
 import EditFlowOverrides from "sap/fe/templates/RootContainer/overrides/EditFlow";
 import TableScroller from "sap/fe/templates/TableScroller";
-import IconTabBar from "sap/m/IconTabBar";
-import SegmentedButton from "sap/m/SegmentedButton";
-import Control from "sap/ui/core/Control";
-import Core from "sap/ui/core/Core";
+import type SegmentedButton from "sap/m/SegmentedButton";
+import type Control from "sap/ui/core/Control";
 import OverrideExecution from "sap/ui/core/mvc/OverrideExecution";
 import { system } from "sap/ui/Device";
 import ControlPersonalizationWriteAPI from "sap/ui/fl/write/api/ControlPersonalizationWriteAPI";
 import StateUtil from "sap/ui/mdc/p13n/StateUtil";
-import Table from "sap/ui/mdc/Table";
-import JSONModel from "sap/ui/model/json/JSONModel";
-import ResourceModel from "sap/ui/model/resource/ResourceModel";
+import type Table from "sap/ui/mdc/Table";
+import type JSONModel from "sap/ui/model/json/JSONModel";
+import type ResourceModel from "sap/ui/model/resource/ResourceModel";
 import hasher from "sap/ui/thirdparty/hasher";
+import type { V4Context } from "types/extension_types";
 import IntentBasedNavigationOverride from "./overrides/IntentBasedNavigation";
 import ShareOverrides from "./overrides/Share";
 import ViewStateOverrides from "./overrides/ViewState";
@@ -114,21 +114,7 @@ class ListReportController extends PageController {
 
 	onInit() {
 		PageController.prototype.onInit.apply(this);
-		const aControls = this._getControls();
 		const oInternalModelContext = this.getView().getBindingContext("internal") as InternalModelContext;
-		if (this._isMultiMode()) {
-			const oMultiModeTab = this._getMultiModeControl();
-			oInternalModelContext.setProperty("tabs", {
-				selected: oMultiModeTab.getSelectedKey() || (oMultiModeTab.getItems()[0] as any).getKey()
-			});
-			aControls.forEach((oControl: any) => {
-				const oUpdateCounts = () => {
-					this._updateCounts();
-				};
-				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", "");
@@ -154,8 +140,6 @@ class ListReportController extends PageController {
 		// happen after the routeMatch event has been processed (otherwise the router gets broken)
 		this.getAppComponent().getRouterProxy().waitForRouteMatchBeforeNavigation();
 
-		this._isMultiMode() && this._updateMultiControlHiddenStatus();
-
 		// Configure the initial load settings
 		this._setInitLoad();
 	}
@@ -163,13 +147,17 @@ class ListReportController extends PageController {
 	onExit() {
 		delete this.filterBarConditions;
 		delete this._oListReportControl;
-		this.extensionAPI && this.extensionAPI.destroy();
+		if (this.extensionAPI) {
+			this.extensionAPI.destroy();
+		}
 		delete this.extensionAPI;
 	}
 
 	_onAfterBinding() {
 		const aTables = this._getControls("table");
 		if (EditState.isEditStateDirty()) {
+			const oMultiModeControl = this._getMultiModeControl();
+			oMultiModeControl?.invalidateContent();
 			const oTableBinding = this._getTableBinding();
 			if (oTableBinding) {
 				if (CommonUtils.getAppComponent(this.getView())._isFclEnabled()) {
@@ -179,10 +167,6 @@ class ListReportController extends PageController {
 					if (!this.sUpdateTimer) {
 						this.sUpdateTimer = setTimeout(() => {
 							oTableBinding.refresh();
-							if (this._isMultiMode()) {
-								this._setCountsOutDated();
-								this._updateCounts();
-							}
 							delete this.sUpdateTimer;
 						}, 0);
 					}
@@ -253,7 +237,7 @@ class ListReportController extends PageController {
 	 * or when a tab with custom content is selected.
 	 * This method can be overwritten by the controller extension in case of customization.
 	 *
-	 * @param {map} mParameters Map containing the filter conditions of the FilterBar, the currentTabID
+	 * @param mParameters Map containing the filter conditions of the FilterBar, the currentTabID
 	 * and the view refresh cause (tabChanged or search).
 	 * The map looks like this:
 	 * <code><pre>
@@ -273,7 +257,6 @@ class ListReportController extends PageController {
 	 *		refreshCause: "tabChanged" | "search"
 	 *	}
 	 * </pre></code>
-	 *
 	 * @public
 	 */
 	@publicExtension()
@@ -307,6 +290,7 @@ class ListReportController extends PageController {
 
 	/**
 	 * 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
 	 */
@@ -318,7 +302,7 @@ class ListReportController extends PageController {
 			// The same is also performed on Table selectionChange event
 			const oInternalModelContext = oTable.getBindingContext("internal"),
 				oActionOperationAvailableMap = JSON.parse(
-					CommonHelper.parseCustomData(DelegateUtil.getCustomData(oTable, "operationAvailableMap")) as any
+					CommonHelper.parseCustomData(DelegateUtil.getCustomData(oTable, "operationAvailableMap"))
 				),
 				aSelectedContexts = oTable.getSelectedContexts();
 
@@ -332,7 +316,7 @@ class ListReportController extends PageController {
 	 *
 	 * @function
 	 * @name sap.fe.templates.ListReport.ListReportController.controller#_scrollTablesToRow
-	 * @param {string} sRowPath The path of the table row context to be scrolled to
+	 * @param sRowPath The path of the table row context to be scrolled to
 	 */
 	_scrollTablesToRow(sRowPath: string) {
 		this._getControls("table").forEach(function (oTable: any) {
@@ -349,7 +333,7 @@ class ListReportController extends PageController {
 
 	_getPageOrFilterBarVariantManagement() {
 		return (
-			this.getView().byId("fe::PageVariantManagement") || this.getView().byId(this._getFilterBarControlId() + "::VariantManagement")
+			this.getView().byId("fe::PageVariantManagement") || this.getView().byId(`${this._getFilterBarControlId()}::VariantManagement`)
 		);
 	}
 
@@ -397,7 +381,7 @@ class ListReportController extends PageController {
 	}
 
 	_getMultiModeControl() {
-		return this.getView().byId("fe::TabMultipleMode") as IconTabBar;
+		return this.getView().byId("fe::TabMultipleMode::Control") as MultipleModeControl;
 	}
 
 	_getTableControlId() {
@@ -406,12 +390,12 @@ class ListReportController extends PageController {
 
 	_getCurrentControl(): Control {
 		if (!this._oListReportControl) {
-			const oMultiModeTab = this._getMultiModeControl();
+			const oMultiModeTab = this._getMultiModeControl().content;
 			this._oListReportControl = this.getView().byId(
 				oMultiModeTab.getSelectedKey() || (oMultiModeTab.getItems()[0] as any).getKey()
 			) as Control;
 		}
-		return this._oListReportControl as Control;
+		return this._oListReportControl;
 	}
 
 	_getTable(): Table | undefined {
@@ -428,23 +412,21 @@ class ListReportController extends PageController {
 
 	_getTableBinding(sTableId?: any) {
 		const oTableControl = sTableId ? this.getView().byId(sTableId) : this._getTable();
-		const oBinding = oTableControl && (oTableControl as any)._getRowBinding();
-
-		return oBinding;
+		return oTableControl && (oTableControl as any)._getRowBinding();
 	}
 
 	_getControls(sKey?: any) {
 		if (this._isMultiMode()) {
 			const aControls: any[] = [];
-			const oTabMultiMode = this._getMultiModeControl();
+			const oTabMultiMode = this._getMultiModeControl().content;
 			oTabMultiMode.getItems().forEach((oItem: any) => {
 				const oControl = this.getView().byId(oItem.getKey());
-				if (sKey) {
-					if (oItem.getKey().indexOf("fe::" + sKey) > -1) {
-						oControl && aControls.push(oControl);
+				if (oControl && sKey) {
+					if (oItem.getKey().indexOf(`fe::${sKey}`) > -1) {
+						aControls.push(oControl);
 					}
-				} else {
-					oControl && aControls.push(oControl);
+				} else if (oControl) {
+					aControls.push(oControl);
 				}
 			});
 			return aControls;
@@ -475,7 +457,7 @@ class ListReportController extends PageController {
 	 *
 	 * @function
 	 * @name _isMultiMode
-	 * @returns {boolean} Is Multiple Table mode set?
+	 * @returns Is Multiple Table mode set?
 	 */
 	_isMultiMode() {
 		if (!this._oListReportControl) {
@@ -489,24 +471,13 @@ class ListReportController extends PageController {
 	 *
 	 * @function
 	 * @name _isInitLoadDisabled
-	 * @returns {boolean} Is InitLoad enabled?
+	 * @returns Is InitLoad enabled?
 	 */
 	_isInitLoadEnabled() {
 		const initLoadMode = (this.getView().getViewData() as any).initialLoad;
 		return initLoadMode === InitialLoadMode.Enabled;
 	}
 
-	/**
-	 * Method to know if ListReport is configured with Multiple EntitySets.
-	 *
-	 * @function
-	 * @name _isMultiEntitySets
-	 * @returns {boolean} Is Multiple EntitySets configuration?
-	 */
-	_isMultiEntitySets() {
-		return this.getView().getContent()[0].data("isMultiEntitySets") === "true";
-	}
-
 	_hasMultiVisualizations() {
 		return this.getView().getContent()[0].data("hasMultiVisualizations") === "true";
 	}
@@ -567,7 +538,7 @@ class ListReportController extends PageController {
 			bookmarkTitle: document.title, //To name the bookmark according to the app title.
 			bookmarkCustomUrl: function () {
 				const sHash = hasher.getHash();
-				return sHash ? "#" + sHash : window.location.href;
+				return sHash ? `#${sHash}` : window.location.href;
 			},
 			/*
 							To be activated once the FLP shows the count - see comment above
@@ -584,75 +555,13 @@ class ListReportController extends PageController {
 		oTemplatePrivateModel.setProperty("/listReport/share", oShareInfo);
 	}
 
-	/**
-	 * Hidden tables must be marked as hidden to avoid sending
-	 * 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 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.
-	 */
-	_updateMultiControlHiddenStatus() {
-		const oDisplayedControl = this._getCurrentControl();
-		if (this._isMultiMode() && oDisplayedControl) {
-			const sDisplayControlId = oDisplayedControl.getId();
-			const aControls = this._getControls();
-			aControls.forEach(function (oControl: any) {
-				const sControlId = oControl.getId();
-				oControl.data("controlHidden", sControlId !== sDisplayControlId);
-			});
-		}
-	}
-
-	/**
-	 * 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 The internal model context
-	 * @param {sap.ui.mdc.FilterBar} oFilterBar MDC filter bar
-	 */
-	_updateMultiTabNotApplicableFields(oInternalModelContext: any, oFilterBar: any) {
-		const mCache: any = {};
-		const ignoredFields: any = {},
-			ignoredFieldsTitle: any = {},
-			aTables = this._getControls("table"),
-			aCharts = this._getControls("Chart");
-		aTables.forEach((oTable: any) => {
-			const sTableEntityPath = oTable.data("targetCollectionPath"),
-				sTableEntitySet = sTableEntityPath.slice(1),
-				sTabId = oTable.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] = this.formatters.setTabMessageStrip.call(this, mCache[sCacheKey], sTabTitle, "false", {});
-		});
-		aCharts.forEach((oChart: any) => {
-			const sChartEntityPath = oChart.data("targetCollectionPath"),
-				sChartEntitySet = sChartEntityPath.slice(1),
-				sTabId = oChart.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] = this.formatters.setTabMessageStrip.call(this, mCache[sCacheKey], sTabTitle, "false", {});
-		});
-		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
+	 * @param oInternalModelContext The internal model context
+	 * @param oFilterBar MDC filter bar
 	 */
-	_updateALPNotApplicableFields(oInternalModelContext: any, oFilterBar: any) {
+	_updateALPNotApplicableFields(oInternalModelContext: InternalModelContext, oFilterBar: FilterBar) {
 		const mCache: any = {};
 		const ignoredFields: any = {},
 			aTables = this._getControls("table"),
@@ -667,7 +576,7 @@ class ListReportController extends PageController {
 		aCharts.forEach(function (oChart: any) {
 			const sChartEntityPath = oChart.data("targetCollectionPath"),
 				sChartEntitySet = sChartEntityPath.slice(1),
-				sCacheKey = sChartEntitySet + "Chart";
+				sCacheKey = `${sChartEntitySet}Chart`;
 			if (!mCache[sCacheKey]) {
 				mCache[sCacheKey] = FilterUtils.getNotApplicableFilters(oFilterBar, oChart);
 			}
@@ -681,79 +590,15 @@ class ListReportController extends PageController {
 		this._oListReportControl = undefined;
 		this._getCurrentControl();
 	}
-
-	_updateCounts() {
-		this._updateMultiModeCounts();
-	}
-
 	/**
 	 * Method to determine if a tab from the list report is a custom tab.
 	 *
 	 * @function
 	 * @name _isCustomTab
-	 * @returns {boolean} Determines if the tab is a custom tab.
+	 * @returns Determines if the tab is a custom tab.
 	 */
 	_isCustomTab() {
-		const oMultiModeControl = this._getMultiModeControl();
-		return oMultiModeControl && oMultiModeControl.getSelectedKey().indexOf("::CustomTab::") > -1;
-	}
-
-	_setCountsOutDated() {
-		const oMultiModeControl = this._getMultiModeControl();
-		if (oMultiModeControl && oMultiModeControl.data("showCounts") === "true") {
-			const aItems = oMultiModeControl.getItems();
-			aItems.forEach(function (oItem: any) {
-				if (oItem.getKey().indexOf("fe::Chart") === -1) {
-					oItem.data("outdatedCounts", true);
-				}
-			});
-		}
-	}
-
-	_updateMultiModeCounts() {
-		let aBindingPromises = [];
-		const oMultiModeControl = this._getMultiModeControl();
-		if (oMultiModeControl && oMultiModeControl.data("showCounts") === "true" && !this._isCustomTab()) {
-			const oDisplayedControl = this._getCurrentControl();
-			const sDisplayedControlId = oDisplayedControl.getId();
-			const aCompliantTabs: any[] = [];
-			const aItems = oMultiModeControl.getItems();
-			aItems.forEach((oItem: any) => {
-				const oControl = this.getView().byId(oItem.getKey());
-				if (
-					oControl &&
-					!oControl.isA("sap.ui.mdc.Chart") &&
-					(oItem.data("outdatedCounts") || oControl.getId() === sDisplayedControlId)
-				) {
-					aCompliantTabs.push({
-						control: oControl,
-						item: oItem
-					});
-				}
-			});
-
-			aBindingPromises = aCompliantTabs.map((mTab: any) => {
-				mTab.item.setCount("...");
-				const oControl = mTab.control;
-				const oFilterInfos = TableUtils.getFiltersInfoForSV(oControl, mTab.item.data("selectionVariant")) as any;
-				return TableUtils.getListBindingForCount(oControl, this.getView().getBindingContext(), {
-					batchGroupId: oControl.getId() === sDisplayedControlId ? oControl.data("batchGroupId") : "$auto",
-					additionalFilters: oFilterInfos.filters
-				});
-			});
-
-			Promise.all(aBindingPromises)
-				.then(function (aCounts: any[]) {
-					for (const k in aCounts) {
-						const oItem = aCompliantTabs[k].item;
-						oItem.setCount(TableUtils.getCountFormatted(aCounts[k]));
-						oItem.data("outdatedCounts", false);
-					}
-				})
-				.catch(function (oError: any) {
-					Log.error("Error while retrieving the values for the icon tab bar", oError);
-				});
-		}
+		return this._getMultiModeControl()?.content.getSelectedKey().indexOf("::CustomTab::") > -1;
 	}
 
 	_isFilterBarHidden() {
@@ -800,46 +645,26 @@ class ListReportController extends PageController {
 
 	handlers = {
 		onTabMultiModeChange(this: ListReportController, oEvent: any) {
-			this._updateMultiModeSelectedControl();
-			this._updateMultiControlHiddenStatus();
-
-			const oFilterBar = this._getFilterBarControl();
-			const oInternalModelContext = this.getView().getBindingContext("internal") as InternalModelContext;
-			const oDisplayedControl = this._getCurrentControl() as any;
-			const oMultiModeControl = this._getMultiModeControl();
-			const sSelectedKey = oMultiModeControl.getSelectedKey();
 			const 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()) {
-					const 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)
-				) {
-					const oInnerChart = oDisplayedControl.getControlDelegate()._getChart(oDisplayedControl);
-					oDisplayedControl.getControlDelegate().rebind(oDisplayedControl, oInnerChart.getBindingInfo("data"));
-					oDisplayedControl.data("outdatedRows", false);
-				}
-			}
+			this._updateMultiModeSelectedControl();
 
 			if (oEvent && oEvent.mParameters && sPreviousSelectedKey !== oEvent.mParameters.selectedKey) {
+				const sSelectedKey = oEvent.mParameters.selectedKey;
+				const oFilterBar = this._getFilterBarControl();
+				const oMultiModeControl = this._getMultiModeControl();
+				const oInternalModelContext = this.getView().getBindingContext("internal");
+				if (oInternalModelContext) {
+					if (oFilterBar && oInternalModelContext.getProperty("hasPendingFilters") !== true) {
+						if (this._isCustomTab()) {
+							const oFilterConditions = oFilterBar.getFilterConditions();
+							this.onViewNeedsRefresh({
+								filterConditions: oFilterConditions,
+								currentTabId: sSelectedKey,
+								refreshCause: "tabChanged"
+							});
+						}
+					}
+				}
 				ControlPersonalizationWriteAPI.add({
 					changes: [
 						{
@@ -850,7 +675,7 @@ class ListReportController extends PageController {
 									previousSelectedKey: sPreviousSelectedKey
 								}
 							},
-							selectorElement: oMultiModeControl
+							selectorElement: oMultiModeControl.content
 						}
 					]
 				});
@@ -865,17 +690,19 @@ class ListReportController extends PageController {
 				this.onPendingFilters();
 				oInternalModelContext.setProperty("appliedFilters", oFilterBar.getAssignedFiltersText().filtersText);
 				if (oEvent.getParameter("conditionsBased")) {
+					this._getMultiModeControl()?.setFreezeContent(true);
 					oInternalModelContext.setProperty("hasPendingFilters", true);
 				}
 			}
 		},
 		onVariantSelected(this: ListReportController, oEvent: any) {
 			const oVM = oEvent.getSource();
+			const oMultiModeControl = this._getMultiModeControl();
+
+			oMultiModeControl?.invalidateContent();
+			oMultiModeControl?.setFreezeContent(true);
 			// setTimeout cause the variant needs to be applied before judging the auto search or updating the app state
 			setTimeout(() => {
-				if (this._isMultiMode()) {
-					(this.handlers as any).onTabMultiModeChange.apply(this, [oEvent]);
-				}
 				if (this._shouldAutoTriggerSearch(oVM)) {
 					// the app state will be updated via onSearch handler
 					return this._getFilterBarControl().triggerSearch();
@@ -898,23 +725,20 @@ class ListReportController extends PageController {
 			oInternalModelContext.setProperty("hasPendingFilters", false);
 			oInternalModelContext.setProperty("hideDraftInfo", bHideDraft);
 			if (this._isMultiMode()) {
-				const aControls = this._getControls(),
-					oMultiModeControl = this._getMultiModeControl();
-				this._setCountsOutDated();
+				const oMultiModeControl = this._getMultiModeControl();
+				oMultiModeControl.setCountsOutDated(true);
+				oMultiModeControl.setFreezeContent(false);
 				if (!this._isCustomTab()) {
-					const sDisplayedControlId = this._getCurrentControl().getId();
-					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: any) {
-						oControl.data("outdatedRows", oControl.getId() !== sDisplayedControlId);
-					});
+					oMultiModeControl.updateMultiTabNotApplicableFields(
+						oFilterBar,
+						oFilterBar.data("entityType"),
+						this.oResourceBundle as ResourceBundle
+					);
 				} else {
 					const oFilterConditions = oFilterBar.getFilterConditions();
 					this.onViewNeedsRefresh({
 						filterConditions: oFilterConditions,
-						currentTabId: oMultiModeControl.getSelectedKey(),
+						currentTabId: oMultiModeControl.content.getSelectedKey(),
 						refreshCause: "search"
 					});
 				}
@@ -926,7 +750,7 @@ class ListReportController extends PageController {
 				(oMdcChart.getBindingContext("internal") as InternalModelContext).setProperty("", {});
 
 				const oPageInternalModelContext = oMdcChart.getBindingContext("pageInternal") as InternalModelContext;
-				const sTemplateContentView = oPageInternalModelContext.getProperty(oPageInternalModelContext.getPath() + "/alpContentView");
+				const sTemplateContentView = oPageInternalModelContext.getProperty(`${oPageInternalModelContext.getPath()}/alpContentView`);
 				if (sTemplateContentView === TemplateContentView.Chart) {
 					this.hasPendingChartChanges = true;
 				}
@@ -954,15 +778,20 @@ class ListReportController extends PageController {
 		/**
 		 * 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 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
+		 * @param oController
+		 * @param sOutboundTarget Name of the outbound target (needs to be defined in the manifest)
+		 * @param oContext The context that contains the data for the target app
+		 * @param sCreatePath Create path when the chevron is created.
+		 * @returns Promise which is resolved once the navigation is triggered
 		 * @ui5-restricted
 		 * @final
 		 */
-		onChevronPressNavigateOutBound(oController: ListReportController, sOutboundTarget: string, oContext: any, sCreatePath: string) {
+		onChevronPressNavigateOutBound(
+			oController: ListReportController,
+			sOutboundTarget: string,
+			oContext: V4Context,
+			sCreatePath: string
+		) {
 			return oController._intentBasedNavigation.onChevronPressNavigateOutBound(oController, sOutboundTarget, oContext, sCreatePath);
 		},
 		onChartSelectionChanged(this: ListReportController, oEvent: any) {
@@ -976,11 +805,11 @@ class ListReportController extends PageController {
 				// update selections on selection or deselection
 				ChartUtils.setChartFilters(oMdcChart);
 			}
-			const sTemplateContentView = oInternalModelContext.getProperty(oInternalModelContext.getPath() + "/alpContentView");
+			const sTemplateContentView = oInternalModelContext.getProperty(`${oInternalModelContext.getPath()}/alpContentView`);
 			if (sTemplateContentView === TemplateContentView.Chart) {
 				this.hasPendingChartChanges = true;
-			} else {
-				oTable && (oTable as any).rebind();
+			} else if (oTable) {
+				(oTable as any).rebind();
 				this.hasPendingChartChanges = false;
 			}
 		},
@@ -1034,53 +863,36 @@ class ListReportController extends PageController {
 		},
 		onStateChange(this: ListReportController) {
 			this.getExtensionAPI().updateAppState();
+		},
+		onDynamicPageTitleStateChanged(this: ListReportController, oEvent: any) {
+			const filterBar: any = this._getFilterBarControl();
+			if (filterBar && filterBar.getSegmentedButton()) {
+				if (oEvent.getParameter("isExpanded")) {
+					filterBar.getSegmentedButton().setVisible(true);
+				} else {
+					filterBar.getSegmentedButton().setVisible(false);
+				}
+			}
 		}
 	};
 	formatters = {
-		/**
-		 * Method to set the message text for the multiple entity sets when fields in the FilterBar need to be ignored.
-		 *
-		 * @param this
-		 * @param {Array} aIgnoredFields Array of ignored fields in the FilterBar for the current tab (multiple entity sets)
-		 * @param {string} sTabTitle Tab title
-		 * @param {boolean} bIsChart Flag that indicates whether the control is a chart or not
-		 * @param {object} oApplySupported ApplySupported for the control
-		 * @returns {string} Message text
-		 */
-		setTabMessageStrip(this: ListReportController, aIgnoredFields: any[], sTabTitle: string, bIsChart?: any, oApplySupported?: any) {
+		setALPControlMessageStrip(this: ListReportController, aIgnoredFields: any[], bIsChart: any, oApplySupported?: any) {
 			let sText = "";
 			bIsChart = bIsChart === "true" || bIsChart === true;
 			const oFilterBar = this._getFilterBarControl();
-			if (oFilterBar && Array.isArray(aIgnoredFields) && aIgnoredFields.length > 0 && (sTabTitle || bIsChart)) {
-				const sFilterBarEntityPath = oFilterBar.data("entityType"),
-					oMetaModel = this.getView().getModel().getMetaModel(),
-					oResourceBundle = Core.getLibraryResourceBundle("sap.fe.templates") as ResourceBundle,
-					aIgnoredLabels = aIgnoredFields.map(function (sProperty) {
-						const oMacroResourceBundle = Core.getLibraryResourceBundle("sap.fe.macros") as ResourceBundle;
-						if (sProperty === "$search") {
-							return oMacroResourceBundle ? oMacroResourceBundle.getText("M_FILTERBAR_SEARCH") : "";
-						}
-						if (sProperty === "$editState") {
-							return oMacroResourceBundle ? oMacroResourceBundle.getText("M_COMMON_FILTERBAR_EDITING_STATUS") : "";
-						}
-						const sLabel = oMetaModel.getObject(sFilterBarEntityPath + sProperty + "@com.sap.vocabularies.Common.v1.Label");
-						return DelegateUtil.getLocalizedText(sLabel, oFilterBar);
-					});
+			if (oFilterBar && Array.isArray(aIgnoredFields) && aIgnoredFields.length > 0 && bIsChart) {
+				const aIgnoredLabels = MessageStrip.getLabels(
+					aIgnoredFields,
+					oFilterBar.data("entityType"),
+					oFilterBar,
+					this.oResourceBundle as ResourceBundle
+				);
 				const bIsSearchIgnored = !oApplySupported.enableSearch;
-				if (oResourceBundle) {
-					sText = CommonUtils.getMessageStripText(
-						this.getView(),
-						aIgnoredLabels,
-						oFilterBar,
-						bIsChart,
-						bIsSearchIgnored,
-						sTabTitle,
-						oResourceBundle,
-						DelegateUtil.getLocalizedText
-					);
-				}
+				sText = bIsChart
+					? MessageStrip.getALPText(aIgnoredLabels, oFilterBar, bIsSearchIgnored)
+					: MessageStrip.getText(aIgnoredLabels, oFilterBar, "", DelegateUtil.getLocalizedText);
+				return sText;
 			}
-			return sText;
 		}
 	};
 }