Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

@uppy/core: check capabilities in clearUploadedFiles #5201

Merged
merged 3 commits into from
May 30, 2024

Conversation

Murderlon
Copy link
Member

Found out while working on #5158 that we block removeFiles during on upload if capabilities.individualCancellation is false but we blindly allow it in clearUploadedFiles.

@Murderlon Murderlon requested review from mifi and aduh95 May 28, 2024 17:03
@Murderlon Murderlon self-assigned this May 28, 2024
Copy link
Contributor

github-actions bot commented May 28, 2024

Diff output files
diff --git a/packages/@uppy/core/lib/Uppy.js b/packages/@uppy/core/lib/Uppy.js
index 6036373..953e090 100644
--- a/packages/@uppy/core/lib/Uppy.js
+++ b/packages/@uppy/core/lib/Uppy.js
@@ -331,6 +331,13 @@ export class Uppy {
     this.emit("reset-progress");
   }
   clearUploadedFiles() {
+    const {
+      capabilities,
+      currentUploads,
+    } = this.getState();
+    if (Object.keys(currentUploads).length > 0 && !capabilities.individualCancellation) {
+      throw new Error("The installed uploader plugin does not allow removing files during an upload.");
+    }
     this.setState({
       ...defaultUploadState,
       files: {},
@@ -600,7 +607,7 @@ export class Uppy {
         capabilities,
       } = this.getState();
       if (newFileIDs.length !== currentUploads[uploadID].fileIDs.length && !capabilities.individualCancellation) {
-        throw new Error("individualCancellation is disabled");
+        throw new Error("The installed uploader plugin does not allow removing files during an upload.");
       }
       updatedUploads[uploadID] = {
         ...currentUploads[uploadID],

Copy link
Member

@aduh95 aduh95 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess it would be nice to have more DRY code to avoid this happening again, but the change LGTM nonetheless

@Murderlon Murderlon merged commit 54700c9 into main May 30, 2024
17 checks passed
@Murderlon Murderlon deleted the clearUploadedFiles-capabilites branch May 30, 2024 13:56
@github-actions github-actions bot mentioned this pull request Jun 4, 2024
github-actions bot added a commit that referenced this pull request Jun 4, 2024
| Package                | Version | Package                | Version |
| ---------------------- | ------- | ---------------------- | ------- |
| @uppy/aws-s3-multipart |  3.12.0 | @uppy/webcam           |   3.4.2 |
| @uppy/core             |  3.12.0 | uppy                   |  3.26.0 |
| @uppy/transloadit      |   3.7.0 |                        |         |

- meta: remove Companion's `prepublishOnly` (Mikael Finstad / #5220)
- docs: document clearUploadedFiles (Merlijn Vos / #5204)
- @uppy/webcam: add missing types for `recordedVideo` (Antoine du Hamel / #5208)
- @uppy/core: check capabilities in clearUploadedFiles (Merlijn Vos / #5201)
- @uppy/core: PartialTree - change the `maxTotalFileSize` error (Evgenia Karunus / #5203)
- @uppy/transloadit: remove `updateNumberOfFilesInAssembly` (Merlijn Vos / #5202)
- @uppy/aws-s3: resolve all headers on response (Merlijn Vos / #5195)
- docs: Improve provider docs: OneDrive (Evgenia Karunus / #5196)
Murderlon added a commit that referenced this pull request Jun 5, 2024
* 4.x:
  meta: fix AWS test suite (#5229)
  Release: uppy@4.0.0-beta.10 (#5225)
  Release: uppy@3.26.0 (#5223)
  meta: remove Companion's `prepublishOnly` (#5220)
  docs: document clearUploadedFiles (#5204)
  @uppy/webcam: add missing types for `recordedVideo` (#5208)
  @uppy/core: check capabilities in clearUploadedFiles (#5201)
  PartialTree - change the `maxTotalFileSize` error (#5203)
  @uppy/transloadit: remove `updateNumberOfFilesInAssembly` (#5202)
  @uppy/aws-s3: resolve all headers on response (#5195)
  Improve provider docs: OneDrive (#5196)
Murderlon added a commit that referenced this pull request Jun 10, 2024
* main: (262 commits)
  Release: uppy@3.26.0 (#5223)
  meta: remove Companion's `prepublishOnly` (#5220)
  docs: document clearUploadedFiles (#5204)
  @uppy/webcam: add missing types for `recordedVideo` (#5208)
  @uppy/core: check capabilities in clearUploadedFiles (#5201)
  PartialTree - change the `maxTotalFileSize` error (#5203)
  @uppy/transloadit: remove `updateNumberOfFilesInAssembly` (#5202)
  @uppy/aws-s3: resolve all headers on response (#5195)
  Improve provider docs: OneDrive (#5196)
  Release: uppy@3.25.5 (#5193)
  @uppy/transloadit: do not cancel assembly when removing all files (#5191)
  @uppy/xhr-upload: fix regression for lowercase HTTP methods (#5179)
  meta: improve changelog generator (#5190)
  Release: uppy@3.25.4 (#5188)
  @uppy/svelte: do not attempt removing plugin before it's created (#5186)
  Update facebook.mdx
  fixup! @uppy/tus: fix no headers passed to companion if argument is a function (#5182)
  @uppy/tus: fix no headers passed to companion if argument is a function (#5182)
  @uppy/companion: fix google drive gsuite export large size (#5144)
  Improve provider docs: Box & Zoom (#5166)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants