Merge branch 'revert-87638e15' into 'master'

Revert error tracking user count removal

Closes gitlab-org/opstrace/opstrace#2345

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/144384



Merged-by: Florie Guibert <fguibert@gitlab.com>
Approved-by: Laura Callahan <lmeckley@gitlab.com>
Approved-by: Florie Guibert <fguibert@gitlab.com>
Reviewed-by: Daniele Rossetti <drossetti@gitlab.com>
Co-authored-by: Joe Shaw <jshaw@gitlab.com>

app/assets/javascripts/error_tracking/components/error_details_info.vue

@@ -74,9 +74,7 @@ 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"

app/assets/javascripts/error_tracking/components/error_tracking_list.vue

@@ -76,7 +76,7 @@ export default {
     {
       key: 'status',
       label: '',
-      tdClass: `${tableDataClass} gl-text-center`,
+      tdClass: `${tableDataClass}`,
     },
   ],
   statusFilters: {
@@ -182,13 +182,6 @@ 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() {
@@ -424,7 +417,7 @@ export default {
         <gl-table
           class="error-list-table gl-mt-5"
           :items="errors"
-          :fields="fields"
+          :fields="$options.fields"
           :show-empty="true"
           fixed
           stacked="md"

spec/frontend/error_tracking/components/error_details_info_spec.js

@@ -47,13 +47,6 @@ describe('ErrorDetails', () => {
     expect(wrapper.findByTestId('user-count-card').text()).toMatchInterpolatedText('Users 2');
   });
 
-  it('should not render a card with user counts if integrated error tracking', () => {
-    mountComponent({
-      integrated: true,
-    });
-    expect(wrapper.findByTestId('user-count-card').exists()).toBe(false);
-  });
-
   describe('first seen card', () => {
     it('if firstSeen is missing, does not render a card', () => {
       mountComponent({

spec/frontend/error_tracking/components/error_tracking_list_spec.js

@@ -146,26 +146,8 @@ describe('ErrorTrackingList', () => {
       expect(findErrorListRows().length).toEqual(store.state.list.errors.length);
     });
 
-    describe('user count', () => {
-      it('shows user count', () => {
-        mountComponent({
-          integratedErrorTrackingEnabled: false,
-          stubs: {
-            GlTable: false,
-          },
-        });
-        expect(findErrorListTable().find('thead').text()).toContain('Users');
-      });
-
-      it('does not show user count', () => {
-        mountComponent({
-          integratedErrorTrackingEnabled: true,
-          stubs: {
-            GlTable: false,
-          },
-        });
-        expect(findErrorListTable().find('thead').text()).not.toContain('Users');
-      });
+    it('shows user count', () => {
+      expect(findErrorListTable().find('thead').text()).toContain('Users');
     });
 
     describe.each([