five-two-nw-olivander 0.1.2.17 → 0.1.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60ef0e4f6cf44268d5836df99ce2f7548b77f6494a1de083ec0374c58c5f823c
-  data.tar.gz: 56d4c32092f2fd4dbeca7f8470fb26f01a23b0a3f2f38e10a734119a745a39c3
+  metadata.gz: 8a36c828d7544eb3e49f262fb2535f738a51e1c12d190eab8faad0d23628fe28
+  data.tar.gz: 3c92c632d2a9684280afbc700b5fa2984b85998c24c2856babeaeba77dfe4ee8
 SHA512:
-  metadata.gz: b58d17599c9bff68932f749af403b809bd7080a7e77fb9dacb943e5f5558e26010ea0cea38e461fa11abaf4847c3bdd81de376622c96c83b32e72df2208418d2
-  data.tar.gz: d2345d025f1460ea4c3a2c7b806885eb514cda39e284400e773da772ac68ebc64596d11841b5a11ae393ffdd3ea5d041e5bc5d580bff50eb79ec5003118167fa
+  metadata.gz: eab8679d522df001fb3d21274571af6da60ed1d825b1d5f2b9fbe7e0f13f7c9c48ff7b81a7bc19d77464088ad5c962e91e6d8e51343e72cdd2aba7f78460eb0d
+  data.tar.gz: 95283a4df656bb868b541131a1fe21aa2ba16eac4cf38280a6df61666b81f6c728015aadd0df4802c5125d046b2de246a7bdd03740bee84ae44a3f92037c1eb5

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

@@ -0,0 +1,10 @@
+- @resource.class.resource_field_groups.select{ |x| x.editable }.each do |rfg|
+  %h3= resource_field_group_label(@resource.class, rfg.key) unless rfg.key == :default
+  - rfg.sections.each do |section|
+    .row
+      - section.fields.each do |field|
+        %div{ class: section.column_class }
+          - if field.type == :association
+            = @f.association field.sym, disabled: !field.editable
+          - else 
+            = @f.input field.sym, disabled: !field.editable

data/app/components/olivander/components/resource_form_component.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Olivander::Components::ResourceFormComponent < ViewComponent::Base
+  delegate :resource_field_group_label, to: :helpers
+
+  def initialize(resource, form_builder)
+    @resource = resource
+    @f = form_builder
+    super
+  end
+end

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

@@ -0,0 +1,30 @@
+- @resource.class.resource_field_groups.each do |rfg|
+  %h3= resource_field_group_label(@resource.class, rfg.key) unless rfg.key == :default
+  %table.table.table-hover.table-striped
+    %thead
+      %tr
+        - 12.times do
+          %td{ style: 'width: 8.33%; height: 0px' }
+    %tbody
+      - rfg.sections.each do |section|
+        - section.fields.each_slice(section.columns) do |slice|
+          - colspan = (12 - slice.size) / section.columns
+          %tr
+            - slice.each do |f|
+              %th.text-right{ style: 'width: 10%' }= field_label_for(@resource.class, f.sym)
+              - max_columns = rfg.max_section_columns
+              %td{ colspan: colspan }
+                - val = @resource.send(f.sym)
+                - case f.type
+                - when :string
+                  = val
+                - when :boolean
+                  - icon_class = val ? 'fa-check text-success' : 'fa-times text-danger'
+                  %i.fa{ class: icon_class }
+                - when :association
+                  = link_to val if val.present?
+                - else
+                  = val
+            - (section.columns-slice.size).times do
+              %th
+              %td{ colspan: colspan }

data/app/components/olivander/components/resource_show_component.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class Olivander::Components::ResourceShowComponent < ViewComponent::Base
+  delegate :field_label_for, to: :helpers
+  delegate :resource_field_group_label, to: :helpers
+
+  def initialize(resource, actions)
+    @resource = resource
+    @actions = actions
+    super
+  end
+end

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

@@ -7,6 +7,132 @@ module Olivander
         def auto_form_attributes
           attributes.keys - ['updated_at', 'created_at', 'deleted_at']
         end
+
+        def self.method_missing(m, *args, &block)
+          if %i[auto_resource_fields resource_field_groups resource_field_group].include?(m)
+            include(Olivander::Resources::ResourceFields)
+            send(m, *args, &block)
+          else
+            super
+          end
+        end
+      end
+    end
+
+    module ResourceFields
+      extend ActiveSupport::Concern
+      SKIPPED_ATTRIBUTES = %i[id created_at updated_at deleted_at]
+
+      included do
+        cattr_accessor :current_resource_field_group
+        cattr_accessor :current_resource_field_row
+        cattr_accessor :resource_field_group_collection
+
+        def self.resource_field_groups
+          auto_resource_fields if self.resource_field_group_collection.nil?
+          self.resource_field_group_collection
+        end
+
+        def self.auto_resource_fields(columns: 2, only: [])
+          if current_resource_field_group.nil?
+            resource_field_group do
+              auto_resource_fields(columns: columns, only: only)
+            end
+          elsif current_resource_field_group.forced_section.nil?
+            resource_field_section(columns) do
+              auto_resource_fields(columns: columns, only: only)
+            end
+          else
+            only = self.columns.collect{ |x| x.name.to_sym } - SKIPPED_ATTRIBUTES if only.size.zero?
+            self.columns.each do |att|
+              sym = att.name.to_sym
+              type = att.type
+              next unless only.include?(sym)
+
+              reflections.map{ |x| x[1] }
+                          .filter{ |x| x.foreign_key == att.name }
+                          .each do |r|
+                sym = r.name
+                type = :association
+              end
+
+              resource_field sym, type
+            end
+          end
+        end
+
+        def self.resource_field_group(key = :default, editable: true, &block)
+          self.resource_field_group_collection ||= []
+          self.current_resource_field_group = resource_field_group_collection.select{ |x| x.key == key}.first
+          unless current_resource_field_group.present?
+            self.current_resource_field_group = ResourceFieldGroup.new(key, editable)
+            self.resource_field_group_collection << self.current_resource_field_group
+          end
+          yield
+          self.current_resource_field_group = nil
+        end
+
+        def self.resource_field_section(columns = nil, &block)
+          self.current_resource_field_group.forced_section = self.current_resource_field_group.next_section(columns)
+          yield
+          self.current_resource_field_group.forced_section = nil
+        end
+
+        def self.resource_field(sym, type = :string, editable: nil)
+          self.current_resource_field_group.add_field(sym, type, editable)
+        end
+      end
+
+      class ResourceFieldGroup
+        attr_accessor :fields, :key, :editable, :forced_section, :sections
+
+        def initialize(key, editable)
+          self.key = key
+          self.editable = editable
+          self.fields = []
+          self.sections = []
+        end
+
+        def add_field(sym, type, editable)
+          e = editable.nil? ? self.editable : editable
+          section = forced_section || next_section
+          field = ResourceField.new(sym, type, e, self)
+          section.fields << field
+          fields << field
+        end
+
+        def next_section(columns = 1)
+          section = ResourceFieldSection.new(columns)
+          sections << section
+          section
+        end
+
+        def max_section_columns
+          sections.collect{ |x| x.columns }.max
+        end
+      end
+
+      class ResourceFieldSection
+        attr_accessor :fields, :columns
+
+        def initialize(columns = 1)
+          self.columns = columns
+          self.fields = []
+        end
+
+        def column_class
+          "col-md-#{12/columns}"
+        end
+      end
+
+      class ResourceField
+        attr_accessor :sym, :type, :editable
+
+        def initialize(sym, type, editable, group)
+          self.sym = sym
+          self.type = type
+          self.editable = editable
+        end
       end
     end
   end

data/app/datatables/olivander/datatable.rb

@@ -32,14 +32,15 @@ module Olivander
         order(order_by[0], order_by[1]) if order_by.size == 2
         bulk_actions_col
         attributes.each do |key|
+          label = field_label_for(klazz, key)
           sym = key.gsub('_id', '').to_sym
           visible = show.include?(key) || !(default_hidden.include?(key) || hide.include?(key))
           if link_path.present? && sym == :id
             link_col sym, link_path, :id, visible: visible
           elsif link_path.present? && sym == :name
-            link_col sym, link_path, %i[id name], visible: visible
+            link_col sym, link_path, :id, visible: visible
           else
-            col sym, visible: visible
+            col sym, visible: visible, label: label
           end
         end
         actions_col

data/app/helpers/olivander/application_helper.rb

@@ -26,15 +26,32 @@ module Olivander
       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.reject{ |a| a.sym == for_action }
+      actions = actions.reject{ |a| a.sym == for_action || !can?(a.sym, resource) }
+      preferred = %i[show edit destroy]
+      [].tap do |arr|
+        preferred.each do |p|
+          actions.each do |a|
+            arr << a if a.sym == p
+          end
+        end
+        arr &&= actions.reject{ |x| preferred.include?(x.sym) }
+      end
     end
 
     def resource_form_actions(route_builder, resource, for_action: :show)
-      [].tap do |output|
-        authorized_resource_actions(route_builder, resource, for_action: for_action).select{ |x| x.show_in_form }.each do |a|
-          output << link_to(a.sym, {controller: a.controller, action: a.action}, method: a.verb, class: 'btn btn-tool', data: { turbo: true })
-        end
-      end.join('&nbsp;').html_safe
+      render partial: 'resource_form_actions', locals: { actions: authorized_resource_actions(route_builder, resource, for_action: for_action).select(&:show_in_form) }
+    end
+
+    def resource_form_action_label(resource, action)
+      return I18n.t("activerecord.actions.#{resource}.#{action}") if I18n.exists?("activerecord.actions.#{resource}.#{action}")
+      return I18n.t("activerecord.actions.#{action}") if I18n.exists?("activerecord.actions.#{action}")
+
+      action.to_s.titleize
+    end
+
+    def resource_field_group_label(resource_class, key)
+      i18n_key = "activerecord.attributes.#{resource_class.name.underscore}.resource_field_groups.#{key}"
+      I18n.exists?(i18n_key) ? I18n.t(i18n_key) : key.to_s.titleize
     end
 
     def current_user
@@ -44,5 +61,28 @@ module Olivander
     def current_ability
       controller.respond_to?(:current_ability) ? controller.current_ability : nil
     end
+
+    def resource_attributes(resource, effective_resource)
+      er_attributes = effective_resource&.model_attributes&.collect{ |x| x[0] }
+      return er_attributes if er_attributes.present? && er_attributes.size.positive?
+
+      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
+    end
+
+    def field_label_for(resource_class, sym)
+      i18n_key = "activerecord.attributes.#{resource_class.name.underscore}.#{sym}"
+      return I18n.t(i18n_key) if I18n.exists?(i18n_key)
+
+      sym.to_s.titleize
+    end
   end
 end

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

@@ -2,16 +2,14 @@
 = simple_form_for(@resource) do |f|
   .card.card-primary
     .card-header
+      %h3.card-title= @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?
-      - @resource.auto_form_attributes.each do |a|
-        .row
-          .col-12
-            = f.input a, disabled: read_only
+      = render Olivander::Components::ResourceFormComponent.new(@resource, f)
     .card-footer.text-right
       = link_to 'Cancel', @_effective_resource.action_path(:index), class: 'btn btn-secondary'
       - unless read_only
-        = f.button :submit, class: 'btn btn-primary'
+        = f.button :submit, class: 'btn btn-primary'

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

@@ -0,0 +1,7 @@
+- actions.each do |a|
+  = link_to controller: a.controller, action: a.action, method: a.verb, class: 'btn btn-tool', data: { turbo: true } do
+    - icon_key = "activerecord.actions.icons.#{a.sym}"
+    - if I18n.exists?(icon_key)
+      %i.fa{ class: I18n.t(icon_key)}
+    = resource_form_action_label(@resource, a.sym)
+   

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

@@ -1,12 +1,19 @@
 - resource = (@_effective_resource || Effective::Resource.new(controller_path))
 - @resource = instance_variable_get('@' + resource.name) if resource.name
 
+= render_optional_partial 'show_before'
+
 - if @resource
   .row
     .col-12
-      = render_resource_form(@resource)
+      .card.card-primary
+        .card-header
+          %h3.card-title= @resource.to_s
+          .card-tools
+            = resource_form_actions(@context.route_builder, @resource, for_action: action_name.to_sym)
+        .card-body
+          = render Olivander::Components::ResourceShowComponent.new(@resource, [])
+        .card-footer.text-right
+          = link_to 'Cancel', @_effective_resource.action_path(:index), class: 'btn btn-secondary'
 
-- begin
-  = render partial: 'show_additional'
-- rescue ActionView::MissingTemplate
-  - Rails.logger.debug "did not find additional show partial"
+= render_optional_partial 'show_after'

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

@@ -2,4 +2,4 @@
 = dropdown(variation: :dropleft, btn_class: btn_class) do
   - authorized_resource_actions(route_builder, resource, for_action: action_name).select{ |x| x.show_in_datatable }.each do |a|
     - path = a.path_helper.is_a?(Proc) ? a.path_helper.call(resource) : send(a.path_helper, resource.id)
-    = dropdown_link_to a.sym, path
+    = dropdown_link_to resource_form_action_label(resource, a.sym), path

data/lib/olivander/menus/menu_item.rb

@@ -42,7 +42,6 @@ module Olivander
         @submenu_items ||= [].tap do |arr|
           if visible
             @submenu_items_blocks.each do |block|
-              Rails.logger.debug "invoking submenu item block on #{@key}"
               block.call.each { |item| arr << item if item.visible }
             end
           end
@@ -58,7 +57,6 @@ module Olivander
         @badges ||= [].tap do |arr|
           if visible
             @badges_blocks.each do |block|
-              Rails.logger.debug "invoking badge block on #{@key}"
               block.call.each { |badge| arr << badge }
             end
           end
@@ -69,7 +67,6 @@ module Olivander
 
       def evaluate_conditions_block
         if @conditions_block
-          Rails.logger.debug "invoking condition on #{@key}"
           @conditions_block.call
         else
           true

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = "0.1.2.17"
+  VERSION = "0.1.2.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.1.2.17
+  version: 0.1.2.18
 platform: ruby
 authors:
 - Eric Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-13 00:00:00.000000000 Z
+date: 2023-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick
@@ -185,6 +185,10 @@ files:
 - app/assets/stylesheets/olivander/application.css
 - app/components/olivander/components/menu_item_component.html.haml
 - app/components/olivander/components/menu_item_component.rb
+- app/components/olivander/components/resource_form_component.html.haml
+- app/components/olivander/components/resource_form_component.rb
+- app/components/olivander/components/resource_show_component.html.haml
+- app/components/olivander/components/resource_show_component.rb
 - app/controllers/concerns/olivander/resources/auto_form_attributes.rb
 - app/controllers/concerns/olivander/resources/route_builder.rb
 - app/controllers/olivander/application_controller.rb
@@ -194,6 +198,7 @@ files:
 - 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
 - app/views/application/index.html.haml
 - app/views/application/new.html.haml