Skip to content
Merged
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
25 changes: 14 additions & 11 deletions frontend/web/components/pages/UserPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,19 @@ const UserPage: FC = () => {
const projectFlag = projectFlags?.find(
(p: any) => p.id === environmentFlag.feature,
)
const actualFlagForFeature =
actualFlags?.[name]?.feature?.id === featureId
? actualFlags[name]
: undefined
const overrideFeatureState = identityFlag
? {
...identityFlag,
//resolves multivariate value if one is set
feature_state_value:
actualFlagForFeature?.feature_state_value,
}
: actualFlagForFeature ??
environmentFlags[featureId]
return (
!!projectFlag && (
<FeatureOverrideRow
Expand All @@ -306,17 +319,7 @@ const UserPage: FC = () => {
valueDataTest={`user-feature-value-${i}`}
projectFlag={projectFlag}
dataTest={`user-feature-${i}`}
overrideFeatureState={
identityFlag
? {
...identityFlag,
//resolves multivariate value if one is set
feature_state_value:
actualFlags?.[name]
?.feature_state_value,
}
: actualFlags?.[name]
}
overrideFeatureState={overrideFeatureState}
environmentFeatureState={
environmentFlags[featureId]
}
Expand Down
Loading