@uppy/core: do not crash if a file is removed before the upload starts #4148
+6
−0
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
Murderlon
requested changes
Oct 19, 2022
There was a problem hiding this comment.
I still think it's better to align with our existing patterns and remove all of this in favor of a single if (uppy.getFile(fileId) === null) return undefined
hasBeenRemoved is a super temporary state, it's just to mutate a file quickly enough to realize it elsewhere, but afterwards the whole file will be gone, making it "removed" already.
Murderlon
reviewed
Oct 19, 2022
packages/@uppy/core/src/Uppy.js
Outdated
| @@ -181,8 +181,8 @@ class Uppy { | |||
| /** | |||
| * Shorthand to set state for a specific file. | |||
| */ | |||
| setFileState (fileID, state) { | |||
| if (!this.getState().files[fileID]) { | |||
| setFileState (fileID, state, checkIfFileExist = true) { | |||
There was a problem hiding this comment.
Personally I'd take a single extra negligible computation over adding a new parameter to a function. Will there every be a case outside this? Is it worth making a function more complex?
Murderlon
approved these changes
Oct 19, 2022
github-actions bot
added a commit
that referenced
this pull request
Oct 19, 2022
| Package | Version | Package | Version | | ---------------------- | ------- | ---------------------- | ------- | | @uppy/angular | 0.3.3 | @uppy/tus | 2.4.5 | | @uppy/aws-s3 | 2.2.3 | uppy | 2.13.7 | | @uppy/golden-retriever | 2.1.3 | | | - @uppy/core: do not crash if a file is removed before the upload starts (Antoine du Hamel / #4148) - @uppy/xhr-upload: fix `Timed out waiting for socket` (Antoine du Hamel / #4150) - @uppy/golden-retriever: Fix retry upload with Golden Retriever (Merlijn Vos / #4155) - @uppy/aws-s3: fix `Cannot mark a queued request as done` in `MiniXHRUpload` (Antoine du Hamel / #4151) - @uppy/angular: remove unnecessary `console.log` call (Antoine du Hamel / #4139)
Merged
aduh95
added a commit
that referenced
this pull request
Oct 19, 2022
| Package | Version | Package | Version | | ---------------------- | ------- | ---------------------- | ------- | | @uppy/angular | 0.4.3 | @uppy/tus | 3.0.3 | | @uppy/aws-s3 | 3.0.3 | @uppy/url | 3.1.0 | | @uppy/companion | 4.0.4 | @uppy/webcam | 3.2.1 | | @uppy/core | 3.0.3 | @uppy/xhr-upload | 3.0.3 | | @uppy/golden-retriever | 3.0.2 | uppy | 3.2.0 | | @uppy/locales | 3.0.2 | | | - @uppy/webcam: fix bug when Dashboard is using a custom id (Antoine du Hamel / #4099) - @uppy/url: refactor `UrlUI` (Antoine du Hamel / #4143) - @uppy/url: trim whitespace around user input (Andrew McIntee / #4143) - @uppy/core: do not crash if a file is removed before the upload starts (Antoine du Hamel / #4148) - @uppy/xhr-upload: fix `Timed out waiting for socket` (Antoine du Hamel / #4150) - @uppy/golden-retriever: Fix retry upload with Golden Retriever (Merlijn Vos / #4155) - @uppy/aws-s3,@uppy/xhr-upload: fix `Cannot mark a queued request as done` in `MiniXHRUpload` (Antoine du Hamel / #4151) - meta: add a CI check to validate `yarn.lock` (Antoine du Hamel / #4154) - meta: fix outdated `yarn.lock` (Antoine du Hamel / #4153) - meta: fix `transloadit-xhr` dev example (Antoine du Hamel / #4149) - meta: Add example for Uppy with S3 and a Node.js server (Raúl Ibáñez / #4129) - @uppy/locales: Fix duplicate keys in UK_UA.js (Murderlon) - @uppy/companion: add workaround for S3 accelerated endpoints (Mikael Finstad / #4140) - @uppy/locales: Add missing Ukrainian locale entries (Andrii Bodnar / #4145) - @uppy/angular: remove unnecessary `console.log` call (Antoine du Hamel / #4139) - meta: fix bundlers workflow (Antoine du Hamel / #4144) - meta: fix default sources (Mikael Finstad / #4134) - @uppy/locales: Update pl_PL.js (Daniel Kamiński / #4136) - @uppy/core: Fix Uppy.cancelAll and Uppy.close types (Sven Grunewaldt / #4128) - @uppy/companion: fix error message (Mikael Finstad / #4125) - @uppy/xhr-upload: queue requests for socket token for remote files (Daniel Jones / #4123) Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
aduh95
added a commit
that referenced
this pull request
Oct 19, 2022
| Package | Version | Package | Version | | ---------------------- | ------- | ---------------------- | ------- | | @uppy/angular | 0.4.3 | @uppy/tus | 3.0.3 | | @uppy/aws-s3 | 3.0.3 | @uppy/url | 3.1.0 | | @uppy/companion | 4.0.4 | @uppy/webcam | 3.2.1 | | @uppy/core | 3.0.3 | @uppy/xhr-upload | 3.0.3 | | @uppy/golden-retriever | 3.0.2 | uppy | 3.2.0 | | @uppy/locales | 3.0.2 | | | - @uppy/webcam: fix bug when Dashboard is using a custom id (Antoine du Hamel / #4099) - @uppy/url: refactor `UrlUI` (Antoine du Hamel / #4143) - @uppy/url: trim whitespace around user input (Andrew McIntee / #4143) - @uppy/core: do not crash if a file is removed before the upload starts (Antoine du Hamel / #4148) - @uppy/xhr-upload: fix `Timed out waiting for socket` (Antoine du Hamel / #4150) - @uppy/golden-retriever: Fix retry upload with Golden Retriever (Merlijn Vos / #4155) - @uppy/aws-s3,@uppy/xhr-upload: fix `Cannot mark a queued request as done` in `MiniXHRUpload` (Antoine du Hamel / #4151) - meta: add a CI check to validate `yarn.lock` (Antoine du Hamel / #4154) - meta: fix outdated `yarn.lock` (Antoine du Hamel / #4153) - meta: fix `transloadit-xhr` dev example (Antoine du Hamel / #4149) - meta: Add example for Uppy with S3 and a Node.js server (Raúl Ibáñez / #4129) - @uppy/locales: Fix duplicate keys in UK_UA.js (Murderlon) - @uppy/companion: add workaround for S3 accelerated endpoints (Mikael Finstad / #4140) - @uppy/locales: Add missing Ukrainian locale entries (Andrii Bodnar / #4145) - @uppy/angular: remove unnecessary `console.log` call (Antoine du Hamel / #4139) - meta: fix bundlers workflow (Antoine du Hamel / #4144) - meta: fix default sources (Mikael Finstad / #4134) - @uppy/locales: Update pl_PL.js (Daniel Kamiński / #4136) - @uppy/core: Fix Uppy.cancelAll and Uppy.close types (Sven Grunewaldt / #4128) - @uppy/companion: fix error message (Mikael Finstad / #4125) - @uppy/xhr-upload: queue requests for socket token for remote files (Daniel Jones / #4123) Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
aduh95
changed the title
hasBeenRemoved flag to UppyFile
HeavenFox
pushed a commit
to docsend/uppy
that referenced
this pull request
Jun 27, 2023
| Package | Version | Package | Version | | ---------------------- | ------- | ---------------------- | ------- | | @uppy/angular | 0.4.3 | @uppy/tus | 3.0.3 | | @uppy/aws-s3 | 3.0.3 | @uppy/url | 3.1.0 | | @uppy/companion | 4.0.4 | @uppy/webcam | 3.2.1 | | @uppy/core | 3.0.3 | @uppy/xhr-upload | 3.0.3 | | @uppy/golden-retriever | 3.0.2 | uppy | 3.2.0 | | @uppy/locales | 3.0.2 | | | - @uppy/webcam: fix bug when Dashboard is using a custom id (Antoine du Hamel / transloadit#4099) - @uppy/url: refactor `UrlUI` (Antoine du Hamel / transloadit#4143) - @uppy/url: trim whitespace around user input (Andrew McIntee / transloadit#4143) - @uppy/core: do not crash if a file is removed before the upload starts (Antoine du Hamel / transloadit#4148) - @uppy/xhr-upload: fix `Timed out waiting for socket` (Antoine du Hamel / transloadit#4150) - @uppy/golden-retriever: Fix retry upload with Golden Retriever (Merlijn Vos / transloadit#4155) - @uppy/aws-s3,@uppy/xhr-upload: fix `Cannot mark a queued request as done` in `MiniXHRUpload` (Antoine du Hamel / transloadit#4151) - meta: add a CI check to validate `yarn.lock` (Antoine du Hamel / transloadit#4154) - meta: fix outdated `yarn.lock` (Antoine du Hamel / transloadit#4153) - meta: fix `transloadit-xhr` dev example (Antoine du Hamel / transloadit#4149) - meta: Add example for Uppy with S3 and a Node.js server (Raúl Ibáñez / transloadit#4129) - @uppy/locales: Fix duplicate keys in UK_UA.js (Murderlon) - @uppy/companion: add workaround for S3 accelerated endpoints (Mikael Finstad / transloadit#4140) - @uppy/locales: Add missing Ukrainian locale entries (Andrii Bodnar / transloadit#4145) - @uppy/angular: remove unnecessary `console.log` call (Antoine du Hamel / transloadit#4139) - meta: fix bundlers workflow (Antoine du Hamel / transloadit#4144) - meta: fix default sources (Mikael Finstad / transloadit#4134) - @uppy/locales: Update pl_PL.js (Daniel Kamiński / transloadit#4136) - @uppy/core: Fix Uppy.cancelAll and Uppy.close types (Sven Grunewaldt / transloadit#4128) - @uppy/companion: fix error message (Mikael Finstad / transloadit#4125) - @uppy/xhr-upload: queue requests for socket token for remote files (Daniel Jones / transloadit#4123) Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
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.
No description provided.