chore: Shared/utils conversions Part 2 Part 1 (#3461)

src/App.test.tsx

@@ -9,6 +9,7 @@ import { type Mock, vi } from 'vitest'
 import config from 'config'
 
 import { useLocationParams } from 'services/navigation'
+import { Plans } from 'shared/utils/billing'
 
 import App from './App'
 
@@ -85,7 +86,7 @@ const user = {
       service: 'github',
       ownerid: 123,
       serviceId: '123',
-      plan: 'users-basic',
+      plan: Plans.USERS_BASIC,
       staff: false,
       hasYaml: false,
       bot: null,

src/layouts/BaseLayout/BaseLayout.test.tsx

@@ -10,6 +10,7 @@ import config from 'config'
 import { useImage } from 'services/image'
 import { useImpersonate } from 'services/impersonate'
 import { useInternalUser, useUser } from 'services/user'
+import { Plans } from 'shared/utils/billing'
 
 import BaseLayout from './BaseLayout'
 
@@ -73,7 +74,7 @@ const mockTrackingMetadata = {
   service: 'github',
   ownerid: 123,
   serviceId: '123',
-  plan: 'users-basic',
+  plan: Plans.USERS_BASIC,
   staff: false,
   hasYaml: false,
   bot: null,

src/layouts/BaseLayout/hooks/useUserAccessGate.test.tsx

@@ -7,6 +7,7 @@ import { MemoryRouter, Route } from 'react-router-dom'
 import config from 'config'
 
 import { User } from 'services/user'
+import { Plans } from 'shared/utils/billing'
 
 import { useUserAccessGate } from './useUserAccessGate'
 
@@ -73,7 +74,7 @@ const mockTrackingMetadata = {
   service: 'github',
   ownerid: 123,
   serviceId: '123',
-  plan: 'users-basic',
+  plan: Plans.USERS_BASIC,
   staff: false,
   hasYaml: false,
   bot: null,

src/layouts/Header/Header.test.tsx

@@ -9,6 +9,7 @@ import config from 'config'
 
 import { useImpersonate } from 'services/impersonate'
 import { User } from 'services/user'
+import { Plans } from 'shared/utils/billing'
 
 import Header from './Header'
 
@@ -58,7 +59,7 @@ const mockUser = {
       service: 'github',
       ownerid: 123,
       serviceId: '123',
-      plan: 'users-basic',
+      plan: Plans.USERS_BASIC,
       staff: false,
       hasYaml: false,
       bot: null,

src/layouts/Header/components/Navigator/Navigator.test.tsx

@@ -7,6 +7,7 @@ import { useLayoutEffect } from 'react'
 import { MemoryRouter, Route, useParams } from 'react-router-dom'
 
 import { RepoBreadcrumbProvider, useCrumbs } from 'pages/RepoPage/context'
+import { Plans } from 'shared/utils/billing'
 
 import Navigator from './Navigator'
 
@@ -83,7 +84,7 @@ const mockUser = {
     service: 'github',
     ownerid: 123,
     serviceId: '123',
-    plan: 'users-basic',
+    plan: Plans.USERS_BASIC,
     staff: false,
     hasYaml: false,
     bot: null,

src/layouts/Header/components/UserDropdown/UserDropdown.test.tsx

@@ -9,6 +9,7 @@ import { type Mock } from 'vitest'
 import config from 'config'
 
 import { useImage } from 'services/image'
+import { Plans } from 'shared/utils/billing'
 
 import UserDropdown from './UserDropdown'
 
@@ -36,7 +37,7 @@ const mockUser = {
       service: 'github',
       ownerid: 123,
       serviceId: '123',
-      plan: 'users-basic',
+      plan: Plans.USERS_BASIC,
       staff: false,
       hasYaml: false,
       bot: null,

src/layouts/Header/components/UserDropdown/UserDropdown.tsx

@@ -3,13 +3,14 @@ import { useHistory, useParams } from 'react-router-dom'
 import config from 'config'
 
 import { useUser } from 'services/user'
+import { Provider } from 'shared/api/helpers'
 import { providerToName } from 'shared/utils/provider'
 import Avatar from 'ui/Avatar'
 import Button from 'ui/Button'
 import { Dropdown } from 'ui/Dropdown/Dropdown'
 
 interface URLParams {
-  provider: string
+  provider: Provider
 }
 
 type DropdownItem = {

src/mocks/handlers.js

@@ -8,6 +8,7 @@ import {
   flagsSelectHandler,
 } from 'services/repo/mocks'
 import { randomUsersHandler } from 'services/users/mocks'
+import { Plans } from 'shared/utils/billing'
 
 export const handlers = [
   repoCoverageHandler,
@@ -42,7 +43,7 @@ graphql.query('CurrentUser', (info) => {
           service: 'github',
           ownerid: 3456556,
           serviceId: '87824812',
-          plan: 'users-basic',
+          plan: Plans.USERS_BASIC,
           staff: true,
           hasYaml: false,
           bot: null,

src/pages/AccountSettings/AccountSettings.test.jsx

@@ -7,6 +7,8 @@ import { MemoryRouter, Route } from 'react-router-dom'
 
 import config from 'config'
 
+import { Plans } from 'shared/utils/billing'
+
 import AccountSettings from './AccountSettings'
 
 vi.mock('config')
@@ -29,7 +31,7 @@ const mockPlanData = {
   billingRate: 'monthly',
   marketingName: 'Pro Team',
   monthlyUploadLimit: 250,
-  value: 'free-plan',
+  value: Plans.USERS_BASIC,
   trialStatus: 'NOT_STARTED',
   trialStartDate: '',
   trialEndDate: '',
@@ -63,7 +65,7 @@ const mockCurrentUser = (username) => ({
       service: 'github',
       ownerid: 123,
       serviceId: '123',
-      plan: 'users-basic',
+      plan: Plans.USERS_BASIC,
       staff: false,
       hasYaml: false,
       bot: null,
@@ -129,14 +131,14 @@ describe('AccountSettings', () => {
       username = 'codecov',
       isAdmin = false,
       hideAccessTab = true,
-      planValue = 'free-plan',
+      planValue = Plans.USERS_BASIC,
     } = {
       isSelfHosted: false,
       owner: 'codecov',
       username: 'codecov',
       isAdmin: false,
       hideAccessTab: true,
-      planValue: 'free-plan',
+      planValue: Plans.USERS_BASIC,
     }
   ) {
     config.IS_SELF_HOSTED = isSelfHosted
@@ -357,7 +359,7 @@ describe('AccountSettings', () => {
   describe('on okta access route', () => {
     it('renders okta access tab for enterprise users', async () => {
       setup({
-        planValue: 'users-enterprisem',
+        planValue: Plans.USERS_ENTERPRISEM,
         isSelfHosted: false,
       })
 

src/pages/AccountSettings/AccountSettingsSideMenu.test.jsx

@@ -7,6 +7,8 @@ import { MemoryRouter, Route } from 'react-router-dom'
 
 import config from 'config'
 
+import { Plans } from 'shared/utils/billing'
+
 import AccountSettingsSideMenu from './AccountSettingsSideMenu'
 
 vi.mock('config')
@@ -17,7 +19,7 @@ const mockPlanData = {
   billingRate: 'monthly',
   marketingName: 'Pro Team',
   monthlyUploadLimit: 250,
-  value: 'free-plan',
+  value: Plans.USERS_BASIC,
   trialStatus: 'NOT_STARTED',
   trialStartDate: '',
   trialEndDate: '',
@@ -51,7 +53,7 @@ const mockCurrentUser = (username) => ({
       service: 'github',
       ownerid: 123,
       serviceId: '123',
-      plan: 'users-basic',
+      plan: Plans.USERS_BASIC,
       staff: false,
       hasYaml: false,
       bot: null,
@@ -117,14 +119,14 @@ describe('AccountSettingsSideMenu', () => {
       owner = 'codecov',
       isSelfHosted = false,
       hideAccessTab = false,
-      planValue = 'free-plan',
+      planValue = Plans.USERS_BASIC,
     } = {
       isAdmin: false,
       username: 'codecov',
       isSelfHosted: false,
       owner: 'codecov',
       hideAccessTab: false,
-      planValue: 'free-plan',
+      planValue: Plans.USERS_BASIC,
     }
   ) {
     config.IS_SELF_HOSTED = isSelfHosted
@@ -288,7 +290,7 @@ describe('AccountSettingsSideMenu', () => {
 
         describe("okta access is displayed according to the user's plan", () => {
           it('displays okta access tab if user is on enterprise', async () => {
-            setup({ isAdmin: true, planValue: 'users-enterprisem' })
+            setup({ isAdmin: true, planValue: Plans.USERS_ENTERPRISEM })
 
             render(<AccountSettingsSideMenu />, {
               wrapper: wrapper(),
@@ -339,7 +341,7 @@ describe('AccountSettingsSideMenu', () => {
             setup({
               isAdmin: true,
               username: 'cool-new-user',
-              planValue: 'users-enterprisem',
+              planValue: Plans.USERS_ENTERPRISEM,
             })
 
             render(<AccountSettingsSideMenu />, {
@@ -411,7 +413,7 @@ describe('AccountSettingsSideMenu', () => {
 
       describe("okta access is displayed according to the user's plan", () => {
         it('displays okta access tab if user is on enterprise', async () => {
-          setup({ planValue: 'users-enterprisem' })
+          setup({ planValue: Plans.USERS_ENTERPRISEM })
 
           render(<AccountSettingsSideMenu />, {
             wrapper: wrapper(),

src/pages/AccountSettings/tabs/Access/Access.test.tsx

@@ -7,6 +7,8 @@ import { setupServer } from 'msw/node'
 import { Suspense } from 'react'
 import { MemoryRouter, Route, useLocation } from 'react-router-dom'
 
+import { Plans } from 'shared/utils/billing'
+
 import Access from './Access'
 
 window.confirm = vi.fn(() => true)
@@ -35,7 +37,7 @@ const mockSignedInUser = {
       service: 'github',
       ownerid: 123,
       serviceId: '123',
-      plan: 'users-basic',
+      plan: Plans.USERS_BASIC,
       staff: false,
       hasYaml: false,
       bot: null,

src/pages/AccountSettings/tabs/Admin/Admin.test.jsx

@@ -4,6 +4,8 @@ import { graphql, HttpResponse } from 'msw'
 import { setupServer } from 'msw/node'
 import { MemoryRouter, Route } from 'react-router-dom'
 
+import { Plans } from 'shared/utils/billing'
+
 import Admin from './Admin'
 
 vi.mock('./DetailsSection', () => ({ default: () => 'DetailsSection' }))
@@ -38,7 +40,7 @@ const user = {
       service: 'github',
       ownerid: 123,
       serviceId: '123',
-      plan: 'users-basic',
+      plan: Plans.USERS_BASIC,
       staff: false,
       hasYaml: false,
       bot: null,

src/pages/AccountSettings/tabs/Admin/GithubIntegrationSection/GithubIntegrationSection.test.jsx

@@ -6,6 +6,8 @@ import { MemoryRouter, Route } from 'react-router-dom'
 
 import config from 'config'
 
+import { Plans } from 'shared/utils/billing'
+
 import GithubIntegrationSection from './GithubIntegrationSection'
 
 const server = setupServer()
@@ -54,11 +56,11 @@ describe('GithubIntegrationSection', () => {
       http.get(`/internal/gh/codecov/account-details/`, (info) => {
         return HttpResponse.json({
           plan: {
-            marketingName: 'users-basic',
+            marketingName: Plans.USERS_BASIC,
             baseUnitPrice: 12,
             benefits: ['Configurable # of users', 'Unlimited repos'],
             quantity: 5,
-            value: 'users-inappm',
+            value: Plans.USERS_INAPPM,
           },
           activatedUserCount: 2,
           inactiveUserCount: 1,

src/pages/DefaultOrgSelector/DefaultOrgSelector.test.jsx

@@ -10,6 +10,8 @@ import config from 'config'
 
 import { SentryBugReporter } from 'sentry'
 
+import { Plans } from 'shared/utils/billing'
+
 import DefaultOrgSelector from './DefaultOrgSelector'
 
 const mocks = vi.hoisted(() => ({
@@ -38,7 +40,7 @@ const mockTrialData = {
   billingRate: 'monthly',
   marketingName: 'Users Basic',
   monthlyUploadLimit: 250,
-  value: 'users-basic',
+  value: Plans.USERS_BASIC,
   trialStatus: 'ONGOING',
   trialStartDate: '2023-01-01T08:55:25',
   trialEndDate: '2023-01-10T08:55:25',
@@ -72,7 +74,7 @@ const mockUserData = {
       service: 'github',
       ownerid: 123,
       serviceId: '123',
-      plan: 'users-basic',
+      plan: Plans.USERS_BASIC,
       staff: false,
       hasYaml: false,
       bot: null,
@@ -116,7 +118,7 @@ const mockBusinessUserData = {
       service: 'github',
       ownerid: 123,
       serviceId: '123',
-      plan: 'users-basic',
+      plan: Plans.USERS_BASIC,
       staff: false,
       hasYaml: false,
       bot: null,
@@ -177,7 +179,7 @@ describe('DefaultOrgSelector', () => {
     useUserData,
     isValidUser = true,
     trialStatus = 'NOT_STARTED',
-    value = 'users-basic',
+    value = Plans.USERS_BASIC,
     privateRepos = true,
   } = {}) {
     const mockMutationVariables = vi.fn()
@@ -218,7 +220,7 @@ describe('DefaultOrgSelector', () => {
                 billingRate: 'monthly',
                 marketingName: 'Users Basic',
                 monthlyUploadLimit: 250,
-                value: 'users-basic',
+                value: Plans.USERS_BASIC,
               },
             },
           },
@@ -822,7 +824,7 @@ describe('DefaultOrgSelector', () => {
     it('does not fire trial mutation', async () => {
       const { user, mockTrialMutationVariables } = setup({
         useUserData: mockUserData,
-        value: 'users-free',
+        value: Plans.USERS_FREE,
         myOrganizationsData: {
           me: {
             myOrganizations: {
@@ -1063,7 +1065,7 @@ describe('DefaultOrgSelector', () => {
             },
           },
         },
-        value: 'users-basic',
+        value: Plans.USERS_BASIC,
       })
 
       render(<DefaultOrgSelector />, { wrapper: wrapper() })
@@ -1126,7 +1128,7 @@ describe('DefaultOrgSelector', () => {
             },
           },
         },
-        value: 'users-basic',
+        value: Plans.USERS_BASIC,
         privateRepos: false,
       })