Skip to content

Commit 622c2d8

Browse files
authored
Merge pull request #1750 from processing/bug/file-uploads
[#1707] Fixes bug introduced by library migration
2 parents 2756433 + f13579f commit 622c2d8

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

client/modules/IDE/actions/files.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export function submitFile(formProps, files, parentId, projectId) {
8383
});
8484
}
8585

86-
export function handleCreateFile(formProps) {
86+
export function handleCreateFile(formProps, setSelected = true) {
8787
return (dispatch, getState) => {
8888
const state = getState();
8989
const { files } = state;
@@ -97,7 +97,9 @@ export function handleCreateFile(formProps) {
9797
if (updatedAt) dispatch(setProjectSavedTime(updatedAt));
9898
dispatch(closeNewFileModal());
9999
dispatch(setUnsavedChanges(true));
100-
dispatch(setSelectedFile(file.id));
100+
if (setSelected) {
101+
dispatch(setSelectedFile(file.id));
102+
}
101103
resolve();
102104
})
103105
.catch((error) => {

client/modules/IDE/actions/uploader.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import apiClient from '../../../utils/apiClient';
22
import getConfig from '../../../utils/getConfig';
3-
import { createFile } from './files';
3+
import { handleCreateFile } from './files';
44
import { TEXT_FILE_REGEX } from '../../../../server/utils/fileUtils';
55

66
const s3BucketHttps =
@@ -48,7 +48,7 @@ export function dropzoneAcceptCallback(userId, file, done) {
4848
if (file.name.match(TEXT_FILE_REGEX) && file.size < MAX_LOCAL_FILE_SIZE) {
4949
localIntercept(file)
5050
.then((result) => {
51-
file.content = result; // eslint-disable-line
51+
file.content = result; // eslint-disable-line
5252
done('Uploading plaintext file locally.');
5353
file.previewElement.classList.remove('dz-error');
5454
file.previewElement.classList.add('dz-success');
@@ -103,7 +103,7 @@ export function dropzoneSendingCallback(file, xhr, formData) {
103103
}
104104

105105
export function dropzoneCompleteCallback(file) {
106-
return (dispatch, getState) => { // eslint-disable-line
106+
return (dispatch) => { // eslint-disable-line
107107
if (
108108
(!file.name.match(TEXT_FILE_REGEX) || file.size >= MAX_LOCAL_FILE_SIZE) &&
109109
file.status !== 'error'
@@ -125,13 +125,13 @@ export function dropzoneCompleteCallback(file) {
125125
name: file.name,
126126
url: `${s3BucketHttps}${file.postData.key}`
127127
};
128-
createFile(formParams)(dispatch, getState);
128+
dispatch(handleCreateFile(formParams, false));
129129
} else if (file.content !== undefined) {
130130
const formParams = {
131131
name: file.name,
132132
content: file.content
133133
};
134-
createFile(formParams)(dispatch, getState);
134+
dispatch(handleCreateFile(formParams, false));
135135
}
136136
};
137137
}

client/modules/IDE/components/UploadFileModal.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const limit = getConfig('UPLOAD_LIMIT') || 250000000;
1313
const limitText = prettyBytes(limit);
1414

1515
class UploadFileModal extends React.Component {
16-
propTypes = {
16+
static propTypes = {
1717
reachedTotalSizeLimit: PropTypes.bool.isRequired,
1818
closeModal: PropTypes.func.isRequired,
1919
t: PropTypes.func.isRequired

0 commit comments

Comments
 (0)