fix: correct duration formatting logic (#643)

* fix: correct duration formatting logic

* test: add unit test for formatting 3600 seconds as "1h 0m 0s"

* test: fix expected output for formatting 3600 seconds as "1h 0m 0s"

src/util/time.ts

@@ -12,9 +12,15 @@ export function seconds_to_duration(seconds: number) {
   const min = Math.floor((seconds / 60) % 60);
   const sec = Math.floor(seconds % 60);
   const l = [];
-  if (hrs != 0) l.push(hrs + 'h');
-  if (min != 0) l.push(min + 'm');
-  if (sec != 0 || l.length == 0) l.push(sec + 's');
+
+  if (hrs > 0) {
+    l.push(hrs + 'h');
+    l.push(min + 'm');
+  } else if (min > 0) {
+    l.push(min + 'm');
+  }
+  l.push(sec + 's');
+
   return l.join(' ');
 }
 

test/unit/time.test.js

@@ -0,0 +1,27 @@
+import { seconds_to_duration } from '~/util/time';
+
+describe('seconds_to_duration', () => {
+  test('should format 8145 seconds as "2h 15m 45s"', () => {
+    expect(seconds_to_duration(8145)).toBe('2h 15m 45s');
+  });
+
+  test('should format 3630 seconds as "1h 0m 30s"', () => {
+    expect(seconds_to_duration(3630)).toBe('1h 0m 30s');
+  });
+
+  test('should format 3600 seconds as "1h 0m 0s"', () => {
+    expect(seconds_to_duration(3600)).toBe('1h 0m 0s');
+  });
+
+  test('should format 1830 seconds as "30m 30s"', () => {
+    expect(seconds_to_duration(1830)).toBe('30m 30s');
+  });
+
+  test('should format 60 seconds as "1m 0s"', () => {
+    expect(seconds_to_duration(60)).toBe('1m 0s');
+  });
+
+  test('should format 30 seconds as "30s"', () => {
+    expect(seconds_to_duration(30)).toBe('30s');
+  });
+});