summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/environments/components/environments_table.vue
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-01-06 19:54:45 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-01-06 19:54:45 +0000
commit7ca5a3f99dd3a3c1800f65da7b4f08395a97395a (patch)
tree6b4c62a9d470e49df82e149e9fe377f7697a6827 /app/assets/javascripts/environments/components/environments_table.vue
parentcbdbb645234f330bfa0b73e9c1bd0bbf60d73b02 (diff)
downloadgitlab-ce-7ca5a3f99dd3a3c1800f65da7b4f08395a97395a.tar.gz
Fixes more eslint rules
Diffstat (limited to 'app/assets/javascripts/environments/components/environments_table.vue')
-rw-r--r--app/assets/javascripts/environments/components/environments_table.vue22
1 files changed, 18 insertions, 4 deletions
diff --git a/app/assets/javascripts/environments/components/environments_table.vue b/app/assets/javascripts/environments/components/environments_table.vue
index a8384e545b2..4c4ef31b8d1 100644
--- a/app/assets/javascripts/environments/components/environments_table.vue
+++ b/app/assets/javascripts/environments/components/environments_table.vue
@@ -31,6 +31,15 @@ export default {
},
},
+ computed: {
+ shouldRenderFolderContent() {
+ return this.model.isFolder &&
+ this.model.isOpen &&
+ this.model.children &&
+ this.model.children.length > 0;
+ },
+ },
+
methods: {
folderUrl(model) {
return `${window.location.pathname}/folders/${model.folderName}`;
@@ -80,17 +89,21 @@ export default {
</div>
<template
v-for="(model, i) in environments"
- :key="i"
:model="model">
<div
is="environment-item"
:model="model"
:can-create-deployment="canCreateDeployment"
:can-read-environment="canReadEnvironment"
+ :key="i"
/>
- <template v-if="model.isFolder && model.isOpen && model.children && model.children.length > 0">
- <div v-if="model.isLoadingFolderContent">
+ <template
+ v-if="shouldRenderFolderContent"
+ >
+ <div
+ v-if="model.isLoadingFolderContent"
+ :key="i">
<loading-icon size="2" />
</div>
@@ -101,9 +114,10 @@ export default {
:model="children"
:can-create-deployment="canCreateDeployment"
:can-read-environment="canReadEnvironment"
+ :key="i"
/>
- <div>
+ <div :key="i">
<div class="text-center prepend-top-10">
<a
:href="folderUrl(model)"