bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-17 16:53:34 +00:00
Code Issues Releases Wiki Activity

[PM-9926] Linked Fields order (#10174)

Browse Source 
* refactor linkedFieldOption to take in an attributes object

* add sort positions for existing linked fields

* sort linked fields on new custom fields
This commit is contained in:
Nick Krantz
2024-07-23 12:26:02 -05:00
committed by GitHub
parent 88f585e09d
commit decc7a3031
5 changed files with 58 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/common/src/vault/models/view/card.view.ts
View File

@@ -6,13 +6,13 @@ import { linkedFieldOption } from "../../linked-field-option.decorator";
import { ItemView } from "./item.view";
export class CardView extends ItemView {
@linkedFieldOption(LinkedId.CardholderName)
@linkedFieldOption(LinkedId.CardholderName, { sortPosition: 0 })
cardholderName: string = null;
@linkedFieldOption(LinkedId.ExpMonth, "expirationMonth")
@linkedFieldOption(LinkedId.ExpMonth, { sortPosition: 3, i18nKey: "expirationMonth" })
expMonth: string = null;
@linkedFieldOption(LinkedId.ExpYear, "expirationYear")
@linkedFieldOption(LinkedId.ExpYear, { sortPosition: 4, i18nKey: "expirationYear" })
expYear: string = null;
@linkedFieldOption(LinkedId.Code, "securityCode")
@linkedFieldOption(LinkedId.Code, { sortPosition: 5, i18nKey: "securityCode" })
code: string = null;
private _brand: string = null;
@@ -27,7 +27,7 @@ export class CardView extends ItemView {
return this.number != null ? "•".repeat(this.number.length) : null;
}
@linkedFieldOption(LinkedId.Brand)
@linkedFieldOption(LinkedId.Brand, { sortPosition: 2 })
get brand(): string {
return this._brand;
}
@@ -36,7 +36,7 @@ export class CardView extends ItemView {
this._subTitle = null;
}
@linkedFieldOption(LinkedId.Number)
@linkedFieldOption(LinkedId.Number, { sortPosition: 1 })
get number(): string {
return this._number;
}

38
libs/common/src/vault/models/view/identity.view.ts
View File

@@ -7,37 +7,37 @@ import { linkedFieldOption } from "../../linked-field-option.decorator";
import { ItemView } from "./item.view";
export class IdentityView extends ItemView {
@linkedFieldOption(LinkedId.Title)
@linkedFieldOption(LinkedId.Title, { sortPosition: 0 })
title: string = null;
@linkedFieldOption(LinkedId.MiddleName)
@linkedFieldOption(LinkedId.MiddleName, { sortPosition: 2 })
middleName: string = null;
@linkedFieldOption(LinkedId.Address1)
@linkedFieldOption(LinkedId.Address1, { sortPosition: 12 })
address1: string = null;
@linkedFieldOption(LinkedId.Address2)
@linkedFieldOption(LinkedId.Address2, { sortPosition: 13 })
address2: string = null;
@linkedFieldOption(LinkedId.Address3)
@linkedFieldOption(LinkedId.Address3, { sortPosition: 14 })
address3: string = null;
@linkedFieldOption(LinkedId.City, "cityTown")
@linkedFieldOption(LinkedId.City, { sortPosition: 15, i18nKey: "cityTown" })
city: string = null;
@linkedFieldOption(LinkedId.State, "stateProvince")
@linkedFieldOption(LinkedId.State, { sortPosition: 16, i18nKey: "stateProvince" })
state: string = null;
@linkedFieldOption(LinkedId.PostalCode, "zipPostalCode")
@linkedFieldOption(LinkedId.PostalCode, { sortPosition: 17, i18nKey: "zipPostalCode" })
postalCode: string = null;
@linkedFieldOption(LinkedId.Country)
@linkedFieldOption(LinkedId.Country, { sortPosition: 18 })
country: string = null;
@linkedFieldOption(LinkedId.Company)
@linkedFieldOption(LinkedId.Company, { sortPosition: 6 })
company: string = null;
@linkedFieldOption(LinkedId.Email)
@linkedFieldOption(LinkedId.Email, { sortPosition: 10 })
email: string = null;
@linkedFieldOption(LinkedId.Phone)
@linkedFieldOption(LinkedId.Phone, { sortPosition: 11 })
phone: string = null;
@linkedFieldOption(LinkedId.Ssn)
@linkedFieldOption(LinkedId.Ssn, { sortPosition: 7 })
ssn: string = null;
@linkedFieldOption(LinkedId.Username)
@linkedFieldOption(LinkedId.Username, { sortPosition: 5 })
username: string = null;
@linkedFieldOption(LinkedId.PassportNumber)
@linkedFieldOption(LinkedId.PassportNumber, { sortPosition: 8 })
passportNumber: string = null;
@linkedFieldOption(LinkedId.LicenseNumber)
@linkedFieldOption(LinkedId.LicenseNumber, { sortPosition: 9 })
licenseNumber: string = null;
private _firstName: string = null;
@@ -48,7 +48,7 @@ export class IdentityView extends ItemView {
super();
}
@linkedFieldOption(LinkedId.FirstName)
@linkedFieldOption(LinkedId.FirstName, { sortPosition: 1 })
get firstName(): string {
return this._firstName;
}
@@ -57,7 +57,7 @@ export class IdentityView extends ItemView {
this._subTitle = null;
}
@linkedFieldOption(LinkedId.LastName)
@linkedFieldOption(LinkedId.LastName, { sortPosition: 4 })
get lastName(): string {
return this._lastName;
}
@@ -83,7 +83,7 @@ export class IdentityView extends ItemView {
return this._subTitle;
}
@linkedFieldOption(LinkedId.FullName)
@linkedFieldOption(LinkedId.FullName, { sortPosition: 3 })
get fullName(): string {
if (
this.title != null ||

4
libs/common/src/vault/models/view/login.view.ts
View File

@@ -10,9 +10,9 @@ import { ItemView } from "./item.view";
import { LoginUriView } from "./login-uri.view";
export class LoginView extends ItemView {
@linkedFieldOption(LinkedId.Username)
@linkedFieldOption(LinkedId.Username, { sortPosition: 0 })
username: string = null;
@linkedFieldOption(LinkedId.Password)
@linkedFieldOption(LinkedId.Password, { sortPosition: 1 })
password: string = null;
passwordRevisionDate?: Date = null;