five-two-nw-olivander 0.2.0.2 → 0.2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76ede3e2ce50954cf786b9b30fabed5c294bb1b174a78f8493e331be73eb1b14
-  data.tar.gz: 7f23d18fe4144d9a0ce8829be386033a8e29e116186590d00c66339adbfdbddc
+  metadata.gz: 2e9d0ccea420078110d4af7de4d7eec3c0ac04e8a8a2533302d5792a1d599c58
+  data.tar.gz: '09b69957d70478ef092e8eff4a979ee867ac74c903fe1572793016d8ab26f531'
 SHA512:
-  metadata.gz: 9fffc213421e65a2c263771e6071d7ff4f8ca97b74b2f9bb30eb7be49180cb97da2beda9bebd2b68e7117504a35b8ecfadfa39056ab17950a69d5dc076ba837f
-  data.tar.gz: 17a316a14e4406b136158ef9100bca6de6249e3ac96eb600dab8983d7f8b6cd21d5a6723e6d2ee3d1715ee4d0529151b82a5948402de517b5af37565f45f6832
+  metadata.gz: 07ce6181e19ada53a8d78cf650c8b4cef82ccb4d38b33a09cca9b340d71567d2a4889f613c5986afb85fb6cc32b0b6010999f9af05fe40ab1ff7ff3a45f291e5
+  data.tar.gz: 67fbcc49d403734676c0f8d46052585ed70e127878bd6f4490f7d94f104d02aa8bcd7827da5d39957182a4a7b9dcc3947b41e69425189844a34e1812684efe15

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

@@ -12,7 +12,11 @@ $.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', (evt) =>
-  evt.target.parent.querySelector('.select2-search__field').focus()
+  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() })
@@ -21,3 +25,11 @@ initSelect2s = () -> $('select').not('.no-select2').each (k,v) =>
 $(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/components/olivander/components/resource_form_component.html.haml

@@ -5,10 +5,19 @@
       - section.fields.each do |field|
         %div{ class: section.column_class }
           - case field.type
-          - when :association
-            - 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 :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 

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/auto_form_attributes.rb

@@ -33,16 +33,16 @@ module Olivander
           self.resource_field_group_collection
         end
 
-        def self.auto_resource_fields(columns: 2, only: [], editable: true)
+        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, editable: editable)
+              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, editable: editable)
+              auto_resource_fields(columns: columns, only: only, except: except, editable: editable)
             end
           else
             if only.size.zero?
@@ -53,6 +53,7 @@ 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
@@ -65,7 +66,11 @@ module Olivander
               reflections.map{ |x| x[1] }
                          .filter{ |x| x.foreign_key == inc || x.name == inc }
                          .each do |r|
-                resource_field r.name, :association, editable: editable
+                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)

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

@@ -8,7 +8,7 @@ module Olivander
         layout 'olivander/adminlte/main'
 
         def index
-          if params[:term].present?
+          if request.format == :json && params[:_type].present? && params[:_type] == 'query'
             index_search
           else
             super
@@ -27,6 +27,7 @@ module Olivander
             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

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/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/lib/olivander/application_context.rb

@@ -11,7 +11,7 @@ module Olivander
       begin
         self.route_builder = RouteBuilder.new
       rescue NameError
-        self.route_builder = OpenStruct.new(resources: [])
+        self.route_builder = OpenStruct.new(resources: {})
       end
     end
 
@@ -55,8 +55,30 @@ module Olivander
     attribute :application_context
     attribute :user, :ability
 
-    def application_context
-      @application_context ||= ::Olivander::ApplicationContext.new
+    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.2'.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.2
+  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