Merge branch '341965-mlunoe-minor-tweaks-to-sm-subscription-activation-modal' into 'master'

Feat(SM: Subscription Activation): size + text

See merge request gitlab-org/gitlab!79334

ee/app/assets/javascripts/admin/subscriptions/show/components/subscription_activation_modal.vue

@@ -93,6 +93,7 @@ export default {
 
 <template>
   <gl-modal
+    size="sm"
     :visible="visible"
     :modal-id="modalId"
     :title="$options.title"

ee/app/assets/javascripts/admin/subscriptions/show/constants.js

@@ -27,7 +27,7 @@ export const historySubscriptionsEntryName = s__('SuperSonics|history subscripti
 export const cancelLabel = __('Cancel');
 export const activateLabel = s__('AdminUsers|Activate');
 export const activateSubscription = s__('SuperSonics|Activate subscription');
-export const activateCloudLicense = s__('SuperSonics|Activate cloud license');
+export const activateCloudLicense = s__('SuperSonics|Enter activation code');
 export const noActiveSubscription = s__(`SuperSonics|You do not have an active subscription`);
 export const subscriptionDetailsHeaderText = s__('SuperSonics|Subscription details');
 export const licensedToHeaderText = s__('SuperSonics|Licensed to');

ee/spec/features/admin/subscriptions/admin_views_subscription_spec.rb

@@ -85,7 +85,7 @@ RSpec.describe 'Admin views Subscription', :js do
     context 'when activating another subscription' do
       before do
         page.within(find('[data-testid="subscription-details"]', match: :first)) do
-          click_button('Activate cloud license')
+          click_button('Enter activation code')
         end
       end
 

ee/spec/frontend/admin/subscriptions/show/components/subscription_activation_modal_spec.js

@@ -49,6 +49,10 @@ describe('SubscriptionActivationModal', () => {
       expect(findGlModal().attributes('modalid')).toBe(modalId);
     });
 
+    it('is size small', () => {
+      expect(findGlModal().props('size')).toBe('sm');
+    });
+
     it('shows a description text', () => {
       expect(wrapper.text()).toContain(subscriptionActivationInsertCode);
     });

locale/gitlab.pot

@@ -34786,9 +34786,6 @@ msgstr ""
 msgid "Sunday"
 msgstr ""
 
-msgid "SuperSonics|Activate cloud license"
-msgstr ""
-
 msgid "SuperSonics|Activate subscription"
 msgstr ""
 
@@ -34813,6 +34810,9 @@ msgstr ""
 msgid "SuperSonics|Cloud licensing is now available. It's an easier way to activate instances and manage subscriptions. Read more about it in our %{blogPostLinkStart}blog post%{blogPostLinkEnd}. Activation codes are available in the %{portalLinkStart}Customers Portal%{portalLinkEnd}."
 msgstr ""
 
+msgid "SuperSonics|Enter activation code"
+msgstr ""
+
 msgid "SuperSonics|Export license usage file"
 msgstr ""