five-two-nw-olivander 0.2.0.1 → 0.2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d247c42715b68ca77e28f0b8d99f48b466d042ba197aad6a0fa5694d344d7d3
-  data.tar.gz: 5d4f1e94e9c1d85378a0586481ecf276b34d65364fb341e95ae9020f437293f2
+  metadata.gz: 2e9d0ccea420078110d4af7de4d7eec3c0ac04e8a8a2533302d5792a1d599c58
+  data.tar.gz: '09b69957d70478ef092e8eff4a979ee867ac74c903fe1572793016d8ab26f531'
 SHA512:
-  metadata.gz: 336beef33e5b2f9b3242a654d9de9b5cb2b19ef30b25b62ccb0b2bbb74753afbdddf027a289ec6dc65d873e9a53acab6998983f0394aa8162a1c516976c8f8f7
-  data.tar.gz: aee825f87643bebac907ccfdf499b1f8d76f1a8e4049f58fa35856eaea663f8d175f808f7b04aa56b1ff0b704f7e1a7c322d6568e945b555c01423c0e6ec29e9
+  metadata.gz: 07ce6181e19ada53a8d78cf650c8b4cef82ccb4d38b33a09cca9b340d71567d2a4889f613c5986afb85fb6cc32b0b6010999f9af05fe40ab1ff7ff3a45f291e5
+  data.tar.gz: 67fbcc49d403734676c0f8d46052585ed70e127878bd6f4490f7d94f104d02aa8bcd7827da5d39957182a4a7b9dcc3947b41e69425189844a34e1812684efe15

data/app/assets/config/olivander_manifest.js

@@ -1 +1,5 @@
 //= link_directory ../stylesheets/olivander .css
+//= link controllers/datatable_index_charts_controller.js
+//= link controllers/datatable_expandable_chart_controller.js
+//= link controllers/turbo_flash_controller.js
+//= link controllers/input_control_association_controller.js

data/app/assets/javascripts/adminlte/datatable.fix.js

@@ -0,0 +1,42 @@
+(function() {
+  var destroySelect2s, logEvent;
+
+  $.extend(true, $.fn.dataTable.Buttons.defaults, {
+    dom: {
+      button: {
+        className: 'btn btn-outline-primary btn-sm'
+      }
+    }
+  });
+
+  $.extend(true, $.fn.dataTable.ext.classes, {
+    sProcessing: "dataTables_processing card overlay-wrapper"
+  });
+
+  destroySelect2s = function() {
+    $('.effective-datatables-filters').find('select').select2('destroy');
+    return $('.dataTables_wrapper').each(function(_, o) {
+      try {
+        return $(o).find('.dataTables_length select.select2-hidden-accessible').addClass('no-select2').removeAttr('name').select2('destroy');
+      } catch (error) {}
+    });
+  };
+
+  logEvent = function(e) {
+    return console.log(e);
+  };
+
+  $(document).ready(function(e) {
+    return destroySelect2s();
+  });
+
+  // $(document).ready(function(e) {
+  //   return $('.effective-datatables-filters input').click(function() {
+  //     var $form, $table;
+  //     $form = $(event.currentTarget).closest('.effective-datatables-filters');
+  //     $table = $('#' + $form.attr('aria-controls'));
+  //     return $table.DataTable().draw();
+  //   });
+  // });
+
+}).call(this);

data/app/assets/javascripts/adminlte/select2_defaults.coffee

@@ -11,13 +11,25 @@ $.fn.select2.defaults.set('dropdownParent', $('#modal-root'))
 #
 # TODO: Recheck with the select2 GH issue and remove once this is fixed on their side
 #
-$(document).on 'select2:open', () =>
-  document.querySelector('.select2-search__field').focus()
+$(document).on 'select2:open', (evt) =>
+  try
+    evt.target.parent.querySelector('.select2-search__field').focus()
+  catch ex
+    evt.target.parentElement.querySelector('.select2-search__field').focus()
+
 
 initSelect2s = () -> $('select').not('.no-select2').each (k,v) =>
   $(v).select2({ dropdownParent: $(v).parent() })
 
-$(document).ready -> initSelect2s()
+# $(document).ready -> initSelect2s()
 $(document).on 'show.bs.modal', (e) =>
   $('select').not('.no-select2').each (k,v) =>
     $(v).select2({ dropdownParent: $(v).parent() })
+
+$(document).ready =>
+  $('.effective-datatables-filters').find('select').select2('destroy');
+  $('.dataTables_wrapper').each (_, o) =>
+    try
+      return $(o).find('.dataTables_length select.select2-hidden-accessible').addClass('no-select2').removeAttr('name').select2('destroy');
+    catch error
+      # don't care

data/app/assets/javascripts/adminlte.js

@@ -19,3 +19,4 @@
 //= require "adminlte/dist/js/adminlte.js"
 //= require 'olivander/flash_toast'
 //= require "effective_datatables"
+//= require "adminlte/datatable.fix.js"

data/app/assets/javascripts/controllers/input_control_association_controller.js

@@ -0,0 +1,25 @@
+import { Controller } from "@hotwired/stimulus"
+
+// Connects to data-controller="input-control-association"
+export default class extends Controller {
+  connect() {
+    var self = this,
+        el = self.element;
+    if (!$(el).hasClass("select2-hidden-accessible")) {
+      $(el).select2({
+        dropdownParent: $(el).parent(),
+        ajax: {
+          url: el.dataset.collectionPath,
+          delay: 250,
+          minimumInputLength: 2,
+          dataType: 'json',
+          processResults: function(data) {
+            return { results: data.map(function(map) {
+              return { id: map.id, text: map.text || map.name || map.description };
+            }) };
+          }
+        }
+      })
+    }
+  }
+}

data/app/components/olivander/components/resource_form_component.html.haml

@@ -5,9 +5,20 @@
       - section.fields.each do |field|
         %div{ class: section.column_class }
           - case field.type
-          - when :association
-            = @f.association field.sym, disabled: !field.editable, input_html: { data: { controller: "input-control-#{field.type}" } }
+          - when :association, :belongs_to_association, :has_many_association, :has_many_through_association, :has_and_belongs_to_many_reflection, :has_one_through_association
+            - reflection = @f.object.class.reflect_on_association(field.sym)
+            - controllers = "#{field.type}-#{@resource.class.name.underscore.gsub('/', '_')}-#{field.sym} input-control-association"
+            - begin
+              - collection_path = polymorphic_path(@resource.class.reflect_on_association(field.sym).klass, format: :json)
+            - rescue
+              - collection_path = ''
+            - collection = @f.object.send(field.sym)
+            - case field.type
+            - when :has_one_through_association
+              = @f.input field.sym, selected: collection, collection: [collection].flatten, disabled: !field.editable, input_html: { data: { collection_path: collection_path, controller: controllers } }
+            -else
+              = @f.association field.sym, collection: [collection].flatten, disabled: !field.editable, input_html: { data: { collection_path: collection_path, controller: controllers } }
           - when :boolean 
             = @f.input field.sym, disabled: !field.editable, as: field.type.to_sym, input_html: { data: { controller: "input-control-#{field.type}" } }, wrapper: :checkbox
           - else 
-            = @f.input field.sym, disabled: !field.editable, as: field.type.to_sym, input_html: { data: { controller: "input-control-#{field.type}" } }
+            = @f.input field.sym, disabled: !field.editable, as: field.type.to_sym, input_html: { rows: 10, data: { controller: "input-control-#{field.type}" } }

data/app/components/olivander/components/resource_show_component.html.haml

@@ -23,14 +23,20 @@
                 - when :boolean
                   - icon_class = val ? 'fa-check text-success' : 'fa-times text-danger'
                   %i.fa{ class: icon_class }
-                - when :association
+                - when :association, :belongs_to_association, :has_many_association, :has_many_through_association, :has_and_belongs_to_many_reflection, :has_one_through_association
                   - if val.present?
                     - if val.is_a?(ActiveRecord::Associations::CollectionProxy)
                       %ul
                         - val.each do |val1|
-                          %li= link_to val1
+                          - begin
+                            %li= link_to val1
+                          - rescue 
+                            %li= val1
                     - else
-                      = link_to val if val.present?
+                      - begin
+                        = link_to val if val.present?
+                      - rescue
+                        = val if val.present?
                 - when :file
                   - if val.present?
                     - if val.content_type.include?('image')
@@ -38,7 +44,6 @@
                     - else
                       = link_to val, val.expiring_url
                 - else
-                  = f.type
                   = val
             - (section.columns-slice.size).times do
               %th

data/app/controllers/concerns/olivander/resources/application_record.rb

@@ -0,0 +1,24 @@
+module Olivander
+  module Resources
+    module ApplicationRecord
+      extend ActiveSupport::Concern
+
+      included do
+        def self.audited_as klazz
+          # Rails.logger.debug "#{self.class.name} is audited as #{klazz.name}"
+          @@audited_user_class = klazz
+
+          belongs_to :created_by, class_name: klazz.name
+          belongs_to :updated_by, class_name: klazz.name
+
+          before_validation :set_audit_user
+        end
+
+        def set_audit_user
+          self.created_by ||= @@audited_user_class.current
+          self.updated_by = @@audited_user_class.current
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/olivander/resources/auto_form_attributes.rb

@@ -33,16 +33,16 @@ module Olivander
           self.resource_field_group_collection
         end
 
-        def self.auto_resource_fields(columns: 2, only: [])
+        def self.auto_resource_fields(columns: 2, only: [], except: [], editable: true)
           return unless ActiveRecord::Base.connection.table_exists?(table_name)
 
           if current_resource_field_group.nil?
             resource_field_group do
-              auto_resource_fields(columns: columns, only: only)
+              auto_resource_fields(columns: columns, only: only, except: except, editable: editable)
             end
           elsif current_resource_field_group.forced_section.nil?
             resource_field_section(columns) do
-              auto_resource_fields(columns: columns, only: only)
+              auto_resource_fields(columns: columns, only: only, except: except, editable: editable)
             end
           else
             if only.size.zero?
@@ -53,27 +53,30 @@ module Olivander
               only << attachment_definitions.select{ |x| x[0] } if respond_to?(:attachment_definitions)
               only = only.flatten - SKIPPED_ATTRIBUTES
             end
+            only = only - except
             only.each do |inc|
               self.columns.each do |att|
                 sym = att.name.to_sym
                 type = att.type
                 next unless inc == sym
 
-                resource_field sym, type
+                resource_field sym, type, editable: editable
               end
 
               reflections.map{ |x| x[1] }
                          .filter{ |x| x.foreign_key == inc || x.name == inc }
                          .each do |r|
-                sym = r.name
-                type = :association
-                resource_field sym, type
+                begin
+                  resource_field(r.name, r.association_class.name.demodulize.underscore.to_sym, editable: editable)
+                rescue NotImplementedError
+                  resource_field(r.name, :association, editable: editable)
+                end
               end
 
               next unless respond_to?(:attachment_definitions)
 
               attachment_definitions.filter{ |x| x == inc }.each do |ad|
-                resource_field ad[0], :file
+                resource_field ad[0], :file, editable: editable
               end
             end
           end

data/app/controllers/concerns/olivander/resources/crud_controller.rb

@@ -0,0 +1,39 @@
+module Olivander
+  module Resources
+    module CrudController
+      extend ActiveSupport::Concern
+
+      included do
+        include Effective::CrudController
+        layout 'olivander/adminlte/main'
+
+        def index
+          if request.format == :json && params[:_type].present? && params[:_type] == 'query'
+            index_search
+          else
+            super
+          end
+        end
+
+        def index_search
+          self.resources ||= resource_scope.all if resource_scope.respond_to?(:all)
+          if resource_scope.respond_to?(:search_for)
+            self.resources = self.resources.search_for(params[:term])
+          else
+            k = resources.klass
+            like_term = "%#{ActiveRecord::Base.sanitize_sql_like(params[:term])}%"
+            fields = %w[name title description text].keep_if{ |field| k.respond_to?(field) }
+            clauses = fields.map{ |field| "#{field} ilike '#{like_term}'" }.join(' or ')
+            orders = fields.join(', ')
+            self.resources = self.resources.where(clauses).order(orders) if clauses.length.positive?
+          end
+          self.resources = self.resources.limit(25)
+        end
+
+        def permitted_params
+          params.fetch(resource_klass.name.underscore.gsub('/', '_').to_sym, {}).permit!
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/olivander/resources/route_builder.rb

@@ -3,12 +3,12 @@ module Olivander
     class ResourceAction
       attr_accessor :sym, :action, :verb, :confirm, :turbo_frame, :collection,
                     :controller, :crud_action, :show_in_form, :show_in_datatable,
-                    :no_route, :path_helper, :confirm_with
+                    :no_route, :path_helper, :confirm_with, :primary
 
       def initialize(sym, action: nil, controller: nil, verb: :get, confirm: false,
                      turbo_frame: nil, collection: false, crud_action: false,
                      show_in_form: true, show_in_datatable: true, no_route: false,
-                     path_helper: nil, confirm_with: nil)
+                     path_helper: nil, confirm_with: nil, primary: nil)
         self.sym = sym
         self.action = action || sym
         self.controller = controller
@@ -22,6 +22,7 @@ module Olivander
         self.no_route = no_route
         self.path_helper = path_helper
         self.confirm_with = confirm_with
+        self.primary = primary || crud_action
       end
 
       def args_hash(options = nil)
@@ -131,7 +132,7 @@ module Olivander
 
         def action(sym, verb: :get, confirm: false, turbo_frame: nil, collection: false, show_in_datatable: true,
                    show_in_form: true, no_route: false, controller: nil, action: nil, path_helper: nil,
-                   confirm_with: nil
+                   confirm_with: nil, primary: nil
                   )
           raise 'Must be invoked in a resource block' unless current_resource.present?
 
@@ -139,7 +140,7 @@ module Olivander
           current_resource.actions << ResourceAction.new(
             sym, action: action, controller: controller, verb: verb, confirm: confirm, turbo_frame: turbo_frame, collection: collection,
             show_in_datatable: show_in_datatable, show_in_form: show_in_form, no_route: no_route, path_helper: path_helper,
-            confirm_with: confirm_with
+            confirm_with: confirm_with, primary: primary
           )
         end
 

data/app/helpers/olivander/application_helper.rb

@@ -73,6 +73,14 @@ module Olivander
       render partial: 'resource_form_actions', locals: { actions: authorized_resource_actions(resource, for_action: for_action).select(&:show_in_form) }
     end
 
+    def resource_form_action_tooltip(resource, action)
+      key = resource.class.name.underscore
+      return I18n.t("activerecord.actions.#{key}.#{action}-tooltip") if I18n.exists?("activerecord.actions.#{key}.#{action}-tooltip")
+      return I18n.t("activerecord.actions.#{action}-tooltip") if I18n.exists?("activerecord.actions.#{action}-tooltip")
+
+      action.to_s.titleize
+    end
+
     def resource_form_action_label(resource, action)
       key = resource.class.name.underscore
       return I18n.t("activerecord.actions.#{key}.#{action}") if I18n.exists?("activerecord.actions.#{key}.#{action}")
@@ -95,7 +103,7 @@ module Olivander
     end
 
     def current_user
-      Olivander::CurrentContext.user || OpenStruct.new({ display_name: 'No User Set' })
+      Olivander::CurrentContext.user
     end
 
     def current_ability

data/app/inputs/custom_form_builder.rb

@@ -0,0 +1,41 @@
+class CustomFormBuilder < SimpleForm::FormBuilder
+  def initialize(*)
+    super
+  end
+
+  def association(association, options = {}, &block)
+    resolve_custom_input_association(association, options)
+    super(association, options, &block)
+  end
+
+  def resolve_custom_input_association(association, options)
+    return if options[:as].present?
+
+    [
+      "#{object.class.name.demodulize.underscore}_#{association.to_s}".to_sym, association
+    ].each do |key|
+      camelized = "#{key.to_s.camelize}Input"
+      mapping = attempt_mapping_with_custom_namespace(camelized) ||
+                attempt_mapping(camelized, Object) ||
+                attempt_mapping(camelized, self.class)
+
+      next unless mapping.present?
+
+      options[:as] = key
+      break
+    end
+  end
+
+  private
+
+  def fetch_association_collection(reflection, options)
+    options_method = "options_for_#{reflection.name}".to_sym
+    if object.respond_to?(options_method) then
+      options.fetch(:collection) do
+        object.send(options_method)
+      end
+    else
+      super(reflection, options)
+    end
+  end
+end

data/app/views/application/_form.html.haml

@@ -1,5 +1,5 @@
 - read_only = !%w[new create edit update].include?(action_name)
-= simple_form_for(@resource) do |f|
+= simple_form_for(@resource, builder: CustomFormBuilder) do |f|
   .card.card-primary
     .card-header
       %h3.card-title= @resource.to_s.blank? ? @resource.model_name.human : @resource

data/app/views/effective/resource/_actions_dropleft.html.haml

@@ -4,21 +4,27 @@
 -#     - data = a.turbo_frame.present? ? { turbo: true, turbo_frame: a.turbo_frame } : {}
 -#     = dropdown_link_to resource_form_action_label(resource, a.sym), path, data: data
 - actions = authorized_resource_actions(resource, for_action: action_name).select{ |x| x.show_in_datatable }
-- crud_actions = actions.select{ |a| a.crud_action }
-- non_crud_actions = actions.select{ |a| !a.crud_action }
+- primary_actions = actions.select{ |a| a.primary }
+- non_primary_actions = actions.select{ |a| !a.primary }
 .btn-group
-  - if non_crud_actions.size.positive?
+  - if non_primary_actions.size.positive?
     .btn-group
       %button.btn.btn-sm.dropdown-toggle{ type: :button, data: { toggle: 'dropdown' }}
       %ul.dropdown-menu
-        - non_crud_actions.each do |a|
+        - non_primary_actions.each do |a|
           - path = a.path_helper.is_a?(Proc) ? a.path_helper.call(resource) : send(a.path_helper, resource.id)
-          - data = a.turbo_frame.present? ? { turbo: true, turbo_frame: a.turbo_frame } : {}
+          - hash = {}
+          - data = a.turbo_frame.present? ? { turbo: true, turbo_frame: a.turbo_frame, turbo_method: a.verb } : {}
+          - hash[:data] = data
+          - hash[:method] = a.verb unless a.turbo_frame.present?
           %li
-            = dropdown_link_to resource_form_action_label(resource, a.sym), path, data: data, method: a.verb
-  - crud_actions.each do |a|
+            = dropdown_link_to resource_form_action_label(resource, a.sym), path, hash
+  - primary_actions.each do |a|
     - path = a.path_helper.is_a?(Proc) ? a.path_helper.call(resource) : send(a.path_helper, resource.id)
     - icon_class = (a.verb == :delete ? '' : '')
-    = link_to path, a.args_hash(title: resource_form_action_label(resource, a.sym), class: "btn btn-sm #{icon_class}") do
-      %i{ class: resource_form_action_icon(resource, a.sym), style: 'display: block; font-size: 10px' }
-      %span{ style: 'font-size: 12px' }= resource_form_action_label(resource, a.sym)
+    = link_to path, a.args_hash(title: resource_form_action_tooltip(resource, a.sym), class: "btn btn-sm #{icon_class}") do
+      - action_label = resource_form_action_label(resource, a.sym)
+      - icon_font_size = action_label.blank? ? '18px' : '10px'
+      %i{ class: resource_form_action_icon(resource, a.sym), style: "display: block; font-size: #{icon_font_size}" }
+      - unless action_label.blank?
+        %span{ style: 'font-size: 12px' }= action_label

data/app/views/layouts/olivander/adminlte/_navbar.html.haml

@@ -101,20 +101,21 @@
     -#     %a.dropdown-item.dropdown-footer{:href => "#"} See All Notifications
     %li.nav-item.dropdown.user-menu
       %a.nav-link.dropdown-toggle{"data-toggle" => "dropdown", :href => "#"}
-        %img.user-image.img-circle.elevation-2{:alt => "User Image", :src => image_path(user_image_path(current_user))}/
+        %img.user-image.img-circle.elevation-2{:alt => "User Image", :src => image_path(user_image_path(Olivander::CurrentContext.user))}/
 
-        %span.d-none.d-md-inline= current_user.display_name
+        %span.d-none.d-md-inline= Olivander::CurrentContext.user.display_name
       %ul.dropdown-menu.dropdown-menu-lg.dropdown-menu-right
         / User image
         %li.user-header.bg-primary
-          %img.img-circle.elevation-2{:alt => "User Image", src: image_path(user_image_path(current_user))}/
-          %p= current_user.display_name
+          %img.img-circle.elevation-2{:alt => "User Image", src: image_path(user_image_path(Olivander::CurrentContext.user))}/
+          %p= Olivander::CurrentContext.user.display_name
         / Menu Footer
-        %li.user-footer
-          = link_to user_path(current_user), class: 'btn btn-default btn-flat' do
-            Profile
-          = link_to Olivander::CurrentContext.application_context.sign_out_path, method: :delete, class: 'btn btn-default btn-flat float-right' do
-            Sign out
+        - unless Olivander::CurrentContext.user.is_a?(OpenStruct)
+          %li.user-footer
+            = link_to polymorphic_path(Olivander::CurrentContext.user), class: 'btn btn-default btn-flat' do
+              Profile
+            = link_to Olivander::CurrentContext.application_context.sign_out_path, method: :delete, class: 'btn btn-default btn-flat float-right' do
+              Sign out
     %li.nav-item
       %a.nav-link{title: 'Full Screen Mode', "data-widget" => "fullscreen", :href => "#", :role => "button"}
         %i.fas.fa-expand-arrows-alt

data/config/initializers/simple_form.rb

@@ -70,16 +70,49 @@ SimpleForm.setup do |config|
   config.wrappers :checkbox, class: "form-check",
     hint_class: :field_with_hint, error_class: :field_with_errors, valid_class: :field_without_errors do |b|
     b.use :html5
-    b.use :placeholder
-    b.optional :maxlength
-    b.optional :minlength
-    b.optional :pattern
-    b.optional :min_max
     b.optional :readonly
-    b.use :input, class: 'form-check-input'
-    b.use :label #, class: 'form-control'
-    b.use :hint,  wrap_with: { tag: :span, class: :hint }
-    b.use :error, wrap_with: { tag: :span, class: "text-danger" }
+    b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba|
+      ba.use :label_text
+    end
+    b.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid'
+    b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
+    b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
+  end
+
+  # vertical input for boolean
+  config.wrappers :vertical_boolean, tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
+    b.use :html5
+    b.optional :readonly
+    b.wrapper :form_check_wrapper, tag: 'div', class: 'form-check' do |bb|
+      bb.use :input, class: 'form-check-input' #, error_class: 'is-invalid', valid_class: 'is-valid'
+      bb.use :label, class: 'form-check-label'
+      bb.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' }
+      bb.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
+    end
+  end
+
+  # vertical input for radio buttons and check boxes
+  config.wrappers :vertical_collection, item_wrapper_class: 'form-check', item_label_class: 'form-check-label', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
+    b.use :html5
+    b.optional :readonly
+    b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba|
+      ba.use :label_text
+    end
+    b.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid'
+    b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
+    b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
+  end
+
+  # vertical input for inline radio buttons and check boxes
+  config.wrappers :vertical_collection_inline, item_wrapper_class: 'form-check form-check-inline', item_label_class: 'form-check-label', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
+    b.use :html5
+    b.optional :readonly
+    b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba|
+      ba.use :label_text
+    end
+    b.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid'
+    b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' }
+    b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' }
   end
 
   config.wrappers :switch, class: "custom-control custom-switch",
@@ -170,10 +203,24 @@ SimpleForm.setup do |config|
   # Custom wrappers for input types. This should be a hash containing an input
   # type as key and the wrapper that will be used for all inputs with specified type.
   # config.wrapper_mappings = { string: :prepend }
+  config.wrapper_mappings = {
+    boolean:  :vertical_boolean,
+    check_boxes:     :check_box,
+    # date:          :horizontal_multi_select,
+    # datetime:      :horizontal_multi_select,
+    # file:          :horizontal_file,
+    # radio_buttons: :horizontal_collection,
+    # range:         :horizontal_range,
+    # time:          :horizontal_multi_select
+  }
 
   # Namespaces where SimpleForm should look for custom input classes that
   # override default inputs.
-  # config.custom_inputs_namespaces << "CustomInputs"
+  Dir.glob('app/inputs/**/')
+     .map{ |x| x.gsub('app/inputs/', '').split('/').reject(&:blank?).join('/').camelize }
+     .reject(&:blank?).each do |d|
+    config.custom_inputs_namespaces << d
+  end
 
   # Default priority for time_zone inputs.
   # config.time_zone_priority = nil

data/lib/olivander/application_context.rb

@@ -2,23 +2,17 @@ module Olivander
   class ApplicationContext
     attr_accessor :name, :logo, :company, :menu_items, :route_builder, :sign_out_path, :sidebar_background_class
 
-    def self.default
-      ctx = ApplicationContext.new
-      ctx.company.name = 'Company Name'
+    def initialize(**kwargs)
+      self.name = kwargs[:name] || ENV['OLIVANDER_APP_NAME'] || 'Application Name'
+      self.logo = kwargs[:logo] || Logo.new(url: kwargs[:logo_url], alt: kwargs[:logo_alt])
+      self.company = kwargs[:company] || Company.new(name: kwargs[:company_name], url: kwargs[:company_url])
+      self.sign_out_path = kwargs[:sign_out_path] || '/sign_out'
+      self.menu_items = kwargs[:menu_items] || []
       begin
-        ctx.route_builder = RouteBuilder.new
-      rescue
-        ctx.route_builder = OpenStruct.new(resources: [])
+        self.route_builder = RouteBuilder.new
+      rescue NameError
+        self.route_builder = OpenStruct.new(resources: {})
       end
-      ctx
-    end
-
-    def initialize(name: 'Application Name', logo: Logo.new, company: Company.new, sign_out_path: '/sign_out', menu_items: [])
-      self.name = name
-      self.logo = logo
-      self.company = company
-      self.sign_out_path = sign_out_path
-      self.menu_items = menu_items
     end
 
     def visible_modules
@@ -41,18 +35,18 @@ module Olivander
     class Logo
       attr_accessor :url, :alt
 
-      def initialize(url: nil, alt: 'Logo')
-        self.url = url
-        self.alt = alt
+      def initialize(**kwargs)
+        self.url = kwargs[:url] || ENV['OLIVANDER_LOGO_URL'] || '/images/olivander_logo.png'
+        self.alt = kwargs[:alt] || ENV['OLIVANDER_LOGO_ALT'] || 'Logo Image'
       end
     end
 
     class Company
       attr_accessor :name, :url
 
-      def initialize(name: nil, url: nil)
-        self.url = url
-        self.name = name
+      def initialize(**kwargs)
+        self.url = kwargs[:url] || ENV['OLIVANDER_COMPANY_URL'] || '/'
+        self.name = kwargs[:name] || ENV['OLIVANDER_COMPANY_NAME'] || 'Company Name'
       end
     end
   end
@@ -61,8 +55,30 @@ module Olivander
     attribute :application_context
     attribute :user, :ability
 
-    def application_context
-      @application_context ||= ::Olivander::ApplicationContext.default
+    def build(&block)
+      self.application_context ||= ::Olivander::ApplicationContext.new
+      self.user ||= build_dummy_user
+      self.ability ||= build_dummy_ability
+      yield(self, application_context, user, ability) if block_given?
+      self
+    end
+
+    private
+
+    def build_dummy_user
+      OpenStruct.new({ display_name: 'No User Set' })
+    end
+
+    def build_dummy_ability
+      Class.new do
+        def can?(_action, _resource)
+          true
+        end
+
+        def authorize!(_action, _resource)
+          true
+        end
+      end.new
     end
   end
 end

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = '0.2.0.1'.freeze
+  VERSION = '0.2.0.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.2.0.1
+  version: 0.2.0.3
 platform: ruby
 authors:
 - Eric Dennis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-13 00:00:00.000000000 Z
+date: 2024-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick
@@ -175,6 +175,7 @@ files:
 - app/assets/images/default-150x150.png
 - app/assets/images/icons.png
 - app/assets/javascripts/adminlte.js
+- app/assets/javascripts/adminlte/datatable.fix.js
 - app/assets/javascripts/adminlte/dist/css/adminlte.min.css
 - app/assets/javascripts/adminlte/dist/js/adminlte.js
 - app/assets/javascripts/adminlte/plugins/bootstrap/js/bootstrap.bundle.min.js
@@ -208,6 +209,7 @@ files:
 - app/assets/javascripts/adminlte/select2_defaults.coffee
 - app/assets/javascripts/controllers/datatable_expandable_chart_controller.js
 - app/assets/javascripts/controllers/datatable_index_charts_controller.js
+- app/assets/javascripts/controllers/input_control_association_controller.js
 - app/assets/javascripts/controllers/turbo_flash_controller.js
 - app/assets/javascripts/olivander/flash_toast.js
 - app/assets/stylesheets/adminlte.css
@@ -228,15 +230,17 @@ files:
 - app/components/olivander/components/table_portlet_component.html.haml
 - app/components/olivander/components/table_portlet_component.rb
 - app/components/olivander/components/table_portlet_component/table_component.html.haml
+- app/controllers/concerns/olivander/resources/application_record.rb
 - app/controllers/concerns/olivander/resources/auto_form_attributes.rb
+- app/controllers/concerns/olivander/resources/crud_controller.rb
 - app/controllers/concerns/olivander/resources/route_builder.rb
 - app/controllers/olivander/application_controller.rb
 - app/datatables/olivander/datatable.rb
 - app/helpers/olivander/application_helper.rb
+- app/inputs/custom_form_builder.rb
 - app/inputs/date_time_input.rb
 - app/jobs/olivander/application_job.rb
 - app/mailers/olivander/application_mailer.rb
-- app/models/olivander/application_record.rb
 - app/views/application/_form.html.haml
 - app/views/application/_resource_form_actions.html.haml
 - app/views/application/edit.html.haml

data/app/models/olivander/application_record.rb

@@ -1,20 +0,0 @@
-module Olivander
-  class ApplicationRecord < ActiveRecord::Base
-    self.abstract_class = true
-
-    def self.audited_as klazz
-      # Rails.logger.debug "#{self.class.name} is audited as #{klazz.name}"
-      @@audited_user_class = klazz
-
-      belongs_to :created_by, class_name: klazz.name
-      belongs_to :updated_by, class_name: klazz.name
-
-      before_validation :set_audit_user
-    end
-
-    def set_audit_user
-      self.created_by ||= @@audited_user_class.current
-      self.updated_by = @@audited_user_class.current
-    end
-  end
-end