Skip to content

Commit 53ce439

Browse files
calvin-codecovcalvin-codecov
authored
Cy/non pat appless (#3667)
1 parent 9a77add commit 53ce439

File tree

60 files changed

+1007
-3911
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1007
-3911
lines changed

‎src/App.test.tsx

Lines changed: 0 additions & 1 deletion
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/assets/onboarding/org_list_install_app.png

41 KB
Loading

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

Lines changed: 5 additions & 76 deletions
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
{
@@ -330,9 +323,6 @@ describe('BaseLayout', () => {
330323
const hello = screen.getByText('hello')
331324
expect(hello).toBeInTheDocument()
332325

333-
const defaultOrg = screen.queryByText(/DefaultOrgSelector/)
334-
expect(defaultOrg).not.toBeInTheDocument()
335-
336326
const termsOfService = screen.queryByText(/TermsOfService/)
337327
expect(termsOfService).not.toBeInTheDocument()
338328
})
@@ -352,9 +342,6 @@ describe('BaseLayout', () => {
352342
const hello = screen.getByText('hello')
353343
expect(hello).toBeInTheDocument()
354344

355-
const defaultOrg = screen.queryByText(/DefaultOrgSelector/)
356-
expect(defaultOrg).not.toBeInTheDocument()
357-
358345
const termsOfService = screen.queryByText(/TermsOfService/)
359346
expect(termsOfService).not.toBeInTheDocument()
360347
})
@@ -385,68 +372,19 @@ describe('BaseLayout', () => {
385372
const header = screen.queryByText(/Header/)
386373
expect(header).not.toBeInTheDocument()
387374
})
388-
389-
it('renders help banner', async () => {
390-
setup({
391-
currentUser: userNoTermsAgreement,
392-
internalUser: mockUserNoTermsAgreement,
393-
})
394-
395-
render(<BaseLayout>hello</BaseLayout>, { wrapper: wrapper() })
396-
const helpBanner = await screen.findByText(/InstallationHelpBanner/)
397-
expect(helpBanner).toBeInTheDocument()
398-
})
399-
})
400-
401-
describe('when no default org selected', () => {
402-
it('renders the default org selector', async () => {
403-
setup({
404-
currentUser: loggedInUser,
405-
internalUser: mockUser,
406-
})
407-
render(<BaseLayout>hello</BaseLayout>, { wrapper: wrapper() })
408-
409-
const defaultOrgSelector = await screen.findByText(/DefaultOrgSelector/)
410-
expect(defaultOrgSelector).toBeInTheDocument()
411-
})
412-
413-
it('does not render the header', async () => {
414-
setup({
415-
currentUser: loggedInUser,
416-
internalUser: mockUser,
417-
})
418-
render(<BaseLayout>hello</BaseLayout>, { wrapper: wrapper() })
419-
420-
const defaultOrgSelector = await screen.findByText(/DefaultOrgSelector/)
421-
expect(defaultOrgSelector).toBeInTheDocument()
422-
423-
const header = screen.queryByText(/Header/)
424-
expect(header).not.toBeInTheDocument()
425-
})
426-
427-
it('renders help banner', async () => {
428-
setup({
429-
currentUser: loggedInUser,
430-
internalUser: mockUser,
431-
})
432-
433-
render(<BaseLayout>hello</BaseLayout>, { wrapper: wrapper() })
434-
const helpBanner = await screen.findByText(/InstallationHelpBanner/)
435-
expect(helpBanner).toBeInTheDocument()
436-
})
437375
})
438376

439-
describe('when agreed to TOS and default org selected', () => {
377+
describe('when agreed to TOS', () => {
440378
it('renders children', async () => {
441-
setup({ currentUser: userHasDefaultOrg })
379+
setup({ currentUser: loggedInUser })
442380
render(<BaseLayout>hello</BaseLayout>, { wrapper: wrapper() })
443381

444382
const children = await screen.findByText(/hello/)
445383
expect(children).toBeInTheDocument()
446384
})
447385

448386
it('renders header', async () => {
449-
setup({ currentUser: userHasDefaultOrg })
387+
setup({ currentUser: loggedInUser })
450388
render(<BaseLayout>hello</BaseLayout>, { wrapper: wrapper() })
451389

452390
const header = await screen.findByText(/Header/)
@@ -488,9 +426,6 @@ describe('BaseLayout', () => {
488426
const hello = screen.getByText('hello')
489427
expect(hello).toBeInTheDocument()
490428

491-
const defaultOrg = screen.queryByText(/DefaultOrgSelector/)
492-
expect(defaultOrg).not.toBeInTheDocument()
493-
494429
const termsOfService = screen.queryByText(/TermsOfService/)
495430
expect(termsOfService).not.toBeInTheDocument()
496431
})
@@ -510,9 +445,6 @@ describe('BaseLayout', () => {
510445
const hello = screen.getByText('hello')
511446
expect(hello).toBeInTheDocument()
512447

513-
const defaultOrg = screen.queryByText(/DefaultOrgSelector/)
514-
expect(defaultOrg).not.toBeInTheDocument()
515-
516448
const termsOfService = screen.queryByText(/TermsOfService/)
517449
expect(termsOfService).not.toBeInTheDocument()
518450
})
@@ -550,23 +482,20 @@ describe('BaseLayout', () => {
550482

551483
const header = await screen.findByText(/Header/)
552484
expect(header).toBeInTheDocument()
553-
554-
const defaultOrgSelector = screen.queryByText(/DefaultOrgSelector/)
555-
expect(defaultOrgSelector).not.toBeInTheDocument()
556485
})
557486
})
558487

559488
describe('when agreed to TOS and default org selected', () => {
560489
it('renders children', async () => {
561-
setup({ currentUser: userHasDefaultOrg })
490+
setup({ currentUser: loggedInUser })
562491
render(<BaseLayout>hello</BaseLayout>, { wrapper: wrapper() })
563492

564493
const children = await screen.findByText(/hello/)
565494
expect(children).toBeInTheDocument()
566495
})
567496

568497
it('renders header', async () => {
569-
setup({ currentUser: userHasDefaultOrg })
498+
setup({ currentUser: loggedInUser })
570499
render(<BaseLayout>hello</BaseLayout>, { wrapper: wrapper() })
571500

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

‎src/layouts/BaseLayout/BaseLayout.tsx

Lines changed: 44 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { EmptyErrorComponent } from 'layouts/shared/ErrorBoundary/ErrorBoundary'
99
import NetworkErrorBoundary from 'layouts/shared/NetworkErrorBoundary'
1010
import SilentNetworkErrorWrapper from 'layouts/shared/SilentNetworkErrorWrapper'
1111
import ToastNotifications from 'layouts/ToastNotifications'
12+
import { OnboardingContainerProvider } from 'pages/OwnerPage/OnboardingContainerContext/context'
1213
import { RepoBreadcrumbProvider } from 'pages/RepoPage/context'
1314
import { useEventContext } from 'services/events/hooks'
1415
import { useImpersonate } from 'services/impersonate'
@@ -20,8 +21,6 @@ import LoadingLogo from 'ui/LoadingLogo'
2021
import { NavigatorDataQueryOpts } from './hooks/NavigatorDataQueryOpts'
2122
import { useUserAccessGate } from './hooks/useUserAccessGate'
2223

23-
const DefaultOrgSelector = lazy(() => import('pages/DefaultOrgSelector'))
24-
const InstallationHelpBanner = lazy(() => import('./InstallationHelpBanner'))
2524
const TermsOfService = lazy(() => import('pages/TermsOfService'))
2625

2726
const FullPageLoader = () => (
@@ -31,20 +30,16 @@ const FullPageLoader = () => (
3130
)
3231

3332
interface OnboardingOrChildrenProps extends React.PropsWithChildren {
34-
isImpersonating: boolean
3533
isFullExperience: boolean
3634
showAgreeToTerms: boolean
3735
redirectToSyncPage: boolean
38-
showDefaultOrgSelector: boolean
3936
}
4037

4138
function OnboardingOrChildren({
4239
children,
43-
isImpersonating,
4440
isFullExperience,
4541
showAgreeToTerms,
4642
redirectToSyncPage,
47-
showDefaultOrgSelector,
4843
}: OnboardingOrChildrenProps) {
4944
if (showAgreeToTerms && !isFullExperience) {
5045
return (
@@ -58,14 +53,6 @@ function OnboardingOrChildren({
5853
return <Redirect to="/sync" />
5954
}
6055

61-
if (showDefaultOrgSelector && !isFullExperience && !isImpersonating) {
62-
return (
63-
<Suspense fallback={null}>
64-
<DefaultOrgSelector />
65-
</Suspense>
66-
)
67-
}
68-
6956
return <>{children}</>
7057
}
7158

@@ -83,7 +70,6 @@ function BaseLayout({ children }: React.PropsWithChildren) {
8370
const {
8471
isFullExperience,
8572
showAgreeToTerms,
86-
showDefaultOrgSelector,
8773
redirectToSyncPage,
8874
isLoading: isUserAccessGateLoading,
8975
} = useUserAccessGate()
@@ -109,53 +95,49 @@ function BaseLayout({ children }: React.PropsWithChildren) {
10995

11096
return (
11197
<>
112-
<RepoBreadcrumbProvider>
113-
{/* Header */}
114-
<Suspense>
115-
<ErrorBoundary errorComponent={<EmptyErrorComponent />}>
116-
<SilentNetworkErrorWrapper>
117-
{isFullExperience || isImpersonating ? (
118-
<>
119-
<GlobalTopBanners />
120-
<Header hasRepoAccess={data?.hasRepoAccess} />
121-
</>
122-
) : (
123-
<>
124-
{showDefaultOrgSelector ? <InstallationHelpBanner /> : null}
125-
</>
126-
)}
127-
</SilentNetworkErrorWrapper>
128-
</ErrorBoundary>
129-
</Suspense>
130-
131-
{/* Main Page Contents */}
132-
<Suspense fallback={<FullPageLoader />}>
133-
<ErrorBoundary sentryScopes={[['layout', 'base']]}>
134-
<NetworkErrorBoundary>
135-
<main className="container mb-8 flex grow flex-col gap-2 md:p-0">
136-
<GlobalBanners />
137-
<OnboardingOrChildren
138-
isFullExperience={isFullExperience}
139-
showAgreeToTerms={showAgreeToTerms}
140-
showDefaultOrgSelector={showDefaultOrgSelector}
141-
redirectToSyncPage={redirectToSyncPage}
142-
isImpersonating={isImpersonating}
143-
>
144-
{children}
145-
</OnboardingOrChildren>
146-
</main>
147-
</NetworkErrorBoundary>
148-
</ErrorBoundary>
149-
</Suspense>
150-
151-
{/* Footer */}
152-
{isFullExperience && (
153-
<>
154-
<Footer />
155-
<ToastNotifications />
156-
</>
157-
)}
158-
</RepoBreadcrumbProvider>
98+
<OnboardingContainerProvider>
99+
<RepoBreadcrumbProvider>
100+
{/* Header */}
101+
<Suspense>
102+
<ErrorBoundary errorComponent={<EmptyErrorComponent />}>
103+
<SilentNetworkErrorWrapper>
104+
{isFullExperience || isImpersonating ? (
105+
<>
106+
<GlobalTopBanners />
107+
<Header hasRepoAccess={data?.hasRepoAccess} />
108+
</>
109+
) : null}
110+
</SilentNetworkErrorWrapper>
111+
</ErrorBoundary>
112+
</Suspense>
113+
114+
{/* Main Page Contents */}
115+
<Suspense fallback={<FullPageLoader />}>
116+
<ErrorBoundary sentryScopes={[['layout', 'base']]}>
117+
<NetworkErrorBoundary>
118+
<main className="container mb-8 flex grow flex-col gap-2 md:p-0">
119+
<GlobalBanners />
120+
<OnboardingOrChildren
121+
isFullExperience={isFullExperience}
122+
showAgreeToTerms={showAgreeToTerms}
123+
redirectToSyncPage={redirectToSyncPage}
124+
>
125+
{children}
126+
</OnboardingOrChildren>
127+
</main>
128+
</NetworkErrorBoundary>
129+
</ErrorBoundary>
130+
</Suspense>
131+
132+
{/* Footer */}
133+
{isFullExperience ? (
134+
<>
135+
<Footer />
136+
<ToastNotifications />
137+
</>
138+
) : null}
139+
</RepoBreadcrumbProvider>
140+
</OnboardingContainerProvider>
159141
</>
160142
)
161143
}

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

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)