diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-03 15:14:20 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-03 15:14:20 +0000 |
commit | ea43f58689bd5ee26a7672889913c2bb8a30d842 (patch) | |
tree | 86318fd4762221c5fcc2292ec61e1acd80e9f815 /app/assets/javascripts/vue_pipelines_index | |
parent | 035cb734d27cb6df56803d10be408c6e0cf764f0 (diff) | |
download | gitlab-ce-ea43f58689bd5ee26a7672889913c2bb8a30d842.tar.gz |
Only load pipelines vue component when there are pipelines.
Move Empty state to vue component
Diffstat (limited to 'app/assets/javascripts/vue_pipelines_index')
-rw-r--r-- | app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 | 18 | ||||
-rw-r--r-- | app/assets/javascripts/vue_pipelines_index/store.js.es6 | 3 |
2 files changed, 14 insertions, 7 deletions
diff --git a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 index c1daf816060..ac2fe99af1c 100644 --- a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 +++ b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 @@ -40,20 +40,26 @@ }, template: ` <div> - <div class="pipelines realtime-loading" v-if='pipelines.length < 1'> + <div class="pipelines realtime-loading" v-if='pageRequest'> <i class="fa fa-spinner fa-spin"></i> </div> - <div class="table-holder" v-if='pipelines.length'> + + <div class="blank-state blank-state-no-icon" + v-if="!pageRequest && pipelines.length === 0"> + <h2 class="blank-state-title js-blank-state-title"> + No pipelines to show + </h2> + </div> + + <div class="table-holder" v-if='!pageRequest && pipelines.length'> <pipelines-table-component :pipelines='pipelines' :svgs='svgs'> </pipelines-table-component> </div> - <div class="pipelines realtime-loading" v-if='pageRequest'> - <i class="fa fa-spinner fa-spin"></i> - </div> + <gl-pagination - v-if='pageInfo.total > pageInfo.perPage' + v-if='!pageRequest && pipelines.length && pageInfo.total > pageInfo.perPage' :pagenum='pagenum' :change='change' :count='count.all' diff --git a/app/assets/javascripts/vue_pipelines_index/store.js.es6 b/app/assets/javascripts/vue_pipelines_index/store.js.es6 index 0c4a3b77153..4d0e2ccaf87 100644 --- a/app/assets/javascripts/vue_pipelines_index/store.js.es6 +++ b/app/assets/javascripts/vue_pipelines_index/store.js.es6 @@ -20,6 +20,7 @@ gl.PipelineStore = class { fetchDataLoop(Vue, pageNum, url, apiScope) { + this.pageRequest = true; const updatePipelineNums = (count) => { const { all } = count; const running = count.running_or_pending; @@ -41,7 +42,7 @@ this.pageRequest = false; }, () => { this.pageRequest = false; - return new Flash('Something went wrong on our end.'); + return new Flash('An error occurred while fetching the pipelines, please reload the page again.'); }); goFetch(); |