@openui5/sap.m 1.101.0 → 1.103.0

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

@@ -26,9 +26,10 @@ sap.ui.define([
 	"sap/m/upload/UploaderHttpRequestMethod",
 	"sap/ui/core/dnd/DragDropInfo",
 	"sap/ui/core/dnd/DropInfo",
-	"sap/m/library"
+	"sap/m/library",
+	"sap/m/upload/UploadSetToolbarPlaceholder"
 ], function (Control, Icon, KeyCodes, Log, deepEqual, MobileLibrary, Button, Dialog, List, MessageBox, OverflowToolbar,
-			 StandardListItem, Text, ToolbarSpacer, FileUploader, UploadSetItem, Uploader, Renderer, UploaderHttpRequestMethod, DragDropInfo, DropInfo, Library) {
+			 StandardListItem, Text, ToolbarSpacer, FileUploader, UploadSetItem, Uploader, Renderer, UploaderHttpRequestMethod, DragDropInfo, DropInfo, Library, UploadSetToolbarPlaceholder) {
 	"use strict";
 
 	/**
@@ -42,7 +43,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.101.0
+	 * @version 1.103.0
 	 * @constructor
 	 * @public
 	 * @since 1.63
@@ -476,6 +477,8 @@ sap.ui.define([
 		this._oLastEnteredTarget = null;
 
 		this._aGroupHeadersAdded = [];
+		this._iFileUploaderPH = null;
+		this._oItemToUpdate = null;
 	};
 
 	UploadSet.prototype.exit = function () {
@@ -505,7 +508,7 @@ sap.ui.define([
 
 	UploadSet.prototype.onBeforeRendering = function (oEvent) {
 		this._aGroupHeadersAdded = [];
-		this._clearList();
+		this._clearGroupHeaders();
 		this._fillListWithUploadSetItems(this.getItems());
 	};
 
@@ -576,9 +579,15 @@ sap.ui.define([
 				this._oToolbar = new OverflowToolbar(this.getId() + "-toolbar", {
 					content: [this._oNumberOfAttachmentsTitle, new ToolbarSpacer(), this.getDefaultFileUploader()]
 				});
+				this._iFileUploaderPH = 2;
 				this.addDependent(this._oToolbar);
 			} else {
-				this._oToolbar.addContent(this.getDefaultFileUploader());
+				this._iFileUploaderPH = this._getFileUploaderPlaceHolderPosition(this._oToolbar);
+				if (this._oToolbar && this._iFileUploaderPH > -1) {
+					this._setFileUploaderInToolbar(this.getDefaultFileUploader());
+				} else if (this._oToolbar) {
+					this._oToolbar.insertContent(this.getDefaultFileUploader());
+				}
 			}
 		}
 
@@ -606,10 +615,18 @@ sap.ui.define([
 
 	UploadSet.prototype.addAggregation = function (sAggregationName, oObject, bSuppressInvalidate) {
 		Control.prototype.addAggregation.call(this, sAggregationName, oObject, bSuppressInvalidate);
+		if (oObject && (sAggregationName === 'items' || sAggregationName === "incompleteItems")) {
+			this._projectToNewListItem(oObject);
+			this._refreshInnerListStyle();
+		}
 	};
 
 	UploadSet.prototype.insertAggregation = function (sAggregationName, oObject, iIndex, bSuppressInvalidate) {
 		Control.prototype.insertAggregation.call(this, sAggregationName, oObject, iIndex, bSuppressInvalidate);
+		if (oObject && (sAggregationName === 'items' || sAggregationName === 'incompleteItems')) {
+			this._projectToNewListItem(oObject, iIndex || 0);
+			this._refreshInnerListStyle();
+		}
 	};
 
 	UploadSet.prototype.removeAggregation = function (sAggregationName, oObject, bSuppressInvalidate) {
@@ -620,12 +637,14 @@ sap.ui.define([
 				oItems = this.getItems();
 				oListItem = oItems[oObject];
 			} else if (typeof oObject === 'object') { // the object itself is given or has just been retrieved
-				oListItem = oObject._getListItem();
+				if (this.getList() && this.getList().getItems().length) {
+					oListItem = oObject._getListItem();
+				}
 			}
             var oItem = this.getList().removeAggregation("items", oListItem, bSuppressInvalidate);
             if (oItem && oObject) {
-                oObject.destroy();
                 oItem.destroy();
+				oObject.destroy();
             }
             this._refreshInnerListStyle();
         }
@@ -935,7 +954,7 @@ sap.ui.define([
 
 	/**
 	 * Retrieves the currently selected UploadSetItem.
-	 * @returns {sap.m.upload.UploadSetItem | null} The currently selected item or null
+	 * @returns {sap.m.upload.UploadSetItem | null} The currently selected item or <code>null</code>
 	 * @public
 	 * @since 1.100.0
 	 */
@@ -988,6 +1007,29 @@ sap.ui.define([
 		return this;
 	};
 
+	/**
+	 * Opens the FileUploader dialog. When an UploadSetItem is provided, this method can be used to update a file with a new version.
+	 * @param {sap.m.UploadSetItem} item The UploadSetItem to update with a new version. This parameter is mandatory.
+	 * @returns {this} this to allow method chaining
+	 * @since 1.103.0
+	 * @public
+	 */
+	 UploadSet.prototype.openFileDialog = function(item) {
+		if (this._oFileUploader) {
+			if (item) {
+				if (!this._oFileUploader.getMultiple()) {
+					this._oItemToUpdate = item;
+					this._oFileUploader.$().find("input[type=file]").trigger("click");
+				} else {
+					Log.warning("Version Upload cannot be used in multiple upload mode");
+				}
+			} else {
+				this._oFileUploader.$().find("input[type=file]").trigger("click");
+			}
+		}
+		return this;
+	};
+
 	/* ============== */
 	/* Event handlers */
 	/* ============== */
@@ -1025,8 +1067,12 @@ sap.ui.define([
 			"headers": oResponseXHRParams.headers
 		};
 		oItem.setProgress(100);
+		if (this._oItemToUpdate && this.getInstantUpload()) {
+			this.removeAggregation('items', this._oItemToUpdate, false);
+		}
 		this.insertItem(oItem, 0);
 		oItem.setUploadState(UploadState.Complete);
+		this._oItemToUpdate = null;
 		this.fireUploadCompleted(oXhrParams);
 	};
 
@@ -1355,7 +1401,11 @@ sap.ui.define([
 			// maps groups for each item if group configuration provided
 			this._mapGroupForItem(oItem);
 		}
-		this.getList().addAggregation("items", oListItem, true);
+		if (iIndex === 0) {
+			this.getList().insertAggregation("items", oListItem, iIndex, true);
+		} else {
+			this.getList().addAggregation("items", oListItem, true);
+		}
 		this._checkRestrictionsForItem(oItem);
 	};
 
@@ -1509,10 +1559,12 @@ sap.ui.define([
 	 * Destroy the items in the List.
 	 * @private
 	 */
-	 UploadSet.prototype._clearList = function() {
-		if (this._oList) {
-			this.getList().destroyAggregation("items", true);	// note: suppress re-rendering
-		}
+	 UploadSet.prototype._clearGroupHeaders = function() {
+		this.getList().getItems().forEach(function(oItem) {
+			if (oItem.isGroupHeader()) {
+				oItem.destroy(false);
+			}
+		});
 	};
 
 	/**
@@ -1553,10 +1605,34 @@ sap.ui.define([
 		var that = this;
 		aItems.forEach(function(item, index) {
 			item._reset();
-			that._projectToNewListItem(item, index, true);
+			that._projectToNewListItem(item, true);
 			that._refreshInnerListStyle();
 		});
 	};
 
+	/**
+	 * Provides the position of the placeholder for the FileUploader, that every toolbar must have if it is provided by the application.
+	 * @param {sap.m.OverflowToolbar} toolbar Toolbar where the placeholder can be found.
+	 * @return {int} The position of the placeholder or -1 if there's no placeholder.
+	 * @private
+	 */
+	 UploadSet.prototype._getFileUploaderPlaceHolderPosition = function(toolbar) {
+		for (var i = 0; i < toolbar.getContent().length; i++) {
+			if (toolbar.getContent()[i] instanceof UploadSetToolbarPlaceholder) {
+				return i;
+			}
+		}
+		return -1;
+	};
+
+	/**
+	 * Inserts the given FileUploader object into the current Toolbar at the position of the placeholder.
+	 * @param {sap.ui.unified.FileUploader} fileUploader The FileUploader object to insert into the Toolbar
+	 * @private
+	 */
+	 UploadSet.prototype._setFileUploaderInToolbar = function(fileUploader) {
+		this._oToolbar.getContent()[this._iFileUploaderPH].setVisible(false);
+		this._oToolbar.insertContent(fileUploader, this._iFileUploaderPH);
+	};
 	return UploadSet;
 });

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

@@ -36,7 +36,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.101.0
+	 * @version 1.103.0
 	 * @constructor
 	 * @public
 	 * @since 1.63
@@ -352,8 +352,8 @@ sap.ui.define([
 			// Below we handle change of icon case for existing uploadSetItem.For creation of uploadSetItem icon is created using _getIcon method.
 			if (this._oListItem && sUrl) {
 				for (var i = 0; i < this._oListItem.getContent().length; i++) {
-					if (this._oListItem.getContent()[i] instanceof sap.ui.core.Icon || this._oListItem.getContent()[i] instanceof sap.m.Image) {
-						var oItem = this._oListItem.getContent()[i];
+					var oItem = this._oListItem.getContent()[i];
+					if (oItem && oItem.isA(["sap.ui.core.Icon", "sap.m.Image"])) {
 						this._oListItem.removeContent(oItem);
 						if (this._oIcon) {
 							this._oIcon.destroy();
@@ -699,7 +699,7 @@ sap.ui.define([
 	 * Retrieves the sap.m.ListItem from the internal sap.m.List based on the ID
 	 * @param {string} listItemId The item ID used for finding the UploadSetItem
 	 * @param {sap.m.ListItemBase[]} listItems The array of list items to search in
-	 * @returns {sap.m.UploadSetItem} The matching UploadSetItem or null if none is found
+	 * @returns {sap.m.UploadSetItem|null} The matching UploadSetItem or null if none is found
 	 * @private
 	 */
 	UploadSetItem._findById = function(listItemId, listItems) {
@@ -1052,8 +1052,21 @@ sap.ui.define([
 	 * @private
 	 */
 	UploadSetItem.prototype._reset = function() {
+		if (this._oListItem) {
+			this._oListItem.destroy();
+			this._oListItem = null;
+		}
 		this._oListItem = null;
-		this._oIcon = null;
+		if (this._oIcon) {
+			this.removeDependent(this._oIcon);
+			this._oIcon.destroy();
+			this._oIcon = null;
+		}
+		if (this._oFileNameLink) {
+			this.removeDependent(this._oFileNameLink);
+			this._oFileNameLink.destroy();
+			this._oFileNameLink = null;
+		}
 		this._oDynamicContent = null;
 	};
 

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

@@ -0,0 +1,46 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	"sap/m/library",
+	"sap/ui/core/Control"
+], function(library, Control) {
+	"use strict";
+
+	/**
+	 * Constructor for a new UploadSetToolbarPlaceholder.
+	 *
+	 * @param {string} [sId] ID for the new control, generated automatically if no ID is given
+	 * @param {object} [mSettings] initial settings for the new control
+	 *
+	 * @class
+	 * Used to create a customizable toolbar for the UploadSet.
+	 * A FileUploader instance is required in the toolbar and it is placed by the application.
+	 * @extends sap.ui.core.Control
+	 *
+	 * @author SAP SE
+	 * @version 1.103.0
+	 *
+	 * @constructor
+	 * @public
+	 * @since 1.103.0
+	 * @alias sap.m.upload.UploadSetToolbarPlaceholder
+	 */
+
+	var UploadSetToolbarPlaceholder = Control.extend("sap.m.upload.UploadSetToolbarPlaceholder", {
+		metadata: {
+			library: "sap.m",
+			properties: {}
+		},
+		renderer: {
+			apiVersion: 2,
+			render: function(oRm, oControl) {}
+		}
+	});
+
+	return UploadSetToolbarPlaceholder;
+
+});