Merge branch 'ag/332941-sync-sub-details' into 'master'

Update banner for Subscription Details Sync

See merge request gitlab-org/gitlab!65316

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

@@ -5,6 +5,7 @@ import {
   connectivityIssue,
   manualSyncSuccessfulTitle,
   subscriptionSyncStatus,
+  manualSyncSuccessfulText,
 } from '../constants';
 
 export const SUCCESS_ALERT_DISMISSED_EVENT = 'success-alert-dismissed';
@@ -15,6 +16,7 @@ const subscriptionSyncStatusValidator = (value) =>
 export default {
   name: 'SubscriptionSyncNotifications',
   i18n: {
+    manualSyncSuccessfulText,
     manualSyncSuccessfulTitle,
     manualSyncFailureText,
     connectivityIssue,
@@ -52,11 +54,12 @@ export default {
   <div>
     <gl-alert
       v-if="syncDidSuccess"
-      variant="success"
+      variant="info"
       :title="$options.i18n.manualSyncSuccessfulTitle"
       data-testid="sync-success-alert"
       @dismiss="didDismissSuccessAlert"
-    />
+      >{{ $options.i18n.manualSyncSuccessfulText }}</gl-alert
+    >
     <gl-alert
       v-else-if="syncDidFail"
       variant="danger"

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

@@ -66,9 +66,10 @@ export const subscriptionTable = {
   type: s__('SuperSonics|Type'),
 };
 export const connectivityIssue = s__('SuperSonics|There is a connectivity issue.');
-export const manualSyncSuccessfulTitle = s__(
-  'SuperSonics|The subscription details synced successfully.',
+export const manualSyncSuccessfulText = s__(
+  'SuperSonics|Your subscription details will sync shortly.',
 );
+export const manualSyncSuccessfulTitle = s__('SuperSonics|Sync subscription request.');
 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}.',
 );

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

@@ -31,7 +31,7 @@ RSpec.describe 'Admin views Subscription', :js do
         page.within(find('#content-body', match: :first)) do
           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
 

locale/gitlab.pot

@@ -31599,10 +31599,10 @@ msgstr ""
 msgid "SuperSonics|Sync subscription details"
 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 ""
 
-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 ""
 
 msgid "SuperSonics|There is a connectivity issue."
@@ -31653,6 +31653,9 @@ msgstr ""
 msgid "SuperSonics|Your subscription"
 msgstr ""
 
+msgid "SuperSonics|Your subscription details will sync shortly."
+msgstr ""
+
 msgid "SuperSonics|Your subscription was successfully activated. You can see the details below."
 msgstr ""