Use Hz instead of hz throughout the UI

hashicorp · Jan 26, 2021 · ff252db · ff252db
1 parent f89cfc3
commit ff252db
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/ui/app/templates/components/primary-metric.hbs b/ui/app/templates/components/primary-metric.hbs
@@ -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}}

diff --git a/ui/app/templates/components/topo-viz/datacenter.hbs b/ui/app/templates/components/topo-viz/datacenter.hbs
@@ -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|>

diff --git a/ui/app/templates/components/topo-viz/node.hbs b/ui/app/templates/components/topo-viz/node.hbs
@@ -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

diff --git a/ui/app/templates/topology.hbs b/ui/app/templates/topology.hbs
@@ -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}}

diff --git a/ui/mirage/factories/job.js b/ui/mirage/factories/job.js
@@ -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

diff --git a/ui/tests/integration/components/topo-viz/datacenter-test.js b/ui/tests/integration/components/topo-viz/datacenter-test.js
@@ -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) {

diff --git a/ui/tests/integration/components/topo-viz/node-test.js b/ui/tests/integration/components/topo-viz/node-test.js
@@ -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) {