mirror of
https://github.com/bitwarden/browser.git
synced 2024-12-22 16:29:09 +01:00
Added dashed line as separator and label for common formats on format selector for import (#7432)
This commit is contained in:
parent
1b1336d92c
commit
99022e2baa
@ -2888,5 +2888,9 @@
|
||||
"example": "google.com"
|
||||
}
|
||||
}
|
||||
},
|
||||
"commonImportFormats": {
|
||||
"message": "Common formats",
|
||||
"description": "Label indicating the most common import formats"
|
||||
}
|
||||
}
|
||||
|
@ -2616,5 +2616,9 @@
|
||||
},
|
||||
"lastPassYubikeyDesc": {
|
||||
"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"
|
||||
}
|
||||
}
|
||||
|
@ -7455,5 +7455,9 @@
|
||||
},
|
||||
"serviceAccountAccessUpdated": {
|
||||
"message": "Service account access updated"
|
||||
},
|
||||
"commonImportFormats": {
|
||||
"message": "Common formats",
|
||||
"description": "Label indicating the most common import formats"
|
||||
}
|
||||
}
|
||||
|
@ -61,9 +61,16 @@
|
||||
<bit-form-field class="tw-w-1/2">
|
||||
<bit-label>{{ "fileFormat" | i18n }}</bit-label>
|
||||
<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" />
|
||||
<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" />
|
||||
</ng-container>
|
||||
</bit-select>
|
||||
|
@ -422,13 +422,8 @@ export class ImportComponent implements OnInit, OnDestroy {
|
||||
}
|
||||
|
||||
protected setImportOptions() {
|
||||
this.featuredImportOptions = [
|
||||
{
|
||||
id: null,
|
||||
name: "-- " + this.i18nService.t("select") + " --",
|
||||
},
|
||||
...this.importService.featuredImportOptions,
|
||||
];
|
||||
this.featuredImportOptions = [...this.importService.featuredImportOptions];
|
||||
|
||||
this.importOptions = [...this.importService.regularImportOptions].sort((a, b) => {
|
||||
if (a.name == null && b.name != null) {
|
||||
return -1;
|
||||
|
Loading…
Reference in New Issue
Block a user