public/harvester-ui-extension
1
0
Fork 0
mirror of https://github.com/harvester/harvester-ui-extension.git synced 2026-10-01 03:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: align all memory / storage / quota units to Gi/Mi

Browse Source 
Signed-off-by: Andy Lee <andy.lee@suse.com>
This commit is contained in:
Andy Lee
2025-02-28 22:57:54 +08:00
parent ff4a865c55
commit 8f76d5ad30
16 changed files with 51 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/harvester/list/harvesterhci.io.dashboard.vue
+25 -27
View File
@@ -8,9 +8,7 @@ import Banner from '@components/Banner/Banner.vue';
import MessageLink from '@shell/components/MessageLink';
import SortableTable from '@shell/components/SortableTable';
import { allHash, setPromiseResult } from '@shell/utils/promise';
import {
parseSi, formatSi, exponentNeeded, UNITS, createMemoryValues
} from '@shell/utils/units';
import { parseSi, formatSi, exponentNeeded, UNITS } from '@shell/utils/units';
import { REASON } from '@shell/config/table-headers';
import {
EVENT, METRIC, NODE, SERVICE, PVC, LONGHORN, POD, COUNT, NETWORK_ATTACHMENT
@@ -32,17 +30,15 @@ dayjs.extend(utc);
dayjs.extend(minMax);
const PARSE_RULES = {
memory: {
format: {
addSuffix: true,
firstSuffix: 'B',
increment: 1024,
maxExponent: 99,
maxPrecision: 2,
minExponent: 0,
startingExponent: 0,
suffix: 'iB',
}
format: {
addSuffix: true,
firstSuffix: 'B',
increment: 1024,
maxExponent: 99,
maxPrecision: 2,
minExponent: 0,
startingExponent: 0,
suffix: 'i',
}
};
@@ -402,13 +398,13 @@ export default {
storageUsed() {
const stats = this.storageStats;
return this.createMemoryValues(stats.maximum, stats.used);
return this.createDisplayValues(stats.maximum, stats.used);
},
storageAllocated() {
const stats = this.storageStats;
return this.createMemoryValues(stats.total, stats.scheduled);
return this.createDisplayValues(stats.total, stats.scheduled);
},
vmEvents() {
@@ -454,7 +450,7 @@ export default {
return total + node.memoryReserved;
}, 0);
return createMemoryValues(this.memoryTotal, useful);
return this.createDisplayValues(this.memoryTotal, useful);
},
availableNodes() {
@@ -494,7 +490,7 @@ export default {
},
ramUsed() {
return createMemoryValues(this.memoryTotal, this.metricAggregations?.memory);
return this.createDisplayValues(this.memoryTotal, this.metricAggregations?.memory);
},
hasMetricNodeSchema() {
@@ -516,10 +512,12 @@ export default {
},
methods: {
createMemoryValues(total, useful) {
createDisplayValues(total, useful) {
const parsedTotal = parseSi((total || '0').toString());
const parsedUseful = parseSi((useful || '0').toString());
const format = this.createMemoryFormat(parsedTotal);
const format = this.createFormat(parsedTotal);
const formattedTotal = formatSi(parsedTotal, format);
let formattedUseful = formatSi(parsedUseful, {
...format,
@@ -538,24 +536,24 @@ export default {
useful: Number(parsedUseful),
formattedTotal,
formattedUseful,
units: this.createMemoryUnits(parsedTotal),
units: this.createUnits(parsedTotal),
};
},
createMemoryFormat(n) {
const exponent = exponentNeeded(n, PARSE_RULES.memory.format.increment);
createFormat(n) {
const exponent = exponentNeeded(n, PARSE_RULES.format.increment);
return {
...PARSE_RULES.memory.format,
...PARSE_RULES.format,
maxExponent: exponent,
minExponent: exponent,
};
},
createMemoryUnits(n) {
const exponent = exponentNeeded(n, PARSE_RULES.memory.format.increment);
createUnits(n) {
const exponent = exponentNeeded(n, PARSE_RULES.format.increment);
return `${ UNITS[exponent] }${ PARSE_RULES.memory.format.suffix }`;
return `${ UNITS[exponent] }${ PARSE_RULES.format.suffix }`;
},
async fetchClusterResources(type, opt = {}, store) {