Jkmarx/update lodash dependency v2 (#3438)

* Update how .has checks for keys. * Remove migrate references.
refinery-platform · Sep 3, 2019 · 8b12cb3 · 8b12cb3
1 parent ba35f44
commit 8b12cb3
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 28 deletions.
diff --git a/refinery/templates/base.html b/refinery/templates/base.html
@@ -235,16 +235,10 @@
   <script src="{% static "vendor/angular-file-model/angular-file-model.js" %}"></script>
   <script src="{% static "vendor/angular-messages/angular-messages.min.js" %}"></script>
   <script src="{% static "vendor/filesize/lib/filesize.js" %}"></script>
-  <script src="{% static "vendor/lodash/index.js" %}"></script>
-  <script src="{% static "vendor/lodash-migrate/dist/lodash-migrate.min.js" %}"></script>
+  <script src="{% static "vendor/lodash/lodash.js" %}"></script>
   <script src="{% static "vendor/markdown/lib/markdown.js" %}"></script>
   <script src="{% static "vendor/chart.js/dist/Chart.min.js" %}"></script>
   <script src="https://www.youtube.com/iframe_api"></script>
-  <script type="text/javascript">
-    // Assign lodash v3.9.3 to a special variable so it doesn't conflict with
-    // lodash v2 or other libraries like underscore.
-    window.lodashLatest = _.noConflict();
-  </script>
 
   <script src="{% static "vendor/d3/d3.min.js" %}"></script>
   <script src="{% static "vendor/d3-tip/index.js" %}"></script>

diff --git a/refinery/ui/Gruntfile.js b/refinery/ui/Gruntfile.js
@@ -481,10 +481,6 @@ module.exports = function (grunt) {
               pattern: 'node_modules/angular-mocks/angular-mocks.js',
               watched: false
             }],
-            [{
-              pattern: './karma.lodash.noConflict.js',
-              watched: false
-            }],
             'node_modules/phantomjs-polyfill/bind-polyfill.js',
             jsFilesByImportance(true),
             config.basePath.ui.src + '/**/*.html'

diff --git a/refinery/ui/config.json b/refinery/ui/config.json
@@ -76,8 +76,7 @@
         "blueimp-file-upload/js/jquery.iframe-transport.js",
         "blueimp-file-upload/js/jquery.fileupload-process.js",
         "jquery-mousewheel/jquery.mousewheel.js",
-        "lodash/index.js",
-        "lodash-migrate/dist/lodash-migrate.min.js",
+        "lodash/lodash.js",
         "angular-ui-grid/ui-grid.min.js",
         "spark-md5/spark-md5.min.js",
         "spectrum-colorpicker/spectrum.js",

diff --git a/refinery/ui/karma.config.js b/refinery/ui/karma.config.js
@@ -12,7 +12,7 @@ module.exports = function(config) {
 
     client: {
       // Set to `true` if `console.log()` should be captured.
-      captureConsole: false
+      captureConsole: true
     },
 
     // frameworks to use
@@ -25,8 +25,7 @@ module.exports = function(config) {
 
 
     // list of files to exclude
-    exclude: [
-    ],
+    exclude: [],
 
 
     // preprocess matching files before serving them to the browser

diff --git a/refinery/ui/karma.lodash.noConflict.js b/refinery/ui/karma.lodash.noConflict.js
diff --git a/refinery/ui/package.json b/refinery/ui/package.json
@@ -44,8 +44,7 @@
     "jquery": "2.1.1",
     "blueimp-file-upload": "9.18.0",
     "jquery-mousewheel": "3.1.13",
-    "lodash": "3.10.1",
-    "lodash-migrate": "0.2.6",
+    "lodash": "4.17.15",
     "markdown": "0.5.0",
     "ng-file-upload": "12.2.13",
     "select2": "3.5.1",
@@ -70,15 +69,15 @@
     "grunt-env": "0.4.4",
     "grunt-eslint": "18.0.0",
     "grunt-jsdoc": "2.2.0",
-    "grunt-karma": "1.0.0",
+    "grunt-karma": "3.0.2",
     "grunt-newer": "1.2.0",
     "grunt-ng-annotate": "2.0.1",
     "hasbin": "1.1.1",
     "isbinaryfile": "3.0.0",
     "jasmine-core": "2.3.4",
-    "karma": "0.13.22",
+    "karma": "4.3.0",
     "karma-chrome-launcher": "0.2.2",
-    "karma-coverage": "0.5.5",
+    "karma-coverage": "2.0.1",
     "karma-firefox-launcher": "0.1.6",
     "karma-jasmine": "0.3.6",
     "karma-ng-html2js-preprocessor": "0.2.0",

diff --git a/refinery/ui/source/js/globals/services/lodash-latest.js b/refinery/ui/source/js/globals/services/lodash-latest.js
@@ -2,14 +2,13 @@
  * Lodash Latest Constant
  * @namespace refineryApp
  * @desc Issue with adding the lodash-latest from the window object to the
- * refinery-library due to script run time. Removable when we upgrade our
- * lodash/underscore syntax.
+ * refinery-library due to script run time.
  * @memberOf refineryApp.lodashLatest
  */
 (function () {
   'use strict';
 
   angular
     .module('lodashLatest', [])
-    .constant('_', window.lodashLatest);
+    .constant('_', window._);
 })();
diff --git a/refinery/ui/source/js/tool-launch/services/file-relationship-service.js b/refinery/ui/source/js/tool-launch/services/file-relationship-service.js
@@ -294,7 +294,7 @@
       }
       // checkbox selected
       if (selectionObj[vm.currentGroup][inputTypeUuid][nodeUuid]) {
-        if (_.has(vm.groupCollection, vm.currentGroup) === false) {
+        if (_.has(vm.groupCollection, vm.currentGroup.toString()) === false) {
           // intialize groupCollection[groupId]
           vm.groupCollection[vm.currentGroup] = {};
         }

diff --git a/refinery/ui/source/js/tool-launch/services/tool-launch-service.js b/refinery/ui/source/js/tool-launch/services/tool-launch-service.js
@@ -235,11 +235,14 @@
     function checkNeedMoreNodes () {
       var moreFlag = false;
       var groupType = fileService.currentTypes[fileService.currentTypes.length - 1];
-      if (!_.property(fileService.currentGroup)(fileService.groupCollection)) {
+      var groupCollectionKeys = _.keys(fileService.groupCollection);
+      var strCurrentGroup = fileService.currentGroup.toString();
+
+      if (groupCollectionKeys.indexOf(strCurrentGroup) < 0) {
         moreFlag = true;
       } else if (groupType === 'PAIR') {
         // pair, requires 2 inputTypes
-        var inputLength = _.keys(fileService.groupCollection[fileService.currentGroup]).length;
+        var inputLength = _.keys(fileService.groupCollection[strCurrentGroup]).length;
         if (inputLength > 1) {
           moreFlag = areInputFileTypesEmpty();
         } else {