Switch from href-to to link-to for QP persistence

See this issue: intercom/ember-href-to#62
hashicorp · Oct 24, 2017 · 855ebf9 · 855ebf9
1 parent c2aba57
commit 855ebf9
Show file tree

Hide file tree

Showing 15 changed files with 37 additions and 37 deletions.
diff --git a/ui/app/helpers/href-to-spread.js b/ui/app/helpers/href-to-spread.js
diff --git a/ui/app/templates/allocations/allocation.hbs b/ui/app/templates/allocations/allocation.hbs
@@ -1,8 +1,8 @@
 <section class="section">
   <h1 class="title">Allocation {{model.name}}</h1>
   <h3 class="subtitle">
-    For job <a href="{{href-to "jobs.job" model.job}}">{{model.job.name}}</a>
-    on node <a href="{{href-to "nodes.node" model.node}}">{{model.node.shortId}}</a>
+    For job {{#link-to "jobs.job" model.job}}{{model.job.name}}{{/link-to}}
+    on node {{#link-to "nodes.node" model.node}}{{model.node.shortId}}{{/link-to}}
   </h3>
 
   <div class="message">

diff --git a/ui/app/templates/components/allocation-row.hbs b/ui/app/templates/components/allocation-row.hbs
@@ -1,7 +1,7 @@
 <td>
-  <a href="{{href-to "allocations.allocation" allocation}}" class="is-primary">
+  {{#link-to "allocations.allocation" allocation class="is-primary"}}
     {{allocation.shortId}}
-  </a>
+  {{/link-to}}
 </td>
 <td>{{allocation.modifyIndex}}</td>
 <td>{{allocation.name}}</td>
@@ -10,13 +10,13 @@
 </td>
 {{#if (eq context "job")}}
   <td>{{allocation.jobVersion}}</td>
-  <td><a href="{{href-to "nodes.node" allocation.node}}">{{allocation.node.shortId}}</a></td>
+  <td>{{#link-to "nodes.node" allocation.node}}{{allocation.node.shortId}}{{/link-to}}</td>
 {{else if (eq context "node")}}
   <td>
     {{#if (or allocation.job.isPending allocation.job.isReloading)}}
       ...
     {{else}}
-      <a href="{{href-to "jobs.job" allocation.job}}">{{allocation.job.name}}</a>
+      {{#link-to "jobs.job" allocation.job}}{{allocation.job.name}}{{/link-to}}
       <span class="is-faded">/ {{allocation.taskGroup.name}}</span>
     {{/if}}
   </td>

diff --git a/ui/app/templates/components/client-node-row.hbs b/ui/app/templates/components/client-node-row.hbs
@@ -1,4 +1,4 @@
-<td><a href="{{href-to "nodes.node" node.id}}" class="is-primary">{{node.shortId}}</a></td>
+<td>{{#link-to "nodes.node" node.id class="is-primary"}}{{node.shortId}}{{/link-to}}</td>
 <td class="is-200px is-truncatable" title="{{node.name}}">{{node.name}}</td>
 <td>{{node.status}}</td>
 <td>{{node.address}}</td>

diff --git a/ui/app/templates/components/job-row.hbs b/ui/app/templates/components/job-row.hbs
@@ -1,4 +1,4 @@
-<td><a href="{{href-to "jobs.job" job.id}}" class="is-primary">{{job.name}}</a></td>
+<td>{{#link-to "jobs.job" job.id class="is-primary"}}{{job.name}}{{/link-to}}</td>
 <td>
   <span class="tag {{job.statusClass}}">{{job.status}}</span>
 </td>

diff --git a/ui/app/templates/components/server-agent-row.hbs b/ui/app/templates/components/server-agent-row.hbs
@@ -1,4 +1,4 @@
-<td><a href="{{href-to "servers.server" agent.id}}" class="is-primary">{{agent.name}}</a></td>
+<td>{{#link-to "servers.server" agent.id class="is-primary"}}{{agent.name}}{{/link-to}}</td>
 <td>{{agent.status}}</td>
 <td>{{if agent.isLeader "True" "False"}}</td>
 <td>{{agent.address}}</td>

diff --git a/ui/app/templates/components/task-group-row.hbs b/ui/app/templates/components/task-group-row.hbs
@@ -1,4 +1,8 @@
-<td><a href="{{href-to "jobs.job.task-group" taskGroup.job taskGroup}}" class="is-primary">{{taskGroup.name}}</a></td>
+<td>
+  {{#link-to "jobs.job.task-group" taskGroup.job taskGroup class="is-primary"}}
+    {{taskGroup.name}}
+  {{/link-to}}
+</td>
 <td>{{taskGroup.count}}</td>
 <td>
   <div class="inline-chart">{{allocation-status-bar allocationContainer=taskGroup.summary isNarrow=true}}</div>

diff --git a/ui/app/templates/jobs/job/definition.hbs b/ui/app/templates/jobs/job/definition.hbs
@@ -1,6 +1,6 @@
 {{#global-header class="page-header"}}
   {{#each breadcrumbs as |breadcrumb|}}
-    <a href="{{href-to-spread breadcrumb.args}}" class="breadcrumb">{{breadcrumb.label}}</a>
+    {{#link-to params=breadcrumb.args class="breadcrumb"}}{{breadcrumb.label}}{{/link-to}}
   {{/each}}
 {{/global-header}}
 {{#gutter-menu class="page-body"}}

diff --git a/ui/app/templates/jobs/job/deployments.hbs b/ui/app/templates/jobs/job/deployments.hbs
@@ -1,6 +1,6 @@
 {{#global-header class="page-header"}}
   {{#each breadcrumbs as |breadcrumb|}}
-    <a href="{{href-to-spread breadcrumb.args}}" class="breadcrumb">{{breadcrumb.label}}</a>
+    {{#link-to params=breadcrumb.args class="breadcrumb"}}{{breadcrumb.label}}{{/link-to}}
   {{/each}}
 {{/global-header}}
 {{#gutter-menu class="page-body"}}

diff --git a/ui/app/templates/jobs/job/index.hbs b/ui/app/templates/jobs/job/index.hbs
@@ -1,6 +1,6 @@
 {{#global-header class="page-header"}}
   {{#each breadcrumbs as |breadcrumb|}}
-    <a href="{{href-to-spread breadcrumb.args}}" class="breadcrumb">{{breadcrumb.label}}</a>
+    {{#link-to params=breadcrumb.args class="breadcrumb"}}{{breadcrumb.label}}{{/link-to}}
   {{/each}}
 {{/global-header}}
 {{#gutter-menu class="page-body"}}

diff --git a/ui/app/templates/jobs/job/loading.hbs b/ui/app/templates/jobs/job/loading.hbs
@@ -1,6 +1,6 @@
 {{#global-header class="page-header"}}
   {{#each breadcrumbs as |breadcrumb|}}
-    <a href="{{href-to-spread breadcrumb.args}}" class="breadcrumb">{{breadcrumb.label}}</a>
+    {{#link-to params=breadcrumb.args class="breadcrumb"}}{{breadcrumb.label}}{{/link-to}}
   {{/each}}
 {{/global-header}}
 {{#gutter-menu class="page-body"}}

diff --git a/ui/app/templates/jobs/job/task-group.hbs b/ui/app/templates/jobs/job/task-group.hbs
@@ -1,6 +1,6 @@
 {{#global-header class="page-header"}}
   {{#each breadcrumbs as |breadcrumb|}}
-    <a href="{{href-to-spread breadcrumb.args}}" class="breadcrumb">{{breadcrumb.label}}</a>
+    {{#link-to params=breadcrumb.args class="breadcrumb"}}{{breadcrumb.label}}{{/link-to}}
   {{/each}}
 {{/global-header}}
 {{#gutter-menu class="page-body"}}

diff --git a/ui/app/templates/jobs/job/versions.hbs b/ui/app/templates/jobs/job/versions.hbs
@@ -1,6 +1,6 @@
 {{#global-header class="page-header"}}
   {{#each breadcrumbs as |breadcrumb|}}
-    <a href="{{href-to-spread breadcrumb.args}}" class="breadcrumb">{{breadcrumb.label}}</a>
+    {{#link-to params=breadcrumb.args class="breadcrumb"}}{{breadcrumb.label}}{{/link-to}}
   {{/each}}
 {{/global-header}}
 {{#gutter-menu class="page-body"}}

diff --git a/ui/app/templates/nodes/node.hbs b/ui/app/templates/nodes/node.hbs
@@ -1,5 +1,5 @@
 {{#global-header class="page-header"}}
-  <a href="{{href-to "nodes"}}" class="breadcrumb">Nodes</a>
+  {{#link-to "nodes" class="breadcrumb"}}Nodes{{/link-to}}
   <span class="breadcrumb">{{model.shortId}}</span>
 {{/global-header}}
 {{#gutter-menu class="page-body"}}

diff --git a/ui/tests/acceptance/job-detail-test.js b/ui/tests/acceptance/job-detail-test.js
@@ -58,8 +58,22 @@ test('each row in the task group table should show basic information about the t
   const tasks = server.db.tasks.where({ taskGroupId: taskGroup.id });
   const sum = (list, key) => list.reduce((sum, item) => sum + get(item, key), 0);
 
-  assert.equal(taskGroupRow.find('td:eq(0)').text(), taskGroup.name, 'Name');
-  assert.equal(taskGroupRow.find('td:eq(1)').text(), taskGroup.count, 'Count');
+  assert.equal(
+    taskGroupRow
+      .find('td:eq(0)')
+      .text()
+      .trim(),
+    taskGroup.name,
+    'Name'
+  );
+  assert.equal(
+    taskGroupRow
+      .find('td:eq(1)')
+      .text()
+      .trim(),
+    taskGroup.count,
+    'Count'
+  );
   assert.equal(
     taskGroupRow.find('td:eq(3)').text(),
     `${sum(tasks, 'Resources.CPU')} MHz`,