web47core 3.2.36 → 3.2.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51addb55203d5e9bca94ca014394dc522b41ef51c1dabb32e2b1fa294f1aa1b8
-  data.tar.gz: 341d01b151ce0c08ee6409c434a37f292dd424c8bcea2647f0434bf7e52cdb3f
+  metadata.gz: 5c3675d2ab5fbd549deab9374e349736b27f3f648bd12d3a29566c5b0af3bbea
+  data.tar.gz: fd2209c37ae9f88094037c1b28af3e5d4ee4420e98aff389ac86f724b2a4a4e3
 SHA512:
-  metadata.gz: f3278e6e57ed98a3e54910cb10676844554e8e418397a991193342b09c5500a6bc6915cae2f11a5d616f4699ceeb18f35c0bbfba0400342a577cbb23d5dbd035
-  data.tar.gz: 73694c5acd82fbd7879289fe536be74cef0024073ae3f182333ec97323907dc0c040f44b1df16eea53c5908473cae84ada2cc10af6fc97b6a12ef76d2bfc1e49
+  metadata.gz: c7a42d5c97ee0b629eee606061c871e75c67e2499ec18158fc8a52c5e2bef28d73a29b32dd08fae4a982206e7b0409c089401defcdf90a2c16dad3309cd874ba
+  data.tar.gz: 4bf04e44e0cb319e79c92aaaa65abd328a00f12c6e9667906991d2139e80416cfcf7ba12acf335aeff7f0b5028a04cf8f43da29c2b9219ae4e7307cbb620bd4c

data/app/helpers/core_form_checkbox_helper.rb

@@ -0,0 +1,43 @@
+module CoreFormCheckboxHelper
+  # @abstract Render a text field
+  # @param [Mongoid::Document] model - The model to render the field for
+  # @param [Symbol] field - The field to render
+  # @param [Hash] options - Options to pass to the field
+  def form_checkbox(model, field, options = {})
+    classes = options[:classes] || []
+    value = model.send(field)
+    options[:disabled] ||= false
+    properties = {
+      class: 'form-check-input',
+      id: form_field_id(model, field, options),
+      name: form_field_name(model, field, options),
+      type: :checkbox,
+      disabled: options[:disabled]
+    }
+    properties[:checked] = true if model.send(field)
+    checkbox_tag = tag(:input, properties)
+    content_tag(:div, class: (%w[mb-3 align-items-center d-flex] + classes).join(' ')) do
+      concat(content_tag(:label, class: 'form-check form-switch align-middle') do
+        concat(checkbox_tag)
+        concat(form_checkbox_label_tag(model, field, value, input_classes: classes))
+      end)
+    end
+  end
+
+  def form_checkbox_label_tag(model, field, value, options = {})
+    # dont do a label if we are in default browser mode
+    return if options[:input_classes].present? && options[:input_classes].include?('browser-default')
+
+    # or if we have a prompt with now value
+    place_holder = form_place_holder_text(model, field)
+    return if place_holder.blank? && value.blank? && options[:prompt].present?
+
+    error = model.errors[field]
+    label = input_label(model, field)
+    classes = value.nil? && place_holder.blank? ? '' : 'active'
+    classes += error.present? ? ' invalid red-text' : ' valid'
+    options[:class] = classes
+    options['data-error'] = error.join(', ') if error.present?
+    content_tag(:span, options) { label}
+  end
+end

data/app/helpers/core_form_helper.rb

@@ -4,11 +4,11 @@
 # helpers for creating forms
 #
 module CoreFormHelper
-  def materialize_form_for(options = {}, &block)
-    options[:form_authenticity_token] = form_authenticity_token
-    form = Materialize::Form.new(options)
-    form.render_form(&block)
-  end
+  # def materialize_form_for(options = {}, &block)
+  #   options[:form_authenticity_token] = form_authenticity_token
+  #   form = Materialize::Form.new(options)
+  #   form.render_form(&block)
+  # end
 
   #
   # Text area
@@ -37,18 +37,18 @@ module CoreFormHelper
   #
   # Text field
   #
-  def form_text_field(model, field, options = {})
-    classes = options[:classes] || %w[s12 m6 l4 xl3]
-    value = model.send(field)
-    options[:type] ||= :text
-    options[:value] = value
-    options[:disabled] ||= false
-    tag_options = text_field_options(model, field, options)
-    content_tag(:div, class: (%w[input-field col] + classes).join(' ')) do
-      concat(tag(:input, tag_options))
-      concat(form_label_tag(model, field, value, options))
-    end
-  end
+  # def form_text_field(model, field, options = {})
+  #   classes = options[:classes] || %w[s12 m6 l4 xl3]
+  #   value = model.send(field)
+  #   options[:type] ||= :text
+  #   options[:value] = value
+  #   options[:disabled] ||= false
+  #   tag_options = text_field_options(model, field, options)
+  #   content_tag(:div, class: (%w[input-field col] + classes).join(' ')) do
+  #     concat(tag(:input, tag_options))
+  #     concat(form_label_tag(model, field, value, options))
+  #   end
+  # end
 
   def form_date_field(model, field, options = {})
     classes = options[:classes] || %w[s12 m6 l4 xl3]
@@ -84,17 +84,17 @@ module CoreFormHelper
   #
   # Password field
   #
-  def form_password(model, field, options = {})
-    classes = options[:classes] || %w[s12 m6 l4 xl3]
-    value = model.send(field)
-    options[:type] = :password
-    options[:place_holder] ||= mask_value(value)
-    tag_options = text_field_options(model, field, options)
-    content_tag(:div, class: (%w[input-field col] + classes).join(' ')) do
-      concat(tag(:input, tag_options))
-      concat(form_label_tag(model, field, value, options))
-    end
-  end
+  # def form_password(model, field, options = {})
+  #   classes = options[:classes] || %w[s12 m6 l4 xl3]
+  #   value = model.send(field)
+  #   options[:type] = :password
+  #   options[:place_holder] ||= mask_value(value)
+  #   tag_options = text_field_options(model, field, options)
+  #   content_tag(:div, class: (%w[input-field col] + classes).join(' ')) do
+  #     concat(tag(:input, tag_options))
+  #     concat(form_label_tag(model, field, value, options))
+  #   end
+  # end
 
   #
   # Select field
@@ -170,47 +170,47 @@ module CoreFormHelper
   #
   # Checkbox field
   #
-  def form_checkbox(model, field, classes = %w[s12 m6 l4 xl3], options = {})
-    value = model.send(field)
-    options[:disabled] ||= false
-    properties = {
-      class: 'validate',
-      id: form_field_id(model, field, options),
-      name: form_field_name(model, field, options),
-      type: :checkbox,
-      disabled: options[:disabled]
-    }
-    properties[:checked] = true if model.send(field)
-    checkbox_tag = tag(:input, properties)
-    content_tag(:div, class: (%w[input-field col] + classes).join(' ')) do
-      concat(content_tag(:label) do
-        concat(checkbox_tag)
-        concat(form_checkbox_label_tag(model, field, value, input_classes: classes))
-      end)
-    end
-  end
+  # def form_checkbox(model, field, classes = %w[s12 m6 l4 xl3], options = {})
+  #   value = model.send(field)
+  #   options[:disabled] ||= false
+  #   properties = {
+  #     class: 'validate',
+  #     id: form_field_id(model, field, options),
+  #     name: form_field_name(model, field, options),
+  #     type: :checkbox,
+  #     disabled: options[:disabled]
+  #   }
+  #   properties[:checked] = true if model.send(field)
+  #   checkbox_tag = tag(:input, properties)
+  #   content_tag(:div, class: (%w[input-field col] + classes).join(' ')) do
+  #     concat(content_tag(:label) do
+  #       concat(checkbox_tag)
+  #       concat(form_checkbox_label_tag(model, field, value, input_classes: classes))
+  #     end)
+  #   end
+  # end
 
   #
   # get the label for checkbox
   #
-  def form_checkbox_label_tag(model, field, value, options = {})
-    # dont do a label if we are in default browser mode
-    return if options[:input_classes].present? && options[:input_classes].include?('browser-default')
-
-    # or if we have a prompt with now value
-    place_holder = field_place_holder(model, field)
-    return if place_holder.blank? && value.blank? && options[:prompt].present?
-
-    error = model.errors[field]
-    key = "ui_form.#{model.class.to_s.underscore}.labels.#{field}"
-    classes = value.nil? && place_holder.blank? ? '' : 'active'
-    classes += error.present? ? ' invalid red-text' : ' valid'
-    options[:class] = classes
-    options['data-error'] = error.join(', ') if error.present?
-    content_tag(:span, options) do
-      concat(I18n.exists?(key) ? I18n.t(key) : field.to_s.humanize)
-    end
-  end
+  # def form_checkbox_label_tag(model, field, value, options = {})
+  #   # dont do a label if we are in default browser mode
+  #   return if options[:input_classes].present? && options[:input_classes].include?('browser-default')
+  #
+  #   # or if we have a prompt with now value
+  #   place_holder = field_place_holder(model, field)
+  #   return if place_holder.blank? && value.blank? && options[:prompt].present?
+  #
+  #   error = model.errors[field]
+  #   key = "ui_form.#{model.class.to_s.underscore}.labels.#{field}"
+  #   classes = value.nil? && place_holder.blank? ? '' : 'active'
+  #   classes += error.present? ? ' invalid red-text' : ' valid'
+  #   options[:class] = classes
+  #   options['data-error'] = error.join(', ') if error.present?
+  #   content_tag(:span, options) do
+  #     concat(I18n.exists?(key) ? I18n.t(key) : field.to_s.humanize)
+  #   end
+  # end
 
   #
   # File field
@@ -230,24 +230,28 @@ module CoreFormHelper
   # get the label for field
   #
   def form_label_tag(model, field, value, options = {})
-    # dont do a label if we are in default browser mode
+    # don't do a label if we are in default browser mode
     return if options[:no_label]
     return if options[:input_classes].present? && options[:input_classes].include?('browser-default')
 
+    help_text = form_helper_text(model, field)
+
     # or if we have a prompt with now value
-    place_holder = options[:place_holder] || field_place_holder(model, field)
+    place_holder = options[:place_holder] || form_place_holder_text(model, field)
     return if place_holder.blank? && value.blank? && options[:prompt].present?
 
     error = model.errors[field]
-    key = "ui_form.#{model.class.to_s.underscore}.labels.#{field}"
-    classes = value.nil? && place_holder.blank? ? '' : 'active'
-    classes += error.present? ? ' invalid red-text' : ' valid'
-    options[:class] = classes
+    classes = %w[form-label mb-2]
+    classes << 'text-red' if error.present?
+    options[:class] = classes.compact.uniq.join(' ')
     options[:for] = form_field_id(model, field, options)
-    options['data-error'] = error.join(', ') if error.present?
-    content_tag(:label, options) do
-      concat(I18n.exists?(key) ? I18n.t(key) : field.to_s.humanize)
-      concat(" #{error.join(', ')}") if error.present?
+    # options['data-error'] = error.join(', ') if error.present?
+    options[:required] = form_required_field?(model, field) ? 'required' : nil
+    tag.label(**options) do
+      concat(input_label(model, field, field.to_s.humanize))
+      concat(content_tag(:span, class: 'form-help ms-2', data: { bs_toggle: :popover, bs_content: help_text }) { '?' }) if help_text.present?
+      # @todo CMS add handling specific errors later
+      # concat(" #{error.join(', ')}") if error.present?
     end
   end
 
@@ -266,35 +270,37 @@ module CoreFormHelper
   #
   # Add the placeholder option if found in the translations
   #
-  def text_field_options(model, field, options)
-    hint_key = "ui_form.#{model.class.to_s.underscore}.hints.#{field}"
-    if I18n.exists?(hint_key)
-      classes = %w[validate tooltipped]
-      options[:data] = { tooltip: I18n.t(hint_key), position: :top }
-    else
-      classes = %w[validate]
-    end
-    classes += options[:input_classes] if options[:input_classes].present?
-    options[:name] = form_field_name(model, field, options)
-    options[:id] = form_field_id(model, field, options)
-    place_holder = options[:place_holder] || field_place_holder(model, field)
-    if place_holder.present?
-      classes << 'active'
-      options[:placeholder] = place_holder
-    end
-    classes << 'active' if options[:value].present?
-    options[:class] = classes.uniq
-    options
-  end
+  # def text_field_options(model, field, options)
+  #   hint_key = "ui_form.#{model.class.to_s.underscore}.hints.#{field}"
+  #   if I18n.exists?(hint_key)
+  #     classes = %w[validate tooltipped]
+  #     options[:data] = { tooltip: I18n.t(hint_key), position: :top }
+  #   else
+  #     classes = %w[validate]
+  #   end
+  #   classes += options[:input_classes] if options[:input_classes].present?
+  #   options[:name] = form_field_name(model, field, options)
+  #   options[:id] = form_field_id(model, field, options)
+  #   place_holder = options[:place_holder] || field_place_holder(model, field)
+  #   if place_holder.present?
+  #     classes << 'active'
+  #     options[:placeholder] = place_holder
+  #   end
+  #   classes << 'active' if options[:value].present?
+  #   options[:class] = classes.uniq
+  #   options
+  # end
 
-  def field_place_holder(model, field)
-    place_holder_key = "ui_form.#{model.class.to_s.underscore}.placeholders.#{field}"
-    I18n.exists?(place_holder_key) ? I18n.t(place_holder_key) : nil
-  end
+  # def field_place_holder(model, field)
+  #   place_holder_key = "ui_form.#{model.class.to_s.underscore}.placeholders.#{field}"
+  #   I18n.exists?(place_holder_key) ? I18n.t(place_holder_key) : nil
+  # end
 
-  #
-  # Return a consistent form field name
-  #
+  # @abstract Return a consistent form field name
+  # @param [Mongoid::Document] model
+  # @param [Symbol] field
+  # @param [Hash] options
+  # @return [HTML]
   def form_field_name(model, field, options = {})
     return options[:form_name] if options[:form_name].present?
 
@@ -316,28 +322,26 @@ module CoreFormHelper
     end
   end
 
-  #
-  # Return a consistent form field id
-  #
+  # @abstract Return a consistent form field id
+  # @param [Mongoid::Document] model
+  # @param [Symbol] field
+  # @param [Hash] options
+  # @return [HTML]
   def form_field_id(model, field, options = {})
     return options[:form_id] if options[:form_id].present?
 
-    # TODO: Need to handle the other side of the 1:M use case where
-    # the field name needs to end in _ids, not _id.
     field = "#{field}_id" if model.class.reflect_on_association(field).present?
-    if options[:index].present?
-      if options[:array_name].present?
-        if options[:base_name].present?
-          "#{options[:form_id_prefix]}#{options[:base_name]}[#{options[:array_name]}[#{options[:index]}][#{field}]]"
-        else
-          "#{options[:form_id_prefix]}#{options[:array_name]}[#{options[:index]}][#{field}]"
-        end
-      else
-        "#{options[:form_id_prefix]}#{model.class.to_s.underscore}[#{options[:index]}][#{field}]"
-      end
-    else
-      "#{options[:form_id_prefix]}#{model.class.to_s.underscore}[#{field}]"
-    end
+    [options[:form_id_prefix], options[:base_name], options[:array_name] || model.class.to_s.underscore, options[:index], field].compact.join('_')
+  end
+
+  # @abstract Determine if the field is required or not
+  # @param [Mongoid::Document] model
+  # @param [Symbol] field
+  # @return [Boolean]
+  def form_required_field?(model, field)
+    model.class.validators_on(field).any? { |v| v.is_a?(Mongoid::Validatable::PresenceValidator) }
+  rescue StandardError
+    false
   end
 
   def form_radio_button(model, field, options = {})
@@ -348,4 +352,57 @@ module CoreFormHelper
       concat(form_label_tag(model, field, value))
     end
   end
+
+  # @abstract Get the placeholder for this input element
+  # @param [Mongoid::Document] model
+  # @param [Symbol] field
+  # @param [String, nil] default
+  # @return [String, nil]
+  def form_place_holder_text(model, field, default = nil)
+    form_localized_text(model, field, :placeholders, default)
+  end
+
+  # @abstract Get the helper text for this input element
+  # @param [Mongoid::Document] model
+  # @param [Symbol] field
+  # @param [String, nil] default
+  # @return [String, nil]
+  def form_helper_text(model, field, default = nil)
+    form_localized_text(model, field, :helpers, default)
+  end
+
+  # @abstract Get the hint text for this input element
+  # @param [Mongoid::Document] model
+  # @param [Symbol] field
+  # @param [String, nil] default
+  # @return [String,nil]
+  def form_hint_text(model, field, default = nil)
+    form_localized_text(model, field, :hints, default)
+  end
+
+  # @abstract Get the label for this input element
+  # @param [Mongoid::Document] model
+  # @param [Symbol] field
+  # @param [String, nil] default
+  # @return [String,nil]
+  def input_label(model, field, default = model.class.human_attribute_name(field))
+    form_localized_text(model, field, :labels, default)
+  end
+
+  def required_field?(model, field)
+    form_required_field?(model, field)
+  end
+
+  # @abstract Get the localized value for the given key
+  # @param [Mongoid::Document] model
+  # @param [Symbol] field
+  # @param [Symbol] type
+  # @param [String] default
+  # @return [String,nil]
+  def form_localized_text(model, field, type, default = nil)
+    key = ['ui_form', model.class.to_s.underscore, type, field].join('.')
+    I18n.exists?(key) ? I18n.t(key) : default
+  rescue StandardError
+    default
+  end
 end

data/app/helpers/core_form_input_helper.rb

@@ -0,0 +1,74 @@
+module CoreFormInputHelper
+
+  # @abstract Render a email text field
+  # @param [Mongoid::Document] model - The model to render the field for
+  # @param [Symbol] field - The field to render
+  # @param [Hash] options - Options to pass to the field
+  def form_number_field(model, field, options = {})
+    options[:type] ||= :number
+    options[:step] ||= 1
+    options[:min] ||= 0
+    form_text_field(model, field, options)
+  end
+
+  # @abstract Render a email text field
+  # @param [Mongoid::Document] model - The model to render the field for
+  # @param [Symbol] field - The field to render
+  # @param [Hash] options - Options to pass to the field
+  def form_email_field(model, field, options = {})
+    options[:type] ||= :email
+    form_text_field(model, field, options)
+  end
+
+  # @abstract Render a text field
+  # @param [Mongoid::Document] model - The model to render the field for
+  # @param [Symbol] field - The field to render
+  # @param [Hash] options - Options to pass to the field
+  def form_url_field(model, field, options = {})
+    options[:type] ||= :url
+    form_text_field(model, field, options)
+  end
+
+  # @abstract Render a text field
+  # @param [Mongoid::Document] model - The model to render the field for
+  # @param [Symbol] field - The field to render
+  # @param [Hash] options - Options to pass to the field
+  def form_password(model, field, options = {})
+    options[:type] = :password
+    form_text_field(model, field, options)
+  end
+
+  # @abstract Render a text field
+  # @param [Mongoid::Document] model - The model to render the field for
+  # @param [Symbol] field - The field to render
+  # @param [Hash] options - Options to pass to the field
+  def form_text_field(model, field, options = {})
+    label_options = options.clone
+    classes = options[:classes] || []
+    classes << 'mb-3'
+    value = model.send(field)
+    options[:type] ||= :text
+    options[:value] = value
+    options[:disabled] ||= false
+    tag_options = text_field_options(model, field, options)
+    content_tag(:div, class: classes.join(' ')) do
+      concat(form_label_tag(model, field, value, label_options))
+      concat(tag(:input, tag_options))
+    end
+  end
+
+  # @abstract Build the options for a text field, place holder, hint, etc.
+  # @param [Mongoid::Document] model - The model to render the field for
+  # @param [Symbol] field - The field to render
+  # @param [Hash] options - Options to pass to the field
+  def text_field_options(model, field, options = {})
+    classes = %w[form-control]
+    classes += options[:input_classes] if options[:input_classes].present?
+    options[:name] = form_field_name(model, field, options)
+    options[:id] = form_field_id(model, field, options)
+    place_holder = options[:place_holder] || form_place_holder_text(model, field)
+    options[:placeholder] = place_holder if place_holder.present?
+    options[:class] = classes.uniq
+    options
+  end
+end

data/app/helpers/core_form_select_helper.rb

@@ -0,0 +1,65 @@
+module CoreFormSelectHelper
+  def form_select(model, field, options = {})
+    value = model.send(field)
+    raise 'Prompt needed' if value.blank? && options[:prompt].blank? && !options[:no_label]
+
+    label_options = options.clone
+    hint = input_hint(model, field)
+    if hint.present?
+      base_classes = %w[tooltipped]
+      data = { tooltip: I18n.t(hint_key), position: :top }
+    else
+      base_classes = []
+      data = {}
+    end
+    classes = (base_classes + (options[:classes] || %w[s12 m6 l4 xl3])).join(' ')
+    content_tag(:div, class: classes, data: data) do
+      concat(input_label_tag(model, field, value, options))
+      concat(form_input_select_tag(model, field, label_options))
+    end
+  end
+
+  def form_select_tag(model, field, options = {})
+    select_content = {
+      id: form_field_id(model, field, options),
+      name: form_field_name(model, field, options),
+      class: [options[:input_classes], 'form-select'].compact.join(' '),
+      disabled: options[:disabled]
+    }
+    content_tag(:select, select_content) do
+      form_select_option_key_values(model.send(field), options).each do |value|
+        concat(content_tag(:option, value: value[:key], selected: value[:selected]) do
+          concat(value[:value])
+        end)
+      end
+    end
+  end
+
+  def form_select_option_key_values(value, options)
+    select_options = []
+    select_options << { key: '', value: options[:prompt], selected: false } if options[:prompt].present?
+    options[:options].each do |option_value|
+      option_value[:display_name] = option_value.display_name if option_value.respond_to?(:display_name)
+      option_value[:display_name] = option_value.user_display_name if option_value.respond_to?(:user_display_name)
+      select_options << case option_value
+                        when String, Integer
+                          { key: option_value,
+                            value: option_value,
+                            selected: value.eql?(option_value) }
+                        when Array
+                          { key: option_value.last,
+                            value: option_value.first,
+                            selected: value.to_s.eql?(option_value.last.to_s) }
+                        when Hash
+                          { key: option_value[:key],
+                            value: option_value[:value],
+                            selected: value.eql?(option_value[:key]) }
+                        else
+                          { key: option_value[:_id].to_s,
+                            value: option_value[:display_name] || option_value[:name],
+                            selected: value.eql?(option_value) }
+                        end
+    end
+    select_options
+  end
+end

data/app/helpers/core_form_textarea_helper.rb

@@ -0,0 +1,22 @@
+module CoreFormTextareaHelper
+  def form_textarea(model, field, options = {})
+    classes = options[:classes] || []
+    value = model.send(field)
+    # options[:value] = value
+    # options[:disabled] ||= false
+    # tag_options = {class: []} # text_field_options(model, field, options)
+    # tag_options[:class] += ['materialize-textarea']
+    content_tag(:div, class: (%w[mb-3] + classes).flatten.join(' ')) do
+      concat(input_label_tag(model, field, value, options))
+      concat(textarea_tag(model, field, value, options))
+    end
+  end
+
+  def form_textarea_tag(model, field, value, options = {})
+    tag_options = text_input_options(model, field, options)
+    tag_options[:class] << 'form-control'
+    content_tag(:textarea, tag_options) do
+      concat(value)
+    end
+  end
+end

data/app/helpers/core_link_helper.rb

@@ -115,14 +115,6 @@ module CoreLinkHelper
     end
   end
 
-  def edit_modal_tag(obj, path, _options = {})
-    return unless can? :edit, obj
-
-    content_tag(:a, href: path, class: 'modal-action') do
-      concat(I18n.t('ui_form.actions.edit'))
-    end
-  end
-
   #
   # Restart a thingy
   #

data/app/helpers/core_table_helper.rb

@@ -4,6 +4,16 @@
 # Methods useful for building out tables
 #
 module CoreTableHelper
+  def card_table_header_actions_tag(clazz, path, classes: [], icon_name: :add, title: 'Add')
+    return unless can?(:create, clazz)
+
+    classes << 'btn'
+    content_tag(:a, class: classes.join(' '), href: path) do
+      concat(svg_icon(icon_name))
+      concat(content_tag(:span, title))
+    end
+  end
+
   #
   # Format the table header
   # @param name - Name of the header, either the text or a localized value
@@ -77,4 +87,17 @@ module CoreTableHelper
       end)
     end
   end
+
+  # @abstract Return a table data cell with a boolean value
+  # @param value [Boolean] - The value to display
+  # @return [String] - The HTML for the cell
+  def table_data_boolean(value, show_false: true)
+    content_tag(:td, class: 'text-center', data: { order: value ? 0 : 1 }) do
+      if value
+        svg_icon(:check, color: :green)
+      else
+        svg_icon(:x, color: :red) if show_false
+      end
+    end
+  end
 end

data/app/helpers/model_modal_helper.rb

@@ -69,15 +69,20 @@ module ModelModalHelper
   end
 
   def model_modal_action(model, _options = {})
-    content_tag(:a, class: 'modal-trigger', href: "#modal-#{model.id}") do
+    content_tag(:a, href: '#', data: { bs_toggle: :modal, bs_target: "#modal-#{model.id}" }) do
       concat(model.name)
     end
   end
 
   def model_modal(model, edit_path, options = {})
-    content_tag(:div, class: 'modal', id: "modal-#{model.id}") do
-      concat(model_modal_content(model, options))
-      concat(model_modal_footer(model, edit_path))
+    content_tag(:div, class: 'modal', id: "modal-#{model.id}", tabindex: -1) do
+      concat(model_modal_dialog(model, edit_path, options))
+    end
+  end
+
+  def model_modal_dialog(model, edit_path, options = {})
+    content_tag(:div, class: 'modal-dialog', role: :document) do
+      concat(model_modal_content(model, edit_path, options))
     end
   end
 
@@ -85,40 +90,60 @@ module ModelModalHelper
     model_modal_content(model, options) + model_modal_footer(model, "#{request.url}/edit")
   end
 
-  def model_modal_content(model, options = {})
+  def model_modal_content(model, edit_path, options = {})
     content_tag(:div, class: 'modal-content') do
-      concat(content_tag(:h2) { model.name })
-      concat(content_tag(:div, class: 'row') do
-        concat(model_modal_tabs(model, options))
-        concat(model_modal_fields_tab(model, options))
-        concat(model_modal_standard_tab(model, options))
-        concat(model_modal_logs_tab(model, options)) if model.respond_to?(:logs) && options[:show_audit_logs]
-      end)
+      concat(model_modal_header(model, edit_path, options))
+      model_modal_body(model, edit_path, options)
+      concat(model_modal_footer(model, edit_path))
+    end
+  end
+
+  def model_modal_header(model, edit_path, options = {})
+    content_tag(:div, class: 'modal-header') do
+      concat(content_tag(:h2) { model.name.titleize })
+      concat(tag(:button, class: 'btn-close', data: { bs_dismiss: :modal }, aria_label: :close))
     end
   end
 
+  def model_modal_body(model, edit_path, options = {})
+    concat(content_tag(:div, class: 'model-body') do
+      concat(model_modal_tabs(model, options))
+      concat(model_modal_tab_content(model, options))
+    end)
+  end
+
   def model_modal_tabs(model, _options = {})
-    content_tag(:div, class: 'col s12') do
-      concat(content_tag(:ul, class: 'tabs tabs-fixed-width') do
-        concat(content_tag(:li, class: 'tab') do
-          content_tag(:a, href: "#field-tab-#{model.id}") { model.class.to_s.titleize }
-        end)
-        concat(content_tag(:li, class: 'tab') { content_tag(:a, href: "#standard-tab-#{model.id}") { 'Details' } })
-        if model.respond_to?(:logs)
-          concat(content_tag(:li, class: 'tab') { content_tag(:a, href: "#logs-tab-#{model.id}") { 'Logs' } })
-        end
+    content_tag(:ul, class: 'nav nav-tabs', data: { bs_toggle: :tabs }) do
+      concat(content_tag(:li, class: 'nav-item') do
+        content_tag(:a, class: 'nav-link active', href: "#field-tab-#{model.id}", data: { bs_toggle: :tab }) { model.class.to_s.titleize }
       end)
+      concat(content_tag(:li, class: 'nav-item') do
+        content_tag(:a, class: 'nav-link', href: "#standard-tab-#{model.id}", data: { bs_toggle: :tab }) { 'Details' }
+      end)
+      if model.respond_to?(:logs)
+        concat(content_tag(:li, class: 'nav-item') do
+          content_tag(:a, class: 'nav-item', href: "#logs-tab-#{model.id}", data: { bs_toggler: :tab }) { 'Logs' }
+        end)
+      end
+    end
+  end
+
+  def model_modal_tab_content(model, options = {})
+    content_tag(:div, class: 'tab-content') do
+      concat(model_modal_fields_tab(model, options))
+      concat(model_modal_standard_tab(model, options))
+      # concat(model_modal_logs_tab(model, options)) if model.respond_to?(:logs) && options[:show_audit_logs]
     end
   end
 
   def model_modal_standard_tab(model, options = {})
-    content_tag(:div, id: "standard-tab-#{model.id}", class: 'col s12') do
-      concat(model_modal_standard(model, options))
+    content_tag(:div, id: "standard-tab-#{model.id}", class: 'tab-pane', role: :tabpanel) do
+      concat(model_modal_standard_fields(model, options))
     end
   end
 
   def model_modal_fields_tab(model, options = {})
-    content_tag(:div, id: "field-tab-#{model.id}", class: 'col s12') do
+    content_tag(:div, id: "field-tab-#{model.id}", class: 'tab-pane active', role: :tabpanel) do
       concat(model_modal_fields(model, options))
     end
   end
@@ -150,33 +175,28 @@ module ModelModalHelper
   end
 
   def model_modal_fields(model, _options = {})
-    content_tag(:table, class: 'center-align') do
-      concat(content_tag(:tbody) do
-        model.class.allowed_param_names.sort.each do |field_name|
-          concat(model_modal_field(model, field_name))
-        end
-      end)
+    content_tag(:div, class: 'datagrid m-2') do
+      field_names = ((model.class.allowed_param_names) + %w(description name)).uniq.sort
+      field_names.each do |field_name|
+        next if model.respond_to?(field_name) && model.send(field_name).blank?
+
+        concat(model_modal_field(model, field_name))
+      end
     end
   end
 
-  def model_modal_standard(model, _options = {})
-    content_tag(:table, class: 'center-align highlight') do
-      concat(content_tag(:tbody) do
-        %w[_id _type created_at updated_at search_text sort_text].each do |field_name|
-          concat(model_modal_field(model, field_name))
-        end
-      end)
+  def model_modal_standard_fields(model, _options = {})
+    content_tag(:div, class: 'datagrid m-2') do
+      model.class::STANDARD_FIELDS.each do |field_name|
+        concat(model_modal_field(model, field_name))
+      end
     end
   end
 
   def model_modal_field(model, field_name)
-    content_tag(:tr) do
-      concat(content_tag(:th, class: 'right-align') do
-        field_name
-      end)
-      concat(content_tag(:td) do
-        model_modal_field_value(model, field_name)
-      end)
+    content_tag(:div, class: 'datagrid-item') do
+      concat(content_tag(:div, class: 'datagrid-title') { field_name })
+      concat(content_tag(:div, class: 'datagrid-content') { model_modal_field_value(model, field_name) })
     end
   end
 
@@ -191,11 +211,11 @@ module ModelModalHelper
         related_model.present? ? related_model.name : 'N/A'
       end
     when FalseClass
-      'No'
+      svg_icon(:x, color: :red)
     when TrueClass
-      'Yes'
+      svg_icon(:check, color: :green)
     when Mongoid::Boolean
-      value ? 'Yes' : 'No'
+      value ? svg_icon(:check, color: :green) : svg_icon(:x, color: :red)
     when Date, DateTime, Time
       current_user.local_time(value, :long)
     when Integer, Array, Hash, Float
@@ -207,7 +227,20 @@ module ModelModalHelper
 
   def model_modal_footer(model, edit_path)
     content_tag(:div, class: 'modal-footer') do
+      concat(content_tag(:button, class: 'btn me-auto', data: { bs_dismiss: :modal }) do
+        concat(I18n.t('ui_form.actions.close'))
+        concat(svg_icon(:close))
+      end)
       concat(edit_modal_tag(model, edit_path))
     end
   end
+
+  def edit_modal_tag(obj, path, _options = {})
+    return unless can? :edit, obj
+
+    content_tag(:a, href: path, class: 'modal-action') do
+      concat(I18n.t('ui_form.actions.edit'))
+      concat(svg_icon(:edit))
+    end
+  end
 end

data/app/helpers/svg_icon_helper.rb

@@ -2,9 +2,13 @@
 module SvgIconHelper
   # @abstract Render the appropriate icon based on the name and type
   # @return [View]
-  def svg_icon(name, size: 24, type: :outline, classes: [], color: 'currentColor')
-    classes = ['icon', classes].compact.flatten.join(' ')
-    key = "icon_partial_path:#{name}:#{type}"
+  def svg_icon(name, size: 24, type: :outline, classes: [], color: 'currentColor', stroke_width: 2)
+    classes = if size <= 24
+                ['icon', classes].compact.flatten.join(' ')
+              else
+                classes.compact.flatten.join(' ')
+              end
+    puts "key: #{key}"
     (partial, stroke) = Rails.cache.fetch(key, expires_in: 1.hour) do
       path_with_type = "icons/#{name}-#{type}"
       path_without_type = "icons/#{name}"
@@ -27,12 +31,12 @@ module SvgIconHelper
             class: classes,
             fill: 'none',
             stroke: stroke,
-            stroke_width: 1,
+            stroke_width: stroke_width,
             stroke_linecap: 'round',
             stroke_linejoin: 'round') do
       render partial
     end
-  rescue StandardError 
+  rescue StandardError
     tag.svg(xmlns: "http://www.w3.org/2000/svg",
             viewBox: "0 0 24 24",
             width: size,
@@ -40,7 +44,7 @@ module SvgIconHelper
             class: classes,
             fill: 'none',
             stroke: 'red',
-            stroke_width: 1,
+            stroke_width: stroke_width,
             stroke_linecap: 'round',
             stroke_linejoin: 'round',
             data: { bs_toggle: :tooltip },

data/config/locales/en.yml

@@ -22,6 +22,7 @@ en:
       axlsx: '%Y-%m-%d'
   ui_form:
     actions:
+      close: Close
       reset: Reset
       cancel: Cancel
       update: Update

data/lib/app/models/concerns/standard_model.rb

@@ -10,24 +10,25 @@ module StandardModel
   include Mongoid::Timestamps
   include App47Logger
 
+  unless defined? FILER_NAMES
+    STANDARD_FIELDS = %w[created_at updated_at _type _id search_text sort_text last_modified_by_email
+                         last_modified_by_name created_by_email created_by_name last_modified_by_id created_by_id
+                         last_modified_by_type created_by_type].sort
+  end
+
   def self.included(base)
     base.class_eval do
-      #
+      # Constants
       # Fields
-      #
       field :last_modified_by_email, type: String
       field :last_modified_by_name, type: String
       field :created_by_email, type: String
       field :created_by_name, type: String
-      #
       # Relationships
-      #
       belongs_to :last_modified_by, polymorphic: true, optional: true
       belongs_to :created_by, polymorphic: true, optional: true
       has_many Web47core::Config.audit_model_log_symbol, dependent: :nullify, inverse_of: :model
-      #
       # Callbacks
-      #
       after_save :clear_cache
       before_destroy :clear_cache
       before_save :capture_user_info
@@ -62,7 +63,7 @@ module StandardModel
     #
     def allowed_param_names(filter_names = [], include_relationships = true)
       # Always filter out the mongoid reserved items
-      filter_names += %w[created_at updated_at _type _id search_text sort_text]
+      filter_names += STANDARD_FIELDS
       associations = many_to_many_associations
       # filter out the relationship names so we don't have dups
       associations.each { |association| filter_names << association.keys.first }

data/lib/web47core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Web47core
-  VERSION = '3.2.36'
+  VERSION = '3.2.50'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 3.2.36
+  version: 3.2.50
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-06 00:00:00.000000000 Z
+date: 2025-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -529,7 +529,11 @@ files:
 - app/helpers/core_dropdown_helper.rb
 - app/helpers/core_flash_toast_helper.rb
 - app/helpers/core_floating_action_button_helper.rb
+- app/helpers/core_form_checkbox_helper.rb
 - app/helpers/core_form_helper.rb
+- app/helpers/core_form_input_helper.rb
+- app/helpers/core_form_select_helper.rb
+- app/helpers/core_form_textarea_helper.rb
 - app/helpers/core_helper.rb
 - app/helpers/core_html5_form_helper.rb
 - app/helpers/core_job_state_helper.rb