Implemented file name and description on file upload

packages/rocketchat-file-upload/client/lib/FileUploadAmazonS3.js

@@ -25,7 +25,7 @@ FileUpload.AmazonS3 = class FileUploadAmazonS3 extends FileUploadBase {
 					Session.set('uploading', uploading);
 				}
 			} else {
-				file = _.pick(this.meta, 'type', 'size', 'name', 'identify');
+				file = _.pick(this.meta, 'type', 'size', 'name', 'identify', 'description');
 				file._id = downloadUrl.substr(downloadUrl.lastIndexOf('/') + 1);
 				file.url = downloadUrl;
 

packages/rocketchat-file-upload/client/lib/FileUploadFileSystem.js

@@ -29,7 +29,7 @@ FileUpload.FileSystem = class FileUploadFileSystem extends FileUploadBase {
 				}
 			},
 			onComplete: (fileData) => {
-				var file = _.pick(fileData, '_id', 'type', 'size', 'name', 'identify');
+				var file = _.pick(fileData, '_id', 'type', 'size', 'name', 'identify', 'description');
 
 				file.url = fileData.url.replace(Meteor.absoluteUrl(), '/');
 

packages/rocketchat-file-upload/client/lib/FileUploadGridFS.js

@@ -20,7 +20,7 @@ FileUpload.GridFS = class FileUploadGridFS extends FileUploadBase {
 				}
 			},
 			onComplete: (fileData) => {
-				var file = _.pick(fileData, '_id', 'type', 'size', 'name', 'identify');
+				var file = _.pick(fileData, '_id', 'type', 'size', 'name', 'identify', 'description');
 
 				file.url = fileData.url.replace(Meteor.absoluteUrl(), '/');
 

packages/rocketchat-file-upload/server/methods/sendFileMessage.js

@@ -16,6 +16,7 @@ Meteor.methods({
 
 		var attachment = {
 			title: `${TAPi18n.__('Attachment_File_Uploaded')}: ${file.name}`,
+			description: file.description,
 			title_link: fileUrl,
 			title_link_download: true
 		};

packages/rocketchat-lib/server/models/Uploads.coffee

@@ -25,6 +25,7 @@ RocketChat.models.Uploads = new class extends RocketChat.models._Base
 				userId: 1
 				rid: 1
 				name: 1
+				description: 1
 				type: 1
 				url: 1
 				uploadedAt: 1

packages/rocketchat-message-attachments/client/messageAttachment.html

@@ -121,6 +121,13 @@
 					</div>
 				{{/unless}}
 			{{/if}}
+
+			{{#if description}}
+				<div class="attachment-description">
+					<p>{{{description}}}</p>
+				</div>
+			{{/if}}
+
 			{{#each attachments}}
 				{{injectIndex . ../index @index}} {{> messageAttachment}}
 			{{/each}}

packages/rocketchat-ui/lib/fileUpload.coffee

@@ -49,7 +49,10 @@ readAsArrayBuffer = (file, callback) ->
 							Your browser does not support the audio element.
 						</audio>
 					</div>
-					<div class='upload-preview-title'>#{Handlebars._escape(file.name)}</div>
+					<div class='upload-preview-title'>
+						<input id='file-name' style='display: inherit;' value='#{Handlebars._escape(file.name)}' placeholder='#{t("File_upload_name")}'>
+						<input id='file-description' style='display: inherit;' value='' placeholder='#{t("File_upload_description")}'>
+					</div>
 				"""
 			else if file.type is 'video'
 				text = """
@@ -59,14 +62,20 @@ readAsArrayBuffer = (file, callback) ->
 							Your browser does not support the video element.
 						</video>
 					</div>
-					<div class='upload-preview-title'>#{Handlebars._escape(file.name)}</div>
+					<div class='upload-preview-title'>
+						<input id='file-name' style='display: inherit;' value='#{Handlebars._escape(file.name)}' placeholder='#{t("File_upload_name")}'>
+						<input id='file-description' style='display: inherit;' value='' placeholder='#{t("File_upload_description")}'>
+					</div>
 				"""
 			else
 				text = """
 					<div class='upload-preview'>
 						<div class='upload-preview-file' style='background-image: url(#{fileContent})'></div>
 					</div>
-					<div class='upload-preview-title'>#{Handlebars._escape(file.name)}</div>
+					<div class='upload-preview-title'>
+						<input id='file-name' style='display: inherit;' value='#{Handlebars._escape(file.name)}' placeholder='#{t("File_upload_name")}'>
+						<input id='file-description' style='display: inherit;' value='' placeholder='#{t("File_upload_description")}'>
+					</div>
 				"""
 
 			swal
@@ -78,15 +87,15 @@ readAsArrayBuffer = (file, callback) ->
 				html: true
 			, (isConfirm) ->
 				consume()
-
 				if isConfirm isnt true
 					return
 
 				record =
-					name: file.name or file.file.name
+					name: document.getElementById('file-name').value or file.name or file.file.name
 					size: file.file.size
 					type: file.file.type
 					rid: roomId
+					description: document.getElementById('file-description').value
 
 				upload = fileUploadHandler record, file.file