ucb_rails_user 8.0.3 → 8.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 918695706c657e124473ab9b924deba0613340af5fec3de9db28c8e67cbe5512
-  data.tar.gz: a53245a84b4150f134b84bf72cece17e2da3b71d565ba4b1ad2e48424558e3d8
+  metadata.gz: 33c1423ac635977abc651ba960a571fb70f398d436475d701f8932b06f54b361
+  data.tar.gz: 15d1eadd248c5a83ef7bc45511e7920721c344f24594eb9083856fb5343a545c
 SHA512:
-  metadata.gz: 126345f6c3015d8fe72e8f6ed957c8b34e2546ef171db042d3878652ef3381e52a4bef61f007eafa066c015e7b7cd18741bbaa4e1e49d75aa310cf0f954ff8cd
-  data.tar.gz: ebcbb49bbfc56404249408beeea6ee80d2d999c712efbc23e6e32fd64d9079189235066edfdd9afc83efb2d67e632426b7a64393c4e8c7532cd71c0547932221
+  metadata.gz: 23e75ecaf5356a46eb33bda871f6fdb6f0416b3d8b27bbaf5c3fba830ec5cb00958d23997cf6139ff3918c7d33907dfb8df64197bcbcadcc6ae9ddd9c17d95a2
+  data.tar.gz: 35eb226797cc645fdb3a7f2798bb0dc88315e9c62e5ff5e0eb8e317c59fb3581032417139c794e7c5833c3dbd724b1704c575a718297a6414cae7317dc0b8c71

data/app/assets/javascripts/ucb_rails_user/ucb_rails_user.js

@@ -35,20 +35,6 @@ var addDatatablesToUsersTable = function () {
   $('.ucb-rails-users-table-wrapper #DataTables_Table_0_filter').append(addNewHtml)
 }
 
-var resetImpersonateButton = function() {
-  var targetId = $('#ucb_rails_user_impersonation_target_id').val()
-  if (targetId != null && targetId.toString().length > 0) {
-    $('input[data-impersonate-button]').removeAttr('disabled')
-  } else {
-    $('input[data-impersonate-button]').attr('disabled', 'disabled')
-  }
-}
-
-var clearImpersonateSelection = function() {
-  $('#ucb_rails_user_impersonation_target_id').val('')
-  resetImpersonateButton()
-}
-
 $( window ).on("load", function() {
   // the datatable calling was failing intermittently, but adding the timeout
   // seemed to fix it, so ¯\_(ツ)_/¯
@@ -58,46 +44,4 @@ $( window ).on("load", function() {
     $('.search-results').hide()
     $('.ucb-rails-user-loader').show()
   })
-
-  var usersSource = new Bloodhound({
-    datumTokenizer: Bloodhound.tokenizers.obj.whitespace('value'),
-    queryTokenizer: Bloodhound.tokenizers.whitespace,
-    remote: {
-      url: '/admin/users/impersonate_search?q=%QUERY',
-      wildcard: '%QUERY'
-    }
-  });
-
-  $('#ucb_rails_user_impersonation_target').typeahead(null, {
-    name: 'users',
-    source: usersSource,
-    display: 'name',
-    limit: 7, // any higher than this, and the results don't display properly
-    templates: {
-      empty: [
-        '<div class="empty-message">',
-        'No match found',
-        '</div>'
-      ].join('\n'),
-      suggestion: function (data) {
-        return '<div><strong>' + data.name + '</strong> (' + data.uid + ')</div>'
-      }
-    }
-  });
-
-  $('#ucb_rails_user_impersonation_target').keyup(function(event) {
-    if ($(event.target).val().length == 0) {
-      clearImpersonateSelection()
-    }
-  })
-
-  $('#ucb_rails_user_impersonation_target').bind('typeahead:open', function(event, suggestion) {
-    clearImpersonateSelection()
-  })
-
-  $('#ucb_rails_user_impersonation_target').bind('typeahead:select', function(event, suggestion) {
-    $('#ucb_rails_user_impersonation_target_id').val(suggestion.id)
-    resetImpersonateButton()
-  })
-
 })

data/app/assets/stylesheets/ucb_rails_user/components/impersonations.css

@@ -10,3 +10,29 @@
   .recent-impersonations li {
     list-style-type: none;
     font-size: 110%; }
+
+.impersonate_search_results_container {
+  margin-top: 10px;
+}
+
+.impersonate_result_list {
+  list-style: none; 
+  padding: 0; 
+  margin-top: 10px;
+}
+
+.impersonate_result_list_item {
+  padding: 8px;
+  border-bottom: 1px solid #eee;
+}
+
+.impersonate_no_results_found {
+  margin-top: 10px; 
+  color: #999;
+}
+
+.impersonate_before_search {
+  margin-top: 10px; 
+  color: #666;
+}
+

data/app/assets/stylesheets/ucb_rails_user/components/users_table.css

@@ -65,3 +65,39 @@ h1 {
   padding-left: 10px;
   padding-right: 10px;
 }
+
+.user_sort {
+  text-decoration: none;
+  color: inherit;
+}
+
+.user_form_container {
+  margin-top: 10px;
+  overflow: auto;
+  margin-bottom: 10px;
+  vertical-align: middle;
+}
+
+.user_form_base_style {
+  display: flex; 
+  gap: 10px;
+  align-items:
+  center; flex-grow: 1;
+}
+
+.user_form_return_count {
+  float: left; 
+  padding-right: 15px;
+}
+
+.user_form_search_box {
+  float: left;
+}
+
+.user_form_add_user_link {
+  float: right;
+}
+
+.user_turbo_frame_users {
+  margin-bottom: 10px;
+}

data/app/controllers/concerns/ucb_rails_user/users_controller_concerns.rb

@@ -37,8 +37,12 @@ module UcbRailsUser::UsersControllerConcerns
   end
 
   def impersonate_search
-    result = UcbRailsUser::UserSearch.find_users_by_name(params[:q])
-    render json: result.map { |u| { name: u.full_name, id: u.id, uid: u.ldap_uid } }
+    @query = params[:q]
+    @results = if @query.present? && @query.length >= 2
+      UcbRailsUser::UserSearch.find_users_by_name(@query)
+    else
+      []
+    end
   end
 
   def edit
@@ -124,8 +128,7 @@ module UcbRailsUser::UsersControllerConcerns
   private
 
   def search_user_table(query)
-    UcbRailsUser.user_class.where('lower(first_name) like lower(:q) or lower(last_name) like lower(:q) or ldap_uid like :q or employee_id like :q',
-                                  q: '%' + query + '%')
+    UcbRailsUser.user_class.where('lower(first_name) like lower(:q) or lower(last_name) like lower(:q) or lower(email) like lower(:q) or lower(alternate_email) like lower(:q) or ldap_uid like :q or ldap_uid like :q or employee_id like :q', q: '%' + query + '%')
   end
 
   def user_params(extra_params = [])

data/app/views/ucb_rails_user/impersonations/index.html.erb

@@ -6,10 +6,22 @@
   </div>
 <% else %>
   <div class="impersonation-form">
-    <%= simple_form_for UcbRailsUser::Impersonation.new, url: admin_impersonations_path, method: :post do |f| %>
-      <%= f.input :target, label: "User", input_html: { class: "typeahead" } %>
-      <%= f.input :target_id, as: :hidden %>
-      <%= f.button :submit, value: "Impersonate", class: "btn btn-primary", disabled: true, data: { impersonate_button: true } %>
+    <%= form_with url: admin_user_impersonate_search_path, method: :get, data: { turbo_frame: "search_results" } do |f| %>
+      <%= f.label :q, "Search for user:" %>
+      <%= f.search_field :q, placeholder: "Enter name...", oninput: "
+        clearTimeout(window.impersonateSearchTimer);
+        window.impersonateSearchTimer = setTimeout(() => {
+          if (this.value.length >= 2) {
+            this.form.requestSubmit();
+          }
+        }, 300);
+      " %>
+    <% end %>
+
+    <%= turbo_frame_tag "search_results" do %>
+      <div style="margin-top: 10px; color: #666;">
+        Type at least 2 characters to search for a user...
+      </div>
     <% end %>
   </div>
 <% end %>
@@ -20,7 +32,7 @@
     <ul>
       <% current_user.recent_impersonations.each do |imp| %>
         <li>
-          <%= link_to full_name_with_uid(imp.target), "#{admin_impersonations_path}?ucb_rails_user_impersonation[target_id]=#{imp.target.id}", method: :post %>
+          <%= link_to full_name_with_uid(imp.target), admin_impersonations_path(ucb_rails_user_impersonation: { target_id: imp.target.id }), data: { turbo_method: :post, turbo_frame: "_top" } %>
         </li>
       <% end %>
     </ul>

data/app/views/ucb_rails_user/users/impersonate_search.html.erb

@@ -0,0 +1,25 @@
+<%= turbo_frame_tag "search_results" do %>
+  <% if @results.any? %>
+    <div class="impersonate_search_results_container">
+      <strong>Search results for "<%= @query %>":</strong>
+      <ul class="impersonate_result_list">
+        <% @results.each do |user| %>
+          <li class="impersonate_result_list_item">
+            <%= link_to admin_impersonations_path(ucb_rails_user_impersonation: { target_id: user.id }), data: { turbo_method: :post, turbo_frame: "_top" }, style: "text-decoration: none; color: inherit; display: block;" do %>
+              <strong><%= user.full_name %></strong>
+              <span style="color: #666; margin-left: 10px;">(<%= user.ldap_uid %>)</span>
+            <% end %>
+          </li>
+        <% end %>
+      </ul>
+    </div>
+  <% elsif @query.present? && @query.length >= 2 %>
+    <div class="impersonate_no_results_found">
+      No users found matching "<%= @query %>"
+    </div
+  <% else %>
+    <div class="impersonate_before_search">
+      Type at least 2 characters to search for a user...
+    </div>
+  <% end %>
+<% end %>

data/app/views/ucb_rails_user/users/index.html.erb

@@ -1,18 +1,30 @@
 <div class="ucb-rails-users-table-header">
   <h1>Users</h1>
-  <%= link_to "Add User", new_admin_user_path, class: "btn btn-primary", style: "float: right;" %>
 </div>
 
 <%= turbo_frame_tag "users" do %>
-  <div style="margin-top: 10px; overflow: auto; margin-bottom: 10px; vertical-align: middle; ">
-    <%= form_with url: "", method: :get, data: { turbo_frame: "users" }, style: "display: flex; gap: 10px; align-items: center; flex-grow: 1;" do |form| %>
+  <% if flash[:notice] || flash[:error] || flash[:alert] %>
+    <div class="user_turbo_frame_users">
+      <% if flash[:notice] %>
+        <div class="alert alert-info"><%= flash[:notice] %></div>
+      <% end %>
+      <% if flash[:error] %>
+        <div class="alert alert-danger"><%= flash[:error] %></div>
+      <% end %>
+      <% if flash[:alert] %>
+        <div class="alert alert-warning"><%= flash[:alert] %></div>
+      <% end %>
+    </div>
+  <% end %>
+  <div class="user_form_container">
+    <%= form_with url: "", method: :get, data: { turbo_frame: "users" }, class: "user_form_base_style" do |form| %>
       <%= form.hidden_field :sort, value: @sort %>
       <%= form.hidden_field :dir, value: @sort_dir %>
-      <div style="float: left; padding-right: 15px">
+      <div class="user_form_return_count">
         Show <%= form.select :count, options_for_select([10, 25, 50, 100], selected: params[:count]), {}, { onchange: "this.form.requestSubmit()" } %>
       </div>
-      <div style="float: left;">
-        Search <%= form.search_field :query, value: params[:query], id: "user_search_field", placeholder: "Search users...", oninput: "
+      <div class="user_form_search_box">
+        Search <%= form.search_field :query, value: params[:query], id: "user_search_field", placeholder: "Search users...", data: { turbo_permanent: true }, oninput: "
               clearTimeout(window.searchTimer);
               window.searchTimer = setTimeout(() => {
                 this.form.requestSubmit();
@@ -20,13 +32,16 @@
             " %>
       </div>
     <% end %>
+    <div class="user_form_add_user_link">
+      <%= link_to "Add User", new_admin_user_path, class: "btn btn-primary" %>
+    </div>
   </div>
   <div class="table-responsive ucb-rails-users-table-wrapper">
     <table class="table table-striped table-bordered table-hover ucb-rails-users-table">
       <thead>
         <tr>
           <th class="min">
-            <%= link_to admin_users_path(sort: "superuser_flag", dir: @sort == "superuser_flag" && @sort_dir == "asc" ? "desc" : "asc", query: params[:query], count: params[:count]), data: { turbo_frame: "users" }, style: "text-decoration: none; color: inherit;" do %>
+            <%= link_to admin_users_path(sort: "superuser_flag", dir: @sort == "superuser_flag" && @sort_dir == "asc" ? "desc" : "asc", query: params[:query], count: params[:count]), data: { turbo_frame: "users" }, class: "user_sort" do %>
               Superuser?
               <% if @sort == "superuser_flag" %>
                 <%= @sort_dir == "asc" ? "▲" : "▼" %>
@@ -34,7 +49,7 @@
             <% end %>
           </th>
           <th class="min">
-            <%= link_to admin_users_path(sort: "inactive_flag", dir: @sort == "inactive_flag" && @sort_dir == "asc" ? "desc" : "asc", query: params[:query], count: params[:count]), data: { turbo_frame: "users" }, style: "text-decoration: none; color: inherit;" do %>
+            <%= link_to admin_users_path(sort: "inactive_flag", dir: @sort == "inactive_flag" && @sort_dir == "asc" ? "desc" : "asc", query: params[:query], count: params[:count]), data: { turbo_frame: "users" }, class: "user_sort"  do %>
               Inactive?
               <% if @sort == "inactive_flag" %>
                 <%= @sort_dir == "asc" ? "▲" : "▼" %>
@@ -42,7 +57,7 @@
             <% end %>
           </th>
           <th>
-            <%= link_to admin_users_path(sort: "first_name", dir: @sort == "first_name" && @sort_dir == "asc" ? "desc" : "asc", query: params[:query], count: params[:count]), data: { turbo_frame: "users" }, style: "text-decoration: none; color: inherit;" do %>
+            <%= link_to admin_users_path(sort: "first_name", dir: @sort == "first_name" && @sort_dir == "asc" ? "desc" : "asc", query: params[:query], count: params[:count]), data: { turbo_frame: "users" }, class: "user_sort" do %>
               First Name
               <% if @sort == "first_name" %>
                 <%= @sort_dir == "asc" ? "▲" : "▼" %>
@@ -50,7 +65,7 @@
             <% end %>
           </th>
           <th>
-            <%= link_to admin_users_path(sort: "last_name", dir: @sort == "last_name" && @sort_dir == "asc" ? "desc" : "asc", query: params[:query], count: params[:count]), data: { turbo_frame: "users" }, style: "text-decoration: none; color: inherit;" do %>
+            <%= link_to admin_users_path(sort: "last_name", dir: @sort == "last_name" && @sort_dir == "asc" ? "desc" : "asc", query: params[:query], count: params[:count]), data: { turbo_frame: "users" }, class: "user_sort" do %>
               Last Name
               <% if @sort == "last_name" %>
                 <%= @sort_dir == "asc" ? "▲" : "▼" %>
@@ -58,7 +73,7 @@
             <% end %>
           </th>
           <th>
-            <%= link_to admin_users_path(sort: "email", dir: @sort == "email" && @sort_dir == "asc" ? "desc" : "asc", query: params[:query], count: params[:count]), data: { turbo_frame: "users" }, style: "text-decoration: none; color: inherit;" do %>
+            <%= link_to admin_users_path(sort: "email", dir: @sort == "email" && @sort_dir == "asc" ? "desc" : "asc", query: params[:query], count: params[:count]), data: { turbo_frame: "users" }, class: "user_sort" do %>
               Email
               <% if @sort == "email" %>
                 <%= @sort_dir == "asc" ? "▲" : "▼" %>
@@ -66,7 +81,7 @@
             <% end %>
           </th>
           <th class="dt">
-            <%= link_to admin_users_path(sort: "last_login_at", dir: @sort == "last_login_at" && @sort_dir == "asc" ? "desc" : "asc", query: params[:query], count: params[:count]), data: { turbo_frame: "users" }, style: "text-decoration: none; color: inherit;" do %>
+            <%= link_to admin_users_path(sort: "last_login_at", dir: @sort == "last_login_at" && @sort_dir == "asc" ? "desc" : "asc", query: params[:query], count: params[:count]), data: { turbo_frame: "users" }, class: "user_sort" do %>
               Last Login
               <% if @sort == "last_login_at" %>
                 <%= @sort_dir == "asc" ? "▲" : "▼" %>
@@ -74,7 +89,7 @@
             <% end %>
           </th>
           <th>
-            <%= link_to admin_users_path(sort: "ldap_uid", dir: @sort == "ldap_uid" && @sort_dir == "asc" ? "desc" : "asc", query: params[:query], count: params[:count]), data: { turbo_frame: "users" }, style: "text-decoration: none; color: inherit;" do %>
+            <%= link_to admin_users_path(sort: "ldap_uid", dir: @sort == "ldap_uid" && @sort_dir == "asc" ? "desc" : "asc", query: params[:query], count: params[:count]), data: { turbo_frame: "users" }, class: "user_sort" do %>
               UID
               <% if @sort == "ldap_uid" %>
                 <%= @sort_dir == "asc" ? "▲" : "▼" %>
@@ -82,7 +97,7 @@
             <% end %>
           </th>
           <th>
-            <%= link_to admin_users_path(sort: "employee_id", dir: @sort == "employee_id" && @sort_dir == "asc" ? "desc" : "asc", query: params[:query], count: params[:count]), data: { turbo_frame: "users" }, style: "text-decoration: none; color: inherit;" do %>
+            <%= link_to admin_users_path(sort: "employee_id", dir: @sort == "employee_id" && @sort_dir == "asc" ? "desc" : "asc", query: params[:query], count: params[:count]), data: { turbo_frame: "users" }, class: "user_sort" do %>
               Employee ID
               <% if @sort == "employee_id" %>
                 <%= @sort_dir == "asc" ? "▲" : "▼" %>

data/app/views/ucb_rails_user/users/new.html.erb

@@ -1,22 +1,17 @@
-<div class="ucb-rails-users-table-header">
-  <h1>Users</h1>
+<%= turbo_frame_tag "users" do %>
   <h2>Add New User</h2>
-</div>
 
-<%= form_tag admin_user_search_path, method: :get, class: "form-inline user-search-form" do %>
-  <%= text_field_tag :first_name, "", placeholder: "First name", class: "form-control" %>
-  <%= text_field_tag :last_name, "", placeholder: "Last name", class: "form-control" %>
-  <%= text_field_tag :employee_id, "", placeholder: "Employee ID", class: "form-control" %>
-  <%= submit_tag "Search", class: "btn btn-primary" %>
-  <%= link_to "Cancel", admin_users_path, class: "btn btn-default" %>
-<% end %>
-
-<div class="ucb-rails-user-loader" style="display: none;">
-  Loading...
-</div>
-
-<div class="search-results">
-  <% if @results %>
-    <%= render "results" %>
+  <%= form_tag admin_user_search_path, method: :get, class: "form-inline user-search-form" do %>
+    <%= text_field_tag :first_name, "", placeholder: "First name", class: "form-control" %>
+    <%= text_field_tag :last_name, "", placeholder: "Last name", class: "form-control" %>
+    <%= text_field_tag :employee_id, "", placeholder: "Employee ID", class: "form-control" %>
+    <%= submit_tag "Search", class: "btn btn-primary", data: { turbo_submits_with: "Searching..." } %>
+    <%= link_to "Cancel", admin_users_path, class: "btn btn-default" %>
   <% end %>
-</div>
+
+  <div class="search-results">
+    <% if @results %>
+      <%= render "results" %>
+    <% end %>
+  </div>
+<% end %>

data/app/views/ucb_rails_user/users/search.html.erb

@@ -1,16 +1,15 @@
-<div class="ucb-rails-users-table-header">
-  <h1>Users</h1>
+<%= turbo_frame_tag "users" do %>
   <h2>Add New User</h2>
-</div>
 
-<%= form_tag admin_user_search_path, method: :get, class: "form-inline user-search-form" do %>
-  <%= text_field_tag :first_name, params[:first_name], placeholder: "First name", class: "form-control" %>
-  <%= text_field_tag :last_name, params[:last_name], placeholder: "Last name", class: "form-control" %>
-  <%= text_field_tag :employee_id, params[:employee_id], placeholder: "Employee ID", class: "form-control" %>
-  <%= submit_tag "Search", class: "btn btn-primary" %>
-  <%= link_to "Cancel", admin_users_path, class: "btn btn-default" %>
-<% end %>
+  <%= form_tag admin_user_search_path, method: :get, class: "form-inline user-search-form" do %>
+    <%= text_field_tag :first_name, params[:first_name], placeholder: "First name", class: "form-control" %>
+    <%= text_field_tag :last_name, params[:last_name], placeholder: "Last name", class: "form-control" %>
+    <%= text_field_tag :employee_id, params[:employee_id], placeholder: "Employee ID", class: "form-control" %>
+    <%= submit_tag "Search", class: "btn btn-primary" %>
+    <%= link_to "Cancel", admin_users_path, class: "btn btn-default" %>
+  <% end %>
 
-<div class="search-results">
-  <%= render "search_results" %>
-</div>
+  <div class="search-results">
+    <%= render "search_results" %>
+  </div>
+<% end %>

data/lib/ucb_rails_user/version.rb

@@ -1,3 +1,3 @@
 module UcbRailsUser
-  VERSION = '8.0.3'
+  VERSION = '8.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ucb_rails_user
 version: !ruby/object:Gem::Version
-  version: 8.0.3
+  version: 8.0.5
 platform: ruby
 authors:
 - Steve Downey
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-01 00:00:00.000000000 Z
+date: 2025-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -336,13 +336,8 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/ucb_rails_user_manifest.js
-- app/assets/javascripts/ucb_rails_user/datatables.js
-- app/assets/javascripts/ucb_rails_user/esm/bloodhound.js
-- app/assets/javascripts/ucb_rails_user/esm/datatables.js
-- app/assets/javascripts/ucb_rails_user/esm/typeahead.js
 - app/assets/javascripts/ucb_rails_user/esm/ucb_rails_user.js
 - app/assets/javascripts/ucb_rails_user/scripts.js
-- app/assets/javascripts/ucb_rails_user/typeahead.bundle.js
 - app/assets/javascripts/ucb_rails_user/ucb_rails_user.js
 - app/assets/stylesheets/ucb_rails_user/components/impersonations.css
 - app/assets/stylesheets/ucb_rails_user/components/loader.css
@@ -350,7 +345,6 @@ files:
 - app/assets/stylesheets/ucb_rails_user/datatables.css
 - app/assets/stylesheets/ucb_rails_user/index.sass
 - app/assets/stylesheets/ucb_rails_user/main.css
-- app/assets/stylesheets/ucb_rails_user/pagy_tailwind.css
 - app/assets/stylesheets/ucb_rails_user/styles.css
 - app/assets/stylesheets/ucb_rails_user/typeahead_tweaks.sass
 - app/assets/stylesheets/ucb_rails_user/user.css
@@ -394,6 +388,7 @@ files:
 - app/views/ucb_rails_user/users/_search_results.html.erb
 - app/views/ucb_rails_user/users/_user.html.erb
 - app/views/ucb_rails_user/users/edit.html.erb
+- app/views/ucb_rails_user/users/impersonate_search.html.erb
 - app/views/ucb_rails_user/users/index.html.erb
 - app/views/ucb_rails_user/users/new.html.erb
 - app/views/ucb_rails_user/users/search.html.erb