Commit 36474d85 authored by Angelo Gulina's avatar Angelo Gulina Committed by Enrique Alcántara

Update copy and type for sync subscription banner

The message conveys a message that better
reflects what's happening after the sync action

Changelog: changed
parent 64779a74
...@@ -5,6 +5,7 @@ import { ...@@ -5,6 +5,7 @@ import {
connectivityIssue, connectivityIssue,
manualSyncSuccessfulTitle, manualSyncSuccessfulTitle,
subscriptionSyncStatus, subscriptionSyncStatus,
manualSyncSuccessfulText,
} from '../constants'; } from '../constants';
export const SUCCESS_ALERT_DISMISSED_EVENT = 'success-alert-dismissed'; export const SUCCESS_ALERT_DISMISSED_EVENT = 'success-alert-dismissed';
...@@ -15,6 +16,7 @@ const subscriptionSyncStatusValidator = (value) => ...@@ -15,6 +16,7 @@ const subscriptionSyncStatusValidator = (value) =>
export default { export default {
name: 'SubscriptionSyncNotifications', name: 'SubscriptionSyncNotifications',
i18n: { i18n: {
manualSyncSuccessfulText,
manualSyncSuccessfulTitle, manualSyncSuccessfulTitle,
manualSyncFailureText, manualSyncFailureText,
connectivityIssue, connectivityIssue,
...@@ -52,11 +54,12 @@ export default { ...@@ -52,11 +54,12 @@ export default {
<div> <div>
<gl-alert <gl-alert
v-if="syncDidSuccess" v-if="syncDidSuccess"
variant="success" variant="info"
:title="$options.i18n.manualSyncSuccessfulTitle" :title="$options.i18n.manualSyncSuccessfulTitle"
data-testid="sync-success-alert" data-testid="sync-success-alert"
@dismiss="didDismissSuccessAlert" @dismiss="didDismissSuccessAlert"
/> >{{ $options.i18n.manualSyncSuccessfulText }}</gl-alert
>
<gl-alert <gl-alert
v-else-if="syncDidFail" v-else-if="syncDidFail"
variant="danger" variant="danger"
......
...@@ -66,9 +66,10 @@ export const subscriptionTable = { ...@@ -66,9 +66,10 @@ export const subscriptionTable = {
type: s__('SuperSonics|Type'), type: s__('SuperSonics|Type'),
}; };
export const connectivityIssue = s__('SuperSonics|There is a connectivity issue.'); export const connectivityIssue = s__('SuperSonics|There is a connectivity issue.');
export const manualSyncSuccessfulTitle = s__( export const manualSyncSuccessfulText = s__(
'SuperSonics|The subscription details synced successfully.', 'SuperSonics|Your subscription details will sync shortly.',
); );
export const manualSyncSuccessfulTitle = s__('SuperSonics|Sync subscription request.');
export const manualSyncFailureText = s__( export const manualSyncFailureText = s__(
'SuperSonics|You can no longer sync your subscription details with GitLab. Get help for the most common connectivity issues by %{connectivityHelpLinkStart}troubleshooting the activation code%{connectivityHelpLinkEnd}.', 'SuperSonics|You can no longer sync your subscription details with GitLab. Get help for the most common connectivity issues by %{connectivityHelpLinkStart}troubleshooting the activation code%{connectivityHelpLinkEnd}.',
); );
......
...@@ -31,7 +31,7 @@ RSpec.describe 'Admin views Subscription', :js do ...@@ -31,7 +31,7 @@ RSpec.describe 'Admin views Subscription', :js do
page.within(find('#content-body', match: :first)) do page.within(find('#content-body', match: :first)) do
click_button('Sync subscription details') click_button('Sync subscription details')
expect(page).to have_content('The subscription details synced successfully') expect(page).to have_content('Your subscription details will sync shortly.')
end end
end end
......
...@@ -31593,10 +31593,10 @@ msgstr "" ...@@ -31593,10 +31593,10 @@ msgstr ""
msgid "SuperSonics|Sync subscription details" msgid "SuperSonics|Sync subscription details"
msgstr "" msgstr ""
msgid "SuperSonics|The activation code is not valid. Please make sure to copy it exactly from the Customers Portal or confirmation email. Learn more about %{linkStart}activating your subscription%{linkEnd}." msgid "SuperSonics|Sync subscription request."
msgstr "" msgstr ""
msgid "SuperSonics|The subscription details synced successfully." msgid "SuperSonics|The activation code is not valid. Please make sure to copy it exactly from the Customers Portal or confirmation email. Learn more about %{linkStart}activating your subscription%{linkEnd}."
msgstr "" msgstr ""
msgid "SuperSonics|There is a connectivity issue." msgid "SuperSonics|There is a connectivity issue."
...@@ -31647,6 +31647,9 @@ msgstr "" ...@@ -31647,6 +31647,9 @@ msgstr ""
msgid "SuperSonics|Your subscription" msgid "SuperSonics|Your subscription"
msgstr "" msgstr ""
msgid "SuperSonics|Your subscription details will sync shortly."
msgstr ""
msgid "SuperSonics|Your subscription was successfully activated. You can see the details below." msgid "SuperSonics|Your subscription was successfully activated. You can see the details below."
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