Skip to content

Commit

Permalink
Release/1.21 (#1059)
Browse files Browse the repository at this point in the history 
* Task/submission review assignments (#1046)

* WIP: misc formatting, typos, cleanup

* WIP: add modal to layout

* WIP: add modal controller

* WIP: add assign review modal

* WIP: Use modal on grant submissions index

* WIP: remove policy scope from submissions controller

* WIP: add submission.eligible_reviewers specs

* WIP: update submission index specs

* WIP: display explanation when reviewer/review limits reached

* WIP: resolve merge conflict

* WIP: additional modal close options

* Redirect opt-out reviewer to grant, update specs (#1047)

* Move modal frame to a partial (#1048)

* Update jquery-ui-rails gem (#1049)

* Task/rework reviewer assignment page (#1053)

* Redesign reviewer tab and review assignment process

* Add assignment of reviews to the Submission page

* Task/update manage links (#1055)

* Update manage grant links

* Add specs for panel and permissions links

* WIP: remove condition for edit link display

* Task/fix grant redirect on slug change (#1056)

* Reload grant on edit to get current friendly url

* WIP: add friendly url spec, remove instance variables

* WIP: rubocop refactor, code and comment cleanup

* WIP: add draft banner specs

* Task/misc updates (#1057)

* WIP: removed unused scope

* WIP: delete unused partial

* WIP: Clarify tool tip text for score count and scores

* WIP: Remove unused css file

* WIP: prevent page bouncing on clear file button click

* WIP: remove file clear button after click

* Reduce n+1 queries on panel page

* Bump rails, hotwire

* Add stimulus controller to Remove disallowed characters from slug input

* Hide assign review on Submission index after review period

* Code cleanup

* Bump version, update release notes
  • Loading branch information
@jseraf
jseraf authored Jul 9, 2024
1 parent f8937b2 commit ee1657a
Show file tree
Hide file tree
Showing 85 changed files with 1,782 additions and 823 deletions.
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ gem 'foundation-datepicker-rails'
gem 'friendly_id', '~> 5.5.0'
gem 'haml-rails', '~> 2.0'
gem 'jquery-rails', '~> 4.6.0'
gem 'jquery-ui-rails'
gem 'jquery-ui-rails', '~> 7.0.0'
gem 'pagy', '~> 6.2.0'
gem 'ransack', '~> 3.2.1'
gem 'sprockets-es6'
Expand Down
146 changes: 73 additions & 73 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,67 +1,67 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (7.0.8.1)
actionpack (= 7.0.8.1)
activesupport (= 7.0.8.1)
actioncable (7.0.8.4)
actionpack (= 7.0.8.4)
activesupport (= 7.0.8.4)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.8.1)
actionpack (= 7.0.8.1)
activejob (= 7.0.8.1)
activerecord (= 7.0.8.1)
activestorage (= 7.0.8.1)
activesupport (= 7.0.8.1)
actionmailbox (7.0.8.4)
actionpack (= 7.0.8.4)
activejob (= 7.0.8.4)
activerecord (= 7.0.8.4)
activestorage (= 7.0.8.4)
activesupport (= 7.0.8.4)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.8.1)
actionpack (= 7.0.8.1)
actionview (= 7.0.8.1)
activejob (= 7.0.8.1)
activesupport (= 7.0.8.1)
actionmailer (7.0.8.4)
actionpack (= 7.0.8.4)
actionview (= 7.0.8.4)
activejob (= 7.0.8.4)
activesupport (= 7.0.8.4)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.8.1)
actionview (= 7.0.8.1)
activesupport (= 7.0.8.1)
actionpack (7.0.8.4)
actionview (= 7.0.8.4)
activesupport (= 7.0.8.4)
rack (~> 2.0, >= 2.2.4)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.8.1)
actionpack (= 7.0.8.1)
activerecord (= 7.0.8.1)
activestorage (= 7.0.8.1)
activesupport (= 7.0.8.1)
actiontext (7.0.8.4)
actionpack (= 7.0.8.4)
activerecord (= 7.0.8.4)
activestorage (= 7.0.8.4)
activesupport (= 7.0.8.4)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.8.1)
activesupport (= 7.0.8.1)
actionview (7.0.8.4)
activesupport (= 7.0.8.4)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (7.0.8.1)
activesupport (= 7.0.8.1)
activejob (7.0.8.4)
activesupport (= 7.0.8.4)
globalid (>= 0.3.6)
activemodel (7.0.8.1)
activesupport (= 7.0.8.1)
activerecord (7.0.8.1)
activemodel (= 7.0.8.1)
activesupport (= 7.0.8.1)
activestorage (7.0.8.1)
actionpack (= 7.0.8.1)
activejob (= 7.0.8.1)
activerecord (= 7.0.8.1)
activesupport (= 7.0.8.1)
activemodel (7.0.8.4)
activesupport (= 7.0.8.4)
activerecord (7.0.8.4)
activemodel (= 7.0.8.4)
activesupport (= 7.0.8.4)
activestorage (7.0.8.4)
actionpack (= 7.0.8.4)
activejob (= 7.0.8.4)
activerecord (= 7.0.8.4)
activesupport (= 7.0.8.4)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.8.1)
activesupport (7.0.8.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand Down Expand Up @@ -106,7 +106,7 @@ GEM
debug_inspector (>= 0.0.1)
bootsnap (1.17.0)
msgpack (~> 1.2)
builder (3.2.4)
builder (3.3.0)
bullet (7.0.1)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
Expand Down Expand Up @@ -148,7 +148,7 @@ GEM
caxlsx (>= 3.0)
cocoon (1.2.15)
coderay (1.1.3)
concurrent-ruby (1.2.3)
concurrent-ruby (1.3.3)
crass (1.0.6)
date (3.3.4)
debug_inspector (1.1.0)
Expand All @@ -165,7 +165,7 @@ GEM
discard (1.3.0)
activerecord (>= 4.2, < 8)
docile (1.4.0)
erubi (1.12.0)
erubi (1.13.0)
exception_notification (4.5.0)
actionmailer (>= 5.2, < 8)
activesupport (>= 5.2, < 8)
Expand Down Expand Up @@ -203,7 +203,7 @@ GEM
stimulus-rails
turbo-rails
htmlentities (4.3.4)
i18n (1.14.4)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
i18n-debug (1.2.0)
i18n (< 2)
Expand All @@ -215,7 +215,7 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (6.0.1)
jquery-ui-rails (7.0.0)
railties (>= 3.2.16)
jsbundling-rails (1.2.2)
railties (>= 6.0.0)
Expand All @@ -232,12 +232,12 @@ GEM
net-smtp
marcel (1.0.4)
matrix (0.4.2)
method_source (1.0.0)
method_source (1.1.0)
mini_mime (1.1.5)
minitest (5.22.3)
minitest (5.24.0)
msgpack (1.7.2)
nested_form (0.3.2)
net-imap (0.4.10)
net-imap (0.4.14)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -246,15 +246,15 @@ GEM
timeout
net-scp (3.0.0)
net-ssh (>= 2.6.5, < 7.0.0)
net-smtp (0.4.0.1)
net-smtp (0.5.0)
net-protocol
net-ssh (6.1.0)
nio4r (2.7.0)
nokogiri (1.16.3-arm64-darwin)
nio4r (2.7.3)
nokogiri (1.16.6-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.3-x86_64-darwin)
nokogiri (1.16.6-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.3-x86_64-linux)
nokogiri (1.16.6-x86_64-linux)
racc (~> 1.4)
orm_adapter (0.5.0)
pagy (6.2.0)
Expand All @@ -275,24 +275,24 @@ GEM
rspec-expectations (~> 3.12)
rspec-mocks (~> 3.12)
rspec-support (~> 3.12)
racc (1.7.3)
rack (2.2.8.1)
racc (1.8.0)
rack (2.2.9)
rack-test (2.1.0)
rack (>= 1.3)
rails (7.0.8.1)
actioncable (= 7.0.8.1)
actionmailbox (= 7.0.8.1)
actionmailer (= 7.0.8.1)
actionpack (= 7.0.8.1)
actiontext (= 7.0.8.1)
actionview (= 7.0.8.1)
activejob (= 7.0.8.1)
activemodel (= 7.0.8.1)
activerecord (= 7.0.8.1)
activestorage (= 7.0.8.1)
activesupport (= 7.0.8.1)
rails (7.0.8.4)
actioncable (= 7.0.8.4)
actionmailbox (= 7.0.8.4)
actionmailer (= 7.0.8.4)
actionpack (= 7.0.8.4)
actiontext (= 7.0.8.4)
actionview (= 7.0.8.4)
activejob (= 7.0.8.4)
activemodel (= 7.0.8.4)
activerecord (= 7.0.8.4)
activestorage (= 7.0.8.4)
activesupport (= 7.0.8.4)
bundler (>= 1.15.0)
railties (= 7.0.8.1)
railties (= 7.0.8.4)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
Expand All @@ -304,15 +304,15 @@ GEM
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.0.8.1)
actionpack (= 7.0.8.1)
activesupport (= 7.0.8.1)
railties (7.0.8.4)
actionpack (= 7.0.8.4)
activesupport (= 7.0.8.4)
method_source
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
rainbow (3.1.1)
rake (13.1.0)
rake (13.2.1)
ransack (3.2.1)
activerecord (>= 6.1.5)
activesupport (>= 6.1.5)
Expand Down Expand Up @@ -410,7 +410,7 @@ GEM
sshkit (1.21.2)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
stimulus-rails (1.0.4)
stimulus-rails (1.3.3)
railties (>= 6.0.0)
temple (0.10.3)
terser (1.1.11)
Expand All @@ -419,7 +419,7 @@ GEM
tilt (2.3.0)
timeliness (0.4.5)
timeout (0.4.1)
turbo-rails (2.0.2)
turbo-rails (2.0.5)
actionpack (>= 6.0.0)
activejob (>= 6.0.0)
railties (>= 6.0.0)
Expand Down Expand Up @@ -447,7 +447,7 @@ GEM
wkhtmltopdf-binary (0.12.6.6)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.13)
zeitwerk (2.6.16)

PLATFORMS
arm64-darwin-22
Expand Down Expand Up @@ -490,7 +490,7 @@ DEPENDENCIES
i18n-debug
jbuilder (~> 2.5)
jquery-rails (~> 4.6.0)
jquery-ui-rails
jquery-ui-rails (~> 7.0.0)
jsbundling-rails
listen (~> 3.5.1)
nested_form
Expand Down
62 changes: 62 additions & 0 deletions app/assets/stylesheets/app.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ header {
main {
.callout {
height: fit-content;
list-style: inside;
width: 100%;
a {
text-decoration: underline;
Expand Down Expand Up @@ -193,6 +194,26 @@ td,
ul.menu a {
padding-top: 0.25em;
}
.manage {
padding-left: 0rem;
padding-top: 0.15rem;

ul.dropdown {
li.text {
a {
background: none;
}

ul {
min-width: 150px;

a {
padding: 0.25rem .5rem;
}
}
}
}
}
}

// submission labels contain paragraphs
Expand Down Expand Up @@ -328,3 +349,44 @@ h2#section {
}
}
}

#modal-container {
.modal-background {
width: 100%;
height: 100%;
background-color: rgba(0,0,0,0.5);
position: fixed;
top: 0;
left: 0;
display: block;
z-index: 998;
}
.content {
/* Note: responsive width is set in the content view */
background-color: #fff;
box-sizing: border-box;
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
margin: auto;
padding: 1.5rem;
display: block;
height: calc(40vh);
z-index: 999;
overflow-y: auto;
.close-button {
font-size: 2rem;
}
.callout {
font-size: .85em;
&.alert {
font-weight: bold;
}
li {
margin-top: 0;
}
}
}
}
3 changes: 3 additions & 0 deletions app/assets/stylesheets/foundation_and_overrides.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@
.help-text {
color: $dark-gray;
padding-left: 0.15em;
a {
opacity: 0.8;
}
}

label {
Expand Down
Loading

0 comments on commit ee1657a

Please sign in to comment.