r
/
p5.js-web-editor
1
0
Fork 0
Code Issues 1 Pull Requests Releases 1 Wiki Activity

Merge branch 'develop' into bug/sketch-name-character-limit

This commit is contained in:
Cassie Tarakajian 2020-08-05 18:19:33 -04:00 committed by GitHub
parent e77edb6ace df99edbc29
commit 2919db4d6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/modules/IDE/actions/files.js
View File

@ -160,7 +160,8 @@ export function deleteFile(id, parentId) {
}
};
apiClient.delete(`/projects/${state.project.id}/files/${id}`, deleteConfig)
.then(() => {
.then((response) => {
dispatch(setProjectSavedTime(response.data.project.updatedAt));
dispatch({
type: ActionTypes.DELETE_FILE,
id,

4
server/controllers/file.controller.js
View File

@ -103,8 +103,8 @@ export function deleteFile(req, res) {
const idsToDelete = getAllDescendantIds(project.files, req.params.file_id);
deleteMany(project.files, [req.params.file_id, ...idsToDelete]);
project.files = deleteChild(project.files, req.query.parentId, req.params.file_id);
project.save((innerErr) => {
res.json(project.files);
project.save((innerErr, savedProject) => {
res.json({ project: savedProject });
});
});
}