TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-28 14:03:48 +03:00
Code Issues Projects Releases Wiki Activity

🐛 Fix order of multiple upload results (#825)

Browse Source 
no issue
- push upload results into an array at the same index as the passed in files array
This commit is contained in:
Kevin Ansfield 2017-08-14 03:35:41 +01:00 committed by Aileen Nowak
parent 4e836d436f
commit b643d47054
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ghost/admin/app/components/gh-uploader.js
View File

@ -166,7 +166,7 @@ export default Component.extend({
// NOTE: for...of loop results in a transpilation that errors in Edge, // NOTE: for...of loop results in a transpilation that errors in Edge,
// once we drop IE11 support we should be able to use native for...of // once we drop IE11 support we should be able to use native for...of
for (let i = 0; i < files.length; i++) { for (let i = 0; i < files.length; i++) {
uploads.push(this.get('_uploadFile').perform(files[i])); uploads.push(this.get('_uploadFile').perform(files[i], i));
} }
// populates this.errors and this.uploadUrls // populates this.errors and this.uploadUrls
@ -179,7 +179,7 @@ export default Component.extend({
this.onComplete(this.get('uploadUrls')); this.onComplete(this.get('uploadUrls'));
}).drop(), }).drop(),
_uploadFile: task(function* (file) { _uploadFile: task(function* (file, index) {
let ajax = this.get('ajax'); let ajax = this.get('ajax');
let formData = this._getFormData(file); let formData = this._getFormData(file);
let url = `${ghostPaths().apiRoot}${this.get('uploadUrl')}`; let url = `${ghostPaths().apiRoot}${this.get('uploadUrl')}`;
@ -219,7 +219,7 @@ export default Component.extend({
url: uploadUrl url: uploadUrl
}; };
this.get('uploadUrls').pushObject(result); this.get('uploadUrls')[index] = result;
this.onUploadSuccess(result); this.onUploadSuccess(result);
return true; return true;

23
ghost/admin/tests/integration/components/gh-uploader-test.js
View File

@ -137,6 +137,29 @@ describe('Integration: Component: gh-uploader', function() {
expect(results[0].fileName).to.equal('file2.png'); expect(results[0].fileName).to.equal('file2.png');
}); });
it('onComplete returns results in same order as selected', async function () {
// first request has a delay to simulate larger file
server.post('/ghost/api/v0.1/uploads/', function () {
// second request has no delay to simulate small file
stubSuccessfulUpload(server, 0);
return [200, {'Content-Type': 'application/json'}, '"/content/images/test.png"'];
}, 100);
this.set('uploadsFinished', sinon.spy());
this.render(hbs`{{#gh-uploader files=files onComplete=(action uploadsFinished)}}{{/gh-uploader}}`);
this.set('files', [
createFile(['test'], {name: 'file1.png'}), // large - finishes last
createFile(['test'], {name: 'file2.png'}) // small - finishes first
]);
await wait();
let [results] = this.get('uploadsFinished').getCall(0).args;
expect(results.length).to.equal(2);
expect(results[0].fileName).to.equal('file1.png');
});
it('doesn\'t allow new files to be set whilst uploading', async function () { it('doesn\'t allow new files to be set whilst uploading', async function () {
let errorSpy = sinon.spy(console, 'error'); let errorSpy = sinon.spy(console, 'error');
stubSuccessfulUpload(server, 100); stubSuccessfulUpload(server, 100);