From: Lenz Grimmer <lenz@grimmer.com>
Date: Wed, 30 May 2018 09:31:00 +0000 (+0200)
Subject: Merge pull request #21980 from Devp00l/wip-formatting-bug-24081
X-Git-Tag: v14.0.1~1241
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f21df7672d4db80acaf782383ccaf474261d5886;p=ceph.git

Merge pull request #21980 from Devp00l/wip-formatting-bug-24081

mgr/dashboard: Format small numbers correctly

Reviewed-by: Ricardo Marques <rimarques@suse.com>
---

f21df7672d4db80acaf782383ccaf474261d5886
diff --cc src/pybind/mgr/dashboard/frontend/src/app/shared/services/formatter.service.spec.ts
index 3cac2b4aa6cbb,d8755337c11b6..74c52106936a4
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/formatter.service.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/formatter.service.spec.ts
@@@ -57,10 -62,14 +62,17 @@@ describe('FormatterService', () => 
        expect(service.format_number('1', 1024, formats)).toBe('1B');
        expect(service.format_number('1024', 1024, formats)).toBe('1KiB');
        expect(service.format_number(23.45678 * Math.pow(1024, 3), 1024, formats)).toBe('23.4568GiB');
 +      expect(service.format_number(23.45678 * Math.pow(1024, 3), 1024, formats, 2)).toBe(
 +        '23.46GiB'
 +      );
      });
+ 
+     it('should test some dimless values', () => {
+       expect(dimlessPipe.transform(0.6)).toBe('0.6 ');
+       expect(dimlessPipe.transform(1000.608)).toBe('1.0006k');
+       expect(dimlessPipe.transform(1e10)).toBe('10G');
+       expect(dimlessPipe.transform(2.37e16)).toBe('23.7P');
+     });
    });
  
    describe('toBytes', () => {