Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-09-23 03:22:50 +02:00
Code Issues Projects Releases Wiki Activity

[PM-8386] - Add section header to import page (#10153)

Browse Source 
* first pass section header in import data component

* change layout

* fix desktop bg

* revert chnage to default config

* update translation key

* revert change to background color
This commit is contained in:
Jordan Aasen 2024-07-24 07:27:28 -07:00 committed by GitHub
parent 4c26ab5a9e
commit fc55082148
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 431 additions and 391 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3136,8 +3136,8 @@
"invalidFilePassword": {
"message": "Invalid file password, please use the password you entered when you created the export file."
},
"importDestination": {
"message": "Import destination"
"destination": {
"message": "Destination"
},
"learnAboutImportOptions": {
"message": "Learn about your import options"
@ -3693,6 +3693,9 @@
"loading": {
"message": "Loading"
},
"data": {
"message": "Data"
},
"assign": {
"message": "Assign"
},

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

@ -2817,8 +2817,8 @@
"invalidFilePassword": {
"message": "Invalid file password, please use the password you entered when you created the export file."
},
"importDestination": {
"message": "Import destination"
"destination": {
"message": "Destination"
},
"learnAboutImportOptions": {
"message": "Learn about your import options"
@ -3013,5 +3013,8 @@
"example": "Work"
}
}
},
"data": {
"message": "Data"
}
}

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

@ -1506,8 +1506,8 @@
"importEncKeyError": {
"message": "Error decrypting the exported file. Your encryption key does not match the encryption key used export the data."
},
"importDestination": {
"message": "Import destination"
"destination": {
"message": "Destination"
},
"learnAboutImportOptions": {
"message": "Learn about your import options"
@ -8622,6 +8622,9 @@
}
}
},
"data": {
"message": "Data"
},
"purchasedSeatsRemoved": {
"message": "purchased seats removed"
}

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

@ -2,18 +2,13 @@
{{ "personalOwnershipPolicyInEffectImports" | i18n }}
</bit-callout>
<form [formGroup]="formGroup" [bitSubmit]="submit" id="import_form_importForm">
<bit-section>
<bit-section-header>
<h2 class="tw-font-bold" bitTypography="h6">{{ "destination" | i18n }}</h2>
</bit-section-header>
<bit-card>
<bit-form-field [hidden]="isFromAC">
<bit-label
>{{ "importDestination" | i18n }}
<a
target="_blank"
rel="noreferrer"
appA11yTitle="{{ 'learnAboutImportOptions' | i18n }}"
href="https://bitwarden.com/help/import-data/"
>
<i class="bwi bwi-question-circle" aria-hidden="true"></i>
</a>
</bit-label>
<bit-label>{{ "vault" | i18n }}</bit-label>
<bit-select formControlName="vaultSelector">
<bit-option
*ngIf="!importBlockedByPolicy"
@ -29,8 +24,7 @@
/>
</bit-select>
</bit-form-field>
<bit-form-field>
<bit-form-field disableMargin>
<bit-label>{{ organizationId ? ("collection" | i18n) : ("folder" | i18n) }}</bit-label>
<bit-select formControlName="targetSelector">
<ng-container *ngIf="!organizationId">
@ -54,10 +48,18 @@
</bit-select>
<bit-hint>{{
"importTargetHint"
| i18n: (organizationId ? ("collection" | i18n | lowercase) : ("folder" | i18n | lowercase))
| i18n
: (organizationId ? ("collection" | i18n | lowercase) : ("folder" | i18n | lowercase))
}}</bit-hint>
</bit-form-field>
</bit-card>
</bit-section>
<bit-section>
<bit-section-header>
<h2 class="tw-font-bold" bitTypography="h6">{{ "data" | i18n }}</h2>
</bit-section-header>
<bit-card>
<bit-form-field class="tw-w-1/2">
<bit-label>{{ "fileFormat" | i18n }}</bit-label>
<bit-select formControlName="format">
@ -85,12 +87,20 @@
<ng-container *ngIf="format === 'lastpasscsv'">
<p bitTypography="body1">
{{ "seeDetailedInstructions" | i18n }}
<a target="_blank" rel="noreferrer" href="https://bitwarden.com/help/import-from-lastpass/">
<a
target="_blank"
rel="noreferrer"
href="https://bitwarden.com/help/import-from-lastpass/"
>
https://bitwarden.com/help/import-from-lastpass/</a
>
</p>
<bit-radio-group *ngIf="showLastPassToggle" formControlName="lastPassType">
<bit-radio-button class="tw-block" id="import_bit-radio-button_lp-direct" value="direct">
<bit-radio-button
class="tw-block"
id="import_bit-radio-button_lp-direct"
value="direct"
>
<bit-label>{{ "importDirectlyFromLastPass" | i18n }}</bit-label>
</bit-radio-button>
<bit-radio-button class="tw-block" id="import_bit-radio-button_lp-csv" value="csv">
@ -99,20 +109,20 @@
</bit-radio-group>
</ng-container>
<ng-container *ngIf="format === 'keepassxcsv'">
Using the KeePassX desktop application, navigate to "Database" &rarr; "Export to CSV file" and
save the CSV file.
Using the KeePassX desktop application, navigate to "Database" &rarr; "Export to CSV file"
and save the CSV file.
</ng-container>
<ng-container *ngIf="format === 'aviracsv'">
In the Avira web vault, go to "Settings" &rarr; "My Data" &rarr; "Export data" and save the
CSV file.
In the Avira web vault, go to "Settings" &rarr; "My Data" &rarr; "Export data" and save
the CSV file.
</ng-container>
<ng-container *ngIf="format === 'blurcsv'">
In the Blur web vault, click your username at the top and go to "Settings" &rarr; "Export
Data", then click "Export CSV" for your "Accounts".
</ng-container>
<ng-container *ngIf="format === 'safeincloudxml'">
Using the SaveInCloud desktop application, navigate to "File" &rarr; "Export" &rarr; "As XML"
and save the XML file.
Using the SaveInCloud desktop application, navigate to "File" &rarr; "Export" &rarr; "As
XML" and save the XML file.
</ng-container>
<ng-container *ngIf="format === 'padlockcsv'">
Using the Padlock desktop application, click the hamburger icon in the top left corner and
@ -135,9 +145,9 @@
click "Show me my data" to save the CSV file.
</ng-container>
<ng-container *ngIf="format === 'keepercsv'">
Log into the Keeper web vault (keepersecurity.com/vault). Click on your "account email" (top
right) and select "Settings". Go to "Export" and find the "Export to .csv File" option. Click
"Export" to save the CSV file.
Log into the Keeper web vault (keepersecurity.com/vault). Click on your "account email"
(top right) and select "Settings". Go to "Export" and find the "Export to .csv File"
option. Click "Export" to save the CSV file.
</ng-container>
<!--
<ng-container *ngIf="format === 'keeperjson'">
@ -159,7 +169,11 @@
</ng-container>
<ng-container *ngIf="format === 'firefoxcsv'">
See detailed instructions on our help site at
<a target="_blank" rel="noreferrer" href="https://bitwarden.com/help/import-from-firefox/">
<a
target="_blank"
rel="noreferrer"
href="https://bitwarden.com/help/import-from-firefox/"
>
https://bitwarden.com/help/import-from-firefox/</a
>.
</ng-container>
@ -178,89 +192,94 @@
"
>
See detailed instructions on our help site at
<a target="_blank" rel="noreferrer" href="https://bitwarden.com/help/import-from-1password/">
<a
target="_blank"
rel="noreferrer"
href="https://bitwarden.com/help/import-from-1password/"
>
https://bitwarden.com/help/import-from-1password/</a
>.
</ng-container>
<ng-container *ngIf="format === 'passworddragonxml'">
Using the Password Dragon desktop application, navigate to "File" &rarr; "Export" &rarr; "To
XML". In the dialog that pops up select "All Rows" and check all fields. Click the "Export"
button and save the XML file.
Using the Password Dragon desktop application, navigate to "File" &rarr; "Export" &rarr;
"To XML". In the dialog that pops up select "All Rows" and check all fields. Click the
"Export" button and save the XML file.
</ng-container>
<ng-container *ngIf="format === 'enpasscsv'">
Using the Enpass desktop application, navigate to "File" &rarr; "Export" &rarr; "As CSV".
Select "OK" to the warning alert and save the CSV file. Note that the importer only supports
files exported while Enpass is set to the English language, so adjust your settings
accordingly.
Select "OK" to the warning alert and save the CSV file. Note that the importer only
supports files exported while Enpass is set to the English language, so adjust your
settings accordingly.
</ng-container>
<ng-container *ngIf="format === 'enpassjson'">
Using the Enpass 6 desktop application, click the menu button and navigate to "File" &rarr;
"Export". Select the ".json" file format option and save the JSON file.
Using the Enpass 6 desktop application, click the menu button and navigate to "File"
&rarr; "Export". Select the ".json" file format option and save the JSON file.
</ng-container>
<ng-container *ngIf="format === 'pwsafexml'">
Using the Password Safe desktop application, navigate to "File" &rarr; "Export To" &rarr; "XML
format..." and save the XML file.
Using the Password Safe desktop application, navigate to "File" &rarr; "Export To" &rarr;
"XML format..." and save the XML file.
</ng-container>
<ng-container *ngIf="format === 'dashlanecsv'">
Log in to Dashlane, click on "My Account" &rarr; "Settings" &rarr; "Export file" and select
"Export as a CSV file". This will download a zip archive containing various CSV files. Unzip
the archive and import each CSV file individually.
Log in to Dashlane, click on "My Account" &rarr; "Settings" &rarr; "Export file" and
select "Export as a CSV file". This will download a zip archive containing various CSV
files. Unzip the archive and import each CSV file individually.
</ng-container>
<ng-container *ngIf="format === 'dashlanejson'">
Dashlane no longer supports the JSON format. Only use this if you have an existing JSON for
import. Use the CSV importer when creating new exports.
Dashlane no longer supports the JSON format. Only use this if you have an existing JSON
for import. Use the CSV importer when creating new exports.
</ng-container>
<ng-container *ngIf="format === 'msecurecsv'">
Using the mSecure desktop application, navigate to "File" &rarr; "Export" &rarr; "CSV File..."
and save the CSV file.
Using the mSecure desktop application, navigate to "File" &rarr; "Export" &rarr; "CSV
File..." and save the CSV file.
</ng-container>
<ng-container *ngIf="format === 'stickypasswordxml'">
Using the Sticky Password desktop application, navigate to "Menu" (top right) &rarr; "Export"
&rarr; "Export all". Select the unencrypted format XML option and save the XML file.
Using the Sticky Password desktop application, navigate to "Menu" (top right) &rarr;
"Export" &rarr; "Export all". Select the unencrypted format XML option and save the XML
file.
</ng-container>
<ng-container *ngIf="format === 'truekeycsv'">
Using the True Key desktop application, click the gear icon (top right) and then navigate to
"App Settings". Click the "Export" button, enter your password and save the CSV file.
Using the True Key desktop application, click the gear icon (top right) and then navigate
to "App Settings". Click the "Export" button, enter your password and save the CSV file.
</ng-container>
<ng-container *ngIf="format === 'clipperzhtml'">
Log into the Clipperz web application (clipperz.is/app). Click the hamburger menu icon in the
top right to expand the navigation bar. Navigate to "Data" &rarr; "Export". Click the
Log into the Clipperz web application (clipperz.is/app). Click the hamburger menu icon in
the top right to expand the navigation bar. Navigate to "Data" &rarr; "Export". Click the
"download HTML+JSON" button to save the HTML file.
</ng-container>
<ng-container *ngIf="format === 'roboformcsv'">
Using the RoboForm Editor desktop application, navigate to "RoboForm" (top left) &rarr;
"Options" &rarr; "Account &amp; Data" and click the "Export" button. Select all of your data,
change the "Format" to "CSV file" and then click the "Export" button to save the CSV file.
Note: RoboForm only allows you to export Logins. Other items will not be exported.
"Options" &rarr; "Account &amp; Data" and click the "Export" button. Select all of your
data, change the "Format" to "CSV file" and then click the "Export" button to save the CSV
file. Note: RoboForm only allows you to export Logins. Other items will not be exported.
</ng-container>
<ng-container *ngIf="format === 'passboltcsv'">
Log into the Passbolt web vault and navigate to the "Passwords" listing. Select all of the
passwords you would like to export and click the "Export" button at the top of the listing.
Choose the "csv (lastpass)" export format and click the "Export" button.
passwords you would like to export and click the "Export" button at the top of the
listing. Choose the "csv (lastpass)" export format and click the "Export" button.
</ng-container>
<ng-container *ngIf="format === 'ascendocsv'">
Using the Ascendo DataVault desktop application, navigate to "Tools" &rarr; "Export". In the
dialog that pops up, select the "All Items (DVX, CSV)" option. Click the "Ok" button to save
the CSV file.
Using the Ascendo DataVault desktop application, navigate to "Tools" &rarr; "Export". In
the dialog that pops up, select the "All Items (DVX, CSV)" option. Click the "Ok" button
to save the CSV file.
</ng-container>
<ng-container *ngIf="format === 'passwordbossjson'">
Using the Password Boss desktop application, navigate to "File" &rarr; "Export data" &rarr;
"Password Boss JSON - not encrypted" and save the JSON file.
Using the Password Boss desktop application, navigate to "File" &rarr; "Export data"
&rarr; "Password Boss JSON - not encrypted" and save the JSON file.
</ng-container>
<ng-container *ngIf="format === 'zohovaultcsv'">
Log into the Zoho web vault (vault.zoho.com). Navigate to "Tools" &rarr; "Export Secrets".
Select "All Secrets" and click the "Zoho Vault Format CSV" button. Highlight and copy the data
from the textarea. Open a text editor like Notepad and paste the data. Save the data from the
text editor as
Select "All Secrets" and click the "Zoho Vault Format CSV" button. Highlight and copy the
data from the textarea. Open a text editor like Notepad and paste the data. Save the data
from the text editor as
<code>zoho_export.csv</code>.
</ng-container>
<ng-container *ngIf="format === 'splashidcsv'">
Using the SplashID Safe desktop application, click on the SplashID blue lock logo in the top
right corner. Navigate to "Export" &rarr; "Export as CSV" and save the CSV file.
Using the SplashID Safe desktop application, click on the SplashID blue lock logo in the
top right corner. Navigate to "Export" &rarr; "Export as CSV" and save the CSV file.
</ng-container>
<ng-container *ngIf="format === 'passkeepcsv'">
Using the PassKeep mobile app, navigate to "Backup/Restore". Locate the "CSV Backup/Restore"
section and click "Backup to CSV" to save the CSV file.
Using the PassKeep mobile app, navigate to "Backup/Restore". Locate the "CSV
Backup/Restore" section and click "Backup to CSV" to save the CSV file.
</ng-container>
<ng-container *ngIf="format === 'gnomejson'">
Make sure you have python-keyring and python-gnomekeyring installed. Save the
@ -273,26 +292,28 @@
resulting <code>my_passwords.json</code> file here to Bitwarden.
</ng-container>
<ng-container *ngIf="format === 'passwordagentcsv'">
Using the Password Agent desktop application navigate to "File" &rarr; "Export", select the
"Fields to export" button and check all of the fields, change the "Output format" to "CSV",
and then click the "Start" button to save the CSV file.
Using the Password Agent desktop application navigate to "File" &rarr; "Export", select
the "Fields to export" button and check all of the fields, change the "Output format" to
"CSV", and then click the "Start" button to save the CSV file.
</ng-container>
<ng-container *ngIf="format === 'passpackcsv'">
Log into the Passpack website vault and navigate to "Settings" &rarr; "Export", then click the
"Download" button to save the CSV file.
Log into the Passpack website vault and navigate to "Settings" &rarr; "Export", then click
the "Download" button to save the CSV file.
</ng-container>
<ng-container *ngIf="format === 'passmanjson'">
Open your Passman vault and click on "Settings" in the bottom left corner. In the "Settings"
window switch to the "Export credentials" tab and choose "JSON" as the export type. Enter your
vault's passphrase and click the "Export" button to save the JSON file.
Open your Passman vault and click on "Settings" in the bottom left corner. In the
"Settings" window switch to the "Export credentials" tab and choose "JSON" as the export
type. Enter your vault's passphrase and click the "Export" button to save the JSON file.
</ng-container>
<ng-container *ngIf="format === 'avastcsv'">
Open the Avast Passwords desktop application and navigate to "Settings" &rarr; "Import/export
data". Select the "Export" button for the "Export to CSV file" option to save the CSV file.
Open the Avast Passwords desktop application and navigate to "Settings" &rarr;
"Import/export data". Select the "Export" button for the "Export to CSV file" option to
save the CSV file.
</ng-container>
<ng-container *ngIf="format === 'avastjson'">
Open the Avast Passwords desktop application and navigate to "Settings" &rarr; "Import/export
data". Select the "Export" button for the "Export to JSON file" option to save the JSON file.
Open the Avast Passwords desktop application and navigate to "Settings" &rarr;
"Import/export data". Select the "Export" button for the "Export to JSON file" option to
save the JSON file.
</ng-container>
<ng-container *ngIf="format === 'fsecurefsk'">
Open the F-Secure KEY desktop application and navigate to "Settings" &rarr; "Export
@ -300,8 +321,8 @@
</ng-container>
<ng-container *ngIf="format === 'kasperskytxt'">
Open the Kaspersky Password Manager desktop application and navigate to "Settings" &rarr;
"Import/Export". Locate the "Export to text file" section and select the "Export" button to
save the TXT file.
"Import/Export". Locate the "Export to text file" section and select the "Export" button
to save the TXT file.
</ng-container>
<ng-container *ngIf="format === 'remembearcsv'">
Open the RememBear desktop application and navigate to "Settings" &rarr; "Account" &rarr;
@ -310,13 +331,13 @@
</ng-container>
<ng-container *ngIf="format === 'passwordwallettxt'">
Open the PasswordWallet desktop application and navigate to "File" &rarr; "Export" &rarr;
"Visible entries to text file". Enter your password and select the "Ok" button to save the TXT
file.
"Visible entries to text file". Enter your password and select the "Ok" button to save the
TXT file.
</ng-container>
<ng-container *ngIf="format === 'mykicsv'">
Open the Myki desktop browser extension and navigate to "Advanced" &rarr; "Export Accounts"
and then scan the QR code with your mobile device. Various CSV files will then be saved to
your computer's downloads folder.
Open the Myki desktop browser extension and navigate to "Advanced" &rarr; "Export
Accounts" and then scan the QR code with your mobile device. Various CSV files will then
be saved to your computer's downloads folder.
</ng-container>
<ng-container *ngIf="format === 'securesafecsv'">
Export your SecureSafe password safe to a CSV file with a comma delimiter.
@ -327,37 +348,37 @@
</ng-container>
<ng-container *ngIf="format === 'blackberrycsv'">
Open the BlackBerry Password Keeper application, then navigate to "Settings" &rarr;
"Import/Export". Select "Export Passwords" and follow the instructions on screen to save the
unencrypted CSV file.
"Import/Export". Select "Export Passwords" and follow the instructions on screen to save
the unencrypted CSV file.
</ng-container>
<ng-container *ngIf="format === 'buttercupcsv'">
Open the Buttercup desktop application and unlock your vault. Right click on your vault's icon
and select "Export" to save the CSV file.
Open the Buttercup desktop application and unlock your vault. Right click on your vault's
icon and select "Export" to save the CSV file.
</ng-container>
<ng-container *ngIf="format === 'codebookcsv'">
Open the Codebook desktop application and log in. Navigate to "File" &rarr; "Export all", then
click "Yes" on the dialog and save the CSV file.
Open the Codebook desktop application and log in. Navigate to "File" &rarr; "Export all",
then click "Yes" on the dialog and save the CSV file.
</ng-container>
<ng-container *ngIf="format === 'encryptrcsv'">
Open the newest version of the Encryptr desktop application and allow all of your data to
sync. Once syncing of your data is complete, the download icon in the top right corner will
turn pink. Click the download icon and save the CSV file.
sync. Once syncing of your data is complete, the download icon in the top right corner
will turn pink. Click the download icon and save the CSV file.
</ng-container>
<ng-container *ngIf="format === 'yoticsv'">
From the Yoti browser extension, click on "Settings", then "Export Saved Logins" and save the
CSV file.
From the Yoti browser extension, click on "Settings", then "Export Saved Logins" and save
the CSV file.
</ng-container>
<ng-container *ngIf="format === 'psonojson'">
Log in to the Psono web vault, click on the "Signed in as"-dropdown, select "Others". Go to
the "Export"-tab and select the json type export and then click on Export.
Log in to the Psono web vault, click on the "Signed in as"-dropdown, select "Others". Go
to the "Export"-tab and select the json type export and then click on Export.
</ng-container>
<ng-container *ngIf="format === 'passkyjson'">
Log in to "https://vault.passky.org" &rarr; "Import & Export" &rarr; "Export" in the Passky
section. ("Backup" is unsupported as it is encrypted).
Log in to "https://vault.passky.org" &rarr; "Import & Export" &rarr; "Export" in the
Passky section. ("Backup" is unsupported as it is encrypted).
</ng-container>
<ng-container *ngIf="format === 'protonpass'">
In the ProtonPass browser extension, go to Settings > Export. Export without PGP encryption
and save the zip file.
In the ProtonPass browser extension, go to Settings > Export. Export without PGP
encryption and save the zip file.
</ng-container>
</bit-callout>
<import-lastpass
@ -385,7 +406,7 @@
class="tw-hidden"
/>
</bit-form-field>
<bit-form-field>
<bit-form-field disableMargin>
<bit-label>{{ "orCopyPasteFileContents" | i18n }}</bit-label>
<textarea
id="import_textarea_fileContents"
@ -394,4 +415,6 @@
></textarea>
</bit-form-field>
</div>
</bit-card>
</bit-section>
</form>

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

@ -43,10 +43,14 @@ import {
BitSubmitDirective,
ButtonModule,
CalloutModule,
CardComponent,
ContainerComponent,
DialogService,
FormFieldModule,
IconButtonModule,
RadioButtonModule,
SectionComponent,
SectionHeaderComponent,
SelectModule,
ToastService,
} from "@bitwarden/components";
@ -104,6 +108,10 @@ const safeProviders: SafeProvider[] = [
ReactiveFormsModule,
ImportLastPassComponent,
RadioButtonModule,
CardComponent,
ContainerComponent,
SectionHeaderComponent,
SectionComponent,
],
providers: safeProviders,
})