Merge pull request #2441 from DMPRoadmap/development

Release Candidate v2.1.6

Author: briri

.github/workflows/brakeman.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
 
     # Will run Brakeman checks on dependencies
     #   https://github.com/marketplace/actions/brakeman-linter

.github/workflows/eslint.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
 
     # Will run ES Lint checks on javascript files
     #   https://github.com/marketplace/actions/run-eslint

.github/workflows/mysql.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
     # Checkout the repo
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
       with:
         fetch-depth: 1
 
@@ -73,6 +73,16 @@ jobs:
           ${{ runner.os }}-yarn-
           ${{ runner.os }}-
 
+    # Figure out where wkhtmltopdf is installed
+    - name: 'Determine wkhtmltopdf location'
+      run: echo ::set-env name=WICKED_PDF_PATH::$(echo `bundle exec which wkhtmltopdf`)
+
+    # Startup MySQL
+    - name: 'Start MySQL'
+      run: sudo systemctl start mysql
+
+
+
     # Install the JS dependencies
     - name: 'Yarn Install'
       run: |

.github/workflows/postgres.yml

@@ -26,11 +26,10 @@ jobs:
     env:
       RAILS_ENV: test
       DATABASE_URL: postgres://postgres:@localhost:5432/roadmap_test
-      WICKED_PDF_PATH: vendor/bundle/bin/wkhtmltopdf
 
     steps:
     # Checkout the repo
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
       with:
         fetch-depth: 1
 
@@ -44,6 +43,7 @@ jobs:
     - name: 'Determine Ruby Version'
       run: echo ::set-env name=RUBY_VERSION::$(echo `cat ./Gemfile.lock | grep -A 1 'RUBY VERSION' | grep 'ruby' | grep -oE '[0-9]\.[0-9]'`)
 
+
     # Install Ruby - using the version found in the Gemfile.lock
     - name: 'Install Ruby'
       uses: actions/setup-ruby@v1

.github/workflows/rubocop.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
 
     # Extract the Ruby version from the Gemfile.lock
 #    - name: 'Determine Ruby Version'
@@ -31,4 +31,4 @@ jobs:
 #         additional-gems: 'rubocop-dmp_roadmap'
 
     - name: 'Placeholder for Rubocop'
-      run: echo "Rubocop has been temporarily disabled"
+      run: echo "Rubocop has been temporarily disabled"

Gemfile

@@ -156,9 +156,6 @@ gem 'wicked_pdf', '~> 1.1.0'
 # This simple gem allows you to create MS Word docx documents from simple html documents. This makes it easy to create dynamic reports and forms that can be downloaded by your users as simple MS Word docx files. (http://github.com/karnov/htmltoword)
 gem 'htmltoword', '1.1.0'
 
-# A feed fetching and parsing library (http://feedjira.com)
-gem 'feedjira'
-
 # Filename sanitization for Ruby. This is useful when you generate filenames for downloads from user input
 gem 'zaru'
 
@@ -188,6 +185,9 @@ gem "dotenv-rails"
 
 gem 'activerecord-session_store'
 
+# -------------------------------------------------
+# UTILITIES
+gem 'parallel'
 
 # ------------------------------------------------
 # ENVIRONMENT SPECIFIC DEPENDENCIES

Gemfile.lock

@@ -133,9 +133,6 @@ GEM
     faraday (0.17.1)
       multipart-post (>= 1.2, < 3)
     fast_gettext (2.0.1)
-    feedjira (3.1.0)
-      loofah (>= 2.3.1)
-      sax-machine (>= 1.0)
     ffi (1.11.3)
     flag_shih_tzu (0.3.23)
     fog-aws (3.5.2)
@@ -245,7 +242,7 @@ GEM
     mysql2 (0.4.10)
     nenv (0.3.0)
     nio4r (2.5.2)
-    nokogiri (1.10.7)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -404,7 +401,6 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    sax-machine (1.3.2)
     selenium-webdriver (3.142.6)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
@@ -498,7 +494,6 @@ DEPENDENCIES
   dragonfly-s3_data_store
   factory_bot_rails
   faker
-  feedjira
   flag_shih_tzu (~> 0.3.23)
   font-awesome-sass (~> 4.2.0)
   fuubar
@@ -518,6 +513,7 @@ DEPENDENCIES
   omniauth-orcid
   omniauth-rails_csrf_protection
   omniauth-shibboleth
+  parallel
   pg (~> 0.19.0)
   progress_bar
   puma

app/assets/stylesheets/blocks/_new_window_popup.scss

@@ -1,9 +1,9 @@
 a.has-new-window-popup-info,
 button.has-new-window-popup-info {
-  
+
   position:relative;
   z-index:24;
-  
+
   & > span.new-window-popup-info {
     position: absolute;
     left: -9000px;
@@ -14,9 +14,9 @@ button.has-new-window-popup-info {
   &:hover,
   &:focus,
   &:active {
-    
+
     z-index:25;
-    
+
     & > span.new-window-popup-info {
       display:block;
       position:absolute;
@@ -29,7 +29,7 @@ button.has-new-window-popup-info {
       color:#000;
       text-align: center;
     }
-    
+
   }
-  
+
 }

app/assets/stylesheets/blocks/_readonly_textarea.scss

@@ -1,17 +1,17 @@
 /* For display of readonly textarea content without the TinyMCE editor */
 .display-readonly-textarea-content {
   // Replicating some TinyMCE styling of textarea
-  overflow-y: hidden;
+  overflow: visible;
   padding-left: 1px;
   padding-right: 1px;
   padding-bottom: 10px;
-  
+
   // Ensure table borders are not lost
   table {
     td {
       border: 1px solid black;
     }
-    
+
     td, tr {
       padding: 10px;
     }

app/assets/stylesheets/blocks/_usage.sccs

@@ -0,0 +1,4 @@
+.single-char-input {
+  display: inline;
+  width: 20px;
+}