Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement logic for showing gb vs mb vs kb for account resources #776

Merged
merged 1 commit into from
Oct 17, 2023
Merged

Implement logic for showing gb vs mb vs kb for account resources #776

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 58 additions & 17 deletions src/components/AccountCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ export default defineComponent({
const none = ref<UInt64>(UInt64.from(0));
const MICRO_UNIT = ref<number>(Math.pow(10, -6));
const KILO_UNIT = ref<number>(Math.pow(10, 3));
const MEGA_UNIT = ref<number>(Math.pow(10, 6));
const GIGA_UNIT = ref<number>(Math.pow(10, 9));
const netUnit = ref<string>('kb');
const ramUnit = ref<string>('kb');
const resources = ref<number>(0);
const delegatedByOthers = ref<number>(0.0);
const delegatedToOthers = computed(
Expand Down Expand Up @@ -152,28 +156,55 @@ export default defineComponent({
}
};

const loadResources = () => {
ram_used.value = fixDec(
Number(accountData.value.ram_usage) / KILO_UNIT.value,
);
const determineUnit = (size: number) => {
if (size > GIGA_UNIT.value) {
return {
unit: 'gb',
denominator: GIGA_UNIT.value,
};
}
if (size > MEGA_UNIT.value) {
return {
unit: 'mb',
denominator: MEGA_UNIT.value,
};
}
return {
unit: 'kb',
denominator: KILO_UNIT.value,
};
};

const loadResources = () => {
let ramDenominator;
if (props.account !== system_account.value) {
// display max resource unit value for readability
const ramMaxNumber = Number(accountData.value.ram_quota);
const ramUnitResult = determineUnit(ramMaxNumber);
ramDenominator = ramUnitResult.denominator;
ramUnit.value = ramUnitResult.unit;
// get displayed number value
ram_max.value = fixDec(
Number(accountData.value.ram_quota) / KILO_UNIT.value,
ramMaxNumber / ramDenominator,
);
// get units
kylanhurt marked this conversation as resolved.
Show resolved Hide resolved
const netUsedNumber = Number(accountData.value.net_limit.used);
const netMaxNumber = Number(accountData.value.net_limit.max);
const netUnitResult = determineUnit(netMaxNumber);
const netDenominator = netUnitResult.denominator;
netUnit.value = netUnitResult.unit;
net_used.value = fixDec(
netUsedNumber / netDenominator,
);
net_max.value = fixDec(
netMaxNumber / netDenominator,
);
cpu_used.value = fixDec(
Number(accountData.value.cpu_limit.used) * MICRO_UNIT.value,
);
cpu_max.value = fixDec(
Number(accountData.value.cpu_limit.max) * MICRO_UNIT.value,
);
net_used.value = fixDec(
Number(accountData.value.net_limit.used) / KILO_UNIT.value,
);
net_max.value = fixDec(
Number(accountData.value.net_limit.max) / KILO_UNIT.value,
);

stakedResources.value =
Number(accountData.value.total_resources.cpu_weight.value) +
Number(accountData.value.total_resources.net_weight.value);
Expand All @@ -190,6 +221,16 @@ export default defineComponent({
stakedResources.value - stakedNET.value - stakedCPU.value,
);
}
const ramUsedNumber = Number(accountData.value.ram_usage);
// only change denominator and units if wasn't already set
if (!ramDenominator) {
const ramUnitResult = determineUnit(ramUsedNumber);
ramDenominator = ramUnitResult.denominator;
ramUnit.value = ramUnitResult.unit;
}
ram_used.value = fixDec(
ramUsedNumber / ramDenominator,
);
};

const setTotalBalance = () => {
Expand Down Expand Up @@ -373,8 +414,8 @@ export default defineComponent({

return {
accountPageSettings,
MICRO_UNIT,
KILO_UNIT,
netUnit,
ramUnit,
stakedCPU,
stakedNET,
cpu_used,
Expand Down Expand Up @@ -484,19 +525,19 @@ export default defineComponent({
:fraction="net_used"
:total="net_max"
label="NET"
unit="kb"
:unit="netUnit"
/>
<PercentCircle
v-if="!accountPageSettings.hideRamInfo"
:radius="radius"
:fraction="ram_used"
:total="ram_max"
label="RAM"
unit="kb"
:unit="ramUnit"
/>
</div>
<div v-else-if="!accountPageSettings.hideRamInfo" class="resources">
<div class="usage">RAM USED: {{ ram_used }} kb</div>
<div class="usage">RAM USED: {{ ram_used }} {{ ramUnit }}</div>
</div>
</q-card-section>
<q-card-section class="resources-container">
Expand Down
Loading