@sapui5/sap.suite.ui.commons 1.136.3 → 1.139.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.commons",
-  "version": "1.136.3",
+  "version": "1.139.0",
   "description": "SAPUI5 Library sap.suite.ui.commons",
   "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
   "author": "SAP SE (https://www.sap.com)",

package/src/sap/suite/ui/commons/.library

@@ -7,7 +7,7 @@
 		SAP UI development toolkit for HTML5 (SAPUI5)
 		(c) Copyright 2009-2015 SAP SE. All rights reserved
 	</copyright>
-	<version>1.136.3</version>
+	<version>1.139.0</version>
 
 	<documentation>SAP UI library: sap.suite.ui.commons</documentation>
 
@@ -54,14 +54,6 @@
 		<jscoverage xmlns="http://www.sap.com/ui5/buildext/jscoverage">
 			<exclude name="sap.suite.ui.commons.thirdparty." />
 		</jscoverage>
-		<!-- Thirdparty references -->
-		<thirdparty xmlns="http://www.sap.com/ui5/buildext/thirdparty" >
-			<lib name="@azure/msal-browser" displayName="Microsoft Authentication Library for JavaScript" npmName="@azure/msal-browser" version="2.22.0" homepage="https://github.com/AzureAD/microsoft-authentication-library-for-js" id="73554900106100194698">
-				<license url="https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/LICENSE" type="MIT" />
-				<copyright>Microsoft Corporation</copyright>
-				<pattern>sap/suite/ui/commons/thirdparty/msal-browser.js</pattern>
-			</lib>
-		</thirdparty>
 		<!-- demokit module app -->
 		<documentation xmlns="http://www.sap.com/ui5/buildext/documentation"
 			indexUrl="../../../../../test-resources/sap/suite/ui/commons/demokit/docuindex.json"

package/src/sap/suite/ui/commons/AriaProperties.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 * @since 1.65.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/CalculationBuilder.js

@@ -134,7 +134,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 * @since 1.56.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/CalculationBuilderExpression.js

@@ -132,27 +132,6 @@ sap.ui.define([
 		MOUSE: "mouse"
 	});
 
-	const OperatorTooltip = Object.freeze({
-		"+": "CALCULATION_BUILDER_ADDITION_TOOLTIP",
-		"-": "CALCULATION_BUILDER_SUBTRACTION_TOOLTIP",
-		"/": "CALCULATION_BUILDER_DIVISION_TOOLTIP",
-		"*": "CALCULATION_BUILDER_MULTIPLICATION_TOOLTIP",
-		"(": "CALCULATION_BUILDER_LEFT_BRACKET_TOOLTIP",
-		")": "CALCULATION_BUILDER_RIGHT_BRACKET_TOOLTIP",
-		",": "CALCULATION_BUILDER_COMMA_TOOLTIP",
-		"<": "CALCULATION_BUILDER_LESS_THAN_TOOLTIP",
-		">": "CALCULATION_BUILDER_GREATER_THAN_TOOLTIP",
-		"<=": "CALCULATION_BUILDER_LESS_THAN_OR_EQUALS_TO_TOOLTIP",
-		">=": "CALCULATION_BUILDER_GREATER_THAN_OR_EQUALS_TO_TOOLTIP",
-		"=": "CALCULATION_BUILDER_EQUALS_TO_TOOLTIP",
-		"!=": "CALCULATION_BUILDER_NOT_EQUALS_TO_TOOLTIP",
-		"AND": "CALCULATION_BUILDER_LOGICAL_CONJUNCTION_TOOLTIP",
-		"OR": "CALCULATION_BUILDER_LOGICAL_DISJUNCTION_TOOLTIP",
-		"XOR": "CALCULATION_BUILDER_EXCLUSIVE_DISJUNCTION_TOOLTIP",
-		"NOT": "CALCULATION_BUILDER_NEGATION_TOOLTIP"
-	});
-
-
 	var DEFAULT_GROUP_KEY = "##DEFAULT##";
 
 	var oResourceBundle = CoreLib.getResourceBundleFor("sap.suite.ui.commons");
@@ -169,7 +148,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 * @since 1.56.0
 	 *
 	 * @constructor
@@ -286,6 +265,27 @@ sap.ui.define([
 		this._mVariableMap = {};
 		this._mFunctionMap = {};
 		this._mOperatorMap = {};
+
+		//Map of Operator Tooltips
+		this._operatorTooltip = Object.freeze({
+			"+": "CALCULATION_BUILDER_ADDITION_TOOLTIP",
+			"-": "CALCULATION_BUILDER_SUBTRACTION_TOOLTIP",
+			"/": "CALCULATION_BUILDER_DIVISION_TOOLTIP",
+			"*": "CALCULATION_BUILDER_MULTIPLICATION_TOOLTIP",
+			"(": "CALCULATION_BUILDER_LEFT_BRACKET_TOOLTIP",
+			")": "CALCULATION_BUILDER_RIGHT_BRACKET_TOOLTIP",
+			",": "CALCULATION_BUILDER_COMMA_TOOLTIP",
+			"<": "CALCULATION_BUILDER_LESS_THAN_TOOLTIP",
+			">": "CALCULATION_BUILDER_GREATER_THAN_TOOLTIP",
+			"<=": "CALCULATION_BUILDER_LESS_THAN_OR_EQUALS_TO_TOOLTIP",
+			">=": "CALCULATION_BUILDER_GREATER_THAN_OR_EQUALS_TO_TOOLTIP",
+			"=": "CALCULATION_BUILDER_EQUALS_TO_TOOLTIP",
+			"!=": "CALCULATION_BUILDER_NOT_EQUALS_TO_TOOLTIP",
+			"AND": "CALCULATION_BUILDER_LOGICAL_CONJUNCTION_TOOLTIP",
+			"OR": "CALCULATION_BUILDER_LOGICAL_DISJUNCTION_TOOLTIP",
+			"XOR": "CALCULATION_BUILDER_EXCLUSIVE_DISJUNCTION_TOOLTIP",
+			"NOT": "CALCULATION_BUILDER_NEGATION_TOOLTIP"
+		});
 	};
 
 	CalculationBuilderExpression.prototype._renderDelimiter = function (oRm, iIndex) {
@@ -454,7 +454,7 @@ sap.ui.define([
 		var fnCreateButton = function (sLabel) {
 			return new Button({
 				text: sLabel,
-				tooltip: OperatorTooltip[sLabel] ? oResourceBundle.getText(OperatorTooltip[sLabel]) : OperatorTooltip[sLabel],
+				tooltip: this._operatorTooltip[sLabel] ? oResourceBundle.getText(this._operatorTooltip[sLabel]) : this._operatorTooltip[sLabel],
 				press: this._updateOrCreateItem.bind(this, {
 					type: ItemType.Operator,
 					key: sLabel
@@ -665,7 +665,7 @@ sap.ui.define([
 
 					var oButton = new Button({
 						text: sText,
-						tooltip: OperatorTooltip[sText] ? oResourceBundle.getText(OperatorTooltip[sText]) : sText,
+						tooltip: this._operatorTooltip[sText] ? oResourceBundle.getText(this._operatorTooltip[sText]) : sText,
 						press: this._updateOrCreateItem.bind(this, {
 							type: sType,
 							key: sItemKey
@@ -2150,21 +2150,21 @@ sap.ui.define([
 
 	CalculationBuilderExpression.prototype._setVariables = function () {
 		var aVariables = this["getVariables"]();
-		aVariables.forEach((oVariable)=> {
+		aVariables.forEach((oVariable) => {
 			this._mVariableMap[oVariable.getKey().toLowerCase()] = oVariable;
 		});
 	};
 
 	CalculationBuilderExpression.prototype._setFunctions = function () {
 		var aFunctions = this["getFunctions"]();
-		aFunctions.forEach((oFunction)=> {
+		aFunctions.forEach((oFunction) => {
 			this._mFunctionMap[oFunction.getKey().toLowerCase()] = oFunction;
 		});
 	};
 
 	CalculationBuilderExpression.prototype._setOperators = function () {
 		var aOperators = this["getOperators"]();
-		aOperators.forEach((oOperator)=> {
+		aOperators.forEach((oOperator) => {
 			this._mOperatorMap[oOperator.getKey().toLowerCase()] = oOperator;
 		});
 	};

package/src/sap/suite/ui/commons/CalculationBuilderFunction.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 * @since 1.56.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/CalculationBuilderGroup.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 * @since 1.60.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/CalculationBuilderItem.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 * @since 1.56.0
 	 *
 	 * @constructor
@@ -144,6 +144,7 @@ sap.ui.define([
 		oRm.openStart("div");
 		oRm.attr("id",this.getId() + "-content");
 		oRm.class("sapCalculationBuilderItemContent");
+		oRm.attr("title", this.getParent()._operatorTooltip[sLabel] ? oResourceBundle.getText(this.getParent()._operatorTooltip[sLabel]) : "");
 		if (this._bIsNew || this._isEmpty()) {
 			oRm.attr("title",oResourceBundle.getText("CALCULATION_BUILDER_NEW_ITEM_TITLE"));
 		} else if (oItemsWithAriaLabel[sLabel]) {
@@ -186,9 +187,8 @@ sap.ui.define([
 			fnRenderExpandButton(oRm);
 		}
 		if (item) {
-
 			oRm.flush(item);
-			}
+		}
 	};
 
 	CalculationBuilderItem.prototype._getClass = function (bHasError, oRm, bCreateExpression) {
@@ -249,9 +249,9 @@ sap.ui.define([
 		oRm.openStart("div");
 		this._getClass(!!oError, oRm);
 		oRm.attr("id",this.getId());
-		oRm.attr("tabindex",sTabIndexAttr);
-		oRm.attr("title",sTooltipAttr);
-		oRm.attr("role",sRoleAttr);
+		oRm.attr("tabindex", sTabIndexAttr);
+		oRm.attr("title", sTooltipAttr);
+		oRm.attr("role", sRoleAttr);
 		oRm.openEnd();
 		// for now we can't add data-sap-ui as it collide with dragging selected items (for unknown reason)
 		//sHtml += "<div " + " class=\"" + this._getClass(!!oError) + "\" data-sap-ui=\"" + this.getId() + "\" id=\"" + this.getId() + "\" tabindex=\"" + (bIsItemInBuilder ? "-1" : "0") + "\"" + sTooltipAttr + ">";

package/src/sap/suite/ui/commons/CalculationBuilderValidationResult.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 * @since 1.56.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/CalculationBuilderVariable.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 * @since 1.56.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/CloudFilePicker.js

@@ -118,7 +118,7 @@ sap.ui.define([
 	 * @class
 	 * @public
 	 * @internal
-	 * @version 1.136.3
+	 * @version 1.139.0
 	*/
 	var CloudFilePicker = Dialog.extend("sap.suite.ui.commons.CloudFilePicker", {
 		metadata: {

package/src/sap/suite/ui/commons/MicroProcessFlow.js

@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/suite/ui/commons/MicroProcessFlowItem.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/suite/ui/commons/ProcessFlow.js

@@ -404,6 +404,10 @@ sap.ui.define([
 			ResizeHandler.deregister(this._resizeRegId);
 		}
 
+		if(this._oInvisibleText) {
+			this._oInvisibleText.destroy();
+		}
+
 		if (this._internalCalcMatrix) {
 			delete this._internalCalcMatrix;
 			this._internalCalcMatrix = null;

package/src/sap/suite/ui/commons/ProcessFlowRenderer.js

@@ -13,8 +13,9 @@ sap.ui.define([
 	"sap/base/security/encodeXML",
         "sap/ui/core/Element",
 	"sap/ui/core/Core",
-	"sap/ui/core/Lib"
-], function (jQuery, library, ProcessFlowLaneHeader, AriaProperties, Device, encodeXML, Element, Core, CoreLib) {
+	"sap/ui/core/Lib",
+	"sap/ui/core/InvisibleText"
+], function (jQuery, library, ProcessFlowLaneHeader, AriaProperties, Device, encodeXML, Element, Core, CoreLib, InvisibleText) {
 	"use strict";
 
 	// shortcut for sap.suite.ui.commons.ProcessFlowZoomLevel
@@ -54,6 +55,13 @@ sap.ui.define([
 			if (!this._oResBundle) {
 				this._oResBundle = CoreLib.getResourceBundleFor("sap.suite.ui.commons");
 			}
+	//Setting invisible text
+		if (!oControl._oInvisibleText) {
+			oControl._oInvisibleText = new InvisibleText();
+			oControl._oInvisibleText.toStatic();
+			oControl._oInvisibleText.setText(this._oResBundle.getText("PF_ARIA_PROCESS_FLOW_NODE_DESC"));
+		}
+
 		oClosedElement = oProcessFlowRenderer._renderBasicStructure(oRm, oControl);
 		if (oClosedElement) {
 			return;
@@ -157,7 +165,7 @@ sap.ui.define([
 			var oCustomContent = node._getCurrentZoomLevelContent();
 			oRm.attr("id", sNodeId);
 			oRm.attr("tabindex", 0);
-            oRm.attr("aria-description", this._oResBundle.getText("PF_ARIA_PROCESS_FLOW_NODE_DESC"));
+            oRm.attr("aria-describedby", oControl._oInvisibleText.getId());
 			var oAriaDefaultProperties = {};
 			oAriaDefaultProperties.label = node._getAriaText();
 			if (oCustomContent) {

package/src/sap/suite/ui/commons/TimelineItemRenderer.js

@@ -296,7 +296,14 @@ sap.ui.define([
 
 		eBarWrapper.addChild(eText);
 		eText.addClass("sapSuiteUiCommonsTimelineGroupHeaderSpan");
-		eText.addChildEscaped(" " + oTimelineItem.getTitle());
+
+		// Use the new _getGroupTypeLabel method
+		var sGroupTypeLabel = this._getGroupTypeLabel(oTimelineItem);
+		if (sGroupTypeLabel) {
+			eText.addChildEscaped(" " + sGroupTypeLabel + ": " + oTimelineItem.getTitle());
+		} else {
+			eText.addChildEscaped(" " + oTimelineItem.getTitle());
+		}
 
 		if (oTimelineItem._orientation === "V") {
 			eTimelineItem.addChild(eIconBarWrapper);
@@ -576,14 +583,50 @@ sap.ui.define([
 			eTimelineItem.setAttribute("aria-setsize", oTimelineItem._callParentFn("_getItemsCount"));
 		}
 		if (bIsGroupHeader) {
+			var sGroupTypeLabel = this._getGroupTypeLabel(oTimelineItem);
 			if (!oTimelineItem._isGroupCollapsed()) {
-				sGroupHeader = oResBundle.getText("TIMELINE_ACCESSIBILITY_GROUP_HEADER") + ": " + oTimelineItem.getTitle() + " " + oResBundle.getText("TIMELINE_ACCESSIBILITY_GROUP_EXPAND");
+				if (sGroupTypeLabel) {
+					sGroupHeader = oResBundle.getText("TIMELINE_ACCESSIBILITY_GROUP_HEADER") + ": " + sGroupTypeLabel + " " + oTimelineItem.getTitle() + " " + oResBundle.getText("TIMELINE_ACCESSIBILITY_GROUP_EXPAND");
+				} else {
+					sGroupHeader = oResBundle.getText("TIMELINE_ACCESSIBILITY_GROUP_HEADER") + ": " + oTimelineItem.getTitle() + " " + oResBundle.getText("TIMELINE_ACCESSIBILITY_GROUP_EXPAND");
+				}
 			} else {
-				sGroupHeader = oResBundle.getText("TIMELINE_ACCESSIBILITY_GROUP_HEADER") + ": " + oTimelineItem.getTitle() + " " + oResBundle.getText("TIMELINE_ACCESSIBILITY_GROUP_COLLAPSE");
+				if (sGroupTypeLabel) {
+					sGroupHeader = oResBundle.getText("TIMELINE_ACCESSIBILITY_GROUP_HEADER") + ": " + sGroupTypeLabel + " " + oTimelineItem.getTitle() + " " + oResBundle.getText("TIMELINE_ACCESSIBILITY_GROUP_COLLAPSE");
+				} else {
+					sGroupHeader = oResBundle.getText("TIMELINE_ACCESSIBILITY_GROUP_HEADER") + ": " + oTimelineItem.getTitle() + " " + oResBundle.getText("TIMELINE_ACCESSIBILITY_GROUP_COLLAPSE");
+				}
 			}
 			eTimelineItem.setAttribute("aria-label", sGroupHeader, false);
 		}
 	};
 
+	/**
+	 * Returns the localized label for the current Timeline grouping type (Year, Month, Quarter, Week, Day).
+	 * Looks up the value of the GroupByType property from the parent Timeline control and returns the corresponding
+	 * localized string from the resource bundle. If the type is not recognized, returns undefined.
+	 * @param {sap.suite.ui.commons.TimelineItem} oTimelineItem The item to be rendered
+	 * @returns {string|undefined} The localized label for the group type, or undefined if not found.
+	 * @private
+	 */
+	TimelineItemRenderer._getGroupTypeLabel = function (oTimelineItem) {
+		var oTimeline = oTimelineItem.getParent();
+		var sType = oTimeline.getGroupByType();
+
+		// Compare against enum values from library
+		var mTypeToKey = {};
+		mTypeToKey[library.TimelineGroupType.Year] = "TIMELINE_YEAR";
+		mTypeToKey[library.TimelineGroupType.Month] = "TIMELINE_MONTH";
+		mTypeToKey[library.TimelineGroupType.Quarter] = "TIMELINE_QUARTER";
+		mTypeToKey[library.TimelineGroupType.Week] = "TIMELINE_WEEK";
+		mTypeToKey[library.TimelineGroupType.Day] = "TIMELINE_DAY";
+
+		var sKey = mTypeToKey[sType];
+		if (sKey && oResBundle.hasText(sKey)) {
+			return oResBundle.getText(sKey);
+		}
+		return undefined;
+	};
+
 	return TimelineItemRenderer;
 }, true);

package/src/sap/suite/ui/commons/TimelineRenderManager.js

@@ -1117,7 +1117,7 @@ sap.ui.define([
                                 that._filterDialogRangePage.setFilterCount(0);
                                 that._objects.getTimestampFilterPicker().clearDates();
                                 if (that._rangeFilterType == "None") {
-                                    that.toggleGroupTypeSelector();
+                                    that.toggleGroupTypeSelector(that._rangeFilterType);
                                 }
                             },
 							filterDetailPageOpened: function (oItem) {

package/src/sap/suite/ui/commons/collaboration/CollaborationHelper.js

@@ -13,6 +13,7 @@ sap.ui.define(
 		var PARAM_SAP_STAGEVIEW_HASH = "&sap-stageview-hash";
 		var PARAM_SAP_CARD_ID = "&sap-ui-cardId";
 		var PARAM_SAP_XX_CARD_ID = "&sap-ui-xx-cardId";
+		var PARAM_SAP_CARD_INFO = "&info=";
 		var TRANSIENT_KEY = "transient";
 		var oLogger = Log.getLogger("sap.suite.ui.commons.collaboration.CollaborationHelper");
 
@@ -107,8 +108,9 @@ sap.ui.define(
 		 * @return {Promise} Return the resolved promise when the redirection of the URL is done.
 		 * @public
 		 */
-		CollaborationHelper.processAndExpandHash = function () {
-			this._hideAvatarFromShellbar();
+		CollaborationHelper.processAndExpandHash = async function () {
+			const bTeamsModeActive = await this.isTeamsModeActive();
+			this._hideAvatarFromShellbar(bTeamsModeActive);
 			return this._getCurrentUrl().then(async function (sCurrentUrl) {
 				//if the current url has url param, sap-url-hash, then we have to redirect to an actual url.
 				if (sCurrentUrl.indexOf(URL_KEY) > -1) {
@@ -116,7 +118,7 @@ sap.ui.define(
 					if (sCurrentUrl.indexOf(PARAM_SAP_STAGEVIEW_HASH) > 0) {
 						sHash = sHash.split(PARAM_SAP_STAGEVIEW_HASH)[0];
 					} else if (sCurrentUrl.includes("info=")) {
-                                                sHash = sHash.includes(",") ? sHash.split(",")[0] : sHash.split("&")[0];
+                        sHash = sHash.includes(",") ? sHash.split(",")[0] : sHash.split("&")[0];
 					} else if (sCurrentUrl.indexOf(PARAM_SAP_CARD_ID) > 0 || sCurrentUrl.indexOf(PARAM_SAP_XX_CARD_ID) > 0) {
 						if (sCurrentUrl.indexOf(PARAM_SAP_CARD_ID) > 0){
 							sHash = sHash.split(PARAM_SAP_CARD_ID)[0];
@@ -128,46 +130,132 @@ sap.ui.define(
 					}
 					return this._retrieveURL(sHash).then(function (oAppState) {
 						if (oAppState.getData()) {
-							window.location.replace(oAppState.getData());
+							this._redirectToUrl(oAppState.getData());
 						} else {
 							// In case AppState couldn't found value for the hash, so removing it and redirecting to LR
 							const sUrl = sCurrentUrl.split(URL_KEY)[0];
-							window.location.replace(sUrl);
+							this._redirectToUrl(sUrl);
 						}
 						return Promise.resolve();
-					});
+					}.bind(this));
 				} else if (sCurrentUrl.indexOf(PARAM_SAP_CARD_ID) > -1) {
 					const sUrl = sCurrentUrl.split(PARAM_SAP_CARD_ID)[0];
-					window.location.replace(sUrl);
+					this._redirectToUrl(sUrl);
 				} else if (sCurrentUrl.indexOf(PARAM_SAP_CARD_TITLE) > -1) {
-					const UshellContainer = sap.ui.require("sap/ushell/Container");
 					const sUrl = sCurrentUrl.split(PARAM_SAP_CARD_TITLE)[0];
-					// Get indication is if we are in AppRuntime (for special use cases handling, e.g. BTP Fiori App in S/Cube)
-					if (UshellContainer?.inAppRuntime()){
-						await CollaborationMessageConsumer.updateTopLevelURLforAppRuntime(sUrl);
-					} else {
-						window.location.replace(sUrl);
-					}
+					await this._redirectBasedOnRuntime(sUrl);
+				} else if (bTeamsModeActive && sCurrentUrl.includes(PARAM_SAP_CARD_INFO)) {
+					const sUrl = sCurrentUrl.split(PARAM_SAP_CARD_INFO)[0];
+					await this._redirectBasedOnRuntime(sUrl);
 				}
 				return Promise.resolve();
 			}.bind(this));
 		};
 
+		/**
+		 * Handles URL redirection according to the runtime environment.
+		 *
+		 * - In AppRuntime (e.g., BTP Fiori App in S/Cube), updates the top-level URL.
+		 * - Otherwise, performs a standard window location redirect.
+		 *
+		 * @param {string} sUrl - The target URL for redirection.
+		 * @private
+		 */
+		CollaborationHelper._redirectBasedOnRuntime = async function (sUrl) {
+			const UshellContainer = sap.ui.require("sap/ushell/Container");
+
+			// Get indication is if we are in AppRuntime (for special use cases handling, e.g. BTP Fiori App in S/Cube)
+			if (UshellContainer && UshellContainer.inAppRuntime()) {
+				await CollaborationMessageConsumer.updateTopLevelURLforAppRuntime(sUrl);
+			} else {
+				const targetUrl = this._stripTeamsParams(sUrl);
+				this._redirectToUrl(targetUrl);
+			}
+		};
+
+		/**
+		 * Removes 'sap-ushell-config' and 'sap-collaboration-teams' query parameters
+		 * from the given URL while preserving the hash fragment.
+		 *
+		 * @param {string} sUrl - The original full URL
+		 * @returns {string} - The cleaned URL
+		 * @private
+		 */
+		CollaborationHelper._removeTeamsParams = function (sUrl) {
+			try {
+				const urlParts = sUrl.split("#");
+				const baseUrl = urlParts[0];
+				const hashPart = urlParts[1] ? "#" + urlParts[1] : "";
+
+				const [path, queryString] = baseUrl.split("?");
+				if (!queryString) {
+					return sUrl;
+				}
+
+				const params = new URLSearchParams(queryString);
+				params.delete("sap-ushell-config");
+				params.delete("sap-collaboration-teams");
+
+				const newBaseUrl = params.toString()
+					? `${path}?${params.toString()}`
+					: path;
+
+				return newBaseUrl + hashPart;
+			} catch (e) {
+				return sUrl;
+			}
+		};
+
+		/**
+		 * If the current window is the top window, we assume it's not running inside an iframe, e.g. Microsoft Teams.
+		 * In this case, we remove the Teams parameters from the URL.
+		 *
+		 * @param {string} sUrl The URL to be cleaned of Teams parameters.
+		 * @returns {string} - The cleaned URL
+		 * @private
+		 */
+		CollaborationHelper._stripTeamsParams = function (sUrl) {
+			if (this._isTopWindow()) {
+				return this._removeTeamsParams(sUrl);
+			}
+			return sUrl;
+		};
+
+		/**
+		 * Determines whether the current window is the top-level window.
+		 * This is typically used to detect if the application is running inside an iframe (e.g., in Microsoft Teams).
+		 *
+		 * @returns {boolean} - Returns true if the current window is not inside an iframe, false otherwise.
+		 * @private
+		 */
+		CollaborationHelper._isTopWindow = function () {
+			return window.self === window.top;
+		};
+
+		/**
+		 * Redirects the browser to a specified URL.
+		 *
+		 * @private
+		 * @param {string} sUrl - The target URL to redirect to
+		 */
+		CollaborationHelper._redirectToUrl = function(sUrl) {
+			window.location.replace(sUrl);
+		};
+
 		/**
 		 * Hides the avatar of the user if the app is running in the Microsoft Teams application.
+		 * @param {boolean} bTeamsModeActive Indicates if Teams mode is active
 		 * @private
 		 * @ui5-restricted sap.suite.suite-ui-commons
 		 * @experimental since 1.108
 		 */
-		CollaborationHelper._hideAvatarFromShellbar = function () {
-			this.isTeamsModeActive().then(function (bIsActive) {
-				if (bIsActive) {
-					var oAvatar = Element.getElementById('userActionsMenuHeaderButton');
-					if (oAvatar) {
-						oAvatar.setVisible(false);
-					}
+		CollaborationHelper._hideAvatarFromShellbar = function (bTeamsModeActive) {
+			if (bTeamsModeActive) {
+				var oAvatar = Element.getElementById('userActionsMenuHeaderButton');
+				if (oAvatar) {
+					oAvatar.setVisible(false);
 				}
-			});
+			}
 		};
 
 		/**