Skip to content

Commit f0deb04

Browse files
chore: Remove bundle analysis flags (#2693)
Remove bundle analysis feature flags from Gazebo. GH codecov/engineering-team#999 GH codecov/engineering-team#1214
1 parent d2a63eb commit f0deb04

31 files changed

+72
-1114
lines changed

src/pages/CommitDetailPage/CommitDetailPage.spec.tsx

-11
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,13 @@ import { setupServer } from 'msw/node'
55
import { Suspense } from 'react'
66
import { MemoryRouter, Route } from 'react-router-dom'
77

8-
import { useFlags } from 'shared/featureFlags'
9-
108
import CommitPage from './CommitDetailPage'
119

1210
jest.mock('ui/TruncatedMessage/hooks')
1311
jest.mock('./Header', () => () => 'Header')
1412
jest.mock('./CommitCoverage', () => () => 'CommitCoverage')
1513
jest.mock('./CommitBundleAnalysis', () => () => 'CommitBundleAnalysis')
1614

17-
jest.mock('shared/featureFlags')
18-
const mockedUseFlags = useFlags as jest.Mock<{
19-
bundleAnalysisPrAndCommitPages: boolean
20-
}>
21-
2215
const mockNotFoundCommit = {
2316
owner: {
2417
isCurrentUserPartOfOrg: false,
@@ -146,10 +139,6 @@ describe('CommitDetailPage', () => {
146139
bundleAnalysisEnabled: false,
147140
}
148141
) {
149-
mockedUseFlags.mockReturnValue({
150-
bundleAnalysisPrAndCommitPages: true,
151-
})
152-
153142
server.use(
154143
graphql.query('CommitPageData', (req, res, ctx) => {
155144
if (notFoundCommit) {

src/pages/CommitDetailPage/CommitDetailPage.tsx

+2-11
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { lazy, Suspense } from 'react'
44
import { useLocation, useParams } from 'react-router-dom'
55

66
import NotFound from 'pages/NotFound'
7-
import { useFlags } from 'shared/featureFlags'
87
import Breadcrumb from 'ui/Breadcrumb'
98
import Spinner from 'ui/Spinner'
109
import SummaryDropdown from 'ui/SummaryDropdown'
@@ -43,10 +42,6 @@ const CommitDetailPage: React.FC = () => {
4342
const { provider, owner, repo, commit: commitSha } = useParams<URLParams>()
4443
const shortSHA = commitSha?.slice(0, 7)
4544

46-
const { bundleAnalysisPrAndCommitPages } = useFlags({
47-
bundleAnalysisPrAndCommitPages: false,
48-
})
49-
5045
// reset cache when user navigates to the commit detail page
5146
const queryClient = useQueryClient()
5247
queryClient.setQueryData(['IgnoredUploadIds'], [])
@@ -71,8 +66,7 @@ const CommitDetailPage: React.FC = () => {
7166
let displayMode: TDisplayMode = DISPLAY_MODE.COVERAGE
7267
if (
7368
commitPageData?.bundleAnalysisEnabled &&
74-
commitPageData?.coverageEnabled &&
75-
bundleAnalysisPrAndCommitPages
69+
commitPageData?.coverageEnabled
7670
) {
7771
const queryString = qs.parse(location.search, {
7872
ignoreQueryPrefix: true,
@@ -86,10 +80,7 @@ const CommitDetailPage: React.FC = () => {
8680
}
8781

8882
displayMode = DISPLAY_MODE.BOTH
89-
} else if (
90-
commitPageData?.bundleAnalysisEnabled &&
91-
bundleAnalysisPrAndCommitPages
92-
) {
83+
} else if (commitPageData?.bundleAnalysisEnabled) {
9384
displayMode = DISPLAY_MODE.BUNDLE_ANALYSIS
9485
}
9586

src/pages/PullRequestPage/PullCoverage/routes/CommitsTab/CommitsTable/CommitsTable.spec.tsx

-11
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,8 @@ import { setupServer } from 'msw/node'
99
import { mockIsIntersecting } from 'react-intersection-observer/test-utils'
1010
import { MemoryRouter, Route } from 'react-router-dom'
1111

12-
import { useFlags } from 'shared/featureFlags'
13-
1412
import CommitsTable from './CommitsTable'
1513

16-
jest.mock('shared/featureFlags')
17-
const mockedUseFlags = useFlags as jest.Mock<{
18-
bundleAnalysisPrAndCommitPages: boolean
19-
}>
20-
2114
const mockRepoOverview = (bundleAnalysisEnabled = false) => ({
2215
owner: {
2316
repository: {
@@ -152,10 +145,6 @@ describe('CommitsTable', () => {
152145
}: SetupArgs) {
153146
const queryClient = new QueryClient()
154147

155-
mockedUseFlags.mockReturnValue({
156-
bundleAnalysisPrAndCommitPages: true,
157-
})
158-
159148
server.use(
160149
graphql.query('GetRepoOverview', (req, res, ctx) => {
161150
return res(

src/pages/PullRequestPage/PullCoverage/routes/CommitsTab/CommitsTable/CommitsTable.tsx

+2-7
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { useParams } from 'react-router-dom'
1212

1313
import { useCommits } from 'services/commits/useCommits'
1414
import { useRepoOverview } from 'services/repo'
15-
import { useFlags } from 'shared/featureFlags'
1615
import Spinner from 'ui/Spinner'
1716

1817
import { createCommitsTableData } from './createCommitsTableData'
@@ -89,9 +88,6 @@ const CommitsTable = () => {
8988
const { ref, inView } = useInView()
9089
const { provider, owner, repo, pullId } = useParams<URLParams>()
9190
const { data: overview } = useRepoOverview({ provider, owner, repo })
92-
const { bundleAnalysisPrAndCommitPages } = useFlags({
93-
bundleAnalysisPrAndCommitPages: false,
94-
})
9591

9692
const {
9793
data: commitsData,
@@ -122,8 +118,7 @@ const CommitsTable = () => {
122118
const columns = useMemo(() => {
123119
if (
124120
overview?.bundleAnalysisEnabled &&
125-
!baseColumns.some((column) => column.id === 'bundleAnalysis') &&
126-
bundleAnalysisPrAndCommitPages
121+
!baseColumns.some((column) => column.id === 'bundleAnalysis')
127122
) {
128123
return [
129124
...baseColumns,
@@ -136,7 +131,7 @@ const CommitsTable = () => {
136131
}
137132

138133
return baseColumns
139-
}, [bundleAnalysisPrAndCommitPages, overview?.bundleAnalysisEnabled])
134+
}, [overview?.bundleAnalysisEnabled])
140135

141136
const table = useReactTable({
142137
columns,

src/pages/PullRequestPage/PullCoverage/routes/CommitsTab/CommitsTableTeam/CommitsTableTeam.spec.tsx

-11
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,8 @@ import { setupServer } from 'msw/node'
99
import { mockIsIntersecting } from 'react-intersection-observer/test-utils'
1010
import { MemoryRouter, Route } from 'react-router-dom'
1111

12-
import { useFlags } from 'shared/featureFlags'
13-
1412
import CommitsTableTeam from './CommitsTableTeam'
1513

16-
jest.mock('shared/featureFlags')
17-
const mockedUseFlags = useFlags as jest.Mock<{
18-
bundleAnalysisPrAndCommitPages: boolean
19-
}>
20-
2114
const mockRepoOverview = (bundleAnalysisEnabled = false) => ({
2215
owner: {
2316
repository: {
@@ -128,10 +121,6 @@ describe('CommitsTableTeam', () => {
128121
}: SetupArgs) {
129122
const queryClient = new QueryClient()
130123

131-
mockedUseFlags.mockReturnValue({
132-
bundleAnalysisPrAndCommitPages: true,
133-
})
134-
135124
server.use(
136125
graphql.query('GetRepoOverview', (req, res, ctx) => {
137126
return res(

src/pages/PullRequestPage/PullCoverage/routes/CommitsTab/CommitsTableTeam/CommitsTableTeam.tsx

+2-7
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { useParams } from 'react-router-dom'
1212

1313
import { useCommitsTeam } from 'services/commits'
1414
import { useRepoOverview } from 'services/repo'
15-
import { useFlags } from 'shared/featureFlags'
1615
import Spinner from 'ui/Spinner'
1716
import 'ui/Table/Table.css'
1817

@@ -77,9 +76,6 @@ export default function CommitsTableTeam() {
7776
const { provider, owner, repo, pullId } = useParams<URLParams>()
7877
const { ref, inView } = useInView()
7978
const { data: overview } = useRepoOverview({ provider, owner, repo })
80-
const { bundleAnalysisPrAndCommitPages } = useFlags({
81-
bundleAnalysisPrAndCommitPages: false,
82-
})
8379

8480
const {
8581
data: commitsData,
@@ -110,8 +106,7 @@ export default function CommitsTableTeam() {
110106
const columns = useMemo(() => {
111107
if (
112108
overview?.bundleAnalysisEnabled &&
113-
!baseColumns.some((column) => column.id === 'bundleAnalysis') &&
114-
bundleAnalysisPrAndCommitPages
109+
!baseColumns.some((column) => column.id === 'bundleAnalysis')
115110
) {
116111
return [
117112
...baseColumns,
@@ -124,7 +119,7 @@ export default function CommitsTableTeam() {
124119
}
125120

126121
return baseColumns
127-
}, [bundleAnalysisPrAndCommitPages, overview?.bundleAnalysisEnabled])
122+
}, [overview?.bundleAnalysisEnabled])
128123

129124
const table = useReactTable({
130125
columns,

src/pages/PullRequestPage/PullRequestPage.spec.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import PullRequestPage from './PullRequestPage'
1313
jest.mock('shared/featureFlags')
1414
const mockedUseFlags = useFlags as jest.Mock<{
1515
multipleTiers: boolean
16-
bundleAnalysisPrAndCommitPages: boolean
1716
}>
1817

1918
jest.mock('./Header', () => () => 'Header')
@@ -189,7 +188,6 @@ describe('PullRequestPage', () => {
189188
}: SetupArgs) {
190189
mockedUseFlags.mockReturnValue({
191190
multipleTiers: true,
192-
bundleAnalysisPrAndCommitPages: true,
193191
})
194192

195193
server.use(

src/pages/PullRequestPage/PullRequestPage.tsx

+3-8
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,8 @@ const Loader = () => (
4242
function PullRequestPage() {
4343
const location = useLocation()
4444
const { provider, owner, repo, pullId } = useParams<URLParams>()
45-
const { multipleTiers, bundleAnalysisPrAndCommitPages } = useFlags({
45+
const { multipleTiers } = useFlags({
4646
multipleTiers: false,
47-
bundleAnalysisPrAndCommitPages: false,
4847
})
4948

5049
const { data: overview } = useRepoOverview({ provider, owner, repo })
@@ -68,11 +67,7 @@ function PullRequestPage() {
6867
let defaultDropdown: Array<'coverage' | 'bundle'> = []
6968
// default to displaying only coverage
7069
let displayMode: TDisplayMode = DISPLAY_MODE.COVERAGE
71-
if (
72-
data?.bundleAnalysisEnabled &&
73-
data?.coverageEnabled &&
74-
bundleAnalysisPrAndCommitPages
75-
) {
70+
if (data?.bundleAnalysisEnabled && data?.coverageEnabled) {
7671
const queryString = qs.parse(location.search, {
7772
ignoreQueryPrefix: true,
7873
depth: 1,
@@ -85,7 +80,7 @@ function PullRequestPage() {
8580
}
8681

8782
displayMode = DISPLAY_MODE.BOTH
88-
} else if (data?.bundleAnalysisEnabled && bundleAnalysisPrAndCommitPages) {
83+
} else if (data?.bundleAnalysisEnabled) {
8984
displayMode = DISPLAY_MODE.BUNDLE_ANALYSIS
9085
}
9186

0 commit comments

Comments
 (0)