support for json exports

This commit is contained in:
Kyle Spearrin 2018-12-17 10:54:18 -05:00
parent 55ba78c66a
commit 1dd88a690b
4 changed files with 17 additions and 5 deletions

2
jslib

@ -1 +1 @@
Subproject commit 27566c3fd5a1040112278c7ad0a50c6b8d45e3e4 Subproject commit 3b22df15e8cb2f14c2b4dfe996af9bbb721902d0

View File

@ -28,7 +28,7 @@ export class ExportComponent extends BaseExportComponent {
} }
getExportData() { getExportData() {
return this.exportService.getOrganizationExport(this.organizationId, 'csv'); return this.exportService.getOrganizationExport(this.organizationId, this.format);
} }
getFileName() { getFileName() {

View File

@ -3,7 +3,7 @@
<h1>{{'exportVault' | i18n}}</h1> <h1>{{'exportVault' | i18n}}</h1>
</div> </div>
<p>{{'exportMasterPassword' | i18n}}</p> <p>{{'exportMasterPassword' | i18n}}</p>
<app-callout type="warning">{{'exportWarning' | i18n}}</app-callout> <app-callout type="warning">{{'exportWarningDesc' | i18n}}</app-callout>
<div class="row"> <div class="row">
<div class="form-group col-6"> <div class="form-group col-6">
<label for="masterPassword">{{'masterPass' | i18n}}</label> <label for="masterPassword">{{'masterPass' | i18n}}</label>
@ -11,6 +11,15 @@
appInputVerbatim> appInputVerbatim>
</div> </div>
</div> </div>
<div class="row">
<div class="form-group col-6">
<label for="format">{{'fileFormat' | i18n}}</label>
<select class="form-control" id="format" name="Format" [(ngModel)]="format">
<option value="json">.json</option>
<option value="csv">.csv</option>
</select>
</div>
</div>
<button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading"> <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
<i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i> <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
<span>{{'exportVault' | i18n}}</span> <span>{{'exportVault' | i18n}}</span>

View File

@ -774,8 +774,8 @@
"warning": { "warning": {
"message": "Warning" "message": "Warning"
}, },
"exportWarning": { "exportWarningDesc": {
"message": "This export contains your unencrypted data in .csv format. You should not store or send it over unsecure channels (such as email). Delete it immediately after you are done using it." "message": "This export contains your vault data in an unencrypted format. You should not store or send the exported file over unsecure channels (such as email). Delete it immediately after you are done using it."
}, },
"exportMasterPassword": { "exportMasterPassword": {
"message": "Enter your master password to export your vault data." "message": "Enter your master password to export your vault data."
@ -783,6 +783,9 @@
"exportVault": { "exportVault": {
"message": "Export Vault" "message": "Export Vault"
}, },
"fileFormat": {
"message": "File Format"
},
"exportSuccess": { "exportSuccess": {
"message": "Your vault data has been exported." "message": "Your vault data has been exported."
}, },