pg_rails 7.1.13 → 7.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a90a7a62e376e482f5e3c072c38f859478a7a333d606de01c8d5481cefd8fb5
-  data.tar.gz: ec85008cd9234bb9c7435ca6838af3ca380c2f34c43fb80bd30e9d2608d2dfc6
+  metadata.gz: 266cfada8ad43cc522e6208107c12715f29ac0393c93154046d377f0ca434598
+  data.tar.gz: 1fec4b327371b492aa75ec6640b7c9a85f93afceb7d89074aec369f67f85cb11
 SHA512:
-  metadata.gz: 9039afd99e6a910e4e1a47c125e8285992360d1979836a0d7df1c1f9f4b0837ee4bf8b5d266384998cabcc765dfe8bd4b0fa96143ba9baa58946b4697e97addd
-  data.tar.gz: c2b42d1565fc804d2ef3015c197820abc54a8425d66d27f6b57f21a768779ceab9ade935dfefb85db8016bcce98988f3378b9bb1cf99a4dfc0f223a335b0a046
+  metadata.gz: a985cde74ba0a65f4f234d0b5648cf7465291dfcd16da6d92ea9d3a1b62c1bb8a9a0c70a4936dcf7bbf679b2f8b6d8ba56b3a9e8bdf8133e3d81b8e5d28a9941
+  data.tar.gz: 9213cd8758d1f4ea9a9ead1c5f0aa8ba26e67cb83ec2a643e7635a0e6ce37caa02e722f174b5b5b10ecfac6f65eb386d0356e8f54bb12c9e34bc91552fb8bed9

data/pg_associable/app/javascript/modal_controller.js

@@ -32,7 +32,7 @@ export default class extends Controller {
 
   disconnect (e) {
     this.modalPuntero.hide()
-    this.element.dispatchEvent(new Event('hidden.bs.modal'))
+    document.dispatchEvent(new Event('hidden.bs.modal'))
     this.modalPuntero.dispose()
   }
 }

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

@@ -3,11 +3,12 @@
     .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|
+      = helpers.search_form_for @q, url: url_for, html: { 'data-turbo-action': :advance } do |f|
         .row.g-1
           .col
             .row.g-1
               = @builder.filtros_html(form: f)
+              = @extra_fields
           .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

data/pg_engine/app/components/search_bar_component.rb

@@ -7,4 +7,8 @@ class SearchBarComponent < ViewComponent::Base
 
     super
   end
+
+  def extra_fields(&)
+    @extra_fields = capture(&)
+  end
 end

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

@@ -22,7 +22,8 @@ module Admin
     def create
       saved = false
       ActiveRecord::Base.transaction do
-        # FIXME: acá la transaction jode porque el ActiveJob no puede deserializar el Email
+        # TODO: acá la transaction jode porque el ActiveJob no puede deserializar el Email
+        # Con rails 7.2 esto se debería arreglar
         if (saved = @email.save)
           PgEngine::AdminMailer.with(email_object: @email).admin_mail.deliver_later
         end

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

@@ -162,9 +162,14 @@ module PgEngine
     def pg_respond_show(object = nil)
       object ||= instancia_modelo
       if params[:modal].present?
-        render turbo_stream: turbo_stream.append_all(
-          'body', partial: 'pg_layout/modal_show', locals: { object: }
-        )
+        respond_to do |format|
+          format.html
+          format.turbo_stream do
+            render turbo_stream: turbo_stream.append_all(
+              'body', partial: 'pg_layout/modal_show', locals: { object: }
+            )
+          end
+        end
       else
         respond_to do |format|
           format.json { render json: object }

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

@@ -91,11 +91,12 @@ module PgEngine
       end
 
       if Current.user.present?
+        # TODO: quitar el limit 3, discard en events
         @notifications = Current.user.notifications.order(id: :desc).includes(:event)
                                 .where(type: 'SimpleUserNotifier::Notification')
+                                .limit(3)
         unseen = @notifications.unseen.any?
-        # FIXME: testear y fixear, buscar el primero que esté present
-        tooltip = @notifications.unseen.map(&:tooltip).first
+        tooltip = @notifications.unseen.map(&:tooltip).select(&:presence).first
         @notifications_bell = NotificationsBellComponent.new(
           unseen:,
           tooltip:

data/pg_engine/spec/components/previews/alert_component_preview/tooltips.html.slim

@@ -1 +1 @@
-span#tooltip data-bs-toggle="tooltip" data-bs-title="El tooltip" las cosas
+span#tooltip data-controller="tooltip" data-bs-title="El tooltip" las cosas

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

@@ -1,16 +1,6 @@
 import * as bootstrap from 'bootstrap'
 
-document.addEventListener('turbo:load', bindTooltips)
-document.addEventListener('turbo:render', bindTooltips)
-
-const tooltipsQuery = '[data-bs-toggle="tooltip"]'
-
-function bindTooltips () {
-  const toastElList = document.querySelectorAll(tooltipsQuery)
-  Array.from(toastElList).map(tooltipEl => {
-    return new bootstrap.Tooltip(tooltipEl)
-  })
-}
+const tooltipsQuery = '[data-controller="tooltip"]'
 
 document.addEventListener('show.bs.tooltip', (ev) => {
   const toastElList = document.querySelectorAll(tooltipsQuery)

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

@@ -10,6 +10,7 @@ import FiltrosController from './filtros_controller'
 import NotificationsController from './notifications_controller'
 import SelectizeController from './selectize_controller'
 import ThemeController from './theme_controller'
+import TooltipController from './tooltip_controller'
 
 application.register('navbar', NavbarController)
 application.register('nested', NestedController)
@@ -21,5 +22,6 @@ application.register('filtros', FiltrosController)
 application.register('notifications', NotificationsController)
 application.register('selectize', SelectizeController)
 application.register('theme', ThemeController)
+application.register('tooltip', TooltipController)
 
 // TODO: testear con capybara todo lo que se pueda

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

@@ -0,0 +1,28 @@
+import { Controller } from '@hotwired/stimulus'
+import * as bootstrap from 'bootstrap'
+
+export default class extends Controller {
+  tooltip = null
+
+  connect () {
+    if (this.element.dataset.bsTrigger === 'contextmenu') {
+      this.element.addEventListener('contextmenu', (ev) => {
+        ev.preventDefault()
+        if (!this.tooltip) {
+          this.tooltip = new bootstrap.Tooltip(this.element, {
+            trigger: 'focus'
+          })
+          this.tooltip.show()
+        }
+      })
+    } else {
+      this.tooltip = new bootstrap.Tooltip(this.element)
+    }
+  }
+
+  disconnect () {
+    if (this.tooltip) {
+      this.tooltip.dispose()
+    }
+  }
+}

data/pg_rails/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.1.13
+  version: 7.1.15
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-12 00:00:00.000000000 Z
+date: 2024-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -839,6 +839,7 @@ files:
 - pg_layout/app/javascript/controllers/selectize_controller.js
 - pg_layout/app/javascript/controllers/switcher_controller.js
 - pg_layout/app/javascript/controllers/theme_controller.js
+- pg_layout/app/javascript/controllers/tooltip_controller.js
 - pg_layout/app/javascript/utils/cookies.js
 - pg_layout/app/javascript/utils/utils.ts
 - pg_layout/app/lib/navbar.rb