Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,13 @@ <h2 bitTypography="h1">{{ "loading" | i18n }}</h2>
<ng-template bitRowDef let-row>
<td bitCell>
<div class="tw-flex tw-items-center">
<bit-avatar size="small" [text]="row.name" class="tw-mr-3"></bit-avatar>
<bit-avatar
size="small"
[text]="row.name || row.email"
[id]="row.userId"
[color]="row.avatarColor"
class="tw-mr-3"
></bit-avatar>
<div class="tw-flex tw-flex-col">
<button type="button" bitLink (click)="edit(row)">
{{ row.name }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ export class MemberAccessResponse extends BaseResponse {
twoFactorEnabled: boolean;
accountRecoveryEnabled: boolean;
userGuid: Guid;
userId?: string;
avatarColor?: string;
usesKeyConnector: boolean;

cipherIds: Guid[] = [];
Expand All @@ -27,6 +29,8 @@ export class MemberAccessResponse extends BaseResponse {
this.twoFactorEnabled = this.getResponseProperty("TwoFactorEnabled");
this.accountRecoveryEnabled = this.getResponseProperty("AccountRecoveryEnabled");
this.userGuid = this.getResponseProperty("UserGuid");
this.userId = this.getResponseProperty("UserId");
this.avatarColor = this.getResponseProperty("AvatarColor");
this.usesKeyConnector = this.getResponseProperty("UsesKeyConnector");

this.cipherIds = this.getResponseProperty("CipherIds") || [];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ export class MemberAccessReportService {
);
const aggregatedData = {
userGuid: userGuid,
userId: userDataArray[0].userId ?? undefined,
avatarColor: userDataArray[0].avatarColor ?? undefined,
name: userDataArray[0].userName,
email: userDataArray[0].email,
collectionsCount: collectionCount,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,7 @@ export type MemberAccessReportView = {
groupsCount: number;
itemsCount: number;
userGuid: Guid;
userId?: string;
avatarColor?: string;
usesKeyConnector: boolean;
};
Loading