tramway 0.5.0.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a8b21470fd862c9a0fdbe1cb424c16826f572ca667609c01c04840420ade2fb
-  data.tar.gz: eeb39f02b824342bd217b79b35ae80f4f87e5246d5e656495fd55d00fba59efa
+  metadata.gz: fbd54b0a803c53d12e50ec585a805ca39dc56b0551e12fa2de66514a9166b750
+  data.tar.gz: 7db6cfe3b24afaed951ac2ca2b52eb65d38bf0bdb49d6625f8508fa2dc594e52
 SHA512:
-  metadata.gz: 40e0bfb98b80c7716120e793a1e1c0391176eff8f9a90ead5394a38c940177aa730292492ae9d65400eb1d0114d5e48de196347d93dfd294c8511938e094b264
-  data.tar.gz: cbbd06e1b3d829a2a6aefa2983b06aa9abc7731909b7d32b706652b93d48fae25aaeafa32b726d012b565ead0dd076194bdebe285f122b4e063d82dca81af434
+  metadata.gz: a4d807fffc40d7e2cdfd9fec0b513f39f4a4338cd9ea1718d4ece1d0587bc1d86aa26112688ec9fb5e108ed1a04fac01f7f79ae7852f105fb132e4b9361550a3
+  data.tar.gz: 45ac2aec489c85b212938ae99456fe8e5fc54f804cc9525aee1f034c5586d0e080e3c58fd9593f3779aabce5f2c5941ff36198183e81880f23f5d3a4b871aa98

data/README.md

@@ -486,6 +486,13 @@ eagerLoadControllersFrom("controllers", application)
 application.register('multiselect', Multiselect) // register Multiselect controller class as `multiselect` stimulus controller
 ```
 
+Use Stimulus `change` action with Tramway Multiselect
+
+```ruby
+= tramway_form_for @user do |f|
+  = f.multiselect :role, data: { action: 'change->user-form#updateForm' } # user-form is your Stimulus controller, updateForm is a method inside user-form Stimulus controller
+```
+
 ### Tailwind-styled pagination for Kaminari
 
 Tramway uses [Tailwind](https://tailwindcss.com/) by default. It has tailwind-styled pagination for [kaminari](https://github.com/kaminari/kaminari).

data/app/assets/javascripts/tramway/multiselect_controller.js

@@ -12,7 +12,8 @@ export default class Multiselect extends Controller {
     selectedItems: Array,
     placeholder: String,
     selectAsInput: String,
-    value: Array
+    value: Array,
+    onChange: String
   }
 
   connect() {
@@ -26,9 +27,14 @@ export default class Multiselect extends Controller {
       }
     });
 
-    const initialValues = this.element.dataset.value === undefined ? [] : this.element.dataset.value.split(',')
-    this.selectedItems = this.items.filter(item => initialValues.includes(item.value));
-    this.items = this.items.filter(item => !initialValues.includes(item.value));
+    const initialValues = this.element.dataset.value === undefined ? [] : JSON.parse(this.element.dataset.value);
+
+    initialValues.map((value) => {
+      const itemIndex = this.items.findIndex(x => x.value.toString() === value.toString());
+      this.items[itemIndex].selected = true;
+    })
+
+    this.selectedItems = this.items.filter(item => item.selected);
 
     this.renderSelectedItems();
   }
@@ -84,6 +90,23 @@ export default class Multiselect extends Controller {
     if (this.dropdown()) {
       this.dropdown().remove();
     }
+
+    const onChange = this.element.dataset.onChange;
+
+    if (onChange) {
+      const [controllerName, actionName] = onChange.split('#');
+      const controller = this.application.controllers.find(controller => controller.identifier === controllerName)
+
+      if (controller) {
+        if (typeof controller[actionName] === 'function') {
+          controller[actionName]({ target: this.element });
+        } else {
+          alert(`Action not found: ${actionName}`); // eslint-disable-line no-undef
+        }
+      } else {
+        alert(`Controller not found: ${controllerName}`); // eslint-disable-line no-undef
+      }
+    }
   }
 
   get template() {

data/app/components/tailwinds/form/builder.rb

@@ -38,7 +38,7 @@ module Tailwinds
       def multiselect(attribute, collection, **options, &)
         render(Tailwinds::Form::MultiselectComponent.new(
                  input: input(:text_field),
-                 value: options[:value] || options[:selected] || object.public_send(attribute)&.first,
+                 value: options[:value] || options[:selected] || object.public_send(attribute),
                  collection:,
                  **default_options(attribute, options)
                ), &)

data/app/components/tailwinds/form/multiselect_component.rb

@@ -15,12 +15,15 @@ module Tailwinds
       def multiselect_hash
         {
           controller:, selected_item_template:, multiselect_selected_items_value:, dropdown_container:, item_container:,
-          items:, action:, select_as_input:, placeholder:, value:
+          items:, action:, select_as_input:, placeholder:, value:, on_change:
         }.transform_keys { |key| key.to_s.gsub('_', '-') }
       end
 
       def controller
-        :multiselect
+        controllers = [:multiselect]
+        controllers << external_action.split('->').last.split('#').first if external_action
+        controllers += external_controllers
+        controllers.join(' ')
       end
 
       private
@@ -45,6 +48,20 @@ module Tailwinds
         render(Tailwinds::Form::Multiselect::SelectAsInput.new(options:, attribute:, input:))
       end
 
+      def on_change
+        return unless external_action&.start_with?('change')
+
+        external_action.split('->').last
+      end
+
+      def external_controllers
+        options[:controller]&.split || []
+      end
+
+      def external_action
+        options.dig(:data, :action)
+      end
+
       def method_missing(method_name, *, &)
         component = component_name(method_name)
 

data/app/components/tailwinds/navbar_component.html.haml

@@ -1,4 +1,4 @@
-%nav.py-4.px-4.sm:px-8.flex.justify-between.items-center.dark:bg-gray-800{ class: "bg-#{@color}" }
+%nav.py-2.px-4.sm:px-8.flex.justify-between.items-center.dark:bg-gray-800{ class: "bg-#{@color}" }
   .flex.justify-between.w-full
     - if @title[:text].present? || @left_items.present?
       .flex.items-center
@@ -7,16 +7,16 @@
             .text-xl.text-white.font-bold
               = @title[:text]
         - if @left_items.present?
-          %ul.hidden.sm:flex.items-center.space-x-4.ml-4
+          %ul.block.flex.flex-row.items-center.space-x-4.ml-4
             - @left_items.each do |item|
               = item
 
-    .block.sm:hidden
+    .hidden.sm:block
       %button#mobile-menu-button.text-white.focus:outline-none
         ☰
 
   - if @right_items.present?
-    %ul.hidden.sm:flex.items-center.space-x-4
+    %ul.block.sm:flex.items-center.space-x-4
       - @right_items.each do |item|
         = item
 

data/app/components/tailwinds/pagination/first_page_component.html.haml

@@ -1,3 +1,10 @@
 - unless current_page.first?
-  = link_to helpers.t('views.pagination.first').html_safe, url, remote:, class: pagination_classes(klass: 'first hidden sm:flex')
-  = link_to '⭰', url, remote:, class: pagination_classes(klass: 'first sm:hidden font-bold')
+  = link_to helpers.t('views.pagination.first').html_safe,
+    url,
+    remote:,
+    class: pagination_classes(klass: 'first sm:hidden flex')
+
+  = link_to '⭰',
+    url,
+    remote:,
+    class: pagination_classes(klass: 'first hidden sm:flex font-bold')

data/app/components/tailwinds/pagination/gap_component.html.haml

@@ -1,2 +1,2 @@
-%span.page.gap.px-3.py-2.text-sm.font-medium.text-purple-700.dark:text-white.sm:flex.hidden
+%span.page.gap.px-3.py-2.text-sm.font-medium.text-purple-700.dark:text-white.flex.sm:hidden
   = helpers.t('views.pagination.truncate').html_safe

data/app/components/tailwinds/pagination/last_page_component.html.haml

@@ -1,3 +1,10 @@
 - unless current_page.last?
-  = link_to helpers.t('views.pagination.last').html_safe, url, remote:, class: pagination_classes(klass: 'last hidden sm:flex')
-  = link_to '⭲', url, remote:, class: pagination_classes(klass: 'last sm:hidden font-bold')
+  = link_to helpers.t('views.pagination.last').html_safe,
+    url,
+    remote:,
+    class: pagination_classes(klass: 'last sm:hidden flex')
+
+  = link_to '⭲',
+    url,
+    remote:,
+    class: pagination_classes(klass: 'last hidden sm:flex font-bold')

data/app/components/tailwinds/pagination/next_page_component.html.haml

@@ -1,3 +1,12 @@
 - unless current_page.last?
-  = link_to helpers.t('views.pagination.next').html_safe, url, rel: 'next', remote:, class: pagination_classes(klass: 'next hidden sm:flex')
-  = link_to '🠖', url, rel: 'next', remote:, class: pagination_classes(klass: 'next sm:hidden font-bold')
+  = link_to helpers.t('views.pagination.next').html_safe,
+    url,
+    rel: 'next',
+    remote:,
+    class: pagination_classes(klass: 'next sm:hidden flex')
+
+  = link_to '🠖',
+    url,
+    rel: 'next',
+    remote:,
+    class: pagination_classes(klass: 'next hidden sm:flex font-bold')

data/app/components/tailwinds/pagination/page_component.html.haml

@@ -2,4 +2,8 @@
   %span.px-3.py-2.font-medium.rounded-md.bg-purple-500.text-white.dark:text-gray-800.dark:bg-white
     = page
 - else
-  = link_to page, url, remote:, rel: page.rel, class: pagination_classes(klass: 'hidden sm:flex')
+  = link_to page,
+    url,
+    remote:,
+    rel: page.rel,
+    class: pagination_classes(klass: 'sm:hidden flex')

data/app/components/tailwinds/pagination/prev_page_component.html.haml

@@ -1,3 +1,12 @@
 - unless current_page.first?
-  = link_to helpers.t('views.pagination.previous').html_safe, url, rel: 'prev', remote:, class: pagination_classes(klass: 'prev hidden sm:flex')
-  = link_to '🠔', url, rel: 'prev', remote:, class: pagination_classes(klass: 'prev sm:hidden font-bold')
+  = link_to helpers.t('views.pagination.previous').html_safe,
+    url,
+    rel: 'prev',
+    remote:,
+    class: pagination_classes(klass: 'prev sm:hidden flex')
+
+  = link_to '🠔',
+    url,
+    rel: 'prev',
+    remote:,
+    class: pagination_classes(klass: 'prev hidden sm:flex font-bold')

data/app/components/tailwinds/table/header_component.html.haml

@@ -1,6 +1,6 @@
 - cols = headers.map { |item| "1fr" }.join(",")
 
-.div-table-row.hidden.md:grid.text-white.text-small.gap-4.bg-purple-700.dark:bg-gray-700.dark:text-gray-400{ class: "grid-cols-[#{cols}]" }
+.div-table-row.block.grid.text-white.text-small.gap-4.bg-purple-700.dark:bg-gray-700.dark:text-gray-400{ class: "grid-cols-[#{cols}]" }
   - headers.each do |header|
     .div-table-cell.py-4.px-6
       = header

data/app/components/tailwinds/table/row_component.html.haml

@@ -2,12 +2,14 @@
 - if cells.any?
   - cols = cells.count.times.map { |item| "1fr" }.join(",")
 
-  = row_tag class: "div-table-row hidden md:grid gap-4 bg-white border-b dark:bg-gray-800 dark:border-gray-700 grid-cols-[#{cols}]" do
+  -# desktop view
+  = row_tag class: "div-table-row block grid gap-4 bg-white border-b dark:bg-gray-800 dark:border-gray-700 grid-cols-[#{cols}]" do
     - cells.each do |(_, value)|
-      .div-table-cell.px-6.py-4.font-medium.text-gray-900.whitespace-nowrap.dark:text-white.text-xs.sm:text-base
+      .div-table-cell.px-6.py-4.font-medium.text-gray-900.whitespace-nowrap.dark:text-white.sm:text-xs.text-base
         = value
 
-  .div-table-row.border-b.dark:bg-gray-800.dark:border-gray-700.md:hidden.mb-2{ "data-action" => "click->preview#toggle", "data-controller" => "preview", "data-items" => cells.to_json }
+  -# mobile view
+  .div-table-row.xl:hidden.border-b.dark:bg-gray-800.dark:border-gray-700.mb-2{ "data-action" => "click->preview#toggle", "data-controller" => "preview", "data-items" => cells.to_json }
     .w-full.p-4.bg-purple-100.text-gray-700.dark:bg-gray-700.dark:text-gray-400
       = cells.values.first
 

data/app/components/tailwinds/table/row_component.rb

@@ -9,7 +9,7 @@ module Tailwinds
 
       def row_tag(**options, &)
         if href.present?
-          klass = "#{options[:class] || ''} cursor-pointer hover:bg-gray-700"
+          klass = "#{options[:class] || ''} cursor-pointer dark:hover:bg-gray-700"
 
           link_to(href, options.merge(class: klass)) do
             yield if block_given?

data/app/views/tramway/entities/index.html.haml

@@ -1,3 +1,6 @@
+- decorator = Tramway::Decorators::NameBuilder.default_decorator_class_name(@model_class)
+- list_attributes = decorator.constantize.list_attributes
+
 .w-full
   - content_for :title, page_title
 
@@ -8,13 +11,13 @@
     - if Tramway.config.pagination[:enabled]
       = paginate @entities
 
-  - if decorator_class(@entities).list_attributes.empty?
+  - if list_attributes.empty?
     %p.text-center.mt-10
       You should fill class-level method `self.list_attributes` inside your
-      = decorator_class_name(@entities)
+      = decorator
 
 = component 'tailwinds/table' do
-  = component 'tailwinds/table/header', headers: decorator_class(@entities).list_attributes.map { |attribute| @model_class.human_attribute_name(attribute) }
+  = component 'tailwinds/table/header', headers: list_attributes.map { |attribute| @model_class.human_attribute_name(attribute) }
   - @entities.each do |item|
     = render 'entity', entity: item
 

data/lib/tramway/decorators/class_helper.rb

@@ -7,15 +7,15 @@ module Tramway
       module_function
 
       def decorator_class(object_or_array, decorator = nil)
-        if decorator.present?
-          decorator
-        else
-          begin
-            class_name = decorator_class_name(object_or_array)
-            class_name.constantize
-          rescue NameError
-            raise NameError, "You should define #{class_name} decorator class."
-          end
+        raise_error_if_object_empty object_or_array, decorator
+
+        return decorator if decorator.present?
+
+        begin
+          class_name = decorator_class_name(object_or_array)
+          class_name.constantize
+        rescue NameError
+          raise NameError, "You should define #{class_name} decorator class."
         end
       end
 
@@ -28,6 +28,16 @@ module Tramway
 
         Tramway::Decorators::NameBuilder.default_decorator_class_name(klass)
       end
+
+      # :reek:NilCheck { enabled: false }
+      def raise_error_if_object_empty(object_or_array, decorator)
+        return unless object_or_array.blank? && decorator.nil?
+
+        text = 'You should pass object or array that is not empty OR provide a decorator class as a second argument'
+
+        raise ArgumentError, text
+      end
+      # :reek:NilCheck { enabled: true }
     end
   end
 end

data/lib/tramway/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tramway
-  VERSION = '0.5.0.1'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: tramway
 version: !ruby/object:Gem::Version
-  version: 0.5.0.1
+  version: 0.5.1
 platform: ruby
 authors:
 - kalashnikovisme
 - moshiaan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-09 00:00:00.000000000 Z
+date: 2025-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyway_config
@@ -213,7 +213,7 @@ metadata:
   homepage_uri: https://github.com/purple-magic/tramway
   source_code_uri: https://github.com/purple-magic/tramway
   changelog_uri: https://github.com/purple-magic/tramway
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -229,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Tramway Rails Engine
 test_files: []