Rebase, bump uppy, rename variables, add changelog item

changelog/unreleased/enhancement-show-upload-speed

@@ -0,0 +1,8 @@
+# Show upload speed
+
+We have added a tooltip that shows the current upload speed and 
+absolute vs processed filesize for the current upload.
+
+https://github.com/owncloud/web/issues/8166
+https://github.com/owncloud/web/pull/8187
+https://github.com/owncloud/ocis/issues/5511

packages/web-runtime/package.json

@@ -9,10 +9,10 @@
     "@ownclouders/design-system": "workspace:*",
     "@popperjs/core": "^2.11.5",
     "@sentry/vue": "7.31.1",
-    "@uppy/core": "^3.0.2",
+    "@uppy/core": "^3.0.5",
     "@uppy/drop-target": "^2.0.0",
     "@uppy/tus": "^3.0.1",
-    "@uppy/utils": "^5.0.2",
+    "@uppy/utils": "^5.1.2",
     "@uppy/xhr-upload": "^3.0.1",
     "@vueuse/head": "1.0.22",
     "axios": "^0.27.2",

packages/web-runtime/src/components/UploadInfo.vue

@@ -182,11 +182,11 @@ export default defineComponent({
       if (this.uploadSpeed === 0) {
         return ''
       }
-      const todo = filesize(this.bytesUploaded)
-      const done = filesize(this.bytesTotal)
+      const uploadedBytes = filesize(this.bytesUploaded)
+      const totalBytes = filesize(this.bytesTotal)
       const currentUploadSpeed = filesize(this.uploadSpeed)
       // needs $gettext interpolation
-      return `${todo} of ${done} (${currentUploadSpeed}/s)`
+      return `${uploadedBytes} of ${totalBytes} (${currentUploadSpeed}/s)`
     },
     uploadInfoTitle() {
       if (this.inFinalization) {
@@ -310,11 +310,9 @@ export default defineComponent({
 
       const timeElapsed = +new Date() - this.timeStarted
 
-      // "bytesTotal" is a wrong type documentation,
-      // fix in progress via https://github.com/transloadit/uppy/pull/4263
       this.uploadSpeed = getSpeed({
-        bytesTotal: this.timeStarted,
-        bytesUploaded: this.bytesUploaded
+        bytesUploaded: this.bytesUploaded,
+        uploadStarted: this.timeStarted
       })
 
       const progressPercent = (100 * this.bytesUploaded) / this.bytesTotal