fe 2.3.0 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2df70f2e238d80ce9d525bf69ea03ff2a1a1cfb48d9e3d2e9cffeae839ab6225
-  data.tar.gz: d52dad7dc024091e1846682bdd7a6363fed083891bf8749ca2756a66aa02b15a
+  metadata.gz: 63c54a49ce10c97d77e21066af68ae2e4d138f57e1d78789a0b304f2ea26d771
+  data.tar.gz: 860211697773fc5643d50e85617065cd49697725ac2479fb644d321eac620c91
 SHA512:
-  metadata.gz: dd4264bdaf1abcfb009a0110f9abbeed89a018c1230239a2f1d79df0e2e1f1dcbac1141d9fa2f5fde22f698c1472189b393f1baa67ffe6ab5ea8a38188d8cb8a
-  data.tar.gz: 9900e68c76bb634d8d5b4b8035ec904e9021fa6d1ef81d8c09da0b8f1000408081d93d4799966bdc474f1e2a74750f4b4626c1bd0f72e9fc5d1a56f1951bf0c0
+  metadata.gz: 20f8c1697604eb9bdf58be607a9c81e86ee4dd0ca9e12e740113c173cbe1402a6371dfa9861ef6861c46b1d9fc6e9ae9f48c069dea829a130ac92d4e32f0e685
+  data.tar.gz: 498cec05620ede4dbee334badd0c2e3810c7d3719816a8a3b7c986238badc9deba878ae0a75ef0a84385330bd17a0a40a2c5cae404e5b32e6a0d688ccaf30591

data/app/assets/javascripts/fe/fe.common.js.erb

@@ -59,6 +59,7 @@ window.setUpSortables = function setUpSortables() {
 }
 
 window.setUpCalendars = function setUpCalendars() {
+  if (!$.fn.datepicker) { return; }
   let now = new Date();
   let year = now.getFullYear() + 10;
   $('[data-calendar]').datepicker({
@@ -68,6 +69,14 @@ window.setUpCalendars = function setUpCalendars() {
   })
 }
 
+// A Turbo snapshot must not carry initialized pickers: jQuery UI refuses to re-init an input
+// marked hasDatepicker, and skips appending its popup when a stale #ui-datepicker-div exists.
+document.addEventListener('turbo:before-cache', function() {
+  if (!$.fn.datepicker) { return; }
+  $('[data-calendar].hasDatepicker').datepicker('destroy');
+  $('#ui-datepicker-div').detach();
+});
+
 window.setUpJsHelpers = function setUpJsHelpers() {
 		// ==================
 		// Sortable

data/app/assets/javascripts/fe/fe.public.nojquery.js.erb

@@ -583,6 +583,12 @@ $(document).on('ready turbo:load', function () {
   });
   <% end %>
 
+  // Keep in step with Fe::ReferenceSheet#email=, which strips the value on the server.
+  let validateEmail = $.validator.methods.email;
+  $.validator.methods.email = function(value, element, param) {
+    return validateEmail.call(this, $.trim(value), element, param);
+  };
+
   $(document).on('click', '.save_button', function() {
     fe.debugLog('[fe concurrency] Save button clicked');
     fe.pageHandler.savePage($(this).closest('.answer-page'), true);
@@ -646,6 +652,11 @@ $(function() {
   setUpCalendars();
 });
 
+document.addEventListener('turbo:load', function() {
+  fixGridColumnWidths();
+  setUpCalendars();
+});
+
 
 window.updateTotal = function updateTotal(id) {
   try {

data/app/models/fe/reference_sheet.rb

@@ -114,6 +114,10 @@ module Fe
 
     def email_sent?() !self.email_sent_at.nil? end
 
+    def email=(value)
+      super(value.is_a?(String) ? value.gsub(/\A[[:space:]]+|[[:space:]]+\z/, '') : value)
+    end
+
     # send email invite
     def send_invite(host)
       return if self.email.blank?

data/lib/fe/version.rb

@@ -1,3 +1,3 @@
 module Fe
-  VERSION = "2.3.0"
+  VERSION = "2.3.2"
 end

data/spec/controllers/fe/answer_pages_controller_spec.rb

@@ -76,6 +76,19 @@ describe Fe::AnswerPagesController, type: :controller do
       expect(reference_sheet.reload.email).to eq('email@reference.com')
     end
 
+    it 'strips whitespace around the reference email' do
+      reference_sheet = create(:reference_sheet, applicant_answer_sheet_id: answer_sheet.id, email: 'initial@ref.com')
+
+      put :update, params: {
+        answers: { "#{element.id}" => 'answer here' },
+        reference: { "#{reference_sheet.id}" => { email: ' email@reference.com ' } },
+        id: page.id,
+        answer_sheet_id: answer_sheet.id
+      }, xhr: true
+
+      expect(reference_sheet.reload.email).to eq('email@reference.com')
+    end
+
     it 'should store a reference sheet answer' do
       # create a normal applicant sheet to make sure the answer isn't saved to that
       # ref