ucb_rails_user 6.1.0 → 6.2.0

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

@@ -0,0 +1,111 @@
+import Bloodhound from "ucb_rails_user/bloodhound"
+
+// the users table has width set to auto, but the pagination tries to stretch to full width - this
+// forces the pagination to match the table
+var resizePagination = function () {
+  //var paginationDiv = $('.dataTables_info').parents('.row').first()
+  //paginationDiv.width($('.dataTable').width())
+}
+
+var addDatatablesToNewUserSearchResults = function () {
+  $('.add-user-search-results-table').dataTable({
+    searching: true,
+    order: [[ 2, "asc" ]],
+    columnDefs: [ {
+      targets: 3,
+      orderable: false
+    }]
+  })
+  resizePagination()
+}
+
+var addDatatablesToUsersTable = function () {
+  var unsorted_columns = $('.ucb-rails-users-table th.unsorted').map((i, e) => $(e).index()).toArray()
+  if (unsorted_columns == []) {
+    var unsorted_columns = $(".ucb-rails-users-table th:contains('Edit'),.ucb-rails-users-table th:contains('Delete')").map((i, e) => $(e).index()).toArray()
+  }
+
+  $('.ucb-rails-users-table').dataTable({
+    searching: true,
+    order: [[ 3, "asc" ]],
+    columnDefs: [ {
+      targets: unsorted_columns,
+      orderable: false
+    }],
+  })
+  var addNewHtml = '&nbsp;&nbsp;<a href="/admin/users/new" class="btn btn-primary">Add New</a>'
+  $('.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 ¯\_(ツ)_/¯
+  window.setTimeout(addDatatablesToUsersTable, 100)
+
+  $('.user-search-form').on('submit', 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()
+  })
+
+})
+
+// hack to make this work better with ES modules
+window.resizePagination = resizePagination
+window.addDatatablesToNewUserSearchResults = addDatatablesToNewUserSearchResults
+window.resetImpersonateButton = resetImpersonateButton
+window.clearImpersonateSelection = clearImpersonateSelection

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

@@ -11,5 +11,6 @@
 // about supported directives.
 //
 //= require rails-ujs
-//= require_tree .
-
+//= require ucb_rails_user/datatables
+//= require ucb_rails_user/typeahead.bundle
+//= require ucb_rails_user/ucb_rails_user

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

@@ -5,7 +5,7 @@ var resizePagination = function () {
   //paginationDiv.width($('.dataTable').width())
 }
 
-var addDatatablesToSearchResults = function () {
+var addDatatablesToNewUserSearchResults = function () {
   $('.add-user-search-results-table').dataTable({
     searching: true,
     order: [[ 2, "asc" ]],
@@ -19,7 +19,7 @@ var addDatatablesToSearchResults = function () {
 
 var addDatatablesToUsersTable = function () {
   var unsorted_columns = $('.ucb-rails-users-table th.unsorted').map((i, e) => $(e).index()).toArray()
-  if (unsorted_columns === []) {
+  if (unsorted_columns == []) {
     var unsorted_columns = $(".ucb-rails-users-table th:contains('Edit'),.ucb-rails-users-table th:contains('Delete')").map((i, e) => $(e).index()).toArray()
   }
 
@@ -101,4 +101,3 @@ $( window ).on("load", function() {
   })
 
 })
-

data/app/assets/stylesheets/ucb_rails_user/components/index.sass

@@ -0,0 +1,3 @@
+@use "impersonations"
+@use "loader"
+@use "users_table"

data/app/assets/stylesheets/ucb_rails_user/datatables.css

@@ -83,7 +83,9 @@ table.dataTable thead > tr > th.sorting_asc, table.dataTable thead > tr > th.sor
 table.dataTable thead > tr > td.sorting_asc,
 table.dataTable thead > tr > td.sorting_desc,
 table.dataTable thead > tr > td.sorting {
+  /*
   padding-right: 30px;
+  */
 }
 table.dataTable thead > tr > th:active,
 table.dataTable thead > tr > td:active {
@@ -398,5 +400,3 @@ div.dtr-modal div.dtr-modal-background {
 div.dtr-bs-modal table.table tr:first-child td {
   border-top: none;
 }
-
-

data/app/assets/stylesheets/ucb_rails_user/index.sass

@@ -0,0 +1,3 @@
+@import "datatables"
+@import "typeahead_tweaks"
+@import "components"

data/app/assets/stylesheets/ucb_rails_user/main.sass

@@ -1,3 +1,6 @@
+/* this is here for backwards compatibility - it should be removed in the future */
 @import "datatables"
 @import "typeahead_tweaks"
-@import "components/**/*"
+@import "components/impersonations"
+@import "components/loader"
+@import "components/users_table"

data/app/views/ucb_rails_user/users/search.js.haml

@@ -1,5 +1,4 @@
 $('.ucb-rails-user-loader').hide()
 $('.search-results').html("#{ j render(partial: "search_results") }")
-addDatatablesToSearchResults()
+addDatatablesToNewUserSearchResults()
 $('.search-results').show()
-

data/lib/ucb_rails_user/version.rb

@@ -1,3 +1,3 @@
 module UcbRailsUser
-  VERSION = '6.1.0'
+  VERSION = '6.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ucb_rails_user
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Steve Downey
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-09 00:00:00.000000000 Z
+date: 2024-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -33,20 +33,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '8.0'
-- !ruby/object:Gem::Dependency
-  name: sprockets-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -235,6 +221,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sprockets-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -303,13 +303,19 @@ files:
 - 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.sass
 - app/assets/stylesheets/ucb_rails_user/components/_loader.sass
 - app/assets/stylesheets/ucb_rails_user/components/_users_table.sass
+- app/assets/stylesheets/ucb_rails_user/components/index.sass
 - app/assets/stylesheets/ucb_rails_user/datatables.css
+- app/assets/stylesheets/ucb_rails_user/index.sass
 - app/assets/stylesheets/ucb_rails_user/main.sass
 - app/assets/stylesheets/ucb_rails_user/styles.css
 - app/assets/stylesheets/ucb_rails_user/typeahead_tweaks.sass