Skip to content

Commit a8a876c

Browse files
authored
fix: dissociated-code-references-gate-from-flag-response (#7065)
1 parent 61ca107 commit a8a876c

3 files changed

Lines changed: 42 additions & 48 deletions

File tree

frontend/web/components/feature-page/FeatureNavTab/FeatureAnalytics.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,10 @@ const FlagAnalytics: FC<FlagAnalyticsType> = ({
106106
tick={{ fill: '#656D7B' }}
107107
axisLine={{ stroke: '#656D7B' }}
108108
/>
109-
<Tooltip cursor={{ fill: 'transparent' }} />
109+
<Tooltip
110+
cursor={{ fill: 'transparent' }}
111+
labelStyle={{ color: '#1a1a1a' }}
112+
/>
110113
{sortBy(environmentIds, (id) =>
111114
environments?.results?.findIndex((env) => `${env.id}` === id),
112115
).map((id) => {

frontend/web/components/modals/create-feature/index.tsx

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import FeatureListStore from 'common/stores/feature-list-store'
88
import IdentityProvider from 'common/providers/IdentityProvider'
99
import FeatureListProvider from 'common/providers/FeatureListProvider'
1010
import AppActions from 'common/dispatcher/app-actions'
11-
import Project from 'common/project'
1211
import Tabs from 'components/navigation/TabMenu/Tabs'
1312
import TabItem from 'components/navigation/TabMenu/TabItem'
1413
import ChangeRequestModal from 'components/modals/ChangeRequestModal'
@@ -380,7 +379,6 @@ const CreateFeatureModal: FC<CreateFeatureModalProps> = (props) => {
380379
controlValue < 0
381380
const isVersionedChangeRequest = existingChangeRequest && isVersioned
382381
const hideIdentityOverridesTab = Utils.getShouldHideIdentityOverridesTab()
383-
const hasCodeReferences = projectFlag?.code_references_counts?.length > 0
384382

385383
let regexValid = true
386384
try {
@@ -659,21 +657,18 @@ const CreateFeatureModal: FC<CreateFeatureModalProps> = (props) => {
659657
/>
660658
</TabItem>
661659
)}
662-
{(!Project.disableAnalytics || hasCodeReferences) && (
663-
<TabItem
664-
tabLabelString='Usage'
665-
tabLabel={
666-
<Row className='justify-content-center'>Usage</Row>
667-
}
668-
>
669-
<UsageTab
670-
projectId={projectId}
671-
featureId={projectFlag.id}
672-
environmentId={environment.id}
673-
hasCodeReferences={hasCodeReferences}
674-
/>
675-
</TabItem>
676-
)}
660+
<TabItem
661+
tabLabelString='Usage'
662+
tabLabel={
663+
<Row className='justify-content-center'>Usage</Row>
664+
}
665+
>
666+
<UsageTab
667+
projectId={projectId}
668+
featureId={projectFlag.id}
669+
environmentId={environment.id}
670+
/>
671+
</TabItem>
677672
{
678673
<TabItem
679674
data-test='feature_health'

frontend/web/components/modals/create-feature/tabs/UsageTab.tsx

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@ type UsageTabProps = {
77
projectId: number | string
88
featureId: number
99
environmentId: number
10-
hasCodeReferences: boolean
1110
}
1211

1312
const UsageTab: FC<UsageTabProps> = ({
1413
environmentId,
1514
featureId,
16-
hasCodeReferences,
1715
projectId,
1816
}) => {
1917
if (!projectId) {
@@ -30,34 +28,32 @@ const UsageTab: FC<UsageTabProps> = ({
3028
/>
3129
</div>
3230
)}
33-
{hasCodeReferences && (
34-
<FormGroup className='mb-4'>
35-
<div className='d-flex align-items-center gap-2 mb-2'>
36-
<h5 className='mb-0'>Code references</h5>
37-
<span
38-
className='chip chip--xs bg-primary text-white'
39-
style={{ border: 'none' }}
40-
>
41-
New
42-
</span>
43-
</div>
44-
<div className='text-muted mb-2'>
45-
Code references allow you to track where feature flags are being
46-
used within your code.{' '}
47-
<a
48-
target='_blank'
49-
href='https://docs.flagsmith.com/managing-flags/code-references'
50-
rel='noreferrer'
51-
>
52-
Learn more
53-
</a>
54-
</div>
55-
<FeatureCodeReferencesContainer
56-
featureId={featureId}
57-
projectId={parseInt(`${projectId}`)}
58-
/>
59-
</FormGroup>
60-
)}
31+
<FormGroup className='mb-4'>
32+
<div className='d-flex align-items-center gap-2 mb-2'>
33+
<h5 className='mb-0'>Code references</h5>
34+
<span
35+
className='chip chip--xs bg-primary text-white'
36+
style={{ border: 'none' }}
37+
>
38+
New
39+
</span>
40+
</div>
41+
<div className='text-muted mb-2'>
42+
Code references allow you to track where feature flags are being used
43+
within your code.{' '}
44+
<a
45+
target='_blank'
46+
href='https://docs.flagsmith.com/managing-flags/code-references'
47+
rel='noreferrer'
48+
>
49+
Learn more
50+
</a>
51+
</div>
52+
<FeatureCodeReferencesContainer
53+
featureId={featureId}
54+
projectId={parseInt(`${projectId}`)}
55+
/>
56+
</FormGroup>
6157
</>
6258
)
6359
}

0 commit comments

Comments
 (0)