Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-28 12:45:45 +01:00
Code Issues Projects Releases Wiki Activity

Added dashed line as separator and label for common formats on format selector for import (#7432)

Browse Source
This commit is contained in:
aj-rosado 2024-01-11 16:24:40 +00:00 committed by GitHub
parent 1b1336d92c
commit 99022e2baa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/browser/src/_locales/en/messages.json
View File

@ -2888,5 +2888,9 @@
"example": "google.com" "example": "google.com"
} }
} }
},
"commonImportFormats": {
"message": "Common formats",
"description": "Label indicating the most common import formats"
} }
} }

4
apps/desktop/src/locales/en/messages.json
View File

@ -2616,5 +2616,9 @@
}, },
"lastPassYubikeyDesc": { "lastPassYubikeyDesc": {
"message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button."
},
"commonImportFormats": {
"message": "Common formats",
"description": "Label indicating the most common import formats"
} }
} }

4
apps/web/src/locales/en/messages.json
View File

@ -7455,5 +7455,9 @@
}, },
"serviceAccountAccessUpdated": { "serviceAccountAccessUpdated": {
"message": "Service account access updated" "message": "Service account access updated"
},
"commonImportFormats": {
"message": "Common formats",
"description": "Label indicating the most common import formats"
} }
} }

9
libs/importer/src/components/import.component.html
View File

@ -61,9 +61,16 @@
<bit-form-field class="tw-w-1/2"> <bit-form-field class="tw-w-1/2">
<bit-label>{{ "fileFormat" | i18n }}</bit-label> <bit-label>{{ "fileFormat" | i18n }}</bit-label>
<bit-select formControlName="format"> <bit-select formControlName="format">
<bit-option value="" label="-- {{ 'select' | i18n }} --" />
<bit-option
class="tw-font-bold tw-text-muted tw-text-xs"
value="-"
label="{{ 'commonImportFormats' | i18n }}"
disabled
/>
<bit-option *ngFor="let o of featuredImportOptions" [value]="o.id" [label]="o.name" /> <bit-option *ngFor="let o of featuredImportOptions" [value]="o.id" [label]="o.name" />
<ng-container *ngIf="importOptions && importOptions.length"> <ng-container *ngIf="importOptions && importOptions.length">
<bit-option value="-" disabled /> <bit-option value="-" label="--------------------------------------" disabled />
<bit-option *ngFor="let o of importOptions" [value]="o.id" [label]="o.name" /> <bit-option *ngFor="let o of importOptions" [value]="o.id" [label]="o.name" />
</ng-container> </ng-container>
</bit-select> </bit-select>

9
libs/importer/src/components/import.component.ts
View File

@ -422,13 +422,8 @@ export class ImportComponent implements OnInit, OnDestroy {
} }
protected setImportOptions() { protected setImportOptions() {
this.featuredImportOptions = [ this.featuredImportOptions = [...this.importService.featuredImportOptions];
{
id: null,
name: "-- " + this.i18nService.t("select") + " --",
},
...this.importService.featuredImportOptions,
];
this.importOptions = [...this.importService.regularImportOptions].sort((a, b) => { this.importOptions = [...this.importService.regularImportOptions].sort((a, b) => {
if (a.name == null && b.name != null) { if (a.name == null && b.name != null) {
return -1; return -1;