Commit eb3b3fb2 authored by mlunoe's avatar mlunoe Committed by David O'Regan

Feat(SM: Subscription Activation): size + text

Update size and button text on modal (and banner)
to fit UX design.

UX design:
https://gitlab.com/gitlab-org/gitlab/-/issues/341967
Issue:
https://gitlab.com/gitlab-org/gitlab/-/issues/341965

Changelog: added
EE: true
parent 1c7e9862
...@@ -93,6 +93,7 @@ export default { ...@@ -93,6 +93,7 @@ export default {
<template> <template>
<gl-modal <gl-modal
size="sm"
:visible="visible" :visible="visible"
:modal-id="modalId" :modal-id="modalId"
:title="$options.title" :title="$options.title"
......
...@@ -27,7 +27,7 @@ export const historySubscriptionsEntryName = s__('SuperSonics|history subscripti ...@@ -27,7 +27,7 @@ export const historySubscriptionsEntryName = s__('SuperSonics|history subscripti
export const cancelLabel = __('Cancel'); export const cancelLabel = __('Cancel');
export const activateLabel = s__('AdminUsers|Activate'); export const activateLabel = s__('AdminUsers|Activate');
export const activateSubscription = s__('SuperSonics|Activate subscription'); 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 noActiveSubscription = s__(`SuperSonics|You do not have an active subscription`);
export const subscriptionDetailsHeaderText = s__('SuperSonics|Subscription details'); export const subscriptionDetailsHeaderText = s__('SuperSonics|Subscription details');
export const licensedToHeaderText = s__('SuperSonics|Licensed to'); export const licensedToHeaderText = s__('SuperSonics|Licensed to');
......
...@@ -85,7 +85,7 @@ RSpec.describe 'Admin views Subscription', :js do ...@@ -85,7 +85,7 @@ RSpec.describe 'Admin views Subscription', :js do
context 'when activating another subscription' do context 'when activating another subscription' do
before do before do
page.within(find('[data-testid="subscription-details"]', match: :first)) do page.within(find('[data-testid="subscription-details"]', match: :first)) do
click_button('Activate cloud license') click_button('Enter activation code')
end end
end end
......
...@@ -49,6 +49,10 @@ describe('SubscriptionActivationModal', () => { ...@@ -49,6 +49,10 @@ describe('SubscriptionActivationModal', () => {
expect(findGlModal().attributes('modalid')).toBe(modalId); expect(findGlModal().attributes('modalid')).toBe(modalId);
}); });
it('is size small', () => {
expect(findGlModal().props('size')).toBe('sm');
});
it('shows a description text', () => { it('shows a description text', () => {
expect(wrapper.text()).toContain(subscriptionActivationInsertCode); expect(wrapper.text()).toContain(subscriptionActivationInsertCode);
}); });
......
...@@ -34786,9 +34786,6 @@ msgstr "" ...@@ -34786,9 +34786,6 @@ msgstr ""
msgid "Sunday" msgid "Sunday"
msgstr "" msgstr ""
msgid "SuperSonics|Activate cloud license"
msgstr ""
msgid "SuperSonics|Activate subscription" msgid "SuperSonics|Activate subscription"
msgstr "" msgstr ""
...@@ -34813,6 +34810,9 @@ 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}." 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 "" msgstr ""
msgid "SuperSonics|Enter activation code"
msgstr ""
msgid "SuperSonics|Export license usage file" msgid "SuperSonics|Export license usage file"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment