Skip to content

fix(settings): align credential groups with organization rollout #8043

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
waleedlatif1 merged 1 commit into from
Sep 20, 2026
Merged

fix(settings): align credential groups with organization rollout #8043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions .../[workspaceId]/w/components/sidebar/components/settings-sidebar/settings-sidebar.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,7 @@ describe('workspace SettingsSidebar organization rollout', () => {
expect(links).toHaveLength(1)
expect(links[0]).toHaveAttribute('href', '/o/host-org/settings/members')
expect(links[0]).toHaveTextContent('Organization')
if (role === 'admin')
expect(workspaceLink('connected-accounts')).toHaveTextContent('Credential Groups')
else expect(workspaceLink('connected-accounts')).toBeNull()
for (const section of ['organization', 'billing', 'usage', 'sso']) {
for (const section of ['organization', 'billing', 'usage', 'sso', 'connected-accounts']) {
expect(workspaceLink(section)).toBeNull()
}
expectWorkspaceLinks()
Expand Down
14 changes: 7 additions & 7 deletions ...space/[workspaceId]/w/components/sidebar/components/settings-sidebar/settings-sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,20 +152,20 @@ export function SettingsSidebar({

const navigationItems = useMemo(() => {
return allNavigationItems.filter((item) => {
if (item.id === 'connected-accounts') {
return Boolean(
hostContext.hostOrganizationId &&
isOrgAdminOrOwner &&
hostContext.features?.credentialGroups
)
}
if (
hostContext.hostOrganizationId &&
ORGANIZATION_PLANE_UNIFIED_SECTIONS.has(item.id) &&
(organizationSettingsId || !hostContext.viewer.isHostOrganizationMember)
) {
return false
}
if (item.id === 'connected-accounts') {
return Boolean(
hostContext.hostOrganizationId &&
isOrgAdminOrOwner &&
hostContext.features?.credentialGroups
)
}
if (item.id === 'organization') {
return Boolean(
hostContext.hostOrganizationId && hostContext.viewer.isHostOrganizationMember
Expand Down
Loading