Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 2 deletions

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"