Merge pull request #2918 from engaging-computing/dev

dev to master
engaging-computing · May 29, 2023 · f6c2af1 · f6c2af1
2 parents a8aa2f5 + c6c4d2c
commit f6c2af1
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 19 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -23,7 +23,7 @@ jobs:
     - run: sudo apt-get install ruby-railties-4.0 bundler
     - run: sudo apt-get install qt5-default libqt5webkit5-dev gstreamer1.0-plugins-base gstreamer1.0-tools gstreamer1.0-x
     - run: sudo apt-get install xvfb
-    - run: gem install bundler
+    - run: gem install bundler -v 2.3.26
     - restore_cache:
         key: v1-{{checksum "Gemfile.lock" }}
     - run: bundle install --path vendor/bundle
@@ -38,11 +38,6 @@ jobs:
     - run: bundle exec rake db:test:prepare
     # Test
     - run: xvfb-run -a bundle exec rake
-    # Run blackduck security scan after test
-    - run: bash <(curl -s https://copilot.blackducksoftware.com/ci/circle2/scripts/upload)
-    # Save test results
-    - store_test_results:
-        path: /tmp/circleci-test-results
     # Save artifacts
     - store_artifacts:
         path: /tmp/circleci-artifacts

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -23,7 +23,7 @@ GIT
 
 GIT
   remote: https://github.com/engaging-computing/better-colorpicker
-  revision: abb1a3ebb6e20bea6a3dfd5ed2b5bab09a83c552
+  revision: 0781a4f541a1b9f14ebf2ed90a6c3ddc6f5c422d
   specs:
     better_colorpicker (0.1.2)
       coffee-rails
@@ -126,7 +126,7 @@ GEM
       coffee-script
       execjs
       json
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.2.2)
     derailed (0.1.0)
       derailed_benchmarks
     derailed_benchmarks (1.6.0)
@@ -151,10 +151,10 @@ GEM
     dropzonejs-rails (0.8.1)
       rails (> 3.1)
     erubis (2.7.0)
-    execjs (2.7.0)
+    execjs (2.8.1)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.13.1)
+    ffi (1.15.5)
     filigree (0.3.3)
     font-awesome-rails (4.4.0.0)
       railties (>= 3.2, < 5.0)
@@ -206,9 +206,9 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0331)
     mini_magick (4.10.1)
-    mini_mime (1.0.1)
+    mini_mime (1.1.2)
     mini_portile2 (2.4.0)
-    minitest (5.14.1)
+    minitest (5.15.0)
     minitest-reporters (1.0.8)
       ansi
       builder
@@ -267,8 +267,8 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.0.0)
-    rake (13.0.1)
-    rb-fsevent (0.10.4)
+    rake (13.0.6)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redcarpet (3.5.0)
@@ -342,12 +342,12 @@ GEM
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
-    thor (1.0.1)
+    thor (1.2.1)
     thread_safe (0.3.6)
     tilt (1.4.1)
     touchpunch-rails (1.0.3)
       railties (>= 3.1)
-    tzinfo (1.2.7)
+    tzinfo (1.2.11)
       thread_safe (~> 0.1)
     uglifier (2.6.1)
       execjs (>= 0.3.0)

diff --git a/app/assets/javascripts/visualizations/highvis/table.coffee b/app/assets/javascripts/visualizations/highvis/table.coffee
@@ -199,8 +199,25 @@ $ ->
           edit:   false
           search: false
         @table.jqGrid('navGrid','#toolbar_bottom', params)
-
-        operands = { "eq": "=",  "ne": "!",  "lt": "<",  "le": "<=",  "gt": ">",  "ge": ">=", "bw": "^",  "bn": "!^",  "in": "=",  "ni": "!=",  "ew": "|",  "en": "!@",  "cn": "~",  "nc": "!~", "nu": "#",  "nn": "!#" }
+
+        operands = {
+          "eq": "=",
+          "ne": "!",
+          "lt": "<",
+          "le": "<=",
+          "gt": ">",
+          "ge": ">=",
+          "bw": "^",
+          "bn": "!^",
+          "in": "=",
+          "ni": "!=",
+          "ew": "|",
+          "en": "!@",
+          "cn": "~",
+          "nc": "!~",
+          "nu": "#",
+          "nn": "!#"
+        }
 
         params =
           stringResult:    true
@@ -367,4 +384,4 @@ $ ->
         # Clears all the table's searchboxes
         $('#data_table')[0].clearToolbar()
 
-    globals.table = new Table "table-canvas"
+    globals.table = new Table "table-canvas"