Skip to content
Open
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
31 changes: 31 additions & 0 deletions frontend/web/components/pages/features/FeaturesPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import FeatureRowSkeleton from 'components/feature-summary/FeatureRowSkeleton'
import JSONReference from 'components/JSONReference'
import Permission from 'common/providers/Permission'
import {
FeaturePermalinkHandler,
FeaturesEmptyState,
FeatureMetricsSection,
FeaturesPageHeader,
Expand Down Expand Up @@ -174,6 +175,22 @@ const FeaturesPage: FC<FeaturesPageProps> = ({
[data?.pagination],
)

// A permalinked feature (`?feature=<id>`) is opened by its own FeatureRow, but
// rows only exist for the current page. When the target feature lives on a later
// page we open it via a dedicated handler instead (see #4239).
const permalinkFeatureId = useMemo(() => {
const { feature } = Utils.fromParam(history.location.search) as {
feature?: string
}
const featureId = feature ? parseInt(feature) : NaN
return Number.isNaN(featureId) ? null : featureId
}, [history.location.search])
const isPermalinkOnCurrentPage =
permalinkFeatureId !== null &&
projectFlags.some(
(projectFlag: ProjectFlag) => projectFlag.id === permalinkFeatureId,
)

usePageTracking({
context: {
environmentId,
Expand Down Expand Up @@ -378,6 +395,20 @@ const FeaturesPage: FC<FeaturesPageProps> = ({

<FormGroup className='mb-4'>{renderFeaturesList()}</FormGroup>

{!!data &&
!isPermalinkOnCurrentPage &&
permalinkFeatureId !== null &&
!!currentEnvironment && (
<FeaturePermalinkHandler
featureId={permalinkFeatureId}
projectId={projectId}
environmentApiKey={environmentId}
environmentId={currentEnvironment.id}
minimumChangeRequestApprovals={minimumChangeRequestApprovals}
experimentMode={defaultExperiment}
/>
)}

<FeaturesSDKIntegration
projectId={projectId}
environmentId={environmentId}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
import React, { FC, useMemo } from 'react'
import Permission from 'common/providers/Permission'
import Utils from 'common/utils/utils'
import { useGetProjectFlagQuery } from 'common/services/useProjectFlag'
import { useGetFeatureStatesQuery } from 'common/services/useFeatureState'
import FeatureRow from 'components/feature-summary/FeatureRow'

type FeaturePermalinkHandlerProps = {
featureId: number
projectId: number
environmentApiKey: string
environmentId: number
minimumChangeRequestApprovals?: number | null
experimentMode?: boolean
}

/**
* Opens the feature panel for a permalinked feature (`?feature=<id>`) that is not
* present on the current page of results.
*
* `FeatureRow` opens the panel from its own effect when the feature id in the URL
* matches its feature, but rows are only rendered for the current page. For a
* feature on a later page no row exists, so the permalink would otherwise be a
* no-op and the user would simply land on the first page (see #4239).
*
* Here we fetch the feature (and its environment feature state) directly and render
* a single hidden `FeatureRow`, so the exact same panel-opening logic runs without
* having to duplicate it.
*/
const FeaturePermalinkHandler: FC<FeaturePermalinkHandlerProps> = ({
environmentApiKey,
environmentId,
experimentMode,
featureId,
minimumChangeRequestApprovals,
projectId,
}) => {
const { data: projectFlag } = useGetProjectFlagQuery({
id: featureId,
project: projectId,
})
const { data: featureStates } = useGetFeatureStatesQuery({

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should also use isLoading from this hook to early return if the projectFlag was returned faster than the environment flags states, otherwise the modal might open end up in a stale state where it is complicated to re-open

environment: environmentId,
feature: featureId,
})

const environmentFlags = useMemo(() => {
const environmentFeatureState = featureStates?.results?.find(
(featureState) => !featureState.feature_segment && !featureState.identity,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
(featureState) => !featureState.feature_segment && !featureState.identity,
(featureState) =>
!featureState.live_from &&
!featureState.feature_segment &&
!featureState.identity,

We need to also filter out scheduled feature state changes

)
return environmentFeatureState
? { [featureId]: environmentFeatureState }
: {}
}, [featureStates, featureId])

if (!projectFlag) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Related to the above: if (!projectFlag || isLoading || !environmentFeatureState) {

return null
}

return (
<div className='d-none'>
<Permission
level='environment'
tags={projectFlag.tags}
permission={Utils.getManageFeaturePermission(
Utils.changeRequestsEnabled(minimumChangeRequestApprovals),
)}
id={environmentApiKey}
>
{({ permission }) => (
<FeatureRow
environmentFlags={environmentFlags}
permission={permission}
environmentId={environmentApiKey}
projectId={projectId}
index={0}
projectFlag={projectFlag}
experimentMode={experimentMode}
/>
)}
</Permission>
</div>
)
}

export default FeaturePermalinkHandler
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export { default as FeaturePermalinkHandler } from './FeaturePermalinkHandler'
export { FeaturesEmptyState } from './FeaturesEmptyState'
export { FeatureMetricsSection } from './FeatureMetricsSection'
export { FeaturesPageHeader } from './FeaturesPageHeader'
Expand Down
Loading