Fix conflicts

Signed-off-by: Steven Esser <[email protected]>

Author: steven-esser

.travis.yml

@@ -1,9 +1,9 @@
 language: node_js
 sudo: required
-dist: precise
+dist: xenial
 
 node_js:
-  - "8"
+  - "10"
 
 env:
   global:
@@ -15,7 +15,7 @@ matrix:
           python: 2.7.13
         - os: osx
           language: generic
-          osx_image: xcode7.3
+          osx_image: xcode11
 
 
 before_install:
@@ -40,4 +40,4 @@ addons:
 after_success:
   - openssl aes-256-cbc -K $encrypted_906d16ae5679_key -iv $encrypted_906d16ae5679_iv -in deploy_rsa.enc -out /tmp/deploy_rsa -d
   - chmod 600 /tmp/deploy_rsa
-  - scp -i /tmp/deploy_rsa dist/AboutCode*.tar.gz [email protected]:/home/frs/project/aboutcode-manager/builds/
+  - scp -i /tmp/deploy_rsa dist/ScanCode*.tar.gz [email protected]:/home/frs/project/aboutcode-manager/builds/

README.md

@@ -54,25 +54,25 @@ Then, from your command line:
 
 ```bash
 # Clone this repository
-git clone https://github.com/nexB/scancode-workbench.git
+$ git clone https://github.com/nexB/scancode-workbench.git
 
 # Go into the repository
-cd scancode-workbench
+$ cd scancode-workbench
 
 # Install dependencies and run the app
-npm install
+$ npm install
 
 # Rebuild native Node.js modules against the app version of Node.js
 # MacOS, Linux and Git Bash on Windows
-$(npm bin)/electron-rebuild
+$ $(npm bin)/electron-rebuild
 # Windows except for Git Bash
-.\node_modules\.bin\electron-rebuild.cmd
+> .\node_modules\.bin\electron-rebuild.cmd
 
 # Run the app
-npm start
+$ npm start
 ```
 
-## Release instructions
+## Release Instructions
 
 You can build a `dist` directory containing executables for any one of three 
 target platforms by running:

appveyor.yml

@@ -6,7 +6,7 @@ platform:
   - x64
 
 install:
-  - ps: Install-Product node 8 x64
+  - ps: Install-Product node 10 x64
   - node --version
   - npm --version
   - openssl version

assets/app/css/main.css

@@ -1,4 +1,6 @@
 /*---------------------------------------
+    $('.jstree').jstree(true).refresh(true);
+    $('.jstree').jstree(true).refresh(true);
   Font source mapping
 -----------------------------------------*/
 @font-face {
@@ -280,12 +282,22 @@ body {
 /*---------------------------------------
   DataTables custom
 -----------------------------------------*/
+.table {
+  table-layout: fixed;
+  word-wrap: break-word;
+}
+
+.dataTable td {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .column-right-justify {
   text-align: right;
 }
 
 .dataTable td select {
-  word-wrap: break-word;
   width: 100%;
 }
 

assets/app/js/controllers/conclusionDialog.js

@@ -139,6 +139,7 @@ class ConclusionDialog extends Controller {
             .then(() => this.getHandler('delete')(conclusion));
         }
       });
+    $('.jstree').jstree(true).refresh(true);
   }
 
   // Populate modal input fields with suggestions from ScanCode results

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/controllers/fileDashboard.js

@@ -163,7 +163,6 @@ class FileDashboard extends Controller {
         unload: true,
         done: () => {
           this.sourceLanguageChartProgressbar.hide();
-          this.sourceLanguageChart.hide('No Value Detected');
           this.sourceLanguageChart.flush();
         }
       }));
@@ -176,7 +175,6 @@ class FileDashboard extends Controller {
         unload: true,
         done: () => {
           this.fileTypeChartProgressbar.hide();
-          this.fileTypeChart.hide('No Value Detected');
           this.fileTypeChart.flush();
         }
       }));
@@ -189,7 +187,6 @@ class FileDashboard extends Controller {
         unload: true,
         done: () => {
           this.holdersChartProgressbar.hide();
-          this.holdersChart.hide('No Value Detected');
           this.holdersChart.flush();
         }
       }));

assets/app/js/controllers/jsTree.js

@@ -182,8 +182,8 @@ class JsTree extends Controller {
           data.instance.set_icon(data.node, 'fa fa-folder fa_custom_package');
         }
       })
-      // Select the root node when the tree is refreshed
-      .on('refresh.jstree', () => {
+      // Select the root node when the tree is loaded
+      .on('loaded.jstree', () => {
         const rootNode = this.jsTree().jstree('get_node', '#').children;
         this.jsTree().jstree('select_node', rootNode);
       })

assets/app/js/controllers/licenseDashboard.js

@@ -164,7 +164,6 @@ class LicenseDashboard extends Controller {
         unload: true,
         done: () => {
           this.licenseExpressionChartProgressbar.hide();
-          this.licenseExpressionChart.hide('No Value Detected');
           this.licenseExpressionChart.flush();
         }
       }));
@@ -177,7 +176,6 @@ class LicenseDashboard extends Controller {
         unload: true,
         done: () => {
           this.licenseKeyChartProgressbar.hide();
-          this.licenseKeyChart.hide('No Value Detected');
           this.licenseKeyChart.flush();
         }
       }));
@@ -190,7 +188,6 @@ class LicenseDashboard extends Controller {
         unload: true,
         done: () => {
           this.licensePolicyChartProgressbar.hide();
-          this.licensePolicyChart.hide('No Value Detected');
           this.licensePolicyChart.flush();
         }
       }));

assets/app/js/controllers/packageDashboard.js

@@ -148,7 +148,6 @@ class PackageDashboard extends Controller {
         unload: true,
         done: () => {
           this.packageTypeChartProgressbar.hide();
-          this.packageTypeChart.hide('No Value Detected');
           this.packageTypeChart.flush();
         }
       }));
@@ -161,7 +160,6 @@ class PackageDashboard extends Controller {
         unload: true,
         done: () => {
           this.packageLanguageChartProgressbar.hide();
-          this.packageLanguageChart.hide('No Value Detected');
           this.packageLanguageChart.flush();
         }
       }));
@@ -174,7 +172,6 @@ class PackageDashboard extends Controller {
         unload: true,
         done: () => {
           this.packageLicenseChartProgressbar.hide();
-          this.packageLicenseChart.hide('No Value Detected');
           this.packageLicenseChart.flush();
         }
       }));