@uppy/utils: fix relativePath when drag&dropping a folder
#4043
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aduh95
added
safe to test
Murderlon
approved these changes
Aug 24, 2022
github-actions
bot
removed
pending end-to-end tests
safe to test
arturi
reviewed
Aug 24, 2022
| // For each dropped item, - make sure it's a file/directory, and start deepening in! | ||
| if (entry.kind === 'file') { | ||
| const file = await entry.getFile() | ||
| if (file !== null) { | ||
| file.relativePath = getRelativePath(entry) | ||
| file.relativePath = relativePath ? `${relativePath}/${entry.name}` : null |
There was a problem hiding this comment.
Can we use ?? here instead?
There was a problem hiding this comment.
You only can if we would take relativePath as is, since we don't, it has to be a ternary.
arturi
approved these changes
Aug 24, 2022
github-actions bot
added a commit
that referenced
this pull request
Aug 30, 2022
| Package | Version | Package | Version | | ------------- | ------- | ------------- | ------- | | @uppy/tus | 2.4.4 | @uppy/robodog | 2.9.4 | | @uppy/utils | 4.1.3 | uppy | 2.13.5 | - @uppy/utils: fix `relativePath` when drag&dropping a folder (Antoine du Hamel / #4043) - @uppy/tus: avoid crashing when Tus client reports an error (Antoine du Hamel / #4019)
Merged
github-actions bot
added a commit
that referenced
this pull request
Aug 30, 2022
| Package | Version | Package | Version | | ------------------------- | ------- | ------------------------- | ------- | | @uppy/angular | 0.4.1 | @uppy/store-default | 3.0.1 | | @uppy/audio | 1.0.1 | @uppy/store-redux | 3.0.1 | | @uppy/aws-s3 | 3.0.1 | @uppy/svelte | 3.0.0 | | @uppy/aws-s3-multipart | 3.0.1 | @uppy/thumbnail-generator | 3.0.1 | | @uppy/companion | 4.0.1 | @uppy/transloadit | 3.0.1 | | @uppy/companion-client | 3.0.1 | @uppy/tus | 3.0.1 | | @uppy/core | 3.0.1 | @uppy/utils | 5.0.1 | | @uppy/dashboard | 3.0.1 | @uppy/webcam | 3.1.0 | | @uppy/react | 3.0.1 | @uppy/xhr-upload | 3.0.1 | | @uppy/remote-sources | 1.0.1 | uppy | 3.0.1 | - @uppy/dashboard,@uppy/webcam: add nativeCameraFacingMode to Webcam and Dashboard (Artur Paikin / #4047) - meta: upgrade to Jest 29 (Antoine du Hamel / #4049) - @uppy/svelte: update peer dependencies (Antoine du Hamel / #4065) - @uppy/react: useUppy: fix unmount on NextJS dev mode (Matt Jesuele / #4062) - @uppy/vue: fix missing component in docs (Antoine du Hamel / #4063) - @uppy/angular: fix compiler warning (Antoine du Hamel / #4064) - meta: improve CI npm install time (Antoine du Hamel / #4058) - meta: example: fix Angular example package name (Antoine du Hamel / #4060) - meta: upgrade to TypeScript 4.8 (Antoine du Hamel / #4048) - @uppy/core,@uppy/dashboard,@uppy/thumbnail-generator: update definition type files for TS 4.8 compatibility (Antoine du Hamel / #4055) - @uppy/transloadit: improve deprecation notice (Antoine du Hamel / #4056) - @uppy/thumbnail-generator: fix `exifr` import (Antoine du Hamel / #4054) - @uppy/utils: fix `relativePath` when drag&dropping a folder (Antoine du Hamel / #4043) - @uppy/companion: Fix Companion license (Merlijn Vos / #4044) - e2e: add tests for AWS (Antoine du Hamel / #3665) - meta: Only publish Companion to Dockerhub on release (Merlijn Vos / #4037) - meta: fix linter warnings (Antoine du Hamel / #4039) - @uppy/utils: Post-release website fixes (Merlijn Vos / #4038) - @uppy/angular: fix peer dependencies (Antoine du Hamel / #4035) - meta: uppy.io homepage: Add Tus (Artur Paikin) - meta: Fix uppy.io homepage example (Artur Paikin)
2 tasks
HeavenFox
pushed a commit
to docsend/uppy
that referenced
this pull request
Jun 27, 2023
| Package | Version | Package | Version | | ------------------------- | ------- | ------------------------- | ------- | | @uppy/angular | 0.4.1 | @uppy/store-default | 3.0.1 | | @uppy/audio | 1.0.1 | @uppy/store-redux | 3.0.1 | | @uppy/aws-s3 | 3.0.1 | @uppy/svelte | 3.0.0 | | @uppy/aws-s3-multipart | 3.0.1 | @uppy/thumbnail-generator | 3.0.1 | | @uppy/companion | 4.0.1 | @uppy/transloadit | 3.0.1 | | @uppy/companion-client | 3.0.1 | @uppy/tus | 3.0.1 | | @uppy/core | 3.0.1 | @uppy/utils | 5.0.1 | | @uppy/dashboard | 3.0.1 | @uppy/webcam | 3.1.0 | | @uppy/react | 3.0.1 | @uppy/xhr-upload | 3.0.1 | | @uppy/remote-sources | 1.0.1 | uppy | 3.0.1 | - @uppy/dashboard,@uppy/webcam: add nativeCameraFacingMode to Webcam and Dashboard (Artur Paikin / transloadit#4047) - meta: upgrade to Jest 29 (Antoine du Hamel / transloadit#4049) - @uppy/svelte: update peer dependencies (Antoine du Hamel / transloadit#4065) - @uppy/react: useUppy: fix unmount on NextJS dev mode (Matt Jesuele / transloadit#4062) - @uppy/vue: fix missing component in docs (Antoine du Hamel / transloadit#4063) - @uppy/angular: fix compiler warning (Antoine du Hamel / transloadit#4064) - meta: improve CI npm install time (Antoine du Hamel / transloadit#4058) - meta: example: fix Angular example package name (Antoine du Hamel / transloadit#4060) - meta: upgrade to TypeScript 4.8 (Antoine du Hamel / transloadit#4048) - @uppy/core,@uppy/dashboard,@uppy/thumbnail-generator: update definition type files for TS 4.8 compatibility (Antoine du Hamel / transloadit#4055) - @uppy/transloadit: improve deprecation notice (Antoine du Hamel / transloadit#4056) - @uppy/thumbnail-generator: fix `exifr` import (Antoine du Hamel / transloadit#4054) - @uppy/utils: fix `relativePath` when drag&dropping a folder (Antoine du Hamel / transloadit#4043) - @uppy/companion: Fix Companion license (Merlijn Vos / transloadit#4044) - e2e: add tests for AWS (Antoine du Hamel / transloadit#3665) - meta: Only publish Companion to Dockerhub on release (Merlijn Vos / transloadit#4037) - meta: fix linter warnings (Antoine du Hamel / transloadit#4039) - @uppy/utils: Post-release website fixes (Merlijn Vos / transloadit#4038) - @uppy/angular: fix peer dependencies (Antoine du Hamel / transloadit#4035) - meta: uppy.io homepage: Add Tus (Artur Paikin) - meta: Fix uppy.io homepage example (Artur Paikin)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Unfortunately Cypress doesn't let us test drag&drop of folders, but I've tested it manually and can confirm the behavior is the same as on uppy@2.13.2.
Fixes: #4041