pg_rails 7.6.31 → 7.6.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b315989e816d61e3a75b72845fc50ab94b4393b538f208c43cfcd6ff078a9bf
-  data.tar.gz: 66b62128b94690c25f37213bc6f4b2958b2218c3d001ae2f1a664f694dfe0efc
+  metadata.gz: 6d75733bf10e7940a7914ee54582c39139416f47cd224f434a4ba1908ff31eb7
+  data.tar.gz: 7f1d1c1487db6d3973584d9e6ee2469de9487602ef3bc72e14b13be1db8baa09
 SHA512:
-  metadata.gz: b1092c6d4cceb0201e86b490124eebab80d3303da02e01c26f185ccaab629950d7f5c6ac069904079e3e243987a9e09d743a778dd207328d4a6033db71e3a95e
-  data.tar.gz: 94f283edbc6474c4fffcec0045e66af213e3ac698e5f4ba1293a9d373892651ffaec3ba54600d0e0e5352358b704eda07452a9d9791f6119194f3158e46aa58c
+  metadata.gz: df27b04686fb2bc10de1250bb59c14fc362cedfa6eb8cfcb3d397235726539ac33ba9cc03b12db9e0080b0eb0fe38d06eb9c59e2cd4aa9e9082dbe57f47aa6e0
+  data.tar.gz: f7aaf775879bc4b4a675f4c485c641eb815a00b89e203e6fd2dc1aff686b6ae489e341d8e71b50e330cadf91347be17a48edb3abf4edec907f08fd3c8c918ed5

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

@@ -22,8 +22,8 @@ $values: 0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100;
   }
 }
 
-// Table row clickable
-// .listado tr:has(td:hover):has(.bi-eye-fill) td {
-// 	background-color: #f2f2f2;
-// 	cursor: pointer;
-// }
+// Table row clickable (bindListingClick)
+.listado tr:has(td:hover):has(.bi-eye-fill):not(:has(.actions-wrapper:hover)):not(:has(a:hover)):not(:has(.inline-edit:hover)) td {
+	background-color: #f2f2f2;
+	cursor: pointer;
+}

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

@@ -0,0 +1,19 @@
+#bulk_form style="max-width: 40em"
+  - @attributes.each do |attr|
+    - active = @active_fields.present? && @active_fields.include?(attr.to_s)
+    .row
+      .col-auto
+        .form-check.form-check-lg
+          = check_box_tag 'active_fields[]', attr, active, class: 'form-check-input', \
+                      data: { controller: 'bulk-edit-field-activator' }
+      .col
+        - attr = attr.to_s.gsub(/_id$/, '')
+        / html5 solo aplica a datetime
+        / date_selector solo aplica a date
+        / ignore_date y prompt solo aplica a time
+        / cada caso es inocuo para el resto de los types
+        = @f.field attr, disabled: !active, date_selector: true, minute_step: 15,
+                         ignore_date: true, prompt: { hour: 'hh', minute: 'mm' }
+  p
+    = @f.button :submit, 'Confirmar'
+    = @f.button :button, 'refresh', class: 'd-none', name: 'refresh', value: '1'

data/pg_engine/app/components/bulk_edit_component.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class BulkEditComponent < BaseComponent
+  def initialize(clase_modelo, params:, form: nil)
+    @clase_modelo = clase_modelo
+    @attributes = @clase_modelo.bulky_attributes
+    @key = @clase_modelo.model_name.param_key
+    @model = if params[@key].present?
+               attrs = @clase_modelo.bulky_attributes.select { |bk| bk.to_s.in?(params[:active_fields] || []) }
+               @clase_modelo.new(params[@key].permit(attrs))
+             else
+               @clase_modelo.new
+             end
+    @active_fields = params[:active_fields]
+    @f = form
+
+    super
+  end
+
+  def before_render
+    @f ||= PgFormBuilder.new(@key, @model, view_context, {}) # rubocop:disable Naming/MemoizedInstanceVariableName
+  end
+end

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

@@ -27,6 +27,8 @@ module PgEngine
       clazz.helper_method :column_options_for
       clazz.helper_method :instancia_modelo
 
+      # clazz.skip_before_action :save_and_load_filters, only: [:bulk_edit, :bulk_update]
+
       clazz.before_action do
         # TODO: quitar esto, que se use el attr_accessor
         #       o sea, quitar todas las referencias a @clase_modelo
@@ -229,6 +231,63 @@ module PgEngine
     def restore
       discard_undiscard(:undiscard)
     end
+
+    def set_session_key_identifier
+      return unless action_name.in?(%w[index bulk_edit bulk_update])
+
+      ::RansackMemory::Core.config[:session_key_format]
+                           .gsub('%controller_name%', controller_path.parameterize.underscore)
+                           .gsub('%action_name%', 'index')
+                           .gsub('%request_format%', request.format.symbol.to_s)
+                           .gsub('%turbo_frame%', request.headers['Turbo-Frame'] || 'top')
+    end
+
+    def bulk_edit
+      # @no_main_frame = true
+
+      @collection = filtros_y_policy(atributos_para_buscar, default_sort)
+      @ids = @collection.map(&:to_key).join(',')
+      @form_target = [:bulk_update, pg_namespace, nested_record, @clase_modelo].compact
+      @model = @clase_modelo.new
+
+      render 'bulk_edit'
+    end
+
+    def bulk_update
+      if params[:refresh].present?
+        bulk_component = BulkEditComponent.new(@clase_modelo, params:)
+        render turbo_stream: turbo_stream.replace('bulk_form', bulk_component)
+
+        return
+      end
+      # params = params.delete_if { |k,v| v.empty? or Hash === v && delete_blank(v).empty? }
+
+      # TODO: test
+      # :nocov:
+      if params[:ids].blank?
+        flash[:alert] = I18n.t('pg_engine.base.index.bulk_edit.blank_ids', model: @clase_modelo)
+        flash[:toast] = true
+        render turbo_stream: render_turbo_stream_flash_messages
+        return
+      end
+
+      key = @clase_modelo.model_name.param_key
+      unless params[key].is_a?(ActionController::Parameters)
+        flash[:alert] = I18n.t('pg_engine.base.index.bulk_edit.bulk_not_hash')
+        flash[:toast] = true
+        render turbo_stream: render_turbo_stream_flash_messages
+        return
+      end
+      # :nocov:
+
+      ids = params[:ids]
+
+      target = [pg_namespace, nested_record, @clase_modelo].compact
+      Bulky.enqueue_update(@clase_modelo, ids, params[key])
+      redirect_to target, notice: I18n.t('pg_engine.base.index.bulk_edit.enqueue_update')
+
+      # FIXME: revisar cuando es embedded index
+    end
     # End public endpoints
 
     protected

data/pg_engine/app/helpers/pg_engine/flash_helper.rb

@@ -2,9 +2,9 @@ module PgEngine
   module FlashHelper
     def render_turbo_stream_flash_messages(to: nil)
       if to.present?
-        turbo_stream.prepend_all to, partial: 'pg_layout/flash'
+        turbo_stream.append_all to, partial: 'pg_layout/flash'
       else
-        turbo_stream.prepend 'flash', partial: 'pg_layout/flash'
+        turbo_stream.append 'flash', partial: 'pg_layout/flash'
       end
     end
 

data/pg_engine/app/models/pg_engine/base_record.rb

@@ -5,6 +5,7 @@ module PgEngine
   class BaseRecord < ActiveRecord::Base
     # rubocop:enable Rails/ApplicationRecord
     extend Enumerize
+    extend Bulky::Model
     include PrintHelper
     include PostgresHelper
     include Naming

data/pg_engine/app/policies/pg_engine/base_policy.rb

@@ -37,6 +37,14 @@ module PgEngine
       puede_editar? && !record_discarded?
     end
 
+    def bulk_edit?
+      bulk_update?
+    end
+
+    def bulk_update?
+      record.respond_to?(:bulky_attributes) && record.bulky_attributes.present?
+    end
+
     def edit?
       update?
     end

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

@@ -0,0 +1,27 @@
+h3 = t('pg_engine.base.index.bulk_edit.title', model: @clase_modelo)
+
+- if @filtros.present?
+  = render SearchBarComponent.new(@q, @filtros)
+  .py-2
+= pg_form_for @model, url: url_for(@form_target), html: { method: :put } do |f|
+  .row
+    .col-auto
+      p.text-center.fw-bold
+        = t('pg_engine.base.index.bulk_edit.count', model: @clase_modelo, count: @collection.count)
+      table.table style="min-width: 20em"
+        - @collection.each do |model|
+          tr
+            td style="width: 1em"
+              .form-check.xform-check-lg
+                = check_box_tag 'ids[]', model.to_key, true, class: 'form-check-input'
+            td
+              = link_to model, model.decorate.object_url, target: :_blank, rel: :noopener
+              / = hidden_field_tag 'ids[]', model.to_key
+    .col.border-start
+      = render BulkEditComponent.new(@clase_modelo, params:, form: f)
+
+css:
+  .form-check-lg .form-check-input {
+    width: 1.5em;
+    height: 1.5em;
+  }

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

@@ -23,6 +23,12 @@
         li = render SearchBarTogglerComponent.new
       - unless @export_link == false
         li = @clase_modelo.new.decorate.export_link(request.url, text: 'Exportar en excel')
+      - if policy(clase_modelo).bulk_edit? && action_name != 'archived'
+        li = link_to url_for([:bulk_edit, pg_namespace, nested_record,
+                              @clase_modelo].compact) + '?' + request.query_string,
+                              class: 'icon-link dropdown-item' do
+          i.bi.bi-pencil.lh-1
+          = t('pg_engine.base.index.bulk_edit.link', model: clase_modelo)
 
 - if action_name == 'archived'
   .text-center.p-3.text-warning-emphasis.border-bottom

data/pg_engine/config/locales/es.rb

@@ -5,10 +5,13 @@ module PgEngine
         male = options[:model].gender == 'm'
         model_plural = options[:model].nombre_plural
         model_singular = options[:model].nombre_singular
+        pluralized_model = options[:count].present? && options[:count] > 1 ? model_plural : model_singular
         text.gsub(/^%{plural_model}/, model_plural)
             .gsub(/^%{singular_model}/, model_singular)
+            .gsub(/^%{pluralized_model}/, pluralized_model)
             .gsub('%{plural_model}', model_plural.downcase)
             .gsub('%{singular_model}', model_singular.downcase)
+            .gsub('%{pluralized_model}', pluralized_model.downcase)
             .gsub(/%{genderize\((?<female>(?:(?!%{).)+),(?<male>(?:(?!%{).)+)\)}/, male ? '\k<male>' : '\k<female>' )
       end
     end
@@ -36,7 +39,15 @@ end
           },
           youre_in_archived_index: PgEngine::I18nRules.rule("Estás viendo el listado de %{plural_model} %{genderize(archivadas,archivados)}"),
           see_archived: PgEngine::I18nRules.rule("%{plural_model} %{genderize(archivadas,archivados)}"),
-          back_to_index: 'Volver al listado principal'
+          back_to_index: 'Volver al listado principal',
+          bulk_edit: {
+            enqueue_update: "Modificación en proceso (podría demorar algunos segundos en completarse)",
+            blank_ids: PgEngine::I18nRules.rule("No hay %{genderize(ninguna,ningún)} %{singular_model} seleccionada"),
+            bulk_not_hash: "Debés seleccionar al menos un campo",
+            title: PgEngine::I18nRules.rule("Modificación masiva de %{plural_model}"),
+            link: PgEngine::I18nRules.rule("Modificar masivamente"),
+            count: PgEngine::I18nRules.rule("%{count} %{pluralized_model} en total"),
+          }
         }
       }
     }

data/pg_engine/lib/pg_engine/active_job_extensions.rb

@@ -2,12 +2,14 @@ module PgEngine
   module ActiveJobExtensions
     def serialize
       super.merge(
-        'app_name' => ::Current.app_name
+        'app_name' => ::Current.app_name,
+        'user_id' => ::Current.user&.id
       )
     end
 
     def deserialize(job_data)
       ::Current.app_name = job_data.delete('app_name')
+      ::Current.user = User.find(job_data.delete('user_id')) if job_data['user_id'].present?
 
       super
     end

data/pg_engine/lib/pg_engine/route_helpers.rb

@@ -9,6 +9,8 @@ module PgEngine
         collection do
           get :archived
           get :abrir_modal
+          get :bulk_edit
+          put :bulk_update
           post :buscar
         end
         yield if block_given?

data/pg_engine/spec/components/bulk_edit_component_spec.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe BulkEditComponent, type: :component do
+  pending "add some examples to (or delete) #{__FILE__}"
+
+  # it "renders something useful" do
+  #   expect(
+  #     render_inline(described_class.new(attr: "value")) { "Hello, components!" }.css("p").to_html
+  #   ).to include(
+  #     "Hello, components!"
+  #   )
+  # end
+end

data/pg_engine/spec/system/bulk_edit_spec.rb

@@ -0,0 +1,37 @@
+# Initially generated with PgRails::SystemSpecGenerator
+# https://github.com/martin-rosso/pg_rails
+
+require 'rails_helper'
+
+# By default uses selenium_chrome_headless_iphone driver
+# run with DRIVER & BROWSER environment variables to override, eg:
+#
+# DRIVER=selenium BROWSER=firefox rspec
+describe 'Bulk edit' do
+  subject(:visitar) do
+    visit '/u/t/cosas'
+  end
+
+  let(:logged_user) { create :user, :owner }
+  let(:account) { ActsAsTenant.current_tenant }
+
+  before do
+    login_as logged_user
+    create_list :cosa, 2
+  end
+
+  describe 'bulk edit' do
+    it do
+      visitar
+      page.find('[data-bs-title="Más opciones"]').click
+      click_on 'Modificar masivamente'
+      page.find('input[value=nombre]').click
+      page.find_by_id('cosa_nombre').set('Nuevo valor')
+      page.find('input[value=tipo]').click
+      page.find_by_id('cosa_tipo').set('completar')
+      click_on 'Confirmar'
+      # expect(Cosa.pluck(:nombre)).to eq ["Nuevo valor", "Nuevo valor"]
+      expect(page).to have_text 'Modificación en proceso'
+    end
+  end
+end

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

@@ -7,23 +7,24 @@ import './tooltips'
 import 'trix'
 import '@rails/actiontext'
 
-// function bindListingClick () {
-//   document.body.onclick = (ev) => {
-//     if (ev.target.closest('a')) return
-//     if (ev.target.closest('.listado')) {
-//       const row = ev.target.closest('tr')
-//       if (row) {
-//         const show = row.querySelector('.bi-eye-fill')
-//         if (show) {
-//           const link = show.closest('a')
-//           if (link) {
-//             link.click()
-//           }
-//         }
-//       }
-//     }
-//   }
-// }
-// bindListingClick()
-// document.addEventListener('turbo:load', bindListingClick)
-// document.addEventListener('turbo:render', bindListingClick)
+function bindListingClick () {
+  document.body.onclick = (ev) => {
+    if (ev.target.closest('a')) return
+    if (ev.target.closest('.inline-edit')) return
+    if (ev.target.closest('.listado')) {
+      const row = ev.target.closest('tr')
+      if (row) {
+        const show = row.querySelector('.bi-eye-fill')
+        if (show) {
+          const link = show.closest('a')
+          if (link) {
+            link.click()
+          }
+        }
+      }
+    }
+  }
+}
+bindListingClick()
+document.addEventListener('turbo:load', bindListingClick)
+document.addEventListener('turbo:render', bindListingClick)

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

@@ -0,0 +1,10 @@
+import { Controller } from '@hotwired/stimulus'
+
+// Connects to data-controller="bulk-edit-field-activator"
+export default class extends Controller {
+  connect () {
+    this.element.addEventListener('change', function (ev) {
+      ev.target.closest('form').querySelector('button[name=refresh]').click()
+    })
+  }
+}

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

@@ -15,6 +15,7 @@ import PopoverController from './popover_controller'
 import PopoverTogglerController from './popover_toggler_controller'
 import DateSelectorController from './date_selector_controller'
 import EmbeddedFrameController from './embedded_frame_controller'
+import BulkEditFieldActivator from './bulk_edit_field_activator'
 
 application.register('navbar', NavbarController)
 application.register('nested', NestedController)
@@ -31,5 +32,6 @@ application.register('popover', PopoverController)
 application.register('popover-toggler', PopoverTogglerController)
 application.register('date-selector', DateSelectorController)
 application.register('embedded-frame', EmbeddedFrameController)
+application.register('bulk-edit-field-activator', BulkEditFieldActivator)
 
 // TODO: testear con capybara todo lo que se pueda

data/pg_rails/lib/version.rb

@@ -2,6 +2,6 @@
 
 # :nocov:
 module PgRails
-  VERSION = '7.6.31'
+  VERSION = '7.6.32'
 end
 # :nocov:

data/pg_scaffold/lib/generators/pg_rails/system_spec/templates/system_spec.rb

@@ -4,9 +4,9 @@
 require 'rails_helper'
 
 # By default uses selenium_chrome_headless_iphone driver
-# run with DRIVER environment variable to override, eg:
+# run with DRIVER & BROWSER environment variables to override, eg:
 #
-# DRIVER=selenium rspec
+# DRIVER=selenium BROWSER=firefox rspec
 describe '<%= name %>' do
   subject(:visitar) do
     visit 'some url'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.31
+  version: 7.6.32
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-02-27 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -698,6 +698,8 @@ files:
 - pg_engine/app/components/bad_request_component.rb
 - pg_engine/app/components/bad_user_input_component.rb
 - pg_engine/app/components/base_component.rb
+- pg_engine/app/components/bulk_edit_component.html.slim
+- pg_engine/app/components/bulk_edit_component.rb
 - pg_engine/app/components/date_selector_component.html.slim
 - pg_engine/app/components/date_selector_component.rb
 - pg_engine/app/components/flash_container_component.rb
@@ -824,6 +826,7 @@ files:
 - pg_engine/app/views/layouts/_logo.html.slim
 - pg_engine/app/views/layouts/action_text/contents/_content.html.erb
 - pg_engine/app/views/pg_engine/admin_mailer/admin_mail.html.slim
+- pg_engine/app/views/pg_engine/base/bulk_edit.html.slim
 - pg_engine/app/views/pg_engine/base/download.xlsx.axlsx
 - pg_engine/app/views/pg_engine/base/edit.html.slim
 - pg_engine/app/views/pg_engine/base/index.html.slim
@@ -896,6 +899,7 @@ files:
 - pg_engine/lib/pg_engine/utils/ssl_verifier.rb
 - pg_engine/lib/tasks/auto_anotar_modelos.rake
 - pg_engine/spec/components/alert_component_spec.rb
+- pg_engine/spec/components/bulk_edit_component_spec.rb
 - pg_engine/spec/components/internal_error_component_spec.rb
 - pg_engine/spec/components/previews/alert_component_preview.rb
 - pg_engine/spec/components/previews/alert_component_preview/colours.html.slim
@@ -963,6 +967,7 @@ files:
 - pg_engine/spec/requests/users/user_accounts_spec.rb
 - pg_engine/spec/system/alerts_spec.rb
 - pg_engine/spec/system/breadcrumbs_spec.rb
+- pg_engine/spec/system/bulk_edit_spec.rb
 - pg_engine/spec/system/date_selector_spec.rb
 - pg_engine/spec/system/destroy_spec.rb
 - pg_engine/spec/system/login_spec.rb
@@ -987,6 +992,7 @@ files:
 - pg_layout/app/javascript/config/turbo_rails/progress_bar.js
 - pg_layout/app/javascript/config/turbo_rails/set_consumer.js
 - pg_layout/app/javascript/controllers/application.js
+- pg_layout/app/javascript/controllers/bulk_edit_field_activator.js
 - pg_layout/app/javascript/controllers/clear_timeout_controller.js
 - pg_layout/app/javascript/controllers/date_selector_controller.js
 - pg_layout/app/javascript/controllers/embedded_frame_controller.js