Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix(site): distinguish cross-org budgets - #28596

Merged
ssncferreira merged 2 commits into
mainfrom
fix/group-budget-other-org-action
Aug 26, 2026
Merged

fix(site): distinguish cross-org budgets#28596
ssncferreira merged 2 commits into
mainfrom
fix/group-budget-other-org-action

Conversation

@ssncferreira

Copy link
Copy Markdown
Contributor

Description

Group member budget actions were disabled whenever another group governed the member's budget, including groups in the same organization.

Distinguish same-organization and cross-organization effective groups so administrators can manage overrides from any same-org group page. Keep the action disabled when the effective group belongs to another organization.

Changes

  • Add an otherOrganization effective-group classification.
  • Enable budget management for same-org effective groups.
  • Keep budget management disabled for cross-org effective groups.
  • Render same-org lookup failures without the cross-org message.

Note

Generated by Coder Agents on behalf of @ssncferreira.

@ssncferreira ssncferreira changed the title fix(site/src/pages/GroupsPage): distinguish cross-org budgets fix(site): distinguish cross-org budgets Aug 26, 2026
@ssncferreira
ssncferreira force-pushed the fix/group-budget-other-org-action branch from 3e1722c to 68687d9 Compare August 26, 2026 07:46
@ssncferreira
ssncferreira marked this pull request as ready for review August 26, 2026 10:40
@ssncferreira
ssncferreira requested a review from EhabY August 26, 2026 10:40

@EhabY EhabY left a comment

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.

Smol naming comments and a question, but otherwise looks good!

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.

Is this actually ever reached? Do we have a test for other and otherOrganization?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes, it’s reached when another group in the same organization is effective. UI behavior is covered by the NotAttributed and NotAttributedOtherOrganization stories.

Comment thread site/src/pages/GroupsPage/GroupMemberBudgetCells.tsx Outdated
Comment thread site/src/pages/GroupsPage/GroupMemberBudgetCells.tsx Outdated
Comment on lines 290 to +291
onClick={onManageAIBudget}
disabled={budgetFromOtherGroup}
disabled={budgetFromOtherOrganization}

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.

So now we can manage other groups within the same org?

Ah tests do say that

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

We always supported changing a user's budget from another group. In fact, we also support changing it from another org, as long as the user belongs to the target group and the caller can update both the user and that group. However, in the UI we want to keep org-scope concerns visible, and showing this information depending on these conditions would be more complex. However, since most cases will happen in the context of the same org, I think this is a nice addition 🙂

@ssncferreira
ssncferreira merged commit e3e7200 into main Aug 26, 2026
26 checks passed
@ssncferreira
ssncferreira deleted the fix/group-budget-other-org-action branch August 26, 2026 12:09
@github-actions github-actions Bot locked and limited conversation to collaborators Aug 26, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants