Merge branch '325739-add-additional-blocks' into 'master'

Add trial and subscription blocks to Subscription Activation Form

See merge request gitlab-org/gitlab!59215

ee/app/assets/javascripts/pages/admin/cloud_licenses/components/app.vue

@@ -7,12 +7,16 @@ import {
 } from '../constants';
 import CloudLicenseSubscriptionActivationForm from './subscription_activation_form.vue';
 import SubscriptionBreakdown from './subscription_breakdown.vue';
+import SubscriptionPurchaseCard from './subscription_purchase_card.vue';
+import SubscriptionTrialCard from './subscription_trial_card.vue';
 
 export default {
   name: 'CloudLicenseApp',
   components: {
     SubscriptionBreakdown,
     CloudLicenseSubscriptionActivationForm,
+    SubscriptionTrialCard,
+    SubscriptionPurchaseCard,
   },
   i18n: {
     subscriptionActivationTitle,
@@ -72,6 +76,14 @@ export default {
           {{ $options.i18n.subscriptionActivationTitle }}
         </h3>
         <cloud-license-subscription-activation-form @subscription-activation="handleActivation" />
+        <div class="row gl-mt-7">
+          <div class="col-lg-6">
+            <subscription-trial-card />
+          </div>
+          <div class="col-lg-6">
+            <subscription-purchase-card />
+          </div>
+        </div>
       </div>
     </div>
   </div>

ee/app/assets/javascripts/pages/admin/cloud_licenses/components/subscription_activation_form.vue

@@ -9,11 +9,19 @@ import {
   GlLink,
   GlSprintf,
 } from '@gitlab/ui';
-import { subscriptionQueries } from '../constants';
+import { subscriptionActivationForm, subscriptionQueries } from '../constants';
 
 export const SUBSCRIPTION_ACTIVATION_EVENT = 'subscription-activation';
 
 export default {
+  i18n: {
+    title: subscriptionActivationForm.title,
+    howToActivateSubscription: subscriptionActivationForm.howToActivateSubscription,
+    activationCode: subscriptionActivationForm.activationCode,
+    pasteActivationCode: subscriptionActivationForm.pasteActivationCode,
+    acceptTerms: subscriptionActivationForm.acceptTerms,
+    activateLabel: subscriptionActivationForm.activateLabel,
+  },
   name: 'CloudLicenseSubscriptionActivationForm',
   components: {
     GlButton,
@@ -74,15 +82,11 @@ export default {
 <template>
   <gl-card>
     <template #header>
-      <h5 class="gl-my-0 gl-font-weight-bold">{{ s__('CloudLicense|Activate subscription') }}</h5>
+      <h5 class="gl-my-0 gl-font-weight-bold">{{ $options.i18n.title }}</h5>
     </template>
 
     <p>
-      <gl-sprintf
-        :message="
-          s__('CloudLicense|Learn how to %{linkStart}activate your subscription%{linkEnd}.')
-        "
-      >
+      <gl-sprintf :message="$options.i18n.howToActivateSubscription">
         <template #link="{ content }">
           <gl-link href="" target="_blank">{{ content }}</gl-link>
         </template>
@@ -92,25 +96,19 @@ export default {
       <gl-form-group class="gl-mb-0">
         <div class="gl-display-flex gl-flex-wrap">
           <label class="gl-w-full" for="activation-code-group">
-            {{ s__('CloudLicense|Activation code') }}
+            {{ $options.i18n.activationCode }}
           </label>
           <gl-form-input
             id="activation-code-group"
             v-model="activationCode"
             :disabled="isLoading"
-            :placeholder="s__('CloudLicense|Paste your activation code')"
+            :placeholder="$options.i18n.pasteActivationCode"
             class="gl-w-full gl-mb-4"
             required
           />
 
           <gl-form-checkbox v-model="termsAccepted">
-            <gl-sprintf
-              :message="
-                s__(
-                  'CloudLicense|I agree that my use of the GitLab Software is subject to the Subscription Agreement located at the %{linkStart}Terms of Service%{linkEnd}, unless otherwise agreed to in writing with GitLab.',
-                )
-              "
-            >
+            <gl-sprintf :message="$options.i18n.acceptTerms">
               <template #link="{ content }">
                 <gl-link href="https://about.gitlab.com/terms/" target="_blank"
                   >{{ content }}
@@ -127,7 +125,7 @@ export default {
             type="submit"
             variant="confirm"
           >
-            {{ s__('CloudLicense|Activate') }}
+            {{ $options.i18n.activateLabel }}
           </gl-button>
         </div>
       </gl-form-group>

ee/app/assets/javascripts/pages/admin/cloud_licenses/components/subscription_purchase_card.vue

+<script>
+import { GlButton, GlCard } from '@gitlab/ui';
+import { buySubscriptionCard } from '../constants';
+
+export default {
+  i18n: {
+    title: buySubscriptionCard.title,
+    description: buySubscriptionCard.description,
+    buttonLabel: buySubscriptionCard.buttonLabel,
+  },
+  name: 'SubscriptionPurchaseCard',
+  components: { GlCard, GlButton },
+  inject: ['buySubscriptionPath'],
+};
+</script>
+<template>
+  <gl-card>
+    <template #header>
+      <h5 class="gl-my-0 gl-font-weight-bold">{{ $options.i18n.title }}</h5>
+    </template>
+    <p>{{ $options.i18n.description }}</p>
+    <gl-button
+      category="secondary"
+      class="gl-mt-6"
+      data-testid="buy-subscription-button"
+      variant="confirm"
+      :href="buySubscriptionPath"
+    >
+      {{ $options.i18n.buttonLabel }}
+    </gl-button>
+  </gl-card>
+</template>

ee/app/assets/javascripts/pages/admin/cloud_licenses/components/subscription_trial_card.vue

+<script>
+import { GlButton, GlCard } from '@gitlab/ui';
+import { trialCard } from '../constants';
+
+export default {
+  i18n: {
+    title: trialCard.title,
+    startTrial: trialCard.startTrial,
+    description: trialCard.description,
+  },
+  name: 'SubscriptionTrialCard',
+  components: {
+    GlCard,
+    GlButton,
+  },
+  inject: ['freeTrialPath'],
+};
+</script>
+
+<template>
+  <gl-card>
+    <template #header>
+      <h5 class="gl-my-0 gl-font-weight-bold">{{ $options.i18n.title }}</h5>
+    </template>
+    <p>
+      {{ $options.i18n.description }}
+    </p>
+    <gl-button
+      category="secondary"
+      class="gl-mt-6"
+      data-testid="free-trial-button"
+      variant="confirm"
+      :href="freeTrialPath"
+    >
+      {{ $options.i18n.startTrial }}
+    </gl-button>
+  </gl-card>
+</template>

ee/app/assets/javascripts/pages/admin/cloud_licenses/constants.js

@@ -57,6 +57,19 @@ export const manualSyncFailureText = s__(
 );
 export const manualSyncFailureTitle = s__('SuperSonics|There is a connectivity issue.');
 
+export const subscriptionActivationForm = {
+  title: s__('CloudLicense|Activate subscription'),
+  howToActivateSubscription: s__(
+    'CloudLicense|Learn how to %{linkStart}activate your subscription%{linkEnd}.',
+  ),
+  activationCode: s__('CloudLicense|Activation code'),
+  pasteActivationCode: s__('CloudLicense|Paste your activation code'),
+  acceptTerms: s__(
+    'CloudLicense|I agree that my use of the GitLab Software is subject to the Subscription Agreement located at the %{linkStart}Terms of Service%{linkEnd}, unless otherwise agreed to in writing with GitLab.',
+  ),
+  activateLabel: s__('CloudLicense|Activate'),
+};
+
 export const subscriptionType = {
   CLOUD: 'cloud',
   LEGACY: 'legacy',
@@ -70,3 +83,19 @@ export const subscriptionQueries = {
 export const subscriptionHistoryQueries = {
   query: getLicenseHistory,
 };
+
+export const trialCard = {
+  title: s__('CloudLicense|Free trial'),
+  description: s__(
+    'CloudLicense|You can start a free trial of GitLab Ultimate without any obligation or payment details.',
+  ),
+  startTrial: s__('CloudLicense|Start free trial'),
+};
+
+export const buySubscriptionCard = {
+  title: s__('CloudLicense|Subscription'),
+  description: s__(
+    'CloudLicense|Ready to get started? A GitLab plan is ideal for scaling organizations and for multi team usage.',
+  ),
+  buttonLabel: s__('CloudLicense|Buy subscription'),
+};

ee/app/assets/javascripts/pages/admin/cloud_licenses/show/mount_cloud_licenses.js

@@ -17,11 +17,15 @@ export default () => {
     return null;
   }
 
-  const { hasActiveLicense } = el.dataset;
+  const { hasActiveLicense, freeTrialPath, buySubscriptionPath } = el.dataset;
 
   return new Vue({
     el,
     apolloProvider,
+    provide: {
+      freeTrialPath,
+      buySubscriptionPath,
+    },
     render: (h) =>
       h(CloudLicenseShowApp, {
         props: {

ee/app/helpers/license_helper.rb

@@ -54,7 +54,9 @@ module LicenseHelper
 
   def cloud_license_view_data
     {
-      has_active_license: (has_active_license? ? 'true' : 'false')
+      has_active_license: (has_active_license? ? 'true' : 'false'),
+      free_trial_path: new_trial_url,
+      buy_subscription_path: ::EE::SUBSCRIPTIONS_PLANS_URL
     }
   end
 

ee/spec/frontend/admin/cloud_licenses/components/subscription_purchase_card_spec.js

+import { shallowMount } from '@vue/test-utils';
+import SubscriptionPurchaseCard from 'ee/pages/admin/cloud_licenses/components/subscription_purchase_card.vue';
+import { buySubscriptionCard } from 'ee/pages/admin/cloud_licenses/constants';
+import { extendedWrapper } from 'helpers/vue_test_utils_helper';
+
+describe('SubscriptionPurchaseCard', () => {
+  let wrapper;
+  const buySubscriptionPath = 'sample-buy-subscription-path';
+
+  const findBuySubscriptionButton = () => wrapper.findByTestId('buy-subscription-button');
+
+  const createComponent = () => {
+    wrapper = extendedWrapper(
+      shallowMount(SubscriptionPurchaseCard, {
+        provide: {
+          buySubscriptionPath,
+        },
+      }),
+    );
+  };
+
+  describe('text and button', () => {
+    beforeEach(() => {
+      createComponent();
+    });
+
+    afterEach(() => {
+      wrapper.destroy();
+    });
+
+    it('renders card description', () => {
+      expect(wrapper.text()).toContain(buySubscriptionCard.description);
+    });
+
+    it('has a buy subscription button', () => {
+      expect(findBuySubscriptionButton().exists()).toBe(true);
+      expect(findBuySubscriptionButton().attributes('href')).toBe(buySubscriptionPath);
+    });
+  });
+});

ee/spec/frontend/admin/cloud_licenses/components/subscription_trial_card_spec.js

+import { shallowMount } from '@vue/test-utils';
+import SubscriptionTrialCard from 'ee/pages/admin/cloud_licenses/components/subscription_trial_card.vue';
+import { trialCard } from 'ee/pages/admin/cloud_licenses/constants';
+import { extendedWrapper } from 'helpers/vue_test_utils_helper';
+
+describe('SubscriptionTrialCard', () => {
+  let wrapper;
+  const freeTrialPath = 'sample-free-trial-path';
+
+  const findFreeTrialButton = () => wrapper.findByTestId('free-trial-button');
+
+  const createComponent = () => {
+    wrapper = extendedWrapper(
+      shallowMount(SubscriptionTrialCard, {
+        provide: {
+          freeTrialPath,
+        },
+      }),
+    );
+  };
+
+  describe('text and button', () => {
+    beforeEach(() => {
+      createComponent();
+    });
+
+    afterEach(() => {
+      wrapper.destroy();
+    });
+
+    it('renders card description', () => {
+      expect(wrapper.text()).toContain(trialCard.description);
+    });
+
+    it('has a free trial button', () => {
+      expect(findFreeTrialButton().exists()).toBe(true);
+      expect(findFreeTrialButton().attributes('href')).toBe(freeTrialPath);
+    });
+  });
+});

ee/spec/helpers/license_helper_spec.rb

@@ -80,13 +80,21 @@ RSpec.describe LicenseHelper do
   end
 
   describe '#cloud_license_view_data' do
+    before do
+      stub_const('::EE::SUBSCRIPTIONS_PLANS_URL', 'subscriptions_plans_url')
+
+      allow(helper).to receive(:new_trial_url).and_return('new_trial_url')
+    end
+
     context 'when there is a current license' do
       it 'returns the data for the view' do
         custom_plan = 'custom plan'
         license = double('License', plan: custom_plan)
         allow(License).to receive(:current).and_return(license)
 
-        expect(cloud_license_view_data).to eq({ has_active_license: 'true' })
+        expect(helper.cloud_license_view_data).to eq({ has_active_license: 'true',
+                                                       free_trial_path: 'new_trial_url',
+                                                       buy_subscription_path: 'subscriptions_plans_url' })
       end
     end
 
@@ -94,7 +102,9 @@ RSpec.describe LicenseHelper do
       it 'returns the data for the view' do
         allow(License).to receive(:current).and_return(nil)
 
-        expect(cloud_license_view_data).to eq({ has_active_license: 'false' })
+        expect(helper.cloud_license_view_data).to eq({ has_active_license: 'false',
+                                                       free_trial_path: 'new_trial_url',
+                                                       buy_subscription_path: 'subscriptions_plans_url' })
       end
     end
   end

locale/gitlab.pot

@@ -6668,6 +6668,12 @@ msgstr ""
 msgid "CloudLicense|Billable users"
 msgstr ""
 
+msgid "CloudLicense|Buy subscription"
+msgstr ""
+
+msgid "CloudLicense|Free trial"
+msgstr ""
+
 msgid "CloudLicense|I agree that my use of the GitLab Software is subject to the Subscription Agreement located at the %{linkStart}Terms of Service%{linkEnd}, unless otherwise agreed to in writing with GitLab."
 msgstr ""
 
@@ -6680,6 +6686,15 @@ msgstr ""
 msgid "CloudLicense|Paste your activation code"
 msgstr ""
 
+msgid "CloudLicense|Ready to get started? A GitLab plan is ideal for scaling organizations and for multi team usage."
+msgstr ""
+
+msgid "CloudLicense|Start free trial"
+msgstr ""
+
+msgid "CloudLicense|Subscription"
+msgstr ""
+
 msgid "CloudLicense|This is the highest peak of users on your installation since the license started."
 msgstr ""
 
@@ -6695,6 +6710,9 @@ msgstr ""
 msgid "CloudLicense|Users with a Guest role or those who don't belong to a Project or Group will not use a seat from your license."
 msgstr ""
 
+msgid "CloudLicense|You can start a free trial of GitLab Ultimate without any obligation or payment details."
+msgstr ""
+
 msgid "CloudLicense|You'll be charged for %{trueUpLinkStart}users over license%{trueUpLinkEnd} on a quarterly or annual basis, depending on the terms of your agreement."
 msgstr ""