diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-08 15:07:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-08 15:07:28 +0300 |
commit | a0a2334dfd251af627aaf9e99486f8579087c3c9 (patch) | |
tree | 15419963fa8be8944d6a4fa056e0637f3ef94db9 /app/assets | |
parent | d59bc6c73d927d63d04f86f8b1d2e471787d48d1 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/error_tracking/components/error_details_info.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/error_tracking/components/error_tracking_list.vue | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/app/assets/javascripts/error_tracking/components/error_details_info.vue b/app/assets/javascripts/error_tracking/components/error_details_info.vue index 0b4eabe25d1..3db946acdfc 100644 --- a/app/assets/javascripts/error_tracking/components/error_details_info.vue +++ b/app/assets/javascripts/error_tracking/components/error_details_info.vue @@ -74,7 +74,9 @@ export default { </template> </gl-card> + <!-- user count is currently not supported for integrated error tracking https://gitlab.com/gitlab-org/opstrace/opstrace/-/issues/2345 --> <gl-card + v-if="!error.integrated" :class="$options.CARD_CLASS" :body-class="$options.BODY_CLASS" :header-class="$options.HEADER_CLASS" diff --git a/app/assets/javascripts/error_tracking/components/error_tracking_list.vue b/app/assets/javascripts/error_tracking/components/error_tracking_list.vue index 95ae5e5a92c..95b47a9e491 100644 --- a/app/assets/javascripts/error_tracking/components/error_tracking_list.vue +++ b/app/assets/javascripts/error_tracking/components/error_tracking_list.vue @@ -76,7 +76,7 @@ export default { { key: 'status', label: '', - tdClass: `${tableDataClass}`, + tdClass: `${tableDataClass} gl-text-center`, }, ], statusFilters: { @@ -182,6 +182,13 @@ export default { showIntegratedDisabledAlert() { return !this.isAlertDismissed && this.showIntegratedTrackingDisabledAlert; }, + fields() { + if (this.integratedErrorTrackingEnabled) { + // user count is currently not supported for integrated error tracking https://gitlab.com/gitlab-org/opstrace/opstrace/-/issues/2345 + return this.$options.fields.filter((field) => field.key !== 'users'); + } + return this.$options.fields; + }, }, watch: { pagination() { @@ -417,7 +424,7 @@ export default { <gl-table class="error-list-table gl-mt-5" :items="errors" - :fields="$options.fields" + :fields="fields" :show-empty="true" fixed stacked="md" |