Release/1.18 (#1008)

* update readme about Shibboleth. #517

* PR comments changes. #517

* Update README.md

updated typo. #517

* Refactor GrantPermissions front-end and Add contact attribute to grant admins (#982)

* Add contact to grant_permission, grant

* Add :contact trait to grant permission factory

* Add contact info to Grant show page

* Include contacts in Grant find

* Move role descriptions to select options

* Add :contact to permitted params

* Tweaks to grant permission form display

* Include contact info on submission page

* Update to latest version of turbo-rails

* Move On/Off boolean string translations to I18n, add Yes/No translation

* Make grant permission editing inline via turbo

* continue Make grant permission editing inline via turbo

* Tweak css on contact card

* Add tom-select for type to select

* Import, override tom-select css

* Add tom-select stimulus controller

* Switch to tom-select in new permission form

* Use turbo for all grant permission actions

* Task/fix permission turbo actions (#991)

* Use turbo update to clear the new_permission frame

* Add new permission alphabetically based on last name

* CSS fixes for proper row striping on turbo updates

* Task/remove decorators (#993)

* Remove empty, auto-generated decorators and specs

* Remove all decorators and related specs

* Add helper to get a CSS class based on grant name length

* Remove all things decorator from index

* Put all mailers in their own app/views directory (#997)

* Task/searchable homepage (#995)

* Use stimulus for filtering open grants on homepage 

* Add basic filtering specs

* Quick fix for datepicker error in Firefox (#996)

* Task/add submission award tracking (#1002)

* Fix typo in partial name

* Make a generic stylesheet for tables containing turbo_streams

* Update permission table to use turbo-table stylesheet

* User turbo-table stylesheet and  minimize role-related calls in Submissions index

* Update Submissions index spec to account for turbo-table styles

* WIP: add awarded to submission, use in submissions index page

* WIP: Add optional awarded column to excel view

* WIP: update turbo-rails, hotwire

* Add system specs for awarding submission, clean up or clarify other specs

* Move submission row to partial, fix css striping

* Use shared tests for roles that can un-/award

* WIP: include RecordIdentifier in rails_helper to use dom_id method in system specs

* Use turbo-table style, include award checkbox/form for appropriate admins

* Add specs to confirm who can view awarded form

* Misc partial cleanup, add notice to grant admins about who can view award form/column

* Move export to dedicated controller, limit exported file name length

* Add sorts on Award columns (#1004)

* Update version number and release notes

---------

Co-authored-by: mattbaumann1 <mattbaumann1@users.noreply.github.com>
Co-authored-by: Matthew Baumann <matthew.baumann@northwestern.edu>

Author: jseraf

Gemfile

@@ -22,7 +22,8 @@ gem 'redis', '~> 4.0'
 
 gem 'hotwire-rails'
 gem 'jsbundling-rails'
-gem 'turbo-rails', '~> 1.1'
+gem 'requestjs-rails'
+gem 'turbo-rails',                  '~> 1.4.0'
 
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap',                     '>= 1.1.0', require: false

Gemfile.lock

@@ -164,7 +164,7 @@ GEM
     childprocess (4.1.0)
     cocoon (1.2.15)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     crass (1.0.6)
     debug_inspector (1.1.0)
     devise (4.8.1)
@@ -187,7 +187,7 @@ GEM
       activesupport (>= 5.0)
       request_store (>= 1.0)
       ruby2_keywords
-    erubi (1.11.0)
+    erubi (1.12.0)
     erubis (2.7.0)
     exception_notification (4.5.0)
       actionmailer (>= 5.2, < 8)
@@ -208,7 +208,7 @@ GEM
       sprockets-es6 (>= 0.9.0)
     friendly_id (5.4.2)
       activerecord (>= 4.0.0)
-    globalid (1.0.0)
+    globalid (1.1.0)
       activesupport (>= 5.0)
     haml (5.2.2)
       temple (>= 0.8.0)
@@ -248,7 +248,7 @@ GEM
     listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.18.0)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -257,16 +257,16 @@ GEM
     matrix (0.4.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    minitest (5.16.2)
+    minitest (5.18.0)
     msgpack (1.5.1)
     nested_form (0.3.2)
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
     net-ssh (6.1.0)
     nio4r (2.5.8)
-    nokogiri (1.13.8-x86_64-darwin)
+    nokogiri (1.14.2-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.8-x86_64-linux)
+    nokogiri (1.14.2-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (4.10.2)
@@ -284,9 +284,9 @@ GEM
       activesupport (>= 3.0.0)
     pundit-matchers (1.6.0)
       rspec-rails (>= 3.0.0)
-    racc (1.6.0)
-    rack (2.2.4)
-    rack-test (2.0.2)
+    racc (1.6.2)
+    rack (2.2.6.4)
+    rack-test (2.1.0)
       rack (>= 1.3)
     rails (6.1.5)
       actioncable (= 6.1.5)
@@ -310,8 +310,8 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.5.0)
+      loofah (~> 2.19, >= 2.19.1)
     railties (6.1.5)
       actionpack (= 6.1.5)
       activesupport (= 6.1.5)
@@ -327,6 +327,8 @@ GEM
     regexp_parser (2.3.0)
     request_store (1.5.1)
       rack (>= 1.4)
+    requestjs-rails (0.0.10)
+      rails (>= 6.0.0)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
@@ -425,11 +427,11 @@ GEM
     timeliness (0.4.4)
     trix (0.10.1)
       rails
-    turbo-rails (1.1.1)
+    turbo-rails (1.4.0)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
       railties (>= 6.0.0)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
     uniform_notifier (1.16.0)
@@ -451,7 +453,7 @@ GEM
     wkhtmltopdf-binary (0.12.6.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   x86_64-darwin-18
@@ -508,6 +510,7 @@ DEPENDENCIES
   rails-controller-testing
   ransack!
   redis (~> 4.0)
+  requestjs-rails
   rspec
   rspec-rails (~> 5.0.0)
   rubocop
@@ -520,7 +523,7 @@ DEPENDENCIES
   sprockets-es6
   terser (~> 1.1)
   trix
-  turbo-rails (~> 1.1)
+  turbo-rails (~> 1.4.0)
   tzinfo-data
   validates_timeliness (= 6.0.0.alpha1)
   web-console (>= 3.3.0)

README.md

@@ -26,9 +26,11 @@ The following are required to install competitions:
 
 # Shibboleth IDP
 
-  You will need an IDP for your staging and production instances which may be coordinated with your university or the NIH.
+  The [Devise SAML Authenticatable gem](https://github.com/apokalipto/devise_saml_authenticatable) has been used for authentication. Please see their documentation for more information on configuration.
 
-  [One Login](https://www.onelogin.com/developer-signup) can be used to set up an IDP for development.
+  You will need an IDP for your staging and production instances which may be coordinated with your university, the NIH, or another IDP.
+
+  We have used a docker container for development. Instructions on setting up a local IDP for development can be found in our [WIKI](https://github.com/NUARIG/competitions/wiki/Installation-and-configuration-of-test-saml-idp). Third party venders like [One Login](https://www.onelogin.com/developer-signup) can also be used for a development IDP.
 
 
 # Installation

app/assets/stylesheets/app.scss

@@ -182,6 +182,7 @@ th,
   font-size: .85em;
   font-weight: bold;
   text-align: left;
+  padding: .25em 0;
   vertical-align: bottom;
 }
 
@@ -254,7 +255,8 @@ h2#section {
 }
 
 // grant dates
-#grant-dates {
+#grant-dates,
+#grant-contacts {
   .card-divider {
     padding: .5rem 1rem;
   }
@@ -277,15 +279,51 @@ h2#section {
 }
 
 #turbo-table {
-  margin: 2rem 0;
   border: $table-border;
+  .header {
+    .cell {
+      font-size: .85em;
+      margin-bottom: 0em;
+    }
+  }
 
   .columns {
     border-bottom: $table-border;
     padding: $table-padding;
   }
 
   .turbo-row:nth-of-type(even) {
-    background-color: #f1f1f1;
+    background-color: #F1F1F1;
+  }
+}
+
+.ts-wrapper {
+  height: 2.4375rem;
+  background-color: #FEFEFE;
+  ::placeholder {
+    color: #000;
+  }
+  &.single {
+    .ts-control {
+      box-shadow: none;
+      background-color: #FEFEFE;
+      background-image: none;
+      border-radius: 0;
+      font-size: 1em;
+    }
+  }
+
+  .ts-dropdown {
+    color: #0A0A0A;
+    font-size: 1em;
+    .ts-dropdown-content {
+      font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif;
+    }
+    .active {
+      border: none;
+      background: #F9F9F9;
+      border-radius: 0;
+      color: #0A0A0A;
+    }
   }
-}
+}

app/assets/stylesheets/application.scss

@@ -15,10 +15,11 @@
  *= require_self
  *= require select2
  */
+@import "tom-select/dist/scss/tom-select.default.scss";
 @import "app";
 @import "foundation_and_overrides";
 @import "foundation-datepicker";
 @import "trix/dist/trix";
 @import "./actiontext.scss";
 @import "font-awesome";
-@import "./jquery-ui.css"
+@import "./jquery-ui.css";

app/assets/stylesheets/grant_permissions.scss

@@ -1,16 +1,6 @@
+@import 'settings';
 main.grant_permissions {
   .notification-checkbox{
     padding-top: .3rem;
   }
-
-  .select2-selection {
-    border-radius: 0 !important;
-    border: 1px solid #cacaca !important;
-    height: 2.4375rem !important;
-    padding-top: .25rem !important;
-  }
-
-  .select2-selection__arrow {
-    top: 6px !important;
-  }
-}
+}

app/assets/stylesheets/home.scss

@@ -9,8 +9,18 @@ main.home {
       display: none;
     }
   }
+
+  input {
+    text-align: center;
+  }
+
   #public-grants {
     padding-top: 1rem;
+    .cell {
+      &.filtered {
+        display: none;
+      }
+    }
     .card {
       @include breakpoint(medium) {
         height: 20rem;

app/assets/stylesheets/tables.scss

@@ -0,0 +1,36 @@
+@import 'settings';
+
+.turbo-table {
+  border: 1px solid $light-gray;
+  margin-bottom: 1em;
+
+  .header {
+    background-color: $table-head-background;
+    padding: .5em 0;
+    .cell {
+      align-items: baseline;
+      display: table-cell;
+      font-size: .85em;
+      font-weight: bold;
+    }
+  }
+
+  .rows {
+    border-top: 1px solid $light-gray;
+    .item {
+      border-bottom: 1px solid $light-gray;
+      display: block;
+      &:nth-of-type(odd) {
+        background-color: $white;
+      }
+      &:nth-of-type(even) {
+        background-color: $table-striped-background;
+      }
+      .row {
+        &:hover {
+          background: #FAFAFA;
+        }
+      }
+    }
+  }
+}

app/controllers/banners_controller.rb

@@ -21,11 +21,14 @@ def new
   def create
     @banner = Banner.new(banner_params)
     authorize @banner
-    if @banner.save
-      redirect_to banners_path, notice: t(@banner.visible? ? '.visible_success' : '.not_visible_success')
-    else
-      flash.now[:alert] = @banner.errors.full_messages
-      render :new, status: :unprocessable_entity
+
+    respond_to do |format|
+      if @banner.save
+        format.html { redirect_to banners_path, notice: t(@banner.visible? ? '.visible_success' : '.not_visible_success') }
+      else
+        flash.now[:alert] = @banner.errors.full_messages
+        format.html { render :new, status: :unprocessable_entity }
+      end
     end
   end
 

app/controllers/grant_permissions/users_query_controller.rb

@@ -1,13 +1,18 @@
 module GrantPermissions
   class UsersQueryController < GrantPermissionsController
+    skip_before_action :set_paper_trail_whodunnit, :audit_action
+
     respond_to :json
 
     def index
-      @grant = Grant.find(params[:grant_id])
-      @users = User.where.not(id: @grant.grant_permissions.map(&:user_id))
-        .where("email LIKE ?", "%#{params[:q]}%")
-        .distinct
-      respond_with @users.to_json
+      if params[:q].size >= 3
+        grant = Grant.includes(:grant_permissions).find(params[:grant_id])
+        users = User.where.not(id: grant.grant_permissions.map(&:user_id)).where("email ILIKE ?", "%#{params[:q]}%").distinct
+
+        render json: users.map{ |u| { text: u.email, value: u.id } }
+      else
+        render json: [{}]
+      end
     end
   end
 end