From 2ce5312d2611d6027683d490afeff9720cdc0b80 Mon Sep 17 00:00:00 2001 From: Aman Harwara Date: Thu, 24 Mar 2022 22:19:06 +0530 Subject: [PATCH 1/3] chore: update dependencies --- package.json | 4 ++-- yarn.lock | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index f14a9bc09e3..eff64497d75 100644 --- a/package.json +++ b/package.json @@ -73,10 +73,10 @@ "@reach/tooltip": "^0.16.2", "@standardnotes/components": "1.7.13", "@standardnotes/features": "1.35.6", - "@standardnotes/filepicker": "1.10.2", + "@standardnotes/filepicker": "1.10.3", "@standardnotes/settings": "1.13.1", "@standardnotes/sncrypto-web": "1.8.0", - "@standardnotes/snjs": "2.92.0", + "@standardnotes/snjs": "2.92.1", "@zip.js/zip.js": "^2.4.7", "mobx": "^6.5.0", "mobx-react-lite": "^3.3.0", diff --git a/yarn.lock b/yarn.lock index 02dbdbcb731..282b0357a1a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2430,10 +2430,10 @@ "@standardnotes/auth" "^3.18.0" "@standardnotes/common" "^1.17.0" -"@standardnotes/filepicker@1.10.2": - version "1.10.2" - resolved "https://registry.yarnpkg.com/@standardnotes/filepicker/-/filepicker-1.10.2.tgz#4e2d76a327e61c5d864ce6e0597786caa83f2e20" - integrity sha512-+3LCaU7CH5gzZJBd6mXajx4ztdIVax8fqk49poHXRQd/mMIc36cOfCwbLlJeT4X6GL7UMLktieZZQqtG7hmRdw== +"@standardnotes/filepicker@1.10.3": + version "1.10.3" + resolved "https://registry.yarnpkg.com/@standardnotes/filepicker/-/filepicker-1.10.3.tgz#7384cf40e5ee6b685ea4773cd7857530f11f9d3a" + integrity sha512-95XYq3f758jiut9L4wmd4pC8UariaWUMuGtZB1NDPWm/qgO9ig117hrL7sMN7NU5hRqdt+f6O9xpO7zOoTblrQ== "@standardnotes/payloads@^1.4.20": version "1.4.20" @@ -2484,10 +2484,10 @@ buffer "^6.0.3" libsodium-wrappers "^0.7.9" -"@standardnotes/snjs@2.92.0": - version "2.92.0" - resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.92.0.tgz#92b926982a014f2584264bfcdb428347f7498c51" - integrity sha512-AlQiF2ToDAOdUdVhc8IGg6F9VCGqUKdWXdOPUzM9gB+vmSNz51cGz3CE0vaO0HfZ7bq7vav9wJ4EFIx8wSD04g== +"@standardnotes/snjs@2.92.1": + version "2.92.1" + resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.92.1.tgz#2a28dbff01b4982de0e6b2eb52c3438546e643b5" + integrity sha512-dJrVl71jecn64iKcfLTwtgCquZGPx+L96EMAp0v1xGYpNREB9qySJW1kWGQukiMrjXbcJYnB7TKNXoerdD6fOg== dependencies: "@standardnotes/applications" "^1.2.6" "@standardnotes/auth" "^3.18.0" From 86558ad1a10a078ad27f23fa407790352808842f Mon Sep 17 00:00:00 2001 From: Aman Harwara Date: Thu, 24 Mar 2022 22:19:19 +0530 Subject: [PATCH 2/3] fix: error on abort file selection --- app/assets/javascripts/ui_models/app_state/files_state.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/javascripts/ui_models/app_state/files_state.ts b/app/assets/javascripts/ui_models/app_state/files_state.ts index 414f26e876d..a2b80ba0833 100644 --- a/app/assets/javascripts/ui_models/app_state/files_state.ts +++ b/app/assets/javascripts/ui_models/app_state/files_state.ts @@ -93,6 +93,10 @@ export class FilesState { ? await StreamingFileReader.getFilesFromHandles([fileOrHandle]) : await picker.selectFiles(); + if (!selectedFiles.length) { + return; + } + const uploadedFiles: SNFile[] = []; for (const file of selectedFiles) { From ca4f06d45fe93bd29419ed12a577000bed53b0a4 Mon Sep 17 00:00:00 2001 From: Aman Harwara Date: Thu, 24 Mar 2022 22:23:40 +0530 Subject: [PATCH 3/3] feat: explicitly check if selectedFiles length is 0 Co-authored-by: Mo --- app/assets/javascripts/ui_models/app_state/files_state.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/ui_models/app_state/files_state.ts b/app/assets/javascripts/ui_models/app_state/files_state.ts index a2b80ba0833..7503fd7aaac 100644 --- a/app/assets/javascripts/ui_models/app_state/files_state.ts +++ b/app/assets/javascripts/ui_models/app_state/files_state.ts @@ -93,7 +93,7 @@ export class FilesState { ? await StreamingFileReader.getFilesFromHandles([fileOrHandle]) : await picker.selectFiles(); - if (!selectedFiles.length) { + if (selectedFiles.length === 0) { return; }