Filter out branches that are applied in the *current* workspace - #14552
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the Lite workspace “Apply branch” picker to exclude branches that are already applied in the current workspace (GB-1713), rather than filtering out all applied branches globally.
Changes:
- Adds a head-info query and derives a
HeadInfoIndexfor workspace-aware branch filtering. - Switches branch listing to fetch unfiltered results and filters client-side using the current workspace’s applied-branch context.
- Adjusts the picker’s item derivation to use the query
selectoutput directly.
Comment on lines
+90
to
+101
| const { data: headInfoIndex } = useQuery({ | ||
| ...headInfoQueryOptions(projectId), | ||
| select: getHeadInfoIndex, | ||
| }); | ||
| const branchesQuery = useQuery({ | ||
| ...listBranchesQueryOptions({ projectId, filter: null }), | ||
| select: (branches) => | ||
| branches | ||
| .flatMap(branchListingToApplyBranchPickerOptions) | ||
| // Filter out branches that are applied in the *current* workspace. | ||
| .filter((option) => !headInfoIndex?.branchContextByRefBytes(encodeBytes(option.branchRef))), | ||
| }); |
This branch was previously deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes GB-1713