From 0b7824d433ec5029da17114389f425f816b7be74 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 28 Apr 2017 17:22:57 +0100
Subject: [PATCH] Updated some Vue specific JS

---
 .../javascripts/deploy_keys/components/action_btn.vue  |  3 ++-
 app/assets/javascripts/deploy_keys/components/app.vue  | 10 +++++-----
 app/assets/javascripts/deploy_keys/components/key.vue  |  4 ++--
 .../components/{keys.vue => keys_panel.vue}            |  0
 app/assets/javascripts/deploy_keys/store/index.js      |  4 ----
 changelogs/unreleased/29667-deploy-keys.yml            |  4 ----
 changelogs/unreleased/deploy-keys-load-async.yml       |  4 ++++
 7 files changed, 13 insertions(+), 16 deletions(-)
 rename app/assets/javascripts/deploy_keys/components/{keys.vue => keys_panel.vue} (100%)
 delete mode 100644 changelogs/unreleased/29667-deploy-keys.yml
 create mode 100644 changelogs/unreleased/deploy-keys-load-async.yml

diff --git a/app/assets/javascripts/deploy_keys/components/action_btn.vue b/app/assets/javascripts/deploy_keys/components/action_btn.vue
index 7da2915a45e..3ff3a9d977e 100644
--- a/app/assets/javascripts/deploy_keys/components/action_btn.vue
+++ b/app/assets/javascripts/deploy_keys/components/action_btn.vue
@@ -47,7 +47,8 @@
     <i
       v-if="isLoading"
       class="fa fa-spinner fa-spin"
-      aria-hidden="true">
+      aria-hidden="true"
+      aria-label="Loading">
     </i>
   </button>
 </template>
diff --git a/app/assets/javascripts/deploy_keys/components/app.vue b/app/assets/javascripts/deploy_keys/components/app.vue
index e0443e2e0df..ee2f85bde53 100644
--- a/app/assets/javascripts/deploy_keys/components/app.vue
+++ b/app/assets/javascripts/deploy_keys/components/app.vue
@@ -3,15 +3,13 @@
   import eventHub from '../eventhub';
   import DeployKeysService from '../service';
   import DeployKeysStore from '../store';
-  import keysPanel from './keys.vue';
+  import keysPanel from './keys_panel.vue';
 
   export default {
     data() {
-      const store = new DeployKeysStore();
-
       return {
         isLoading: false,
-        store,
+        store: new DeployKeysStore(),
       };
     },
     props: {
@@ -84,7 +82,9 @@
       class="text-center"
       v-if="isLoading && !hasKeys">
       <i
-        class="fa fa-spinner fa-spin fa-2x">
+        class="fa fa-spinner fa-spin fa-2x"
+        aria-hidden="true"
+        aria-label="Loading deploy keys">
       </i>
     </div>
     <div v-else-if="hasKeys">
diff --git a/app/assets/javascripts/deploy_keys/components/key.vue b/app/assets/javascripts/deploy_keys/components/key.vue
index af842a3bb39..1b47cceba78 100644
--- a/app/assets/javascripts/deploy_keys/components/key.vue
+++ b/app/assets/javascripts/deploy_keys/components/key.vue
@@ -56,9 +56,9 @@
     </div>
     <div class="deploy-key-content prepend-left-default deploy-key-projects">
       <a
+        v-for="project in deployKey.projects"
         class="label deploy-project-label"
-        :href="project.full_path"
-        v-for="project in deployKey.projects">
+        :href="project.full_path">
         {{ project.full_name }}
       </a>
     </div>
diff --git a/app/assets/javascripts/deploy_keys/components/keys.vue b/app/assets/javascripts/deploy_keys/components/keys_panel.vue
similarity index 100%
rename from app/assets/javascripts/deploy_keys/components/keys.vue
rename to app/assets/javascripts/deploy_keys/components/keys_panel.vue
diff --git a/app/assets/javascripts/deploy_keys/store/index.js b/app/assets/javascripts/deploy_keys/store/index.js
index 7177d9bed7f..6210361af26 100644
--- a/app/assets/javascripts/deploy_keys/store/index.js
+++ b/app/assets/javascripts/deploy_keys/store/index.js
@@ -6,8 +6,4 @@ export default class DeployKeysStore {
   findEnabledKey(id) {
     return this.keys.enabled_keys.find(key => key.id === id);
   }
-
-  removeKeyForType(deployKey, type) {
-    this.keys[type] = this.keys[type].filter(key => key.id !== deployKey.id);
-  }
 }
diff --git a/changelogs/unreleased/29667-deploy-keys.yml b/changelogs/unreleased/29667-deploy-keys.yml
deleted file mode 100644
index 0f202ebf1ee..00000000000
--- a/changelogs/unreleased/29667-deploy-keys.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Project deploy keys json end point
-merge_request:
-author:
diff --git a/changelogs/unreleased/deploy-keys-load-async.yml b/changelogs/unreleased/deploy-keys-load-async.yml
new file mode 100644
index 00000000000..e90910278e8
--- /dev/null
+++ b/changelogs/unreleased/deploy-keys-load-async.yml
@@ -0,0 +1,4 @@
+---
+title: Deploy keys load are loaded async
+merge_request:
+author: