+ {String(showOnboardingContainer)}
+
+ )
+ }
+
+ const { user } = setup()
+ render(
+ <>
+
- No organizations found
-
- )
- }
-
- if (item?.isProvider) {
- return (
-
- )
- }
-
- return (
-
- {item?.org?.avatarUrl &&
- )
-}
-
-function DefaultOrgSelector() {
- const { register, control, setValue, handleSubmit } = useForm({
- resolver: zodResolver(FormSchema),
- mode: 'onSubmit',
- })
-
- const { provider } = useParams()
- const isGh = providerToName(provider) === 'GitHub'
-
- const history = useHistory()
-
- const [orgValue, setOrgValue] = useState(null)
- const { codecovAppInstallation } = useStaticNavLinks()
-
- const { data: currentUser, isLoading: userIsLoading } = useUser()
- const { mutate: updateDefaultOrg } = useUpdateDefaultOrganization()
- const { mutate: storeEventMetric } = useStoreCodecovEventMetric()
-
- const selectedOrg = orgValue?.org?.username ?? currentUser?.user?.username
-
- const { data: planData } = usePlanData({
- owner: selectedOrg,
- provider,
- })
- const { mutate: fireTrial } = useStartTrial()
-
- const isNewTrial = planData?.plan?.trialStatus === TrialStatuses.NOT_STARTED
- const {
- data: myOrganizations,
- hasNextPage,
- fetchNextPage,
- isFetching,
- } = useMyOrganizations({
- select: ({ pages }) => {
- const organizations = pages.flatMap((org) =>
- mapEdges(org?.me?.myOrganizations).map((edge) => ({
- org: edge,
- isProvider: false,
- }))
- )
-
- return [
- {
- org: pages?.at(-1)?.me?.owner,
- isProvider: false,
- },
- ...organizations,
- ]
- },
- })
-
- const isBusinessIntent =
- currentUser?.user?.customerIntent === CustomerIntent.BUSINESS
-
- useLayoutEffect(() => {
- if (!config.SENTRY_DSN) {
- return
- }
- const widget = SentryBugReporter.createWidget()
- return widget.removeFromDom
- }, [])
-
- const onSubmit = () => {
- updateDefaultOrg({ username: selectedOrg })
- storeEventMetric({
- owner: selectedOrg,
- event: EVENT_METRICS.CLICKED_BUTTON,
- jsonPayload: { action: 'Selected Default Org' },
- })
- if (
- planData?.plan?.isFreePlan &&
- selectedOrg !== currentUser?.user?.username &&
- isNewTrial &&
- planData?.hasPrivateRepos
- ) {
- fireTrial({ owner: selectedOrg })
- }
-
- return history.push(`/${provider}/${selectedOrg}?source=onboarding`)
- }
-
- if (userIsLoading) return null
- if (!userIsLoading && !currentUser) return
-
- )
-}
-
-export default DefaultOrgSelector
diff --git a/src/pages/DefaultOrgSelector/DefaultOrgSelector.test.jsx b/src/pages/DefaultOrgSelector/DefaultOrgSelector.test.jsx
deleted file mode 100644
index bebdb375d2..0000000000
--- a/src/pages/DefaultOrgSelector/DefaultOrgSelector.test.jsx
+++ /dev/null
@@ -1,1480 +0,0 @@
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
-import { render, screen, waitFor } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import { graphql, HttpResponse } from 'msw'
-import { setupServer } from 'msw/node'
-import { Suspense } from 'react'
-import { MemoryRouter, Route } from 'react-router-dom'
-
-import config from 'config'
-
-import { SentryBugReporter } from 'sentry'
-
-import { BillingRate, Plans } from 'shared/utils/billing'
-
-import DefaultOrgSelector from './DefaultOrgSelector'
-
-const mocks = vi.hoisted(() => ({
- useIntersection: vi.fn(),
-}))
-
-vi.mock('react-use', async () => {
- const actual = await vi.importActual('react-use')
- return {
- ...actual,
- useIntersection: mocks.useIntersection,
- }
-})
-
-vi.mock('./GitHubHelpBanner', () => ({ default: () => 'GitHubHelpBanner' }))
-vi.mock('config')
-
-const queryClient = new QueryClient({
- defaultOptions: { queries: { retry: false } },
-})
-const server = setupServer()
-
-const mockTrialData = {
- baseUnitPrice: 10,
- benefits: [],
- billingRate: BillingRate.MONTHLY,
- marketingName: 'Users Basic',
- monthlyUploadLimit: 250,
- value: Plans.USERS_BASIC,
- trialStatus: 'ONGOING',
- trialStartDate: '2023-01-01T08:55:25',
- trialEndDate: '2023-01-10T08:55:25',
- trialTotalDays: 0,
- pretrialUsersCount: 0,
- planUserCount: 1,
- hasSeatsLeft: true,
-}
-
-const mockUserData = {
- me: {
- owner: {
- defaultOrgUsername: 'codecov',
- },
- email: 'jane.doe@codecov.io',
- privateAccess: true,
- onboardingCompleted: true,
- businessEmail: 'jane.doe@codecov.io',
- termsAgreement: true,
- user: {
- name: 'Jane Doe',
- username: 'janedoe',
- avatarUrl: 'http://127.0.0.1/avatar-url',
- avatar: 'http://127.0.0.1/avatar-url',
- student: false,
- studentCreatedAt: null,
- studentUpdatedAt: null,
- customerIntent: 'PERSONAL',
- },
- trackingMetadata: {
- service: 'github',
- ownerid: 123,
- serviceId: '123',
- plan: Plans.USERS_BASIC,
- staff: false,
- hasYaml: false,
- bot: null,
- delinquent: null,
- didTrial: null,
- planProvider: null,
- planUserCount: 1,
- createdAt: 'timestamp',
- updatedAt: 'timestamp',
- profile: {
- createdAt: 'timestamp',
- otherGoal: null,
- typeProjects: [],
- goals: [],
- },
- },
- },
-}
-
-const mockBusinessUserData = {
- me: {
- owner: {
- defaultOrgUsername: 'codecov',
- },
- email: 'jane.doe@codecov.io',
- privateAccess: true,
- onboardingCompleted: true,
- businessEmail: 'jane.doe@codecov.io',
- termsAgreement: true,
- user: {
- name: 'Jane Doe',
- username: 'janedoe',
- avatarUrl: 'http://127.0.0.1/avatar-url',
- avatar: 'http://127.0.0.1/avatar-url',
- student: false,
- studentCreatedAt: null,
- studentUpdatedAt: null,
- customerIntent: 'BUSINESS',
- },
- trackingMetadata: {
- service: 'github',
- ownerid: 123,
- serviceId: '123',
- plan: Plans.USERS_BASIC,
- staff: false,
- hasYaml: false,
- bot: null,
- delinquent: null,
- didTrial: null,
- planProvider: null,
- planUserCount: 1,
- createdAt: 'timestamp',
- updatedAt: 'timestamp',
- profile: {
- createdAt: 'timestamp',
- otherGoal: null,
- typeProjects: [],
- goals: [],
- },
- },
- },
-}
-
-let testLocation
-const wrapper =
- (initialEntries = ['/gh/codecov/cool-repo']) =>
- ({ children }) => (
- - Which organization are you working with today? -
- -
-
-
- You'll need the organization admin to install the app -{' '}
- setShowModal(true)}
- >
-
- share request
-
-
-
-
-
+
diff --git a/src/pages/OwnerPage/HeaderBanners/HeaderBanners.jsx b/src/pages/OwnerPage/HeaderBanners/HeaderBanners.jsx
index 4900260d4d..136da130e1 100644
--- a/src/pages/OwnerPage/HeaderBanners/HeaderBanners.jsx
+++ b/src/pages/OwnerPage/HeaderBanners/HeaderBanners.jsx
@@ -4,10 +4,9 @@ import { useParams } from 'react-router-dom'
import config from 'config'
import { useOwnerPageData } from 'pages/OwnerPage/hooks'
-import { useAccountDetails, usePlanData } from 'services/account'
+import { usePlanData } from 'services/account'
import ExceededUploadsAlert from './ExceededUploadsAlert'
-import GithubConfigBanner from './GithubConfigBanner'
import ReachingUploadLimitAlert from './ReachingUploadLimitAlert'
const useUploadsInfo = () => {
@@ -31,14 +30,9 @@ const useUploadsInfo = () => {
return { isUploadLimitExceeded, isApproachingUploadLimit }
}
-const AlertBanners = ({
- isUploadLimitExceeded,
- isApproachingUploadLimit,
- hasGhApp,
-}) => {
+const AlertBanners = ({ isUploadLimitExceeded, isApproachingUploadLimit }) => {
return (
<>
- {!hasGhApp &&
diff --git a/src/pages/OwnerPage/OwnerPage.test.jsx b/src/pages/OwnerPage/OwnerPage.test.jsx
index d9868db345..4159b85c18 100644
--- a/src/pages/OwnerPage/OwnerPage.test.jsx
+++ b/src/pages/OwnerPage/OwnerPage.test.jsx
@@ -1,9 +1,10 @@
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
import { render, screen, waitFor } from '@testing-library/react'
-import { graphql, HttpResponse } from 'msw'
+import { graphql, http, HttpResponse } from 'msw'
import { setupServer } from 'msw/node'
import { MemoryRouter, Route } from 'react-router-dom'
+import { OnboardingContainerProvider } from './OnboardingContainerContext/context'
import OwnerPage from './OwnerPage'
const mocks = vi.hoisted(() => ({
@@ -31,14 +32,16 @@ let testLocation
const wrapper = ({ children }) => (
- {children}
- {
- testLocation = location
- return null
- }}
- />
+
+ {children}
+ {
+ testLocation = location
+ return null
+ }}
+ />
+
)
@@ -56,9 +59,10 @@ afterAll(() => {
describe('OwnerPage', () => {
function setup(
- { owner, successfulMutation = true } = {
+ { owner, successfulMutation = true, integrationId = 9 } = {
owner: null,
successfulMutation: true,
+ integrationId: 9,
}
) {
server.use(
@@ -82,6 +86,9 @@ describe('OwnerPage', () => {
return HttpResponse.json({
data: { saveSentryState: null },
})
+ }),
+ http.get('/internal/gh/codecov/account-details/', () => {
+ return HttpResponse.json({ integrationId })
})
)
}
diff --git a/src/pages/RepoPage/RepoPage.test.tsx b/src/pages/RepoPage/RepoPage.test.tsx
index f2d373c070..79fa226323 100644
--- a/src/pages/RepoPage/RepoPage.test.tsx
+++ b/src/pages/RepoPage/RepoPage.test.tsx
@@ -105,7 +105,6 @@ const mockUser = {
student: false,
studentCreatedAt: null,
studentUpdatedAt: null,
- customerIntent: 'PERSONAL',
},
trackingMetadata: {
service: 'github',
diff --git a/src/pages/TermsOfService/TermsOfService.test.tsx b/src/pages/TermsOfService/TermsOfService.test.tsx
index 048ab16f6e..fd68f26516 100644
--- a/src/pages/TermsOfService/TermsOfService.test.tsx
+++ b/src/pages/TermsOfService/TermsOfService.test.tsx
@@ -248,9 +248,6 @@ describe('TermsOfService', () => {
/I agree to the TOS and privacy policy/i
)
- const customerIntent = screen.getByRole('radio', { name: /Personal use/ })
- await user.click(customerIntent)
-
await user.click(selectedTos)
const submit = await screen.findByRole('button', { name: /Continue/ })
@@ -263,7 +260,7 @@ describe('TermsOfService', () => {
businessEmail: 'personal@cr.com',
termsAgreement: true,
marketingConsent: false,
- customerIntent: 'PERSONAL',
+ name: 'Chetney',
},
})
)
@@ -298,7 +295,7 @@ describe('TermsOfService', () => {
'case #1',
{
validationDescription:
- 'user has email, signs TOS, submit is now enabled',
+ 'user has email and name, signs TOS, submit is now enabled',
internalUserData: {
email: 'personal@cr.com',
termsAgreement: false,
@@ -309,15 +306,15 @@ describe('TermsOfService', () => {
},
[expectPageIsReady],
[expectSubmitIsDisabled],
+ [expectPrepopulatedFields, { email: 'personal@cr.com', name: 'Chetney' }],
[expectUserSignsTOS],
- [expectUserToChooseCustomerIntent],
[expectSubmitIsEnabled],
],
[
'case #2',
{
validationDescription:
- 'user wants to receive emails, signs TOS, submit is now enabled',
+ 'user has email and name, user wants to receive emails, signs TOS, submit is now enabled',
internalUserData: {
email: 'chetney@cr.com',
termsAgreement: false,
@@ -327,38 +324,18 @@ describe('TermsOfService', () => {
},
},
[expectPageIsReady],
- [expectUserSelectsMarketingWithFoundEmail, { email: 'chetney@cr.com' }],
+ [expectPrepopulatedFields, { email: 'chetney@cr.com', name: 'Chetney' }],
[expectSubmitIsDisabled],
- [expectUserToChooseCustomerIntent],
- [expectUserSignsTOS],
- [expectSubmitIsEnabled],
- ],
- [
- 'case #3',
- {
- validationDescription:
- 'user has email, user wants to receive emails, signs TOS, submit is now enabled',
- internalUserData: {
- email: 'chetney@cr.com',
- termsAgreement: false,
- name: 'Chetney',
- externalId: '1234',
- owners: null,
- },
- },
- [expectPageIsReady],
- [expectSubmitIsDisabled],
- [expectUserSelectsMarketingWithFoundEmail, { email: 'chetney@cr.com' }],
+ [expectUserSelectsMarketing],
[expectSubmitIsDisabled],
[expectUserSignsTOS],
- [expectUserToChooseCustomerIntent],
[expectSubmitIsEnabled],
],
[
- 'case #4',
+ 'case #3',
{
validationDescription:
- 'signs TOS, decides not to, is warned they must sign and cannot submit',
+ 'has prefilled email and name, signs TOS, decides not to, is warned they must sign and cannot submit',
internalUserData: {
email: 'chetney@cr.com',
termsAgreement: false,
@@ -369,7 +346,7 @@ describe('TermsOfService', () => {
},
[expectPageIsReady],
[expectSubmitIsDisabled],
- [expectUserToChooseCustomerIntent],
+ [expectPrepopulatedFields, { email: 'chetney@cr.com', name: 'Chetney' }],
[expectUserSignsTOS],
[expectSubmitIsEnabled],
[expectUserSignsTOS],
@@ -377,10 +354,10 @@ describe('TermsOfService', () => {
[expectUserIsWarnedTOS],
],
[
- 'case #5',
+ 'case #4',
{
validationDescription:
- 'user checks marketing consent and is required to provide an email, sign TOS (check email validation messages)',
+ 'user checks marketing consent and is required to provide an email, provide a name, sign TOS (check email validation messages)',
internalUserData: {
termsAgreement: false,
name: 'Chetney',
@@ -391,21 +368,20 @@ describe('TermsOfService', () => {
},
[expectPageIsReady],
[expectSubmitIsDisabled],
- [expectEmailRequired],
[expectUserTextEntryEmailField, { email: 'chetney' }],
[expectUserIsWarnedForValidEmail],
[expectSubmitIsDisabled],
- [expectUserTextEntryEmailField, { email: '@cr.com' }],
+ [expectUserTextEntryEmailField, { email: '@hello.com' }],
[expectUserIsNotWarnedForValidEmail],
[expectSubmitIsDisabled],
+ [expectUserTextEntryNameField],
[expectUserSelectsMarketing],
[expectSubmitIsDisabled],
- [expectUserToChooseCustomerIntent],
[expectUserSignsTOS],
[expectSubmitIsEnabled],
],
[
- 'case #6',
+ 'case #5',
{
validationDescription:
'user checks marketing consent and does not provide an email, sign TOS (check email validation messages)',
@@ -418,29 +394,28 @@ describe('TermsOfService', () => {
},
},
[expectPageIsReady],
- [expectEmailRequired],
[expectSubmitIsDisabled],
[expectUserSignsTOS],
[expectSubmitIsDisabled],
- [expectUserToChooseCustomerIntent],
],
[
- 'case #7',
+ 'case #6',
{
validationDescription: 'server unknown error notification',
isUnknownError: true,
internalUserData: {
termsAgreement: false,
- email: 'personal@cr.com',
- name: 'Chetney',
+ email: '',
+ name: '',
externalId: '1234',
owners: null,
},
},
[expectPageIsReady],
+ [expectUserTextEntryEmailField, { email: 'personal@cr.com' }],
+ [expectUserTextEntryNameField],
[expectUserSignsTOS],
[expectClickSubmit],
- [expectUserToChooseCustomerIntent],
[
expectRendersServerFailureResult,
{
@@ -456,22 +431,23 @@ describe('TermsOfService', () => {
],
],
[
- 'case #8',
+ 'case #7',
{
validationDescription: 'server failure error notification',
isUnAuthError: true,
internalUserData: {
termsAgreement: false,
- email: 'personal@cr.com',
- name: 'Chetney',
+ email: '',
+ name: '',
externalId: '1234',
owners: null,
},
},
[expectPageIsReady],
+ [expectUserTextEntryEmailField, { email: 'personal@cr.com' }],
+ [expectUserTextEntryNameField],
[expectUserSignsTOS],
[expectClickSubmit],
- [expectUserToChooseCustomerIntent],
[
expectRendersServerFailureResult,
{
@@ -481,27 +457,28 @@ describe('TermsOfService', () => {
],
],
[
- 'case #9',
+ 'case #8',
{
validationDescription:
'server validation error notification (saveTerms)',
isValidationError: true,
internalUserData: {
termsAgreement: false,
- email: 'personal@cr.com',
- name: 'Chetney',
+ email: '',
+ name: '',
externalId: '1234',
owners: null,
},
},
[expectPageIsReady],
+ [expectUserTextEntryEmailField, { email: 'personal@cr.com' }],
+ [expectUserTextEntryNameField],
[expectUserSignsTOS],
[expectClickSubmit],
- [expectUserToChooseCustomerIntent],
[expectRendersServerFailureResult, 'validation error'],
],
[
- 'case #10',
+ 'case #9',
{
validationDescription:
'redirects to main root if user has already synced a provider',
@@ -526,33 +503,6 @@ describe('TermsOfService', () => {
},
[expectRedirectTo, '/gh/codecov/cool-repo'],
],
- [
- 'case #11',
- {
- validationDescription: 'provide no customer intent, does not submit',
- internalUserData: {
- termsAgreement: true,
- name: 'Chetney',
- externalId: '1234',
- email: '',
- owners: [
- {
- avatarUrl: 'http://roland.com/avatar-url',
- integrationId: null,
- name: null,
- ownerid: 2,
- stats: null,
- service: 'github',
- username: 'roland',
- },
- ],
- },
- },
- [expectPageIsReady],
- [expectSubmitIsDisabled],
- [expectUserSignsTOS],
- [expectSubmitIsDisabled],
- ],
])(
'form validation, %s',
(
@@ -693,33 +643,43 @@ async function expectPageIsReady() {
expect(welcome).toBeInTheDocument()
}
-async function expectUserToChooseCustomerIntent(user: UserEvent) {
- const customerIntent = screen.getByRole('radio', { name: /Personal use/ })
-
- await user.click(customerIntent)
+async function expectPrepopulatedFields(
+ user: UserEvent,
+ args: { email: string; name: string }
+) {
+ await waitFor(() => {
+ const emailInput = screen.getByLabelText(
+ /Enter your email/i
+ ) as HTMLInputElement
+ expect(emailInput).toHaveValue(args.email)
+ })
+ await waitFor(() => {
+ const nameInput = screen.getByLabelText(
+ /Enter your name/i
+ ) as HTMLInputElement
+ expect(nameInput).toHaveValue(args.name)
+ })
}
-async function expectUserSignsTOS(user: UserEvent) {
- const selectedTos = screen.getByLabelText(
- /I agree to the TOS and privacy policy/i
- )
-
- await user.click(selectedTos)
+async function expectUserTextEntryNameField(user: UserEvent) {
+ const nameInput = screen.getByLabelText(/Enter your name/i)
+ await user.type(nameInput, 'My name')
}
-async function expectUserSelectsMarketingWithFoundEmail(
+async function expectUserTextEntryEmailField(
user: UserEvent,
args: { email: string }
) {
- const selectedMarketing = screen.getByLabelText(
- /I would like to receive updates via email/i
- )
- const emailIsInTheLabelOfSelectedMarketing = screen.getByText(
- new RegExp(args.email, 'i')
+ const emailInput = screen.getByLabelText(/Enter your email/i)
+ await user.type(emailInput, args.email)
+}
+
+async function expectUserSignsTOS(user: UserEvent) {
+ const selectedTos = screen.getByLabelText(
+ /I agree to the TOS and privacy policy/i
)
- expect(emailIsInTheLabelOfSelectedMarketing).toBeInTheDocument()
- await user.click(selectedMarketing)
+ await user.click(selectedTos)
}
async function expectUserSelectsMarketing(user: UserEvent) {
@@ -730,15 +690,6 @@ async function expectUserSelectsMarketing(user: UserEvent) {
await user.click(selectedMarketing)
}
-async function expectUserTextEntryEmailField(
- user: UserEvent,
- args: { email: string }
-) {
- const emailInput = screen.getByLabelText(/Contact email/i)
-
- await user.type(emailInput, args.email)
-}
-
async function expectSubmitIsDisabled() {
const submit = screen.getByRole('button', { name: /Continue/ })
expect(submit).toBeDisabled()
@@ -770,17 +721,6 @@ async function expectClickSubmit(user: UserEvent) {
await user.click(submit)
}
-async function expectEmailRequired(user: UserEvent) {
- const selectedMarketing = screen.getByLabelText(
- /I would like to receive updates via email/i
- )
-
- await user.click(selectedMarketing)
-
- const emailRequired = screen.getByText(/Contact email/i)
- expect(emailRequired).toBeInTheDocument()
-}
-
async function expectRendersServerFailureResult(
user: UserEvent,
expectedError = {}
diff --git a/src/pages/TermsOfService/TermsOfService.tsx b/src/pages/TermsOfService/TermsOfService.tsx
index 1e1e1a290b..51ffa56c95 100644
--- a/src/pages/TermsOfService/TermsOfService.tsx
+++ b/src/pages/TermsOfService/TermsOfService.tsx
@@ -8,21 +8,30 @@ import config from 'config'
import { SentryBugReporter } from 'sentry'
import umbrellaSvg from 'assets/svg/umbrella.svg'
-import { CustomerIntent, useInternalUser } from 'services/user'
+import { useInternalUser } from 'services/user'
import A from 'ui/A'
import Button from 'ui/Button'
-import RadioInput from 'ui/RadioInput/RadioInput'
import TextInput from 'ui/TextInput'
+import { ONBOARDING_SOURCE } from './constants'
import { useSaveTermsAgreement } from './hooks/useTermsOfService'
const FormSchema = z.object({
- marketingEmail: z.string().email().nullish(),
+ marketingName: z.string().min(1, 'Name is required'),
+ marketingEmail: z.string().email('Invalid email'),
marketingConsent: z.boolean().nullish(),
tos: z.literal(true),
- customerIntent: z.string(),
+ apiError: z.string().nullish(),
})
+type FormData = {
+ marketingName?: string
+ marketingEmail?: string
+ marketingConsent?: boolean
+ tos?: boolean
+ apiError?: string
+}
+
interface IsDisabled {
isValid: boolean
isDirty: boolean
@@ -33,33 +42,50 @@ function isDisabled({ isValid, isDirty, isMutationLoading }: IsDisabled) {
return (!isValid && isDirty) || !isDirty || isMutationLoading
}
+interface NameInputProps {
+ register: ReturnType['register']
+ marketingNameMessage?: string
+}
+
+function NameInput({ register, marketingNameMessage }: NameInputProps) {
+ return (
+ ['register']
marketingEmailMessage?: string
- showEmailRequired: boolean
}
-function EmailInput({
- register,
- marketingEmailMessage,
- showEmailRequired,
-}: EmailInputProps) {
- if (!showEmailRequired) return null
-
+function EmailInput({ register, marketingEmailMessage }: EmailInputProps) {
return (
({
resolver: zodResolver(FormSchema),
mode: 'onChange',
+ defaultValues: {
+ marketingName: currentUser?.name || '',
+ marketingEmail: currentUser?.email || '',
+ marketingConsent: undefined,
+ tos: false,
+ // this field just used for custom form error
+ apiError: undefined,
+ },
})
+
+ useEffect(() => {
+ if (currentUser && !isDirty) {
+ reset({
+ marketingName: currentUser.name || '',
+ marketingEmail: currentUser.email || '',
+ marketingConsent: undefined,
+ tos: false,
+ apiError: undefined,
+ })
+ }
+ }, [currentUser, isDirty, reset])
+
const { mutate, isLoading: isMutationLoading } = useSaveTermsAgreement({
onSuccess: ({ data }) => {
if (data?.saveTermsAgreement?.error) {
@@ -91,7 +140,6 @@ export default function TermsOfService() {
},
onError: (error) => setError('apiError', error),
})
- const { data: currentUser, isLoading: userIsLoading } = useInternalUser({})
useLayoutEffect(() => {
if (!config.SENTRY_DSN) {
@@ -101,19 +149,19 @@ export default function TermsOfService() {
return widget.removeFromDom
}, [])
- interface FormValues {
- marketingEmail?: string
- marketingConsent?: boolean
- customerIntent?: string
- }
+ const onSubmit: SubmitHandler = (data: FormData) => {
+ if (!data.marketingName || !data.marketingEmail) return
- const onSubmit: SubmitHandler = (data: FormValues) => {
mutate({
- businessEmail: data?.marketingEmail || currentUser?.email,
- termsAgreement: true,
+ businessEmail: data.marketingEmail,
marketingConsent: data?.marketingConsent,
- customerIntent: data?.customerIntent || CustomerIntent.PERSONAL,
+ name: data.marketingName,
+ termsAgreement: true,
})
+
+ const url = new URL(window.location.href)
+ url.searchParams.set('source', ONBOARDING_SOURCE)
+ window.location.href = url.toString()
}
useEffect(() => {
@@ -139,41 +187,14 @@ export default function TermsOfService() {
diff --git a/src/pages/OwnerPage/HeaderBanners/HeaderBanners.jsx b/src/pages/OwnerPage/HeaderBanners/HeaderBanners.jsx
index 4900260d4d..136da130e1 100644
--- a/src/pages/OwnerPage/HeaderBanners/HeaderBanners.jsx
+++ b/src/pages/OwnerPage/HeaderBanners/HeaderBanners.jsx
@@ -4,10 +4,9 @@ import { useParams } from 'react-router-dom'
import config from 'config'
import { useOwnerPageData } from 'pages/OwnerPage/hooks'
-import { useAccountDetails, usePlanData } from 'services/account'
+import { usePlanData } from 'services/account'
import ExceededUploadsAlert from './ExceededUploadsAlert'
-import GithubConfigBanner from './GithubConfigBanner'
import ReachingUploadLimitAlert from './ReachingUploadLimitAlert'
const useUploadsInfo = () => {
@@ -31,14 +30,9 @@ const useUploadsInfo = () => {
return { isUploadLimitExceeded, isApproachingUploadLimit }
}
-const AlertBanners = ({
- isUploadLimitExceeded,
- isApproachingUploadLimit,
- hasGhApp,
-}) => {
+const AlertBanners = ({ isUploadLimitExceeded, isApproachingUploadLimit }) => {
return (
<>
- {!hasGhApp && = ({ children }) => (
+
+
+
+ {children}
+
+
+
+)
+
+const noQueryParamWrapper: React.FC = ({
+ children,
+}) => (
+
+
+
+ {children}
+
+
+
+)
+
+const TestComponent = () => {
+ const { showOnboardingContainer, setShowOnboardingContainer } =
+ useOnboardingContainer()
+
+ return (
+
+ Show container: {showOnboardingContainer.toString()}
+
+
+ )
+}
+
+describe('OnboardingContainer context', () => {
+ beforeEach(() => {
+ localStorage.clear()
+ })
+
+ describe('when called outside of provider', () => {
+ it('throws error', () => {
+ console.error = () => {}
+ expect(() => render(`'
+ )
+ })
+ })
+
+ describe('when called inside provider', () => {
+ it('initializes with false when no localStorage value exists', () => {
+ render((null)
+
+interface URLParams {
+ provider: Provider
+}
+
+export const OnboardingContainerProvider: React.FC = ({
+ children,
+}) => {
+ const {
+ params,
+ }: {
+ params: { source?: string }
+ } = useLocationParams()
+ const { provider } = useParams()
+ const isGh = providerToName(provider) === 'GitHub'
+ if (
+ // this should only show for newly onboarded GH users
+ isGh &&
+ params['source'] === ONBOARDING_SOURCE &&
+ localStorage.getItem(LOCAL_STORAGE_SHOW_ONBOARDING_CONTAINER) === null
+ ) {
+ localStorage.setItem(LOCAL_STORAGE_SHOW_ONBOARDING_CONTAINER, 'true')
+ }
+ const localStorageValue = localStorage.getItem(
+ LOCAL_STORAGE_SHOW_ONBOARDING_CONTAINER
+ )
+
+ const [showOnboardingContainer, setShowFunction] = useState(
+ localStorageValue === 'true' ? true : false
+ )
+
+ const setShowOnboardingContainer = (showOnboardingContainer: boolean) => {
+ if (isGh) {
+ setShowFunction(showOnboardingContainer)
+ localStorage.setItem(
+ LOCAL_STORAGE_SHOW_ONBOARDING_CONTAINER,
+ showOnboardingContainer ? 'true' : 'false'
+ )
+ }
+ }
+
+ return (
+
+ {children}
+
+ )
+}
+
+OnboardingContainerContext.displayName = 'OnboardingContainerContext'
+
+export function useOnboardingContainer() {
+ const rawContext = useContext(OnboardingContainerContext)
+
+ if (rawContext === null) {
+ throw new Error(
+ 'useOnboardingContainer has to be used within ``'
+ )
+ }
+
+ return rawContext
+}
diff --git a/src/pages/OwnerPage/OnboardingOrg/OnboardingOrg.test.tsx b/src/pages/OwnerPage/OnboardingOrg/OnboardingOrg.test.tsx
new file mode 100644
index 0000000000..77ba2f80f9
--- /dev/null
+++ b/src/pages/OwnerPage/OnboardingOrg/OnboardingOrg.test.tsx
@@ -0,0 +1,82 @@
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { MemoryRouter, Route } from 'react-router-dom'
+import { type Mock, vi } from 'vitest'
+
+import { useLocationParams } from 'services/navigation'
+
+import OnboardingOrg from './OnboardingOrg'
+
+import { OnboardingContainerProvider } from '../OnboardingContainerContext/context'
+
+vi.mock('services/navigation', async () => {
+ const servicesNavigation = await vi.importActual('services/navigation')
+
+ return {
+ ...servicesNavigation,
+ useLocationParams: vi.fn(),
+ }
+})
+
+const mockedUseLocationParams = useLocationParams as Mock
+
+const queryClient = new QueryClient({
+ defaultOptions: {
+ queries: { retry: false, suspense: false },
+ },
+})
+
+const wrapper: React.FC = ({ children }) => (
+
+
+
+ {children}
+
+
+
+)
+
+describe('OnboardingOrg', () => {
+ beforeEach(() => {
+ localStorage.clear()
+ mockedUseLocationParams.mockReturnValue({ params: {} })
+ })
+
+ it('renders the component correctly', () => {
+ render(
+
+
+
+ Add your GitHub Organization to Codecov
+
+
+ To get full access, you need to install the Codecov app on your
+ GitHub organization. Admin required.
+
+
+
+
+
+
+
+ setShowModal(false)}
+ onComplete={() => setShowModal(false)}
+ />
+
+ )
+}
+
+export default OnboardingOrg
diff --git a/src/pages/OwnerPage/OnboardingOrg/constants.ts b/src/pages/OwnerPage/OnboardingOrg/constants.ts
new file mode 100644
index 0000000000..99bfb5a0ba
--- /dev/null
+++ b/src/pages/OwnerPage/OnboardingOrg/constants.ts
@@ -0,0 +1,2 @@
+export const LOCAL_STORAGE_SHOW_ONBOARDING_CONTAINER =
+ 'show-onboarding-container'
diff --git a/src/pages/OwnerPage/OnboardingOrg/index.ts b/src/pages/OwnerPage/OnboardingOrg/index.ts
new file mode 100644
index 0000000000..b4629aec61
--- /dev/null
+++ b/src/pages/OwnerPage/OnboardingOrg/index.ts
@@ -0,0 +1,2 @@
+export { default } from './OnboardingOrg'
+export { LOCAL_STORAGE_SHOW_ONBOARDING_CONTAINER } from './constants'
diff --git a/src/pages/OwnerPage/OwnerPage.jsx b/src/pages/OwnerPage/OwnerPage.jsx
index 957429c3b4..06af7655ba 100644
--- a/src/pages/OwnerPage/OwnerPage.jsx
+++ b/src/pages/OwnerPage/OwnerPage.jsx
@@ -4,13 +4,15 @@ import { useHistory, useParams } from 'react-router-dom'
import SilentNetworkErrorWrapper from 'layouts/shared/SilentNetworkErrorWrapper'
import NotFound from 'pages/NotFound'
import { useOwnerPageData } from 'pages/OwnerPage/hooks'
-import { useSentryToken } from 'services/account'
+import { useAccountDetails, useSentryToken } from 'services/account'
import { useLocationParams } from 'services/navigation'
import { renderToast } from 'services/toast'
import { ActiveContext } from 'shared/context'
import ListRepo from 'shared/ListRepo'
import HeaderBanners from './HeaderBanners'
+import { useOnboardingContainer } from './OnboardingContainerContext/context'
+import OnboardingOrg from './OnboardingOrg'
import Tabs from './Tabs'
export const LOCAL_STORAGE_USER_STARTED_TRIAL_KEY = 'user-started-trial'
@@ -36,7 +38,7 @@ const useSentryTokenRedirect = ({ ownerData }) => {
}
function OwnerPage() {
- const { provider } = useParams()
+ const { owner, provider } = useParams()
const { data: ownerData } = useOwnerPageData()
const { params } = useLocationParams({
repoDisplay: 'All',
@@ -47,6 +49,8 @@ function OwnerPage() {
LOCAL_STORAGE_USER_STARTED_TRIAL_KEY
)
+ const { showOnboardingContainer } = useOnboardingContainer()
+
useEffect(() => {
if (userStartedTrial) {
renderToast({
@@ -62,6 +66,14 @@ function OwnerPage() {
}
}, [userStartedTrial])
+ // TODO: refactor this to add a gql field for the integration id used to determine if the org has a GH app
+ const { data: accountDetails } = useAccountDetails({
+ provider,
+ owner,
+ })
+
+ const hasGhApp = !!accountDetails?.integrationId
+
if (!ownerData) {
return
-
+
+ )
+}
+
+describe('OnboardingContainer context', () => {
+ beforeEach(() => {
+ localStorage.clear()
+ })
+
+ describe('when called outside of provider', () => {
+ it('throws error', () => {
+ console.error = () => {}
+ expect(() => render(Show container: {showOnboardingContainer.toString()}
+
+
+
+
+
+
+ How to integrate another organization to Codecov
+
+
+
+
+
+
+
+
+
+
+ Add your GitHub Organization to Codecov
+
+
+ To get full access, you need to install the Codecov app on your
+ GitHub organization. Admin required.
+
+
+
+
+
+ {showOnboardingContainer ?
-
+
+
+ )
+}
+
interface EmailInputProps {
register: ReturnType
+
+ {marketingNameMessage}
+ )} +