Merge branch '442909-add-sm-permissions-data' into 'master'

Update getSubscriptionPermissionsData to not use namespace for SM

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



Merged-by: Alexander Turinske <aturinske@gitlab.com>
Approved-by: Serhii Yarynovskyi <syarynovskyi@gitlab.com>
Approved-by: Eugie Limpin <elimpin@gitlab.com>
Approved-by: Tomas Vik <tvik@gitlab.com>
Approved-by: Alexander Turinske <aturinske@gitlab.com>
Reviewed-by: Alexander Turinske <aturinske@gitlab.com>
Co-authored-by: minahilnichols <minahilnichols@gitlab.com>

ee/app/assets/javascripts/fulfillment/shared_queries/subscription_actions_reason.customer.query.graphql

-query getSubscriptionPermissionsData($namespaceId: ID!) {
-  subscription(namespaceId: $namespaceId) {
+query getSubscriptionPermissionsData($namespaceId: ID, $subscriptionName: String) {
+  subscription(namespaceId: $namespaceId, subscriptionName: $subscriptionName) {
     canAddSeats
     canAddDuoProSeats
     canRenew
     communityPlan
   }
-  userActionAccess(namespaceId: $namespaceId) {
+  userActionAccess(namespaceId: $namespaceId, subscriptionName: $subscriptionName) {
     limitedAccessReason
   }
 }

ee/app/assets/javascripts/pages/admin/code_suggestions/index.js

 import Vue from 'vue';
-import VueApollo from 'vue-apollo';
-import createDefaultClient from '~/lib/graphql';
+import apolloProvider from 'ee/usage_quotas/shared/provider';
 import CodeSuggestionsUsage from 'ee/usage_quotas/code_suggestions/components/code_suggestions_usage.vue';
 
-Vue.use(VueApollo);
-
-const apolloProvider = new VueApollo({
-  defaultClient: createDefaultClient(),
-});
-
 function mountCodeSuggestionsUsageApp() {
   const el = document.getElementById('js-code-suggestions-page');
 
@@ -23,6 +16,7 @@ function mountCodeSuggestionsUsageApp() {
     provide: {
       isSaaS: false,
       addDuoProHref: el.dataset.addDuoProSeatsUrl,
+      subscriptionName: el.dataset.subscriptionName,
     },
     render: (h) => h(CodeSuggestionsUsage),
   });

ee/app/assets/javascripts/usage_quotas/code_suggestions/components/code_suggestions_info_card.vue

@@ -42,7 +42,7 @@ export default {
     GlModalDirective,
   },
   mixins: [Tracking.mixin()],
-  inject: ['addDuoProHref', 'isSaaS'],
+  inject: ['addDuoProHref', 'isSaaS', 'subscriptionName'],
   props: {
     groupId: {
       type: String,
@@ -60,7 +60,7 @@ export default {
       return parseInt(this.groupId, 10);
     },
     shouldShowAddSeatsButton() {
-      if (this.isLoading || !this.addDuoProHref) {
+      if (this.isLoading) {
         return false;
       }
       return true;
@@ -86,12 +86,12 @@ export default {
       query: getSubscriptionPermissionsData,
       client: 'customersDotClient',
       variables() {
-        return {
-          namespaceId: this.parsedGroupId,
-        };
+        return this.groupId
+          ? { namespaceId: this.parsedGroupId }
+          : { subscriptionName: this.subscriptionName };
       },
       skip() {
-        return !this.addDuoProHref || !this.groupId;
+        return !(this.groupId || this.subscriptionName);
       },
       update: (data) => ({
         canAddDuoProSeats: data.subscription.canAddDuoProSeats,

ee/app/views/admin/code_suggestions/index.html.haml

@@ -2,4 +2,4 @@
 - page_title s_('CodeSuggestions|GitLab Duo Pro')
 - duo_pro_url = add_duo_pro_seats_url(@subscription_name)
 
-#js-code-suggestions-page{ data: { add_duo_pro_seats_url: duo_pro_url } }
+#js-code-suggestions-page{ data: { add_duo_pro_seats_url: duo_pro_url, subscription_name: @subscription_name } }

ee/spec/frontend/usage_quotas/code_suggestions/components/code_suggestions_info_card_spec.js

@@ -20,6 +20,7 @@ jest.mock('~/lib/utils/url_utility', () => ({
 const defaultProvide = {
   addDuoProHref: 'http://customers.gitlab.com/namespaces/10/duo_pro_seats',
   isSaaS: true,
+  subscriptionName: null,
 };
 
 describe('CodeSuggestionsInfoCard', () => {
@@ -123,13 +124,6 @@ describe('CodeSuggestionsInfoCard', () => {
         await waitForPromises();
         expect(findAddSeatsButton().exists()).toBe(true);
       });
-
-      it('does not render add seats button if link is empty', async () => {
-        createComponent({ provide: { isSaas: false, addDuoProHref: '' } });
-        // wait for apollo to load
-        await waitForPromises();
-        expect(findAddSeatsButton().exists()).toBe(false);
-      });
     });
 
     describe('with saas', () => {
@@ -145,13 +139,6 @@ describe('CodeSuggestionsInfoCard', () => {
           expect(findAddSeatsButton().exists()).toBe(true);
         });
       });
-
-      it('does not render add seats button if link is empty', async () => {
-        createComponent({ provide: { addDuoProHref: '' } });
-        // wait for apollo to load
-        await waitForPromises();
-        expect(findAddSeatsButton().exists()).toBe(false);
-      });
     });
 
     describe('tracking', () => {

ee/spec/support/helpers/subscription_portal_helpers.rb

@@ -93,7 +93,7 @@ def stub_subscription_management_data(namespace_id, can_add_seats: true, can_ren
   def stub_subscription_permissions_data(namespace_id, can_add_seats: true, can_add_duo_pro_seats: true, can_renew: true, community_plan: false, reason: 'MANAGED_BY_RESELLER')
     stub_full_request(graphql_url, method: :post)
       .with(
-        body: "{\"operationName\":\"getSubscriptionPermissionsData\",\"variables\":{\"namespaceId\":#{namespace_id}},\"query\":\"query getSubscriptionPermissionsData($namespaceId: ID!) {\\n  subscription(namespaceId: $namespaceId) {\\n    canAddSeats\\n    canAddDuoProSeats\\n    canRenew\\n    communityPlan\\n    __typename\\n  }\\n  userActionAccess(namespaceId: $namespaceId) {\\n    limitedAccessReason\\n    __typename\\n  }\\n}\\n\"}"
+        body: "{\"operationName\":\"getSubscriptionPermissionsData\",\"variables\":{\"namespaceId\":#{namespace_id}},\"query\":\"query getSubscriptionPermissionsData($namespaceId: ID, $subscriptionName: String) {\\n  subscription(namespaceId: $namespaceId, subscriptionName: $subscriptionName) {\\n    canAddSeats\\n    canAddDuoProSeats\\n    canRenew\\n    communityPlan\\n    __typename\\n  }\\n  userActionAccess(namespaceId: $namespaceId, subscriptionName: $subscriptionName) {\\n    limitedAccessReason\\n    __typename\\n  }\\n}\\n\"}"
       )
       .to_return(status: 200, body: {
         "data": {