diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-22 03:08:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-22 03:08:07 +0300 |
commit | 21539fe9ab9a7a9604bb667b78b08854b4976f7b (patch) | |
tree | 82fb2be49aaaace5057d1e8e208ad12a422a7bbb /app/assets/javascripts/performance_bar | |
parent | e7bc93852d0ce48c490a780b6a1adc6cc36dd342 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/performance_bar')
-rw-r--r-- | app/assets/javascripts/performance_bar/components/detailed_metric.vue | 11 | ||||
-rw-r--r-- | app/assets/javascripts/performance_bar/components/performance_bar_app.vue | 5 |
2 files changed, 14 insertions, 2 deletions
diff --git a/app/assets/javascripts/performance_bar/components/detailed_metric.vue b/app/assets/javascripts/performance_bar/components/detailed_metric.vue index e1a0e2df0e0..ef24dbfb6ce 100644 --- a/app/assets/javascripts/performance_bar/components/detailed_metric.vue +++ b/app/assets/javascripts/performance_bar/components/detailed_metric.vue @@ -39,6 +39,11 @@ export default { metricDetails() { return this.currentRequest.details[this.metric]; }, + metricDetailsLabel() { + return this.metricDetails.duration + ? `${this.metricDetails.duration} / ${this.metricDetails.calls}` + : this.metricDetails.calls; + }, detailsList() { return this.metricDetails.details; }, @@ -68,7 +73,7 @@ export default { type="button" data-toggle="modal" > - {{ metricDetails.duration }} / {{ metricDetails.calls }} + {{ metricDetailsLabel }} </button> <gl-modal :id="`modal-peek-${metric}-details`" @@ -80,7 +85,9 @@ export default { <template v-if="detailsList.length"> <tr v-for="(item, index) in detailsList" :key="index"> <td> - <span>{{ sprintf(__('%{duration}ms'), { duration: item.duration }) }}</span> + <span v-if="item.duration">{{ + sprintf(__('%{duration}ms'), { duration: item.duration }) + }}</span> </td> <td> <div class="js-toggle-container"> diff --git a/app/assets/javascripts/performance_bar/components/performance_bar_app.vue b/app/assets/javascripts/performance_bar/components/performance_bar_app.vue index 1df5562e1b6..41147ccaea8 100644 --- a/app/assets/javascripts/performance_bar/components/performance_bar_app.vue +++ b/app/assets/javascripts/performance_bar/components/performance_bar_app.vue @@ -38,6 +38,11 @@ export default { keys: ['sql'], }, { + metric: 'bullet', + header: s__('PerformanceBar|Bullet notifications'), + keys: ['notification'], + }, + { metric: 'gitaly', header: s__('PerformanceBar|Gitaly calls'), keys: ['feature', 'request'], |