Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Clean up bundle caching feature flag #3659

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@ import { MemoryRouter, Route } from 'react-router-dom'

import BundleSelection from './BundleSelection'

const mocks = vi.hoisted(() => ({
useFlags: vi.fn().mockReturnValue({ displayBundleCachingModal: true }),
}))

vi.mock('shared/featureFlags', () => ({
useFlags: mocks.useFlags,
}))

const mockRepoOverview = {
__typename: 'Repository',
private: false,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { lazy, useCallback, useRef, useState } from 'react'

import { ConfigureCachedBundleModal } from 'pages/RepoPage/shared/ConfigureCachedBundleModal/ConfigureCachedBundleModal'
import { useFlags } from 'shared/featureFlags'
import Icon from 'ui/Icon'

import BranchSelector from './BranchSelector'
Expand All @@ -16,10 +15,6 @@ const BundleSelection: React.FC = () => {

const [showBundleCachingModal, setShowBundleCachingModal] = useState(false)

const { displayBundleCachingModal } = useFlags({
displayBundleCachingModal: false,
})

const resetFilterSelects = useCallback(() => {
typesSelectRef.current?.resetSelected()
loadingSelectRef?.current?.resetSelected()
Expand All @@ -40,21 +35,19 @@ const BundleSelection: React.FC = () => {
/>
<TypeSelector ref={typesSelectRef} />
<LoadSelector ref={loadingSelectRef} />
{displayBundleCachingModal ? (
<div className="flex w-full justify-end self-start md:w-auto">
<button
onClick={() => setShowBundleCachingModal(true)}
className="flex items-center gap-0.5 text-xs font-semibold text-ds-blue-darker hover:cursor-pointer hover:underline"
>
<Icon name="cog" size="sm" variant="outline" />
Configure data caching
</button>
<ConfigureCachedBundleModal
isOpen={showBundleCachingModal}
setIsOpen={setShowBundleCachingModal}
/>
</div>
) : null}
<div className="flex w-full justify-end self-start md:w-auto">
<button
onClick={() => setShowBundleCachingModal(true)}
className="flex items-center gap-0.5 text-xs font-semibold text-ds-blue-darker hover:cursor-pointer hover:underline"
>
<Icon name="cog" size="sm" variant="outline" />
Configure data caching
</button>
<ConfigureCachedBundleModal
isOpen={showBundleCachingModal}
setIsOpen={setShowBundleCachingModal}
/>
</div>
</div>
</div>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@ import { MemoryRouter, Route } from 'react-router'
import ConfigurationManager from './ConfigurationManager'
import { RepositoryConfiguration } from './hooks/useRepoConfigurationStatus/RepoConfigurationStatusQueryOpts'

const mocks = vi.hoisted(() => ({
useFlags: vi.fn().mockReturnValue({ displayBundleCachingModal: true }),
}))

vi.mock('shared/featureFlags', () => ({
useFlags: mocks.useFlags,
}))

interface mockRepoConfigArgs {
isTeamPlan?: boolean
flags?: boolean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { useState } from 'react'
import { useParams } from 'react-router'

import { ConfigureCachedBundleModal } from 'pages/RepoPage/shared/ConfigureCachedBundleModal/ConfigureCachedBundleModal'
import { useFlags } from 'shared/featureFlags'
import Icon from 'ui/Icon'

import FeatureGroup from './components/FeatureGroup'
Expand Down Expand Up @@ -144,10 +143,6 @@ function TestAnalyticsConfiguration({
function BundleAnalysisConfiguration({
repoConfiguration,
}: ConfigurationGroupProps) {
const { displayBundleCachingModal } = useFlags({
displayBundleCachingModal: false,
})

const [showBundleCachingModal, setShowBundleCachingModal] = useState(false)
const jsOrTsPresent = !!repoConfiguration?.repository?.languages?.some(
(lang) =>
Expand Down Expand Up @@ -177,21 +172,19 @@ function BundleAnalysisConfiguration({
>
Track, monitor, and manage your bundle
</FeatureItem>
{displayBundleCachingModal ? (
<div>
<button
onClick={() => setShowBundleCachingModal(true)}
className="flex items-center gap-0.5 text-xs font-semibold text-ds-blue-darker hover:cursor-pointer hover:underline"
>
<Icon name="cog" size="sm" variant="outline" />
Configure data caching
</button>
<ConfigureCachedBundleModal
isOpen={showBundleCachingModal}
setIsOpen={setShowBundleCachingModal}
/>
</div>
) : null}
<div>
<button
onClick={() => setShowBundleCachingModal(true)}
className="flex items-center gap-0.5 text-xs font-semibold text-ds-blue-darker hover:cursor-pointer hover:underline"
>
<Icon name="cog" size="sm" variant="outline" />
Configure data caching
</button>
<ConfigureCachedBundleModal
isOpen={showBundleCachingModal}
setIsOpen={setShowBundleCachingModal}
/>
</div>
</FeatureGroup.UniversalItems>
</FeatureGroup>
)
Expand Down
Loading