From 9e57523414b9972706733344b4a339f7123f5909 Mon Sep 17 00:00:00 2001 From: cpirich Date: Thu, 25 May 2017 12:08:58 -0700 Subject: [PATCH] update bramble, light-theme, files API feedback --- apps/package.json | 2 +- apps/src/weblab/brambleHost.js | 3 ++- apps/yarn.lock | 6 +++--- shared/middleware/files_api.rb | 14 +++++++++++--- shared/test/test_files.rb | 2 +- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/apps/package.json b/apps/package.json index 40e4613b1e9fc..689332b1276c4 100644 --- a/apps/package.json +++ b/apps/package.json @@ -42,7 +42,7 @@ "devDependencies": { "@cdo/apps": "file:src", "@code-dot-org/blockly": "1.6.19", - "@code-dot-org/bramble": "0.1.15", + "@code-dot-org/bramble": "0.1.16", "@code-dot-org/johnny-five": "0.10.10-cdo.0", "@code-dot-org/js-interpreter-tyrant": "0.2.2", "@code-dot-org/js-numbers": "0.1.0-cdo.0", diff --git a/apps/src/weblab/brambleHost.js b/apps/src/weblab/brambleHost.js index d4c5da78ee0c7..57d616486e358 100644 --- a/apps/src/weblab/brambleHost.js +++ b/apps/src/weblab/brambleHost.js @@ -496,12 +496,13 @@ function load(Bramble) { bramble_ = Bramble; Bramble.load("#bramble", { - url: "//downloads.computinginthecore.org/bramble_0.1.15/index.html?disableExtensions=bramble-move-file", + url: "//downloads.computinginthecore.org/bramble_0.1.16/index.html?disableExtensions=bramble-move-file", // DEVMODE: INSECURE (local) url: "../blockly/js/bramble/index.html?disableExtensions=bramble-move-file", // DEVMODE: INSECURE url: "http://127.0.0.1:8000/src/index.html?disableExtensions=bramble-move-file", useLocationSearch: true, disableUIState: true, initialUIState: { + theme: 'light-theme', readOnly: webLab_.getPageConstants().isReadOnlyWorkspace } }); diff --git a/apps/yarn.lock b/apps/yarn.lock index 980c13aeee6bc..74975785bd9eb 100644 --- a/apps/yarn.lock +++ b/apps/yarn.lock @@ -9,9 +9,9 @@ version "1.6.19" resolved "https://registry.yarnpkg.com/@code-dot-org/blockly/-/blockly-1.6.19.tgz#5b1e6eacf5ff3b6b41ae81772f2ce8145740ded4" -"@code-dot-org/bramble@0.1.15": - version "0.1.15" - resolved "https://registry.yarnpkg.com/@code-dot-org/bramble/-/bramble-0.1.15.tgz#4c550a49665df8f03b952fe432d4ef010631397d" +"@code-dot-org/bramble@0.1.16": + version "0.1.16" + resolved "https://registry.yarnpkg.com/@code-dot-org/bramble/-/bramble-0.1.16.tgz#9f0b904a15397750f88ce75d1036b86725ce115e" dependencies: autoprefixer-core "5.1.8" aws-sdk "^2.2.9" diff --git a/shared/middleware/files_api.rb b/shared/middleware/files_api.rb index bb1f19debc77e..3d33acedd1732 100644 --- a/shared/middleware/files_api.rb +++ b/shared/middleware/files_api.rb @@ -505,7 +505,12 @@ def files_put_file(encrypted_channel_id, filename, body) not_found if src_entry.nil? new_entry_json = src_entry.to_json else - new_entry_json = copy_file('files', encrypted_channel_id, URI.encode(unescaped_filename_downcased), URI.encode(unescaped_src_filename_downcased)) + new_entry_json = copy_file( + 'files', + encrypted_channel_id, + URI.encode(unescaped_filename_downcased), + URI.encode(unescaped_src_filename_downcased) + ) end else new_entry_json = put_file('files', encrypted_channel_id, URI.encode(unescaped_filename_downcased), body) @@ -523,7 +528,8 @@ def files_put_file(encrypted_channel_id, filename, body) manifest_is_unchanged = false end - deleting_separate_file = unescaped_delete_filename_downcased && unescaped_delete_filename_downcased != unescaped_filename_downcased + deleting_separate_file = unescaped_delete_filename_downcased && + unescaped_delete_filename_downcased != unescaped_filename_downcased # if we're also deleting a file (on rename), remove it from the manifest (don't remove from manifest) if deleting_separate_file reject_result = manifest.reject! {|e| e['filename'].downcase == unescaped_delete_filename_downcased} @@ -541,7 +547,9 @@ def files_put_file(encrypted_channel_id, filename, body) end # delete a file if requested (same as src file in a rename operation) - bucket.delete(encrypted_channel_id, URI.encode(unescaped_delete_filename_downcased)) if deleting_separate_file + if deleting_separate_file + bucket.delete(encrypted_channel_id, URI.encode(unescaped_delete_filename_downcased)) + end # return the new entry info new_entry_hash['filesVersionId'] = response.version_id diff --git a/shared/test/test_files.rb b/shared/test/test_files.rb index d5f1eb9482d2d..b7d0188b0c865 100644 --- a/shared/test/test_files.rb +++ b/shared/test/test_files.rb @@ -474,7 +474,7 @@ def test_rename_case_only assert_fileinfo_equal(expected_image_info_after_rename, file_infos_after_rename[0]) # The manifest version (filesVersionId) should be different, but the file version should be the same - assert response_before_rename['filesVersionId'] != response_after_rename['filesVersionId'] + refute_equal response_before_rename['filesVersionId'], response_after_rename['filesVersionId'] assert_equal file_infos[0]['versionId'], file_infos_after_rename[0]['versionId'] @api.delete_object(escaped_filename2)