ui_bibz 3.0.0 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08901c79a02f3cdf155c8ebaaabbbeb51ca9f1c288683c9ed7a011f9fd0db79b'
-  data.tar.gz: a6775b311c69081ceaa310231e8a75c1734ee2e5137995dc14a667a88f77555f
+  metadata.gz: 2d1035c2c040919bc8d95ea88c10a9ec9d193ad0a065a2051d4bb50859f6f790
+  data.tar.gz: d6d98df20222b1b34dbf14cd8ef0d0ccdc9d1273b719ea91ba6f182a85d8958f
 SHA512:
-  metadata.gz: b0ea16797c341c948a1d249a72e9707368fce3b8547ece6cbde40a5c29932e0871a78247d2e28ef22b74b392eb89913b5e30c73bb0535dd1b6bc79b537cc7a88
-  data.tar.gz: d79f28d50fd11585ec2f798a49a151c9422e240d9573f4ae52502eb13f22a7f4d2a15054e50174e6b41ba629ca663f05336a7c64692c9821c68bff82f73ba020
+  metadata.gz: a673392058615c477d62b5b5cc9db1f5c5a7fef1fd8d37e00553c33dedd198e6f32b7b318f55b3cb7dec88c05c444442a158b93e80320f5d3eb17feeb8cd3d17
+  data.tar.gz: acc63ee66aab8fa6a185e57bb2f67700781c0616e3a2ada4279a1c122aaa7a35c25ae84c95d16e79bf372e1f311bc40f1adbc4956878be0e509800eac6b993b4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ui_bibz (3.0.0)
+    ui_bibz (3.0.4)
       will-paginate-i18n
       will_paginate (~> 3.3.0)
       will_paginate-bootstrap4
@@ -9,60 +9,60 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.4)
-      actionpack (= 6.1.4)
-      activesupport (= 6.1.4)
+    actioncable (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4)
-      actionpack (= 6.1.4)
-      activejob (= 6.1.4)
-      activerecord (= 6.1.4)
-      activestorage (= 6.1.4)
-      activesupport (= 6.1.4)
+    actionmailbox (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activejob (= 6.1.4.1)
+      activerecord (= 6.1.4.1)
+      activestorage (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       mail (>= 2.7.1)
-    actionmailer (6.1.4)
-      actionpack (= 6.1.4)
-      actionview (= 6.1.4)
-      activejob (= 6.1.4)
-      activesupport (= 6.1.4)
+    actionmailer (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      actionview (= 6.1.4.1)
+      activejob (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.4)
-      actionview (= 6.1.4)
-      activesupport (= 6.1.4)
+    actionpack (6.1.4.1)
+      actionview (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.4)
-      actionpack (= 6.1.4)
-      activerecord (= 6.1.4)
-      activestorage (= 6.1.4)
-      activesupport (= 6.1.4)
+    actiontext (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activerecord (= 6.1.4.1)
+      activestorage (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       nokogiri (>= 1.8.5)
-    actionview (6.1.4)
-      activesupport (= 6.1.4)
+    actionview (6.1.4.1)
+      activesupport (= 6.1.4.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.4)
-      activesupport (= 6.1.4)
+    activejob (6.1.4.1)
+      activesupport (= 6.1.4.1)
       globalid (>= 0.3.6)
-    activemodel (6.1.4)
-      activesupport (= 6.1.4)
-    activerecord (6.1.4)
-      activemodel (= 6.1.4)
-      activesupport (= 6.1.4)
-    activestorage (6.1.4)
-      actionpack (= 6.1.4)
-      activejob (= 6.1.4)
-      activerecord (= 6.1.4)
-      activesupport (= 6.1.4)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord (6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activestorage (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activejob (= 6.1.4.1)
+      activerecord (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       marcel (~> 1.0.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.4)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -83,9 +83,9 @@ GEM
     factory_bot_rails (4.11.1)
       factory_bot (~> 4.11.1)
       railties (>= 3.0.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    haml (5.2.1)
+    globalid (0.5.2)
+      activesupport (>= 5.0)
+    haml (5.2.2)
       temple (>= 0.8.0)
       tilt
     haml-rails (2.0.1)
@@ -106,19 +106,19 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    loofah (2.10.0)
+    loofah (2.12.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (1.0.1)
     method_source (1.0.0)
-    mini_mime (1.1.0)
-    mini_portile2 (2.5.3)
+    mini_mime (1.1.1)
+    mini_portile2 (2.6.1)
     minitest (5.14.4)
-    nio4r (2.5.7)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
+    nio4r (2.5.8)
+    nokogiri (1.12.3)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     overcommit (0.58.0)
       childprocess (>= 0.6.3, < 5)
@@ -131,29 +131,29 @@ GEM
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.1.4)
-      actioncable (= 6.1.4)
-      actionmailbox (= 6.1.4)
-      actionmailer (= 6.1.4)
-      actionpack (= 6.1.4)
-      actiontext (= 6.1.4)
-      actionview (= 6.1.4)
-      activejob (= 6.1.4)
-      activemodel (= 6.1.4)
-      activerecord (= 6.1.4)
-      activestorage (= 6.1.4)
-      activesupport (= 6.1.4)
+    rails (6.1.4.1)
+      actioncable (= 6.1.4.1)
+      actionmailbox (= 6.1.4.1)
+      actionmailer (= 6.1.4.1)
+      actionpack (= 6.1.4.1)
+      actiontext (= 6.1.4.1)
+      actionview (= 6.1.4.1)
+      activejob (= 6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activerecord (= 6.1.4.1)
+      activestorage (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       bundler (>= 1.15.0)
-      railties (= 6.1.4)
+      railties (= 6.1.4.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.1)
       loofah (~> 2.3)
-    railties (6.1.4)
-      actionpack (= 6.1.4)
-      activesupport (= 6.1.4)
+    railties (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       method_source
       rake (>= 0.13)
       thor (~> 1.0)
@@ -161,20 +161,20 @@ GEM
     rake (13.0.6)
     regexp_parser (2.1.1)
     rexml (3.2.5)
-    rubocop (1.18.3)
+    rubocop (1.19.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 1.9.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.8.0)
+    rubocop-ast (1.10.0)
       parser (>= 3.0.1.1)
-    rubocop-minitest (0.14.0)
+    rubocop-minitest (0.15.0)
       rubocop (>= 0.90, < 2.0)
-    rubocop-performance (1.11.4)
+    rubocop-performance (1.11.5)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.11.3)
@@ -182,7 +182,7 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
     ruby-progressbar (1.11.0)
-    ruby_parser (3.16.0)
+    ruby_parser (3.17.0)
       sexp_processor (~> 4.15, >= 4.15.1)
     sexp_processor (4.15.3)
     simple_form (5.1.0)
@@ -212,7 +212,7 @@ GEM
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     will-paginate-i18n (0.1.15)
-    will_paginate (3.3.0)
+    will_paginate (3.3.1)
     will_paginate-bootstrap4 (0.2.2)
       will_paginate (~> 3.0, >= 3.0.0)
     yard (0.9.26)

data/config/locales/en.yml

@@ -1,5 +1,8 @@
 en:
   ui_bibz:
+    table:
+      pagination:
+        per_page: 'Per page: '
     grid:
       pagination:
         per_page: 'Per page: '

data/config/locales/fr.yml

@@ -1,5 +1,8 @@
 fr:
   ui_bibz:
+    table:
+      pagination:
+        per_page: 'Par page : '
     grid:
       pagination:
         per_page: 'Par page : '

data/lib/ui_bibz.rb

@@ -43,7 +43,7 @@ module UiBibz
     attr_accessor :configuration
   end
 
-  def self.configured? #:nodoc:
+  def self.configured? # :nodoc:
     @@configured
   end
 

data/lib/ui_bibz/concerns/models/searchable.rb

@@ -16,38 +16,45 @@ module UiBibz::Concerns::Models::Searchable
 
     def self.generate_parameters
       {
-        controller: @arguments[:controller] || @params[:controller],
+        controller: @params[:controller],
+        actions_controller: @arguments[:actions_controller] || @params[:controller],
         param_id: @params[:id],
         params: @params,
-        direction: @params[:direction],
-        search: @params[:search],
-        sort: @params[:sort],
+        direction: @tmp_params[:direction],
+        search: @tmp_params[:search],
+        sort: @tmp_params[:sort],
         action: @params[:action],
         column_id: @params[:column_id],
-        id: @arguments[:store_id],
+        id: store_id,
         records: search_sort_paginate,
         searchable_attributes: @searchable_attributes,
         model: create_model
       }
     end
 
+    def self.store_id
+      @arguments[:store_id] || @params[:controller]
+    end
+
     def self.create_model
       @arguments[:model].nil? ? self : @arguments[:model].to_s.camelize.classify.constantize
     end
 
     # If there is more one table in html page
     def self.initialize_params
-      @tmp_params = { per_page: @arguments[:per_page] }
+      @tmp_params = (session_store || { 'per_page' => @arguments[:per_page] || 30 }).with_indifferent_access
 
       return unless good_store_id?
 
       @tmp_params = {
-        search: @params[:search],
-        per_page: @params[:per_page] || @arguments[:per_page],
-        page: new_search? ? nil : @params[:page],
-        sort: @params[:sort],
-        direction: @params[:direction]
-      }
+        'search' => @params[:search] || @tmp_params['search'],
+        'per_page' => @params[:per_page] || @tmp_params['per_page'] || @arguments[:per_page],
+        'page' => @params[:page],
+        'sort' => @params[:sort] || @tmp_params['sort'],
+        'direction' => @params[:direction] || @tmp_params['direction']
+      }.with_indifferent_access
+
+      @session[store_id] = @tmp_params
     end
 
     def self.search
@@ -75,15 +82,15 @@ module UiBibz::Concerns::Models::Searchable
 
     def self.generate_default_sql(sql)
       if sorting?
-        sql.paginate(page: @tmp_params[:page], per_page: @session[:per_page])
+        sql.paginate(page: @tmp_params[:page], per_page: @tmp_params[:per_page])
       else
-        sql.reorder(order_sql).paginate(page: @tmp_params[:page], per_page: @session[:per_page])
+        sql.reorder(order_sql).paginate(page: @tmp_params[:page], per_page: @tmp_params[:per_page])
       end
     end
 
     def self.generate_count_sql(sql)
       sq = "SELECT * FROM (#{sql.group("#{table_name}.id").to_sql}) countable ORDER BY countable.count #{@tmp_params[:direction] || asc}"
-      paginate_by_sql(sq, page: @tmp_params[:page], per_page: @session[:per_page])
+      paginate_by_sql(sq, page: @tmp_params[:page], per_page: @tmp_params[:per_page])
     end
 
     def self.generate_select_count_sort_query(sql, column_args)
@@ -147,13 +154,16 @@ module UiBibz::Concerns::Models::Searchable
     end
 
     def self.search_sort_paginate
-      @session[:per_page] = @tmp_params[:per_page] unless @tmp_params[:per_page].nil?
       search
     end
 
+    def self.session_store
+      @session[store_id]
+    end
+
     # If there's several table in the same page
     def self.good_store_id?
-      @arguments[:store_id] == @params[:store_id]
+      @params[:store_id].nil? ? true : store_id == @params[:store_id]
     end
 
     def self.new_search?

data/lib/ui_bibz/infos.rb

@@ -12,6 +12,6 @@ module UiBibz
   REPO                = 'git+https://github.com/thooams/ui_bibz.git'
   EMAIL               = 'thomas@hummel.link'
   AUTHOR              = 'Thooams [Thomas HUMMEL]'
-  VERSION             = '3.0.0'
+  VERSION             = '3.0.4'
   AUTHORS = ['Thooams'].freeze
 end

data/lib/ui_bibz/ui/concerns/card_itemable_concern.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module UiBibz::Ui::Concerns::CardItemableConcern #:nodoc:
+module UiBibz::Ui::Concerns::CardItemableConcern # :nodoc:
   extend ActiveSupport::Concern
   include UiBibz::Ui::Concerns::HtmlConcern
 

data/lib/ui_bibz/ui/concerns/html_concern.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module UiBibz::Ui::Concerns::HtmlConcern #:nodoc:
+module UiBibz::Ui::Concerns::HtmlConcern # :nodoc:
   extend ActiveSupport::Concern
 
   included do

data/lib/ui_bibz/ui/concerns/navigation_concern.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module UiBibz::Ui::Concerns::NavigationConcern #:nodoc:
+module UiBibz::Ui::Concerns::NavigationConcern # :nodoc:
   extend ActiveSupport::Concern
 
   included do

data/lib/ui_bibz/ui/concerns/notification_concern.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module UiBibz::Ui::Concerns::NotificationConcern #:nodoc:
+module UiBibz::Ui::Concerns::NotificationConcern # :nodoc:
   extend ActiveSupport::Concern
 
   included do

data/lib/ui_bibz/ui/core/boxes/card.rb

@@ -26,6 +26,7 @@ module UiBibz::Ui::Core::Boxes
   # * text - Hash (+:size+, +:position+)
   #   (+:left+, +:right+, +:center+)
   # * block - Boolean
+  # * tabbed - Boolean to use tab card
   # * type - Symbol
   #   (+:inverse+)
   #
@@ -108,7 +109,7 @@ module UiBibz::Ui::Core::Boxes
     end
 
     def component_html_classes
-      ['card', text, type, tab_pane, outline]
+      ['card', text, type, tab_pane, outline, tabbed]
     end
 
     def status
@@ -135,6 +136,10 @@ module UiBibz::Ui::Core::Boxes
       'tab-pane' if @options[:tab]
     end
 
+    def tabbed
+      'tab-content' if @options[:tabbed]
+    end
+
     def outline
       'bg-transparent' if @options[:outline]
     end

data/lib/ui_bibz/ui/core/boxes/components/card_body.rb

@@ -81,7 +81,11 @@ module UiBibz::Ui::Core::Boxes::Components
     private
 
     def component_html_classes
-      ['card-body', outline]
+      ['card-body', outline, tab_pane]
+    end
+
+    def component_html_options
+      @options[:tab_pane].nil? ? {} : { id: @options[:tab_pane] }
     end
 
     def outline
@@ -91,5 +95,9 @@ module UiBibz::Ui::Core::Boxes::Components
     def show
       'show' if @options[:show]
     end
+
+    def tab_pane
+      'tab-pane' if options[:tab_pane]
+    end
   end
 end

data/lib/ui_bibz/ui/core/boxes/components/card_col.rb

@@ -47,7 +47,7 @@ module UiBibz::Ui::Core::Boxes::Components
 
     # See UiBibz::Ui::Core::Component.initialize
     def initialize(content = nil, options = nil, html_options = nil, &block)
-      content = content.is_a?(Integer) ? { num: content } : content
+      content = { num: content } if content.is_a?(Integer)
       super
       @items = [@content]
     end

data/lib/ui_bibz/ui/core/component.rb

@@ -148,7 +148,7 @@ module UiBibz::Ui::Core
     # Add html data arguments
     def add_html_data(name, value: true)
       html_options[:data] = {} if html_options[:data].nil?
-      value = value.is_a?(String) ? value.strip : value
+      value = value.strip if value.is_a?(String)
       html_options[:data].update({ name => value })
     end
 

data/lib/ui_bibz/ui/core/forms/selects/dropdown_select_field.rb

@@ -102,6 +102,7 @@ module UiBibz::Ui::Core::Forms::Selects
 
     def searchable
       add_html_data('enable_filtering') if options[:searchable]
+      add_html_data('fuzzy_search') if options[:searchable] == :fuzzy
     end
 
     def n_selected_text

data/lib/ui_bibz/ui/core/layouts/col.rb

@@ -52,9 +52,7 @@ module UiBibz::Ui::Core::Layouts
   class Col < UiBibz::Ui::Core::Component
     # See UiBibz::Ui::Core::Component.initialize
     def initialize(content = nil, options = nil, html_options = nil, &block)
-      unless block.nil?
-        content = content.is_a?(Integer) ? { num: content } : content
-      end
+      content = { num: content } if !block.nil? && content.is_a?(Integer)
       super
     end
 

data/lib/ui_bibz/ui/core/layouts/row.rb

@@ -50,9 +50,7 @@ module UiBibz::Ui::Core::Layouts
 
     # See UiBibz::Ui::Core::Component.initialize
     def initialize(content = nil, options = nil, html_options = nil, &block)
-      unless block.nil?
-        content = content.is_a?(Integer) ? { num: content } : content
-      end
+      content = { num: content } if !block.nil? && content.is_a?(Integer)
       super
       @items = [@content]
     end

data/lib/ui_bibz/ui/core/navigations/components/navbar_form.rb

@@ -44,7 +44,7 @@ module UiBibz::Ui::Core::Navigations
     include Haml::Helpers
     include SimpleForm::ActionViewExtensions::FormHelper if defined?(SimpleForm)
     include UiBibz::Helpers::UtilsHelper
-    include ActionView::Helpers #::FormHelper
+    include ActionView::Helpers # ::FormHelper
 
     attr_accessor :html_options
 

data/lib/ui_bibz/ui/ux/tables/components/actions.rb

@@ -51,9 +51,9 @@ module UiBibz::Ui::Ux::Tables
 
     def defaults_actions
       [
-        UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownLink.new(show_name, url: { controller: @store.controller, action: 'show', id: :id }, glyph: 'eye').render,
-        UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownLink.new(edit_name, url: { controller: @store.controller, action: 'edit', id: :id }, glyph: 'edit').render,
-        UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownLink.new(delete_name, { glyph: 'trash', url: { controller: @store.controller, action: 'destroy', id: :id }, link_html_options: { data: { confirm: 'Are you sure?', method: :delete } } }).render
+        UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownLink.new(show_name, url: { controller: @store.actions_controller, action: 'show', id: :id }, glyph: 'eye').render,
+        UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownLink.new(edit_name, url: { controller: @store.actions_controller, action: 'edit', id: :id }, glyph: 'edit').render,
+        UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownLink.new(delete_name, { glyph: 'trash', url: { controller: @store.actions_controller, action: 'destroy', id: :id }, link_html_options: { data: { confirm: 'Are you sure?', method: :delete } } }).render
       ]
     end
 

data/lib/ui_bibz/ui/ux/tables/components/store.rb

@@ -70,6 +70,10 @@ module UiBibz::Ui::Ux::Tables
       @store.controller
     end
 
+    def actions_controller
+      @store.actions_controller
+    end
+
     def params
       @store.params || {}
     end

data/lib/ui_bibz/ui/ux/tables/extensions/paginable.rb

@@ -15,7 +15,6 @@ module UiBibz::Ui::Ux::Tables
       content_tag :div, @html_options do
         concat UiBibz::Ui::Ux::Tables::TablePagination.new(store: @store, wrap_form: @options[:wrap_form]).render
         concat UiBibz::Ui::Ux::Tables::TablePaginationPerPage.new(store: @store, wrap_form: @options[:wrap_form]).render
-        concat tag(:br, class: 'ui-bibz-clear')
       end
     end
 

data/lib/ui_bibz/ui/ux/tables/table_pagination.rb

@@ -39,8 +39,8 @@ module UiBibz::Ui::Ux::Tables
     # Render html tag with boostrap pagination theme
     def render
       paginate_parameters = { controller: store.controller }
-      paginate_parameters = paginate_parameters.merge({ store_id: store.id }) unless store.id.nil?
       paginate_parameters = paginate_parameters.merge(store.parameters)
+      paginate_parameters = paginate_parameters.merge({ store_id: store.id }) unless store.id.nil?
       paginate_parameters = paginate_parameters.merge({ link_type: 'pagination' })
       will_paginate(store.records, params: paginate_parameters.with_indifferent_access.reject { |k, v| default_parameters?(k) || v.blank? }, renderer: WillPaginate::ActionView::BootstrapLinkRenderer)
     end

data/lib/ui_bibz/ui/ux/tables/table_pagination_per_page.rb

@@ -57,7 +57,7 @@ module UiBibz::Ui::Ux::Tables
       content_tag :div, class: 'table-pagination-per-page' do
         concat results_count_html
         concat UiBibz::Utils::Internationalization.new('ui_bibz.table.pagination.per_page', default: 'Per page: ').translate
-        concat select_tag('per_page', options_for_select([5, 10, 20, 30, 50, 100, 200, 500], store.per_page), class: 'form-control')
+        concat select_tag('per_page', options_for_select([5, 10, 20, 30, 50, 100, 200, 500], store.per_page), class: 'form-select')
       end
     end
 
@@ -68,7 +68,7 @@ module UiBibz::Ui::Ux::Tables
         store.parameters.with_indifferent_access.reject { |k, v| default_parameters?(k) || v.blank? }.each do |k, v|
           concat tag(:input, type: 'hidden', name: k, value: v)
         end
-        concat select_tag('per_page', options_for_select([5, 10, 20, 30, 50, 100, 200, 500], store.per_page), class: 'form-control')
+        concat select_tag('per_page', options_for_select([5, 10, 20, 30, 50, 100, 200, 500], store.per_page), class: 'form-select')
         concat tag(:input, type: 'hidden', name: 'store_id', value: store.id) unless store.id.nil? # If there is more 1 table in html page
       end
     end

data/lib/ui_bibz/ui/ux/tables/table_search_field.rb

@@ -62,11 +62,7 @@ module UiBibz::Ui::Ux::Tables
     end
 
     def search_content
-      if store.id.nil?
-        store.search
-      else
-        store.id == store.params[:store_id] ? store.search : ''
-      end
+      store.search
     end
 
     def clear_button

data/test/ui/core/boxes/card_test.rb

@@ -136,16 +136,18 @@ class CardTest < ActionView::TestCase
     assert_equal expected, actual
   end
 
-  test 'card header tab group' do
-    actual = ui_card do |c|
+  test 'card tab' do
+    actual = ui_card tabbed: true do |c|
       c.header do |h|
         h.tab_group do |cg|
           cg.tab 'link1', url: '#link1'
           cg.tab 'link2', url: '#link2'
         end
       end
+      c.body tab_pan: "link1", state: :active
+      c.body tab_pan: "link2"
     end
-    expected = "<div class=\"card\"><div class=\"card-header\"><ul class=\"nav nav-tabs card-header-tabs\" role=\"tablist\"><li class=\"nav-item\"><a href=\"#link1\" class=\"nav-link\" data-bs-toggle=\"tab\" role=\"tab\">link1</a></li><li class=\"nav-item\"><a href=\"#link2\" class=\"nav-link\" data-bs-toggle=\"tab\" role=\"tab\">link2</a></li></ul></div></div>"
+    expected = "<div class=\"card tab-content\"><div class=\"card-header\"><ul class=\"nav nav-tabs card-header-tabs\" role=\"tablist\"><li class=\"nav-item\"><a href=\"#link1\" class=\"nav-link\" data-bs-toggle=\"tab\" role=\"tab\">link1</a></li><li class=\"nav-item\"><a href=\"#link2\" class=\"nav-link\" data-bs-toggle=\"tab\" role=\"tab\">link2</a></li></ul></div><div class=\"active card-body\"></div><div class=\"card-body\"></div></div>"
 
     assert_equal expected, actual
   end

data/test/ui/core/forms/selects/dropdown_select_field_test.rb

@@ -12,6 +12,15 @@ class DropdownSelectFieldTest < ActionView::TestCase
     assert_equal expected, actual
   end
 
+  test 'Dropdown Select Field with fuzzy search' do
+    options  = options_for_select(Array.new(2) { |i| "option #{i}" })
+    actual   = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('example', option_tags: options, searchable: :fuzzy).render
+    expected = "<select name=\"example\" id=\"example\" data-enable-filtering=\"true\" data-fuzzy-search=\"true\" data-dropdown-classes=\"dropdown\" class=\"btn-secondary multi-select-field\"><option value=\"option 0\">option 0</option>
+<option value=\"option 1\">option 1</option></select>"
+
+    assert_equal expected, actual
+  end
+
   test 'Dropdown Select Field data html options' do
     grouped_options = { 'North America' => [['United statuss', 'US'], 'Canada'], 'Europe' => %w[Denmark Germany France] }
     actual = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('example', { multiple: true, option_tags: grouped_options_for_select(grouped_options), clickable_opt_group: true, collapsible_opt_group: true, searchable: true, non_selected_text: 'test', select_all_options: true, number_displayed: 2, status: :danger, n_selected_text: "items selected" }).render

data/test/ui/ux/tables/table_test.rb

@@ -26,14 +26,14 @@ class TableTest < ActionView::TestCase
 
   test 'table search field' do
     actual   = UiBibz::Ui::Ux::Tables::TableSearchField.new({ store: @users }).render
-    expected = "<form class=\"form-table-search-field\" action=\"/users?direction=asc&amp;page=1&amp;per_page=2&amp;search=Name+fr&amp;sort=users.name_fr\" accept-charset=\"UTF-8\" method=\"get\"><div class=\"input-group input-group-sm table-search-field\"><span class=\"input-group-text\"><i class=\"glyph fas fa-search\"></i></span><input type=\"hidden\" name=\"sort\" value=\"users.name_fr\" /><input type=\"hidden\" name=\"direction\" value=\"asc\" /><input type=\"hidden\" name=\"per_page\" value=\"2\" /><input type=\"hidden\" name=\"page\" value=\"1\" /><input type=\"hidden\" name=\"only_path\" value=\"true\" /><input type=\"hidden\" name=\"link_type\" value=\"search\" /><input type=\"search\" value=\"Name fr\" name=\"search\" class=\"form-control\" placeholder=\"Search by Name fr and Name en...\" /><button type=\"button\" class=\"btn btn-secondary input-group-btn clear-search-btn\"><i class=\"glyph fas fa-times-circle\"></i> <span class=\"visually-hidden\">Clear Search</span></button></div></form>"
+    expected = "<form class=\"form-table-search-field\" action=\"/users?direction=asc&amp;page=1&amp;per_page=2&amp;search=Name+fr&amp;sort=users.name_fr\" accept-charset=\"UTF-8\" method=\"get\"><div class=\"input-group input-group-sm table-search-field\"><span class=\"input-group-text\"><i class=\"glyph fas fa-search\"></i></span><input type=\"hidden\" name=\"sort\" value=\"users.name_fr\" /><input type=\"hidden\" name=\"direction\" value=\"asc\" /><input type=\"hidden\" name=\"per_page\" value=\"2\" /><input type=\"hidden\" name=\"page\" value=\"1\" /><input type=\"hidden\" name=\"only_path\" value=\"true\" /><input type=\"hidden\" name=\"store_id\" value=\"users\" /><input type=\"hidden\" name=\"link_type\" value=\"search\" /><input type=\"search\" value=\"Name fr\" name=\"search\" class=\"form-control\" placeholder=\"Search by Name fr and Name en...\" /><button type=\"button\" class=\"btn btn-secondary input-group-btn clear-search-btn\"><i class=\"glyph fas fa-times-circle\"></i> <span class=\"visually-hidden\">Clear Search</span></button></div></form>"
 
     assert_equal expected, actual
   end
 
   test 'table pagination' do
     actual = UiBibz::Ui::Ux::Tables::TablePagination.new({ store: @users }).render
-    expected = "<nav class=\"pagination\"><ul class=\"pagination\" role=\"group\"><li class=\"previous page-item disabled\"><span class=\"page-link\">&laquo;</span></li> <li class=\"page-item active\"><span class=\"page-link\">1</span></li> <li class=\"page-item\"><a class=\"page-link\" rel=\"next\" href=\"/users?direction=asc&amp;page=2&amp;search=Name+fr&amp;sort=users.name_fr\">2</a></li> <li class=\"page-item\"><a class=\"page-link\" href=\"/users?direction=asc&amp;page=3&amp;search=Name+fr&amp;sort=users.name_fr\">3</a></li> <li class=\"page-item\"><a class=\"page-link\" href=\"/users?direction=asc&amp;page=4&amp;search=Name+fr&amp;sort=users.name_fr\">4</a></li> <li class=\"page-item\"><a class=\"page-link\" href=\"/users?direction=asc&amp;page=5&amp;search=Name+fr&amp;sort=users.name_fr\">5</a></li> <li class=\"page-item disabled\"><i class=\"page-link\">&hellip;</i></li> <li class=\"page-item\"><a class=\"page-link\" href=\"/users?direction=asc&amp;page=12&amp;search=Name+fr&amp;sort=users.name_fr\">12</a></li> <li class=\"page-item\"><a class=\"page-link\" href=\"/users?direction=asc&amp;page=13&amp;search=Name+fr&amp;sort=users.name_fr\">13</a></li> <li class=\"next page-item\"><a class=\"page-link\" rel=\"next\" href=\"/users?direction=asc&amp;page=2&amp;search=Name+fr&amp;sort=users.name_fr\">&raquo;</a></li></ul></nav>"
+    expected = "<nav class=\"pagination\"><ul class=\"pagination\" role=\"group\"><li class=\"previous page-item disabled\"><span class=\"page-link\">&laquo;</span></li> <li class=\"page-item active\"><span class=\"page-link\">1</span></li> <li class=\"page-item\"><a class=\"page-link\" rel=\"next\" href=\"/users?direction=asc&amp;page=2&amp;search=Name+fr&amp;sort=users.name_fr&amp;store_id=users\">2</a></li> <li class=\"page-item\"><a class=\"page-link\" href=\"/users?direction=asc&amp;page=3&amp;search=Name+fr&amp;sort=users.name_fr&amp;store_id=users\">3</a></li> <li class=\"page-item\"><a class=\"page-link\" href=\"/users?direction=asc&amp;page=4&amp;search=Name+fr&amp;sort=users.name_fr&amp;store_id=users\">4</a></li> <li class=\"page-item\"><a class=\"page-link\" href=\"/users?direction=asc&amp;page=5&amp;search=Name+fr&amp;sort=users.name_fr&amp;store_id=users\">5</a></li> <li class=\"page-item disabled\"><i class=\"page-link\">&hellip;</i></li> <li class=\"page-item\"><a class=\"page-link\" href=\"/users?direction=asc&amp;page=12&amp;search=Name+fr&amp;sort=users.name_fr&amp;store_id=users\">12</a></li> <li class=\"page-item\"><a class=\"page-link\" href=\"/users?direction=asc&amp;page=13&amp;search=Name+fr&amp;sort=users.name_fr&amp;store_id=users\">13</a></li> <li class=\"next page-item\"><a class=\"page-link\" rel=\"next\" href=\"/users?direction=asc&amp;page=2&amp;search=Name+fr&amp;sort=users.name_fr&amp;store_id=users\">&raquo;</a></li></ul></nav>"
 
     assert_equal expected, actual
   end
@@ -49,7 +49,7 @@ class TableTest < ActionView::TestCase
   test 'table sortable' do
     options  = { sortable: true }
     actual   = UiBibz::Ui::Ux::Tables::Sortable.new(@store, options).header(@store.columns.list.first)
-    expected = '<a class="dropup" href="/users?column_id=id&amp;direction=asc&amp;link_type=column&amp;search=Name+fr&amp;sort=users.id">Id</a>'
+    expected = '<a class="dropup" href="/users?column_id=id&amp;direction=asc&amp;link_type=column&amp;search=Name+fr&amp;sort=users.id&amp;store_id=users">Id</a>'
 
     assert_equal expected, actual
   end
@@ -66,14 +66,14 @@ class TableTest < ActionView::TestCase
     options      = { paginable: true }
     pagination   = UiBibz::Ui::Ux::Tables::Paginable.new(@store, options)
     actual       = pagination.render if pagination.paginable?
-    expected     = "<div><nav class=\"pagination\"><ul class=\"pagination\" role=\"group\"><li class=\"previous page-item disabled\"><span class=\"page-link\">&laquo;</span></li> <li class=\"page-item active\"><span class=\"page-link\">1</span></li> <li class=\"page-item\"><a class=\"page-link\" rel=\"next\" href=\"/users?direction=asc&amp;page=2&amp;search=Name+fr&amp;sort=users.name_fr\">2</a></li> <li class=\"page-item\"><a class=\"page-link\" href=\"/users?direction=asc&amp;page=3&amp;search=Name+fr&amp;sort=users.name_fr\">3</a></li> <li class=\"page-item\"><a class=\"page-link\" href=\"/users?direction=asc&amp;page=4&amp;search=Name+fr&amp;sort=users.name_fr\">4</a></li> <li class=\"page-item\"><a class=\"page-link\" href=\"/users?direction=asc&amp;page=5&amp;search=Name+fr&amp;sort=users.name_fr\">5</a></li> <li class=\"page-item disabled\"><i class=\"page-link\">&hellip;</i></li> <li class=\"page-item\"><a class=\"page-link\" href=\"/users?direction=asc&amp;page=12&amp;search=Name+fr&amp;sort=users.name_fr\">12</a></li> <li class=\"page-item\"><a class=\"page-link\" href=\"/users?direction=asc&amp;page=13&amp;search=Name+fr&amp;sort=users.name_fr\">13</a></li> <li class=\"next page-item\"><a class=\"page-link\" rel=\"next\" href=\"/users?direction=asc&amp;page=2&amp;search=Name+fr&amp;sort=users.name_fr\">&raquo;</a></li></ul></nav><form action=\"/users\" accept-charset=\"UTF-8\" method=\"get\"><div class=\"table-pagination-per-page\">Displaying User <b>1&nbsp;-&nbsp;2</b> of <b>25</b> in total | Per page: <input type=\"hidden\" name=\"sort\" value=\"users.name_fr\" /><input type=\"hidden\" name=\"direction\" value=\"asc\" /><input type=\"hidden\" name=\"per_page\" value=\"2\" /><input type=\"hidden\" name=\"only_path\" value=\"true\" /><select name=\"per_page\" id=\"per_page\" class=\"form-control\"><option value=\"5\">5</option>
+    expected     = "<div><nav class=\"pagination\"><ul class=\"pagination\" role=\"group\"><li class=\"previous page-item disabled\"><span class=\"page-link\">&laquo;</span></li> <li class=\"page-item active\"><span class=\"page-link\">1</span></li> <li class=\"page-item\"><a class=\"page-link\" rel=\"next\" href=\"/users?direction=asc&amp;page=2&amp;search=Name+fr&amp;sort=users.name_fr&amp;store_id=users\">2</a></li> <li class=\"page-item\"><a class=\"page-link\" href=\"/users?direction=asc&amp;page=3&amp;search=Name+fr&amp;sort=users.name_fr&amp;store_id=users\">3</a></li> <li class=\"page-item\"><a class=\"page-link\" href=\"/users?direction=asc&amp;page=4&amp;search=Name+fr&amp;sort=users.name_fr&amp;store_id=users\">4</a></li> <li class=\"page-item\"><a class=\"page-link\" href=\"/users?direction=asc&amp;page=5&amp;search=Name+fr&amp;sort=users.name_fr&amp;store_id=users\">5</a></li> <li class=\"page-item disabled\"><i class=\"page-link\">&hellip;</i></li> <li class=\"page-item\"><a class=\"page-link\" href=\"/users?direction=asc&amp;page=12&amp;search=Name+fr&amp;sort=users.name_fr&amp;store_id=users\">12</a></li> <li class=\"page-item\"><a class=\"page-link\" href=\"/users?direction=asc&amp;page=13&amp;search=Name+fr&amp;sort=users.name_fr&amp;store_id=users\">13</a></li> <li class=\"next page-item\"><a class=\"page-link\" rel=\"next\" href=\"/users?direction=asc&amp;page=2&amp;search=Name+fr&amp;sort=users.name_fr&amp;store_id=users\">&raquo;</a></li></ul></nav><form action=\"/users\" accept-charset=\"UTF-8\" method=\"get\"><div class=\"table-pagination-per-page\">Displaying User <b>1&nbsp;-&nbsp;2</b> of <b>25</b> in total | Per page: <input type=\"hidden\" name=\"sort\" value=\"users.name_fr\" /><input type=\"hidden\" name=\"direction\" value=\"asc\" /><input type=\"hidden\" name=\"per_page\" value=\"2\" /><input type=\"hidden\" name=\"only_path\" value=\"true\" /><select name=\"per_page\" id=\"per_page\" class=\"form-select\"><option value=\"5\">5</option>
 <option value=\"10\">10</option>
 <option value=\"20\">20</option>
 <option value=\"30\">30</option>
 <option value=\"50\">50</option>
 <option value=\"100\">100</option>
 <option value=\"200\">200</option>
-<option value=\"500\">500</option></select></div></form><br class=\"ui-bibz-clear\" /></div>"
+<option value=\"500\">500</option></select><input type=\"hidden\" name=\"store_id\" value=\"users\" /></div></form></div>"
 
     assert_equal expected, actual
   end
@@ -97,7 +97,7 @@ class TableTest < ActionView::TestCase
   test 'table searchable' do
     options  = { searchable: true }
     actual   = UiBibz::Ui::Ux::Tables::Searchable.new(@store, options).render
-    expected = "<div><div class=\"title\">Users list</div><form class=\"form-table-search-field\" action=\"/users?direction=asc&amp;page=1&amp;per_page=2&amp;search=Name+fr&amp;sort=users.name_fr\" accept-charset=\"UTF-8\" method=\"get\"><div class=\"input-group input-group-sm table-search-field\"><span class=\"input-group-text\"><i class=\"glyph fas fa-search\"></i></span><input type=\"hidden\" name=\"sort\" value=\"users.name_fr\" /><input type=\"hidden\" name=\"direction\" value=\"asc\" /><input type=\"hidden\" name=\"per_page\" value=\"2\" /><input type=\"hidden\" name=\"page\" value=\"1\" /><input type=\"hidden\" name=\"only_path\" value=\"true\" /><input type=\"hidden\" name=\"link_type\" value=\"search\" /><input type=\"search\" value=\"Name fr\" name=\"search\" class=\"form-control\" placeholder=\"Search by Name fr and Name en...\" /><button type=\"button\" class=\"btn btn-secondary input-group-btn clear-search-btn\"><i class=\"glyph fas fa-times-circle\"></i> <span class=\"visually-hidden\">Clear Search</span></button></div></form><br class=\"ui-bibz-clear\" /></div>"
+    expected = "<div><div class=\"title\">Users list</div><form class=\"form-table-search-field\" action=\"/users?direction=asc&amp;page=1&amp;per_page=2&amp;search=Name+fr&amp;sort=users.name_fr\" accept-charset=\"UTF-8\" method=\"get\"><div class=\"input-group input-group-sm table-search-field\"><span class=\"input-group-text\"><i class=\"glyph fas fa-search\"></i></span><input type=\"hidden\" name=\"sort\" value=\"users.name_fr\" /><input type=\"hidden\" name=\"direction\" value=\"asc\" /><input type=\"hidden\" name=\"per_page\" value=\"2\" /><input type=\"hidden\" name=\"page\" value=\"1\" /><input type=\"hidden\" name=\"only_path\" value=\"true\" /><input type=\"hidden\" name=\"store_id\" value=\"users\" /><input type=\"hidden\" name=\"link_type\" value=\"search\" /><input type=\"search\" value=\"Name fr\" name=\"search\" class=\"form-control\" placeholder=\"Search by Name fr and Name en...\" /><button type=\"button\" class=\"btn btn-secondary input-group-btn clear-search-btn\"><i class=\"glyph fas fa-times-circle\"></i> <span class=\"visually-hidden\">Clear Search</span></button></div></form><br class=\"ui-bibz-clear\" /></div>"
 
     assert_equal expected, actual
   end
@@ -130,10 +130,10 @@ class TableTest < ActionView::TestCase
   end
 
   test 'table actionable with antoher controller' do
-    @users = User.table_search_pagination(params, session, { controller: "areas" })
+    @users = User.table_search_pagination(params, session, { actions_controller: "areas" })
     @store = UiBibz::Ui::Ux::Tables::Store.new @users
 
-    assert_equal("areas", @store.controller)
+    assert_equal("areas", @store.actions_controller)
   end
 
   test 'table non actionable header' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ui_bibz
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.4
 platform: ruby
 authors:
 - Thooams [Thomas HUMMEL]
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails