diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-01-06 19:54:45 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-01-06 19:54:45 +0000 |
commit | 7ca5a3f99dd3a3c1800f65da7b4f08395a97395a (patch) | |
tree | 6b4c62a9d470e49df82e149e9fe377f7697a6827 /app/assets/javascripts/environments/components | |
parent | cbdbb645234f330bfa0b73e9c1bd0bbf60d73b02 (diff) | |
download | gitlab-ce-7ca5a3f99dd3a3c1800f65da7b4f08395a97395a.tar.gz |
Fixes more eslint rules
Diffstat (limited to 'app/assets/javascripts/environments/components')
4 files changed, 25 insertions, 10 deletions
diff --git a/app/assets/javascripts/environments/components/environment_actions.vue b/app/assets/javascripts/environments/components/environment_actions.vue index 61b684a8fc6..16bd2f5feb3 100644 --- a/app/assets/javascripts/environments/components/environment_actions.vue +++ b/app/assets/javascripts/environments/components/environment_actions.vue @@ -69,7 +69,8 @@ <i class="fa fa-caret-down" aria-hidden="true" - /> + > + </i> <loading-icon v-if="isLoading" /> </span> </button> diff --git a/app/assets/javascripts/environments/components/environment_rollback.vue b/app/assets/javascripts/environments/components/environment_rollback.vue index 084a7de2305..605a88e997e 100644 --- a/app/assets/javascripts/environments/components/environment_rollback.vue +++ b/app/assets/javascripts/environments/components/environment_rollback.vue @@ -9,6 +9,10 @@ import loadingIcon from '../../vue_shared/components/loading_icon.vue'; export default { + components: { + loadingIcon, + }, + props: { retryUrl: { type: String, @@ -21,10 +25,6 @@ }, }, - components: { - loadingIcon, - }, - data() { return { isLoading: false, diff --git a/app/assets/javascripts/environments/components/environments_app.vue b/app/assets/javascripts/environments/components/environments_app.vue index a82bba15a89..c0be72f7401 100644 --- a/app/assets/javascripts/environments/components/environments_app.vue +++ b/app/assets/javascripts/environments/components/environments_app.vue @@ -119,7 +119,7 @@ :can-read-environment="canReadEnvironment" @onChangePage="onChangePage" > - <empty-state + <empty-state slot="emptyState" v-if="!isLoading && state.environments.length === 0" :new-path="newEnvironmentPath" 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)" |