luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Merge pull request #9896 from hashicorp/b-ui-hz-casing

Browse source 
UI: Use MHz instead of Mhz throughout
This commit is contained in:
Michael Lange 2021-01-26 11:23:48 -08:00 committed by GitHub
parent 5a5b7a72a7 6ba229e86c
commit 60caa366b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ui/app/templates/components/primary-metric.hbs
View file

@ -19,7 +19,7 @@
</div>
<div class="annotation" data-test-absolute-value>
{{#if (eq this.metric "cpu")}}
<strong>{{this.data.lastObject.used}} Mhz</strong> / {{this.reservedAmount}} Mhz reserved
<strong>{{this.data.lastObject.used}} MHz</strong> / {{this.reservedAmount}} MHz reserved
{{else if (eq this.metric "memory")}}
<strong>{{format-bytes this.data.lastObject.used}}</strong> / {{this.reservedAmount}} MiB reserved
{{else}}

2
ui/app/templates/components/topo-viz/datacenter.hbs
View file

@ -4,7 +4,7 @@
<span class="bumper-left">{{this.scheduledAllocations.length}} Allocs</span>
<span class="bumper-left">{{@datacenter.nodes.length}} Nodes</span>
<span class="bumper-left is-faded">{{this.aggregatedAllocationResources.memory}}/{{this.aggregatedNodeResources.memory}} MiB,
{{this.aggregatedAllocationResources.cpu}}/{{this.aggregatedNodeResources.cpu}} Mhz</span>
{{this.aggregatedAllocationResources.cpu}}/{{this.aggregatedNodeResources.cpu}} MHz</span>
</div>
<div class="boxed-section-body">
<FlexMasonry @columns={{if @isSingleColumn 1 2}} @items={{@datacenter.nodes}} as |node|>

2
ui/app/templates/components/topo-viz/node.hbs
View file

@ -8,7 +8,7 @@
{{/if}}
<strong>{{@node.node.name}}</strong>
<span class="bumper-left">{{this.count}} Allocs</span>
<span class="bumper-left is-faded">{{@node.memory}} MiB, {{@node.cpu}} Mhz</span>
<span class="bumper-left is-faded">{{@node.memory}} MiB, {{@node.cpu}} MHz</span>
</p>
{{/unless}}
<svg

8
ui/app/templates/topology.hbs
View file

@ -111,7 +111,7 @@
</div>
</div>
<div class="dashboard-metric">
<p class="metric">{{this.nodeUtilization.totalCPU}} <span class="metric-units">Mhz</span> <span class="metric-label">of CPU</span></p>
<p class="metric">{{this.nodeUtilization.totalCPU}} <span class="metric-units">MHz</span> <span class="metric-label">of CPU</span></p>
<div class="columns graphic">
<div class="column">
<div class="inline-chart" data-test-percentage-bar>
@ -128,7 +128,7 @@
</div>
</div>
<div class="annotation" data-test-absolute-value>
<strong>{{this.nodeUtilization.totalReservedCPU}} Mhz</strong> / {{this.nodeUtilization.totalCPU}} Mhz reserved
<strong>{{this.nodeUtilization.totalReservedCPU}} MHz</strong> / {{this.nodeUtilization.totalCPU}} MHz reserved
</div>
</div>
{{/let}}
@ -201,7 +201,7 @@
</div>
</div>
<div class="dashboard-metric">
<p class="metric">{{this.totalCPU}} <span class="metric-units">Mhz</span> <span class="metric-label">of CPU</span></p>
<p class="metric">{{this.totalCPU}} <span class="metric-units">MHz</span> <span class="metric-label">of CPU</span></p>
<div class="columns graphic">
<div class="column">
<div class="inline-chart" data-test-percentage-bar>
@ -218,7 +218,7 @@
</div>
</div>
<div class="annotation" data-test-absolute-value>
<strong>{{this.totalReservedCPU}} Mhz</strong> / {{this.totalCPU}} Mhz reserved
<strong>{{this.totalReservedCPU}} MHz</strong> / {{this.totalCPU}} MHz reserved
</div>
</div>
{{/if}}

2
ui/mirage/factories/job.js
View file

@ -25,7 +25,7 @@ export default Factory.extend({
// When provided, the resourceSpec will inform how many task groups to create
// and how much of each resource that task group reserves.
//
// One task group, 256 MiB memory and 500 Mhz cpu
// One task group, 256 MiB memory and 500 MHz cpu
// resourceSpec: ['M: 256, C: 500']
//
// Two task groups

2
ui/tests/integration/components/topo-viz/datacenter-test.js
View file

@ -108,7 +108,7 @@ module('Integration | Component | TopoViz::Datacenter', function(hooks) {
assert.ok(TopoVizDatacenter.label.includes(`${this.datacenter.nodes.length} Nodes`));
assert.ok(TopoVizDatacenter.label.includes(`${allocs.length} Allocs`));
assert.ok(TopoVizDatacenter.label.includes(`${memoryReserved}/${memoryTotal} MiB`));
assert.ok(TopoVizDatacenter.label.includes(`${cpuReserved}/${cpuTotal} Mhz`));
assert.ok(TopoVizDatacenter.label.includes(`${cpuReserved}/${cpuTotal} MHz`));
});
test('when @isSingleColumn is true, the FlexMasonry layout gets one column, otherwise it gets two', async function(assert) {

2
ui/tests/integration/components/topo-viz/node-test.js
View file

@ -96,7 +96,7 @@ module('Integration | Component | TopoViz::Node', function(hooks) {
assert.ok(TopoVizNode.label.includes(node.node.name));
assert.ok(TopoVizNode.label.includes(`${this.node.allocations.length} Allocs`));
assert.ok(TopoVizNode.label.includes(`${this.node.memory} MiB`));
assert.ok(TopoVizNode.label.includes(`${this.node.cpu} Mhz`));
assert.ok(TopoVizNode.label.includes(`${this.node.cpu} MHz`));
});
test('the status icon indicates when the node is draining', async function(assert) {