Skip to content
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

Users tables: Only show org/space name in pills when needed #2443

Merged
merged 2 commits into from
Jun 20, 2018
Merged

Users tables: Only show org/space name in pills when needed #2443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8dedb1e
Only show org/space name in users pills when needed
richard-cox Jun 20, 2018
76f2cf2
Merge remote-tracking branch 'origin/v2-master' into only-show-org-sp…
richard-cox Jun 20, 2018
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
11 changes: 7 additions & 4 deletions ...nents/list/list-types/cf-users/cf-org-permission-cell/cf-org-permission-cell.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,23 +42,26 @@ export class CfOrgPermissionCellComponent extends CfPermissionCell<OrgUserRoleNa
);
}

private setChipConfig(row: APIResource<CfUser>, org: APIResource<IOrganization>): AppChip<ICellPermissionList<OrgUserRoleNames>>[] {
private setChipConfig(row: APIResource<CfUser>, org?: APIResource<IOrganization>): AppChip<ICellPermissionList<OrgUserRoleNames>>[] {
const userRoles = this.cfUserService.getOrgRolesFromUser(row.entity, org);
const userOrgPermInfo = arrayHelper.flatten<ICellPermissionList<OrgUserRoleNames>>(
userRoles.map(orgPerms => this.getOrgPermissions(orgPerms, row))
userRoles.map(orgPerms => this.getOrgPermissions(orgPerms, row, !org))
);
return this.getChipConfig(userOrgPermInfo);
}

private getOrgPermissions(orgPerms: IUserPermissionInOrg, row: APIResource<CfUser>): ICellPermissionList<OrgUserRoleNames>[] {
private getOrgPermissions(
orgPerms: IUserPermissionInOrg,
row: APIResource<CfUser>,
showName: boolean): ICellPermissionList<OrgUserRoleNames>[] {
return getOrgRoles(orgPerms.permissions).map(perm => {
const updatingKey = RemoveUserRole.generateUpdatingKey(
perm.key,
row.metadata.guid
);
return {
...perm,
name: orgPerms.name,
name: showName ? orgPerms.name : null,
guid: orgPerms.orgGuid,
userName: row.entity.username,
userGuid: row.metadata.guid,
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/app/shared/components/list/list-types/cf-users/cf-permission-cell.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export abstract class CfPermissionCell<T> extends TableCellCustom<APIResource<Cf
return cellPermissionList.map(perm => {
const chipConfig = new AppChip<ICellPermissionList<T>>();
chipConfig.key = perm;
chipConfig.value = `${perm.name}: ${perm.string}`;
chipConfig.value = perm.name ? `${perm.name}: ${perm.string}` : perm.string;
chipConfig.busy = perm.busy;
chipConfig.clearAction = chip => {
const permission = chip.key;
Expand Down
8 changes: 4 additions & 4 deletions ...s/list/list-types/cf-users/cf-space-permission-cell/cf-space-permission-cell.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,22 +77,22 @@ export class CfSpacePermissionCellComponent extends CfPermissionCell<SpaceUserRo
);
}

private createPermissions(row: APIResource<CfUser>, spaces: APIResource<ISpace>[]): ICellPermissionList<SpaceUserRoleNames>[] {
private createPermissions(row: APIResource<CfUser>, spaces?: APIResource<ISpace>[]): ICellPermissionList<SpaceUserRoleNames>[] {
const userRoles = this.cfUserService.getSpaceRolesFromUser(row.entity, spaces);
return arrayHelper.flatten<ICellPermissionList<SpaceUserRoleNames>>(
userRoles.map(spacePerms => this.getSpacePermissions(spacePerms, row))
userRoles.map(spacePerms => this.getSpacePermissions(spacePerms, row, spaces))
);
}

private getSpacePermissions(spacePerms: IUserPermissionInSpace, row: APIResource<CfUser>) {
private getSpacePermissions(spacePerms: IUserPermissionInSpace, row: APIResource<CfUser>, spaces?: APIResource<ISpace>[]) {
return getSpaceRoles(spacePerms.permissions).map(perm => {
const updatingKey = RemoveUserRole.generateUpdatingKey(
perm.key,
row.metadata.guid
);
return {
...perm,
name: spacePerms.name,
name: !spaces || spaces.length > 1 ? spacePerms.name : '',
guid: spacePerms.spaceGuid,
userName: row.entity.username,
userGuid: row.metadata.guid,
Expand Down