Skip to content

fix: fix loading states and permissions checks in organization settings #16465

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
merged 25 commits into from
Feb 19, 2025
Merged

fix: fix loading states and permissions checks in organization settings #16465

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
f3828b4
oh man what I have gotten myself into
aslilac Feb 5, 2025
cd61327
fix even more-er permissions
aslilac Feb 5, 2025
baccd65
Merge branch 'main' into lilac/fix-a-bunch-of-orgs-stuff
aslilac Feb 7, 2025
0a59089
oh yeah
aslilac Feb 7, 2025
379bacd
oh yeah
aslilac Feb 7, 2025
45b2ba6
🔥
aslilac Feb 7, 2025
b841aac
yes
aslilac Feb 8, 2025
d7990cf
🧹
aslilac Feb 8, 2025
acf5cc7
:)
aslilac Feb 8, 2025
6db6aa4
Merge branch 'main' into lilac/fix-a-bunch-of-orgs-stuff
aslilac Feb 11, 2025
c8db4f7
yay polish time
aslilac Feb 11, 2025
1bb6137
💀
aslilac Feb 11, 2025
44b84d1
Merge branch 'main' into lilac/fix-a-bunch-of-orgs-stuff
aslilac Feb 18, 2025
5cd198b
🧹
aslilac Feb 18, 2025
0cb6c4e
of course
aslilac Feb 18, 2025
b4227b2
fix some stories
aslilac Feb 18, 2025
5f6b248
a few more permissions fixes
aslilac Feb 18, 2025
81fbdf4
mmmmm bep
aslilac Feb 18, 2025
41ff221
:|
aslilac Feb 18, 2025
58a0876
testin'
aslilac Feb 18, 2025
71b3170
ok lets do this separately
aslilac Feb 18, 2025
37d87d3
add missing query to terminal page story
aslilac Feb 19, 2025
660cbda
🧹
aslilac Feb 19, 2025
b6024b5
Merge branch 'main' into lilac/fix-a-bunch-of-orgs-stuff
aslilac Feb 19, 2025
f0f3859
story fixes
aslilac Feb 19, 2025
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
Prev Previous commit
Next Next commit
mmmmm bep
  • Loading branch information
@aslilac
aslilac committed Feb 18, 2025
commit 81fbdf4116ff9aa219efeea1543f0fabf665b677
15 changes: 8 additions & 7 deletions site/src/modules/management/OrganizationSidebarView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,13 +191,14 @@ const OrganizationSettingsNavigation: FC<
Roles
</SettingsSidebarNavItem>
)}
{orgPermissions.viewProvisionerJobs && (
<SettingsSidebarNavItem
href={urlForSubpage(organization.name, "provisioners")}
>
Provisioners
</SettingsSidebarNavItem>
)}
{orgPermissions.viewProvisioners &&
orgPermissions.viewProvisionerJobs && (
<SettingsSidebarNavItem
href={urlForSubpage(organization.name, "provisioners")}
>
Provisioners
</SettingsSidebarNavItem>
)}
{orgPermissions.viewIdpSyncSettings && (
<SettingsSidebarNavItem
href={urlForSubpage(organization.name, "idp-sync")}
Expand Down