Skip to content

Commit

Permalink
Merge pull request #2063 from threefoldtech/development_consistent_se…
Browse files Browse the repository at this point in the history
…rial_numbers

Make serial numbers consitent
  • Loading branch information
AhmedHanafy725 committed Jan 29, 2024
2 parents cf0f2dc + 6ede1ee commit e567b7d
Showing 1 changed file with 11 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,10 @@
<template #title>
Node ID: {{ node?.nodeId }}
<VTooltip
text="Node Serial Number"
v-if="node && node.serialNumber && node.serialNumber.toLowerCase() !== 'default string'"
>
<VTooltip text="Node Serial Number" v-if="node && node.serialNumber">
<template #activator="{ props }">
<VChip size="x-small" v-bind="props">
<span class="font-weight-bold" v-text="node.serialNumber" />
<span class="font-weight-bold" v-text="checkSerialNumber(node?.serialNumber)" />
</VChip>
</template>
</VTooltip>
Expand Down Expand Up @@ -154,14 +151,22 @@ export default {
};
}
function checkSerialNumber(serialNumber: string) {
if (/\d/.test(serialNumber)) {
return serialNumber;
} else {
return "Unknown";
}
}
const cruText = computed(() =>
props.node ? `${props.node.used_resources.cru} / ${props.node.total_resources.cru} (Cores)` : "",
);
const mruText = computed(normalizeBytesResourse("mru"));
const sruText = computed(normalizeBytesResourse("sru"));
const hruText = computed(normalizeBytesResourse("hru"));
return { flag, cruText, mruText, sruText, hruText };
return { flag, cruText, mruText, sruText, hruText, checkSerialNumber };
},
};
</script>

0 comments on commit e567b7d

Please sign in to comment.