@sapui5/sap.fe.templates 1.103.0 → 1.106.0

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

@@ -2,6 +2,7 @@ import type ResourceBundle from "sap/base/i18n/ResourceBundle";
 import Log from "sap/base/Log";
 import ObjectPath from "sap/base/util/ObjectPath";
 import type DynamicPage from "sap/f/DynamicPage";
+import ActionRuntime from "sap/fe/core/ActionRuntime";
 import CommonUtils from "sap/fe/core/CommonUtils";
 import EditFlow from "sap/fe/core/controllerextensions/EditFlow";
 import IntentBasedNavigation from "sap/fe/core/controllerextensions/IntentBasedNavigation";
@@ -23,7 +24,9 @@ import {
 	usingExtension
 } from "sap/fe/core/helpers/ClassSupport";
 import EditState from "sap/fe/core/helpers/EditState";
-import type { InternalModelContext } from "sap/fe/core/helpers/ModelHelper";
+import MessageStrip from "sap/fe/core/helpers/MessageStrip";
+import { InternalModelContext } from "sap/fe/core/helpers/ModelHelper";
+import * as StableIdHelper from "sap/fe/core/helpers/StableIdHelper";
 import CoreLibrary from "sap/fe/core/library";
 import PageController from "sap/fe/core/PageController";
 import ChartRuntime from "sap/fe/macros/chart/ChartRuntime";
@@ -31,23 +34,22 @@ 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 type IconTabBar from "sap/m/IconTabBar";
 import type SegmentedButton from "sap/m/SegmentedButton";
+import Component from "sap/ui/core/Component";
 import type Control from "sap/ui/core/Control";
-import Core from "sap/ui/core/Core";
 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 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 * as ListReportTemplating from "./ListReportTemplating";
 import IntentBasedNavigationOverride from "./overrides/IntentBasedNavigation";
 import ShareOverrides from "./overrides/Share";
 import ViewStateOverrides from "./overrides/ViewState";
@@ -95,12 +97,9 @@ class ListReportController extends PageController {
 	@usingExtension(MassEdit)
 	massEdit!: MassEdit;
 	private extensionAPI?: ExtensionAPI;
-	private _oListReportControl?: Control;
 	private filterBarConditions?: any;
-	private _bMultiMode?: boolean;
 	private sUpdateTimer?: any;
 	private oResourceBundle?: ResourceBundle;
-	private _sEntitySet?: string;
 	private hasPendingChartChanges?: boolean;
 	private hasPendingTableChanges?: boolean;
 
@@ -115,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", "");
@@ -155,17 +140,12 @@ class ListReportController extends PageController {
 		// happen after the routeMatch event has been processed (otherwise the router gets broken)
 		this.getAppComponent().getRouterProxy().waitForRouteMatchBeforeNavigation();
 
-		if (this._isMultiMode()) {
-			this._updateMultiControlHiddenStatus();
-		}
-
 		// Configure the initial load settings
 		this._setInitLoad();
 	}
 
 	onExit() {
 		delete this.filterBarConditions;
-		delete this._oListReportControl;
 		if (this.extensionAPI) {
 			this.extensionAPI.destroy();
 		}
@@ -175,7 +155,8 @@ class ListReportController extends PageController {
 	_onAfterBinding() {
 		const aTables = this._getControls("table");
 		if (EditState.isEditStateDirty()) {
-			const oTableBinding = this._getTableBinding();
+			this._getMultiModeControl()?.invalidateContent();
+			const oTableBinding = this._getTable()?.getRowBinding();
 			if (oTableBinding) {
 				if (CommonUtils.getAppComponent(this.getView())._isFclEnabled()) {
 					// there is an issue if we use a timeout with a kept alive context used on another page
@@ -184,11 +165,6 @@ class ListReportController extends PageController {
 					if (!this.sUpdateTimer) {
 						this.sUpdateTimer = setTimeout(() => {
 							oTableBinding.refresh();
-							if (this._isMultiMode()) {
-								this._invalidateMultipleModeContent();
-								this._setCountsOutDated();
-								this._updateCounts();
-							}
 							delete this.sUpdateTimer;
 						}, 0);
 					}
@@ -303,11 +279,7 @@ class ListReportController extends PageController {
 	}
 
 	getCurrentEntitySet() {
-		if (!this._sEntitySet) {
-			const oDisplayedControl = (this._isMultiMode() && this._getCurrentControl()) || this._getTable();
-			this._sEntitySet = oDisplayedControl?.data("targetCollectionPath").slice(1);
-		}
-		return this._sEntitySet;
+		return this._getTable()?.data("targetCollectionPath").slice(1);
 	}
 
 	/**
@@ -328,7 +300,7 @@ class ListReportController extends PageController {
 				),
 				aSelectedContexts = oTable.getSelectedContexts();
 
-			CommonUtils.setActionEnablement(oInternalModelContext, oActionOperationAvailableMap, aSelectedContexts);
+			ActionRuntime.setActionEnablement(oInternalModelContext, oActionOperationAvailableMap, aSelectedContexts, "table");
 		});
 		CommonUtils.updateDataFieldForIBNButtonsVisibility(aIBNActions, this.getView());
 	}
@@ -347,16 +319,13 @@ class ListReportController extends PageController {
 	}
 
 	_getPageTitleInformation() {
-		const oTitleInfo = { title: "", subtitle: "", intent: "", icon: "" };
-		oTitleInfo.title = this.getView().getContent()[0].data().ListReportTitle;
-		oTitleInfo.subtitle = this.getView().getContent()[0].data().ListReportSubtitle;
-		return oTitleInfo;
-	}
-
-	_getPageOrFilterBarVariantManagement() {
-		return (
-			this.getView().byId("fe::PageVariantManagement") || this.getView().byId(`${this._getFilterBarControlId()}::VariantManagement`)
-		);
+		const oManifestEntry = this.getAppComponent().getManifestEntry("sap.app");
+		return {
+			title: oManifestEntry.title,
+			subtitle: oManifestEntry.appSubTitle || "",
+			intent: "",
+			icon: ""
+		};
 	}
 
 	_getFilterBarControl() {
@@ -371,76 +340,52 @@ class ListReportController extends PageController {
 	}
 
 	_getSegmentedButton(sControl: any) {
-		return this.getView().byId(this._getSegmentedButtonId(sControl));
+		const sSegmentedButtonId = (sControl === "Chart" ? this.getChartControl() : this._getTable())?.data("segmentedButtonId");
+		return this.getView().byId(sSegmentedButtonId);
 	}
 
-	_getSegmentedButtonId(sControl: any) {
-		if (sControl === "Chart") {
-			return this._getChart().data("segmentedButtonId");
-		} else {
-			return this._getTable()?.data("segmentedButtonId");
-		}
+	_getControlFromPageModelProperty(sPath: string) {
+		const controlId = this._getPageModel()?.getProperty(sPath);
+		return controlId && this.getView().byId(controlId);
 	}
 
-	_getFilterBarControlId() {
-		return this.getView().getContent()[0].data("filterBarId");
+	_getPageModel(): JSONModel | undefined {
+		const pageComponent = Component.getOwnerComponentFor(this.getView()) as any;
+		return pageComponent.getModel("_pageModel");
 	}
 
-	_getChartControlId() {
-		return this.getView().getContent()[0].data("singleChartId");
+	_getFilterBarControlId(): string {
+		return this._getPageModel()?.getProperty("/filterBarId") || "";
 	}
 
 	getChartControl() {
-		return this.getView().byId(this._getChartControlId());
+		return this._getControlFromPageModelProperty("/singleChartId");
 	}
 
 	_getVisualFilterBarControl() {
-		return this.getView().byId(this._getVisualFilterBarControlId());
+		const sVisualFilterBarId = StableIdHelper.generate(["visualFilter", this._getFilterBarControlId()]);
+		return sVisualFilterBarId && this.getView().byId(sVisualFilterBarId);
 	}
-
-	_getVisualFilterBarControlId() {
-		return this.getView().getContent()[0].data("visualFilterBarId");
+	_getFilterBarVariantControl() {
+		return this._getControlFromPageModelProperty("/variantManagement/id");
 	}
 
 	_getMultiModeControl() {
-		return this.getView().byId("fe::TabMultipleMode") as IconTabBar;
-	}
-
-	_getTableControlId() {
-		return this.getView().getContent()[0].data("singleTableId");
-	}
-
-	_getCurrentControl(): Control {
-		if (!this._oListReportControl) {
-			const oMultiModeTab = this._getMultiModeControl();
-			this._oListReportControl = this.getView().byId(
-				oMultiModeTab.getSelectedKey() || (oMultiModeTab.getItems()[0] as any).getKey()
-			) as Control;
-		}
-		return this._oListReportControl;
+		return this.getView().byId("fe::TabMultipleMode::Control") as MultipleModeControl;
 	}
 
 	_getTable(): Table | undefined {
 		if (this._isMultiMode()) {
-			const oControl = this._getCurrentControl();
-			return oControl && oControl.isA("sap.ui.mdc.Table") ? (oControl as Table) : undefined;
+			const oControl = this._getMultiModeControl()?.getSelectedInnerControl()?.content;
+			return oControl?.isA("sap.ui.mdc.Table") ? (oControl as Table) : undefined;
+		} else {
+			return this._getControlFromPageModelProperty("/singleTableId") as Table;
 		}
-		return this.getView().byId(this._getTableControlId()) as Table;
-	}
-
-	_getChart() {
-		return this.getView().byId(this._getChartControlId());
-	}
-
-	_getTableBinding(sTableId?: any) {
-		const oTableControl = sTableId ? this.getView().byId(sTableId) : this._getTable();
-		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 (oControl && sKey) {
@@ -453,7 +398,7 @@ class ListReportController extends PageController {
 			});
 			return aControls;
 		} else if (sKey === "Chart") {
-			const oChart = this._getChart();
+			const oChart = this.getChartControl();
 			return oChart ? [oChart] : [];
 		} else {
 			const oTable = this._getTable();
@@ -462,7 +407,7 @@ class ListReportController extends PageController {
 	}
 
 	_getDefaultPath() {
-		const defaultPath = this.getView().getContent()[0].data("defaultPath");
+		const defaultPath = ListReportTemplating.getDefaultPath(this._getPageModel()?.getProperty("/views") || []);
 		switch (defaultPath) {
 			case "primary":
 				return TemplateContentView.Chart;
@@ -481,11 +426,8 @@ class ListReportController extends PageController {
 	 * @name _isMultiMode
 	 * @returns Is Multiple Table mode set?
 	 */
-	_isMultiMode() {
-		if (!this._oListReportControl) {
-			this._bMultiMode = !!this._getMultiModeControl();
-		}
-		return this._bMultiMode;
+	_isMultiMode(): boolean {
+		return !!this._getPageModel()?.getProperty("/multiViewsControl");
 	}
 
 	/**
@@ -495,24 +437,13 @@ class ListReportController extends PageController {
 	 * @name _isInitLoadDisabled
 	 * @returns Is InitLoad enabled?
 	 */
-	_isInitLoadEnabled() {
+	_isInitLoadEnabled(): boolean {
 		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 Is Multiple EntitySets configuration?
-	 */
-	_isMultiEntitySets() {
-		return this.getView().getContent()[0].data("isMultiEntitySets") === "true";
-	}
-
-	_hasMultiVisualizations() {
-		return this.getView().getContent()[0].data("hasMultiVisualizations") === "true";
+	_hasMultiVisualizations(): boolean {
+		return this._getPageModel()?.getProperty("/hasMultiVisualizations");
 	}
 
 	/**
@@ -552,7 +483,8 @@ class ListReportController extends PageController {
 		}
 		// set hook for flex for when standard variant is set (at start or by user at runtime)
 		// required to override the user setting 'apply automatically' behaviour if there are no filters
-		const variantManagement: any = this._getPageOrFilterBarVariantManagement();
+		const variantManagementId: any = ListReportTemplating.getVariantBackReference(this.getView().getViewData(), this._getPageModel());
+		const variantManagement = variantManagementId && this.getView().byId(variantManagementId);
 		if (variantManagement) {
 			variantManagement.registerApplyAutomaticallyOnStandardVariant(this._applyAutomaticallyOnStandardVariant.bind(this));
 		}
@@ -588,68 +520,6 @@ 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 oInternalModelContext The internal model context
-	 * @param oFilterBar MDC filter bar
-	 */
-	_updateMultiTabNotApplicableFields(oInternalModelContext: InternalModelContext, oFilterBar: FilterBar) {
-		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).
 	 *
@@ -680,97 +550,19 @@ class ListReportController extends PageController {
 		oInternalModelContext.setProperty("controls/ignoredFields", ignoredFields);
 	}
 
-	_updateMultiModeSelectedControl() {
-		this._sEntitySet = undefined;
-		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 Determines if the tab is a custom tab.
-	 */
-	_isCustomTab() {
-		const oMultiModeControl = this._getMultiModeControl();
-		return oMultiModeControl && oMultiModeControl.getSelectedKey().indexOf("::CustomTab::") > -1;
+	_isFilterBarHidden() {
+		return (this.getView().getViewData() as any).hideFilterBar;
 	}
 
-	_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);
-				}
-			});
+	_getApplyAutomaticallyOnVariant(VariantManagement: any, key: string): Boolean {
+		if (!VariantManagement || !key) {
+			return false;
 		}
-	}
-	_invalidateMultipleModeContent() {
-		const aControls = this._getControls();
-		const sDisplayedControlId = this._getCurrentControl().getId();
-		aControls.forEach(function (oControl: any) {
-			oControl.data("outdatedRows", oControl.getId() !== sDisplayedControlId);
+		const variants = VariantManagement.getVariants();
+		const currentVariant = variants.find(function (variant: any) {
+			return variant && variant.key === key;
 		});
-	}
-
-	_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) => {
-				if (oItem.getProperty("visible")) {
-					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);
-				});
-		}
-	}
-
-	_isFilterBarHidden() {
-		return (this.getView().getViewData() as any).hideFilterBar;
+		return (currentVariant && currentVariant.executeOnSelect) || false;
 	}
 
 	_shouldAutoTriggerSearch(oVM: any) {
@@ -812,64 +604,6 @@ 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);
-				}
-			}
-
-			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(this: ListReportController, oEvent: any) {
 			const oFilterBar = this._getFilterBarControl();
 			if (oFilterBar) {
@@ -884,15 +618,17 @@ class ListReportController extends PageController {
 		},
 		onVariantSelected(this: ListReportController, oEvent: any) {
 			const oVM = oEvent.getSource();
+			const currentVariantKey = oEvent.getParameter("key");
+			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();
-				} else {
+				} else if (!this._getApplyAutomaticallyOnVariant(oVM, currentVariantKey)) {
 					this.getExtensionAPI().updateAppState();
 				}
 			}, 0);
@@ -910,24 +646,8 @@ class ListReportController extends PageController {
 			const bHideDraft = FilterUtils.getEditStateIsHideDraft(oFilterBar.getConditions());
 			oInternalModelContext.setProperty("hasPendingFilters", false);
 			oInternalModelContext.setProperty("hideDraftInfo", bHideDraft);
-			if (this._isMultiMode()) {
-				const oMultiModeControl = this._getMultiModeControl();
-				this._setCountsOutDated();
-				if (!this._isCustomTab()) {
-					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()
-					this._invalidateMultipleModeContent();
-				} else {
-					const oFilterConditions = oFilterBar.getFilterConditions();
-					this.onViewNeedsRefresh({
-						filterConditions: oFilterConditions,
-						currentTabId: oMultiModeControl.getSelectedKey(),
-						refreshCause: "search"
-					});
-				}
-			} else {
+
+			if (!this._getMultiModeControl()) {
 				this._updateALPNotApplicableFields(oInternalModelContext, oFilterBar);
 			}
 			if (oMdcChart) {
@@ -1002,7 +722,7 @@ class ListReportController extends PageController {
 			const sSelectedKey = oEvent.mParameters.key ? oEvent.mParameters.key : null;
 			const oInternalModelContext = this.getView().getBindingContext("internal") as InternalModelContext;
 			oInternalModelContext.setProperty("alpContentView", sSelectedKey);
-			const oChart = this._getChart();
+			const oChart = this.getChartControl();
 			const oTable = this._getTable();
 			const oSegmentedButtonDelegate = {
 				onAfterRendering() {
@@ -1038,13 +758,9 @@ class ListReportController extends PageController {
 			this.getExtensionAPI().updateAppState();
 		},
 		onFiltersSegmentedButtonPressed(this: ListReportController, oEvent: any) {
-			if (oEvent.getParameter("key") === "Compact") {
-				this._getFilterBarControl().setVisible(true);
-				(this.getView().byId(this.getView().getContent()[0].data("visualFilterBarId")) as Control).setVisible(false);
-			} else {
-				this._getFilterBarControl().setVisible(false);
-				(this.getView().byId(this.getView().getContent()[0].data("visualFilterBarId")) as Control).setVisible(true);
-			}
+			const isCompact = oEvent.getParameter("key") === "Compact";
+			this._getFilterBarControl().setVisible(isCompact);
+			(this._getVisualFilterBarControl() as Control).setVisible(!isCompact);
 		},
 		onStateChange(this: ListReportController) {
 			this.getExtensionAPI().updateAppState();
@@ -1061,50 +777,23 @@ class ListReportController extends PageController {
 		}
 	};
 	formatters = {
-		/**
-		 * Method to set the message text for the multiple entity sets when fields in the FilterBar need to be ignored.
-		 *
-		 * @param this
-		 * @param aIgnoredFields Array of ignored fields in the FilterBar for the current tab (multiple entity sets)
-		 * @param sTabTitle Tab title
-		 * @param bIsChart Flag that indicates whether the control is a chart or not
-		 * @param oApplySupported ApplySupported for the control
-		 * @returns 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;
 		}
 	};
 }