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

fix various type issues #4958

Merged
merged 1 commit into from Feb 28, 2024
Merged

fix various type issues #4958

merged 1 commit into from Feb 28, 2024

Conversation

mifi
Copy link
Contributor

@mifi mifi commented Feb 24, 2024

neglected in #4911:

  • bytesTotal can be null (also handle that bug in runtime)
  • progress is not a property on the progress object
  • use satisfies instead of as
  • add todo about broken throttle implementation
  • in emitSocketProgress, progressData should not have the FileProgress type, as it is a completely different type (it comes from companion)

neglected in #4911:

- bytesTotal can be null (also handle that bug in runtime)
- progress is not a property on the progress object
- use `satisfies` instead of `as`
- add todo about broken `throttle` implementation
- in emitSocketProgress, progressData should not have the FileProgress type, as it is a completely different type (it comes from companion)
Copy link
Contributor

Diff output files
diff --git a/packages/@uppy/core/lib/Uppy.js b/packages/@uppy/core/lib/Uppy.js
index f89267e..978cf7c 100644
--- a/packages/@uppy/core/lib/Uppy.js
+++ b/packages/@uppy/core/lib/Uppy.js
@@ -1283,7 +1283,6 @@ function _addListeners2() {
     });
     const filesState = Object.fromEntries(filesFiltered.map(file => [file.id, {
       progress: {
-        progress: 0,
         uploadStarted: Date.now(),
         uploadComplete: false,
         percentage: 0,
diff --git a/packages/@uppy/utils/lib/getBytesRemaining.js b/packages/@uppy/utils/lib/getBytesRemaining.js
index 8a3ff8a..7c09b31 100644
--- a/packages/@uppy/utils/lib/getBytesRemaining.js
+++ b/packages/@uppy/utils/lib/getBytesRemaining.js
@@ -1,3 +1,4 @@
 export default function getBytesRemaining(fileProgress) {
+  if (fileProgress.bytesTotal == null) return 0;
   return fileProgress.bytesTotal - fileProgress.bytesUploaded;
 }

@mifi mifi merged commit 448e667 into main Feb 28, 2024
16 checks passed
@mifi mifi deleted the fixes branch February 28, 2024 08:55
@github-actions github-actions bot mentioned this pull request Feb 28, 2024
github-actions bot added a commit that referenced this pull request Feb 28, 2024
| Package                | Version | Package                | Version |
| ---------------------- | ------- | ---------------------- | ------- |
| @uppy/box              |   2.2.1 | @uppy/onedrive         |   3.2.1 |
| @uppy/companion-client |   3.7.4 | @uppy/progress-bar     |   3.1.0 |
| @uppy/core             |   3.9.3 | @uppy/provider-views   |  3.10.0 |
| @uppy/dashboard        |   3.7.5 | @uppy/status-bar       |   3.3.0 |
| @uppy/file-input       |   3.1.0 | @uppy/utils            |   5.7.4 |
| @uppy/form             |   3.2.0 | @uppy/xhr-upload       |   3.6.4 |
| @uppy/image-editor     |   2.4.4 | uppy                   |  3.23.0 |
| @uppy/informer         |   3.1.0 |                        |         |

- @uppy/form: migrate to TS (Merlijn Vos / #4937)
- @uppy/box: fetchPreAuthToken in box too (Mikael Finstad / #4969)
- @uppy/progress-bar: refactor to TypeScript (Mikael Finstad / #4921)
- @uppy/onedrive: fix custom oauth2 credentials for onedrive (Mikael Finstad / #4968)
- @uppy/companion-client,@uppy/utils,@uppy/xhr-upload: improvements for #4922 (Mikael Finstad / #4960)
- @uppy/utils: fix various type issues (Mikael Finstad / #4958)
- @uppy/provider-views: migrate to TS (Merlijn Vos / #4919)
- @uppy/utils: simplify `findDOMElements` (Mikael Finstad / #4957)
- @uppy/xhr-upload: fix getResponseData regression (Merlijn Vos / #4964)
- @uppy/informer: migrate to TS (Merlijn Vos / #4967)
- @uppy/core: remove unused import (Antoine du Hamel / #4972)
- @uppy/image-editor: remove default target (Merlijn Vos / #4966)
- @uppy/angular: Build fixes (Mikael Finstad / #4959)
- meta: Fix flaky e2e test (Murderlon)
- meta: fix e2e flake (Mikael Finstad / #4961)
- meta: add support for `Fragment` short syntax (Antoine du Hamel / #4953)
- @uppy/file-input: refactor to TypeScript (Antoine du Hamel / #4954)
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