pg_rails 7.1.9 → 7.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27fbc8e577ed0fed33aa886661ef3a3b0af756d2485e0af017eba42bedaed7c6
-  data.tar.gz: e579a2a15e0dd692d102ee83615ec25f1b641ccc4674b14ca704a41ca93fc11a
+  metadata.gz: 0f6553a59df0df7aeb2906baac1974c3f2ef6f5b17bd83f4df1b4fbf3f7f2819
+  data.tar.gz: 20e9aa024c6aebb771ebea3c3b852a2e47a6d7583d043bcbc750d3ec2642e336
 SHA512:
-  metadata.gz: 21ced186a92373d6289c79c364510e65252594fdfd46a514c19cac55f39ce55398323325a5ef2d5ae75d3d462fdca5dafa6bc2d1b5c906538a47faed208a0d83
-  data.tar.gz: e632afb4c13e2fb01ed5f641acce2efd681b610a96da8ef95ab5d48fed82c896634bd5a049833fef3669e11006db65b98af1fa4c3e2cd440fba72d954598e442
+  metadata.gz: b5b1ff627eeff7269b53d81a2b8d39184118741001cb4d36d89eba76801910315551ef563d55216f5a2e5b372b7afd3ff66ef7a4bae8428f94b20a28004c727b
+  data.tar.gz: c7af654f04ac7fba7d48e9c220f9396bb5ab24508350035447c792f0fd0afe213ccb529ed5360db4e1baa4f27cd5cbf387d6f3b4a71877edccf10395359fc8a6

data/pg_engine/app/assets/stylesheets/pg_rails_b5.scss

@@ -84,6 +84,11 @@ input[type=datetime-local], input[type=datetime] {
   vertical-align: top;
   // max-width: 17em;
 }
+.filter.active {
+  .form-select, .form-control {
+    background-color: #ffb40157;
+  }
+}
 
 .filter label {
   font-size: 0.8em;

data/pg_engine/app/components/search_bar_component.html.slim

@@ -0,0 +1,17 @@
+- if helpers.show_filters?
+  .border-bottom#filtros
+    .d-flex.align-items-center.px-3.py-2
+      .px-2.d-none.d-sm-inline-block
+        span.bi.bi-funnel-fill
+      = helpers.search_form_for @q, url: url_for do |f|
+        .row.g-1
+          .col
+            .row.g-1
+              = @builder.filtros_html(form: f)
+          .col-auto.gap-1.d-flex.align-items-start
+            = helpers.button_tag class: 'btn btn-sm btn-primary col-auto' do
+              span.bi.bi-search
+              span.d-none.d-sm-inline
+                | &nbsp
+                span.text Buscar
+            = helpers.clear_filter(title: 'Limpiar', class: 'btn btn-sm btn-secondary col-auto')

data/pg_engine/app/components/search_bar_component.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class SearchBarComponent < ViewComponent::Base
+  def initialize(ransack, filtros)
+    @q = ransack
+    @builder = filtros
+
+    super
+  end
+end

data/pg_engine/app/components/search_bar_toggler_component.html.slim

@@ -0,0 +1,8 @@
+- if helpers.show_filters?
+  = link_to url_for(ocultar_filtros: 1, cancel_filter: 'true'),
+            class: 'btn btn-sm btn-outline-primary col-auto' do
+    | Ocultar filtros
+- else
+  = link_to url_for(mostrar_filtros: 1),
+            class: 'btn btn-sm btn-outline-primary col-auto' do
+    | Filtrar

data/pg_engine/app/components/search_bar_toggler_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class SearchBarTogglerComponent < ViewComponent::Base
+end

data/pg_engine/app/controllers/pg_engine/require_sign_in.rb

@@ -3,7 +3,9 @@
 module PgEngine
   module RequireSignIn
     def self.included(clazz)
+      clazz.include RansackMemory::Concern
       clazz.before_action :authenticate_user!
+      clazz.before_action :save_and_load_filters
     end
   end
 end

data/pg_engine/app/lib/pg_engine/filtros_builder.rb

@@ -231,7 +231,7 @@ module PgEngine
       map = scope.map { |o| [o.to_s, o.id] }
 
       content_tag :div, class: 'col-auto' do
-        content_tag :div, class: 'filter' do
+        content_tag :div, class: "filter #{active_class(campo)}" do
           suf = extraer_sufijo(campo)
           if suf.in? %w[in]
             @form.select campo, map, { multiple: true }, placeholder:, 'data-controller': 'selectize',
@@ -249,7 +249,7 @@ module PgEngine
          key.value]
       end
       content_tag :div, class: 'col-auto' do
-        content_tag :div, class: 'filter' do
+        content_tag :div, class: "filter #{active_class(campo)}" do
           suf = extraer_sufijo(campo)
           if suf.in? %w[in]
             @form.select(campo, map, { multiple: true }, placeholder:, class: 'form-control form-control-sm pg-input-lg', 'data-controller': 'selectize')
@@ -262,7 +262,7 @@ module PgEngine
 
     def filtro_texto(campo, placeholder = '')
       content_tag :div, class: 'col-auto' do
-        content_tag :div, class: 'filter' do
+        content_tag :div, class: "filter #{active_class(campo)}" do
           @form.search_field(
             campo, class: 'form-control form-control-sm allow-enter-submit', placeholder:, autocomplete: 'off'
           )
@@ -276,7 +276,7 @@ module PgEngine
       include_blank = "¿#{placeholder.titleize}?"
 
       content_tag :div, class: 'col-auto' do
-        content_tag :div, class: 'filter' do
+        content_tag :div, class: "filter #{active_class(campo)}" do
           @form.select campo.to_sym, map, { include_blank: }, class: 'form-select form-select-sm pg-input-lg'
         end
       end
@@ -284,7 +284,7 @@ module PgEngine
 
     def filtro_fecha(campo, placeholder = '')
       content_tag :div, class: 'col-auto' do
-        content_tag :div, class: 'filter' do
+        content_tag :div, class: "filter #{active_class(campo)}" do
           label_tag(nil, placeholder, class: 'text-body-secondary') +
             @form.date_field(
               campo, class: 'form-control form-control-sm d-inline-block w-auto ms-1', placeholder:, autocomplete: 'off'
@@ -293,6 +293,15 @@ module PgEngine
       end
     end
 
+    def active_class(campo)
+      if parametros_controller[:q] &&
+         [parametros_controller[:q][campo.to_sym]].flatten.compact_blank.any?
+        'active'
+      else
+        ''
+      end
+    end
+
     def parametros_controller
       params
     end

data/pg_engine/app/views/pg_engine/base/index.html.slim

@@ -3,36 +3,13 @@
   - @actions&.each do |link_args|
     = link_to(*link_args)
   - if @filtros.present?
-    - if show_filters?
-      = link_to namespaced_path(@clase_modelo, ocultar_filtros: 1),
-                class: 'btn btn-sm btn-outline-primary col-auto' do
-        | Ocultar filtros
-    - else
-      = link_to namespaced_path(@clase_modelo, mostrar_filtros: 1),
-                class: 'btn btn-sm btn-outline-primary col-auto' do
-        | Filtrar
+    = render SearchBarTogglerComponent.new
     .ms-1
   = @clase_modelo.new.decorate.new_link
 
-- if @filtros.present? && show_filters?
-  .border-bottom#filtros
-    .d-flex.align-items-center.px-3.py-2
-      .px-2.d-none.d-sm-inline-block
-        span.bi.bi-funnel-fill
-      = search_form_for @q, url: namespaced_path(@clase_modelo) do |f|
-        .row.g-1
-          .col
-            .row.g-1
-              = @filtros.filtros_html(form: f)
-          .col-auto.gap-1.d-flex.align-items-start
-            = button_tag class: 'btn btn-sm btn-primary col-auto' do
-              span.bi.bi-search
-              span.d-none.d-sm-inline
-                | &nbsp
-                span.text Buscar
-            = link_to namespaced_path(@clase_modelo, mostrar_filtros: 1),
-                      class: 'btn btn-sm btn-secondary col-auto' do
-              | Limpiar
+- if @filtros.present?
+  = render SearchBarComponent.new(@q, @filtros)
+
 div
   - if @collection.any?
     .table-responsive

data/pg_engine/config/initializers/ransack_memory.rb

@@ -0,0 +1,4 @@
+RansackMemory::Core.config = {
+  param: :q, # this means the default Ransack param name for searching. You can change it
+  session_key_format: '%controller_name%_%action_name%_%request_format%' # this means how the key used to store the information to the session will be stored. Currently it interpolates request parameters. You can customize it and use these vars to build a key that fits your needs
+}

data/pg_engine/config/initializers/view_component.rb

@@ -0,0 +1,3 @@
+Rails.application.configure do
+  config.view_component.capture_compatibility_patch_enabled = true
+end

data/pg_engine/lib/pg_engine.rb

@@ -52,6 +52,7 @@ require 'mailgun-ruby'
 require 'pg_search'
 require 'view_component'
 require 'noticed'
+require 'ransack_memory'
 
 if Rails.env.local?
   require 'letter_opener'

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.1.9'
+  VERSION = '7.1.11'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.1.9
+  version: 7.1.11
 platform: ruby
 authors:
 - Martín Rosso
@@ -528,6 +528,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.6
+- !ruby/object:Gem::Dependency
+  name: ransack_memory
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: view_component
   requirement: !ruby/object:Gem::Requirement
@@ -603,6 +617,10 @@ files:
 - pg_engine/app/components/notification_component.rb
 - pg_engine/app/components/notifications_bell_component.rb
 - pg_engine/app/components/page_not_found_component.rb
+- pg_engine/app/components/search_bar_component.html.slim
+- pg_engine/app/components/search_bar_component.rb
+- pg_engine/app/components/search_bar_toggler_component.html.slim
+- pg_engine/app/components/search_bar_toggler_component.rb
 - pg_engine/app/controllers/admin/accounts_controller.rb
 - pg_engine/app/controllers/admin/email_logs_controller.rb
 - pg_engine/app/controllers/admin/emails_controller.rb
@@ -704,8 +722,10 @@ files:
 - pg_engine/config/initializers/cable_ready.rb
 - pg_engine/config/initializers/devise.rb
 - pg_engine/config/initializers/ransack.rb
+- pg_engine/config/initializers/ransack_memory.rb
 - pg_engine/config/initializers/rollbar.rb
 - pg_engine/config/initializers/simple_form_monkey_patch.rb
+- pg_engine/config/initializers/view_component.rb
 - pg_engine/config/initializers/zeitwerk.rb
 - pg_engine/config/locales/devise.en.yml
 - pg_engine/config/locales/es.yml