Merge branch '352231-cleanup-unused-variables' into 'master'

Removed fetching unused properties for subscription

See merge request gitlab-org/gitlab!83053

ee/app/assets/javascripts/subscriptions/graphql/queries/state.query.graphql

@@ -3,7 +3,6 @@ query State {
     id
     accountId
     name
-    users
   }
   activeSubscription @client {
     name

ee/app/helpers/subscriptions_helper.rb

@@ -65,8 +65,6 @@ module SubscriptionsHelper
       id: namespace.id,
       account_id: account_id,
       name: namespace.name,
-      users: namespace.member_count,
-      guests: namespace.guest_count,
       full_path: namespace.full_path
     }
   end

ee/spec/frontend/subscriptions/mock_data.js

@@ -33,8 +33,8 @@ export const mockStoragePlans = [
 ];
 
 export const mockNamespaces = `
-  [{"id":132,"accountId":"${accountId}","name":"Gitlab Org","users":3},
-  {"id":483,"accountId":null,"name":"Gnuwget","users":12}]
+  [{"id":132,"accountId":"${accountId}","name":"Gitlab Org"},
+  {"id":483,"accountId":null,"name":"Gnuwget"}]
 `;
 
 export const mockParsedNamespaces = JSON.parse(mockNamespaces).map((namespace) => ({

ee/spec/helpers/subscriptions_helper_spec.rb

@@ -51,7 +51,7 @@ RSpec.describe SubscriptionsHelper do
     it { is_expected.to include(plan_id: 'bronze_id') }
     it { is_expected.to include(namespace_id: group.id.to_s) }
     it { is_expected.to include(source: 'some_source') }
-    it { is_expected.to include(group_data: %Q{[{"id":#{group.id},"account_id":null,"name":"My Namespace","users":2,"guests":1,"full_path":"my_namespace"}]}) }
+    it { is_expected.to include(group_data: %Q{[{"id":#{group.id},"account_id":null,"name":"My Namespace","full_path":"my_namespace"}]}) }
     it { is_expected.to include(trial: 'false') }
     it { is_expected.to include(new_trial_registration_path: '/-/trial_registrations/new') }
 
@@ -163,7 +163,7 @@ RSpec.describe SubscriptionsHelper do
     it { is_expected.to include(namespace_id: group.id.to_s) }
     it { is_expected.to include(active_subscription: active_subscription) }
     it { is_expected.to include(source: 'some_source') }
-    it { is_expected.to include(group_data: %Q{[{"id":#{group.id},"account_id":"#{account_id}","name":"My Namespace","users":1,"guests":0,"full_path":"my_namespace"}]}) }
+    it { is_expected.to include(group_data: %Q{[{"id":#{group.id},"account_id":"#{account_id}","name":"My Namespace","full_path":"my_namespace"}]}) }
     it { is_expected.to include(redirect_after_success: group_usage_quotas_path(group, anchor: anchor, purchased_product: purchased_product)) }
   end
 end