five-two-nw-olivander 0.2.0.1 → 0.2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d247c42715b68ca77e28f0b8d99f48b466d042ba197aad6a0fa5694d344d7d3
-  data.tar.gz: 5d4f1e94e9c1d85378a0586481ecf276b34d65364fb341e95ae9020f437293f2
+  metadata.gz: 76ede3e2ce50954cf786b9b30fabed5c294bb1b174a78f8493e331be73eb1b14
+  data.tar.gz: 7f23d18fe4144d9a0ce8829be386033a8e29e116186590d00c66339adbfdbddc
 SHA512:
-  metadata.gz: 336beef33e5b2f9b3242a654d9de9b5cb2b19ef30b25b62ccb0b2bbb74753afbdddf027a289ec6dc65d873e9a53acab6998983f0394aa8162a1c516976c8f8f7
-  data.tar.gz: aee825f87643bebac907ccfdf499b1f8d76f1a8e4049f58fa35856eaea663f8d175f808f7b04aa56b1ff0b704f7e1a7c322d6568e945b555c01423c0e6ec29e9
+  metadata.gz: 9fffc213421e65a2c263771e6071d7ff4f8ca97b74b2f9bb30eb7be49180cb97da2beda9bebd2b68e7117504a35b8ecfadfa39056ab17950a69d5dc076ba837f
+  data.tar.gz: 17a316a14e4406b136158ef9100bca6de6249e3ac96eb600dab8983d7f8b6cd21d5a6723e6d2ee3d1715ee4d0529151b82a5948402de517b5af37565f45f6832

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/select2_defaults.coffee

@@ -11,13 +11,13 @@ $.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) =>
+  evt.target.parent.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() })

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

@@ -6,8 +6,10 @@
         %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}" } }
+            - controllers = "#{field.type}-#{@resource.class.name.underscore}-#{field.sym} input-control-#{field.type}"
+            - collection_path = polymorphic_path(@resource.class.reflect_on_association(field.sym).klass, format: :json)
+            = @f.association field.sym, collection: [@f.object.send(field.sym)].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/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: [], 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, 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, editable: editable)
             end
           else
             if only.size.zero?
@@ -59,21 +59,19 @@ module Olivander
                 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
+                resource_field r.name, :association, editable: editable
               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,38 @@
+module Olivander
+  module Resources
+    module CrudController
+      extend ActiveSupport::Concern
+
+      included do
+        include Effective::CrudController
+        layout 'olivander/adminlte/main'
+
+        def index
+          if params[:term].present?
+            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
+        end
+
+        def permitted_params
+          params.fetch(resource_klass.name.underscore.gsub('/', '_').to_sym, {}).permit!
+        end
+      end
+    end
+  end
+end

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/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
@@ -62,7 +56,7 @@ module Olivander
     attribute :user, :ability
 
     def application_context
-      @application_context ||= ::Olivander::ApplicationContext.default
+      @application_context ||= ::Olivander::ApplicationContext.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.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.2.0.1
+  version: 0.2.0.2
 platform: ruby
 authors:
 - Eric Dennis
@@ -208,6 +208,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 +229,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