From fa524b9edb141adc0b6adb4c9229e605a02e9f2d Mon Sep 17 00:00:00 2001
From: John Cowen <johncowen@users.noreply.github.com>
Date: Mon, 13 Jul 2020 14:22:58 +0100
Subject: [PATCH] ui: Move dc sorting to the view/template (#8297)

* ui: Move dc sorting to the view/template

* Cleanup unused coordinates service from Node repo

* Fix up integration test to not expect a sorted result
---
 ui-v2/app/components/hashicorp-consul/index.hbs        | 2 +-
 ui-v2/app/services/repository/dc.js                    | 5 +----
 ui-v2/app/services/repository/node.js                  | 2 --
 ui-v2/tests/integration/services/repository/dc-test.js | 6 +-----
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/ui-v2/app/components/hashicorp-consul/index.hbs b/ui-v2/app/components/hashicorp-consul/index.hbs
index a41d1c15d..c9fb5bdd8 100644
--- a/ui-v2/app/components/hashicorp-consul/index.hbs
+++ b/ui-v2/app/components/hashicorp-consul/index.hbs
@@ -70,7 +70,7 @@
                                 @loading="lazy"
                               />
                             </li>
-                            {{#each dcs as |item|}}
+                            {{#each (sort-by 'Name' dcs) as |item|}}
                               <li role="none" data-test-datacenter-picker class={{if (eq dc.Name item.Name) 'is-active'}}>
                                 <a tabindex="-1" role="menuitem" href={{href-mut (hash dc=item.Name)}}>{{item.Name}}</a>
                               </li>
diff --git a/ui-v2/app/services/repository/dc.js b/ui-v2/app/services/repository/dc.js
index d81106b40..e34379625 100644
--- a/ui-v2/app/services/repository/dc.js
+++ b/ui-v2/app/services/repository/dc.js
@@ -10,10 +10,7 @@ export default RepositoryService.extend({
     return modelName;
   },
   findAll: function() {
-    return this.store.query(this.getModelName(), {}).then(function(items) {
-      // TODO: Move to view/template
-      return items.sortBy('Name');
-    });
+    return this.store.query(this.getModelName(), {});
   },
   findBySlug: function(name, items) {
     if (name != null) {
diff --git a/ui-v2/app/services/repository/node.js b/ui-v2/app/services/repository/node.js
index bb4e2ea3c..b5cb4b39c 100644
--- a/ui-v2/app/services/repository/node.js
+++ b/ui-v2/app/services/repository/node.js
@@ -1,9 +1,7 @@
 import RepositoryService from 'consul-ui/services/repository';
-import { inject as service } from '@ember/service';
 
 const modelName = 'node';
 export default RepositoryService.extend({
-  coordinates: service('repository/coordinate'),
   getModelName: function() {
     return modelName;
   },
diff --git a/ui-v2/tests/integration/services/repository/dc-test.js b/ui-v2/tests/integration/services/repository/dc-test.js
index 7333fab6b..6a71f98ff 100644
--- a/ui-v2/tests/integration/services/repository/dc-test.js
+++ b/ui-v2/tests/integration/services/repository/dc-test.js
@@ -24,11 +24,7 @@ test('findAll returns the correct data for list endpoint', function(assert) {
       assert.deepEqual(
         actual,
         expected(function(payload) {
-          return payload.map(item => ({ Name: item })).sort(function(a, b) {
-            if (a.Name < b.Name) return -1;
-            if (a.Name > b.Name) return 1;
-            return 0;
-          });
+          return payload.map(item => ({ Name: item }));
         })
       );
     }