diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-04-21 10:21:38 +0100 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-04-21 10:21:38 +0100 |
commit | 9b59ffebd0e05e3782ba3b25f750f58f49eef79c (patch) | |
tree | 3d5cebecec1073b18957e0207aad39deddb1de01 /app | |
parent | a318c04afdf4dc33b0449256544599271045a7ac (diff) | |
download | gitlab-ce-9b59ffebd0e05e3782ba3b25f750f58f49eef79c.tar.gz |
Port of 31189-pipelines-error-state to 9-1-stable31189-pipelines-error-state-stable
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/commit/pipelines/pipelines_table.js | 23 | ||||
-rw-r--r-- | app/assets/javascripts/vue_pipelines_index/components/empty_state.js | 2 |
2 files changed, 19 insertions, 6 deletions
diff --git a/app/assets/javascripts/commit/pipelines/pipelines_table.js b/app/assets/javascripts/commit/pipelines/pipelines_table.js index da9707549f9..9be94b16ef1 100644 --- a/app/assets/javascripts/commit/pipelines/pipelines_table.js +++ b/app/assets/javascripts/commit/pipelines/pipelines_table.js @@ -55,7 +55,15 @@ export default Vue.component('pipelines-table', { }, shouldRenderEmptyState() { - return !this.state.pipelines.length && !this.isLoading; + return !this.state.pipelines.length && + !this.isLoading && + !this.hasError; + }, + + shouldRenderTable() { + return !this.isLoading && + this.state.pipelines.length > 0 && + !this.hasError; }, }, @@ -145,8 +153,12 @@ export default Vue.component('pipelines-table', { template: ` <div class="content-list pipelines"> - <div class="realtime-loading" v-if="isLoading"> - <i class="fa fa-spinner fa-spin"></i> + <div + class="realtime-loading" + v-if="isLoading"> + <i + class="fa fa-spinner fa-spin" + aria-hidden="true" /> </div> <empty-state @@ -155,8 +167,9 @@ export default Vue.component('pipelines-table', { <error-state v-if="shouldRenderErrorState" /> - <div class="table-holder" - v-if="!isLoading && state.pipelines.length > 0"> + <div + class="table-holder" + v-if="shouldRenderTable"> <pipelines-table-component :pipelines="state.pipelines" :service="service" /> diff --git a/app/assets/javascripts/vue_pipelines_index/components/empty_state.js b/app/assets/javascripts/vue_pipelines_index/components/empty_state.js index 56b4858f4b4..1b1000e5027 100644 --- a/app/assets/javascripts/vue_pipelines_index/components/empty_state.js +++ b/app/assets/javascripts/vue_pipelines_index/components/empty_state.js @@ -9,7 +9,7 @@ export default { }, template: ` - <div class="row empty-state"> + <div class="row empty-state js-empty-state"> <div class="col-xs-12"> <div class="svg-content"> ${pipelinesEmptyStateSVG} |