From 49446afb8212b9e5902a08a857f7628a9089c851 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Fri, 31 Mar 2017 10:30:10 +0100 Subject: [PATCH 1/4] Remove duplicate line --- .../coffee/ide/file-tree/controllers/FileTreeController.coffee | 1 - 1 file changed, 1 deletion(-) diff --git a/services/web/public/coffee/ide/file-tree/controllers/FileTreeController.coffee b/services/web/public/coffee/ide/file-tree/controllers/FileTreeController.coffee index 5c8b82e5ed..fb3335c04c 100644 --- a/services/web/public/coffee/ide/file-tree/controllers/FileTreeController.coffee +++ b/services/web/public/coffee/ide/file-tree/controllers/FileTreeController.coffee @@ -93,7 +93,6 @@ define [ if !name? or name.length == 0 return $scope.state.inflight = true - $scope.state.inflight = true ide.fileTreeManager .createFolder(name, parent_folder) .error (e)-> From 15d0a40f85291f20f56de7cd713e5e5f0d47580f Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Fri, 31 Mar 2017 10:30:28 +0100 Subject: [PATCH 2/4] When error occurs, unset `state.inflight` --- .../coffee/ide/file-tree/controllers/FileTreeController.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/services/web/public/coffee/ide/file-tree/controllers/FileTreeController.coffee b/services/web/public/coffee/ide/file-tree/controllers/FileTreeController.coffee index fb3335c04c..0702aa5d53 100644 --- a/services/web/public/coffee/ide/file-tree/controllers/FileTreeController.coffee +++ b/services/web/public/coffee/ide/file-tree/controllers/FileTreeController.coffee @@ -97,6 +97,7 @@ define [ .createFolder(name, parent_folder) .error (e)-> $scope.error = e + $scope.state.inflight = false .success () -> $scope.state.inflight = false $modalInstance.close() From 2c62acee0bb8082f69c558bb348b3d68406ee104 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Fri, 31 Mar 2017 10:31:03 +0100 Subject: [PATCH 3/4] Cleaner error reporting for `addFolder` endpoint --- .../app/coffee/Features/Editor/EditorHttpController.coffee | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/web/app/coffee/Features/Editor/EditorHttpController.coffee b/services/web/app/coffee/Features/Editor/EditorHttpController.coffee index 0c547e53ba..098d474172 100644 --- a/services/web/app/coffee/Features/Editor/EditorHttpController.coffee +++ b/services/web/app/coffee/Features/Editor/EditorHttpController.coffee @@ -96,8 +96,10 @@ module.exports = EditorHttpController = EditorController.addFolder project_id, parent_folder_id, name, "editor", (error, doc) -> if error == "project_has_to_many_files" res.status(400).json(req.i18n.translate("project_has_to_many_files")) + else if error.message == 'invalid element name' + res.status(400).json(req.i18n.translate('invalid_file_name')) else if error? - next(error) + res.status(500).json(req.i18n.translate('generic_something_went_wrong')) else res.json doc From cc81eca9028a0405727dbb681ff9d31b496f3312 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Fri, 31 Mar 2017 10:46:13 +0100 Subject: [PATCH 4/4] Account for error being null --- .../web/app/coffee/Features/Editor/EditorHttpController.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/app/coffee/Features/Editor/EditorHttpController.coffee b/services/web/app/coffee/Features/Editor/EditorHttpController.coffee index 098d474172..1323aefae9 100644 --- a/services/web/app/coffee/Features/Editor/EditorHttpController.coffee +++ b/services/web/app/coffee/Features/Editor/EditorHttpController.coffee @@ -96,7 +96,7 @@ module.exports = EditorHttpController = EditorController.addFolder project_id, parent_folder_id, name, "editor", (error, doc) -> if error == "project_has_to_many_files" res.status(400).json(req.i18n.translate("project_has_to_many_files")) - else if error.message == 'invalid element name' + else if error?.message == 'invalid element name' res.status(400).json(req.i18n.translate('invalid_file_name')) else if error? res.status(500).json(req.i18n.translate('generic_something_went_wrong'))