diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-11-18 15:59:04 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-11-21 13:57:10 -0500 |
| commit | 8a26021b2e7adc669782721ebeabb58314a6e29d (patch) | |
| tree | 2fa6862d7edf1e13ef67ec0c0d3eb8c53b048615 | |
| parent | 6efe1531bdad8f48bc24a0fa315d74132bd139b2 (diff) | |
| download | gitlab-ce-8a26021b2e7adc669782721ebeabb58314a6e29d.tar.gz | |
Fix empty stage presentation
3 files changed, 11 insertions, 4 deletions
diff --git a/app/assets/javascripts/cycle_analytics/cycle_analytics_store.js.es6 b/app/assets/javascripts/cycle_analytics/cycle_analytics_store.js.es6 index 7f3e8bfa6e6..a6005306130 100644 --- a/app/assets/javascripts/cycle_analytics/cycle_analytics_store.js.es6 +++ b/app/assets/javascripts/cycle_analytics/cycle_analytics_store.js.es6 @@ -23,7 +23,6 @@ }); newData.stages.forEach((item) => { - item.value = item.value || '- - -'; item.active = false; item.component = `stage-${item.title.toLowerCase()}-component`; }); diff --git a/app/assets/stylesheets/pages/cycle_analytics.scss b/app/assets/stylesheets/pages/cycle_analytics.scss index 50939f55168..ba85e13fc5e 100644 --- a/app/assets/stylesheets/pages/cycle_analytics.scss +++ b/app/assets/stylesheets/pages/cycle_analytics.scss @@ -246,6 +246,10 @@ .stage-name { padding-left: 16px; } + + .stage-empty { + color: $gl-text-color-light; + } } } diff --git a/app/views/projects/cycle_analytics/show.html.haml b/app/views/projects/cycle_analytics/show.html.haml index bebe2782bd7..521ae085f61 100644 --- a/app/views/projects/cycle_analytics/show.html.haml +++ b/app/views/projects/cycle_analytics/show.html.haml @@ -69,15 +69,19 @@ .stage-panel-body %nav.stage-nav %ul - %li.stage-nav-item{ ':class' => '{active: stage.active}', '@click' => 'selectStage(stage)', "v-for" => "stage in state.stages" } + %li.stage-nav-item{ ':class' => '{ active: stage.active }', '@click' => 'selectStage(stage)', "v-for" => "stage in state.stages" } .stage-name {{ stage.title }} .stage-median - {{ stage.value }} + %template{ "v-if" => "stage.value" } + {{ stage.value }} + %template{ "v-else" => true } + %span.stage-empty + No enough data .section.stage-events %template{ "v-if" => "isLoadingStage" } = icon("spinner spin", "v-show" => "isLoadingStage") - %template{ "v-if" => "isEmptyStage" } + %template{ "v-if" => "isEmptyStage && !isLoadingStage" } = render partial: "empty_stage" %template{ "v-if" => "state.events.length && !isLoadingStage && !isEmptyStage" } %component{ ":is" => "currentStage.component", ":stage" => "currentStage", ":items" => "state.events" } |