Org Managers: Disable org role checkboxes in roles stepper if not adm…

…in/org manager

- fixes #4332

src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.ts

@@ -46,6 +46,7 @@ export class CfRoleCheckboxComponent implements OnInit, OnDestroy {
 
 
   @Input() cfGuid: string;
+  @Input() orgGuid: string;
   @Input() spaceGuid: string;
   @Input() orgName: string;
   @Input() spaceName: string;
@@ -60,7 +61,6 @@ export class CfRoleCheckboxComponent implements OnInit, OnDestroy {
   sub: Subscription;
   isOrgRole = false;
   disabled = false;
-  orgGuid: string;
 
   private static hasExistingRole(role: string, roles: CfUserRolesSelected, userGuid: string, orgGuid: string, spaceGuid: string): boolean {
     if (roles && roles[userGuid] && roles[userGuid][orgGuid]) {
@@ -266,7 +266,6 @@ export class CfRoleCheckboxComponent implements OnInit, OnDestroy {
       combineLatestOp(this.cfRolesService.newRoles$, users$, canEditRole$, selectUsersIsSetByUsername$),
       filter(([existingRoles, newRoles, users, canEditRole, isSetByUsername]) => !!users.length && !!newRoles.orgGuid)
     ).subscribe(([existingRoles, newRoles, users, canEditRole, isSetByUsername]) => {
-      this.orgGuid = newRoles.orgGuid;
       const { checked, tooltip } = CfRoleCheckboxComponent.getCheckedState(
         this.role, users, existingRoles, newRoles, this.orgGuid, this.spaceGuid);
       this.checked = checked;

src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component.html

@@ -1,4 +1,5 @@
 <app-cf-role-checkbox [cfGuid]="row.entity.cfGuid"
+  [orgGuid]="config.isSpace ? row?.entity.organization?.metadata.guid : row?.metadata.guid"
   [orgName]="config.isSpace ? row?.entity.organization?.entity.name : row?.entity.name"
   [spaceName]="config.isSpace ? row?.entity.name : null" [spaceGuid]="config.isSpace ? row.metadata.guid : ''"
   [role]="config.role"></app-cf-role-checkbox>