From 901a9ae9d7e7c14d0b7dbf995c5fd05205db2fec Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 19 Jul 2018 00:01:29 -0400
Subject: [PATCH] ascendo dv csv importer

---
 jslib                               | 2 +-
 src/app/tools/import.component.html | 4 ++++
 src/app/tools/import.component.ts   | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/jslib b/jslib
index 51ee0b06..4b5e1924 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 51ee0b065abb965980e8fe398b568c015e557a2f
+Subproject commit 4b5e192457efd2ca6f364274a395bc21ce172c70
diff --git a/src/app/tools/import.component.html b/src/app/tools/import.component.html
index e84fd23f..7e81a5b1 100644
--- a/src/app/tools/import.component.html
+++ b/src/app/tools/import.component.html
@@ -118,6 +118,10 @@
             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.
+        </ng-container>
     </app-callout>
     <div class="row">
         <div class="col-6">
diff --git a/src/app/tools/import.component.ts b/src/app/tools/import.component.ts
index 7995a8b2..e61d47da 100644
--- a/src/app/tools/import.component.ts
+++ b/src/app/tools/import.component.ts
@@ -21,6 +21,7 @@ import { KvpRequest } from 'jslib/models/request/kvpRequest';
 
 import { CipherView } from 'jslib/models/view/cipherView';
 
+import { AscendoCsvImporter } from 'jslib/importers/ascendoCsvImporter';
 import { AviraCsvImporter } from 'jslib/importers/aviraCsvImporter';
 import { BitwardenCsvImporter } from 'jslib/importers/bitwardenCsvImporter';
 import { BlurCsvImporter } from 'jslib/importers/blurCsvImporter';
@@ -280,6 +281,8 @@ export class ImportComponent implements OnInit {
                 return new ClipperzHtmlImporter();
             case 'roboformcsv':
                 return new RoboFormCsvImporter();
+            case 'ascendocsv':
+                return new AscendoCsvImporter();
             default:
                 return null;
         }