Merge branch 'main' into first_party_analytics

o19s · Dec 2, 2024 · 611e154 · 611e154
2 parents ad9762a + 7fc150f
commit 611e154
Show file tree

Hide file tree

Showing 104 changed files with 908 additions and 1,065 deletions.
diff --git a/Gemfile b/Gemfile
@@ -24,7 +24,6 @@ gem 'devise_invitable', '~> 2.0'
 
 # Using this as it wires in via Sprockets and I can't get npm version to work with the main app.
 # Had no luck with js/svg approach ;-(
-gem 'font-awesome-sass'
 gem 'foreman'
 gem 'importmap-rails', '~> 2.0'
 gem 'intercom-rails'
@@ -33,7 +32,8 @@ gem 'jquery-rails'
 gem 'jquery-ui-rails' # Can we narrow the widgets to load faster?
 gem 'listen', '~> 3.3'
 gem 'local_time'
-gem 'mission_control-jobs'
+gem 'mission_control-jobs', '~> 0.5.0' # git: 'https://github.com/rails/mission_control-jobs.git', branch: 'main'
+
 gem 'mysql2'
 gem 'omniauth'
 gem 'omniauth-keycloak'
@@ -58,8 +58,7 @@ gem 'vega'
 group :development, :test do
   # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
   gem 'debug', platforms: [ :mri, :windows ], require: 'debug/prelude'
-  # gem 'bullet' not Rails 8 compatible
-  gem 'bullet', git: 'https://github.com/adiaz04/bullet.git', branch: 'main'
+  gem 'bullet'
   gem 'memory_profiler'
 end
 
@@ -85,7 +84,7 @@ end
 
 group :test do
   gem 'minitest-reporters', '>= 0.5.0'
-  gem 'mocha', '~> 2.0'
+  gem 'mocha', '~> 2.6'
   gem 'simplecov', require: false
   gem 'webmock'
   gem 'rails-controller-testing' # bring back compatibility with rails 4 assigns in controller tests.

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,12 +1,3 @@
-GIT
-  remote: https://github.com/adiaz04/bullet.git
-  revision: f4b09256b8151c290f6bf4cd6c7aadd829435128
-  branch: main
-  specs:
-    bullet (7.2.0)
-      activesupport (>= 3.0.0)
-      uniform_notifier (~> 1.11)
-
 GIT
   remote: https://github.com/epugh/angular-rails-templates.git
   revision: c45588bec096089e51d84ee3461736f000dff87a
@@ -97,7 +88,7 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
-    acts_as_list (1.2.3)
+    acts_as_list (1.2.4)
       activerecord (>= 6.1)
       activesupport (>= 6.1)
     addressable (2.8.7)
@@ -117,7 +108,7 @@ GEM
     ast (2.4.2)
     base64 (0.2.0)
     bcrypt (3.1.20)
-    benchmark (0.3.0)
+    benchmark (0.4.0)
     benchmark-ips (2.14.0)
     bigdecimal (3.1.8)
     bindata (2.5.0)
@@ -131,6 +122,9 @@ GEM
     bootsnap (1.18.4)
       msgpack (~> 1.2)
     builder (3.3.0)
+    bullet (8.0.0)
+      activesupport (>= 3.0.0)
+      uniform_notifier (~> 1.11)
     cal-heatmap-rails (3.6.2)
     capybara (3.40.0)
       addressable
@@ -208,8 +202,6 @@ GEM
     ffi (1.17.0-aarch64-linux-gnu)
     ffi (1.17.0-x86_64-darwin)
     ffi (1.17.0-x86_64-linux-gnu)
-    font-awesome-sass (6.5.2)
-      sassc (~> 2.0)
     foreman (0.88.1)
     fugit (1.11.1)
       et-orbi (~> 1, >= 1.2.11)
@@ -250,7 +242,7 @@ GEM
       railties (>= 3.2.16)
     js_cookie_rails (2.2.0)
       railties (>= 3.1)
-    json (2.8.1)
+    json (2.8.2)
     json-jwt (1.16.7)
       activesupport (>= 4.2)
       aes_key_wrap
@@ -290,7 +282,7 @@ GEM
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    mission_control-jobs (0.4.0)
+    mission_control-jobs (0.5.0)
       actioncable (>= 7.1)
       actionpack (>= 7.1)
       activejob (>= 7.1)
@@ -300,7 +292,7 @@ GEM
       railties (>= 7.1)
       stimulus-rails
       turbo-rails
-    mocha (2.5.0)
+    mocha (2.6.0)
       ruby2_keywords (>= 0.0.5)
     msgpack (1.7.3)
     multi_xml (0.7.1)
@@ -371,7 +363,7 @@ GEM
     psych (5.2.0)
       stringio
     public_suffix (6.0.1)
-    puma (6.4.3)
+    puma (6.5.0)
       nio4r (~> 2.0)
     pundit (2.4.0)
       activesupport (>= 3.0.0)
@@ -387,7 +379,7 @@ GEM
       rack (>= 3.0.0)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rackup (2.2.0)
+    rackup (2.2.1)
       rack (>= 3)
     rails (8.0.0)
       actioncable (= 8.0.0)
@@ -435,25 +427,25 @@ GEM
     rdoc (6.7.0)
       psych (>= 4.0.0)
     regexp_parser (2.9.2)
-    reline (0.5.10)
+    reline (0.5.11)
       io-console (~> 0.5)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
     rexml (3.3.9)
     rover-df (0.4.1)
       numo-narray (>= 0.9.1.9)
-    rubocop (1.68.0)
+    rubocop (1.69.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.4, < 3.0)
-      rubocop-ast (>= 1.32.2, < 2.0)
+      rubocop-ast (>= 1.36.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.34.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.36.1)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
@@ -477,8 +469,8 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    securerandom (0.3.1)
-    selenium-webdriver (4.26.0)
+    securerandom (0.3.2)
+    selenium-webdriver (4.27.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
@@ -498,7 +490,7 @@ GEM
       activejob (>= 7.2)
       activerecord (>= 7.2)
       railties (>= 7.2)
-    solid_queue (1.0.0)
+    solid_queue (1.0.2)
       activejob (>= 7.1)
       activerecord (>= 7.1)
       concurrent-ruby (>= 1.3.1)
@@ -523,9 +515,11 @@ GEM
       railties (>= 6.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.6.0)
+    unicode-display_width (3.1.2)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
     uniform_notifier (1.16.0)
-    uri (1.0.0)
+    uri (1.0.2)
     useragent (0.16.10)
     vega (0.4.0)
     version_gem (1.1.4)
@@ -566,7 +560,7 @@ DEPENDENCIES
   bcrypt (~> 3.1.7)
   blazer (~> 3.1)
   bootsnap
-  bullet!
+  bullet
   cal-heatmap-rails (~> 3.6)
   capybara
   colorize
@@ -577,7 +571,6 @@ DEPENDENCIES
   devise (>= 4.6.2)
   devise_invitable (~> 2.0)
   error_highlight (>= 0.4.0)
-  font-awesome-sass
   foreman
   geocoder (~> 1.8)
   geoip (~> 1.6)
@@ -591,8 +584,8 @@ DEPENDENCIES
   local_time
   memory_profiler
   minitest-reporters (>= 0.5.0)
-  mission_control-jobs
-  mocha (~> 2.0)
+  mission_control-jobs (~> 0.5.0)
+  mocha (~> 2.6)
   mysql2
   omniauth
   omniauth-google-oauth2

diff --git a/app/assets/images/openid-logo.png b/app/assets/images/openid-logo.png
diff --git a/app/assets/javascripts/components/add_member/add_member.html b/app/assets/javascripts/components/add_member/add_member.html
@@ -1,5 +1,5 @@
 <div class='form-group'>
-    <form class="form input-append">
+    <form class="form input-append vertically-centered">
         <input id="user-lookup" class="form-control email" size="30" type="text" ng-model="ctrl.selected"
             placeholder="Look for users via email or display name"
             uib-typeahead="user as user.display_name for user in ctrl.getUsers($viewValue)"
@@ -15,7 +15,7 @@
             ng-click="ctrl.inviteUserToJoin()">
             Send invitation
         </a>
-        <i ng-show="loadingUsers" class="fa fa-spinner fa-spin"></i>
+        <i ng-show="loadingUsers" class="spinner"></i>
     </form>
 
     <p class='help-block'>

diff --git a/app/assets/javascripts/components/add_query/add_query.html b/app/assets/javascripts/components/add_query/add_query.html
@@ -1,4 +1,4 @@
-<form class="form input-append">
+<form class="form input-append vertically-centered">
   <input
     id="add-query"
     class="form-control"
@@ -17,5 +17,5 @@
     value="{{ ctrl.text.indexOf(';') === -1 ? 'Add query' : 'Add queries' }}"
    />
 
-  <i class="fa fa-spinner fa-spin" ng-class="{'hidden': !ctrl.loading}"></i>
+  <i class="spinner" ng-class="{'hidden': !ctrl.loading}">/>
 </form>
diff --git a/app/assets/javascripts/components/annotation/annotation.html b/app/assets/javascripts/components/annotation/annotation.html
@@ -1,19 +1,19 @@
 <li class='annotation'>
   <div class="dropdown pull-right" uib-dropdown>
     <a uib-dropdown-toggle>
-      <i class="fa fa-bars"></i>
+      <i class="glyphicon glyphicon-menu-hamburger"></i>
     </a>
 
     <ul class="dropdown-menu" uib-dropdown-menu>
       <li>
         <a ng-click='ctrl.update()'>
-          <i class='fa fa-edit'></i>
+          <i class='glyphicon glyphicon-pencil'></i>
           Edit
         </a>
       </li>
       <li>
         <a ng-click='ctrl.delete()' class='text-danger'>
-          <i class='fa fa-trash'></i>
+          <i class='glyphicon glyphicon-trash'></i>
           Delete
         </a>
       </li>
@@ -35,7 +35,7 @@
       Try No: {{ ctrl.theAnnotation.score.try_id }}
     </span>
 
-    <i class='fa fa-circle'></i>
+    <i class='bi bi-circle-fill'></i>
 
     <span class='annotation-score'>
       Score: {{ ctrl.theAnnotation.score.score }}

diff --git a/app/assets/javascripts/components/archive_case/archive_case.html b/app/assets/javascripts/components/archive_case/archive_case.html
@@ -1,6 +1,6 @@
 <a class="action-icon" ng-click="ctrl.openArchiveModal()">
   <i
-    class="fa fa-archive"
+    class="bi bi-archive-fill"
     aria-hidden="true"
     title="Archive"
     alt="Archive"

diff --git a/app/assets/javascripts/components/archive_search_endpoint/archive_search_endpoint.html b/app/assets/javascripts/components/archive_search_endpoint/archive_search_endpoint.html
@@ -1,6 +1,6 @@
 <a class="action-icon" ng-click="ctrl.openArchiveModal()">
   <i
-    class="fa fa-archive"
+    class="bi bi-archive-fill"
     aria-hidden="true"
     title="Archive"
     alt="Archive"

diff --git a/app/assets/javascripts/components/book_listing/book_listing.html b/app/assets/javascripts/components/book_listing/book_listing.html
@@ -21,7 +21,7 @@
 
       <a ng-href="books/{{ctrl.book.id}}/edit" target="_self" class="action-icon">
         <i
-          class="fa fa-edit"
+          class="glyphicon glyphicon-pencil"
           aria-hidden="true"
           title="Edit"
           alt="Edit"

diff --git a/app/assets/javascripts/components/case_listing/case_listing.html b/app/assets/javascripts/components/case_listing/case_listing.html
@@ -14,7 +14,7 @@
         </span>
         <br/>
         <span class="item-actions">
-          <action-icon title="'Rename'" icon-class="'fa fa-edit'" fn-call="ctrl.rename()"></action-icon>
+          <action-icon title="'Rename'" icon-class="'glyphicon glyphicon-pencil'" fn-call="ctrl.rename()"></action-icon>
 
           <delete-case this-case="ctrl.thisCase"></delete-case>
           <archive-case this-case="ctrl.thisCase"></archive-case>
@@ -50,7 +50,7 @@
     {{ ctrl.thisCase.lastScore.score }}
 
     <span ng-show="ctrl.thisCase.lastScore.all_rated === false" class='text-warning' title="Hop to it!  There are unrated results!">
-      <i class="fa fa-frog"></i>
+      <i class="bi bi-balloon-fill"></i>
     </span>
   </div>
 

diff --git a/app/assets/javascripts/components/clone_case/clone_case.html b/app/assets/javascripts/components/clone_case/clone_case.html
@@ -1,4 +1,4 @@
-<i class="fa fa-clone" aria-hidden="true"></i>
+<i class="bi bi-copy" aria-hidden="true"></i>
 <a ng-click="ctrl.prompt()">
   Clone
 </a>
diff --git a/app/assets/javascripts/components/clone_scorer/clone_scorer.html b/app/assets/javascripts/components/clone_scorer/clone_scorer.html
@@ -1 +1 @@
-<action-icon title="'Clone'" icon-class="'fa fa-clone'" fn-call="ctrl.cloneScorer()"></action-icon>
+<action-icon title="'Clone'" icon-class="'bi bi-copy'" fn-call="ctrl.cloneScorer()"></action-icon>
diff --git a/app/assets/javascripts/components/delete_case/delete_case.html b/app/assets/javascripts/components/delete_case/delete_case.html
@@ -1,6 +1,6 @@
 <a class="action-icon" ng-click="ctrl.openDeleteModal()">
   <i
-    class="fa fa-trash"
+    class="glyphicon glyphicon-trash"
     aria-hidden="true"
     title="Delete"
     alt="Delete"

diff --git a/app/assets/javascripts/components/delete_case_options/delete_case_options.html b/app/assets/javascripts/components/delete_case_options/delete_case_options.html
@@ -1,4 +1,4 @@
-<i class="fa fa-remove" aria-hidden="true"></i>
+<i class="bi bi-x-lg" aria-hidden="true"></i>
 <a ng-click="ctrl.prompt()">
   Delete
 </a>
diff --git a/app/assets/javascripts/components/delete_scorer/delete_scorer.html b/app/assets/javascripts/components/delete_scorer/delete_scorer.html
@@ -1,6 +1,6 @@
 <a class="action-icon" ng-click="ctrl.openDeleteModal()">
   <i
-    class="fa fa-trash"
+    class="glyphicon glyphicon-trash"
     aria-hidden="true"
     title="Delete"
     alt="Delete"

diff --git a/app/assets/javascripts/components/diff/_modal.html b/app/assets/javascripts/components/diff/_modal.html
@@ -22,7 +22,7 @@ <h3 class="modal-title">Compare Your Search Results</h3>
         ng-click="ctrl.toggleDel(ctrl.selection)"
         title="delete"
       >
-        <i class='fa fa-times'></i>
+        <i class='bi bi-x-lg'></i>
       </a>
 
       <div class="alert alert-warning" ng-show="ctrl.delStarted()">

diff --git a/app/assets/javascripts/components/diff/diff.html b/app/assets/javascripts/components/diff/diff.html
@@ -1,4 +1,4 @@
-<i class="fa fa-chart-bar" aria-hidden="true"></i>
+<i class="bi bi-bar-chart-fill" aria-hidden="true"></i>
 <a ng-click="ctrl.prompt()">
   Compare snapshots
 </a>
diff --git a/app/assets/javascripts/components/edit_scorer/edit_scorer.html b/app/assets/javascripts/components/edit_scorer/edit_scorer.html
@@ -1 +1 @@
-<action-icon title="'Edit'" icon-class="'fa fa-edit'" fn-call="ctrl.editScorer()"></action-icon>
+<action-icon title="'Edit'" icon-class="'glyphicon glyphicon-pencil'" fn-call="ctrl.editScorer()"></action-icon>
diff --git a/app/assets/javascripts/components/expand_content/expand_content.html b/app/assets/javascripts/components/expand_content/expand_content.html
@@ -3,5 +3,5 @@
   ng-click="ctrl.expand()"
 >
   Expand
-  <i class="fa fa-expand"></i>
+  <i class="bi bi-arrows-angle-expand"></i>
 </a>
diff --git a/app/assets/javascripts/components/export_case/_modal.html b/app/assets/javascripts/components/export_case/_modal.html
@@ -25,7 +25,7 @@ <h3 class="modal-title">Export Case: <span class="modal-case">{{ ctrl.theCase.ca
     <input type="radio" id="detailed" name="exportSelection" value="detailed" ng-model="ctrl.options.which">
     <label for="detailed" class="disabled">Detailed</label>
     <p ng-if="ctrl.options.which==='detailed' && !ctrl.supportsDetailedExport" class='bg-warning text-warning padded-text'>
-      <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+      <i class="bi bi-exclamation-triangle-fill" aria-hidden="true"></i>
       Detailed export is only supported from the individual Case view.
     </p>
     <span class="help-block">