Commitba22bc9

committed

fixup! Merge remote-tracking branch 'github/main' into asher/show-editable-orgs

1 parent9aca231 commitba22bc9Copy full SHA for ba22bc9

File tree

+12

-5

lines changed

site/src
- api/queries
  - organizations.ts
- pages/ManagementSettingsPage
  - SidebarView.tsx

+12

-5

lines changed

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -185,9 +185,9 @@ export const organizationsPermissions = (`
`185`	`185`	`queryKey:["organizations",organizationIds.sort(),"permissions"],`
`186`	`186`	`queryFn:async()=>{`
`187`	`187`	`// Only request what we need for the sidebar, which is one edit permission`
`188`		`-// per sub-link (audit page, settings page, groups page, and memberspage)`
`189`		`-//thattells us whether to show that page, since we only show them if you`
`190`		`-//canedit (and not, at the moment if you can only view).`
	`188`	`+// per sub-link (audit, settings, groups, roles, and memberspages) that`
	`189`	`+// tells us whether to show that page, since we only show them if you can`
	`190`	`+// edit (and not, at the moment if you can only view).`
`191`	`191`	`constchecks=(organizationId:string)=>({`
`192`	`192`	`editMembers:{`
`193`	`193`	`object:{`
`@@ -217,6 +217,13 @@ export const organizationsPermissions = (`
`217`	`217`	`},`
`218`	`218`	`action:"read",`
`219`	`219`	`},`
	`220`	`+assignOrgRole:{`
	`221`	`+object:{`
	`222`	`+resource_type:"assign_org_role",`
	`223`	`+organization_id:organizationId,`
	`224`	`+},`
	`225`	`+action:"create",`
	`226`	`+},`
`220`	`227`	`});`
`221`	`228`
`222`	`229`	`// The endpoint takes a flat array, so to avoid collisions prepend each`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -256,10 +256,10 @@ const OrganizationSettingsNavigation: FC<`
`256`	`256`	`Groups`
`257`	`257`	`</SidebarNavSubItem>`
`258`	`258`	`)}`
`259`		`-{props.permissions.assignOrgRole&&`
	`259`	`+{organization.permissions.assignOrgRole&&`
`260`	`260`	`experiments.includes("custom-roles")&&(`
`261`	`261`	`<SidebarNavSubItem`
`262`		`-href={urlForSubpage(props.organization.name,"roles")}`
	`262`	`+href={urlForSubpage(organization.name,"roles")}`
`263`	`263`	`>`
`264`	`264`	`Roles`
`265`	`265`	`</SidebarNavSubItem>`

Comments

(0)