@openui5/sap.m 1.123.1 → 1.124.0

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

@@ -0,0 +1,322 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+// Provides Element sap.m.upload.UploadItem.
+sap.ui.define([
+	"sap/ui/core/IconPool",
+	"sap/base/Log",
+	"sap/ui/core/Lib",
+	"sap/ui/core/Element"
+], function (IconPool, Log, Library, Element) {
+    "use strict";
+
+	/**
+	 * Constructor for a new UploadItem.
+	 *
+	 * @param {string} [sId] Id for the new control, it is generated automatically if no ID is provided.
+	 * @param {object} [mSettings] Initial settings for the new control.
+	 * @class
+	 * <code>sap.m.upload.UploadItem</code> represents one item to be uploaded using the {@link sap.m.plugins.UploadSetwithTable UploadSetwithTable}
+	 *
+	 * <b>Note:</b> This element should only be used within the {@link sap.m.plugins.UploadSetwithTable UploadSetwithTable} plugin.
+	 * @extends sap.ui.core.Element
+	 * @author SAP SE
+	 * @constructor
+	 * @experimental Since 1.124
+	 * @public
+	 * @since 1.124
+	 * @version 1.124.0
+	 * @alias sap.m.upload.UploadItem
+	 */
+    var UploadItem = Element.extend("sap.m.upload.UploadItem", {
+			metadata: {
+				library: "sap.m",
+				properties: {
+					/**
+					 * Specifies the name of the uploaded file.
+					 */
+					fileName: {type: "string", defaultValue: null},
+					/**
+					 * Specifies the MIME type of the file.
+					 */
+					mediaType: {type: "string", defaultValue: null},
+					/**
+					 * Specifies the URL where the file is located.
+					 */
+					url: {type: "string", defaultValue: null},
+					/**
+					 * URL where the uploaded files are stored. If empty, uploadUrl from the uploader is considered.
+					 */
+					uploadUrl: {type: "string", defaultValue: null},
+					/**
+					 * State of the item relevant to its upload process.
+					 */
+					uploadState: {type: "sap.m.UploadState", defaultValue: null},
+					/**
+					 * Specifies whether the item can be previewed.
+					 */
+					previewable: {type: "boolean", defaultValue: true},
+					/**
+					 * Specifies file size of the item in bytes.
+					 */
+					fileSize: {type: "float", defaultValue: 0}
+				},
+				aggregations: {
+					/**
+					 * Header fields to be included in the header section of an XMLHttpRequest (XHR) request
+					 */
+					headerFields: {type: "sap.ui.core.Item", multiple: true, singularName: "headerField"}
+				}
+			}
+    });
+
+	/* ================== */
+	/* Lifecycle handling */
+	/* ================== */
+
+    UploadItem.prototype.init = function () {
+		this._oFileObject = null;
+		this._fFileSize = null;
+		// Restriction flags
+		this._bFileTypeRestricted = false;
+		this._bNameLengthRestricted = false;
+		this._bSizeRestricted = false;
+		this._bMediaTypeRestricted = false;
+		this._oRb = Library.getResourceBundleFor("sap.m");
+		this._oCloudFileInfo = null;
+    };
+
+	/* ===================== */
+	/* Overriden API methods */
+	/* ===================== */
+
+	UploadItem.prototype.setFileName = function (sFileName) {
+		if (this.getFileName() !== sFileName) {
+			this.setProperty("fileName", sFileName);
+			// File name related controls available no sooner than a parent is set
+			if (this.getParent() && this.getParent().getMaxFileNameLength && this.getParent().getFileTypes) {
+				this._checkNameLengthRestriction(this.getParent()?.getMaxFileNameLength());
+				this._checkTypeRestriction(this.getParent()?.getFileTypes());
+			}
+		}
+
+		return this;
+	};
+
+	/* ============== */
+	/* Public methods */
+	/* ============== */
+
+	/**
+	 * Returns file object.
+	 *
+	 * @public
+	 * @returns {File|Blob} File object.
+	 *
+	 */
+	UploadItem.prototype.getFileObject = function () {
+		return this._oFileObject;
+	};
+
+	/**
+	 * Downloads the item. Only possible when the item has a valid URL specified in the <code>url</code> property.
+	 * @param {boolean} bAskForLocation Whether to ask for a location where to download the file or not.
+	 * @public
+	 * @returns {boolean} <code>true</code> if download is possible, <code>false</code> otherwise.
+	 */
+	UploadItem.prototype.download = function (bAskForLocation) {
+		var oParent = this.getParent();
+		if (!oParent) {
+			Log.warning("Download cannot proceed without a parent association.");
+			return false;
+		}
+
+		return oParent?._initiateFileDownload(this, bAskForLocation);
+	};
+
+	/**
+	 * Validates if the item is restricted, to check if it is restricted for the file type, media type, maximum file name length and maximum file size limit.
+	 *
+	 * @public
+	 * @returns {boolean} <code>true</code> if item is restricted, <code>false</code> otherwise.
+	 *
+	 */
+	UploadItem.prototype.isRestricted = function () {
+		return this._isRestricted();
+	};
+
+	/**
+	 * Returns the details of the file selected from the CloudFilePicker control.
+	 * @returns {sap.suite.ui.commons.CloudFileInfo} oCloudFileInfo Specifies the details of the file selected from the cloudFilePicker control.
+	 * @public
+	 */
+	UploadItem.prototype.getCloudFileInfo = function() {
+		return this._oCloudFileInfo;
+	};
+
+	/* =============== */
+	/* Private methods */
+	/* =============== */
+
+	UploadItem._getIconByMimeType = function(sMimeType, fileName) {
+
+		if (sMimeType) {
+			return IconPool.getIconForMimeType(sMimeType);
+		} else {
+			return UploadItem._getIconByFileType(fileName);
+		}
+	};
+
+	UploadItem._getIconByFileType = function (fileName) {
+		var sFileExtension = UploadItem._splitFileName(fileName).extension;
+		if (!sFileExtension) {
+			return "sap-icon://document";
+		}
+
+		switch (sFileExtension.toLowerCase()) {
+			case "bmp" :
+			case "jpg" :
+			case "jpeg" :
+			case "png" :
+				return UploadItem.IMAGE_FILE_ICON;
+			case "csv" :
+			case "xls" :
+			case "xlsx" :
+				return "sap-icon://excel-attachment";
+			case "doc" :
+			case "docx" :
+			case "odt" :
+				return "sap-icon://doc-attachment";
+			case "pdf" :
+				return "sap-icon://pdf-attachment";
+			case "ppt" :
+			case "pptx" :
+				return "sap-icon://ppt-attachment";
+			case "txt" :
+				return "sap-icon://document-text";
+			default :
+				return "sap-icon://document";
+		}
+	};
+
+	UploadItem._splitFileName = function (sFileName, bWithDot) {
+		var oResult = {};
+		var oRegex = /(?:\.([^.]+))?$/;
+		var aFileExtension = oRegex.exec(sFileName);
+		if (!aFileExtension[0]) {
+			aFileExtension[0] = "";
+			oResult.name = sFileName;
+		} else {
+			oResult.name = sFileName ? sFileName.slice(0, sFileName.indexOf(aFileExtension[0])) : "";
+		}
+		if (bWithDot) {
+			oResult.extension = aFileExtension[0];
+		} else {
+			oResult.extension = aFileExtension[1];
+		}
+		return oResult;
+	};
+
+	UploadItem.prototype._setFileObject = function (oFileObject) {
+		this._oFileObject = oFileObject;
+		if (oFileObject) {
+			this._fFileSize = oFileObject.size / UploadItem.MEGABYTE;
+			this.setFileSize(oFileObject.size);
+			this.setMediaType(oFileObject.type);
+		} else {
+			this._fFileSize = null;
+			this.setMediaType(null);
+		}
+		if (this.getParent()) {
+			this._checkSizeRestriction(this.getParent()?.getMaxFileSize());
+			this._checkMediaTypeRestriction(this.getParent()?.getMediaTypes());
+		}
+	};
+
+	/**
+	 * Checks if and how compliance with the file name length restriction changed for this item.
+	 * @param {int} iMaxLength Maximum length of file name.
+	 * @private
+	 */
+	UploadItem.prototype._checkNameLengthRestriction = function (iMaxLength) {
+		var bRestricted = (iMaxLength && !!this.getFileName() && this.getFileName().length > iMaxLength);
+		if (bRestricted !== this._bNameLengthRestricted) {
+			this._bNameLengthRestricted = bRestricted;
+			this.invalidate();
+			if (bRestricted && this.getParent()) {
+				this.getParent()?.fireFileNameLengthExceeded({item: this});
+			}
+		}
+	};
+
+	/**
+	 * Checks if and how compliance with the file size restriction changed for this item.
+	 * @param {float} fMaxSize Maximum file size allowed in megabytes.
+	 * @private
+	 */
+	UploadItem.prototype._checkSizeRestriction = function (fMaxSize) {
+		var bRestricted = (fMaxSize && this._fFileSize > fMaxSize);
+		if (bRestricted !== this._bSizeRestricted) {
+			this._bSizeRestricted = bRestricted;
+			this.invalidate();
+			if (bRestricted && this.getParent()) {
+				this.getParent()?.fireFileSizeExceeded({item: this});
+			}
+		}
+	};
+
+	/**
+	 * Checks if and how compliance with the mime type restriction changed for this item.
+	 * @param {string[]} aTypes List of allowed mime types.
+	 * @private
+	 */
+	UploadItem.prototype._checkMediaTypeRestriction = function (aTypes) {
+		var bRestricted = (!!aTypes && (aTypes.length > 0) && !!this.getMediaType() && aTypes.indexOf(this.getMediaType()) === -1);
+		if (bRestricted !== this._bMediaTypeRestricted) {
+			this._bMediaTypeRestricted = bRestricted;
+			this.invalidate();
+			if (bRestricted && this.getParent()) {
+				this.getParent()?.fireMediaTypeMismatch({item: this});
+			}
+		}
+	};
+
+	/**
+	 * Checks if and how compliance with the file type restriction changed for this item.
+	 * @param {string[]} aTypes List of allowed file types.
+	 * @private
+	 */
+	UploadItem.prototype._checkTypeRestriction = function (aTypes) {
+		var oFile = UploadItem._splitFileName(this.getFileName()),
+			bRestricted =
+				(!!this.getFileName() && !!aTypes && (aTypes.length > 0)
+					&& oFile.extension && aTypes.indexOf(oFile.extension.toLowerCase()) === -1);
+		if (bRestricted !== this._bFileTypeRestricted) {
+			this._bFileTypeRestricted = bRestricted;
+			this.invalidate();
+			if (bRestricted && this.getParent()) {
+				this.getParent()?.fireFileTypeMismatch({item: this});
+			}
+		}
+	};
+
+	UploadItem.prototype._isRestricted = function () {
+		return this._bFileTypeRestricted || this._bNameLengthRestricted || this._bSizeRestricted || this._bMediaTypeRestricted;
+	};
+
+	/**
+	 * @param {suite.ui.commons.CloudFileInfo} oCloudFileInfo info the file selected from the CloudFilePicker control.
+	 * @private
+	 */
+	UploadItem.prototype._setCloudFileInfo = function(oCloudFileInfo) {
+		this._oCloudFileInfo = oCloudFileInfo;
+	};
+
+    UploadItem.IMAGE_FILE_ICON = "sap-icon://card";
+	UploadItem.MEGABYTE = 1048576;
+
+    return UploadItem;
+});

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

@@ -0,0 +1,191 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+// Provides Element sap.m.upload.UploadItemConfiguration.
+sap.ui.define([
+	"sap/base/Log",
+	"sap/ui/core/Element"
+], function (Log, Element) {
+    "use strict";
+
+	/**
+	 * Constructor for a new UploadItemConfiguration.
+	 *
+	 * @param {string} [sId] Id for the new Element, it is generated automatically if no ID is provided.
+	 * @param {object} [mSettings] Initial settings for the new Element.
+	 * @class
+	 * <code>sap.m.UploadItemConfiguration</code> represents the configuration for the items in the {@link sap.m.plugins.UploadSetwithTable UploadSetwithTable} plugin.
+	 * <br>The configuration template represents the paths in the model to the file name, mediaType, url, uploadUrl, previewable, and file size properties in reference to the {@link sap.m.upload.UploadItem UploadItem}. This is essential for the plugin in understanding the structure of the model data bound to continue with operations.
+	 * <br><b>Note:</b> Configuration is mandatory for the plugin to offer the features such as file preview, download, rename etc. The element must be used only within the {@link sap.m.plugins.UploadSetwithTable UploadSetwithTable} plugin.
+	 *
+	 * @extends sap.ui.core.Element
+	 * @author SAP SE
+	 * @constructor
+	 * @experimental Since 1.124
+	 * @public
+	 * @since 1.124
+	 * @version 1.124.0
+	 * @alias sap.m.upload.UploadItemConfiguration
+	 */
+    const UploadItemConfiguration = Element.extend("sap.m.upload.UploadItemConfiguration", {
+			metadata: {
+				library: "sap.m",
+				properties: {
+					/**
+					 * Specifies the path in the model to the file name
+					 */
+					fileNamePath: {type: "string", defaultValue: null},
+					/**
+					 * Specifies the path in the model to the file mediaType.
+					 */
+					mediaTypePath: {type: "string", defaultValue: null},
+					/**
+					 * Specifies the path in the model to the file URL. It is used to download/access the file.
+					 */
+					urlPath: {type: "string", defaultValue: null},
+					/**
+					 * Specifies the path in the model for upload URL. Used to upload the file.
+					 */
+					uploadUrlPath: {type: "string", defaultValue: null},
+					/**
+					 * Specifies the path in the model to determine if the file uploaded can be previewed.
+					 */
+					previewablePath: {type: "string", defaultValue: null},
+					/**
+					 * Specifies path in the model to the file size.
+					 */
+					fileSizePath: {type: "string", defaultValue: null}
+				}
+			}
+    });
+
+	/**
+	 * Validates the configuration of the file name path value.
+	 * @param {sap.ui.model.Context} oBindingContext context of the item
+	 * @returns {boolean} true if the file name is valid, false otherwise.
+	 * @private
+	 */
+	UploadItemConfiguration.prototype._fileNameValidator = function (oBindingContext) {
+		const sPath = this.getFileNamePath();
+		if (!sPath) {
+			return false;
+		}
+		const value = oBindingContext?.getProperty(sPath);
+
+		if (typeof value === "string") {
+			return true;
+		}
+		Log.error(`Invalid file name value at ${oBindingContext.getPath()}. Expected string.`);
+		return false;
+	};
+
+	/**
+	 * Validates the configuration of the media type path value.
+	 * @param {sap.ui.model.Context} oBindingContext context of the item
+	 * @returns {boolean} true if the media type is valid, false otherwise.
+	 * @private
+	 */
+	UploadItemConfiguration.prototype._mediaTypeValidator = function (oBindingContext) {
+		const sPath = this.getMediaTypePath();
+		if (!sPath) {
+			return false;
+		}
+		const value = oBindingContext?.getProperty(sPath);
+		if (typeof value === "string") {
+			return true;
+		}
+		Log.error(`Invalid media type value at ${oBindingContext.getPath()}. Expected string.`);
+		return false;
+	};
+
+	/**
+	 * Validates the configuration of the url path value.
+	 * @param {sap.ui.model.Context} oBindingContext context of the item
+	 * @returns {boolean} true if the url is valid, false otherwise.
+	 * @private
+	 */
+	UploadItemConfiguration.prototype._urlValidator = function (oBindingContext) {
+		const sPath = this.getUrlPath();
+		if (!sPath) {
+			return false;
+		}
+		const value = oBindingContext?.getProperty(sPath);
+		if (typeof value === "string") {
+			return true;
+		}
+		Log.error(`Invalid url value at ${oBindingContext.getPath()}. Expected string.`);
+		return false;
+	};
+
+	/**
+	 * Validates the configuration of the upload url path value.
+	 * @param {sap.ui.model.Context} oBindingContext context of the item
+	 * @returns {boolean} true if the upload url is valid, false otherwise.
+	 * @private
+	 */
+	UploadItemConfiguration.prototype._uploadUrlValidator = function (oBindingContext) {
+		const sPath = this.getUploadUrlPath();
+		if (!sPath) {
+			return false;
+		}
+		const value = oBindingContext?.getProperty(sPath);
+		if (typeof value === "string") {
+			return true;
+		}
+		Log.error(`Invalid upload URL value at ${oBindingContext.getPath()}. Expected string.`);
+		return false;
+
+	};
+
+	/**
+	 * Validates the configuration of the previewable path value.
+	 * @param {sap.ui.model.Context} oBindingContext context of the item
+	 * @returns {boolean} true if the previewable is valid, false otherwise.
+	 * @private
+	 */
+	UploadItemConfiguration.prototype._previewableValidator = function (oBindingContext) {
+		const sPath = this.getPreviewablePath();
+		if (!sPath) {
+			return false;
+		}
+		const value = oBindingContext?.getProperty(sPath);
+		if (typeof value === "boolean") {
+			return true;
+		} else if (typeof value === "string") {
+			if (value.toLowerCase() === "true" || value.toLowerCase() === "false") {
+				return true;
+			}
+		}
+		Log.error(`Invalid previewable value at ${oBindingContext.getPath()}. Expected string.`);
+		return false;
+	};
+
+	/**
+	 * Validates the configuration of the file size path value.
+	 * @param {sap.ui.model.Context} oBindingContext context of the item
+	 * @returns {boolean} true if the file size is valid, false otherwise.
+	 * @private
+	 */
+	UploadItemConfiguration.prototype._fileSizeValidator = function (oBindingContext) {
+		const sPath = this.getFileSizePath();
+		if (!sPath) {
+			return false;
+		}
+		const value = oBindingContext?.getProperty(sPath);
+		if (typeof value === "number") {
+			return true;
+		} else if (typeof value === "string") {
+			const sValue = parseFloat(value);
+			if (!isNaN(sValue)) {
+				return false;
+			}
+		}
+		Log.error(`Invalid file Size value at ${oBindingContext.getPath()}. Expected number.`);
+		return false;
+	};
+
+    return UploadItemConfiguration;
+});

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

@@ -53,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.123.1
+	 * @version 1.124.0
 	 * @constructor
 	 * @public
 	 * @since 1.63

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

@@ -21,11 +21,10 @@ sap.ui.define([
 	"sap/m/ProgressIndicator",
 	"sap/m/VBox",
 	"sap/m/HBox",
-	"sap/ui/core/Lib",
-	"sap/ui/core/Core"
+	"sap/ui/core/Lib"
 ], function (Log, CoreLibrary, Element, Icon, IconPool, HTML,
 			 MobileLibrary, Button, CustomListItem, Image, Input,
-			 Label, Link, ProgressIndicator, VBox, HBox, CoreLib, Core) {
+			 Label, Link, ProgressIndicator, VBox, HBox, CoreLib) {
 	"use strict";
 
 	var UploadType = MobileLibrary.UploadType;
@@ -38,7 +37,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.123.1
+	 * @version 1.124.0
 	 * @constructor
 	 * @public
 	 * @since 1.63
@@ -186,7 +185,7 @@ sap.ui.define([
 			apiVersion: 2,
 			render: function (oRm, oControl) {
 				var sItemId = oControl.getAssociation("item");
-				var oItem = Core.byId(sItemId);
+				var oItem = Element.getElementById(sItemId);
 				oRm.openStart("div");
 				oRm.class("sapMUCTextContainer");
 				if (this._bInEditMode) {

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

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

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

@@ -62,9 +62,8 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @constructor
 	 * @public
-	 * @experimental since 1.120
-	 * @since 1.120
-	 * @version 1.123.1
+	 * @deprecated as of version 1.124, replaced by {@link sap.m.plugins.UploadSetwithTable}
+	 * @version 1.124.0
 	 * @alias sap.m.upload.UploadSetwithTable
 	 */
 	var UploadSetwithTable = Table.extend("sap.m.upload.UploadSetwithTable", {
@@ -126,6 +125,7 @@ sap.ui.define([
 				 * @param {sap.m.upload.UploadSetwithTable.ItemInfo} oItemInfo The info of the item queued for upload.
 				 * @returns {Promise<sap.m.upload.UploadSetwithTableItem>} oPromise, once resolved the UploadSetWithTable control initiates the upload.
 				 * @public
+				 * @deprecated as of version 1.124.
 				**/
 
 				/**
@@ -135,6 +135,7 @@ sap.ui.define([
 				 * @property {number} iTotalItemsForUpload Total count of items queued for upload.
 				 * @property {sap.m.upload.UploadSetwithTable} oSource Source on which the callback was invoked.
 				 * @public
+				 * @deprecated as of version 1.124.
 				**/
 
 				/**

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

@@ -27,9 +27,8 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @constructor
 	 * @public
-	 * @experimental since 1.120
-	 * @since 1.120
-	 * @version 1.123.1
+	 * @deprecated as of version 1.124, replaced by {@link sap.m.upload.UploadItem}
+	 * @version 1.124.0
 	 * @alias sap.m.upload.UploadSetwithTableItem
 	 */
     var UploadSetwithTableItem = ColumnListItem.extend("sap.m.upload.UploadSetwithTableItem", {

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

@@ -11,8 +11,9 @@ sap.ui.define([
 	"sap/ui/core/util/File",
 	"sap/ui/Device",
 	"sap/m/upload/UploadSetwithTableItem",
-	"sap/m/upload/UploaderHttpRequestMethod"
-], function (Log, MobileLibrary, Element, FileUtil, Device, UploadSetItem, UploaderHttpRequestMethod) {
+	"sap/m/upload/UploaderHttpRequestMethod",
+	"sap/m/upload/UploadItem"
+], function (Log, MobileLibrary, Element, FileUtil, Device, UploadSetItem, UploaderHttpRequestMethod, UploadItem) {
 	"use strict";
 
 	/**
@@ -27,7 +28,7 @@ sap.ui.define([
 	 * @public
 	 * @experimental since 1.120
 	 * @since 1.120
-	 * @version 1.123.1
+	 * @version 1.124.0
 	 * @alias sap.m.upload.UploaderTableItem
 	 */
 	var Uploader = Element.extend("sap.m.upload.UploaderTableItem", {
@@ -62,9 +63,9 @@ sap.ui.define([
 				uploadStarted: {
 					parameters: {
 						/**
-						 * The item that is going to be uploaded.
+						 * The item {@link sap.m.upload.UploadSetwithTableItem UploadSetwithTableItem} or {@link sap.m.upload.UploadItem UploadItem} that is going to be uploaded.
 						 */
-						item: {type: "sap.m.upload.UploadSetwithTableItem"}
+						item: {type: "any"}
 					}
 				},
 				/**
@@ -73,9 +74,9 @@ sap.ui.define([
 				uploadProgressed: {
 					parameters: {
 						/**
-						 * The item that is being uploaded.
+						 * The item {@link sap.m.upload.UploadSetwithTableItem UploadSetwithTableItem} or {@link sap.m.upload.UploadItem UploadItem} that is being uploaded.
 						 */
-						item: {type: "sap.m.upload.UploadSetwithTableItem"},
+						item: {type: "any"},
 						/**
 						 * The number of bytes transferred since the beginning of the operation.
 						 * This doesn't include headers and other overhead, but only the content itself
@@ -94,9 +95,9 @@ sap.ui.define([
 				uploadCompleted: {
 					parameters: {
 						/**
-						 * The item that was uploaded.
+						 * The item {@link sap.m.upload.UploadSetwithTableItem UploadSetwithTableItem} or {@link sap.m.upload.UploadItem UploadItem} that was uploaded.
 						 */
-						item: {type: "sap.m.upload.UploadSetwithTableItem"},
+						item: {type: "any"},
 						/**
 						 * A JSON object containing the additional response parameters like response, responseXML, readyState, status and headers.
 						 * <i>Sample response object:</i>
@@ -164,7 +165,7 @@ sap.ui.define([
 	/**
 	 * Starts the process of uploading the specified file.
 	 *
-	 * @param {sap.m.upload.UploadSetwithTableItem} oItem Item representing the file to be uploaded.
+	 * @param {sap.m.upload.UploadSetwithTableItem | sap.m.upload.UploadItem} oItem Item representing the file to be uploaded.
 	 * @param {sap.ui.core.Item[]} [aHeaderFields] Collection of request header fields to be send along.
 	 * @public
 	 */
@@ -232,7 +233,7 @@ sap.ui.define([
 	/**
 	 * Starts the process of downloading a file.
 	 *
-	 * @param {sap.m.upload.UploadSetwithTableItem} oItem Item representing the file to be downloaded.
+	 * @param {sap.m.upload.UploadSetwithTableItem | sap.m.upload.UploadItem} oItem Item representing the file to be downloaded.
 	 * @param {sap.ui.core.Item[]} aHeaderFields List of header fields to be added to the GET request.
 	 * @param {boolean} bAskForLocation If it is true, the location of where the file is to be downloaded is queried by a browser dialog.
 	 * @return {boolean} It returns true if the download is processed successfully
@@ -260,8 +261,14 @@ sap.ui.define([
 
 			oXhr.responseType = "blob"; // force the HTTP response, response-type header to be blob
 			oXhr.onload = function () {
+				let targetItem = UploadItem;
+				if (oItem instanceof UploadItem) {
+					targetItem = UploadItem;
+				} else if (oItem instanceof UploadSetItem) {
+					targetItem = UploadSetItem;
+				}
 				var sFileName = oItem.getFileName(),
-					oSplit = UploadSetItem._splitFileName(sFileName, false);
+					oSplit = targetItem._splitFileName(sFileName, false);
 				oBlob = oXhr.response;
 				FileUtil.save(oBlob, oSplit.name, oSplit.extension, oItem.getMediaType(), "utf-8");
 			};