Merge branch '323181-hide-renew-button-for-trail-subscriptions' into 'master'

Hide "Renew" button for trial subscription on group billing page

See merge request gitlab-org/gitlab!55796

ee/app/assets/javascripts/billings/subscriptions/components/subscription_table.vue

@@ -50,6 +50,9 @@ export default {
 
       return `${this.namespaceName}: ${planName} ${suffix}`;
     },
+    canRenew() {
+      return this.isSubscription && !this.plan.trial;
+    },
     canUpgrade() {
       return this.isFreePlan || this.plan.upgradable;
     },
@@ -78,7 +81,7 @@ export default {
       return this.canUpgradeEEPlan ? this.planUpgradeHref : this.customerPortalUrl;
     },
     renewButton() {
-      return this.isSubscription
+      return this.canRenew
         ? createButtonProps(s__('SubscriptionTable|Renew'), this.planRenewHref, 'renew-button')
         : null;
     },

ee/changelogs/unreleased/323181-hide-renew-button-for-trail-subscriptions.yml

+---
+title: Hide "Renew" button for trial subscription on group billing page
+merge_request: 55796
+author: Kev @KevSlashNull
+type: fixed

ee/spec/frontend/billings/subscriptions/components/subscription_table_spec.js

@@ -132,19 +132,21 @@ describe('SubscriptionTable component', () => {
 
   describe('Renew button', () => {
     describe.each`
-      planCode    | expected | testDescription
-      ${'silver'} | ${true}  | ${'renders the button'}
-      ${null}     | ${false} | ${'does not render the button'}
-      ${'free'}   | ${false} | ${'does not render the button'}
+      planCode    | trial    | expected | testDescription
+      ${'silver'} | ${false} | ${true}  | ${'renders the button'}
+      ${'silver'} | ${true}  | ${false} | ${'does not render the button'}
+      ${null}     | ${false} | ${false} | ${'does not render the button'}
+      ${'free'}   | ${false} | ${false} | ${'does not render the button'}
     `(
-      'given a plan with state: planCode = $planCode',
-      ({ planCode, expected, testDescription }) => {
+      'given a plan with state: planCode = $planCode, trial = $trial',
+      ({ planCode, trial, expected, testDescription }) => {
         beforeEach(() => {
           createComponentWithStore({
             state: {
               isLoadingSubscription: false,
               plan: {
                 code: planCode,
+                trial,
               },
             },
           });