From 6c1006ffdf005e9c3c651d7d1dc53af9b8a29d97 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Fri, 6 Jul 2018 16:50:41 -0700
Subject: [PATCH] Adds sorting to evaluations

---
 ui/app/controllers/jobs/job/evaluations.js | 14 +++++++++++++-
 ui/app/templates/jobs/job/evaluations.hbs  | 17 ++++++++++-------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/ui/app/controllers/jobs/job/evaluations.js b/ui/app/controllers/jobs/job/evaluations.js
index 4b531adc0..f79228e7f 100644
--- a/ui/app/controllers/jobs/job/evaluations.js
+++ b/ui/app/controllers/jobs/job/evaluations.js
@@ -1,12 +1,24 @@
 import { alias } from '@ember/object/computed';
 import Controller, { inject as controller } from '@ember/controller';
 import WithNamespaceResetting from 'nomad-ui/mixins/with-namespace-resetting';
+import Sortable from 'nomad-ui/mixins/sortable';
 
-export default Controller.extend(WithNamespaceResetting, {
+export default Controller.extend(WithNamespaceResetting, Sortable, {
   jobController: controller('jobs.job'),
 
+  queryParams: {
+    sortProperty: 'sort',
+    sortDescending: 'desc',
+  },
+
+  sortProperty: 'modifyIndex',
+  sortDescending: true,
+
   job: alias('model'),
   evaluations: alias('model.evaluations'),
 
   breadcrumbs: alias('jobController.breadcrumbs'),
+
+  listToSort: alias('evaluations'),
+  sortedEvaluations: alias('listSorted'),
 });
diff --git a/ui/app/templates/jobs/job/evaluations.hbs b/ui/app/templates/jobs/job/evaluations.hbs
index 16bfbcd88..7b46c0c25 100644
--- a/ui/app/templates/jobs/job/evaluations.hbs
+++ b/ui/app/templates/jobs/job/evaluations.hbs
@@ -12,15 +12,18 @@
       <div class="boxed-section-head">
         Evaluations
       </div>
-      <div class="boxed-section-body {{if evaluations.length "is-full-bleed"}} evaluations">
-        {{#if evaluations.length}}
-          {{#list-table source=evaluations as |t|}}
+      <div class="boxed-section-body {{if sortedEvaluations.length "is-full-bleed"}}">
+        {{#if sortedEvaluations.length}}
+          {{#list-table
+            source=sortedEvaluations
+            sortProperty=sortProperty
+            sortDescending=sortDescending as |t|}}
             {{#t.head}}
               <th>ID</th>
-              <th>Priority</th>
-              <th>Triggered By</th>
-              <th>Status</th>
-              <th>Placement Failures</th>
+              {{#t.sort-by prop="priority"}}Priority{{/t.sort-by}}
+              {{#t.sort-by prop="triggeredBy"}}Triggered By{{/t.sort-by}}
+              {{#t.sort-by prop="status"}}Status{{/t.sort-by}}
+              {{#t.sort-by prop="hasPlacementFailures"}}Placement Failures{{/t.sort-by}}
             {{/t.head}}
             {{#t.body as |row|}}
               <tr data-test-evaluation="{{row.model.shortId}}">