From e9785677ddc2feb1e21e9041df98b652ba9244ff Mon Sep 17 00:00:00 2001 From: Mohd Imran Date: Mon, 12 Oct 2020 16:13:37 +0530 Subject: [PATCH 1/4] Loading bar does not disappear after uploading file issue FIXED --- client/modules/IDE/components/FileUploader.jsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/client/modules/IDE/components/FileUploader.jsx b/client/modules/IDE/components/FileUploader.jsx index f33b59ed85..8cf9bbd32e 100644 --- a/client/modules/IDE/components/FileUploader.jsx +++ b/client/modules/IDE/components/FileUploader.jsx @@ -9,7 +9,7 @@ import getConfig from '../../../utils/getConfig'; import { fileExtensionsAndMimeTypes } from '../../../../server/utils/fileUtils'; const s3Bucket = getConfig('S3_BUCKET_URL_BASE') || - `https://s3-${getConfig('AWS_REGION')}.amazonaws.com/${getConfig('S3_BUCKET')}/`; + `https://s3-${getConfig('AWS_REGION')}.amazonaws.com/${getConfig('S3_BUCKET')}/`; class FileUploader extends React.Component { componentDidMount() { @@ -34,7 +34,11 @@ class FileUploader extends React.Component { dictDefaultMessage: this.props.t('FileUploader.DictDefaultMessage'), accept: this.props.dropzoneAcceptCallback.bind(this, userId), sending: this.props.dropzoneSendingCallback, - complete: this.props.dropzoneCompleteCallback + complete: this.props.dropzoneCompleteCallback, + success: (file, response) => { + console.log(response); + file.previewElement.querySelector('.dz-progress').remove(); + } // error: (file, errorMessage) => { // console.log(file); // console.log(errorMessage); From 1f94590fef4330ae5ce618d55dda10a9d5728607 Mon Sep 17 00:00:00 2001 From: Mohd Imran Date: Mon, 12 Oct 2020 16:40:25 +0530 Subject: [PATCH 2/4] Loading bar does not disappear after uploading file issue FIXED --- client/modules/IDE/components/FileUploader.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/client/modules/IDE/components/FileUploader.jsx b/client/modules/IDE/components/FileUploader.jsx index 8cf9bbd32e..3cf4740b2d 100644 --- a/client/modules/IDE/components/FileUploader.jsx +++ b/client/modules/IDE/components/FileUploader.jsx @@ -36,7 +36,6 @@ class FileUploader extends React.Component { sending: this.props.dropzoneSendingCallback, complete: this.props.dropzoneCompleteCallback, success: (file, response) => { - console.log(response); file.previewElement.querySelector('.dz-progress').remove(); } // error: (file, errorMessage) => { From d5abae1a83db25c6b00d776384b6fdf82a000b59 Mon Sep 17 00:00:00 2001 From: Cassie Tarakajian Date: Tue, 13 Oct 2020 16:01:35 -0400 Subject: [PATCH 3/4] [#1220] Update plaintext file uploading to match other file types --- client/modules/IDE/actions/uploader.js | 3 +++ client/modules/IDE/components/FileUploader.jsx | 7 ++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/modules/IDE/actions/uploader.js b/client/modules/IDE/actions/uploader.js index 1bff26719d..52085f8eaa 100644 --- a/client/modules/IDE/actions/uploader.js +++ b/client/modules/IDE/actions/uploader.js @@ -38,6 +38,9 @@ export function dropzoneAcceptCallback(userId, file, done) { localIntercept(file).then((result) => { file.content = result; // eslint-disable-line done('Uploading plaintext file locally.'); + file.previewElement.classList.remove('dz-error'); + file.previewElement.classList.add('dz-success'); + file.previewElement.querySelector('.dz-upload').style.width = '100%'; }) .catch((result) => { done(`Failed to download file ${file.name}: ${result}`); diff --git a/client/modules/IDE/components/FileUploader.jsx b/client/modules/IDE/components/FileUploader.jsx index 3cf4740b2d..f33b59ed85 100644 --- a/client/modules/IDE/components/FileUploader.jsx +++ b/client/modules/IDE/components/FileUploader.jsx @@ -9,7 +9,7 @@ import getConfig from '../../../utils/getConfig'; import { fileExtensionsAndMimeTypes } from '../../../../server/utils/fileUtils'; const s3Bucket = getConfig('S3_BUCKET_URL_BASE') || - `https://s3-${getConfig('AWS_REGION')}.amazonaws.com/${getConfig('S3_BUCKET')}/`; + `https://s3-${getConfig('AWS_REGION')}.amazonaws.com/${getConfig('S3_BUCKET')}/`; class FileUploader extends React.Component { componentDidMount() { @@ -34,10 +34,7 @@ class FileUploader extends React.Component { dictDefaultMessage: this.props.t('FileUploader.DictDefaultMessage'), accept: this.props.dropzoneAcceptCallback.bind(this, userId), sending: this.props.dropzoneSendingCallback, - complete: this.props.dropzoneCompleteCallback, - success: (file, response) => { - file.previewElement.querySelector('.dz-progress').remove(); - } + complete: this.props.dropzoneCompleteCallback // error: (file, errorMessage) => { // console.log(file); // console.log(errorMessage); From 4a76e285622334328ce46991d829f93c0e4a244a Mon Sep 17 00:00:00 2001 From: Cassie Tarakajian Date: Wed, 14 Oct 2020 14:53:32 -0400 Subject: [PATCH 4/4] [#1220] Add class to text file upload --- client/modules/IDE/actions/uploader.js | 1 + 1 file changed, 1 insertion(+) diff --git a/client/modules/IDE/actions/uploader.js b/client/modules/IDE/actions/uploader.js index 52085f8eaa..b62c0604ca 100644 --- a/client/modules/IDE/actions/uploader.js +++ b/client/modules/IDE/actions/uploader.js @@ -40,6 +40,7 @@ export function dropzoneAcceptCallback(userId, file, done) { done('Uploading plaintext file locally.'); file.previewElement.classList.remove('dz-error'); file.previewElement.classList.add('dz-success'); + file.previewElement.classList.add('dz-processing'); file.previewElement.querySelector('.dz-upload').style.width = '100%'; }) .catch((result) => {