fe 2.1.6.1 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e29a0202c879750c9ce98aeabf6dad15b45a944eb0bbd09223452b3d3bc0e414
-  data.tar.gz: 922748695f42ab0e0d56f498f458d0fa1a06f06b484123e9e51dc3101bef7e6f
+  metadata.gz: b64b157852e00628b533ed9826d53d40c715e023813b0e30290397a78adfcb3b
+  data.tar.gz: 97f8071426f54e34982967b7613439eb3e27d0e77e7cb9d7589b2857d08a8790
 SHA512:
-  metadata.gz: fec4745196d7fabd0118ad6385159f22aaa05672e2d2c3d637dc133ebf4f744236903248b96b6d48d75030433987c0457de592b3b9680375e779cebe02a00c90
-  data.tar.gz: 032cfcb16e5ad4db94808af41b254c7116308ffbec83789283372203a44d130802166f4fa3b6f16a8723e3c3fe430f0ca37496a55eff73ea0afdac8ecac272ca
+  metadata.gz: 2357386af9137a2b4d40f7ce981d7d48909001b066638af236fe55affa3405d50f3866133e934231bdcb9f04f2a02053222c389511214f4e9b9a306b7fd56d54
+  data.tar.gz: 7b228d9046ba5fd172d5199c94ab78e012d6c3205eda62aaa3da952971d34899e60b4e1fb7f073db2164a36c419c4f47f14074e05e0355c288699655e1675162

data/app/assets/javascripts/fe/fe.admin.js

@@ -72,7 +72,7 @@ $(document).on('ready turbo:load', function () {
 
 let currentTab = 'pages_list';
 
-function switchTab(toTab) {
+window.switchTab = function switchTab(toTab) {
   if(currentTab != null) $('#tab-' + currentTab).removeClass('active');
   $('#tab-' + toTab).addClass('active');
   currentTab = toTab;
@@ -81,7 +81,7 @@ function switchTab(toTab) {
   }
 }
 
-function selectPage() {
+window.selectPage = function selectPage() {
   let el = $('#link-page-name');
   clearCurrentElement();
   el.addClass('active');
@@ -90,7 +90,7 @@ function selectPage() {
   if($('#page_label').length > 0) $('#page_label').focus();
 }
 
-function selectElement(id) {
+window.selectElement = function selectElement(id) {
   let el = $(id);
   clearPageName();
   clearCurrentElement();
@@ -102,28 +102,28 @@ function selectElement(id) {
   // if( $('#element_label')) $('#element_label').focus();
 }
 
-function clearCurrentElement() {
+window.clearCurrentElement = function clearCurrentElement() {
   if (activeElement != '' && $(activeElement)) {
     $(activeElement).removeClass('active');
   }
 }
 
-function clearPageName() {
+window.clearPageName = function clearPageName() {
   $('#link-page-name').removeClass('active');
 }
 
-function snapElementProperties(el) {
+window.snapElementProperties = function snapElementProperties(el) {
   let propsTop = Position.cumulativeOffset(el)[1] - 160;
   if (propsTop < 0) propsTop = 0;
   $('#panel-properties-element').css({'margin-top': propsTop});
 }
 
-function addError(id) {
+window.addError = function addError(id) {
   $('#' + id).addClassName('fieldWithErrors');
 }
 
 // convert label to slug
-function updateSlug(source, dest) {
+window.updateSlug = function updateSlug(source, dest) {
   let label = $(source).val();
   let slug = $(dest).val();
   if( label == null || slug == null) return;  // oh oh
@@ -133,10 +133,10 @@ function updateSlug(source, dest) {
 
   if( label != '' && slug == '' ) {  // if slug is empty lets copy label to it
     slug = label.toLowerCase();
-    slug = slug.gsub(/[^a-z0-9]/, '_');   // only alpha-numeric
-    slug = slug.gsub(/_{2,}/, '_');       // compact double hyphens down to one
-    slug = slug.gsub(/_$/, '');           // remove trailing underscores
-    slug = slug.gsub(/^([0-9])/, '_\1')   // can't begin with a digit, so preprend an underscore
+    slug = slug.replace(/[^a-z0-9]/, '_');   // only alpha-numeric
+    slug = slug.replace(/_{2,}/, '_');       // compact double hyphens down to one
+    slug = slug.replace(/_$/, '');           // remove trailing underscores
+    slug = slug.replace(/^([0-9])/, '_$&')   // can't begin with a digit, so preprend an underscore
     if( slug.length > 36 ) slug = slug.slice(0, 36)  // max length
 
     $(dest).value = slug

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

@@ -1,33 +1,35 @@
-function setUpSortables() {
-  $('[data-sortable]').sortable({axis:'y',
-                                items: '> li.sortable',
-                                dropOnEmpty:false,
-                                update: function(event, ui) {
-                                  let sortable = this;
-                                  $.ajax({data:$(this).sortable('serialize',{key:sortable.id + '[]'}),
-                                         complete: function(request) {$(sortable).effect('highlight')},
-                                         success:function(request){$('#errors').html(request)},
-                                         type:'POST',
-                                         url: $(sortable).attr('data-sortable-url')
-                                  })
-                                },
-                                stop: function(event, ui) {
-                                  let before_dropper = $('li.before-container[data-element_id="'+ui.item.data('element_id'));
-                                  if (before_dropper.length > 0) {
-                                    before_dropper.detach();
-                                    before_dropper.insertBefore(ui.item);
-                                  }
-                                  let after_dropper = $('li.after-container[data-element_id="'+ui.item.data('element_id'));
-                                  if (after_dropper.length > 0) {
-                                    after_dropper.detach();
-                                    after_dropper.insertAfter(ui.item);
-                                  }
-                                }
-  });
-  $('[data-sortable][data-sortable-handle]').each(function() {
-    handle = $(this).attr('data-sortable-handle');
+window.setUpSortables = function setUpSortables() {
+	$('[data-sortable]').sortable({
+    axis:'y',
+    items: '> li.sortable',
+    dropOnEmpty:false,
+    update: function(event, ui) {
+      let sortable = this;
+      $.ajax({
+        data:$(this).sortable('serialize',{key:sortable.id + '[]'}),
+        complete: function(request) {$(sortable).effect('highlight')},
+        success: function(request){$('#errors').html(request)},
+        type:'POST',
+        url: $(sortable).attr('data-sortable-url')
+        })
+      },
+    stop: function(event, ui) {
+      let before_dropper = $('li.before-container[data-element_id="'+ui.item.data('element_id'));
+      if (before_dropper.length > 0) {
+        before_dropper.detach();
+        before_dropper.insertBefore(ui.item);
+      }
+      let after_dropper = $('li.after-container[data-element_id="'+ui.item.data('element_id'));
+      if (after_dropper.length > 0) {
+        after_dropper.detach();
+        after_dropper.insertAfter(ui.item);
+      }
+    }
+	});
+	$('[data-sortable][data-sortable-handle]').each(function() {
+    const handle = $(this).attr('data-sortable-handle');
     $(this).sortable("option", "handle", handle);
-  });
+	});
 
   $('.droppable').droppable({
     activeClass: 'droppable-active',
@@ -36,8 +38,8 @@ function setUpSortables() {
       $.post($(this).attr('data-url'), {draggable_element: ui.draggable.attr('id')}, function() {}, 'script')
     },
     activate: function( event, ui ) {
-      $draggable = ui.draggable;
-      $container = $draggable.parents("li.element.container")
+      const $draggable = ui.draggable;
+      const $container = $draggable.parents("li.element.container");
       if ($container.length == 1) {
         $container.parent().find('li.around-container[data-element_id="'+$container.data('element_id')+'"]').addClass('droppable-active')
       } else {
@@ -45,8 +47,8 @@ function setUpSortables() {
       }
     },
     deactivate: function( event, ui ) {
-      $draggable = ui.draggable;
-      $container = $draggable.parents("li.element.container")
+      const $draggable = ui.draggable;
+      const $container = $draggable.parents("li.element.container");
       if ($container.length == 1) {
         $container.parent().find('li.around-container[data-element_id="'+$container.data('element_id')+'"]').removeClass('droppable-active')
       } else {
@@ -56,7 +58,7 @@ function setUpSortables() {
   });
 }
 
-function setUpCalendars() {
+window.setUpCalendars = function setUpCalendars() {
   let now = new Date();
   let year = now.getFullYear() + 10;
   $('[data-calendar]').datepicker({
@@ -66,11 +68,11 @@ function setUpCalendars() {
   })
 }
 
-function setUpJsHelpers() {
-  // ==================
-  // Sortable
-  setUpSortables();
-  // ==================
+window.setUpJsHelpers = function setUpJsHelpers() {
+		// ==================
+		// Sortable
+		setUpSortables();
+		// ==================
 
   // ==================
   // Calendar
@@ -79,8 +81,8 @@ function setUpJsHelpers() {
   <% unless Fe.bootstrap %>$(".tip[title], a[title]").tooltip()<% end %>
 }
 
-function fixGridColumnWidths() {
-  $("table.grid").each(function(i, grid) {
+window.fixGridColumnWidths = function fixGridColumnWidths() {
+	$("table.grid").each(function(i, grid) {
     let num_columns = $(grid).find("th").length;
     if (num_columns > 0) {
       let width = (100 / num_columns) + "%";
@@ -97,6 +99,13 @@ function scrollTo(el) {
   }, 1000);
 }
 
+window.scrollToElement = function scrollToElement(el) {
+  if ($(el).length == 0) { return; }
+  $('html, body').animate({
+    scrollTop: $(el).offset().top
+  }, 1000);
+}
+
 // jQuery 3 has removed $(document).on('ready', ...) in favor of $(document).ready(...). Manually call it from
 // the new method here, so we can avoid changing over all the document ready's.
 $(document).ready(function() {

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

@@ -99,7 +99,7 @@ fe.pageHandler = {
     //
     if (!isValid && $('#' + this.current_page + "-form").hasClass('enforce-valid-before-next')) {
       // scroll up to where the error is
-      scrollTo($(".help-block:visible")[0].closest("li"));
+      scrollToElement($(".help-block:visible")[0].closest("li"));
       return;
     }
 
@@ -110,9 +110,9 @@ fe.pageHandler = {
 
     if (!background_load) { 
       if ($('a[name="main"]').length == 1) {
-        scrollTo('a[name="main"]');
+        scrollToElement('a[name="main"]');
       } else {
-        scrollTo('#main');
+        scrollToElement('#main');
       }
     }
 
@@ -157,7 +157,9 @@ fe.pageHandler = {
     if( form_data ) {
       if( page.data('form_data') == null || page.data('form_data').data !== form_data.data || force === true) {  // if any changes
         page.data('form_data', form_data);
-        $.ajax({url: form_data.url, type: 'put', data: form_data.data,  
+        const auth_token = $('meta[name=csrf-token]').attr('content');
+        form_data.data += '&authenticity_token=' + encodeURIComponent(auth_token);
+        $.ajax({url: form_data.url, type: 'put', data: form_data.data,
                beforeSend: function (xhr) {
                  $('#spinner_' + page.attr('id')).show();
                },
@@ -302,8 +304,9 @@ fe.pageHandler = {
             // clear out pages array to force reload.  This enables "frozen" apps
             //       immediately after submission - :onSuccess (for USCM which stays in the application vs. redirecting to the dashboard)
             let curr = fe.pageHandler.current_page;
+            const auth_token = $('meta[name=csrf-token]').attr('content');
             $.ajax({url: url, dataType:'script',
-                   data: {answer_sheet_type: answer_sheet_type, a: $('input[type=hidden][name=a]').val()},
+                   data: {answer_sheet_type: answer_sheet_type, a: $('input[type=hidden][name=a]').val(), authenticity_token: auth_token},
                    type:'post', 
                    beforeSend: function(xhr) {
                      $('body').trigger('ajax:loading', xhr);
@@ -444,6 +447,8 @@ $(document).on('ready turbo:load', function () {
     let data = form_elements.serializeArray();
 
     data.push({name: 'answer_sheet_type', value: answer_sheet_type});
+    const auth_token = $('meta[name=csrf-token]').attr('content');
+    data.push({name: 'authenticity_token', value: auth_token});
     $.ajax({url: $(el).attr('href'), data: data, dataType: 'script',  type: 'POST',
            beforeSend: function (xhr) {
              $('body').trigger('ajax:loading', xhr);
@@ -495,7 +500,7 @@ $(function() {
 });
 
 
-function updateTotal(id) {
+window.updateTotal = function updateTotal(id) {
   try {
     let total = 0;
     $(".col_" + id).each(function(index, el) {
@@ -506,7 +511,7 @@ function updateTotal(id) {
   }
 }
 
-function submitToFrame(id, url) {
+window.submitToFrame = function submitToFrame(id, url) {
   let form = $('<form method="post" action="'+url+'.js" endtype="multipart/form-data"></form>')
   let csrf_token = $('meta[name=csrf-token]').attr('content'),
   csrf_param = $('meta[name=csrf-param]').attr('content'),
@@ -531,3 +536,10 @@ if (typeof scrollTo === 'undefined') {
     }, 1000);
   }
 }
+
+window.scrollToElement = function scrollToElement(el) {
+  if ($(el).length == 0) { return; }
+  $('html, body').animate({
+    scrollTop: $(el).offset().top
+  }, 1000);
+}

data/app/assets/javascripts/fe/jquery.html5_upload.js

@@ -1,7 +1,7 @@
 /* Taken from https://github.com/mihaild/jquery-html5-upload */
 
 (function($) {
-    $.fn.html5_upload = function(options) {
+    $.fn.html5_upload = function(_options) {
 
         function get_file_name(file) {
             return file.name || file.fileName;

data/app/controllers/concerns/fe/answer_pages_controller_concern.rb

@@ -59,6 +59,7 @@ module Fe::AnswerPagesControllerConcern
     end
     @presenter.active_page = nil
     @answer_sheet.update(locale: session[:locale])
+    @answer_sheet.touch
     set_saved_at_timestamp
     respond_to do |format|
       format.js

data/app/models/concerns/fe/answer_sheet_concern.rb

@@ -34,7 +34,7 @@ module Fe
 
       unless @languages
         @languages = question_sheets.first.languages
-        question_sheets[1..-1].each { |qs| @languages &= qs.languages.select(&:present?) }
+        question_sheets[1..-1].each { |qs| @languages &= qs.languages&.select(&:present?) }
       end
       @languages
     end

data/app/models/concerns/fe/choice_field_concern.rb

@@ -15,7 +15,7 @@ module Fe
       included do
         has_many :elements, class_name: "Element", foreign_key: "choice_field_id", dependent: :nullify#, order: :position
         [:rating_before_label_translations, :rating_after_label_translations, :rating_na_label_translations].each do |column|
-          if Rails::VERSION::MAJOR < 7
+          if Rails.gem_version < "7.1.0"
             serialize column, Hash
           else
             serialize column, type: Hash

data/app/models/fe/element.rb

@@ -50,7 +50,7 @@ module Fe
     after_save :update_any_previous_conditional_elements
 
     [:label_translations, :tip_translations, :content_translations].each do |column|
-      if Rails::VERSION::MAJOR < 7
+      if Rails.gem_version < "7.1.0"
         serialize column, Hash
       else
         serialize column, type: Hash
@@ -65,15 +65,15 @@ module Fe
     #   HUMANIZED_ATTRIBUTES[attr.to_sym] || super
     # end
     def label(locale = nil)
-      label_translations[locale].present? ? label_translations[locale] : self[:label]
+      label_translations&.dig(locale).present? ? label_translations[locale] : self[:label]
     end
 
     def content(locale = nil)
-      content_translations[locale].present? ? content_translations[locale] : self[:content]
+      content_translations&.dig(locale).present? ? content_translations[locale] : self[:content]
     end
 
     def tooltip(locale = nil)
-      tip_translations[locale].present? ? tip_translations[locale] : self[:tooltip]
+      tip_translations&.dig(locale).present? ? tip_translations[locale] : self[:tooltip]
     end
 
     # returns all pages this element is on, whether that be directly, through a grid, or as a choice field conditional option

data/app/models/fe/page.rb

@@ -45,7 +45,7 @@ module Fe
 
     # NOTE: You may need config.active_record.yaml_column_permitted_classes = [Hash, ActiveSupport::HashWithIndifferentAccess]
     # in config/application.rb or you may get Psych::DisallowedClass trying to use label_translations
-    if Rails::VERSION::MAJOR < 7
+    if Rails.gem_version < "7.1.0"
       serialize :label_translations, Hash
     else
       serialize :label_translations, type: Hash
@@ -73,7 +73,7 @@ module Fe
     end
 
     def label(locale = nil)
-      label_translations[locale] || self[:label]
+      label_translations&.dig(locale) || self[:label]
     end
 
     # returns true if there is a question element on the page, including one inside a grid

data/app/models/fe/question_sheet.rb

@@ -21,7 +21,7 @@ module Fe
 
     validates_presence_of :label
 
-    if Rails::VERSION::MAJOR < 7
+    if Rails.gem_version < "7.1.0"
       serialize :languages, Array
     else
       serialize :languages, type: Array

data/app/views/fe/admin/elements/create.js.erb

@@ -5,7 +5,7 @@
   $('#element_form_<%= dom_id(@element) %>').html('<%= escape_javascript(render("fe/admin/panels/prop_element", element: @element)) %>');
   $('#element_form_<%= dom_id(@element) %>').show();
   selectElement("#element_<%= @element.id %>");
-  scrollTo("#element_<%= @element.id %>");
+  scrollToElement("#element_<%= @element.id %>");
   setUpSortables();
 <% else %>
   alert('That question already exists on this question sheet')

data/app/views/fe/questions/fe/_reference_question.html.erb

@@ -43,7 +43,7 @@
           "have edited the information in order for your reference to receive another email.") %>
     </strong></em></p></li>
 
-      <li><%= link_to(_("Send Email Invitation"), @answer_sheet ? send_reference_invite_fe_answer_sheet_path(@answer_sheet, reference_id: reference.id) : "#", class: "#{"form-control" if Fe.bootstrap} reference_send_invite button no-left-margin", disabled: !reference.all_affecting_questions_answered) %>
+      <li><%= link_to(_("Send Email Invitation"), @answer_sheet ? send_reference_invite_fe_answer_sheet_path(@answer_sheet, reference_id: reference.id) : "#", class: "#{"form-control" if Fe.bootstrap} reference_send_invite button no-left-margin", disabled: !reference.all_affecting_questions_answered, data: { turbo: false }) %>
       <% if reference.question && !reference.all_affecting_questions_answered %>
         <div>
           <strong><i>This button is disabled because there are questions that affect whether this reference is required that need to answered first:</i></strong>

data/lib/fe/version.rb

@@ -1,3 +1,3 @@
 module Fe
-  VERSION = "2.1.6.1"
+  VERSION = "2.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fe
 version: !ruby/object:Gem::Version
-  version: 2.1.6.1
+  version: 2.1.7
 platform: ruby
 authors:
 - CruGlobal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-24 00:00:00.000000000 Z
+date: 2025-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -551,7 +551,6 @@ files:
 - spec/dummy/app/models/person.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/views/layouts/fe/fe.admin.html.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
@@ -678,7 +677,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.17
 signing_key:
 specification_version: 4
 summary: Form Engine
@@ -704,7 +703,6 @@ test_files:
 - spec/dummy/app/models/person.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/views/layouts/fe/fe.admin.html.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake

data/spec/dummy/app/views/layouts/fe/fe.admin.html.erb

@@ -1 +0,0 @@
-<%= yield %>