From e5232b9ccd91476eb1100a742bc5e2c362fdbbc7 Mon Sep 17 00:00:00 2001 From: Michael Lange Date: Mon, 10 Feb 2020 20:51:59 -0800 Subject: [PATCH] Add volume column to allocation row --- ui/app/templates/clients/client.hbs | 1 + ui/app/templates/components/allocation-row.hbs | 1 + .../components/job-deployment/deployment-allocations.hbs | 1 + ui/app/templates/components/job-editor.hbs | 1 + .../templates/components/job-page/parts/recent-allocations.hbs | 1 + ui/app/templates/jobs/job/allocations.hbs | 1 + ui/app/templates/jobs/job/task-group.hbs | 1 + 7 files changed, 7 insertions(+) diff --git a/ui/app/templates/clients/client.hbs b/ui/app/templates/clients/client.hbs index 554fd896a..be6e18e47 100644 --- a/ui/app/templates/clients/client.hbs +++ b/ui/app/templates/clients/client.hbs @@ -305,6 +305,7 @@ {{#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}} + Volume CPU Memory {{/t.head}} diff --git a/ui/app/templates/components/allocation-row.hbs b/ui/app/templates/components/allocation-row.hbs index 04bfdaf58..2c23595a5 100644 --- a/ui/app/templates/components/allocation-row.hbs +++ b/ui/app/templates/components/allocation-row.hbs @@ -50,6 +50,7 @@ {{allocation.jobVersion}} {{/if}} +{{if allocation.taskGroup.volumes.length "Yes"}} {{#if allocation.isRunning}} {{#if (and (not cpu) fetchStats.isRunning)}} diff --git a/ui/app/templates/components/job-deployment/deployment-allocations.hbs b/ui/app/templates/components/job-deployment/deployment-allocations.hbs index 3f7dbf895..6a213342a 100644 --- a/ui/app/templates/components/job-deployment/deployment-allocations.hbs +++ b/ui/app/templates/components/job-deployment/deployment-allocations.hbs @@ -15,6 +15,7 @@ Status Version Node + Volume CPU Memory {{/t.head}} diff --git a/ui/app/templates/components/job-editor.hbs b/ui/app/templates/components/job-editor.hbs index 52969285c..69e291d17 100644 --- a/ui/app/templates/components/job-editor.hbs +++ b/ui/app/templates/components/job-editor.hbs @@ -106,6 +106,7 @@ Status Version Node + Volume CPU Memory {{/t.head}} diff --git a/ui/app/templates/components/job-page/parts/recent-allocations.hbs b/ui/app/templates/components/job-page/parts/recent-allocations.hbs index 062f06cc2..7cf905edb 100644 --- a/ui/app/templates/components/job-page/parts/recent-allocations.hbs +++ b/ui/app/templates/components/job-page/parts/recent-allocations.hbs @@ -18,6 +18,7 @@ Status Version Client + Volume CPU Memory {{/t.head}} diff --git a/ui/app/templates/jobs/job/allocations.hbs b/ui/app/templates/jobs/job/allocations.hbs index 893117490..0fbf6738e 100644 --- a/ui/app/templates/jobs/job/allocations.hbs +++ b/ui/app/templates/jobs/job/allocations.hbs @@ -31,6 +31,7 @@ {{#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}} + Volume CPU Memory {{/t.head}} diff --git a/ui/app/templates/jobs/job/task-group.hbs b/ui/app/templates/jobs/job/task-group.hbs index d3d104ec2..6ca04099d 100644 --- a/ui/app/templates/jobs/job/task-group.hbs +++ b/ui/app/templates/jobs/job/task-group.hbs @@ -71,6 +71,7 @@ {{#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}} + Volume CPU Memory {{/t.head}}