pg_rails 7.1.1.pre.5 → 7.1.1.pre.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ed654c2ed0008b0a029aafcf59fbf1fb11d681b091852cdf91075eb59027b4e
-  data.tar.gz: 8c5030277d34251d6e214697475c1e79121a40b1c5c9b757eb9ca95d04261bfb
+  metadata.gz: b95efca3ae2b2ec3c5779300bbfd6cc00ba9cac453b4fd07395803eb5010a726
+  data.tar.gz: 87811da5c11b5ec8bfb15e45e8b43ed5c606bceb23804bc473990f9f46ab13ed
 SHA512:
-  metadata.gz: f2a334fbf6cf1e62e629bb231ab9ecca2300b30db6f04e1fb6360e7d9d2688a9399398d860cc0930418889b5960dfe900eb6e7bd8a7be8ff0e32d8e48513244b
-  data.tar.gz: f3686b6c215d38d54147e1506d7645b36ccf29ed2fde0dae04574662a649550d952deb5bce503a6ff3403dc98c77235364485e04e3dc4171f39af7ee4db672cf
+  metadata.gz: 4da052d189d685cd90c2aed939bfebd8d3e4809f6e3db671d686a034d597b32b03a2f52f3b3413c9277566329822cbf4a520ab33531cc40ef8873a2b8c51850a
+  data.tar.gz: fddd0362fab8db6f74816b583372fbc10fbd4d6ad68f48adbbe635579b28339603e1f09358a16563d9d9e6909573009ec6111c84f50d9c28f109758e402f6495

data/pg_engine/app/controllers/admin/users_controller.rb

@@ -53,7 +53,7 @@ module Admin
     end
 
     def atributos_para_buscar
-      %i[email nombre apellido developer]
+      %i[email_cont nombre_cont apellido_cont developer]
     end
 
     def atributos_para_listar

data/pg_engine/app/controllers/concerns/pg_engine/resource.rb

@@ -5,7 +5,7 @@ module PgEngine
       clazz.helper_method :atributos_para_listar
       clazz.helper_method :atributos_para_mostrar
       clazz.helper_method :current_page_size
-      clazz.helper_method :any_filter?
+      clazz.helper_method :show_filters?
     end
 
     # Public endpoints
@@ -19,6 +19,15 @@ module PgEngine
 
     def index
       @collection = filtros_y_policy atributos_para_buscar
+
+      shared_context = Ransack::Context.for(clase_modelo)
+
+      @q = @clase_modelo.ransack(params[:q], context: shared_context)
+      # @collection = @q.result(distinct: true)
+      @collection = @collection.joins(shared_context.join_sources)
+      vis = Ransack::Visitor.new.accept(@q.base)
+      @collection = @collection.where(vis)
+
       @collection = sort_collection(@collection)
       pg_respond_index
     end
@@ -53,8 +62,17 @@ module PgEngine
 
     protected
 
-    def any_filter?
-      params.keys.reject { |a| a.in? %w[controller action page page_size order_by order_direction] }.any?
+    def show_filters?
+      cur_route = pg_current_route
+      idtf = cur_route[:controller] + '#' + cur_route[:action] + '#open-filters'
+
+      if params[:ocultar_filtros]
+        session[idtf] = nil
+      elsif params[:mostrar_filtros]
+        session[idtf] = true
+      end
+
+      session[idtf]
     end
 
     def current_page_size

data/pg_engine/app/controllers/pg_engine/base_controller.rb

@@ -94,6 +94,7 @@ module PgEngine
         @notifications = Current.user.notifications.order(id: :desc)
                                 .where(type: 'SimpleUserNotifier::Notification')
         unseen = @notifications.unseen.any?
+        # FIXME: testear y fixear, buscar el primero que esté present
         tooltip = @notifications.unseen.map(&:tooltip).first
         @notifications_bell = NotificationsBellComponent.new(
           unseen:,

data/pg_engine/app/helpers/pg_engine/route_helper.rb

@@ -16,11 +16,15 @@ module PgEngine
         end
       end
 
+      def self.current_route(context)
+        req = request(context)
+        Rails.application.routes.recognize_path(req.path, method: req.env['REQUEST_METHOD'])
+      end
+
       def self.namespace(context)
         return Current.namespace if Current.namespace.present?
 
-        req = request(context)
-        route = Rails.application.routes.recognize_path(req.path, method: req.env['REQUEST_METHOD'])
+        route = current_route(context)
         parts = route[:controller].split('/')
         return unless parts.length > 1
 
@@ -30,6 +34,10 @@ module PgEngine
       end
     end
 
+    def pg_current_route
+      NamespaceDeductor.current_route(self)
+    end
+
     def pg_namespace
       NamespaceDeductor.namespace(self)
     end

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

@@ -186,6 +186,9 @@ module PgEngine
     end
 
     def filtros_html(options = {})
+      @form = options[:form]
+      raise PgEngine::Error, 'se debe setear el form' if @form.blank?
+
       res = ''
       @filtros.each do |campo, opciones|
         if opciones[:oculto] ||
@@ -253,42 +256,35 @@ module PgEngine
 
       map = scope.map { |o| [o.to_s, o.id] }
 
-      unless @filtros[campo.to_sym].present? && @filtros[campo.to_sym][:include_blank] == false
-        map.unshift ["Seleccionar #{@clase_modelo.human_attribute_name(campo.to_sym).downcase}",
-                     nil]
-      end
-
-      default = parametros_controller[campo].nil? ? nil : parametros_controller[campo]
       content_tag :div, class: 'col-auto' do
         content_tag :div, class: 'filter' do
           if multiple
-            select_tag campo, options_for_select(map, default), multiple: true,
-                                                                class: 'form-select form-select-sm selectize pg-input-lg'
+            @form.select campo, map, { multiple: true }, 'data-controller': 'selectize',
+                                                         class: 'form-select form-select-sm pg-input-lg'
           else
-            select_tag campo, options_for_select(map, default),
-                       class: 'form-select form-select-sm chosen-select pg-input-lg'
+            campo = campo.to_s + '_id_in'
+            placeholder = ransack_placeholder(campo)
+            @form.select campo, map, { multiple: true }, placeholder:, 'data-controller': 'selectize',
+                                                         class: 'form-control form-control-sm pg-input-lg'
           end
         end
       end
     end
 
     def filtro_select(campo, placeholder = '')
-      map = @clase_modelo.send(campo).values.map do |key|
+      map = @clase_modelo.send(sin_sufijo(campo)).values.map do |key|
         [I18n.t("#{@clase_modelo.to_s.underscore}.#{campo}.#{key}", default: key.humanize),
          key.value]
       end
-      unless @filtros[campo.to_sym].present? && @filtros[campo.to_sym][:include_blank] == false
-        map.unshift ["Seleccionar #{placeholder.downcase}",
-                     nil]
-      end
-      default = parametros_controller[campo].nil? ? nil : parametros_controller[campo]
       content_tag :div, class: 'col-auto' do
         content_tag :div, class: 'filter' do
-          select_tag campo, options_for_select(map, default), class: 'form-select form-select-sm pg-input-lg'
+          placeholder = ransack_placeholder(campo)
+          @form.select(campo, map, { multiple: true }, placeholder:, class: 'form-control form-control-sm pg-input-lg', 'data-controller': 'selectize')
         end
       end
     end
 
+    # DEPRECADO
     def filtro_select_custom(campo, placeholder = '')
       map = @filtros[campo.to_sym][:opciones]
       unless @filtros[campo.to_sym].present? && @filtros[campo.to_sym][:include_blank] == false
@@ -306,8 +302,9 @@ module PgEngine
     def filtro_texto(campo, placeholder = '')
       content_tag :div, class: 'col-auto' do
         content_tag :div, class: 'filter' do
-          text_field_tag(
-            campo, parametros_controller[campo], class: 'form-control form-control-sm allow-enter-submit', placeholder:, autocomplete: 'off'
+          placeholder = ransack_placeholder(campo)
+          @form.search_field(
+            campo, class: 'form-control form-control-sm allow-enter-submit', placeholder:, autocomplete: 'off'
           )
         end
       end
@@ -330,14 +327,19 @@ module PgEngine
     def filtro_fecha(campo, placeholder = '')
       content_tag :div, class: 'col-auto' do
         content_tag :div, class: 'filter' do
+          placeholder = ransack_placeholder(campo)
           label_tag(nil, placeholder, class: 'text-body-secondary') +
-            date_field_tag(
-              campo, parametros_controller[campo], class: 'form-control form-control-sm d-inline-block w-auto ms-1', placeholder:, autocomplete: 'off'
+            @form.date_field(
+              campo, class: 'form-control form-control-sm d-inline-block w-auto ms-1', placeholder:, autocomplete: 'off'
             )
         end
       end
     end
 
+    def ransack_placeholder(campo)
+      @form.object.translate(campo, include_associations: true)
+    end
+
     def parametros_controller
       params
     end

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

@@ -3,37 +3,34 @@
   - @actions&.each do |link_args|
     = link_to(*link_args)
   - if @filtros.present?
-    button.btn.btn-sm.btn-outline-primary[
-      type="button" data-bs-toggle="collapse"
-      data-bs-target="#filtros" aria-expanded="#{any_filter? ? 'true' : 'false'}"
-      aria-controls="filtros" data-controller="filtros" data-expanded-text="Ocultar filtros"
-    ]
-      span.bi.bi-funnel-fill
-      span.d-none.d-sm-inline
-        | &nbsp
-        span.text Filtrar
+    - 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
     .ms-1
   = @clase_modelo.new.decorate.new_link
 
-- if @filtros.present?
-  .collapse.border-bottom#filtros class="#{ 'show' if any_filter? }"
+- if @filtros.present? && show_filters?
+  .border-bottom#filtros
     .d-flex.align-items-center.p-2
       .px-2.d-none.d-sm-inline-block
         span.bi.bi-funnel-fill
-      = form_tag nil, class: '', method: :get do
+      = search_form_for @q, url: namespaced_path(@clase_modelo) do |f|
         .row.g-1
-          = @filtros.filtros_html
-          .col-auto
+          = @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
-          .col-auto
-            = link_to namespaced_path(@clase_modelo, clean: true),
+            = link_to namespaced_path(@clase_modelo, mostrar_filtros: 1),
                       class: 'btn btn-sm btn-secondary col-auto' do
               | Limpiar
-
 div
   - if @collection.any?
     .table-responsive
@@ -67,7 +64,7 @@ div
       = t(i18n_key, default: :'.empty_but_filtered', model: @clase_modelo.nombre_plural.downcase)
       | :
       span.ms-2
-      = link_to namespaced_path(@clase_modelo, clean: true) do
+      = link_to namespaced_path(@clase_modelo, mostrar_filtros: 1) do
         | Limpiar búsqueda
   - else
     - i18n_key = "#{controller_key}.#{action_name}.index.empty"

data/pg_engine/config/locales/es.yml

@@ -1,4 +1,9 @@
 es:
+  ransack:
+    predicates:
+      cont: ''
+      in: ''
+      eq: ''
   pg_engine:
     base:
       index:

data/pg_layout/app/javascript/controllers/filtros_controller.js

@@ -1,5 +1,7 @@
 import { Controller } from '@hotwired/stimulus'
 
+// DEPRECATED.
+//
 // Connects to data-controller="switcher"
 export default class extends Controller {
   originalText = null

data/pg_layout/app/javascript/controllers/index.js

@@ -8,6 +8,7 @@ import ClearTimeoutController from './clear_timeout_controller'
 import SwitcherController from './switcher_controller'
 import FiltrosController from './filtros_controller'
 import NotificationsController from './notifications_controller'
+import SelectizeController from './selectize_controller'
 
 application.register('navbar', NavbarController)
 application.register('nested', NestedController)
@@ -17,5 +18,6 @@ application.register('clear-timeout', ClearTimeoutController)
 application.register('switcher', SwitcherController)
 application.register('filtros', FiltrosController)
 application.register('notifications', NotificationsController)
+application.register('selectize', SelectizeController)
 
 // TODO: testear con capybara todo lo que se pueda

data/pg_layout/app/javascript/controllers/selectize_controller.js

@@ -0,0 +1,10 @@
+import { Controller } from '@hotwired/stimulus'
+import TomSelect from 'tom-select'
+
+// Connects to data-controller="selectize"
+export default class extends Controller {
+  connect () {
+    /* eslint no-new: 0 */
+    new TomSelect(this.element)
+  }
+}

data/pg_layout/app/views/layouts/pg_layout/base.html.slim

@@ -74,6 +74,7 @@ html
             = render FlashContainerComponent.new
             / TODO: si hay varios flashes toast, se superponen. habría que
                     hacer un container con position absolute para los toasts
+          / FIXME: el yield(filtros)
           = content
           div style="width:100%; height: 10em"
           = render partial: 'layouts/footer'

data/pg_rails/lib/version.rb

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

data/pg_rails/scss/pg_rails.scss

@@ -39,7 +39,20 @@ $alert-margin-bottom:           0.5rem;
 @import 'bootstrap-icons/font/bootstrap-icons';
 
 @import 'trix/dist/trix';
+@import 'tom-select/dist/scss/tom-select.bootstrap5';
 
+.ts-control {
+  padding-top: 2px!important;
+  padding-bottom: 2px!important;
+  display: flex;
+  gap: 4px;
+}
+.input-group-sm > .ts-wrapper.multi.has-items .ts-control, .ts-wrapper.form-select-sm.multi.has-items .ts-control, .ts-wrapper.form-control-sm.multi.has-items .ts-control {
+	padding-top: 2px!important;
+}
+.ts-wrapper.multi .ts-control > div {
+	margin: 0!important;
+}
 $warning-border-emphasis:   shade-color($yellow, 60%);
 .bg-primary-subtle .btn-warning {
   border: 1px solid $warning-border-emphasis;

data/pg_scaffold/lib/generators/pg_scaffold/templates/controller.rb

@@ -26,6 +26,7 @@ class <%= controller_class_name.split('::').last %>Controller < <%= parent_contr
   end
 
   def atributos_para_buscar
+    # FIXME: append _cont
     %i[<%= atributos_a_filtrar.map(&:name).join(' ') %>]
   end
 

data/pg_scaffold/lib/generators/pg_slim/templates/index.html.slim

@@ -9,7 +9,8 @@
   = @clase_modelo.new.decorate.new_link
   .ms-1
   = @clase_modelo.new.decorate.export_link(request.url)
-.collapse.p-2.border-bottom#filtros class="#{ 'show' if any_filter? }"
+/ FIXME: update
+.collapse.p-2.border-bottom#filtros class="#{ 'show' if show_filters? }"
   .d-flex.align-items-center
     .px-2.d-none.d-sm-inline-block
       span.bi.bi-funnel-fill
@@ -20,7 +21,7 @@
           = button_tag class: 'btn btn-sm btn-primary col-auto' do
             span.bi.bi-search
         .col-auto
-          = link_to <%= plural_route_name %>_path(clean: true),
+          = link_to <%= plural_route_name %>_path(mostrar_filtros: true),
                     class: 'btn btn-sm btn-secondary col-auto' do
             | Limpiar
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.1.1.pre.5
+  version: 7.1.1.pre.6
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-22 00:00:00.000000000 Z
+date: 2024-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -814,6 +814,7 @@ files:
 - pg_layout/app/javascript/controllers/nested_controller.js
 - pg_layout/app/javascript/controllers/notifications_controller.js
 - pg_layout/app/javascript/controllers/pg_form_controller.js
+- pg_layout/app/javascript/controllers/selectize_controller.js
 - pg_layout/app/javascript/controllers/switcher_controller.js
 - pg_layout/app/javascript/utils/cookies.js
 - pg_layout/app/javascript/utils/utils.ts