Powered On
diff --git a/webapp/frontend/src/app/layout/common/dashboard-settings/dashboard-settings.component.html b/webapp/frontend/src/app/layout/common/dashboard-settings/dashboard-settings.component.html
index cde830a..750d54d 100644
--- a/webapp/frontend/src/app/layout/common/dashboard-settings/dashboard-settings.component.html
+++ b/webapp/frontend/src/app/layout/common/dashboard-settings/dashboard-settings.component.html
@@ -37,12 +37,20 @@
- Temperature Display Unit
+ Temperature
Celsius
Fahrenheit
+
+
+ File Size
+
+ SI Units (GB)
+ Binary Units (GiB)
+
+
diff --git a/webapp/frontend/src/app/layout/common/dashboard-settings/dashboard-settings.component.ts b/webapp/frontend/src/app/layout/common/dashboard-settings/dashboard-settings.component.ts
index 21e8e8e..6bc5f2a 100644
--- a/webapp/frontend/src/app/layout/common/dashboard-settings/dashboard-settings.component.ts
+++ b/webapp/frontend/src/app/layout/common/dashboard-settings/dashboard-settings.component.ts
@@ -22,6 +22,7 @@ export class DashboardSettingsComponent implements OnInit {
dashboardDisplay: string;
dashboardSort: string;
temperatureUnit: string;
+ fileSizeSIUnits: boolean;
theme: string;
statusThreshold: number;
statusFilterAttributes: number;
@@ -46,6 +47,7 @@ export class DashboardSettingsComponent implements OnInit {
this.dashboardDisplay = config.dashboard_display;
this.dashboardSort = config.dashboard_sort;
this.temperatureUnit = config.temperature_unit;
+ this.fileSizeSIUnits = config.file_size_si_units;
this.theme = config.theme;
this.statusFilterAttributes = config.metrics.status_filter_attributes;
@@ -60,6 +62,7 @@ export class DashboardSettingsComponent implements OnInit {
dashboard_display: this.dashboardDisplay as DashboardDisplay,
dashboard_sort: this.dashboardSort as DashboardSort,
temperature_unit: this.temperatureUnit as TemperatureUnit,
+ file_size_si_units: this.fileSizeSIUnits,
theme: this.theme as Theme,
metrics: {
status_filter_attributes: this.statusFilterAttributes as MetricsStatusFilterAttributes,
diff --git a/webapp/frontend/src/app/modules/detail/detail.component.html b/webapp/frontend/src/app/modules/detail/detail.component.html
index d2ff848..5c94592 100644
--- a/webapp/frontend/src/app/modules/detail/detail.component.html
+++ b/webapp/frontend/src/app/modules/detail/detail.component.html
@@ -107,7 +107,7 @@
Firmware Version
-
{{device?.capacity | fileSize}}
+
{{device?.capacity | fileSize:config.file_size_si_units}}
Capacity
diff --git a/webapp/frontend/src/app/shared/file-size.pipe.spec.ts b/webapp/frontend/src/app/shared/file-size.pipe.spec.ts
index 14973cf..0f2127a 100644
--- a/webapp/frontend/src/app/shared/file-size.pipe.spec.ts
+++ b/webapp/frontend/src/app/shared/file-size.pipe.spec.ts
@@ -1,4 +1,4 @@
-import { FileSizePipe } from './file-size.pipe';
+import {FileSizePipe} from './file-size.pipe';
describe('FileSizePipe', () => {
it('create an instance', () => {
@@ -10,23 +10,61 @@ describe('FileSizePipe', () => {
const testCases = [
{
'bytes': 1500,
- 'precision': undefined,
- 'result': '1 KB'
- },{
- 'bytes': 2_100_000_000,
- 'precision': undefined,
- 'result': '2.0 GB',
- },{
+ 'si': false,
+ 'result': '1.5 KiB'
+ },
+ {
'bytes': 1500,
- 'precision': 2,
- 'result': '1.46 KB',
+ 'si': true,
+ 'result': '1.5 kB'
+ },
+ {
+ 'bytes': 5000,
+ 'si': false,
+ 'result': '4.9 KiB',
+ },
+ {
+ 'bytes': 5000,
+ 'si': true,
+ 'result': '5.0 kB',
+ },
+ {
+ 'bytes': 999_949,
+ 'si': false,
+ 'result': '976.5 KiB',
+ },
+ {
+ 'bytes': 999_949,
+ 'si': true,
+ 'result': '999.9 kB',
+ },
+ {
+ 'bytes': 999_950,
+ 'si': true,
+ 'result': '1.0 MB',
+ },
+ {
+ 'bytes': 1_551_859_712,
+ 'si': false,
+ 'result': '1.4 GiB',
+ },
+ {
+ 'bytes': 2_100_000_000,
+ 'si': false,
+ 'result': '2.0 GiB',
+ },
+ {
+ 'bytes': 2_100_000_000,
+ 'si': true,
+ 'result': '2.1 GB',
}
]
+
testCases.forEach((test, index) => {
it(`should correctly format bytes ${test.bytes}. (testcase: ${index + 1})`, () => {
// test
const pipe = new FileSizePipe();
- const formatted = pipe.transform(test.bytes, test.precision)
+ const formatted = pipe.transform(test.bytes, test.si)
expect(formatted).toEqual(test.result);
});
})
diff --git a/webapp/frontend/src/app/shared/file-size.pipe.ts b/webapp/frontend/src/app/shared/file-size.pipe.ts
index e6cbc7b..14fdf0c 100644
--- a/webapp/frontend/src/app/shared/file-size.pipe.ts
+++ b/webapp/frontend/src/app/shared/file-size.pipe.ts
@@ -1,75 +1,27 @@
-/**
- * @license
- * Copyright (c) 2019 Jonathan Catmull.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-import { Pipe, PipeTransform } from '@angular/core';
+import {Pipe, PipeTransform} from '@angular/core';
-type unit = 'bytes' | 'KB' | 'MB' | 'GB' | 'TB' | 'PB';
-type unitPrecisionMap = {
- [u in unit]: number;
-};
-
-const defaultPrecisionMap: unitPrecisionMap = {
- bytes: 0,
- KB: 0,
- MB: 1,
- GB: 1,
- TB: 2,
- PB: 2
-};
-
-/*
- * Convert bytes into largest possible unit.
- * Takes an precision argument that can be a number or a map for each unit.
- * Usage:
- * bytes | fileSize:precision
- * @example
- * // returns 1 KB
- * {{ 1500 | fileSize }}
- * @example
- * // returns 2.1 GB
- * {{ 2100000000 | fileSize }}
- * @example
- * // returns 1.46 KB
- * {{ 1500 | fileSize:2 }}
- */
-@Pipe({ name: 'fileSize' })
+@Pipe({name: 'fileSize'})
export class FileSizePipe implements PipeTransform {
- private readonly units: unit[] = ['bytes', 'KB', 'MB', 'GB', 'TB', 'PB'];
- transform(bytes: number = 0, precision: number | unitPrecisionMap = defaultPrecisionMap): string {
- if (isNaN(parseFloat(String(bytes))) || !isFinite(bytes)) return '?';
+ transform(bytes: number = 0, si = false, dp = 1): string {
+ const thresh = si ? 1000 : 1024;
- let unitIndex = 0;
-
- while (bytes >= 1024) {
- bytes /= 1024;
- unitIndex++;
+ if (Math.abs(bytes) < thresh) {
+ return bytes + ' B';
}
- const unit = this.units[unitIndex];
+ const units = si
+ ? ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']
+ : ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
+ let u = -1;
+ const r = 10 ** dp;
- if (typeof precision === 'number') {
- return `${bytes.toFixed(+precision)} ${unit}`;
- }
- return `${bytes.toFixed(precision[unit])} ${unit}`;
+ do {
+ bytes /= thresh;
+ ++u;
+ } while (Math.round(Math.abs(bytes) * r) / r >= thresh && u < units.length - 1);
+
+
+ return bytes.toFixed(dp) + ' ' + units[u];
}
}