@sapui5/sap.suite.ui.commons 1.141.0 → 1.142.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.commons",
-  "version": "1.141.0",
+  "version": "1.142.1",
   "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.141.0</version>
+	<version>1.142.1</version>
 
 	<documentation>SAP UI library: sap.suite.ui.commons</documentation>
 

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.141.0
+	 * @version 1.142.1
 	 * @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.141.0
+	 * @version 1.142.1
 	 * @since 1.56.0
 	 *
 	 * @constructor
@@ -1089,19 +1089,25 @@ sap.ui.define([
 		});
 	};
 
-	CalculationBuilder.prototype._isTokenAllowed = function (sKey) {
+	CalculationBuilder.prototype._isTokenAllowed = function (sKey, bIsInputStringGeneration) {
 		sKey = (sKey || "").toLowerCase();
-		// Check if the token is a custom function by searching the aggregation
-		var bCustomFunction = this.getFunctions().some(function (oFunction) {
-			return oFunction.getKey().toLowerCase() === sKey;
-		});
-		// If this is a custom function and its key is present in _mDisabledTokens,
-		// allow it (custom functions are not blocked by disabledDefaultTokens)
-		if (bCustomFunction && this._mDisabledTokens[sKey]) {
-			return true;
+		if (bIsInputStringGeneration) {
+			// New logic for string generation
+			// Check if the token is a custom function by searching the aggregation
+			var bCustomFunction = this.getFunctions().some(function (oFunction) {
+				return oFunction.getKey().toLowerCase() === sKey;
+			});
+			// If this is a custom function and its key is present in _mDisabledTokens,
+       		// allow it (custom functions are not blocked by disabledDefaultTokens)
+			if (bCustomFunction && this._mDisabledTokens[sKey]) {
+				return true;
+			}
+			// For all other cases, block if present in _mDisabledTokens
+			return !this._mDisabledTokens[sKey];
+		} else {
+			// Old logic for existing other cases
+			return !this._mDisabledTokens[sKey];
 		}
-		// For all other cases, block if present in _mDisabledTokens
-		return !this._mDisabledTokens[sKey];
 	};
 
 	CalculationBuilder.prototype.setDisabledDefaultTokens = function (sValue) {

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

@@ -148,7 +148,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.141.0
+	 * @version 1.142.1
 	 * @since 1.56.0
 	 *
 	 * @constructor
@@ -1592,7 +1592,7 @@ sap.ui.define([
 		this.getItems().forEach(function (oItem) {
 			aDomRefs.push(oItem.getFocusDomRef());
 			if (oItem.isExpandable()) {
-				aDomRefs.push(oItem.$("expandbutton"));
+				aDomRefs.push(oItem.$("expandbutton")[0]);
 			}
 		});
 		aDomRefs.push(this._getNewItem().getFocusDomRef());
@@ -1650,10 +1650,14 @@ sap.ui.define([
 	CalculationBuilderExpression.prototype._printErrors = function () {
 		this.getItems().forEach(function (oItem) {
 			var oError = oItem._getItemError(),
-				$this = oItem.$(),
-				sFnName = !!oError ? "addClass" : "removeClass";
-
-			$this[sFnName]("sapCalculationBuilderItemErrorSyntax");
+				$this = oItem.$();
+			if (oError) {
+				oItem._oArrowNavigtionInvisibleText.setText(oResourceBundle.getText("CALCULATION_BUILDER_NEGATIVE_ACTION") + " " + oResourceBundle.getText("CALCULATION_BUILDER_NAVIGATION"));
+				$this.addClass("sapCalculationBuilderItemErrorSyntax");
+			} else {
+				oItem._oArrowNavigtionInvisibleText.setText(oResourceBundle.getText("CALCULATION_BUILDER_NAVIGATION"));
+				$this.removeClass("sapCalculationBuilderItemErrorSyntax");
+			}
 		});
 
 		if (this.getParent().getLayoutType() === LayoutTypes.VisualOnly) {
@@ -1662,7 +1666,7 @@ sap.ui.define([
 	};
 
 	CalculationBuilderExpression.prototype._validateSyntax = function (mParameters) {
-		//Usually The map creation is done on the onBeforeRendering hook of this class but this method is getting invoked even before the onBeforeRendering is called 
+		//Usually The map creation is done on the onBeforeRendering hook of this class but this method is getting invoked even before the onBeforeRendering is called
 		//Its getting called from the "sap.suite.ui.commons.CalculationBuilder.js"
 		//To handle this case we are calling the _createMap function to ensure all maps are created appropriately
 		this._createMap();

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.141.0
+	 * @version 1.142.1
 	 * @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.141.0
+	 * @version 1.142.1
 	 * @since 1.60.0
 	 *
 	 * @constructor

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

@@ -941,7 +941,7 @@ sap.ui.define([
 		for (var i = 0; i < aItems.length; i++) {
 			var oItem = aItems[i],
 				sKey = oItem.getKey(),
-				bIsFunction = this._isFunction(sKey);
+				bIsFunction = this._isFunction(sKey, true);
 
 			if (bCreateInputText) {
 				oError = jQuery.grep(mParameters.errors, function (oItem) { // eslint-disable-line
@@ -1360,13 +1360,13 @@ sap.ui.define([
 		return this.$("input").text();
 	};
 
-	CalculationBuilderInput.prototype._isFunction = function (sKey) {
-		return !!this._getFunction(sKey);
+	CalculationBuilderInput.prototype._isFunction = function (sKey, bIsInputStringGeneration) {
+		return !!this._getFunction(sKey, bIsInputStringGeneration);
 	};
 
-	CalculationBuilderInput.prototype._getFunction = function (sKey) {
+	CalculationBuilderInput.prototype._getFunction = function (sKey, bIsInputStringGeneration) {
 		var oParent = this.getParent();
-		return oParent && oParent._isTokenAllowed(sKey) && oParent._getFunctionDefinition(sKey);
+		return oParent && oParent._isTokenAllowed(sKey, bIsInputStringGeneration) && oParent._getFunctionDefinition(sKey);
 	};
 
 	CalculationBuilderInput.prototype._storeCurrent = function (sValue) {

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

@@ -14,11 +14,12 @@ sap.ui.define([
 	"sap/base/security/encodeXML",
 	"./Utils",
 	"sap/ui/core/Lib",
+	"sap/ui/core/InvisibleText",
 	"sap/ui/thirdparty/jqueryui/jquery-ui-core",
 	"sap/ui/thirdparty/jqueryui/jquery-ui-widget",
 	"sap/ui/thirdparty/jqueryui/jquery-ui-mouse",
 	"sap/ui/thirdparty/jqueryui/jquery-ui-draggable"
-], function (jQuery, library, BaseObject, Control, MessageBox, encodeXML, Utils, CoreLib) {
+], function (jQuery, library, BaseObject, Control, MessageBox, encodeXML, Utils, CoreLib, InvisibleText) {
 	"use strict";
 
 	var ItemType = library.CalculationBuilderItemType,
@@ -39,7 +40,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.141.0
+	 * @version 1.142.1
 	 * @since 1.56.0
 	 *
 	 * @constructor
@@ -105,12 +106,19 @@ sap.ui.define([
 		var fnRenderExpandButton = function (oRm) {
 			oRm.openStart("div");
 			oRm.class("sapCalculationBuilderItemExpandButtonWrapper");
-			oRm.attr("title",oResourceBundle.getText("CALCULATION_BUILDER_EXPAND_BUTTON_TITLE"));
 			oRm.openEnd();
 			oRm.openStart("div");
 			oRm.attr("id",this.getId() + "-expandbutton");
 			oRm.class("sapCalculationBuilderItemExpandButton").class(sDisable);
 			oRm.attr("tabindex", "-1");
+			if (!this._oExpandButtonText) {
+				this._oExpandButtonText = new InvisibleText();
+				this._oExpandButtonText.toStatic();
+				this._oExpandButtonText.setText(oResourceBundle.getText("CALCULATION_BUILDER_EXPAND_BUTTON_TITLE"));
+			}
+			oRm.attr("aria-labelledby", this._oExpandButtonText.getId());
+			oRm.attr("aria-describedby", this._oArrowNavigtionInvisibleText.getId());
+			oRm.attr("role", "button");
 			oRm.openEnd();
 
 			if (!this._bReadOnly) {
@@ -146,7 +154,8 @@ sap.ui.define([
 		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"));
+			oRm.attr("title", oResourceBundle.getText("CALCULATION_BUILDER_NEW_ITEM_TITLE"));
+			fnGetItemAriaLabel(oRm, "CALCULATION_BUILDER_NEW_ITEM_TITLE");
 		} else if (oItemsWithAriaLabel[sLabel]) {
 			fnGetItemAriaLabel(oRm, "CALCULATION_BUILDER_" + oItemsWithAriaLabel[sLabel] + "_ARIA_LABEL");
 		}
@@ -251,10 +260,15 @@ sap.ui.define([
 		oRm.attr("id",this.getId());
 		oRm.attr("tabindex", sTabIndexAttr);
 		oRm.attr("title", sTooltipAttr);
-		oRm.attr("role", sRoleAttr);
+		oRm.attr("role", "button");
+		if (!this._oCalculationBuilderItemText) {
+			this._oCalculationBuilderItemText = new InvisibleText();
+			this._oCalculationBuilderItemText.toStatic();
+			this._oCalculationBuilderItemText.setText(this._getLabel());
+		}
+		oRm.attr("aria-labelledby", this._oCalculationBuilderItemText.getId());
+		oRm.attr("aria-describedby", this._oArrowNavigtionInvisibleText.getId());
 		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 + ">";
 		this._innerRender(oRm);
 		oRm.close("div");
 	};
@@ -265,6 +279,11 @@ sap.ui.define([
 	CalculationBuilderItem.prototype.init = function () {
 		// Indicates whether the item is NewItem
 		this._bIsNew = false;
+		if (!this._oArrowNavigtionInvisibleText) {
+			this._oArrowNavigtionInvisibleText = new InvisibleText();
+			this._oArrowNavigtionInvisibleText.toStatic();
+			this._oArrowNavigtionInvisibleText.setText(oResourceBundle.getText("CALCULATION_BUILDER_NAVIGATION"));
+		}
 	};
 
 	CalculationBuilderItem.prototype.onBeforeRendering = function () {

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.141.0
+	 * @version 1.142.1
 	 * @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.141.0
+	 * @version 1.142.1
 	 * @since 1.56.0
 	 *
 	 * @constructor

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

@@ -33,7 +33,8 @@ sap.ui.define([
 	"sap/m/OverflowToolbar",
 	"sap/m/ToolbarSpacer",
 	"sap/m/Title",
-	"sap/m/table/columnmenu/ActionItem",
+	"sap/m/table/columnmenu/QuickSort",
+	"sap/m/table/columnmenu/QuickSortItem",
 	"sap/m/table/columnmenu/Menu",
 	"sap/ui/core/CustomData",
 	"sap/ui/model/Sorter",
@@ -77,8 +78,9 @@ sap.ui.define([
 	OverflowToolbar,
 	ToolbarSpacer,
 	Title,
-	ActionItem,
-	Columnmenu,
+	QuickSort,
+	QuickSortItem,
+	ColumnMenu,
 	CustomData,
 	Sorter,
 	SearchField,
@@ -118,7 +120,7 @@ sap.ui.define([
 	 * @class
 	 * @public
 	 * @internal
-	 * @version 1.141.0
+	 * @version 1.142.1
 	*/
 	var CloudFilePicker = Dialog.extend("sap.suite.ui.commons.CloudFilePicker", {
 		metadata: {
@@ -707,23 +709,19 @@ sap.ui.define([
 			if (sColumnType === "CreatedByUser" || sColumnType === "FileShareItemContentSize" || sColumnType === "FileShareItemContentType") {
 				return;
 			}
-			var oColumnMenu = new Columnmenu({
-				items: [
-					new ActionItem({
-						icon: "sap-icon://sort-ascending",
-						press: function() {
-							this._fHandleSorting(oColumn, true);
-						}.bind(this)
-					}),
-					new ActionItem({
-						icon: "sap-icon://sort-descending",
-						press: function() {
-							this._fHandleSorting(oColumn, false);
+			var oColumnMenu = new ColumnMenu({
+				quickActions: [
+					new QuickSort({
+						items: new QuickSortItem({key: sColumnType, label: oColumn.getHeader().getText()}),
+						change: function(oEvent) {
+							const sSortOrder = oEvent.getParameter("item").getSortOrder();
+							this._fHandleSorting(oColumn, sSortOrder);
 						}.bind(this)
 					})
 				]
 			});
 
+			oColumnMenu.getQuickActions()[0].getItems()[0].setSortOrder(oColumn.getSortIndicator());
 			oColumnMenu.openBy(oColumn);
 		}.bind(this));
 
@@ -962,16 +960,18 @@ sap.ui.define([
 		oApproveDialog.open();
 	};
 
-	CloudFilePicker.prototype._fHandleSorting = function(oColumn, bIsAsc) {
+	CloudFilePicker.prototype._fHandleSorting = function(oColumn, sSortOrder) {
 		this._clearCheckboxFileSelections();
-		var sNewSort = bIsAsc ? SortOrder.Ascending : SortOrder.Descending;
-		if (sNewSort === oColumn.getSortIndicator()) {
-			sNewSort = SortOrder.None;
+		var bIsAsc = false
+		if (sSortOrder === SortOrder.Ascending) {
+			bIsAsc = true;
+		} else if (sSortOrder === SortOrder.Descending) {
+			bIsAsc = false;
 		}
 		this.oTableControl.getColumns().forEach(function(oColumn){
 			oColumn.setSortIndicator("None");
 		});
-		oColumn.setSortIndicator(sNewSort);
+		oColumn.setSortIndicator(sSortOrder);
 		var sSortProperty = oColumn.data("bindingProperty");
 		var oItemBinding = this.oTableControl.getBinding("items");
 		oItemBinding.sort([

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.141.0
+	 * @version 1.142.1
 	 *
 	 * @constructor
 	 * @public
@@ -107,7 +107,7 @@ sap.ui.define([
 
 			oRM.openStart("div", oMicroProcessFlow);
 
-			oRM.attr("role", "listbox");
+			oRM.attr("role", "list");
 			oRM.attr("aria-roledescription", oResourceBundle.getText("ACC_CTR_TYPE_MICRO_PROCESS_FLOW"));
 			oRM.attr("aria-label",sLabel);
 

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.141.0
+	 * @version 1.142.1
 	 *
 	 * @constructor
 	 * @public
@@ -202,9 +202,12 @@ sap.ui.define([
 				oRM.attr("tabindex", "0");
 				oRM.class("sapSuiteUiCommonsMicroProcessFlowItem").class("sapSuiteUiCommonsMicroProcessFlowItem" + oMicroProcessFlowItem.getState());
 				oRM.attr("aria-label", oMicroProcessFlowItem._getAriaText());
-				oRM.attr("role", "option");
-				oRM.attr("aria-roledescription", `${oMicroProcessFlowItem._iIndex} of ${oMicroProcessFlowItem._iItemsCount}`);
-				oRM.attr("aria-selected", "false");
+				if (oMicroProcessFlowItem.hasListeners("press")) {
+					oRM.attr("role", "button");
+					oRM.attr("aria-roledescription", oResourceBundle.getText("MICRO_PROCESS_FLOW_ITEM_ACC_BUTTON",[oMicroProcessFlowItem._iIndex,oMicroProcessFlowItem._iItemsCount]));
+				} else {
+					oRM.attr("role", "listitem");
+				}
 				oRM.openEnd();
 
 				if (sIcon) {
@@ -242,7 +245,6 @@ sap.ui.define([
 			$item.attr("tabindex", 0);
 		}
 		$item.attr("aria-label", sAriaLabel);
-		$item.attr("role", "option");
 		$item.attr("aria-posinset", this._iIndex);
 		$item.attr("aria-setsize", this._iItemsCount);
 		this._setItemContentAccessibility();
@@ -262,8 +264,6 @@ sap.ui.define([
 
 		if (bHasPressEvent) {
 			$item.css("cursor", "pointer");
-			$item.attr("role", "button");
-			$item.attr("aria-hidden", "true");
 		}
 	};
 
@@ -355,11 +355,9 @@ sap.ui.define([
 		var selectedItem = document.getElementsByClassName('sapSuiteMicroProcessFlowItemSelected')[0];
 		var item = this._getAccessibleItem()[0];
 		if (selectedItem) {
-			selectedItem.setAttribute("aria-selected", false);
 			selectedItem.classList.remove("sapSuiteMicroProcessFlowItemSelected");
 		}
 		if (item.tabIndex == "0") {
-			item.setAttribute("aria-selected", true);
 			item.classList.add("sapSuiteMicroProcessFlowItemSelected");
 		}
 	};

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

@@ -33,9 +33,10 @@ sap.ui.define([
 	"sap/ui/core/Configuration",
 	"./TimelineRenderer",
 	"sap/ui/core/Lib",
-	"sap/base/i18n/Localization"
+	"sap/base/i18n/Localization",
+	"sap/base/util/deepEqual"
 ], function (jQuery, library, Control, ResizeHandler, DateFormat, ClientListBinding, FilterType, TimelineNavigator, DateUtils, ManagedObjectRegister,
-	JSONModel, Sorter, Filter, FilterOperator, ManagedObject, TimelineItem, TimelineRenderManager, ScrollEnablement, BaseObject, assert, Log, UI5Date, Configuration, TimelineRenderer, CoreLib, Localization) {
+	JSONModel, Sorter, Filter, FilterOperator, ManagedObject, TimelineItem, TimelineRenderManager, ScrollEnablement, BaseObject, assert, Log, UI5Date, Configuration, TimelineRenderer, CoreLib, Localization, deepEqual) {
 	"use strict";
 
 	var ScrollingFadeout = library.TimelineScrollingFadeout,
@@ -1183,7 +1184,7 @@ sap.ui.define([
 			aCurrentFilters = [];
 		if (oBinding) {
 			if (!bResetAll) {
-				aFilters = oBinding.aFilters.length != 0 ? [...oBinding.aFilters] : this.aPrevFilters || [];
+				aFilters = oBinding.aFilters.length != 0 ? [...oBinding.aFilters] : this.aPrevFilters.map(val => val) || [];
 			}
 
 			if (this._dataFilter) {
@@ -1214,6 +1215,10 @@ sap.ui.define([
 				aFilters.push(this._filter);
 			}
 			if (aFilters.length) {
+				if(deepEqual(aFilters, this.aPrevFilters)){
+					this._setBusy(false);
+					return;
+				}
 				this.aPrevFilters = aFilters.map(function (val) { return val; });
 				oBinding.filter(aFilters, FilterType.Control);
 			} else {
@@ -1603,16 +1608,16 @@ sap.ui.define([
 	 */
 	Timeline.prototype._clearFilter = function () {
 		var fnClearTimeRangeFilter = function () {
-			var bExecuteDefault,
-				oSlider = this._objects.getTimeRangeSlider();
+			var oSlider = this._objects.getTimeRangeSlider();
 			this._startDate = null;
 			this._endDate = null;
 			this._rangeMessage = null;
 
 			oSlider.setRange([oSlider.getMin(), oSlider.getMax()]);
 
+			// Fire event but don't let it prevent filter clearing
 			if (this._useModelFilter()) {
-				bExecuteDefault = this._fireSelectionChange({
+				this._fireSelectionChange({
 					clear: true,
 					timeKeys: {
 						from: null,
@@ -1621,40 +1626,33 @@ sap.ui.define([
 					type: TimelineFilterType.Range
 				});
 			}
-			return bExecuteDefault;
+			return true;  // Always return true to ensure filter clearing
 		}.bind(this),
 			fnClearDataFilter = function () {
-				var bExecuteDefault;
 
 				this._currentFilterKeys = [];
 				if (this._useModelFilter()) {
-					bExecuteDefault = this._fireSelectionChange({
+					this._fireSelectionChange({
 						clear: true,
 						selectedItems: [],
 						selectedItem: "",
 						type: TimelineFilterType.Data
 					});
 				}
-				return bExecuteDefault;
+				return true;  // Always return true to ensure filter clearing
 			}.bind(this);
 
-		var bDataDefault = fnClearDataFilter(),
-			bRangeDefault = fnClearTimeRangeFilter();
+			// Execute both clear functions
+			fnClearDataFilter(),
+			fnClearTimeRangeFilter();
 
-		// clear custom filter
-		this._customFilterMessage = "";
-		if (bDataDefault || bRangeDefault) {
-			if (bDataDefault) {
+				// Always clear filters regardless of event handling
+				this._customFilterMessage = "";
 				this._dataFilter = null;
-			}
-
-			if (bRangeDefault) {
 				this._rangeDataFilter = null;
-			}
-			this.recreateFilter(true /*force clear custom filters*/);
-		} else {
-			this.invalidate();
-		}
+
+			/*force clear custom filters*/
+			this.recreateFilter(true);
 
 		//reset filter
 		// this is a bit overkill but we are so far unable to reset filter to it's init state without some filter's internal errors

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

@@ -366,7 +366,6 @@ sap.ui.define([
 			eTimelineItem.setAttribute("aria-level", 2);
 		}
 		eTimelineItem.addClass("sapSuiteUiCommonsTimelineItem");
-		eTimelineItem.setAttribute("aria-labelledby", oTimelineItem.getAriaLabelledBy().join(" "), true);
 
 		if (oTimelineItem._isLast) {
 			eTimelineItem.addClass("sapSuiteUiCommonsTimelineLastItem");
@@ -476,6 +475,7 @@ sap.ui.define([
 		eShellItem.addChild(oTimelineItem._objects.getInfoBar());
 		eShellItem.addChild(eHeaderWrapper);
 
+		eHeaderWrapper.setId(oTimelineItem.getId() + "-headerWrapper");
 		eHeaderWrapper.addClass("sapSuiteUiCommonsTimelineItemHeaderWrapper");
 
 		oUserPicture = oTimelineItem._getUserPictureControl();
@@ -511,7 +511,7 @@ sap.ui.define([
 		eDateTime.addChildEscaped(this._getFormatedDateTime(oTimelineItem));
 		eDateTime.setAttribute("aria-label", sAriaLabelForDateTime, false);
 		eHeader.addChild(eDateTime);
-
+		eBody.setId(oTimelineItem.getId() + "-shellbody");
 		eBody.addClass("sapSuiteUiCommonsTimelineItemShellBody");
 		eShellItem.addChild(eBody);
 
@@ -598,6 +598,16 @@ sap.ui.define([
 				}
 			}
 			eTimelineItem.setAttribute("aria-label", sGroupHeader, false);
+		} else {
+			const aAriaLabelledByIds = [oTimelineItem.getId() + "-headerWrapper"];
+			if (!oTimelineItem.getEmbeddedControl()) {
+				aAriaLabelledByIds.push(oTimelineItem.getId() + "-shellbody");
+			}
+			var aLabelledBy = [...aAriaLabelledByIds, ...oTimelineItem.getAriaLabelledBy()];
+			if (oTimelineItem._objects && oTimelineItem._objects.getLineIcon) {
+				aLabelledBy.push(oTimelineItem._objects.getLineIcon().getId());
+			}
+			eTimelineItem.setAttribute("aria-labelledby", aLabelledBy.join(" "));
 		}
 	};
 

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

@@ -61,8 +61,24 @@ sap.ui.define([
 			return oServicePromise;
 		}
 		if (UshellContainer && UshellContainer.inAppRuntime()) {
-			oProviderConfiguration = await CollaborationMessageConsumer.getProviderConfiguration();
-		}
+			try {
+                let isProviderConfigurationSet = false;
+                try {
+					if (window.location.host === top.window.location.host) {
+                        oProviderConfiguration = {};
+                        isProviderConfigurationSet = true;
+                    }
+                } catch (error) {
+                    oLogger.info("Cannot access parent window");
+                }
+                if (!isProviderConfigurationSet) {
+                    oProviderConfiguration = await CollaborationMessageConsumer.getProviderConfiguration();
+                }
+            } catch (error) {
+                oLogger.error("Error while getting the provider configuration from the parent window", error);
+				oProviderConfiguration = {};
+            }
+        }
 		return fnGetCollaborationType();
 	};