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

Companion: bring back default upload protocol #3967

Merged
merged 6 commits into from Aug 11, 2022
Merged

Companion: bring back default upload protocol #3967

merged 6 commits into from Aug 11, 2022

Conversation

mifi
Copy link
Contributor

@mifi mifi commented Aug 10, 2022

add (failing) e2e test for remote xhr (multipart)
i just copy pasted tus tests and adjusted a bit. should we reuse instead?
regression caused by #3834

also:

  • explicitly add protocol: 'multipart' in the client so we can possibly remove the default value in companion in the future (breaking)

@mifi mifi requested a review from Murderlon August 10, 2022 12:43
@mifi
Copy link
Contributor Author

mifi commented Aug 10, 2022

ok, tests failed without fix. pushed fix (reverse commit c7e61dd)

@mifi mifi changed the title add (failing) e2e test for remote xhr (multipart) add (failing) e2e test for remote xhr (multipart) and fix regression Aug 10, 2022
@Murderlon Murderlon changed the title add (failing) e2e test for remote xhr (multipart) and fix regression Companion: bring back default upload protocol Aug 10, 2022
@mifi
Copy link
Contributor Author

mifi commented Aug 10, 2022

not sure if i broke "dashboard with transloadit -> should emit one assembly-cancelled event when cancelled" test with the reverted commit or if it's an unstable test

@mifi
Copy link
Contributor Author

mifi commented Aug 10, 2022

ok it was indeed an unstable test, i re-ran and it succeeded

@mifi mifi merged commit 31a9e0c into main Aug 11, 2022
@mifi mifi deleted the e2e-multipart branch August 11, 2022 10:09
This was referenced Aug 16, 2022
github-actions bot added a commit that referenced this pull request Aug 16, 2022
| Package                   |      Version | Package                   |      Version |
| ------------------------- | ------------ | ------------------------- | ------------ |
| @uppy/audio               | 1.0.0-beta.2 | @uppy/progress-bar        | 3.0.0-beta.2 |
| @uppy/aws-s3              | 3.0.0-beta.3 | @uppy/provider-views      | 3.0.0-beta.3 |
| @uppy/aws-s3-multipart    | 3.0.0-beta.4 | @uppy/react               | 3.0.0-beta.4 |
| @uppy/box                 | 2.0.0-beta.2 | @uppy/redux-dev-tools     | 3.0.0-beta.2 |
| @uppy/companion           | 4.0.0-beta.4 | @uppy/remote-sources      | 1.0.0-beta.4 |
| @uppy/companion-client    | 3.0.0-beta.2 | @uppy/screen-capture      | 3.0.0-beta.3 |
| @uppy/compressor          | 1.0.0-beta.3 | @uppy/status-bar          | 3.0.0-beta.3 |
| @uppy/core                | 3.0.0-beta.4 | @uppy/store-default       | 3.0.0-beta.3 |
| @uppy/dashboard           | 3.0.0-beta.4 | @uppy/store-redux         | 3.0.0-beta.3 |
| @uppy/drag-drop           | 3.0.0-beta.2 | @uppy/svelte              | 2.0.0-beta.2 |
| @uppy/drop-target         | 2.0.0-beta.3 | @uppy/thumbnail-generator | 3.0.0-beta.2 |
| @uppy/dropbox             | 3.0.0-beta.2 | @uppy/transloadit         | 3.0.0-beta.5 |
| @uppy/facebook            | 3.0.0-beta.2 | @uppy/tus                 | 3.0.0-beta.3 |
| @uppy/file-input          | 3.0.0-beta.2 | @uppy/unsplash            | 3.0.0-beta.2 |
| @uppy/form                | 3.0.0-beta.2 | @uppy/url                 | 3.0.0-beta.3 |
| @uppy/golden-retriever    | 3.0.0-beta.2 | @uppy/utils               | 5.0.0-beta.1 |
| @uppy/google-drive        | 3.0.0-beta.2 | @uppy/vue                 | 1.0.0-beta.2 |
| @uppy/image-editor        | 2.0.0-beta.3 | @uppy/webcam              | 3.0.0-beta.3 |
| @uppy/informer            | 3.0.0-beta.3 | @uppy/xhr-upload          | 3.0.0-beta.3 |
| @uppy/instagram           | 3.0.0-beta.2 | @uppy/zoom                | 2.0.0-beta.2 |
| @uppy/locales             | 3.0.0-beta.4 | uppy                      | 3.0.0-beta.5 |
| @uppy/onedrive            | 3.0.0-beta.2 |                           |              |

- meta: prepare release workflow for beta versions (Antoine du Hamel)
- @uppy/provider-views: Reset filter input correctly in provider views (Merlijn Vos / #3978)
- @uppy/aws-s3-multipart: Fix when using Companion (Merlijn Vos / #3969)
- @uppy/companion: Companion: bring back default upload protocol (Mikael Finstad / #3967)
- meta: Update CONTRIBUTING.md (Mikael Finstad / #3966)
- meta: fix contributing link (Mikael Finstad / #3968)
- @uppy/companion: enforce usage of uploadUrls (Mikael Finstad / #3965)
- @uppy/utils: Fix webp mimetype (Merlijn Vos / #3961)
- @uppy/locales: Add compressor string translation to Japanese locale (kenken / #3963)
- meta: Fix statement about cropping images in README.md (Mikael Finstad / #3964)
- @uppy/aws-s3-multipart: Fix race condition in `#uploadParts` (Morgan Zolob / #3955)
- @uppy/provider-views: core validateRestrictions: return error directly vs the result/reason obj (Artur Paikin / #3951)
- @uppy/aws-s3: Export AwsS3UploadParameters & AwsS3Options interfaces (Antonina Vertsinskaya / #3956)
- website: convert all website examples to ESM (Antoine du Hamel / #3957)
- @uppy/companion: fix crash if redis disconnects (Mikael Finstad / #3954)
- @uppy/companion: upgrade `ws` version (Antoine du Hamel / #3949)
- @uppy/companion: sort Dropbox response & refactor to async/await (Mikael Finstad / #3897)
- @uppy/utils: modernize `getDroppedFiles` (Antoine du Hamel / #3534)
- @uppy/companion: fix default getKey for non-standalone too (Mikael Finstad / #3945)
- @uppy/aws-s3-multipart: ignore exception inside `abortMultipartUpload` (Antoine du Hamel / #3950)
- @uppy/companion: remove `isobject` from dependencies (Antoine du Hamel / #3948)
- @uppy/compressor: Fix Compressor being broken when no name is in the compressed blob (Artur Paikin / #3947)
- @uppy/core,@uppy/react: Fix all breaking todo comments for 3.0 (Merlijn Vos / #3907)
- @uppy/companion: show deprecation message when using legacy s3 options (Antoine du Hamel / #3944)
- example: fix aws-companion example (Antoine du Hamel / #3850)
HeavenFox pushed a commit to docsend/uppy that referenced this pull request Jun 27, 2023
* add (failing) e2e test for remote xhr (multipart)

regression caused by transloadit#3834

* Revert "do not use a default upload protocol"

This reverts commit c7e61dd.

* add note on todo

* dry code a bit

* explicitly add protocol: 'multipart' in the client

* fix review comment
HeavenFox pushed a commit to docsend/uppy that referenced this pull request Jun 27, 2023
| Package                   |      Version | Package                   |      Version |
| ------------------------- | ------------ | ------------------------- | ------------ |
| @uppy/audio               | 1.0.0-beta.2 | @uppy/progress-bar        | 3.0.0-beta.2 |
| @uppy/aws-s3              | 3.0.0-beta.3 | @uppy/provider-views      | 3.0.0-beta.3 |
| @uppy/aws-s3-multipart    | 3.0.0-beta.4 | @uppy/react               | 3.0.0-beta.4 |
| @uppy/box                 | 2.0.0-beta.2 | @uppy/redux-dev-tools     | 3.0.0-beta.2 |
| @uppy/companion           | 4.0.0-beta.4 | @uppy/remote-sources      | 1.0.0-beta.4 |
| @uppy/companion-client    | 3.0.0-beta.2 | @uppy/screen-capture      | 3.0.0-beta.3 |
| @uppy/compressor          | 1.0.0-beta.3 | @uppy/status-bar          | 3.0.0-beta.3 |
| @uppy/core                | 3.0.0-beta.4 | @uppy/store-default       | 3.0.0-beta.3 |
| @uppy/dashboard           | 3.0.0-beta.4 | @uppy/store-redux         | 3.0.0-beta.3 |
| @uppy/drag-drop           | 3.0.0-beta.2 | @uppy/svelte              | 2.0.0-beta.2 |
| @uppy/drop-target         | 2.0.0-beta.3 | @uppy/thumbnail-generator | 3.0.0-beta.2 |
| @uppy/dropbox             | 3.0.0-beta.2 | @uppy/transloadit         | 3.0.0-beta.5 |
| @uppy/facebook            | 3.0.0-beta.2 | @uppy/tus                 | 3.0.0-beta.3 |
| @uppy/file-input          | 3.0.0-beta.2 | @uppy/unsplash            | 3.0.0-beta.2 |
| @uppy/form                | 3.0.0-beta.2 | @uppy/url                 | 3.0.0-beta.3 |
| @uppy/golden-retriever    | 3.0.0-beta.2 | @uppy/utils               | 5.0.0-beta.1 |
| @uppy/google-drive        | 3.0.0-beta.2 | @uppy/vue                 | 1.0.0-beta.2 |
| @uppy/image-editor        | 2.0.0-beta.3 | @uppy/webcam              | 3.0.0-beta.3 |
| @uppy/informer            | 3.0.0-beta.3 | @uppy/xhr-upload          | 3.0.0-beta.3 |
| @uppy/instagram           | 3.0.0-beta.2 | @uppy/zoom                | 2.0.0-beta.2 |
| @uppy/locales             | 3.0.0-beta.4 | uppy                      | 3.0.0-beta.5 |
| @uppy/onedrive            | 3.0.0-beta.2 |                           |              |

- meta: prepare release workflow for beta versions (Antoine du Hamel)
- @uppy/provider-views: Reset filter input correctly in provider views (Merlijn Vos / transloadit#3978)
- @uppy/aws-s3-multipart: Fix when using Companion (Merlijn Vos / transloadit#3969)
- @uppy/companion: Companion: bring back default upload protocol (Mikael Finstad / transloadit#3967)
- meta: Update CONTRIBUTING.md (Mikael Finstad / transloadit#3966)
- meta: fix contributing link (Mikael Finstad / transloadit#3968)
- @uppy/companion: enforce usage of uploadUrls (Mikael Finstad / transloadit#3965)
- @uppy/utils: Fix webp mimetype (Merlijn Vos / transloadit#3961)
- @uppy/locales: Add compressor string translation to Japanese locale (kenken / transloadit#3963)
- meta: Fix statement about cropping images in README.md (Mikael Finstad / transloadit#3964)
- @uppy/aws-s3-multipart: Fix race condition in `#uploadParts` (Morgan Zolob / transloadit#3955)
- @uppy/provider-views: core validateRestrictions: return error directly vs the result/reason obj (Artur Paikin / transloadit#3951)
- @uppy/aws-s3: Export AwsS3UploadParameters & AwsS3Options interfaces (Antonina Vertsinskaya / transloadit#3956)
- website: convert all website examples to ESM (Antoine du Hamel / transloadit#3957)
- @uppy/companion: fix crash if redis disconnects (Mikael Finstad / transloadit#3954)
- @uppy/companion: upgrade `ws` version (Antoine du Hamel / transloadit#3949)
- @uppy/companion: sort Dropbox response & refactor to async/await (Mikael Finstad / transloadit#3897)
- @uppy/utils: modernize `getDroppedFiles` (Antoine du Hamel / transloadit#3534)
- @uppy/companion: fix default getKey for non-standalone too (Mikael Finstad / transloadit#3945)
- @uppy/aws-s3-multipart: ignore exception inside `abortMultipartUpload` (Antoine du Hamel / transloadit#3950)
- @uppy/companion: remove `isobject` from dependencies (Antoine du Hamel / transloadit#3948)
- @uppy/compressor: Fix Compressor being broken when no name is in the compressed blob (Artur Paikin / transloadit#3947)
- @uppy/core,@uppy/react: Fix all breaking todo comments for 3.0 (Merlijn Vos / transloadit#3907)
- @uppy/companion: show deprecation message when using legacy s3 options (Antoine du Hamel / transloadit#3944)
- example: fix aws-companion example (Antoine du Hamel / transloadit#3850)
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