@sapui5/sap.fe.templates 1.145.1 → 1.147.0

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

@@ -24,6 +24,7 @@ import CoreLibrary from "sap/fe/core/library";
 import type { TitleInformation } from "sap/fe/core/rootView/RootViewBaseController";
 import type Breadcrumbs from "sap/fe/macros/Breadcrumbs";
 import type ChartType from "sap/fe/macros/Chart";
+import type FilterBarAPI from "sap/fe/macros/FilterBar";
 import type MacroAPI from "sap/fe/macros/MacroAPI";
 import type MessageButton from "sap/fe/macros/MessageButton";
 import type TableAPI from "sap/fe/macros/Table";
@@ -32,18 +33,18 @@ import ChartUtils from "sap/fe/macros/chart/ChartUtils";
 import type ContentSwitcher from "sap/fe/macros/contentSwitcher/ContentSwitcher";
 import type FilterBar from "sap/fe/macros/controls/FilterBar";
 import FilterUtils from "sap/fe/macros/filter/FilterUtils";
-import type FilterBarAPI from "sap/fe/macros/filterBar/FilterBarAPI";
 import SelectionVariant from "sap/fe/navigation/SelectionVariant";
 import ExtensionAPI from "sap/fe/templates/ListReport/ExtensionAPI";
 import type MultipleModeControl from "sap/fe/templates/ListReport/controls/MultipleModeControl";
 import SideEffectsOverride from "sap/fe/templates/ListReport/overrides/SideEffects";
 import TableScroller from "sap/fe/templates/TableScroller";
+import type Button from "sap/m/Button";
 import type IconTabBar from "sap/m/IconTabBar";
 import type TabContainerItem from "sap/m/TabContainerItem";
 import Device from "sap/ui/Device";
 import type UI5Event from "sap/ui/base/Event";
 import type Control from "sap/ui/core/Control";
-import UI5Element from "sap/ui/core/Element";
+import type UI5Element from "sap/ui/core/Element";
 import InvisibleMessage from "sap/ui/core/InvisibleMessage";
 import { InvisibleMessageMode } from "sap/ui/core/library";
 import OverrideExecution from "sap/ui/core/mvc/OverrideExecution";
@@ -56,6 +57,7 @@ import type { FilterBarBase$FiltersChangedEvent } from "sap/ui/mdc/filterbar/Fil
 import StateUtil from "sap/ui/mdc/p13n/StateUtil";
 import type JSONModel from "sap/ui/model/json/JSONModel";
 import type Context from "sap/ui/model/odata/v4/Context";
+import type ODataModel from "sap/ui/model/odata/v4/ODataModel";
 import hasher from "sap/ui/thirdparty/hasher";
 import type { TitleAdditionalInfo } from "sap/ushell/ui5service/ShellUIService";
 import * as ListReportTemplating from "./ListReportTemplating";
@@ -200,6 +202,14 @@ class ListReportController extends PageController {
 		const aTables = this._getControls("table") as Table[];
 		let updateActions = true;
 		if (EditState.isEditStateDirty()) {
+			// Terminate any lingering ABAP draft session when returning from an edit session
+			// This handles the case where the user navigates back via browser back button,
+			// which doesn't trigger the draft data loss dialog
+			const model: ODataModel = this.getModel();
+			if (model) {
+				this.editFlow.terminateDraftSession(model);
+			}
+
 			this._getMultiModeControl()?.invalidateContent();
 			const table = this._getTable();
 			const oTableBinding = table?.getRowBinding();
@@ -408,10 +418,42 @@ class ListReportController extends PageController {
 	}
 
 	/**
-	 * This method sets the initial focus in a list report based on the User Experience guidelines.
-	 *
+	 * Tries to focus the emphasized (primary) header action in the DynamicPageTitle actions.
+	 * This is used when no FilterBar is rendered so that the first actionable control receives focus.
+	 * @returns True if an emphasized and focusable action is found and focused
+	 */
+	private setFocusOnEmphasizedHeaderAction(): boolean {
+		const dynamicPage = this._getDynamicListReportControl();
+		const title = dynamicPage.getTitle();
+		const actions = title.getActions();
+		const emphasizedButton = actions.find((control) => {
+			return (
+				control &&
+				control.isA?.("sap.m.Button") &&
+				(control as Button).getType() === "Emphasized" &&
+				control.getVisible() &&
+				(control as Button).getEnabled() !== false
+			);
+		});
+		if (emphasizedButton) {
+			emphasizedButton.focus();
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Sets the initial focus in the ListReport based on the UX focus rules.
 	 */
 	async _setInitialFocus(): Promise<void> {
+		// In FCL, when navigating forward to an Object Page (e.g. after Create), the routeMatched event
+		// fires first for the parent route (LR only) before the child route (LR+OP). This causes
+		// onPageReady to be called on the LR with forceFocus=true, stealing focus from the OP.
+		// Guard: skip focus if the FCL is showing more than one column (deeper page is visible).
+		const rootViewController = this.getAppComponent().getRootViewController();
+		if (rootViewController.isFclEnabled() && rootViewController.getVisibleViews().length > 1) {
+			return;
+		}
 		const dynamicPage = this._getDynamicListReportControl(),
 			isHeaderExpanded = dynamicPage.getHeaderExpanded(),
 			filterBar = this._getFilterBarControl() as FilterBar;
@@ -434,6 +476,10 @@ class ListReportController extends PageController {
 					});
 			}
 		} else {
+			// No FilterBar rendered: focus the emphasized (primary) header action if available
+			if (this.setFocusOnEmphasizedHeaderAction()) {
+				return;
+			}
 			await this._getTable()
 				?.focusRow(0)
 				.catch(function (error: unknown) {
@@ -494,6 +540,31 @@ class ListReportController extends PageController {
 		}
 	}
 
+	/**
+	 * Gets all control-level variant management controls (FilterBar, Tables, Charts).
+	 * This is only applicable when variant management is set to "Control" mode.
+	 * @returns Array of VariantManagement controls, or empty array if control variant IDs don't exist
+	 */
+	_getControlVariantManagementControls(): VariantManagement[] {
+		const controlVariantIds = this._getPageModel()?.getProperty("/variantManagement/controlVariantIds");
+
+		if (!controlVariantIds) {
+			return [];
+		}
+
+		const variantControls: VariantManagement[] = [];
+		const variantIdArray = controlVariantIds.split(",");
+
+		variantIdArray.forEach((variantId: string) => {
+			const variantControl = this.getView().byId(variantId.trim()) as VariantManagement;
+			if (variantControl) {
+				variantControls.push(variantControl);
+			}
+		});
+
+		return variantControls;
+	}
+
 	_getSegmentedButton(): UI5Element | undefined {
 		const contentSwitcher = this.getView().byId("fe::ContentSwitcher") as UI5Element & { $segmentedButton?: { current?: UI5Element } };
 		return contentSwitcher?.$segmentedButton?.current;
@@ -786,12 +857,23 @@ class ListReportController extends PageController {
 	handlers = {
 		onFilterLayoutSwitch(this: ListReportController, oEvent: UI5Event<{}, ContentSwitcher>): void {
 			const currentKey = oEvent.getSource().selectedKey;
-			const variantManagement = this._getControlFromPageModelProperty("/variantManagement/pageId");
-			if (variantManagement) {
-				if (currentKey === "ai") {
-					variantManagement.setVisible(false);
-				} else {
-					variantManagement.setVisible(true);
+			const controlVariantControls = this._getControlVariantManagementControls();
+
+			if (controlVariantControls.length > 0) {
+				// Control variant management is configured
+				const isVisible = currentKey !== "ai";
+				controlVariantControls.forEach((variantControl) => {
+					variantControl.setVisible(isVisible);
+				});
+			} else {
+				// Page variant management
+				const variantManagement = this._getControlFromPageModelProperty("/variantManagement/pageId");
+				if (variantManagement) {
+					if (currentKey === "ai") {
+						variantManagement.setVisible(false);
+					} else {
+						variantManagement.setVisible(true);
+					}
 				}
 			}
 		},

package/src/sap/fe/templates/ListReport/ListReportTemplating.js

@@ -1,18 +1,19 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
- *      (c) Copyright 2009-2025 SAP SE. All rights reserved
+ *      (c) Copyright 2009-2026 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/fe/core/helpers/StableIdHelper"], function (StableIdHelper) {
+sap.ui.define(["sap/fe/core/helpers/ActionUtilities", "sap/fe/core/helpers/StableIdHelper"], function (ActionUtilities, StableIdHelper) {
   "use strict";
 
   var _exports = {};
   var generate = StableIdHelper.generate;
+  var LR_EMPHASIS_SUPPRESSION_CONDITION = ActionUtilities.LR_EMPHASIS_SUPPRESSION_CONDITION;
   // Template Helpers for the List Report
   /**
    * Method returns an VariantBackReference expression based on variantManagement and oConverterContext value.
    * @param viewData Object Containing View Data
    * @param converterContextObject Object containing converted context
-   * @returns {string}
+   * @returns The variant back reference ID or undefined
    */
 
   const getVariantBackReference = function (viewData, converterContextObject) {
@@ -32,7 +33,42 @@ sap.ui.define(["sap/fe/core/helpers/StableIdHelper"], function (StableIdHelper)
       }
     }
   };
+
+  /**
+   * Returns the binding expression condition for when ListReport header emphasis should be suppressed.
+   * This condition is centralized to ensure consistency between converters and templates.
+   * Emphasis is suppressed when FilterBar is visible and liveMode is disabled (Go button gets emphasis).
+   * @returns The suppression condition as a binding string
+   */
   _exports.getDefaultPath = getDefaultPath;
+  const getEmphasisSuppressionCondition = function () {
+    return LR_EMPHASIS_SUPPRESSION_CONDITION;
+  };
+
+  /**
+   * Determines whether ListReport header emphasis should be suppressed at runtime.
+   * This formatter is used in templates to apply the same logic as the converter.
+   * @param hideFilterBar Whether the FilterBar is hidden
+   * @param useHiddenFilterBar Whether a hidden FilterBar is used
+   * @param liveMode Whether liveMode is enabled
+   * @returns True if emphasis should be suppressed (FilterBar visible and liveMode disabled)
+   */
+  _exports.getEmphasisSuppressionCondition = getEmphasisSuppressionCondition;
+  const isListReportEmphasisSuppressed = function (hideFilterBar, useHiddenFilterBar, liveMode) {
+    return !hideFilterBar && !useHiddenFilterBar && !liveMode;
+  };
+
+  /**
+   * Returns the dt:designtime value for a header action based on whether it's an emphasized-first clone.
+   * Emphasized-first clones are technical duplicates and should not be adaptable in RTA.
+   * @param action The action to check
+   * @returns The designtime value: "not-adaptable" for emphasized-first clones, undefined otherwise
+   */
+  _exports.isListReportEmphasisSuppressed = isListReportEmphasisSuppressed;
+  const getDesigntimeForHeaderAction = function (action) {
+    return ActionUtilities.isEmphasizedFirstClone(action) ? "not-adaptable" : undefined;
+  };
+  _exports.getDesigntimeForHeaderAction = getDesigntimeForHeaderAction;
   return _exports;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJnZXRWYXJpYW50QmFja1JlZmVyZW5jZSIsInZpZXdEYXRhIiwiY29udmVydGVyQ29udGV4dE9iamVjdCIsInZhcmlhbnRNYW5hZ2VtZW50IiwiZ2VuZXJhdGUiLCJmaWx0ZXJCYXJJZCIsInVuZGVmaW5lZCIsIl9leHBvcnRzIiwiZ2V0RGVmYXVsdFBhdGgiLCJhVmlld3MiLCJpIiwibGVuZ3RoIiwiZGVmYXVsdFBhdGgiXSwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzIjpbIkxpc3RSZXBvcnRUZW1wbGF0aW5nLnRzIl0sInNvdXJjZXNDb250ZW50IjpbIi8vIFRlbXBsYXRlIEhlbHBlcnMgZm9yIHRoZSBMaXN0IFJlcG9ydFxuaW1wb3J0IHR5cGUgeyBMaXN0UmVwb3J0RGVmaW5pdGlvbiB9IGZyb20gXCJzYXAvZmUvY29yZS9jb252ZXJ0ZXJzL3RlbXBsYXRlcy9MaXN0UmVwb3J0Q29udmVydGVyXCI7XG5pbXBvcnQgeyBnZW5lcmF0ZSB9IGZyb20gXCJzYXAvZmUvY29yZS9oZWxwZXJzL1N0YWJsZUlkSGVscGVyXCI7XG5pbXBvcnQgdHlwZSB7IFZpZXdEYXRhIH0gZnJvbSBcInNhcC9mZS9jb3JlL3NlcnZpY2VzL1RlbXBsYXRlZFZpZXdTZXJ2aWNlRmFjdG9yeVwiO1xuXG4vKipcbiAqIE1ldGhvZCByZXR1cm5zIGFuIFZhcmlhbnRCYWNrUmVmZXJlbmNlIGV4cHJlc3Npb24gYmFzZWQgb24gdmFyaWFudE1hbmFnZW1lbnQgYW5kIG9Db252ZXJ0ZXJDb250ZXh0IHZhbHVlLlxuICogQHBhcmFtIHZpZXdEYXRhIE9iamVjdCBDb250YWluaW5nIFZpZXcgRGF0YVxuICogQHBhcmFtIGNvbnZlcnRlckNvbnRleHRPYmplY3QgT2JqZWN0IGNvbnRhaW5pbmcgY29udmVydGVkIGNvbnRleHRcbiAqIEByZXR1cm5zIHtzdHJpbmd9XG4gKi9cblxuZXhwb3J0IGNvbnN0IGdldFZhcmlhbnRCYWNrUmVmZXJlbmNlID0gZnVuY3Rpb24gKHZpZXdEYXRhOiBWaWV3RGF0YSwgY29udmVydGVyQ29udGV4dE9iamVjdDogTGlzdFJlcG9ydERlZmluaXRpb24pOiBzdHJpbmcgfCB1bmRlZmluZWQge1xuXHRpZiAodmlld0RhdGEgJiYgdmlld0RhdGEudmFyaWFudE1hbmFnZW1lbnQgPT09IFwiUGFnZVwiKSB7XG5cdFx0cmV0dXJuIFwiZmU6OlBhZ2VWYXJpYW50TWFuYWdlbWVudFwiO1xuXHR9XG5cdGlmICh2aWV3RGF0YSAmJiB2aWV3RGF0YS52YXJpYW50TWFuYWdlbWVudCA9PT0gXCJDb250cm9sXCIpIHtcblx0XHRyZXR1cm4gZ2VuZXJhdGUoW2NvbnZlcnRlckNvbnRleHRPYmplY3QuZmlsdGVyQmFySWQsIFwiVmFyaWFudE1hbmFnZW1lbnRcIl0pO1xuXHR9XG5cdHJldHVybiB1bmRlZmluZWQ7XG59O1xuXG5leHBvcnQgY29uc3QgZ2V0RGVmYXVsdFBhdGggPSBmdW5jdGlvbiAoYVZpZXdzOiB7IGRlZmF1bHRQYXRoPzogc3RyaW5nIH1bXSk6IHN0cmluZyB8IHVuZGVmaW5lZCB7XG5cdGZvciAobGV0IGkgPSAwOyBpIDwgYVZpZXdzLmxlbmd0aDsgaSsrKSB7XG5cdFx0aWYgKGFWaWV3c1tpXS5kZWZhdWx0UGF0aCkge1xuXHRcdFx0cmV0dXJuIGFWaWV3c1tpXS5kZWZhdWx0UGF0aDtcblx0XHR9XG5cdH1cbn07XG4iXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztFQUFBO0VBS0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBOztFQUVPLE1BQU1BLHVCQUF1QixHQUFHLFNBQUFBLENBQVVDLFFBQWtCLEVBQUVDLHNCQUE0QyxFQUFzQjtJQUN0SSxJQUFJRCxRQUFRLElBQUlBLFFBQVEsQ0FBQ0UsaUJBQWlCLEtBQUssTUFBTSxFQUFFO01BQ3RELE9BQU8sMkJBQTJCO0lBQ25DO0lBQ0EsSUFBSUYsUUFBUSxJQUFJQSxRQUFRLENBQUNFLGlCQUFpQixLQUFLLFNBQVMsRUFBRTtNQUN6RCxPQUFPQyxRQUFRLENBQUMsQ0FBQ0Ysc0JBQXNCLENBQUNHLFdBQVcsRUFBRSxtQkFBbUIsQ0FBQyxDQUFDO0lBQzNFO0lBQ0EsT0FBT0MsU0FBUztFQUNqQixDQUFDO0VBQUNDLFFBQUEsQ0FBQVAsdUJBQUEsR0FBQUEsdUJBQUE7RUFFSyxNQUFNUSxjQUFjLEdBQUcsU0FBQUEsQ0FBVUMsTUFBa0MsRUFBc0I7SUFDL0YsS0FBSyxJQUFJQyxDQUFDLEdBQUcsQ0FBQyxFQUFFQSxDQUFDLEdBQUdELE1BQU0sQ0FBQ0UsTUFBTSxFQUFFRCxDQUFDLEVBQUUsRUFBRTtNQUN2QyxJQUFJRCxNQUFNLENBQUNDLENBQUMsQ0FBQyxDQUFDRSxXQUFXLEVBQUU7UUFDMUIsT0FBT0gsTUFBTSxDQUFDQyxDQUFDLENBQUMsQ0FBQ0UsV0FBVztNQUM3QjtJQUNEO0VBQ0QsQ0FBQztFQUFDTCxRQUFBLENBQUFDLGNBQUEsR0FBQUEsY0FBQTtFQUFBLE9BQUFELFFBQUE7QUFBQSIsImlnbm9yZUxpc3QiOltdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJnZXRWYXJpYW50QmFja1JlZmVyZW5jZSIsInZpZXdEYXRhIiwiY29udmVydGVyQ29udGV4dE9iamVjdCIsInZhcmlhbnRNYW5hZ2VtZW50IiwiZ2VuZXJhdGUiLCJmaWx0ZXJCYXJJZCIsInVuZGVmaW5lZCIsIl9leHBvcnRzIiwiZ2V0RGVmYXVsdFBhdGgiLCJhVmlld3MiLCJpIiwibGVuZ3RoIiwiZGVmYXVsdFBhdGgiLCJnZXRFbXBoYXNpc1N1cHByZXNzaW9uQ29uZGl0aW9uIiwiTFJfRU1QSEFTSVNfU1VQUFJFU1NJT05fQ09ORElUSU9OIiwiaXNMaXN0UmVwb3J0RW1waGFzaXNTdXBwcmVzc2VkIiwiaGlkZUZpbHRlckJhciIsInVzZUhpZGRlbkZpbHRlckJhciIsImxpdmVNb2RlIiwiZ2V0RGVzaWdudGltZUZvckhlYWRlckFjdGlvbiIsImFjdGlvbiIsIkFjdGlvblV0aWxpdGllcyIsImlzRW1waGFzaXplZEZpcnN0Q2xvbmUiXSwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzIjpbIkxpc3RSZXBvcnRUZW1wbGF0aW5nLnRzIl0sInNvdXJjZXNDb250ZW50IjpbIi8vIFRlbXBsYXRlIEhlbHBlcnMgZm9yIHRoZSBMaXN0IFJlcG9ydFxuaW1wb3J0IHR5cGUgeyBCYXNlQWN0aW9uIH0gZnJvbSBcInNhcC9mZS9jb3JlL2NvbnZlcnRlcnMvY29udHJvbHMvQ29tbW9uL0FjdGlvblwiO1xuaW1wb3J0IHR5cGUgeyBMaXN0UmVwb3J0RGVmaW5pdGlvbiB9IGZyb20gXCJzYXAvZmUvY29yZS9jb252ZXJ0ZXJzL3RlbXBsYXRlcy9MaXN0UmVwb3J0Q29udmVydGVyXCI7XG5pbXBvcnQgQWN0aW9uVXRpbGl0aWVzLCB7IExSX0VNUEhBU0lTX1NVUFBSRVNTSU9OX0NPTkRJVElPTiB9IGZyb20gXCJzYXAvZmUvY29yZS9oZWxwZXJzL0FjdGlvblV0aWxpdGllc1wiO1xuaW1wb3J0IHsgZ2VuZXJhdGUgfSBmcm9tIFwic2FwL2ZlL2NvcmUvaGVscGVycy9TdGFibGVJZEhlbHBlclwiO1xuaW1wb3J0IHR5cGUgeyBWaWV3RGF0YSB9IGZyb20gXCJzYXAvZmUvY29yZS9zZXJ2aWNlcy9UZW1wbGF0ZWRWaWV3U2VydmljZUZhY3RvcnlcIjtcblxuLyoqXG4gKiBNZXRob2QgcmV0dXJucyBhbiBWYXJpYW50QmFja1JlZmVyZW5jZSBleHByZXNzaW9uIGJhc2VkIG9uIHZhcmlhbnRNYW5hZ2VtZW50IGFuZCBvQ29udmVydGVyQ29udGV4dCB2YWx1ZS5cbiAqIEBwYXJhbSB2aWV3RGF0YSBPYmplY3QgQ29udGFpbmluZyBWaWV3IERhdGFcbiAqIEBwYXJhbSBjb252ZXJ0ZXJDb250ZXh0T2JqZWN0IE9iamVjdCBjb250YWluaW5nIGNvbnZlcnRlZCBjb250ZXh0XG4gKiBAcmV0dXJucyBUaGUgdmFyaWFudCBiYWNrIHJlZmVyZW5jZSBJRCBvciB1bmRlZmluZWRcbiAqL1xuXG5leHBvcnQgY29uc3QgZ2V0VmFyaWFudEJhY2tSZWZlcmVuY2UgPSBmdW5jdGlvbiAodmlld0RhdGE6IFZpZXdEYXRhLCBjb252ZXJ0ZXJDb250ZXh0T2JqZWN0OiBMaXN0UmVwb3J0RGVmaW5pdGlvbik6IHN0cmluZyB8IHVuZGVmaW5lZCB7XG5cdGlmICh2aWV3RGF0YSAmJiB2aWV3RGF0YS52YXJpYW50TWFuYWdlbWVudCA9PT0gXCJQYWdlXCIpIHtcblx0XHRyZXR1cm4gXCJmZTo6UGFnZVZhcmlhbnRNYW5hZ2VtZW50XCI7XG5cdH1cblx0aWYgKHZpZXdEYXRhICYmIHZpZXdEYXRhLnZhcmlhbnRNYW5hZ2VtZW50ID09PSBcIkNvbnRyb2xcIikge1xuXHRcdHJldHVybiBnZW5lcmF0ZShbY29udmVydGVyQ29udGV4dE9iamVjdC5maWx0ZXJCYXJJZCwgXCJWYXJpYW50TWFuYWdlbWVudFwiXSk7XG5cdH1cblx0cmV0dXJuIHVuZGVmaW5lZDtcbn07XG5cbmV4cG9ydCBjb25zdCBnZXREZWZhdWx0UGF0aCA9IGZ1bmN0aW9uIChhVmlld3M6IHsgZGVmYXVsdFBhdGg/OiBzdHJpbmcgfVtdKTogc3RyaW5nIHwgdW5kZWZpbmVkIHtcblx0Zm9yIChsZXQgaSA9IDA7IGkgPCBhVmlld3MubGVuZ3RoOyBpKyspIHtcblx0XHRpZiAoYVZpZXdzW2ldLmRlZmF1bHRQYXRoKSB7XG5cdFx0XHRyZXR1cm4gYVZpZXdzW2ldLmRlZmF1bHRQYXRoO1xuXHRcdH1cblx0fVxufTtcblxuLyoqXG4gKiBSZXR1cm5zIHRoZSBiaW5kaW5nIGV4cHJlc3Npb24gY29uZGl0aW9uIGZvciB3aGVuIExpc3RSZXBvcnQgaGVhZGVyIGVtcGhhc2lzIHNob3VsZCBiZSBzdXBwcmVzc2VkLlxuICogVGhpcyBjb25kaXRpb24gaXMgY2VudHJhbGl6ZWQgdG8gZW5zdXJlIGNvbnNpc3RlbmN5IGJldHdlZW4gY29udmVydGVycyBhbmQgdGVtcGxhdGVzLlxuICogRW1waGFzaXMgaXMgc3VwcHJlc3NlZCB3aGVuIEZpbHRlckJhciBpcyB2aXNpYmxlIGFuZCBsaXZlTW9kZSBpcyBkaXNhYmxlZCAoR28gYnV0dG9uIGdldHMgZW1waGFzaXMpLlxuICogQHJldHVybnMgVGhlIHN1cHByZXNzaW9uIGNvbmRpdGlvbiBhcyBhIGJpbmRpbmcgc3RyaW5nXG4gKi9cbmV4cG9ydCBjb25zdCBnZXRFbXBoYXNpc1N1cHByZXNzaW9uQ29uZGl0aW9uID0gZnVuY3Rpb24gKCk6IHN0cmluZyB7XG5cdHJldHVybiBMUl9FTVBIQVNJU19TVVBQUkVTU0lPTl9DT05ESVRJT047XG59O1xuXG4vKipcbiAqIERldGVybWluZXMgd2hldGhlciBMaXN0UmVwb3J0IGhlYWRlciBlbXBoYXNpcyBzaG91bGQgYmUgc3VwcHJlc3NlZCBhdCBydW50aW1lLlxuICogVGhpcyBmb3JtYXR0ZXIgaXMgdXNlZCBpbiB0ZW1wbGF0ZXMgdG8gYXBwbHkgdGhlIHNhbWUgbG9naWMgYXMgdGhlIGNvbnZlcnRlci5cbiAqIEBwYXJhbSBoaWRlRmlsdGVyQmFyIFdoZXRoZXIgdGhlIEZpbHRlckJhciBpcyBoaWRkZW5cbiAqIEBwYXJhbSB1c2VIaWRkZW5GaWx0ZXJCYXIgV2hldGhlciBhIGhpZGRlbiBGaWx0ZXJCYXIgaXMgdXNlZFxuICogQHBhcmFtIGxpdmVNb2RlIFdoZXRoZXIgbGl2ZU1vZGUgaXMgZW5hYmxlZFxuICogQHJldHVybnMgVHJ1ZSBpZiBlbXBoYXNpcyBzaG91bGQgYmUgc3VwcHJlc3NlZCAoRmlsdGVyQmFyIHZpc2libGUgYW5kIGxpdmVNb2RlIGRpc2FibGVkKVxuICovXG5leHBvcnQgY29uc3QgaXNMaXN0UmVwb3J0RW1waGFzaXNTdXBwcmVzc2VkID0gZnVuY3Rpb24gKGhpZGVGaWx0ZXJCYXI6IGJvb2xlYW4sIHVzZUhpZGRlbkZpbHRlckJhcjogYm9vbGVhbiwgbGl2ZU1vZGU6IGJvb2xlYW4pOiBib29sZWFuIHtcblx0cmV0dXJuICFoaWRlRmlsdGVyQmFyICYmICF1c2VIaWRkZW5GaWx0ZXJCYXIgJiYgIWxpdmVNb2RlO1xufTtcblxuLyoqXG4gKiBSZXR1cm5zIHRoZSBkdDpkZXNpZ250aW1lIHZhbHVlIGZvciBhIGhlYWRlciBhY3Rpb24gYmFzZWQgb24gd2hldGhlciBpdCdzIGFuIGVtcGhhc2l6ZWQtZmlyc3QgY2xvbmUuXG4gKiBFbXBoYXNpemVkLWZpcnN0IGNsb25lcyBhcmUgdGVjaG5pY2FsIGR1cGxpY2F0ZXMgYW5kIHNob3VsZCBub3QgYmUgYWRhcHRhYmxlIGluIFJUQS5cbiAqIEBwYXJhbSBhY3Rpb24gVGhlIGFjdGlvbiB0byBjaGVja1xuICogQHJldHVybnMgVGhlIGRlc2lnbnRpbWUgdmFsdWU6IFwibm90LWFkYXB0YWJsZVwiIGZvciBlbXBoYXNpemVkLWZpcnN0IGNsb25lcywgdW5kZWZpbmVkIG90aGVyd2lzZVxuICovXG5leHBvcnQgY29uc3QgZ2V0RGVzaWdudGltZUZvckhlYWRlckFjdGlvbiA9IGZ1bmN0aW9uIChhY3Rpb246IEJhc2VBY3Rpb24pOiBzdHJpbmcgfCB1bmRlZmluZWQge1xuXHRyZXR1cm4gQWN0aW9uVXRpbGl0aWVzLmlzRW1waGFzaXplZEZpcnN0Q2xvbmUoYWN0aW9uKSA/IFwibm90LWFkYXB0YWJsZVwiIDogdW5kZWZpbmVkO1xufTtcbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztFQUFBO0VBT0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBOztFQUVPLE1BQU1BLHVCQUF1QixHQUFHLFNBQUFBLENBQVVDLFFBQWtCLEVBQUVDLHNCQUE0QyxFQUFzQjtJQUN0SSxJQUFJRCxRQUFRLElBQUlBLFFBQVEsQ0FBQ0UsaUJBQWlCLEtBQUssTUFBTSxFQUFFO01BQ3RELE9BQU8sMkJBQTJCO0lBQ25DO0lBQ0EsSUFBSUYsUUFBUSxJQUFJQSxRQUFRLENBQUNFLGlCQUFpQixLQUFLLFNBQVMsRUFBRTtNQUN6RCxPQUFPQyxRQUFRLENBQUMsQ0FBQ0Ysc0JBQXNCLENBQUNHLFdBQVcsRUFBRSxtQkFBbUIsQ0FBQyxDQUFDO0lBQzNFO0lBQ0EsT0FBT0MsU0FBUztFQUNqQixDQUFDO0VBQUNDLFFBQUEsQ0FBQVAsdUJBQUEsR0FBQUEsdUJBQUE7RUFFSyxNQUFNUSxjQUFjLEdBQUcsU0FBQUEsQ0FBVUMsTUFBa0MsRUFBc0I7SUFDL0YsS0FBSyxJQUFJQyxDQUFDLEdBQUcsQ0FBQyxFQUFFQSxDQUFDLEdBQUdELE1BQU0sQ0FBQ0UsTUFBTSxFQUFFRCxDQUFDLEVBQUUsRUFBRTtNQUN2QyxJQUFJRCxNQUFNLENBQUNDLENBQUMsQ0FBQyxDQUFDRSxXQUFXLEVBQUU7UUFDMUIsT0FBT0gsTUFBTSxDQUFDQyxDQUFDLENBQUMsQ0FBQ0UsV0FBVztNQUM3QjtJQUNEO0VBQ0QsQ0FBQzs7RUFFRDtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7RUFMQUwsUUFBQSxDQUFBQyxjQUFBLEdBQUFBLGNBQUE7RUFNTyxNQUFNSywrQkFBK0IsR0FBRyxTQUFBQSxDQUFBLEVBQW9CO0lBQ2xFLE9BQU9DLGlDQUFpQztFQUN6QyxDQUFDOztFQUVEO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7RUFQQVAsUUFBQSxDQUFBTSwrQkFBQSxHQUFBQSwrQkFBQTtFQVFPLE1BQU1FLDhCQUE4QixHQUFHLFNBQUFBLENBQVVDLGFBQXNCLEVBQUVDLGtCQUEyQixFQUFFQyxRQUFpQixFQUFXO0lBQ3hJLE9BQU8sQ0FBQ0YsYUFBYSxJQUFJLENBQUNDLGtCQUFrQixJQUFJLENBQUNDLFFBQVE7RUFDMUQsQ0FBQzs7RUFFRDtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7RUFMQVgsUUFBQSxDQUFBUSw4QkFBQSxHQUFBQSw4QkFBQTtFQU1PLE1BQU1JLDRCQUE0QixHQUFHLFNBQUFBLENBQVVDLE1BQWtCLEVBQXNCO0lBQzdGLE9BQU9DLGVBQWUsQ0FBQ0Msc0JBQXNCLENBQUNGLE1BQU0sQ0FBQyxHQUFHLGVBQWUsR0FBR2QsU0FBUztFQUNwRixDQUFDO0VBQUNDLFFBQUEsQ0FBQVksNEJBQUEsR0FBQUEsNEJBQUE7RUFBQSxPQUFBWixRQUFBO0FBQUEiLCJpZ25vcmVMaXN0IjpbXX0=

package/src/sap/fe/templates/ListReport/ListReportTemplating.ts

@@ -1,5 +1,7 @@
 // Template Helpers for the List Report
+import type { BaseAction } from "sap/fe/core/converters/controls/Common/Action";
 import type { ListReportDefinition } from "sap/fe/core/converters/templates/ListReportConverter";
+import ActionUtilities, { LR_EMPHASIS_SUPPRESSION_CONDITION } from "sap/fe/core/helpers/ActionUtilities";
 import { generate } from "sap/fe/core/helpers/StableIdHelper";
 import type { ViewData } from "sap/fe/core/services/TemplatedViewServiceFactory";
 
@@ -7,7 +9,7 @@ import type { ViewData } from "sap/fe/core/services/TemplatedViewServiceFactory"
  * Method returns an VariantBackReference expression based on variantManagement and oConverterContext value.
  * @param viewData Object Containing View Data
  * @param converterContextObject Object containing converted context
- * @returns {string}
+ * @returns The variant back reference ID or undefined
  */
 
 export const getVariantBackReference = function (viewData: ViewData, converterContextObject: ListReportDefinition): string | undefined {
@@ -27,3 +29,35 @@ export const getDefaultPath = function (aViews: { defaultPath?: string }[]): str
 		}
 	}
 };
+
+/**
+ * Returns the binding expression condition for when ListReport header emphasis should be suppressed.
+ * This condition is centralized to ensure consistency between converters and templates.
+ * Emphasis is suppressed when FilterBar is visible and liveMode is disabled (Go button gets emphasis).
+ * @returns The suppression condition as a binding string
+ */
+export const getEmphasisSuppressionCondition = function (): string {
+	return LR_EMPHASIS_SUPPRESSION_CONDITION;
+};
+
+/**
+ * Determines whether ListReport header emphasis should be suppressed at runtime.
+ * This formatter is used in templates to apply the same logic as the converter.
+ * @param hideFilterBar Whether the FilterBar is hidden
+ * @param useHiddenFilterBar Whether a hidden FilterBar is used
+ * @param liveMode Whether liveMode is enabled
+ * @returns True if emphasis should be suppressed (FilterBar visible and liveMode disabled)
+ */
+export const isListReportEmphasisSuppressed = function (hideFilterBar: boolean, useHiddenFilterBar: boolean, liveMode: boolean): boolean {
+	return !hideFilterBar && !useHiddenFilterBar && !liveMode;
+};
+
+/**
+ * Returns the dt:designtime value for a header action based on whether it's an emphasized-first clone.
+ * Emphasized-first clones are technical duplicates and should not be adaptable in RTA.
+ * @param action The action to check
+ * @returns The designtime value: "not-adaptable" for emphasized-first clones, undefined otherwise
+ */
+export const getDesigntimeForHeaderAction = function (action: BaseAction): string | undefined {
+	return ActionUtilities.isEmphasizedFirstClone(action) ? "not-adaptable" : undefined;
+};

package/src/sap/fe/templates/ListReport/controls/MultipleModeControl.js

@@ -1,6 +1,6 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
- *      (c) Copyright 2009-2025 SAP SE. All rights reserved
+ *      (c) Copyright 2009-2026 SAP SE. All rights reserved
  */
 sap.ui.define(["sap/base/Log", "sap/fe/base/ClassSupport", "sap/fe/core/CommonUtils", "sap/fe/core/converters/MetaModelConverter", "sap/fe/core/helpers/MessageStrip", "sap/fe/core/helpers/ResourceModelHelper", "sap/ui/core/Control", "sap/ui/core/Element", "sap/ui/model/json/JSONModel"], function (Log, ClassSupport, CommonUtils, MetaModelConverter, MessageStrip, ResourceModelHelper, Control, UI5Element, JSONModel) {
   "use strict";

package/src/sap/fe/templates/ListReport/designtime/ListReport.designtime.helper.js

@@ -1,6 +1,6 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
- *      (c) Copyright 2009-2025 SAP SE. All rights reserved
+ *      (c) Copyright 2009-2026 SAP SE. All rights reserved
  */
 sap.ui.define(["sap/fe/core/CommonUtils"], function (CommonUtils) {
   "use strict";

package/src/sap/fe/templates/ListReport/designtime/ListReport.designtime.js

@@ -1,6 +1,6 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
- *      (c) Copyright 2009-2025 SAP SE. All rights reserved
+ *      (c) Copyright 2009-2026 SAP SE. All rights reserved
  */
 sap.ui.define(["sap/fe/core/CommonUtils", "sap/fe/core/designtime/AnnotationBasedChanges", "sap/fe/macros/designtime/Designtime.helper", "sap/fe/templates/ListReport/designtime/ListReport.designtime.helper"], function (CommonUtils, AnnotationBasedChanges, Designtime_helper, ListReport_designtime_helper) {
   "use strict";

package/src/sap/fe/templates/ListReport/manifest.json

@@ -5,7 +5,7 @@
 		"type": "component",
 		"i18n": "../messagebundle.properties",
 		"applicationVersion": {
-			"version": "1.145.1"
+			"version": "1.147.0"
 		},
 		"title": "List Report",
 		"tags": {

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

@@ -1,6 +1,6 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
- *      (c) Copyright 2009-2025 SAP SE. All rights reserved
+ *      (c) Copyright 2009-2026 SAP SE. All rights reserved
  */
 sap.ui.define(["sap/base/Log", "sap/fe/navigation/SelectionVariant"], function (Log, SelectionVariant) {
   "use strict";

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

@@ -1,6 +1,6 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
- *      (c) Copyright 2009-2025 SAP SE. All rights reserved
+ *      (c) Copyright 2009-2026 SAP SE. All rights reserved
  */
 sap.ui.define(["sap/fe/core/CommonUtils"], function (CommonUtils) {
   "use strict";
@@ -17,7 +17,8 @@ sap.ui.define(["sap/fe/core/CommonUtils"], function (CommonUtils) {
       //In FCL scenarios, multiple pages can be visible simultaneously (List Report + Object Page in columns).
       //The original logic prevents showing bound messages from background columns.
       //In non-FCL apps where only one page is visible at a time, this filtering isn't necessary.
-      if (appComponent._isFclEnabled() && currentPageViewID !== baseViewID) {
+      // for a fcl case, when both List Report and Object Page are visible, we want to show message
+      if (appComponent._isFclEnabled() && currentPageViewID !== baseViewID && getCurrentPageView?.getViewData()?.viewLevel !== 1) {
         return false;
       }
       return true;
@@ -25,4 +26,4 @@ sap.ui.define(["sap/fe/core/CommonUtils"], function (CommonUtils) {
   };
   return MessageHandlerLRExtension;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJNZXNzYWdlSGFuZGxlckxSRXh0ZW5zaW9uIiwiZ2V0U2hvd0JvdW5kTWVzc2FnZXNJbk1lc3NhZ2VEaWFsb2ciLCJhcHBDb21wb25lbnQiLCJiYXNlIiwiZ2V0QXBwQ29tcG9uZW50IiwiZ2V0Q3VycmVudFBhZ2VWaWV3IiwiQ29tbW9uVXRpbHMiLCJjdXJyZW50UGFnZVZpZXdJRCIsImdldElkIiwiYmFzZVZpZXdJRCIsImdldFZpZXciLCJfaXNGY2xFbmFibGVkIl0sInNvdXJjZVJvb3QiOiIuIiwic291cmNlcyI6WyJNZXNzYWdlSGFuZGxlci50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgQ29tbW9uVXRpbHMgZnJvbSBcInNhcC9mZS9jb3JlL0NvbW1vblV0aWxzXCI7XG5pbXBvcnQgdHlwZSBNZXNzYWdlSGFuZGxlciBmcm9tIFwic2FwL2ZlL2NvcmUvY29udHJvbGxlcmV4dGVuc2lvbnMvTWVzc2FnZUhhbmRsZXJcIjtcbi8vIGltcG9ydCB0eXBlIE5hdkNvbnRhaW5lciBmcm9tIFwic2FwL20vTmF2Q29udGFpbmVyXCI7XG5cbmNvbnN0IE1lc3NhZ2VIYW5kbGVyTFJFeHRlbnNpb24gPSB7XG5cdGdldFNob3dCb3VuZE1lc3NhZ2VzSW5NZXNzYWdlRGlhbG9nOiBmdW5jdGlvbiAodGhpczogTWVzc2FnZUhhbmRsZXIpOiBib29sZWFuIHtcblx0XHQvLyBGb3IgTGlzdCBSZXBvcnQsIGRldGVybWluZXMgd2hldGhlciBib3VuZCBtZXNzYWdlcyBzaG91bGQgYmUgc2hvd24gaW4gYSBkaWFsb2cgb3Igbm90XG5cdFx0Y29uc3QgYXBwQ29tcG9uZW50ID0gdGhpcy5iYXNlLmdldEFwcENvbXBvbmVudCgpO1xuXHRcdGNvbnN0IGdldEN1cnJlbnRQYWdlVmlldyA9IENvbW1vblV0aWxzLmdldEN1cnJlbnRQYWdlVmlldyhhcHBDb21wb25lbnQpO1xuXHRcdGNvbnN0IGN1cnJlbnRQYWdlVmlld0lEID0gZ2V0Q3VycmVudFBhZ2VWaWV3Py5nZXRJZCgpO1xuXHRcdGNvbnN0IGJhc2VWaWV3SUQgPSB0aGlzLmJhc2UuZ2V0VmlldygpPy5nZXRJZCgpO1xuXHRcdC8vSW4gRkNMIHNjZW5hcmlvcywgbXVsdGlwbGUgcGFnZXMgY2FuIGJlIHZpc2libGUgc2ltdWx0YW5lb3VzbHkgKExpc3QgUmVwb3J0ICsgT2JqZWN0IFBhZ2UgaW4gY29sdW1ucykuXG5cdFx0Ly9UaGUgb3JpZ2luYWwgbG9naWMgcHJldmVudHMgc2hvd2luZyBib3VuZCBtZXNzYWdlcyBmcm9tIGJhY2tncm91bmQgY29sdW1ucy5cblx0XHQvL0luIG5vbi1GQ0wgYXBwcyB3aGVyZSBvbmx5IG9uZSBwYWdlIGlzIHZpc2libGUgYXQgYSB0aW1lLCB0aGlzIGZpbHRlcmluZyBpc24ndCBuZWNlc3NhcnkuXG5cdFx0aWYgKGFwcENvbXBvbmVudC5faXNGY2xFbmFibGVkKCkgJiYgY3VycmVudFBhZ2VWaWV3SUQgIT09IGJhc2VWaWV3SUQpIHtcblx0XHRcdHJldHVybiBmYWxzZTtcblx0XHR9XG5cdFx0cmV0dXJuIHRydWU7XG5cdH1cbn07XG5cbmV4cG9ydCBkZWZhdWx0IE1lc3NhZ2VIYW5kbGVyTFJFeHRlbnNpb247XG4iXSwibWFwcGluZ3MiOiI7Ozs7Ozs7RUFFQTs7RUFFQSxNQUFNQSx5QkFBeUIsR0FBRztJQUNqQ0MsbUNBQW1DLEVBQUUsU0FBQUEsQ0FBQSxFQUF5QztNQUM3RTtNQUNBLE1BQU1DLFlBQVksR0FBRyxJQUFJLENBQUNDLElBQUksQ0FBQ0MsZUFBZSxDQUFDLENBQUM7TUFDaEQsTUFBTUMsa0JBQWtCLEdBQUdDLFdBQVcsQ0FBQ0Qsa0JBQWtCLENBQUNILFlBQVksQ0FBQztNQUN2RSxNQUFNSyxpQkFBaUIsR0FBR0Ysa0JBQWtCLEVBQUVHLEtBQUssQ0FBQyxDQUFDO01BQ3JELE1BQU1DLFVBQVUsR0FBRyxJQUFJLENBQUNOLElBQUksQ0FBQ08sT0FBTyxDQUFDLENBQUMsRUFBRUYsS0FBSyxDQUFDLENBQUM7TUFDL0M7TUFDQTtNQUNBO01BQ0EsSUFBSU4sWUFBWSxDQUFDUyxhQUFhLENBQUMsQ0FBQyxJQUFJSixpQkFBaUIsS0FBS0UsVUFBVSxFQUFFO1FBQ3JFLE9BQU8sS0FBSztNQUNiO01BQ0EsT0FBTyxJQUFJO0lBQ1o7RUFDRCxDQUFDO0VBQUMsT0FFYVQseUJBQXlCO0FBQUEiLCJpZ25vcmVMaXN0IjpbXX0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJNZXNzYWdlSGFuZGxlckxSRXh0ZW5zaW9uIiwiZ2V0U2hvd0JvdW5kTWVzc2FnZXNJbk1lc3NhZ2VEaWFsb2ciLCJhcHBDb21wb25lbnQiLCJiYXNlIiwiZ2V0QXBwQ29tcG9uZW50IiwiZ2V0Q3VycmVudFBhZ2VWaWV3IiwiQ29tbW9uVXRpbHMiLCJjdXJyZW50UGFnZVZpZXdJRCIsImdldElkIiwiYmFzZVZpZXdJRCIsImdldFZpZXciLCJfaXNGY2xFbmFibGVkIiwiZ2V0Vmlld0RhdGEiLCJ2aWV3TGV2ZWwiXSwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzIjpbIk1lc3NhZ2VIYW5kbGVyLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBDb21tb25VdGlscyBmcm9tIFwic2FwL2ZlL2NvcmUvQ29tbW9uVXRpbHNcIjtcbmltcG9ydCB0eXBlIE1lc3NhZ2VIYW5kbGVyIGZyb20gXCJzYXAvZmUvY29yZS9jb250cm9sbGVyZXh0ZW5zaW9ucy9NZXNzYWdlSGFuZGxlclwiO1xuLy8gaW1wb3J0IHR5cGUgTmF2Q29udGFpbmVyIGZyb20gXCJzYXAvbS9OYXZDb250YWluZXJcIjtcblxuY29uc3QgTWVzc2FnZUhhbmRsZXJMUkV4dGVuc2lvbiA9IHtcblx0Z2V0U2hvd0JvdW5kTWVzc2FnZXNJbk1lc3NhZ2VEaWFsb2c6IGZ1bmN0aW9uICh0aGlzOiBNZXNzYWdlSGFuZGxlcik6IGJvb2xlYW4ge1xuXHRcdC8vIEZvciBMaXN0IFJlcG9ydCwgZGV0ZXJtaW5lcyB3aGV0aGVyIGJvdW5kIG1lc3NhZ2VzIHNob3VsZCBiZSBzaG93biBpbiBhIGRpYWxvZyBvciBub3Rcblx0XHRjb25zdCBhcHBDb21wb25lbnQgPSB0aGlzLmJhc2UuZ2V0QXBwQ29tcG9uZW50KCk7XG5cdFx0Y29uc3QgZ2V0Q3VycmVudFBhZ2VWaWV3ID0gQ29tbW9uVXRpbHMuZ2V0Q3VycmVudFBhZ2VWaWV3KGFwcENvbXBvbmVudCk7XG5cdFx0Y29uc3QgY3VycmVudFBhZ2VWaWV3SUQgPSBnZXRDdXJyZW50UGFnZVZpZXc/LmdldElkKCk7XG5cdFx0Y29uc3QgYmFzZVZpZXdJRCA9IHRoaXMuYmFzZS5nZXRWaWV3KCk/LmdldElkKCk7XG5cdFx0Ly9JbiBGQ0wgc2NlbmFyaW9zLCBtdWx0aXBsZSBwYWdlcyBjYW4gYmUgdmlzaWJsZSBzaW11bHRhbmVvdXNseSAoTGlzdCBSZXBvcnQgKyBPYmplY3QgUGFnZSBpbiBjb2x1bW5zKS5cblx0XHQvL1RoZSBvcmlnaW5hbCBsb2dpYyBwcmV2ZW50cyBzaG93aW5nIGJvdW5kIG1lc3NhZ2VzIGZyb20gYmFja2dyb3VuZCBjb2x1bW5zLlxuXHRcdC8vSW4gbm9uLUZDTCBhcHBzIHdoZXJlIG9ubHkgb25lIHBhZ2UgaXMgdmlzaWJsZSBhdCBhIHRpbWUsIHRoaXMgZmlsdGVyaW5nIGlzbid0IG5lY2Vzc2FyeS5cblx0XHQvLyBmb3IgYSBmY2wgY2FzZSwgd2hlbiBib3RoIExpc3QgUmVwb3J0IGFuZCBPYmplY3QgUGFnZSBhcmUgdmlzaWJsZSwgd2Ugd2FudCB0byBzaG93IG1lc3NhZ2Vcblx0XHRpZiAoYXBwQ29tcG9uZW50Ll9pc0ZjbEVuYWJsZWQoKSAmJiBjdXJyZW50UGFnZVZpZXdJRCAhPT0gYmFzZVZpZXdJRCAmJiBnZXRDdXJyZW50UGFnZVZpZXc/LmdldFZpZXdEYXRhKCk/LnZpZXdMZXZlbCAhPT0gMSkge1xuXHRcdFx0cmV0dXJuIGZhbHNlO1xuXHRcdH1cblx0XHRyZXR1cm4gdHJ1ZTtcblx0fVxufTtcblxuZXhwb3J0IGRlZmF1bHQgTWVzc2FnZUhhbmRsZXJMUkV4dGVuc2lvbjtcbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7OztFQUVBOztFQUVBLE1BQU1BLHlCQUF5QixHQUFHO0lBQ2pDQyxtQ0FBbUMsRUFBRSxTQUFBQSxDQUFBLEVBQXlDO01BQzdFO01BQ0EsTUFBTUMsWUFBWSxHQUFHLElBQUksQ0FBQ0MsSUFBSSxDQUFDQyxlQUFlLENBQUMsQ0FBQztNQUNoRCxNQUFNQyxrQkFBa0IsR0FBR0MsV0FBVyxDQUFDRCxrQkFBa0IsQ0FBQ0gsWUFBWSxDQUFDO01BQ3ZFLE1BQU1LLGlCQUFpQixHQUFHRixrQkFBa0IsRUFBRUcsS0FBSyxDQUFDLENBQUM7TUFDckQsTUFBTUMsVUFBVSxHQUFHLElBQUksQ0FBQ04sSUFBSSxDQUFDTyxPQUFPLENBQUMsQ0FBQyxFQUFFRixLQUFLLENBQUMsQ0FBQztNQUMvQztNQUNBO01BQ0E7TUFDQTtNQUNBLElBQUlOLFlBQVksQ0FBQ1MsYUFBYSxDQUFDLENBQUMsSUFBSUosaUJBQWlCLEtBQUtFLFVBQVUsSUFBSUosa0JBQWtCLEVBQUVPLFdBQVcsQ0FBQyxDQUFDLEVBQUVDLFNBQVMsS0FBSyxDQUFDLEVBQUU7UUFDM0gsT0FBTyxLQUFLO01BQ2I7TUFDQSxPQUFPLElBQUk7SUFDWjtFQUNELENBQUM7RUFBQyxPQUVhYix5QkFBeUI7QUFBQSIsImlnbm9yZUxpc3QiOltdfQ==

package/src/sap/fe/templates/ListReport/overrides/MessageHandler.ts

@@ -12,7 +12,8 @@ const MessageHandlerLRExtension = {
 		//In FCL scenarios, multiple pages can be visible simultaneously (List Report + Object Page in columns).
 		//The original logic prevents showing bound messages from background columns.
 		//In non-FCL apps where only one page is visible at a time, this filtering isn't necessary.
-		if (appComponent._isFclEnabled() && currentPageViewID !== baseViewID) {
+		// for a fcl case, when both List Report and Object Page are visible, we want to show message
+		if (appComponent._isFclEnabled() && currentPageViewID !== baseViewID && getCurrentPageView?.getViewData()?.viewLevel !== 1) {
 			return false;
 		}
 		return true;

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

@@ -1,6 +1,6 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
- *      (c) Copyright 2009-2025 SAP SE. All rights reserved
+ *      (c) Copyright 2009-2026 SAP SE. All rights reserved
  */
 sap.ui.define(["sap/base/Log", "sap/fe/core/CommonUtils", "sap/ui/core/routing/HashChanger"], function (Log, CommonUtils, HashChanger) {
   "use strict";

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

@@ -1,6 +1,6 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
- *      (c) Copyright 2009-2025 SAP SE. All rights reserved
+ *      (c) Copyright 2009-2026 SAP SE. All rights reserved
  */
 sap.ui.define(["sap/fe/core/CommonUtils", "sap/fe/core/converters/MetaModelConverter", "sap/fe/core/helpers/ResourceModelHelper"], function (CommonUtils, MetaModelConverter, ResourceModelHelper) {
   "use strict";

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

@@ -1,6 +1,6 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
- *      (c) Copyright 2009-2025 SAP SE. All rights reserved
+ *      (c) Copyright 2009-2026 SAP SE. All rights reserved
  */
 sap.ui.define(["sap/base/Log", "sap/fe/core/helpers/KeepAliveHelper", "sap/fe/core/library", "sap/fe/navigation/library", "sap/ui/Device", "sap/ui/mdc/p13n/StateUtil"], function (Log, KeepAliveHelper, CoreLibrary, NavLibrary, Device, StateUtil) {
   "use strict";

package/src/sap/fe/templates/ListReport/view/fragments/MultipleMode.block.js

@@ -1,6 +1,6 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
- *      (c) Copyright 2009-2025 SAP SE. All rights reserved
+ *      (c) Copyright 2009-2026 SAP SE. All rights reserved
  */
 sap.ui.define(["sap/fe/core/buildingBlocks/templating/BuildingBlockSupport", "sap/fe/core/buildingBlocks/templating/BuildingBlockTemplateProcessor", "sap/fe/core/buildingBlocks/templating/BuildingBlockTemplatingBase", "sap/fe/core/helpers/StableIdHelper", "sap/m/IconTabBar", "sap/m/IconTabFilter", "sap/m/MessageStrip", "../../controls/MultipleModeControl", "sap/fe/base/jsx-runtime/jsx"], function (BuildingBlockSupport, BuildingBlockTemplateProcessor, BuildingBlockTemplatingBase, StableIdHelper, IconTabBar, IconTabFilter, MessageStrip, MultipleModeControl, _jsx) {
   "use strict";

package/src/sap/fe/templates/ObjectPage/Component.js

@@ -1,6 +1,6 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
- *      (c) Copyright 2009-2025 SAP SE. All rights reserved
+ *      (c) Copyright 2009-2026 SAP SE. All rights reserved
  */
 sap.ui.define(["sap/base/Log", "sap/fe/base/ClassSupport", "sap/fe/core/CommonUtils", "sap/fe/core/TemplateComponent", "sap/fe/core/helpers/ModelHelper", "sap/fe/core/library", "sap/fe/templates/ObjectPage/ExtendPageDefinition", "sap/fe/templates/library"], function (Log, ClassSupport, CommonUtils, TemplateComponent, ModelHelper, CoreLibrary, ExtendPageDefinition, templateLib) {
   "use strict";

package/src/sap/fe/templates/ObjectPage/ExtendPageDefinition.js

@@ -1,6 +1,6 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
- *      (c) Copyright 2009-2025 SAP SE. All rights reserved
+ *      (c) Copyright 2009-2026 SAP SE. All rights reserved
  */
 sap.ui.define(["sap/fe/base/BindingToolkit", "sap/fe/templates/ObjectPage/ObjectPageTemplating"], function (BindingToolkit, ObjectPageTemplating) {
   "use strict";