@@ -314,16 +314,12 @@ customRoleLoop:
314314
315315func applyOrgResourceActions (role * codersdk.Role ,orgID uuid.UUID ,resource string ,actions []string ) {
316316if role .OrganizationPermissions == nil {
317- role .OrganizationPermissions = map [string ][]codersdk.Permission {}
318- }
319-
320- if _ ,ok := role .OrganizationPermissions [orgID .String ()];! ok {
321- role .OrganizationPermissions [orgID .String ()]= []codersdk.Permission {}
317+ role .OrganizationPermissions = make ([]codersdk.Permission ,0 )
322318}
323319
324320// Construct new site perms with only new perms for the resource
325321keep := make ([]codersdk.Permission ,0 )
326- for _ ,perm := range role .OrganizationPermissions [ orgID . String ()] {
322+ for _ ,perm := range role .OrganizationPermissions {
327323perm := perm
328324if string (perm .ResourceType )!= resource {
329325keep = append (keep ,perm )
@@ -339,16 +335,16 @@ func applyOrgResourceActions(role *codersdk.Role, orgID uuid.UUID, resource stri
339335})
340336}
341337
342- role .OrganizationPermissions [ orgID . String ()] = keep
338+ role .OrganizationPermissions = keep
343339}
344340
345341func defaultActions (role * codersdk.Role ,orgID uuid.UUID ,resource string ) []string {
346342if role .OrganizationPermissions == nil {
347- role .OrganizationPermissions = map [ string ] []codersdk.Permission {}
343+ role .OrganizationPermissions = []codersdk.Permission {}
348344}
349345
350346defaults := make ([]string ,0 )
351- for _ ,perm := range role .OrganizationPermissions [ orgID . String ()] {
347+ for _ ,perm := range role .OrganizationPermissions {
352348if string (perm .ResourceType )== resource {
353349defaults = append (defaults ,string (perm .Action ))
354350}
@@ -366,11 +362,11 @@ func permissionPreviews(role *codersdk.Role, orgID uuid.UUID, resources []coders
366362
367363func permissionPreview (role * codersdk.Role ,orgID uuid.UUID ,resource codersdk.RBACResource )string {
368364if role .OrganizationPermissions == nil {
369- role .OrganizationPermissions = map [ string ] []codersdk.Permission {}
365+ role .OrganizationPermissions = []codersdk.Permission {}
370366}
371367
372368count := 0
373- for _ ,perm := range role .OrganizationPermissions [ orgID . String ()] {
369+ for _ ,perm := range role .OrganizationPermissions {
374370if perm .ResourceType == resource {
375371count ++
376372}
@@ -382,28 +378,17 @@ func roleToTableView(role codersdk.Role) roleTableRow {
382378return roleTableRow {
383379Name :role .Name ,
384380DisplayName :role .DisplayName ,
381+ OrganizationID :role .OrganizationID ,
385382SitePermissions :fmt .Sprintf ("%d permissions" ,len (role .SitePermissions )),
386- OrganizationPermissions :orgPermissionString ( role .OrganizationPermissions ),
383+ OrganizationPermissions :fmt . Sprintf ( "%d permissions" , len ( role .OrganizationPermissions ) ),
387384UserPermissions :fmt .Sprintf ("%d permissions" ,len (role .UserPermissions )),
388385}
389386}
390387
391- func orgPermissionString (perms map [string ][]codersdk.Permission )string {
392- totalOrg := 0
393- for _ ,o := range perms {
394- totalOrg += len (o )
395- }
396- plural := ""
397- if len (perms )> 1 {
398- plural = "s"
399- }
400- return fmt .Sprintf ("%d over %d organization%s" ,
401- totalOrg ,len (perms ),plural )
402- }
403-
404388type roleTableRow struct {
405389Name string `table:"name,default_sort"`
406390DisplayName string `table:"display_name"`
391+ OrganizationID string `table:"organization_id"`
407392SitePermissions string ` table:"site_permissions"`
408393// map[<org_id>] -> Permissions
409394OrganizationPermissions string `table:"org_permissions"`