UX: Do not display negative ETA in Web upload dialog #4285

Signed-off-by: Michael Mayer <michael@photoprism.app>
photoprism · May 21, 2024 · 885a42f · 885a42f
1 parent 5e655ec
commit 885a42f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 16 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -29,7 +29,7 @@
     "@babel/runtime": "^7.24.5",
     "@lcdp/offline-plugin": "^5.1.1",
     "@vvo/tzdb": "^6.139.0",
-    "axios": "^1.7.0",
+    "axios": "^1.7.1",
     "axios-mock-adapter": "^1.22.0",
     "babel-loader": "^9.1.3",
     "babel-plugin-istanbul": "^6.1.1",

diff --git a/frontend/src/dialog/upload.vue b/frontend/src/dialog/upload.vue
@@ -228,11 +228,15 @@ export default {
           const rate = currentSize / elapsedTime;
           const ms = this.totalSize / rate - elapsedTime;
           this.remainingTime = Math.ceil(ms * 0.001);
-          const dur = Duration.fromObject({
-            minutes: Math.floor(this.remainingTime / 60),
-            seconds: this.remainingTime % 60,
-          });
-          this.eta = dur.toHuman();
+          if (this.remainingTime > 0) {
+            const dur = Duration.fromObject({
+              minutes: Math.floor(this.remainingTime / 60),
+              seconds: this.remainingTime % 60,
+            });
+            this.eta = dur.toHuman();
+          } else {
+            this.eta = "";
+          }
         }
       }
     },