diff --git a/ui/app/templates/clients/client.hbs b/ui/app/templates/clients/client.hbs
index b6e2bcf9f..3b84f643e 100644
--- a/ui/app/templates/clients/client.hbs
+++ b/ui/app/templates/clients/client.hbs
@@ -100,7 +100,7 @@
|
{{#t.sort-by prop="shortId"}}ID{{/t.sort-by}}
{{#t.sort-by prop="modifyIndex" title="Modify Index"}}Modified{{/t.sort-by}}
- {{#t.sort-by prop="name"}}Name{{/t.sort-by}}
+ {{#t.sort-by prop="createIndex" title="Create Index"}}Created{{/t.sort-by}}
{{#t.sort-by prop="statusIndex"}}Status{{/t.sort-by}}
{{#t.sort-by prop="job.name"}}Job{{/t.sort-by}}
{{#t.sort-by prop="jobVersion"}}Version{{/t.sort-by}}
diff --git a/ui/app/templates/components/allocation-row.hbs b/ui/app/templates/components/allocation-row.hbs
index 1da565ff5..1fe001990 100644
--- a/ui/app/templates/components/allocation-row.hbs
+++ b/ui/app/templates/components/allocation-row.hbs
@@ -15,8 +15,8 @@
{{allocation.shortId}}
{{/link-to}}
-{{moment-format allocation.modifyTime "MM/DD HH:mm:ss"}} |
-{{allocation.name}} |
+{{moment-format allocation.createTime "MM/DD HH:mm:ss"}} |
+{{moment-from-now allocation.modifyTime}} |
{{allocation.clientStatus}}
|
diff --git a/ui/app/templates/components/job-deployment/deployment-allocations.hbs b/ui/app/templates/components/job-deployment/deployment-allocations.hbs
index 242427238..cda6afb0e 100644
--- a/ui/app/templates/components/job-deployment/deployment-allocations.hbs
+++ b/ui/app/templates/components/job-deployment/deployment-allocations.hbs
@@ -9,8 +9,8 @@
{{#t.head}}
|
ID |
+ Created |
Modified |
- Name |
Status |
Version |
Node |
diff --git a/ui/app/templates/jobs/job/task-group.hbs b/ui/app/templates/jobs/job/task-group.hbs
index 0bf01cb84..1ae35542c 100644
--- a/ui/app/templates/jobs/job/task-group.hbs
+++ b/ui/app/templates/jobs/job/task-group.hbs
@@ -63,8 +63,8 @@
{{#t.head}}
|
{{#t.sort-by prop="shortId"}}ID{{/t.sort-by}}
+ {{#t.sort-by prop="createIndex" title="Create Index"}}Created{{/t.sort-by}}
{{#t.sort-by prop="modifyIndex" title="Modify Index"}}Modified{{/t.sort-by}}
- {{#t.sort-by prop="name"}}Name{{/t.sort-by}}
{{#t.sort-by prop="statusIndex"}}Status{{/t.sort-by}}
{{#t.sort-by prop="jobVersion"}}Version{{/t.sort-by}}
{{#t.sort-by prop="node.shortId"}}Client{{/t.sort-by}}
diff --git a/ui/tests/acceptance/client-detail-test.js b/ui/tests/acceptance/client-detail-test.js
index cf260833d..df58c32ea 100644
--- a/ui/tests/acceptance/client-detail-test.js
+++ b/ui/tests/acceptance/client-detail-test.js
@@ -129,12 +129,16 @@ test('each allocation should have high-level details for the allocation', functi
const allocationRow = ClientDetail.allocations.objectAt(0);
assert.equal(allocationRow.id, allocation.id.split('-')[0], 'Allocation short ID');
+ assert.equal(
+ allocationRow.createTime,
+ moment(allocation.createTime / 1000000).format('MM/DD HH:mm:ss'),
+ 'Allocation create time'
+ );
assert.equal(
allocationRow.modifyTime,
- moment(allocation.modifyTime / 1000000).format('MM/DD HH:mm:ss'),
+ moment(allocation.modifyTime / 1000000).fromNow(),
'Allocation modify time'
);
- assert.equal(allocationRow.name, allocation.name, 'Allocation name');
assert.equal(allocationRow.status, allocation.clientStatus, 'Client status');
assert.equal(allocationRow.job, server.db.jobs.find(allocation.jobId).name, 'Job name');
assert.ok(allocationRow.taskGroup, 'Task group name');
diff --git a/ui/tests/acceptance/task-group-detail-test.js b/ui/tests/acceptance/task-group-detail-test.js
index 2466e6da9..cccdd67d7 100644
--- a/ui/tests/acceptance/task-group-detail-test.js
+++ b/ui/tests/acceptance/task-group-detail-test.js
@@ -143,12 +143,16 @@ test('each allocation should show basic information about the allocation', funct
andThen(() => {
assert.equal(allocationRow.shortId, allocation.id.split('-')[0], 'Allocation short id');
+ assert.equal(
+ allocationRow.createTime,
+ moment(allocation.createTime / 1000000).format('MM/DD HH:mm:ss'),
+ 'Allocation create time'
+ );
assert.equal(
allocationRow.modifyTime,
- moment(allocation.modifyTime / 1000000).format('MM/DD HH:mm:ss'),
+ moment(allocation.modifyTime / 1000000).fromNow(),
'Allocation modify time'
);
- assert.equal(allocationRow.name, allocation.name, 'Allocation name');
assert.equal(allocationRow.status, allocation.clientStatus, 'Client status');
assert.equal(allocationRow.jobVersion, allocation.jobVersion, 'Job Version');
assert.equal(
diff --git a/ui/tests/pages/clients/detail.js b/ui/tests/pages/clients/detail.js
index d67e42c53..a46fd85bc 100644
--- a/ui/tests/pages/clients/detail.js
+++ b/ui/tests/pages/clients/detail.js
@@ -38,8 +38,8 @@ export default create({
allocations: collection('[data-test-allocation]', {
id: text('[data-test-short-id]'),
+ createTime: text('[data-test-create-time]'),
modifyTime: text('[data-test-modify-time]'),
- name: text('[data-test-name]'),
status: text('[data-test-client-status]'),
job: text('[data-test-job]'),
taskGroup: text('[data-test-task-group]'),
diff --git a/ui/tests/pages/jobs/job/task-group.js b/ui/tests/pages/jobs/job/task-group.js
index b1203e893..9a7db9056 100644
--- a/ui/tests/pages/jobs/job/task-group.js
+++ b/ui/tests/pages/jobs/job/task-group.js
@@ -34,8 +34,8 @@ export default create({
allocations: collection('[data-test-allocation]', {
id: attribute('data-test-allocation'),
shortId: text('[data-test-short-id]'),
+ createTime: text('[data-test-create-time]'),
modifyTime: text('[data-test-modify-time]'),
- name: text('[data-test-name]'),
status: text('[data-test-client-status]'),
jobVersion: text('[data-test-job-version]'),
client: text('[data-test-client]'),