Skip to content

Commit b06c86e

Browse files
calvin-codecovcalvin-codecov
committed
fix: Only show onboarding for new users, remove older app install modal, remove customer intent
1 parent cac26f2 commit b06c86e

36 files changed

+307
-1309
lines changed

‎src/App.test.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ const user = {
8484
student: false,
8585
studentCreatedAt: null,
8686
studentUpdatedAt: null,
87-
customerIntent: 'PERSONAL',
8887
},
8988
trackingMetadata: {
9089
service: 'github',

‎src/layouts/BaseLayout/BaseLayout.test.tsx

+5-76
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,7 @@ const mockedUseImpersonate = useImpersonate as Mock
2727
vi.mock('shared/GlobalTopBanners', () => ({
2828
default: () => 'GlobalTopBanners',
2929
}))
30-
vi.mock('./InstallationHelpBanner', () => ({
31-
default: () => 'InstallationHelpBanner',
32-
}))
3330
vi.mock('pages/TermsOfService', () => ({ default: () => 'TermsOfService' }))
34-
vi.mock('pages/DefaultOrgSelector', () => ({
35-
default: () => 'DefaultOrgSelector',
36-
}))
3731
vi.mock('layouts/Header', () => ({ default: () => 'Header' }))
3832
vi.mock('layouts/Footer', () => ({ default: () => 'Footer' }))
3933

@@ -53,7 +47,6 @@ const mockUser = {
5347
student: false,
5448
studentCreatedAt: null,
5549
studentUpdatedAt: null,
56-
customerIntent: 'BUSINESS',
5750
externalId: 'asdf',
5851
owners: [
5952
{
@@ -306,9 +299,6 @@ describe('BaseLayout', () => {
306299
const hello = screen.getByText('hello')
307300
expect(hello).toBeInTheDocument()
308301

309-
const defaultOrg = screen.queryByText(/DefaultOrgSelector/)
310-
expect(defaultOrg).not.toBeInTheDocument()
311-
312302
const termsOfService = screen.queryByText(/TermsOfService/)
313303
expect(termsOfService).not.toBeInTheDocument()
314304
})
@@ -328,9 +318,6 @@ describe('BaseLayout', () => {
328318
const hello = screen.getByText('hello')
329319
expect(hello).toBeInTheDocument()
330320

331-
const defaultOrg = screen.queryByText(/DefaultOrgSelector/)
332-
expect(defaultOrg).not.toBeInTheDocument()
333-
334321
const termsOfService = screen.queryByText(/TermsOfService/)
335322
expect(termsOfService).not.toBeInTheDocument()
336323
})
@@ -361,68 +348,19 @@ describe('BaseLayout', () => {
361348
const header = screen.queryByText(/Header/)
362349
expect(header).not.toBeInTheDocument()
363350
})
364-
365-
it('renders help banner', async () => {
366-
setup({
367-
currentUser: userNoTermsAgreement,
368-
internalUser: mockUserNoTermsAgreement,
369-
})
370-
371-
render(<BaseLayout>hello</BaseLayout>, { wrapper: wrapper() })
372-
const helpBanner = await screen.findByText(/InstallationHelpBanner/)
373-
expect(helpBanner).toBeInTheDocument()
374-
})
375-
})
376-
377-
describe('when no default org selected', () => {
378-
it('renders the default org selector', async () => {
379-
setup({
380-
currentUser: loggedInUser,
381-
internalUser: mockUser,
382-
})
383-
render(<BaseLayout>hello</BaseLayout>, { wrapper: wrapper() })
384-
385-
const defaultOrgSelector = await screen.findByText(/DefaultOrgSelector/)
386-
expect(defaultOrgSelector).toBeInTheDocument()
387-
})
388-
389-
it('does not render the header', async () => {
390-
setup({
391-
currentUser: loggedInUser,
392-
internalUser: mockUser,
393-
})
394-
render(<BaseLayout>hello</BaseLayout>, { wrapper: wrapper() })
395-
396-
const defaultOrgSelector = await screen.findByText(/DefaultOrgSelector/)
397-
expect(defaultOrgSelector).toBeInTheDocument()
398-
399-
const header = screen.queryByText(/Header/)
400-
expect(header).not.toBeInTheDocument()
401-
})
402-
403-
it('renders help banner', async () => {
404-
setup({
405-
currentUser: loggedInUser,
406-
internalUser: mockUser,
407-
})
408-
409-
render(<BaseLayout>hello</BaseLayout>, { wrapper: wrapper() })
410-
const helpBanner = await screen.findByText(/InstallationHelpBanner/)
411-
expect(helpBanner).toBeInTheDocument()
412-
})
413351
})
414352

415-
describe('when agreed to TOS and default org selected', () => {
353+
describe('when agreed to TOS', () => {
416354
it('renders children', async () => {
417-
setup({ currentUser: userHasDefaultOrg })
355+
setup({ currentUser: loggedInUser })
418356
render(<BaseLayout>hello</BaseLayout>, { wrapper: wrapper() })
419357

420358
const children = await screen.findByText(/hello/)
421359
expect(children).toBeInTheDocument()
422360
})
423361

424362
it('renders header', async () => {
425-
setup({ currentUser: userHasDefaultOrg })
363+
setup({ currentUser: loggedInUser })
426364
render(<BaseLayout>hello</BaseLayout>, { wrapper: wrapper() })
427365

428366
const header = await screen.findByText(/Header/)
@@ -464,9 +402,6 @@ describe('BaseLayout', () => {
464402
const hello = screen.getByText('hello')
465403
expect(hello).toBeInTheDocument()
466404

467-
const defaultOrg = screen.queryByText(/DefaultOrgSelector/)
468-
expect(defaultOrg).not.toBeInTheDocument()
469-
470405
const termsOfService = screen.queryByText(/TermsOfService/)
471406
expect(termsOfService).not.toBeInTheDocument()
472407
})
@@ -486,9 +421,6 @@ describe('BaseLayout', () => {
486421
const hello = screen.getByText('hello')
487422
expect(hello).toBeInTheDocument()
488423

489-
const defaultOrg = screen.queryByText(/DefaultOrgSelector/)
490-
expect(defaultOrg).not.toBeInTheDocument()
491-
492424
const termsOfService = screen.queryByText(/TermsOfService/)
493425
expect(termsOfService).not.toBeInTheDocument()
494426
})
@@ -526,23 +458,20 @@ describe('BaseLayout', () => {
526458

527459
const header = await screen.findByText(/Header/)
528460
expect(header).toBeInTheDocument()
529-
530-
const defaultOrgSelector = screen.queryByText(/DefaultOrgSelector/)
531-
expect(defaultOrgSelector).not.toBeInTheDocument()
532461
})
533462
})
534463

535464
describe('when agreed to TOS and default org selected', () => {
536465
it('renders children', async () => {
537-
setup({ currentUser: userHasDefaultOrg })
466+
setup({ currentUser: loggedInUser })
538467
render(<BaseLayout>hello</BaseLayout>, { wrapper: wrapper() })
539468

540469
const children = await screen.findByText(/hello/)
541470
expect(children).toBeInTheDocument()
542471
})
543472

544473
it('renders header', async () => {
545-
setup({ currentUser: userHasDefaultOrg })
474+
setup({ currentUser: loggedInUser })
546475
render(<BaseLayout>hello</BaseLayout>, { wrapper: wrapper() })
547476

548477
const header = await screen.findByText(/Header/)

‎src/layouts/BaseLayout/BaseLayout.tsx

+1-22
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ import LoadingLogo from 'ui/LoadingLogo'
1919
import { NavigatorDataQueryOpts } from './hooks/NavigatorDataQueryOpts'
2020
import { useUserAccessGate } from './hooks/useUserAccessGate'
2121

22-
const DefaultOrgSelector = lazy(() => import('pages/DefaultOrgSelector'))
23-
const InstallationHelpBanner = lazy(() => import('./InstallationHelpBanner'))
2422
const TermsOfService = lazy(() => import('pages/TermsOfService'))
2523

2624
const FullPageLoader = () => (
@@ -30,20 +28,16 @@ const FullPageLoader = () => (
3028
)
3129

3230
interface OnboardingOrChildrenProps extends React.PropsWithChildren {
33-
isImpersonating: boolean
3431
isFullExperience: boolean
3532
showAgreeToTerms: boolean
3633
redirectToSyncPage: boolean
37-
showDefaultOrgSelector: boolean
3834
}
3935

4036
function OnboardingOrChildren({
4137
children,
42-
isImpersonating,
4338
isFullExperience,
4439
showAgreeToTerms,
4540
redirectToSyncPage,
46-
showDefaultOrgSelector,
4741
}: OnboardingOrChildrenProps) {
4842
if (showAgreeToTerms && !isFullExperience) {
4943
return (
@@ -57,14 +51,6 @@ function OnboardingOrChildren({
5751
return <Redirect to="/sync" />
5852
}
5953

60-
if (showDefaultOrgSelector && !isFullExperience && !isImpersonating) {
61-
return (
62-
<Suspense fallback={null}>
63-
<DefaultOrgSelector />
64-
</Suspense>
65-
)
66-
}
67-
6854
return <>{children}</>
6955
}
7056

@@ -81,7 +67,6 @@ function BaseLayout({ children }: React.PropsWithChildren) {
8167
const {
8268
isFullExperience,
8369
showAgreeToTerms,
84-
showDefaultOrgSelector,
8570
redirectToSyncPage,
8671
isLoading: isUserAccessGateLoading,
8772
} = useUserAccessGate()
@@ -112,15 +97,11 @@ function BaseLayout({ children }: React.PropsWithChildren) {
11297
<Suspense>
11398
<ErrorBoundary errorComponent={<EmptyErrorComponent />}>
11499
<SilentNetworkErrorWrapper>
115-
{isFullExperience || isImpersonating ? (
100+
{(isFullExperience || isImpersonating) && (
116101
<>
117102
<GlobalTopBanners />
118103
<Header hasRepoAccess={data?.hasRepoAccess} />
119104
</>
120-
) : (
121-
<>
122-
{showDefaultOrgSelector ? <InstallationHelpBanner /> : null}
123-
</>
124105
)}
125106
</SilentNetworkErrorWrapper>
126107
</ErrorBoundary>
@@ -135,9 +116,7 @@ function BaseLayout({ children }: React.PropsWithChildren) {
135116
<OnboardingOrChildren
136117
isFullExperience={isFullExperience}
137118
showAgreeToTerms={showAgreeToTerms}
138-
showDefaultOrgSelector={showDefaultOrgSelector}
139119
redirectToSyncPage={redirectToSyncPage}
140-
isImpersonating={isImpersonating}
141120
>
142121
{children}
143122
</OnboardingOrChildren>

‎src/layouts/BaseLayout/InstallationHelpBanner/InstallationHelpBanner.jsx

-65
This file was deleted.

0 commit comments

Comments
 (0)