From 9b59ffebd0e05e3782ba3b25f750f58f49eef79c Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Fri, 21 Apr 2017 10:21:38 +0100 Subject: Port of 31189-pipelines-error-state to 9-1-stable --- .../commit/pipelines/pipelines_table.js | 23 +++++++++++++++++----- .../vue_pipelines_index/components/empty_state.js | 2 +- .../javascripts/commit/pipelines/pipelines_spec.js | 5 +++++ 3 files changed, 24 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: `
-
- +
+