fix: review

Author: artemmufazalov

src/utils/dataFormatters/__test__/formatUptime.test.ts

@@ -52,6 +52,15 @@ describe('formatUptimeInSeconds', () => {
         expect(formatUptimeInSeconds(12)).toBe('12s');
         expect(formatUptimeInSeconds(2)).toBe('2s');
     });
+    it('should correctly process negative values', () => {
+        expect(formatUptimeInSeconds(-0)).toBe('0s');
+        expect(formatUptimeInSeconds(-12)).toBe('-12s');
+        expect(formatUptimeInSeconds(-1 * (12 * M + 2))).toBe('-12:02');
+        expect(formatUptimeInSeconds(-1 * (12 * H + 12 * M + 12))).toBe('-12:12:12');
+        expect(formatUptimeInSeconds(-1 * (12 * D + 12 * H + 12 * M + 12))).toBe(
+            '-12d' + UNBREAKABLE_GAP + '12:12:12',
+        );
+    });
     it('should return empty placeholder on NaN', () => {
         expect(formatUptimeInSeconds(Number.NaN)).toBe(EMPTY_DATA_PLACEHOLDER);
     });

src/utils/dataFormatters/dataFormatters.ts

@@ -49,20 +49,25 @@ export function formatUptimeInSeconds(seconds: number) {
         return EMPTY_DATA_PLACEHOLDER;
     }
 
-    const d = duration(seconds, 's').rescale();
+    // duration.format() doesn't work well with negative values
+    // negative value will be displayed like -2d -12:-58:-21
+    // so we process positive duration and only then add sign if any
+    const sign = seconds < 0 ? '-' : '';
+    const d = duration(Math.abs(seconds), 's').rescale();
 
-    if (d.days() > 0) {
-        return d.format(`d[${i18n('d')}${UNBREAKABLE_GAP}]hh:mm:ss`);
-    }
+    let value: string;
 
-    if (d.hours() > 0) {
-        return d.format('h:mm:ss');
-    }
-    if (d.minutes() > 0) {
-        return d.format('m:ss');
+    if (d.days() > 0) {
+        value = d.format(`d[${i18n('d')}${UNBREAKABLE_GAP}]hh:mm:ss`);
+    } else if (d.hours() > 0) {
+        value = d.format('h:mm:ss');
+    } else if (d.minutes() > 0) {
+        value = d.format('m:ss');
+    } else {
+        value = d.format(`s[${i18n('s')}]`);
     }
 
-    return d.format(`s[${i18n('s')}]`);
+    return sign + value;
 }
 
 export const formatMsToUptime = (ms?: number) => {
@@ -86,10 +91,7 @@ export function getDowntimeFromDateFormatted(dateFrom?: number | string, dateTo?
     // Prevent wrong negative uptime values
     diff = diff < 0 ? 0 : diff;
 
-    const formattedUptime = formatUptimeInSeconds(diff);
-
-    // Do not add sign to 0 values to prevent -0:00:00 uptime
-    return diff === 0 ? formattedUptime : '-' + formattedUptime;
+    return formatUptimeInSeconds(-diff);
 }
 
 export function calcTimeDiffInSec(