@openui5/sap.m 1.120.7 → 1.121.0

package/src/sap/m/upload/UploadSet.js

@@ -6,6 +6,7 @@
 
 sap.ui.define([
 	"sap/ui/core/Control",
+	"sap/ui/core/Element",
 	"sap/ui/events/KeyCodes",
 	"sap/base/Log",
 	"sap/base/util/deepEqual",
@@ -25,7 +26,6 @@ sap.ui.define([
 	"sap/m/upload/UploaderHttpRequestMethod",
 	"sap/ui/core/dnd/DragDropInfo",
 	"sap/ui/core/dnd/DropInfo",
-	"sap/m/library",
 	"sap/m/upload/UploadSetToolbarPlaceholder",
 	"sap/m/IllustratedMessage",
 	"sap/m/IllustratedMessageType",
@@ -36,13 +36,11 @@ sap.ui.define([
 	"sap/m/MenuItem",
 	"sap/m/MenuButton",
 	"sap/ui/core/Lib"
-], function (Control, KeyCodes, Log, deepEqual, MobileLibrary, Button, Dialog, List, MessageBox, OverflowToolbar,
-			 StandardListItem, Text, ToolbarSpacer, FileUploader, UploadSetItem, Uploader, Renderer, UploaderHttpRequestMethod,
-			DragDropInfo, DropInfo, Library, UploadSetToolbarPlaceholder, IllustratedMessage,IllustratedMessageType,
-			IllustratedMessageSize, Core, InvisibleText, Menu, MenuItem, MenuButton, CoreLib) {
+], function(Control, Element, KeyCodes, Log, deepEqual, MobileLibrary, Button, Dialog, List, MessageBox, OverflowToolbar, StandardListItem, Text, ToolbarSpacer, FileUploader, UploadSetItem, Uploader, Renderer, UploaderHttpRequestMethod, DragDropInfo, DropInfo, UploadSetToolbarPlaceholder, IllustratedMessage, IllustratedMessageType, IllustratedMessageSize, Core, InvisibleText, Menu, MenuItem, MenuButton, CoreLib) {
 	"use strict";
 
-	var UploadType = Library.UploadType;
+	var UploadType = MobileLibrary.UploadType;
+	var MenuButtonMode = MobileLibrary.MenuButtonMode;
 
 	/**
 	 * Constructor for a new UploadSet.
@@ -55,7 +53,7 @@ sap.ui.define([
 	 * and requests, unified behavior of instant and deferred uploads, as well as improved progress indication.
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 * @constructor
 	 * @public
 	 * @since 1.63
@@ -88,17 +86,20 @@ sap.ui.define([
 				mediaTypes: {type: "string[]", defaultValue: null},
 				/**
 				 * Defines custom text for the 'No data' text label.
+				 * @deprecated Since version 1.121. Use illustratedMessage instead.
 				 */
-				noDataText: {type: "string", defaultValue: null},
+				noDataText: { type: "string", defaultValue: null, deprecated: true },
 				/**
 				 * Defines custom text for the 'No data' description label.
+				 * @deprecated Since version 1.121. Use illustratedMessage instead.
 				 */
-				noDataDescription: {type: "string", defaultValue: null},
+				noDataDescription: { type: "string", defaultValue: null, deprecated: true },
 				/**
 				 * Determines which illustration type is displayed when the control holds no data.
+				 * @deprecated Since version 1.121. Use illustratedMessage instead.
 				 * @since 1.117
 				 */
-				noDataIllustrationType: {type: "sap.m.IllustratedMessageType", group: "Appearance", defaultValue: IllustratedMessageType.NoData},
+				noDataIllustrationType: { type: "sap.m.IllustratedMessageType", group: "Appearance", defaultValue: IllustratedMessageType.NoData, deprecated: true },
 				/**
 				 * Defines custom text for the drag and drop text label.
 				 */
@@ -157,7 +158,7 @@ sap.ui.define([
 				 * In addition, if instant upload is set to false the mode sap.m.ListMode.MultiSelect is not supported and will be automatically set to sap.m.ListMode.None.
 				 * @since 1.100.0
 				 */
-				mode: {type: "sap.m.ListMode", group: "Behavior", defaultValue: Library.ListMode.MultiSelect},
+				mode: {type: "sap.m.ListMode", group: "Behavior", defaultValue: MobileLibrary.ListMode.MultiSelect},
 				/**
 				  * Enables CloudFile picker feature to upload files from cloud.
 				  * @experimental Since 1.106.
@@ -203,9 +204,9 @@ sap.ui.define([
 				uploader: {type: "sap.m.upload.Uploader", multiple: false},
 				/**
 			 	 * An illustrated message is displayed when no data is loaded or provided
-				 * @private
+				 * @since 1.121
 				 */
-				 _illustratedMessage: { type: "sap.m.IllustratedMessage", multiple: false, visibility: "hidden" }
+				illustratedMessage: { type: "sap.m.IllustratedMessage", multiple: false }
 			},
 			events: {
 				/**
@@ -516,6 +517,7 @@ sap.ui.define([
 		this._mListItemIdToItemMap = {};
 		this._oUploadButton = null;
 		this._oDragIndicator = false;
+		this._initialIllustrationClone = true;
 
 		// Drag&drop
 		this._$Body = null;
@@ -528,15 +530,17 @@ sap.ui.define([
 		//Setting invisible text
 		this._oInvisibleText = new InvisibleText();
 		this._oInvisibleText.toStatic();
-		var oIllustratedMessage = new IllustratedMessage({
-				illustrationType: this.getNoDataIllustrationType(),
+		this._oIllustratedMessage = this.getAggregation("illustratedMessage");
+		if (!this._oIllustratedMessage) {
+			this._oIllustratedMessage = new IllustratedMessage({
+				illustrationType: IllustratedMessageType.NoData,
 				illustrationSize: IllustratedMessageSize.Auto,
-				title: this.getNoDataText(),
-				description: this.getNoDataDescription()
+				title: this._oRb.getText("UPLOAD_SET_NO_DATA_TEXT"),
+				description: this._oRb.getText("UPLOADCOLLECTION_NO_DATA_DESCRIPTION")
 			});
-
-		this.setAggregation("_illustratedMessage", oIllustratedMessage);
-		oIllustratedMessage.addIllustrationAriaLabelledBy(this._oInvisibleText.getId());
+		}
+		this._oIllustratedMessage.addIllustrationAriaLabelledBy(this._oInvisibleText.getId());
+		this.setAggregation("illustratedMessage", this._oIllustratedMessage);
 		this._oInvisibleText.setText(this._oRb.getText("UPLOAD_SET_ILLUSTRATED_MESSAGE"));
 		this._cloudFilePickerControl = null;
 		this._oListEventDelegate = null;
@@ -560,6 +564,14 @@ sap.ui.define([
 			this._oUploader.destroy();
 			this._oUploader = null;
 		}
+		if (this._oIllustratedMessage) {
+			this._oIllustratedMessage.destroy();
+			this._oIllustratedMessage = null;
+		}
+		if (this._oIllustratedMessageClone) {
+			this._oIllustratedMessageClone.destroy();
+			this._oIllustratedMessageClone = null;
+		}
 	};
 
 	/* ===================== */
@@ -574,6 +586,10 @@ sap.ui.define([
 		this._aGroupHeadersAdded = [];
 		this._clearGroupHeaders();
 		this._fillListWithUploadSetItems(this.getItems());
+		if (this._initialIllustrationClone) {
+			this._oIllustratedMessageClone = this.getAggregation("illustratedMessage").clone();
+			this._initialIllustrationClone = false;
+		}
 	};
 
 	UploadSet.prototype.onAfterRendering = function () {
@@ -623,24 +639,24 @@ sap.ui.define([
 	 * @private
 	 */
 	UploadSet.prototype._handleClick = function (oEvent, item) {
-        var $Button = oEvent.target.closest("button");
-        var sId = "";
-        if ($Button) {
-            sId = $Button.id;
-        }
-        if (sId.lastIndexOf("editButton") === -1) {
-            if (sId.lastIndexOf("cancelButton") !== -1) {
+		var $Button = oEvent.target.closest("button");
+		var sId = "";
+		if ($Button) {
+			sId = $Button.id;
+		}
+		if (sId.lastIndexOf("editButton") === -1) {
+			if (sId.lastIndexOf("cancelButton") !== -1) {
 				if (item) {
 					this._handleItemEditCancelation(oEvent, item);
 				}
-            } else if (oEvent.target.id.lastIndexOf("thumbnail") < 0 && oEvent.target.id.lastIndexOf("icon") < 0 &&
-                oEvent.target.id.lastIndexOf("deleteButton") < 0 && oEvent.target.id.lastIndexOf("fileNameEdit-inner") < 0) {
-                if (item) {
+			} else if (oEvent.target.id.lastIndexOf("thumbnail") < 0 && oEvent.target.id.lastIndexOf("icon") < 0 &&
+				oEvent.target.id.lastIndexOf("deleteButton") < 0 && oEvent.target.id.lastIndexOf("fileNameEdit-inner") < 0) {
+				if (item) {
 					this._handleItemEditConfirmation(oEvent, item);
 				}
-            }
-        }
-    };
+			}
+		}
+	};
 
 	UploadSet.prototype.onkeydown = function (oEvent) {
 		var oListItem,
@@ -650,7 +666,7 @@ sap.ui.define([
 		if (this._oEditedItem && this._oEditedItem._getFileNameEdit().$("inner")[0] === oEvent.target) {
 			oItem = this._oEditedItem;
 		} else if (oEvent.target) {
-			oListItem = Core.byId(oEvent.target.id);
+			oListItem = Element.getElementById(oEvent.target.id);
 			if (oListItem) {
 				oItem = this._mListItemIdToItemMap[oListItem.getId()];
 			}
@@ -749,7 +765,7 @@ sap.ui.define([
 	// Functions returns sNoDataText which is combination of Title and Description from the IllustratedMessage
 	UploadSet.prototype._setListNoDataText = function (sText, bIsDescription) {
 		var sNoDataText = "";
-		var oIllustratedMessage = this.getAggregation("_illustratedMessage");
+		var oIllustratedMessage = this.getAggregation("illustratedMessage");
 		if (!sText) {
 			sNoDataText = oIllustratedMessage.getTitle() + " " + oIllustratedMessage.getDescription();
 		} else if (sText) {
@@ -816,9 +832,9 @@ sap.ui.define([
 	};
 
 	UploadSet.prototype.removeAggregation = function (sAggregationName, oObject, bSuppressInvalidate) {
-        var oListItem,oItems;
-        Control.prototype.removeAggregation.call(this, sAggregationName, oObject, bSuppressInvalidate);
-        if (sAggregationName === "items" || sAggregationName === "incompleteItems") {
+		var oListItem,oItems;
+		Control.prototype.removeAggregation.call(this, sAggregationName, oObject, bSuppressInvalidate);
+		if (sAggregationName === "items" || sAggregationName === "incompleteItems") {
 			if (typeof oObject === 'number') { // "oObject" is the index now
 				oItems = this.getItems();
 				oListItem = oItems[oObject];
@@ -828,14 +844,14 @@ sap.ui.define([
 					oListItem = oObject.isDestroyStarted() ? oObject : oObject._getListItem();
 				}
 			}
-            var oItem = this.getList().removeAggregation("items", oListItem, bSuppressInvalidate);
-            if (oItem && oObject) {
-                oItem.destroy();
+			var oItem = this.getList().removeAggregation("items", oListItem, bSuppressInvalidate);
+			if (oItem && oObject) {
+				oItem.destroy();
 				oObject.destroy();
-            }
-            this._refreshInnerListStyle();
-        }
-    };
+			}
+			this._refreshInnerListStyle();
+		}
+	};
 
 	UploadSet.prototype.removeAllAggregation = function (sAggregationName, bSuppressInvalidate) {
 		if (sAggregationName === "items") {
@@ -969,11 +985,11 @@ sap.ui.define([
 	};
 
 	UploadSet.prototype.setMode = function(sMode) {
-		if (sMode === Library.ListMode.Delete) {
-			this.setProperty("mode", Library.ListMode.None);
+		if (sMode === MobileLibrary.ListMode.Delete) {
+			this.setProperty("mode", MobileLibrary.ListMode.None);
 			Log.info("sap.m.ListMode.Delete is not supported by UploadSet. Value has been resetted to 'None'");
-		} else if (sMode === Library.ListMode.MultiSelect && !this.getInstantUpload()) {
-			this.setProperty("mode", Library.ListMode.None);
+		} else if (sMode === MobileLibrary.ListMode.MultiSelect && !this.getInstantUpload()) {
+			this.setProperty("mode", MobileLibrary.ListMode.None);
 			Log.info("sap.m.ListMode.MultiSelect is not supported by UploadSet for Pending Upload. Value has been reset to 'None'");
 		} else {
 			this.setProperty("mode", sMode);
@@ -985,7 +1001,7 @@ sap.ui.define([
 	};
 
 	UploadSet.prototype._getIllustratedMessage = function () {
-		var oAggregation = this.getAggregation("_illustratedMessage");
+		var oAggregation = this.getAggregation("illustratedMessage");
 		// Invoke rendering of illustrated message only when the list is empty else no scope of illustrated message.
 		if (oAggregation && this._oList && this._oList.getItems && !this._oList.getItems().length) {
 			if (this._getDragIndicator()) {
@@ -994,10 +1010,23 @@ sap.ui.define([
 				oAggregation.setDescription(this.getDragDropDescription());
 				oAggregation.removeAllAdditionalContent();
 			} else {
-				oAggregation.setIllustrationType(this.getNoDataIllustrationType());
-				oAggregation.setTitle(this.getNoDataText());
-				oAggregation.setDescription(this.getNoDataDescription());
-				oAggregation.addAdditionalContent(this.getUploadButtonForIllustratedMessage());
+				oAggregation.setIllustrationType(this._oIllustratedMessageClone.getIllustrationType());
+				if (this._oIllustratedMessageClone.getTitle()) {
+					oAggregation.setTitle(this._oIllustratedMessageClone.getTitle());
+				} else {
+					oAggregation.setTitle(this._oRb.getText("UPLOAD_SET_NO_DATA_TEXT"));
+				}
+				if (this._oIllustratedMessageClone.getDescription()) {
+					oAggregation.setDescription(this._oIllustratedMessageClone.getDescription());
+				} else {
+					oAggregation.setDescription(this._oRb.getText("UPLOADCOLLECTION_NO_DATA_DESCRIPTION"));
+				}
+				if (this._oIllustratedMessageClone.getAdditionalContent().length) {
+					oAggregation.removeAllAdditionalContent();
+					oAggregation.addAdditionalContent(new Button(this._oIllustratedMessageClone.getAdditionalContent()[0].mProperties));
+				} else {
+					oAggregation.addAdditionalContent(this.getUploadButtonForIllustratedMessage());
+				}
 			}
 		}
 		return oAggregation;
@@ -1005,7 +1034,7 @@ sap.ui.define([
 
 	UploadSet.prototype.getUploadButtonForIllustratedMessage = function () {
 		if (!this._oUploadButton) {
-			var oAccIds = this.getAggregation("_illustratedMessage").getAccessibilityReferences();
+			var oAccIds = this.getAggregation("illustratedMessage").getAccessibilityReferences();
 			var sTitleId = oAccIds.title;
 			var sDescriptionId = oAccIds.description;
 			this._oUploadButton = new Button({
@@ -1085,7 +1114,7 @@ sap.ui.define([
 		var oDragSession = oEvent.getParameter("dragSession");
 		var oDraggedControl = oDragSession.getDragControl();
 		this._oDragIndicator = true;
-    this._getIllustratedMessage();
+	this._getIllustratedMessage();
 		if (oDraggedControl) {
 			oEvent.preventDefault();
 		}
@@ -1444,7 +1473,7 @@ sap.ui.define([
 	/**
 	 * Edited item confirmation handling.
 	 * @param {object} oEvent Event instance.
-	 * @param {UploadSetItem} oItem Item whose editing is to be confirmed.
+	 * @param {sap.m.upload.UploadSetItem} oItem Item whose editing is to be confirmed.
 	 * @private
 	 */
 	UploadSet.prototype._handleItemEditConfirmation = function (oEvent, oItem) {
@@ -1507,7 +1536,7 @@ sap.ui.define([
 	 * Edited item cancelation handling.
 	 *
 	 * @param {object} oEvent Event instance.
-	 * @param {UploadSetItem} oItem Item whose editing is to be canceled.
+	 * @param {sap.m.upload.UploadSetItem} oItem Item whose editing is to be canceled.
 	 * @private
 	 */
 	UploadSet.prototype._handleItemEditCancelation = function (oEvent, oItem) {
@@ -1758,6 +1787,7 @@ sap.ui.define([
 		} else {
 			this.getList().addAggregation("items", oListItem, true);
 		}
+		oItem.attachEvent("selected", this._handleItemSetSelected, this); // capturing selected event to set selected status to CustomListItem
 		this._checkRestrictionsForItem(oItem);
 	};
 
@@ -1871,7 +1901,7 @@ sap.ui.define([
 	 */
 	 UploadSet.prototype._setSelectedForItems = function(uploadSetItemsToUpdate, selected) {
 		//Reset all 'selected' values in UploadSetItems
-		if (this.getMode() !== Library.ListMode.MultiSelect && selected) {
+		if (this.getMode() !== MobileLibrary.ListMode.MultiSelect && selected) {
 			var aUploadSetItems = this.getItems();
 			for (var j = 0; j < aUploadSetItems.length; j++) {
 				aUploadSetItems[j].setSelected(false);
@@ -2015,7 +2045,7 @@ sap.ui.define([
 		if (this.getCloudFilePickerEnabled()) {
 			this._oMenuButton = new MenuButton({
 				text: this._oRb.getText("UPLOAD_SET_DEFAULT_LFP_BUTTON_TEXT"),
-				buttonMode: sap.m.MenuButtonMode.Split,
+				buttonMode: MenuButtonMode.Split,
 				menu: this._getMenuButtonItems(),
 				defaultAction: this._openFileUploaderPicker.bind(this)
 			});
@@ -2188,9 +2218,40 @@ sap.ui.define([
 		// getDropControl returns the valid drop target underneath the drop control, if no dropcontrol available UploadSet control to reset the illustrated message
 		if (!oDragSession || !oDragSession.getDropControl() || (oDragSession && !oEvent.relatedTarget)) {
 			this._oDragIndicator = false;
-      this._getIllustratedMessage();
+	  this._getIllustratedMessage();
+		}
+	};
+
+	/**
+	 * Handles the selected event of UploadSetItem.
+	 * Used to synchronize the internal list with the given item. The ListItem has to be set to selected value too.
+	 * Otherwise the internal sap.m.List and the UploadSetItem aggregation are not in sync.
+	 * @param {sap.ui.base.Event} event The SAPUI5 event object
+	 * @private
+	 */
+	UploadSet.prototype._handleItemSetSelected = function(event) {
+		var oItem = event.getSource();
+		if (oItem instanceof UploadSetItem) {
+			var oListItem = this._getListItemById(oItem.getId() + "-listItem");
+			if (oListItem) {
+				oListItem.setSelected(oItem.getSelected());
+			}
 		}
 	};
 
+	/**
+	 * Returns a CustomListItem instance rendered in the list using the id.
+	 * @param {string} sID id of the Custom List item to be queried.
+	 * @returns {sap.m.CustomListItem} The matching CustomList Item.
+	 * @private
+	 */
+	UploadSet.prototype._getListItemById = function(sID) {
+		const aListItems = this.getList()?.getItems();
+		if (aListItems && aListItems.length && sID) {
+			return aListItems.find((oListItem) => oListItem?.getId() === sID);
+		}
+		return null;
+	};
+
 	return UploadSet;
 });

package/src/sap/m/upload/UploadSetItem.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @class Item that represents one file to be uploaded using the {@link sap.m.upload.UploadSet} control.
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 * @constructor
 	 * @public
 	 * @since 1.63
@@ -203,7 +203,6 @@ sap.ui.define([
 				oItem._renderAttributes(oRm);
 				oItem._renderStatuses(oRm);
 				oRm.close("div");
-				oItem._renderStateAndProgress(oRm);
 				oItem._renderButtons(oRm);
 			}
 		}
@@ -530,8 +529,10 @@ sap.ui.define([
 			this._oListItem = new CustomListItem(this.getId() + "-listItem", {
 				content: [
 					this._getIcon(),
-					this._getDynamicContent()
-				]
+					this._getDynamicContent(),
+					this._getProgressBox()
+				],
+				selected: this.getSelected() // mapping UploadSetItem's property selected to customList item selected.
 			});
 			this._oListItem.addStyleClass("sapMUCItem");
 			this._oListItem.setTooltip(this.getTooltip_Text());
@@ -911,7 +912,7 @@ sap.ui.define([
 		if (!this._oStateLabel) {
 			this._oStateLabel = new Label({
 				id: this.getId() + "-stateLabel",
-				text: "Pending", // TODO: All states and localization
+				text: "Uploading", // TODO: All states and localization
 				visible: this.getUploadState() !== UploadState.Complete
 			});
 		}
@@ -1010,7 +1011,7 @@ sap.ui.define([
 
 		// Render div container only if there is at least one button
 		if (aButtonsToRender.length > 0) {
-			oRm.openStart("div").class("sapMUCButtonContainer").openEnd();
+			oRm.openStart("div").class("sapMUSButtonContainer").openEnd();
 			aButtonsToRender.forEach(function (oBtn, iIndex) {
 				if (iIndex < (aButtonsToRender.length)) {
 					oBtn.addStyleClass("sapMUCFirstButton");
@@ -1139,7 +1140,30 @@ sap.ui.define([
 			this._oFileNameLink.destroy();
 			this._oFileNameLink = null;
 		}
-		this._oDynamicContent = null;
+		if (this._oProgressBox) {
+			this._oProgressBox.destroy();
+			this.removeDependent(this._oProgressBox);
+			this._oProgressBox = null;
+		}
+		if (this._oProgressIndicator) {
+			this._oProgressIndicator.destroy();
+			this.removeDependent(this._oProgressIndicator);
+			this._oProgressIndicator = null;
+		}
+		if (this._oStateLabel) {
+			this._oStateLabel.destroy();
+			this.removeDependent(this._oStateLabel);
+			this._oStateLabel = null;
+		}
+		if (this._oProgressLabel) {
+			this._oProgressLabel.destroy();
+			this.removeDependent(this._oProgressLabel);
+			this._oProgressLabel = null;
+		}
+		if (this._oDynamicContent) {
+			this._oDynamicContent.destroy();
+			this._oDynamicContent = null;
+		}
 	};
 
 	return UploadSetItem;

package/src/sap/m/upload/UploadSetToolbarPlaceholder.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/upload/UploadSetwithTable.js

@@ -9,6 +9,7 @@ sap.ui.define([
 	"sap/m/Table",
 	"sap/m/ToolbarSpacer",
 	"sap/m/upload/UploadSetwithTableRenderer",
+	"sap/ui/core/Lib",
 	"sap/ui/unified/FileUploader",
 	"sap/m/upload/UploaderHttpRequestMethod",
 	"sap/m/OverflowToolbar",
@@ -41,11 +42,11 @@ sap.ui.define([
 	"sap/m/MenuButton",
 	"sap/m/MenuItem",
 	"sap/m/Menu"
-	], function (Table, ToolbarSpacer, UploadSetwithTableRenderer, FileUploader, UploaderHttpRequestMethod, OverFlowToolbar, UploadSetwithTableItem, deepEqual, Log, Library, IllustratedMessageType,
-	IllustratedMessage, IllustratedMessageSize, Uploader, DragDropInfo, DropInfo, FilePreviewDialog, EventBase, Dialog, Label, Input, MessageBox, Button, Core, VariantManagement, PersManager,
-	ColumnsMediator, SortMediator, GroupMediator, FilterMediator, View, Element, MenuButton, MenuItem, Menu) {
+], function(Table, ToolbarSpacer, UploadSetwithTableRenderer, Library1, FileUploader, UploaderHttpRequestMethod, OverFlowToolbar, UploadSetwithTableItem, deepEqual, Log, Library, IllustratedMessageType, IllustratedMessage, IllustratedMessageSize, Uploader, DragDropInfo, DropInfo, FilePreviewDialog, EventBase, Dialog, Label, Input, MessageBox, Button, Core, VariantManagement, PersManager, ColumnsMediator, SortMediator, GroupMediator, FilterMediator, View, Element, MenuButton, MenuItem, Menu) {
 	"use strict";
 
+	var MenuButtonMode = Library.MenuButtonMode;
+
 	/**
 	 * Constructor for a new UploadSetwithTable.
 	 *
@@ -63,7 +64,7 @@ sap.ui.define([
 	 * @public
 	 * @experimental since 1.120
 	 * @since 1.120
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 * @alias sap.m.upload.UploadSetwithTable
 	 */
 	var UploadSetwithTable = Table.extend("sap.m.upload.UploadSetwithTable", {
@@ -401,7 +402,7 @@ sap.ui.define([
 		this._setDragDropConfig();
 		this._filesTobeUploaded = [];
 		this._filePreviewDialogControl = null;
-		this._oRb = Core.getLibraryResourceBundle("sap.m");
+		this._oRb = Library1.getResourceBundleFor("sap.m");
 		this._bPersoRegistered = false;
 		this._setIllustratedMessage();
 	};
@@ -1388,7 +1389,7 @@ sap.ui.define([
 	UploadSetwithTable.prototype._getCloudFilePickerMenu = function () {
 		this._oMenuButton = new MenuButton({
 			text: this._oRb.getText("UPLOAD_SET_DEFAULT_LFP_BUTTON_TEXT"),
-			buttonMode: sap.m.MenuButtonMode.Split,
+			buttonMode: MenuButtonMode.Split,
 			menu: this._getMenuButtonItems(),
 			defaultAction: this.fileSelectionHandler.bind(this)
 		});

package/src/sap/m/upload/UploadSetwithTableItem.js

@@ -10,8 +10,8 @@ sap.ui.define([
 	"sap/ui/core/IconPool",
 	"sap/m/upload/UploadSetwithTableItemRenderer",
 	"sap/base/Log",
-	"sap/ui/core/Core"
-], function (ColumnListItem, IconPool, UploadSetwithTableItemRenderer, Log, Core) {
+	"sap/ui/core/Lib"
+], function (ColumnListItem, IconPool, UploadSetwithTableItemRenderer, Log, Library) {
     "use strict";
 
 	/**
@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @public
 	 * @experimental since 1.120
 	 * @since 1.120
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 * @alias sap.m.upload.UploadSetwithTableItem
 	 */
     var UploadSetwithTableItem = ColumnListItem.extend("sap.m.upload.UploadSetwithTableItem", {
@@ -72,7 +72,7 @@ sap.ui.define([
 					headerFields: {type: "sap.ui.core.Item", multiple: true, singularName: "headerField"}
 				}
 			},
-			render: UploadSetwithTableItemRenderer
+			renderer: UploadSetwithTableItemRenderer
     });
 
 	/* ================== */
@@ -88,7 +88,7 @@ sap.ui.define([
 		this._bNameLengthRestricted = false;
 		this._bSizeRestricted = false;
 		this._bMediaTypeRestricted = false;
-		this._oRb = Core.getLibraryResourceBundle("sap.m");
+		this._oRb = Library.getResourceBundleFor("sap.m");
 		this._oCloudFileInfo = null;
     };
 

package/src/sap/m/upload/UploaderTableItem.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @public
 	 * @experimental since 1.120
 	 * @since 1.120
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 * @alias sap.m.upload.UploaderTableItem
 	 */
 	var Uploader = Element.extend("sap.m.upload.UploaderTableItem", {

package/src/sap/m/upload/p13n/PersManager.js

@@ -72,7 +72,7 @@ sap.ui.define(
 		 * @alias sap.m.upload.p13n.PersManager
 		 * @extends sap.ui.base.Object
 		 * @author SAP SE
-		 * @version 1.120.7
+		 * @version 1.121.0
 		 * @experimental
 		 * @internal
 		 * @private
@@ -244,7 +244,9 @@ sap.ui.define(
 				}
 			});
 			const aSorters = Object.values(oSorters);
-			oControl.getBinding("items").sort(aSorters.length ? aSorters : null);
+			if (oControl.getBinding("items")) {
+				oControl.getBinding("items").sort(aSorters.length ? aSorters : null);
+			}
 		};
 		return PersManager;
 	}

package/src/sap/m/upload/p13n/mediator/BaseMediator.js

@@ -20,7 +20,7 @@ sap.ui.define(["sap/ui/base/Object", "sap/ui/core/mvc/XMLView"], function (BaseO
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @experimental since 1.120

package/src/sap/m/upload/p13n/mediator/ColumnsMediator.js

@@ -6,13 +6,14 @@
 
 sap.ui.define(
 	[
+		"sap/base/i18n/Localization",
 		"sap/m/upload/p13n/mediator/BaseMediator",
 		"sap/m/p13n/SelectionPanel",
 		"sap/m/upload/p13n/modules/CustomDataConfig",
-		"sap/ui/core/Configuration",
+		"sap/ui/core/Locale",
 		"sap/base/util/deepEqual"
 	],
-	function (BaseMediator, SelectionPanel, CustomDataConfig, Configuration, deepEqual) {
+	function(Localization, BaseMediator, SelectionPanel, CustomDataConfig, Locale, deepEqual) {
 		"use strict";
 
 		/**
@@ -29,7 +30,7 @@ sap.ui.define(
 		 * @extends sap.m.upload.p13n.mediator.BaseMediator
 		 *
 		 * @author SAP SE
-		 * @version 1.120.7
+		 * @version 1.121.0
 		 * @private
 		 * @experimental
 		 * @internal
@@ -67,7 +68,7 @@ sap.ui.define(
 			});
 
 			// Sort panel config
-			const sLocale = Configuration.getLocale().toString(),
+			const sLocale = new Locale(Localization.getLanguageTag()).toString(),
 				oCollator = window.Intl.Collator(sLocale, {});
 			aPanelState.sort((mItem1, mItem2) => {
 				if (mItem1.visible && mItem2.visible) {

package/src/sap/m/upload/p13n/mediator/FilterMediator.js

@@ -30,7 +30,7 @@ sap.ui.define(
 		 * @extends sap.m.upload.p13n.mediator.BaseMediator
 		 *
 		 * @author SAP SE
-		 * @version 1.120.7
+		 * @version 1.121.0
 		 * @private
 		 * @experimental
 		 * @internal
@@ -188,7 +188,10 @@ sap.ui.define(
 		FilterMediator.prototype.applyStateToTable = function (oSorters = {}) {
 			const aState = this.getCurrentState(),
 				aFilters = aState.map((oEntry) => new Filter(oEntry.path, oEntry.operator, oEntry.value));
-			this.getControl().getBinding("items").filter(aFilters.length ? new Filter(aFilters, true) : null, FilterType.Control);
+
+			if (this.getControl().getBinding("items")){
+				this.getControl().getBinding("items").filter(aFilters.length ? new Filter(aFilters, true) : null, FilterType.Control);
+			}
 		};
 
 		return FilterMediator;