Merge branch...

Merge branch '294249-plan-free-state-code-changed-from-null-to-string-causing-unwanted-ui-render' into 'master'

Update check for free plan with both code and null

See merge request gitlab-org/gitlab!50275

ee/app/assets/javascripts/billings/subscriptions/store/getters.js

-export const isFreePlan = state => state.plan.code === null;
+export const isFreePlan = state => ['free', null].includes(state.plan.code);

ee/changelogs/unreleased/294249-plan-free-state-code-changed-from-null-to-string-causing-unwant.yml

+---
+title: 50275 Update check for free plan with both code and null
+merge_request: 50275
+author:
+type: fixed

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

@@ -116,6 +116,7 @@ describe('SubscriptionTable component', () => {
       planCode    | expected | testDescription
       ${'bronze'} | ${true}  | ${'renders the button'}
       ${null}     | ${false} | ${'does not render the button'}
+      ${'free'}   | ${false} | ${'does not render the button'}
     `(
       'given a plan with state: planCode = $planCode and saasAddSeatsButton = $featureFlag',
       ({ planCode, upgradable, expected, testDescription }) => {
@@ -145,6 +146,8 @@ describe('SubscriptionTable component', () => {
       ${'silver'} | ${false}    | ${false} | ${'does not render the button'}
       ${null}     | ${true}     | ${false} | ${'does not render the button'}
       ${null}     | ${false}    | ${false} | ${'does not render the button'}
+      ${'free'}   | ${true}     | ${false} | ${'does not render the button'}
+      ${'free'}   | ${false}    | ${false} | ${'does not render the button'}
     `(
       'given a plan with state: planCode = $planCode and saasManualRenewButton = $featureFlag',
       ({ planCode, featureFlag, expected, testDescription }) => {
@@ -174,6 +177,8 @@ describe('SubscriptionTable component', () => {
       ${'silver'} | ${false}    | ${false} | ${'does not render the button'}
       ${null}     | ${true}     | ${false} | ${'does not render the button'}
       ${null}     | ${false}    | ${false} | ${'does not render the button'}
+      ${'free'}   | ${true}     | ${false} | ${'does not render the button'}
+      ${'free'}   | ${false}    | ${false} | ${'does not render the button'}
     `(
       'given a plan with state: planCode = $planCode and saasAddSeatsButton = $featureFlag',
       ({ planCode, featureFlag, expected, testDescription }) => {
@@ -204,6 +209,8 @@ describe('SubscriptionTable component', () => {
       ${'bronze'} | ${false}   | ${false} | ${'does not render the button'}
       ${null}     | ${true}    | ${true}  | ${'renders the button'}
       ${null}     | ${false}   | ${true}  | ${'renders the button'}
+      ${'free'}   | ${true}    | ${true}  | ${'renders the button'}
+      ${'free'}   | ${false}   | ${true}  | ${'renders the button'}
     `(
       'given a plan with state: planCode = $planCode, upgradable = $upgradable',
       ({ planCode, upgradable, expected, testDescription }) => {