five-two-nw-olivander 0.1.2.30 → 0.1.2.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c44e3b7096fe950aaac7828a92343e5f05cabac07d3776d35369fd434fd83a97
-  data.tar.gz: 6a46d72cfc1f35b37fdc61ee0027f278785af0fcb79e5ee38f1f67cf72da4756
+  metadata.gz: 9b9f0ff95753e126cb4de1106d1cad6f079b4bdd53fd7fe1329b1cd00556ef2c
+  data.tar.gz: c0ef254479699aced86f0ae096ad4b013becf8c96aff80ec510906107aaf6d46
 SHA512:
-  metadata.gz: fa838b60681399f4000cf08e2c0fcc8d23cbacd9ea8c72087a309fc78bcb1223f3062ce5be88c849591d477aaef2c49a18c35b0e5bc166ef972aa4d6902e04d8
-  data.tar.gz: ad347d7be7b1a862b125152ea10484e5b9c5cd36287064d3c8bc49fe60043349aaff32eca85f77ceee1c8d5e1eb7c769fb12af5e54457908b87bb0ddbd95f65d
+  metadata.gz: 7f9297fdacf15c8a833c226deb411c6394e4c8ec125c6515d4127b5dea867048d15e2478ea6f911ca2b6855c887a444886180d4ac9356b94eb7855b301b17823
+  data.tar.gz: a8fdfaf8efbd4eaeb2dfef11060f10b3bbf90bd8f1249d734aa64c1a44238e8f9aec7af4093d8ec161a3b041ebdfbab1a6405a29ec0e94c83035ca8412011bab

data/app/assets/stylesheets/adminlte.css

@@ -25,4 +25,10 @@
 
  .table td, .table th {
   padding: 0.25rem !important;
- }
+ }
+ .table-fixed_header thead tr {
+  position: sticky;
+  top: 0;
+  z-index: 1;
+  background-color: white;
+}

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

@@ -6,7 +6,7 @@
     %h3.card-title= @title
   .card-body
     = content
-  .card-footer
+  -# .card-footer
   - if @src.present?
     .overlay.dark
       %i.fas.fa-sync-alt.fa-spin.fa-lg

data/app/components/olivander/components/portlet_component.rb

@@ -3,7 +3,7 @@
 module Olivander
   module Components
     class PortletComponent < ViewComponent::Base
-      def initialize(title, background: nil, header_background: 'bg-info', turbo_frame: nil, src: nil, loading: nil)
+      def initialize(title, background: nil, header_background: 'bg-secondary', turbo_frame: nil, src: nil, loading: nil)
         super
         @title = title
         @background = background

data/app/components/olivander/components/table_portlet_component/table_component.html.haml

@@ -0,0 +1,18 @@
+- if @item_iteration.first?
+  %table.table.table-striped.table-hover.table-fixed_header/
+  - if @headers
+    %thead
+      %tr
+        - @builder.field_blocks.each do |field_block|
+          %th{ class: field_block.alignment }
+            - if field_block.key.present?
+              = I18n.t(['activerecord.attributes', @item.class.name.underscore, field_block.key].join('.'))
+  %tbody/
+%tr
+  - @builder.field_blocks.each do |field_block|
+    %td{ class: field_block.alignment }
+      = capture do
+        - instance_exec(@item, &field_block.block)
+- if @item_iteration.last?
+  </tbody>
+  </table>

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

@@ -0,0 +1,25 @@
+- if @turbo_frame.present?
+  <turbo-frame id="#{@turbo_frame}">
+
+.card{ class: @background }
+  .card-header{ class: @header_background }
+    %h3.card-title= @title
+    .card-tools
+      - if header_tools?
+        = header_tools
+      -# %button.btn.btn-tool{ type: :button, 'data-card-widget': :collapse }
+      -#   %i.fas.fa-minus
+      -# %button.btn.btn-tool{ type: :button, 'data-card-widget': :maximize }
+      -#   %i.fas.fa-expand
+  .card-body
+    - if @collection&.size&.positive?
+      %div{style: @max_height.present? ? "max-height: #{@max_height}; overflow-y: auto; overflow-x: hidden" : ""}
+        = render Olivander::Components::TablePortletComponent::TableComponent.with_collection(@collection, builder: @builder, headers: @headers)
+    - else
+      No #{@title.downcase} to display.
+  - if footer_buttons?
+    .card-footer.text-right
+      = footer_buttons
+
+- if @turbo_frame.present?
+  </turbo-frame>

data/app/components/olivander/components/table_portlet_component.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Olivander
+  module Components
+    class TablePortletComponent < ViewComponent::Base
+      renders_one :header_tools
+      renders_one :footer_buttons
+
+      def initialize(collection, headers: true, builder:, title: '', background: nil, header_background: 'bg-secondary', turbo_frame: nil, max_height: nil)
+        super
+        @collection = collection
+        @builder = builder
+        @title = title
+        @background = background
+        @header_background = header_background
+        @turbo_frame = turbo_frame
+        @max_height = max_height
+        @headers = headers
+      end
+
+      class TableComponent < ViewComponent::Base
+        with_collection_parameter :item
+        delegate :can?, :cannot?, to: :helpers
+
+        def initialize(item:, item_iteration:, builder:, headers:)
+          super
+          @item = item
+          @item_iteration = item_iteration
+          @builder = builder
+          @headers = headers
+        end
+      end
+
+      class Builder
+        attr_accessor :field_blocks, :header_tools, :footer_buttons
+
+        def initialize(collection, &block)
+          self.field_blocks = []
+          block.call(self) if block_given?
+        end
+
+        def field(key, alignment = 'text-left', &block)
+          unless block_given?
+            block = Proc.new{ |x| x.send(key).to_s.html_safe }
+          end
+          field_blocks << OpenStruct.new(key: key, alignment: alignment, block: block)
+        end
+
+        def with_header_tools(&block)
+          self.header_tools = block
+        end
+
+        def with_footer_buttons(&block)
+          self.footer_buttons = block
+        end
+      end
+    end
+  end
+end

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

@@ -44,19 +44,21 @@ module Olivander
             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
+            only.each do |inc|
+              self.columns.each do |att|
+                sym = att.name.to_sym
+                type = att.type
+                next unless inc == 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
-
-              resource_field sym, type
             end
           end
         end

data/app/helpers/olivander/application_helper.rb

@@ -146,5 +146,23 @@ module Olivander
         "fas fa-question-circle"
       end
     end
+
+    def collection_component_builder_for(klass, collection, *args, &block)
+      builder = klass::Builder.new(self, &block)
+      options = args.extract_options!
+      options[:builder] = builder
+      render klass.new(collection, *(args + [options])) do |component|
+        if builder.header_tools.present?
+          component.with_header_tools do
+            builder.header_tools.call
+          end
+        end
+        if builder.footer_buttons.present?
+          component.with_footer_buttons do
+            builder.footer_buttons.call
+          end
+        end
+      end 
+    end
   end
 end

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = '0.1.2.30'.freeze
+  VERSION = '0.1.2.31'.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.30
+  version: 0.1.2.31
 platform: ruby
 authors:
 - Eric Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-08 00:00:00.000000000 Z
+date: 2023-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick
@@ -192,6 +192,9 @@ files:
 - app/components/olivander/components/resource_show_component.rb
 - app/components/olivander/components/small_box_component.html.haml
 - app/components/olivander/components/small_box_component.rb
+- 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/auto_form_attributes.rb
 - app/controllers/concerns/olivander/resources/model_registrar.rb
 - app/controllers/concerns/olivander/resources/model_registry.rb