Skip to content

fix: add skip conditions for undefined environment ID queries #6557

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.

Sign up for GitHub

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

Merged
talissoncosta merged 2 commits into from
Jan 20, 2026
Merged

fix: add skip conditions for undefined environment ID queries #6557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad29391
fix(frontend): add skip conditions for undefined environment ID queries
talissoncosta Jan 20, 2026
4929283
fix(frontend): add guard in CompareEnvironments fetch for empty envir…
talissoncosta Jan 20, 2026
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
137 changes: 73 additions & 64 deletions frontend/web/components/CompareEnvironments.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ class CompareEnvironments extends Component {
}

fetch = () => {
if (!this.state.environmentLeft || !this.state.environmentRight) {
return
}
this.setState({ isLoading: true })
return Promise.all([
data.get(
Expand All @@ -66,70 +69,76 @@ class CompareEnvironments extends Component {
data.get(
`${Project.api}environments/${this.state.environmentRight}/featurestates/?page_size=999`,
),
]).then(
([
environmentLeftProjectFlags,
environmentRightProjectFlags,
environmentLeftFlags,
environmentRightFlags,
]) => {
const changes = []
const same = []
_.each(
_.sortBy(environmentLeftProjectFlags.results, (p) => p.name),
(projectFlagLeft) => {
const projectFlagRight = environmentRightProjectFlags.results?.find(
(projectFlagRight) => projectFlagRight.id === projectFlagLeft.id,
)
const leftSide = environmentLeftFlags.results.find(
(v) => v.feature === projectFlagLeft.id,
)
const rightSide = environmentRightFlags.results.find(
(v) => v.feature === projectFlagLeft.id,
)
const change = {
leftEnabled: leftSide.enabled,
leftEnvironmentFlag: leftSide,
leftValue: leftSide.feature_state_value,
projectFlagLeft,
projectFlagRight,
rightEnabled: rightSide.enabled,
rightEnvironmentFlag: rightSide,
rightValue: rightSide.feature_state_value,
}
change.enabledChanged = change.rightEnabled !== change.leftEnabled
change.valueChanged = change.rightValue !== change.leftValue
if (
change.enabledChanged ||
change.valueChanged ||
projectFlagLeft.num_identity_overrides ||
projectFlagLeft.num_segment_overrides ||
projectFlagRight.num_identity_overrides ||
projectFlagRight.num_segment_overrides
) {
changes.push(change)
} else {
same.push(change)
}
},
)
this.setState({
changes,
environmentLeftFlags: _.keyBy(
environmentLeftFlags.results,
'feature',
),
environmentRightFlags: _.keyBy(
environmentRightFlags.results,
'feature',
),
isLoading: false,
projectFlagsLeft: environmentLeftProjectFlags.results,
projectFlagsRight: environmentLeftProjectFlags.results,
same,
})
},
)
])
.then(
([
environmentLeftProjectFlags,
environmentRightProjectFlags,
environmentLeftFlags,
environmentRightFlags,
]) => {
const changes = []
const same = []
_.each(
_.sortBy(environmentLeftProjectFlags.results, (p) => p.name),
(projectFlagLeft) => {
const projectFlagRight =
environmentRightProjectFlags.results?.find(
(projectFlagRight) =>
projectFlagRight.id === projectFlagLeft.id,
)
const leftSide = environmentLeftFlags.results.find(
(v) => v.feature === projectFlagLeft.id,
)
const rightSide = environmentRightFlags.results.find(
(v) => v.feature === projectFlagLeft.id,
)
const change = {
leftEnabled: leftSide.enabled,
leftEnvironmentFlag: leftSide,
leftValue: leftSide.feature_state_value,
projectFlagLeft,
projectFlagRight,
rightEnabled: rightSide.enabled,
rightEnvironmentFlag: rightSide,
rightValue: rightSide.feature_state_value,
}
change.enabledChanged = change.rightEnabled !== change.leftEnabled
change.valueChanged = change.rightValue !== change.leftValue
if (
change.enabledChanged ||
change.valueChanged ||
projectFlagLeft.num_identity_overrides ||
projectFlagLeft.num_segment_overrides ||
projectFlagRight.num_identity_overrides ||
projectFlagRight.num_segment_overrides
) {
changes.push(change)
} else {
same.push(change)
}
},
)
this.setState({
changes,
environmentLeftFlags: _.keyBy(
environmentLeftFlags.results,
'feature',
),
environmentRightFlags: _.keyBy(
environmentRightFlags.results,
'feature',
),
isLoading: false,
projectFlagsLeft: environmentLeftProjectFlags.results,
projectFlagsRight: environmentLeftProjectFlags.results,
same,
})
},
)
.catch(() => {
this.setState({ isLoading: false })
})
}

onSave = () => this.fetch()
Expand Down
16 changes: 10 additions & 6 deletions frontend/web/components/CompareIdentities.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,14 @@ const CompareIdentities: FC<CompareIdentitiesType> = ({
}) => {
const [leftId, setLeftId] = useState<IdentitySelectType['value']>()
const [rightId, setRightId] = useState<IdentitySelectType['value']>()
const { data: projectFlags, refetch } = useGetProjectFlagsQuery({
environment: ProjectStore.getEnvironmentIdFromKey(_environmentId),
project: projectId,
})
const envId = ProjectStore.getEnvironmentIdFromKey(_environmentId)
const { data: projectFlags, refetch } = useGetProjectFlagsQuery(
{
environment: envId,
project: projectId,
},
{ skip: !envId || !projectId },
)
const [environmentId, setEnvironmentId] = useState(_environmentId)
const [showArchived, setShowArchived] = useState(false)

Expand All @@ -74,11 +78,11 @@ const CompareIdentities: FC<CompareIdentitiesType> = ({

const { data: leftUser } = useGetIdentityFeatureStatesAllQuery(
{ environment: environmentId, user: `${leftId?.value}` },
{ skip: !leftId },
{ skip: !leftId || !environmentId },
)
const { data: rightUser } = useGetIdentityFeatureStatesAllQuery(
{ environment: environmentId, user: `${rightId?.value}` },
{ skip: !rightId },
{ skip: !rightId || !environmentId },
)
const [createCloneIdentityFeatureStates] =
useCreateCloneIdentityFeatureStatesMutation()
Expand Down
15 changes: 10 additions & 5 deletions frontend/web/components/IdentitySelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,16 @@ const IdentitySelect: FC<IdentitySelectType> = ({
const { data, isLoading, loadMore, searchItems } = useInfiniteScroll<
Req['getIdentities'],
Res['identities']
>(useGetIdentitiesQuery, {
environmentId,
isEdge,
page_size: 10,
})
>(
useGetIdentitiesQuery,
{
environmentId,
isEdge,
page_size: 10,
},
500,
{ skip: !environmentId },
)
const identityOptions = useMemo(() => {
return filter(
data?.results,
Expand Down
Loading