Merge pull request #394 from nexB/391-392-conclusion-upload-fix

Improve Conclusion uploads

Author: steven-esser

assets/app/js/controllers/dejacodeExportDialog.js

@@ -1,6 +1,6 @@
 /*
  #
- # Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+ # Copyright (c) 2019 nexB Inc. and others. All rights reserved.
  # https://nexb.com and https://github.com/nexB/scancode-workbench/
  # The ScanCode Workbench software is licensed under the Apache License version 2.0.
  # ScanCode is a trademark of nexB Inc.
@@ -57,10 +57,10 @@ class DejaCodeExportDialog extends Controller {
         const productVersion = this.productVersion.val();
         const productNameVersion = productName.concat(':', productVersion);
         const apiUrl = this.apiUrl.val();
-        const apiKey = this.apiKey.val();
+        const apiKey = this.apiKey.val().trim();
 
         // Test whether any form field is empty
-        if (productName === '' || productVersion === '' || apiUrl === '' || apiKey === '') {
+        if (productName === '' || apiUrl === '' || apiKey === '') {
           throw new Error('Please make sure you complete all fields in the upload form.');
         }
 

assets/app/js/renderer.js

@@ -1,6 +1,6 @@
 /*
  #
- # Copyright (c) 2017 nexB Inc. and others. All rights reserved.
+ # Copyright (c) 2019 nexB Inc. and others. All rights reserved.
  # https://nexb.com and https://github.com/nexB/scancode-workbench/
  # The ScanCode Workbench software is licensed under the Apache License version 2.0.
  # ScanCode is a trademark of nexB Inc.
@@ -117,6 +117,12 @@ $(document).ready(() => {
     updateViewsByPath(scanDataTable._selectedPath);
   });
 
+  $(document).on('click', '#showApiKeyButton', () => {
+    // Toggle API key visibilty (See issue: #391)
+    const apiKeyInput = document.getElementById('apiKey');
+    apiKeyInput.type = (apiKeyInput.type === 'password') ? 'text' : 'password';
+  });
+
   const splitter = new Splitter('#leftCol', '#rightCol')
     .on('drag-end', () => redrawCurrentView());
 

index.html

@@ -516,6 +516,7 @@ <h4 class="modal-title" id="myModalLabel">Upload Conclusions to DejaCode</h4>
                             <small><em>Your API key can be found in your DejaCode Profile Settings</em></small>
                         </div>
                     </form>
+                    <button id="showApiKeyButton">Show/Hide API Key</button>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>

npm-shrinkwrap.json

@@ -42,7 +42,7 @@
   "dependencies": {
     "JSONStream": "^1.3.1",
     "packageurl-js": "0.0.1",
-    "sequelize": "^4.39.0",
+    "sequelize": "^4.44.3",
     "sequelize-cli": "^4.1.1",
     "sqlite3": "^4.0.2"
   }