five-two-nw-olivander 0.1.2.48 → 0.1.2.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec4a9fc8c9018030d6702854ee743538d76826f3b5d4c334e8b47f399281ad0e
-  data.tar.gz: 7226f507c8129d6a28af91b86e371ae5b6fd68dd866bf406a8c9b088d90020c4
+  metadata.gz: 813bb7ec43d77ce06d78481a6fd41a8ceef88fff67dc898464dd8c2ab6f3486e
+  data.tar.gz: 054c82737ee7e9c01e86c016f1caca362d11e665eb4a5628fc09a4d27aa2c34b
 SHA512:
-  metadata.gz: deee0c4028fec2dc2d1a277a1b470716799ebe36b63a342eaafcb78ce813e1ff6dfa7c11f128106360654d49fa57653932673ab0dc6de6471885ed0db3686e19
-  data.tar.gz: e3f95336c8dde7c3d060e592410a53dff9e918f12827d417ce62d19a2b5bf5fbeb5f7d5fefc1da193d4cee90a22f2a773045450ec169583c6d959cc504b5ef2f
+  metadata.gz: 45b11c5971c38f84ed31f247e7c407ffd2df32a58be4e302ca4a5c8756ee4fd0e7c6648b5209a4e788c43322fa8d095d1133e2046f9961efc3f94e2d8f701c13
+  data.tar.gz: cfafb658d561858e330495178079e58c5e76a787c5d145ea0854ca2131eb10b1312ab2109bd5a004109d5c4a4a9ee976b832be672873b19e7f6dea0051c82ed6

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

@@ -7,5 +7,7 @@
           - case field.type
           - when :association
             = @f.association field.sym, disabled: !field.editable, input_html: { data: { controller: "input-control-#{field.type}" } }
+          - 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}" } }

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

@@ -16,6 +16,8 @@
               %td{ colspan: colspan }
                 - val = @resource.send(f.sym)
                 - case f.type
+                - when :integer, :float
+                  = val
                 - when :string, :text
                   = simple_format(val)
                 - when :boolean

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

@@ -43,7 +43,14 @@ module Olivander
               auto_resource_fields(columns: columns, only: only)
             end
           else
-            only = self.columns.collect{ |x| x.name.to_sym } - SKIPPED_ATTRIBUTES if only.size.zero?
+            if only.size.zero?
+              only = [
+                self.columns.collect{ |x| x.name.to_sym },
+                reflections.map{ |r| r[1].name },
+              ]
+              only << attachment_definitions.select{ |x| x[0] } if respond_to?(:attachment_definitions)
+              only = only.flatten - SKIPPED_ATTRIBUTES
+            end
             only.each do |inc|
               self.columns.each do |att|
                 sym = att.name.to_sym
@@ -63,7 +70,7 @@ module Olivander
 
               next unless respond_to?(:attachment_definitions)
 
-              attachment_definitions.filter{ |x| puts x; puts inc; x == inc }.each do |ad|
+              attachment_definitions.filter{ |x| x == inc }.each do |ad|
                 resource_field ad[0], :file
               end
             end

data/app/datatables/olivander/datatable.rb

@@ -18,14 +18,19 @@ module Olivander
     def self.auto_datatable(klazz, collection: nil, link_path: nil, only: [], except: [], hide: [], show: [], order_by: [], scopes: [])
       Rails.logger.debug "initializing datatable for #{klazz}"
 
-      klazz_attributes = klazz.new.attributes.collect{ |x| x[0] }
+      instance = klazz.new
+      klazz_attributes = instance.attributes.collect{ |x| x[0] }
       column_attributes = klazz_attributes
       column_attributes &&= only if only.size.positive?
       column_attributes -= except if except.size.positive?
       resources_sym = klazz.table_name.to_sym
       bulk_action_list = self::ROUTE_BUILDER.resources[resources_sym]&.datatable_bulk_actions || []
 
-      default_hidden = %w[id created updated created_at updated_at deleted_at current_user current_action]
+      default_hidden = %w[
+        id created updated created_at updated_at
+        deleted_at current_user current_action
+        application_tenant_id created_by_id updated_by_id
+      ]
 
       filters do
         scopes.each do |s|
@@ -60,6 +65,8 @@ module Olivander
         Rails.logger.debug "bulk actions size: #{datatable._bulk_actions.size}"
         Rails.logger.debug "bulk actions size: #{datatable._bulk_actions.size.positive?}"
         # bulk_actions_col if datatable._bulk_actions.size.positive?
+
+        #TODO: use columns from model here instead of attributes keys
         column_attributes.each do |key|
           label = field_label_for(klazz, key)
           sym = key.gsub('_id', '')
@@ -68,6 +75,12 @@ module Olivander
             col sym, visible: visible, action: :show
           elsif sym.include?('.')
             col sym, visible: visible, label: label
+          elsif klazz.columns.select{ |x| x.name == key }.first&.type == :boolean
+            col sym, visible: visible, label: label do |c|
+              val = c.send(sym)
+              icon_class = val ? 'fa-check text-success' : 'fa-times text-danger'
+              "<div class='text-center'><i class='fa fa-icon #{icon_class}'></div>".html_safe
+            end
           else
             col sym, visible: visible, label: label
           end

data/app/helpers/olivander/application_helper.rb

@@ -25,10 +25,16 @@ module Olivander
       routed_resource = route_builder.resources[plural_name.to_sym]
       return [] if routed_resource.nil?
 
-      actions = resource.is_a?(Class) ?
-        (routed_resource.unpersisted_crud_actions | routed_resource.collection_actions.select{ |x| !x.crud_action }) : 
-        (resource.persisted? ? (routed_resource.persisted_crud_actions | routed_resource.member_actions.select{ |x| !x.crud_action }): [])
-      actions = actions.reject{ |a| a.sym == for_action || !EffectiveDatatables.authorization_method.call(controller, a.sym, resource) }
+      actions = if resource.is_a?(Class)
+                  routed_resource.unpersisted_crud_actions | routed_resource.collection_actions.reject(&:crud_action)
+                else
+                  if resource.persisted?
+                    routed_resource.persisted_crud_actions | routed_resource.member_actions.reject(&:crud_action)
+                  else
+                    []
+                  end
+                end
+      actions = actions.select{ |a| authorized_resource_action?(a.sym, resource, for_action) }
       preferred = %i[show edit destroy]
       [].tap do |arr|
         preferred.each do |p|
@@ -42,6 +48,12 @@ module Olivander
       end
     end
 
+    def authorized_resource_action?(action, resource, except = nil)
+      return false if action == except
+
+      respond_to?('can?') ? can?(action, resource) : true
+    end
+
     def resource_form_actions(route_builder, resource, for_action: :show)
       render partial: 'resource_form_actions', locals: { actions: authorized_resource_actions(route_builder, resource, for_action: for_action).select(&:show_in_form) }
     end
@@ -82,13 +94,12 @@ module Olivander
       resource.auto_form_attributes
     end
 
-    def render_optional_partial partial
-      begin
-        render partial: partial
-      rescue ActionView::MissingTemplate
-        Rails.logger.debug "did not find partial: #{partial}"
-        nil
-      end
+    def render_optional_partial(partial, locals: {})
+      render partial: partial, locals: locals
+
+    rescue ActionView::MissingTemplate
+      Rails.logger.debug "did not find partial: #{partial}"
+      nil
     end
 
     def field_label_for(resource_class, sym)

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

@@ -1,16 +1,16 @@
-- read_only = !%w[edit new].include?(action_name)
+- read_only = !%w[new create edit update].include?(action_name)
 = simple_form_for(@resource) do |f|
   .card.card-primary
     .card-header
-      %h3.card-title= @resource
+      %h3.card-title= @resource.to_s.blank? ? @resource.model_name.human : @resource
       .card-tools
         = resource_form_actions(@context.route_builder, @resource, for_action: action_name.to_sym)
     .card-body
       =f.error_notification
       =f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present?
-      = render_optional_partial 'form_inside_before'
+      = render_optional_partial 'form_inside_before', locals: {f: f}
       = render Olivander::Components::ResourceFormComponent.new(@resource, f)
-      = render_optional_partial 'form_inside_after'
+      = render_optional_partial 'form_inside_after', locals: {f: f}
     .card-footer.text-right
       = link_to 'Cancel', @_effective_resource.action_path(:index), class: 'btn btn-secondary'
       - unless read_only

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

@@ -23,9 +23,11 @@
 :javascript
   $(document).ready(function(){
     function getUrl() {
-      const reg = /\/new|\/[0-9]+[\/edit]*/,
-            url = "" + window.location;
-      return url.replace(reg, '');
+      const locationUrl = new URL(window.location),
+            reg = /\/new|\/[0-9]+[\/edit]*/;
+      
+      locationUrl.pathname = locationUrl.pathname.replace(reg, '')
+      return locationUrl.href;
     }
     const url = getUrl();
 

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = '0.1.2.48'.freeze
+  VERSION = '0.1.2.50'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.1.2.48
+  version: 0.1.2.50
 platform: ruby
 authors:
 - Eric Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-25 00:00:00.000000000 Z
+date: 2024-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick