Merge branch 'main' into cy/file_diff_400

Author: calvin-codecov

.github/workflows/ci.yml

@@ -337,6 +337,45 @@ jobs:
           # The head sha aligns with how the sha used in prod builds
           GAZEBO_SHA: ${{ github.event.pull_request.head.sha }}
 
+  upload-bundle-stats-to-helmtest:
+    name: Upload Bundle Stats - Helmtest
+    runs-on: ubuntu-latest
+    needs: install
+    if: ${{ !github.event.pull_request.head.repo.fork && github.repository_owner == 'codecov' }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Cache node_modules
+        id: cache-node-modules
+        uses: actions/cache@v4
+        env:
+          cache-name: cache-gazebo-node-modules
+        with:
+          path: |
+            node_modules
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ env.cache-name }}-
+
+      - name: Build and upload stats
+        run: |
+          yarn build
+        env:
+          CODECOV_API_URL: https://helmtest.codecov.dev
+          CODECOV_ORG_TOKEN: ${{ secrets.CODECOV_HELMTEST_TOKEN }}
+          CODECOV_BUNDLE_NAME: 'gazebo-helmtest'
+          UPLOAD_CODECOV_BUNDLE_STATS: true
+          # The head sha aligns with how the sha used in prod builds
+          GAZEBO_SHA: ${{ github.event.pull_request.head.sha }}
+
   storybook:
     name: Run storybook
     runs-on: ubuntu-latest

VERSION

@@ -1 +1 @@
-25.12.1
+26.1.20

src/pages/PlanPage/subRoutes/CancelPlanPage/subRoutes/TeamPlanSpecialOffer/TeamPlanCard/TeamPlanCard.test.tsx

@@ -177,7 +177,7 @@ describe('TeamPlanCard', () => {
     const monthlyPrice = await screen.findByText(/6/)
     expect(monthlyPrice).toBeInTheDocument()
 
-    const auxiliaryText = await screen.findByText(/billed monthly/)
+    const auxiliaryText = await screen.findByText(/per user billed monthly/)
     expect(auxiliaryText).toBeInTheDocument()
   })
 

src/pages/PlanPage/subRoutes/CancelPlanPage/subRoutes/TeamPlanSpecialOffer/TeamPlanCard/TeamPlanCard.tsx

@@ -47,11 +47,9 @@ const TeamPlanCard: React.FC = () => {
         <div className="flex flex-col gap-2 border-t pt-2 sm:border-0 sm:p-0">
           <p className="text-xs font-semibold">Pricing</p>
           <div>
-            <p className="font-semibold">
-              <span className="text-2xl">${teamPlanMonth?.baseUnitPrice}</span>{' '}
-              per user/month
+            <p className="text-ds-gray-senary">
+              ${teamPlanMonth?.baseUnitPrice} per user billed monthly
             </p>
-            <p className="text-ds-gray-senary">billed monthly</p>
           </div>
         </div>
       </div>

src/pages/PlanPage/subRoutes/CurrentOrgPlan/BillingDetails/PaymentCard/CardInformation.jsx

@@ -33,7 +33,12 @@ const cardBrand = {
   },
 }
 
-function CardInformation({ subscriptionDetail, card, nextBillPrice }) {
+function CardInformation({
+  subscriptionDetail,
+  card,
+  nextBillPrice,
+  isFreePlan,
+}) {
   const typeCard = cardBrand[card?.brand] ?? cardBrand?.fallback
   let nextBilling = null
 
@@ -58,7 +63,7 @@ function CardInformation({ subscriptionDetail, card, nextBillPrice }) {
       <p className="text-ds-gray-quinary">
         Expires {card?.expMonth}/{lastTwoDigits(card?.expYear)}
       </p>
-      {nextBilling && (
+      {nextBilling && !isFreePlan && (
         <p className="text-sm text-ds-gray-quinary">
           Your next billing date is{' '}
           <span className="text-ds-gray-octonary">
@@ -81,6 +86,7 @@ CardInformation.propTypes = {
     expYear: PropTypes.number.isRequired,
   }).isRequired,
   nextBillPrice: PropTypes.string,
+  isFreePlan: PropTypes.bool,
 }
 
 export default CardInformation

src/pages/PlanPage/subRoutes/CurrentOrgPlan/BillingDetails/PaymentCard/PaymentCard.jsx

@@ -40,23 +40,32 @@ const calculateNextBillPrice = ({ planData, scheduledPhase }) => {
     seats = scheduledPhaseQuantity ?? 0
     baseUnitPrice = scheduledPhaseBaseUnitPrice ?? 0
     calculatePriceFunction =
-      scheduledPhasePlanName === PlanMarketingNames.PRO
-        ? calculatePriceProPlan
-        : scheduledPhasePlanName === PlanMarketingNames.TEAM
-          ? calculatePriceTeamPlan
-          : calculatePriceSentryPlan
+      scheduledPhasePlanName === PlanMarketingNames.SENTRY
+        ? calculatePriceSentryPlan
+        : scheduledPhasePlanName === PlanMarketingNames.PRO
+          ? calculatePriceProPlan
+          : scheduledPhasePlanName === PlanMarketingNames.TEAM
+            ? calculatePriceTeamPlan
+            : null
   } else {
     isPerYear = planData?.plan?.billingRate === BillingRate.ANNUALLY
     seats =
       (planData?.plan?.planUserCount ?? 0) -
       (planData?.plan?.freeSeatCount ?? 0)
     baseUnitPrice = planData?.plan?.baseUnitPrice ?? 0
-    calculatePriceFunction = planData?.plan?.isProPlan
-      ? calculatePriceProPlan
-      : planData?.plan?.isTeamPlan
-        ? calculatePriceTeamPlan
-        : calculatePriceSentryPlan
+    calculatePriceFunction = planData?.plan?.isSentryPlan
+      ? calculatePriceSentryPlan
+      : planData?.plan?.isProPlan
+        ? calculatePriceProPlan
+        : planData?.plan?.isTeamPlan
+          ? calculatePriceTeamPlan
+          : null
   }
+
+  if (!calculatePriceFunction) {
+    return null
+  }
+
   // make sure seats is not negative
   seats = Math.max(seats, 0)
   const billPrice = calculatePriceFunction({
@@ -118,6 +127,7 @@ function PaymentCard({ accountDetails, provider, owner }) {
           card={card}
           subscriptionDetail={subscriptionDetail}
           nextBillPrice={nextBillPrice}
+          isFreePlan={planData?.plan?.isFreePlan}
         />
       ) : usBankAccount ? (
         <BankInformation

src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/FreePlanCard.test.jsx

@@ -117,7 +117,7 @@ const sentryPlans = [
   {
     marketingName: 'Sentry',
     value: Plans.USERS_SENTRYM,
-    billingRate: null,
+    billingRate: BillingRate.MONTHLY,
     baseUnitPrice: 12,
     benefits: ['Includes 5 seats', 'Unlimited public repositories'],
     monthlyUploadLimit: null,
@@ -127,7 +127,7 @@ const sentryPlans = [
   {
     marketingName: 'Sentry',
     value: Plans.USERS_SENTRYY,
-    billingRate: null,
+    billingRate: BillingRate.ANNUALLY,
     baseUnitPrice: 10,
     benefits: ['Includes 5 seats', 'Unlimited private repositories'],
     monthlyUploadLimit: null,
@@ -313,6 +313,7 @@ describe('FreePlanCard', () => {
       })
 
       const link = await screen.findByRole('link', { name: /Upgrade/ })
+
       expect(link).toBeInTheDocument()
       expect(link).toHaveAttribute(
         'href',
@@ -367,9 +368,6 @@ describe('FreePlanCard', () => {
       const cost = await screen.findByText(/\$12/)
       expect(cost).toBeInTheDocument()
 
-      const billingText = await screen.findByText(/per user\/month/)
-      expect(billingText).toBeInTheDocument()
-
       const monthlyBillingText = await screen.findByText(/billed monthly/)
       expect(monthlyBillingText).toBeInTheDocument()
     })
@@ -500,6 +498,7 @@ describe('FreePlanCard', () => {
       })
 
       const cost = await screen.findByText(/\$29/)
+
       expect(cost).toBeInTheDocument()
 
       const perMonth = await screen.findByText(/^\/month/)

src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/PlanUpgradePro/PlanUpgradePro.jsx

@@ -57,7 +57,7 @@ function PlanUpgradePro({ isSentryUpgrade, plans }) {
           <h2 className="font-semibold">{upgradeToPlan?.marketingName} plan</h2>
           <ProPlanSubheading />
         </div>
-        <ActionsBilling buttonOptions={{ params: { plan: 'pro' } }} />
+        <ActionsBilling />
       </div>
       <hr />
       <div className="grid gap-4 p-4 sm:grid-cols-2 sm:gap-0">

src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/PlanUpgradePro/PlanUpgradePro.test.jsx

@@ -8,12 +8,8 @@ import { BillingRate, Plans } from 'shared/utils/billing'
 import PlanUpgradePro from './PlanUpgradePro'
 
 vi.mock('../ProPlanSubheading', () => ({ default: () => 'Pro Subheading' }))
-const mockActionsBilling = vi.fn(() => 'Actions Billing')
 vi.mock('../../shared/ActionsBilling/ActionsBilling', () => ({
-  default: (props) => {
-    mockActionsBilling(props)
-    return 'Actions Billing'
-  },
+  default: () => 'Actions Billing',
 }))
 vi.mock('shared/plan/BenefitList', () => ({ default: () => 'BenefitsList' }))
 
@@ -101,7 +97,7 @@ const plansWithSentryOptions = [
     marketingName: 'Sentry',
     value: Plans.USERS_SENTRYM,
     billingRate: null,
-    baseUnitPrice: 12,
+    baseUnitPrice: 456,
     benefits: ['Includes 5 seats', 'Unlimited public repositories'],
     monthlyUploadLimit: null,
   },
@@ -172,7 +168,7 @@ describe('PlanUpgradePro', () => {
       expect(benefitsList).toBeInTheDocument()
     })
 
-    it('shows sentry up to 5 users price', async () => {
+    it('shows sentry price', async () => {
       render(
         <PlanUpgradePro isSentryUpgrade plans={plansWithSentryOptions} />,
         {
@@ -184,15 +180,15 @@ describe('PlanUpgradePro', () => {
       expect(sentryPrice).toBeInTheDocument()
     })
 
-    it('shows sentry above 5 users price', async () => {
+    it('shows sentry monthly price', async () => {
       render(
         <PlanUpgradePro isSentryUpgrade plans={plansWithSentryOptions} />,
         {
           wrapper,
         }
       )
 
-      const annualSentryPrice = await screen.findByText(/12/)
+      const annualSentryPrice = await screen.findByText(/456/)
       expect(annualSentryPrice).toBeInTheDocument()
     })
 
@@ -207,21 +203,6 @@ describe('PlanUpgradePro', () => {
       const actionsBilling = await screen.findByText(/Actions Billing/)
       expect(actionsBilling).toBeInTheDocument()
     })
-
-    it('passes buttonOptions prop to ActionsBilling', async () => {
-      render(
-        <PlanUpgradePro isSentryUpgrade plans={plansWithSentryOptions} />,
-        {
-          wrapper,
-        }
-      )
-
-      const actionsBilling = await screen.findByText(/Actions Billing/)
-      expect(actionsBilling).toBeInTheDocument()
-      expect(mockActionsBilling).toHaveBeenCalledWith({
-        buttonOptions: { params: { plan: 'pro' } },
-      })
-    })
   })
 
   describe('when rendered with pro plan', () => {
@@ -285,7 +266,7 @@ describe('PlanUpgradePro', () => {
       expect(monthlyProPrice).toBeInTheDocument()
     })
 
-    it('does not shows pro yearly price', async () => {
+    it('does not show pro yearly price', async () => {
       render(
         <PlanUpgradePro
           isSentryUpgrade={false}
@@ -296,6 +277,9 @@ describe('PlanUpgradePro', () => {
         }
       )
 
+      const monthlyProPrice = await screen.findByText(/789/)
+      expect(monthlyProPrice).toBeInTheDocument()
+
       const yearlyProPrice = screen.queryByText(/456/)
       expect(yearlyProPrice).not.toBeInTheDocument()
     })
@@ -314,23 +298,5 @@ describe('PlanUpgradePro', () => {
       const actionsBilling = await screen.findByText(/Actions Billing/)
       expect(actionsBilling).toBeInTheDocument()
     })
-
-    it('passes buttonOptions prop to ActionsBilling', async () => {
-      render(
-        <PlanUpgradePro
-          isSentryUpgrade={false}
-          plans={plansWithoutSentryOptions}
-        />,
-        {
-          wrapper,
-        }
-      )
-
-      const actionsBilling = await screen.findByText(/Actions Billing/)
-      expect(actionsBilling).toBeInTheDocument()
-      expect(mockActionsBilling).toHaveBeenCalledWith({
-        buttonOptions: { params: { plan: 'pro' } },
-      })
-    })
   })
 })

src/pages/PlanPage/subRoutes/CurrentOrgPlan/CurrentPlanCard/FreePlanCard/PlanUpgradeTeam/PlanUpgradeTeam.test.jsx

@@ -283,12 +283,12 @@ describe('PlanUpgradeTeam', () => {
         wrapper,
       })
 
-      const yearlyPrice = screen.queryByText(/5/)
-      expect(yearlyPrice).not.toBeInTheDocument()
-
       const monthlyPrice = await screen.findByText(/6/)
       expect(monthlyPrice).toBeInTheDocument()
 
+      const yearlyPrice = screen.queryByText(/5/)
+      expect(yearlyPrice).not.toBeInTheDocument()
+
       const auxiliaryText = await screen.findByText(/billed monthly/)
       expect(auxiliaryText).toBeInTheDocument()
     })