bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-12 14:23:32 +00:00
Code Issues Releases Wiki Activity

[SM-590] show email as fallback name in SM header (#4957)

Browse Source 
* show email if name is falsy

* update and use user-name pipe
This commit is contained in:
Will Martin
2023-03-10 09:53:15 -05:00
committed by GitHub
parent e57bc7f781
commit 363fc7e022
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bitwarden_license/bit-web/src/app/secrets-manager/shared/header.component.html
View File

@@ -33,7 +33,7 @@
[bitMenuTriggerFor]="accountMenu" [bitMenuTriggerFor]="accountMenu"
class="tw-border-0 tw-bg-transparent tw-p-0" class="tw-border-0 tw-bg-transparent tw-p-0"
> >
<bit-avatar [id]="account.userId" [text]="account.name || account.email"></bit-avatar> <bit-avatar [id]="account.userId" [text]="account | userName"></bit-avatar>
</button> </button>
<bit-menu #accountMenu> <bit-menu #accountMenu>
@@ -42,14 +42,11 @@
class="tw-flex tw-items-center tw-py-1 tw-px-4 tw-leading-tight tw-text-info" class="tw-flex tw-items-center tw-py-1 tw-px-4 tw-leading-tight tw-text-info"
appStopProp appStopProp
> >
<bit-avatar <bit-avatar [text]="account | userName" [id]="account.userId"></bit-avatar>
[text]="account.name || account.email"
[id]="account.userId"
></bit-avatar>
<div class="tw-ml-2 tw-block tw-overflow-hidden tw-whitespace-nowrap"> <div class="tw-ml-2 tw-block tw-overflow-hidden tw-whitespace-nowrap">
<span>{{ "loggedInAs" | i18n }}</span> <span>{{ "loggedInAs" | i18n }}</span>
<small class="tw-block tw-overflow-hidden tw-whitespace-nowrap tw-text-muted"> <small class="tw-block tw-overflow-hidden tw-whitespace-nowrap tw-text-muted">
{{ account.name }} {{ account | userName }}
</small> </small>
</div> </div>
</div> </div>

6
libs/angular/src/pipes/user-name.pipe.ts
View File

@@ -2,7 +2,7 @@ import { Pipe, PipeTransform } from "@angular/core";
interface User { interface User {
name?: string; name?: string;
email: string; email?: string;
} }
@Pipe({ @Pipe({
@@ -14,6 +14,10 @@ export class UserNamePipe implements PipeTransform {
return null; return null;
} }
if (user.name == null && user.email == null) {
return null;
}
return user.name == null || user.name.trim() === "" ? user.email : user.name; return user.name == null || user.name.trim() === "" ? user.email : user.name;
} }
} }