fluxbit_view_components 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f66b9f23ca4ef3e2fe559a212875eda72091ec0e44473efdeade01655b01ddf
-  data.tar.gz: 5d17abad070b64489453dde8cc700f3c464d4b97d60f0cb8aab4aa0137013385
+  metadata.gz: 3ff7c36152723efea00fcb464ac64ca6462b5f2a0f80cd7eab5298f5129bab1a
+  data.tar.gz: aa51123027b44b8e2a268275c15ed192bcb8bc111f5ec82d1d9ad74597b3f0c1
 SHA512:
-  metadata.gz: 0f893f775299b24f11ebc2c8120099c13999f525502d314d9ad87709a02fbbf6dd194bede20193e0cf5a5a7bd53b2b9e58d1298113df77f3ee7b958988c81bfd
-  data.tar.gz: 802ffce4186aa7fe55a32c56b904e084b4c346b6e50a5891bab9683eaa636cde5654b97e0c9b4502e30ad20e4d21b4bdcb2e68260cd66fd9d1aad72a7fd1ea73
+  metadata.gz: 2051c7d64576f3a0f8996475e184b164adc767241c52e33837472b7a28f011a2fe5e67fc86ad122599a7679dd252a019834489a795fae7b4bb558f4a444200d5
+  data.tar.gz: 5d62cc33db45e466341d46fbef8c35b128c4c16d8311a66ec0052a7133e4d7a344527577c66df08a609a48fa142e051a952dda15f041bada8c2ecc54919706a0

data/app/components/fluxbit/accordion_component.rb

@@ -6,7 +6,10 @@ class Fluxbit::AccordionComponent < Fluxbit::Component
   include Fluxbit::Config::AccordionComponent
 
   renders_many :panels, lambda { |**attrs, &block|
+    @panel_index ||= 0
+    attrs[:index] = @panel_index unless attrs.key?(:index)
     panel = Panel.new(accordion_id: fx_id, flush: @flush, color: @color, **attrs)
+    @panel_index += 1
     block.call(panel) if block_given?
     panel
   }
@@ -58,7 +61,7 @@ class Fluxbit::AccordionComponent < Fluxbit::Component
     # @param [Boolean] flush (false) Whether the panel should use flush styling.
     # @param [Symbol, String] color (:default) The color theme for this panel.
     # @param [Boolean] open (false) Whether the panel should start in an expanded state.
-    # @param [Integer] index (0) The panel's position index for proper styling (first, middle, last).
+    # @param [Integer] index The panel's position index for proper styling (first, middle, last). Automatically increments for each panel if not specified.
     # @param [Hash] **props Additional HTML attributes for the panel container.
     #
     # @return [Fluxbit::AccordionComponent::Panel]

data/app/components/fluxbit/form/text_field_component.rb

@@ -99,7 +99,7 @@ class Fluxbit::Form::TextFieldComponent < Fluxbit::Form::FieldComponent
         first_element: true,
         class: [
           styles[:default],
-          (@props.key?(:readonly) || @props.key?(:disabled) ? styles[:text][@color] : nil),
+          (@props.key?(:readonly) || @props.key?(:disabled) ? styles[:text][@color] : styles[:text][:default]),
           styles[:ring][@color],
           styles[:bg][@color],
           styles[:placeholder][@color],

data/lib/fluxbit/view_components/version.rb

@@ -1,5 +1,5 @@
 module Fluxbit
   module ViewComponents
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/lib/generators/fluxbit/scaffold_generator.rb

@@ -89,6 +89,8 @@ module Fluxbit
       # Generate i18n
       template "i18n.en.yml.tt",    File.join("config", "locales", "#{file_name.pluralize}.en.yml")
       template "i18n.pt-BR.yml.tt", File.join("config", "locales", "#{file_name.pluralize}.pt-BR.yml")
+      template "i18n.general.en.yml.tt",    File.join("config", "locales", "general.en.yml")
+      template "i18n.general.pt-BR.yml.tt", File.join("config", "locales", "general.pt-BR.yml")
 
       # Generate Policy
       template "policy.rb.tt", File.join("app/policies", "#{file_name.singularize}_policy.rb")
@@ -97,6 +99,7 @@ module Fluxbit
       template "_alert.html.erb.tt", File.join("app/views/shared", "_alert.html.erb")
       template "send_alert_via_drawer.html.erb.tt", File.join("app/views/shared", "send_alert_via_drawer_alert.html.erb")
       template "_flash.html.erb.tt", File.join("app/views/shared", "_flash.html.erb")
+      template "sortable.rb.tt", File.join("app/controllers/concerns", "sortable.rb")
     end
 
     private

data/lib/generators/fluxbit/templates/_flash.html.erb.tt

@@ -6,10 +6,12 @@
   "warning" => :warning
 } %>
 
-<%% flash.each do |type, msg| %>
-  <%% next if msg.blank? %>
-  <%% color = mapping[type.to_s] || :info %>
-  <%%= fx_alert(color: color) do %>
-    <%%= safe_join(Array(msg).map { |m| sanitize(m.to_s, tags: [], attributes: []) }, tag.br) %>
+<div id="notice" class="fixed top-4 right-4 z-50 max-w-md w-auto">
+  <%% flash.each do |type, msg| %>
+    <%% next if msg.blank? %>
+    <%% color = mapping[type.to_s] || :info %>
+    <%%= fx_alert(color: color) do %>
+      <%%= safe_join(Array(msg).map { |m| sanitize(m.to_s, tags: [], attributes: []) }, tag.br) %>
+    <%% end %>
   <%% end %>
-<%% end %>
+</div>

data/lib/generators/fluxbit/templates/controller.rb.tt

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 class <%= namespaced? ? "#{namespace_module}::" : "" %><%= class_name.pluralize %>Controller < ApplicationController
+  include Sortable
   include Pundit::Authorization
   rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
 
@@ -241,7 +242,7 @@ class <%= namespaced? ? "#{namespace_module}::" : "" %><%= class_name.pluralize
   private
 
   def set_<%= singular %>
-    @<%= singular %> = <%= class_name.singularize %>.find(params[:id])
+    @<%= singular %> = policy_scope(<%= class_name.singularize %>).find(params[:id])
     # Note: Pundit authorization for @<%= singular %> happens in each action
   rescue ActiveRecord::RecordNotFound
     @message = t("<%= plural %>.messages.not_found")
@@ -264,7 +265,7 @@ class <%= namespaced? ? "#{namespace_module}::" : "" %><%= class_name.pluralize
 
   def set_<%= plural %>_for_bulk_actions
     <%= singular %>_ids = Array(params[:<%= singular %>_ids]).reject(&:blank?)
-    @<%= plural %> = <%= class_name.singularize %>.where(id: <%= singular %>_ids)
+    @<%= plural %> = policy_scope(<%= class_name.singularize %>).where(id: <%= singular %>_ids)
 
     if @<%= plural %>.empty?
       @message = t("<%= plural %>.messages.not_selected_for_action")

data/lib/generators/fluxbit/templates/i18n.general.en.yml.tt

@@ -0,0 +1,4 @@
+en:
+  general:
+    messages:
+      order_error: "Invalid order parameter."

data/lib/generators/fluxbit/templates/sortable.rb.tt

@@ -0,0 +1,23 @@
+module Sortable
+  extend ActiveSupport::Concern
+
+  included do
+    helper_method :apply_sorting
+  end
+
+  private
+
+  def apply_sorting(resource_class, order_param, order_options = %i[created_at updated_at], default_order = { created_at: :desc })
+    if order_param.present?
+      order = order_param.rpartition("_")
+      if order.length == 3 && %w[asc desc].include?(order.last) && order_options.include?(order.first.to_sym)
+        resource_class.order(order.first.to_sym => order.last.to_sym)
+      else
+        flash[:error] = t("general.messages.order_error")
+        resource_class.order(default_order)
+      end
+    else
+      resource_class.order(default_order) # Default order
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluxbit_view_components
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Arthur Molina
@@ -292,15 +292,18 @@ files:
 - lib/generators/fluxbit/templates/edit.html.erb.tt
 - lib/generators/fluxbit/templates/fluxbit_pagy.css
 - lib/generators/fluxbit/templates/i18n.en.yml.tt
+- lib/generators/fluxbit/templates/i18n.general.en.yml.tt
+- lib/generators/fluxbit/templates/i18n.general.pt-BR.yml.tt
 - lib/generators/fluxbit/templates/i18n.pt-BR.yml.tt
 - lib/generators/fluxbit/templates/index.html.erb.tt
 - lib/generators/fluxbit/templates/index.json.jbuilder.tt
 - lib/generators/fluxbit/templates/new.html.erb.tt
 - lib/generators/fluxbit/templates/partial.html.erb.tt
 - lib/generators/fluxbit/templates/policy.rb.tt
-- lib/generators/fluxbit/templates/send_alert_via_drawer.erb.tt
+- lib/generators/fluxbit/templates/send_alert_via_drawer.html.erb.tt
 - lib/generators/fluxbit/templates/show.html.erb.tt
 - lib/generators/fluxbit/templates/show.json.jbuilder.tt
+- lib/generators/fluxbit/templates/sortable.rb.tt
 - lib/generators/fluxbit/templates/update.turbo_stream.erb.tt
 - lib/generators/fluxbit/templates/update_all.turbo_stream.erb.tt
 - lib/install/install.rb