pg_rails 7.6.39 → 7.6.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2de59469aa32c2ef73f030ea848179b8941f67a1eb948b72b018cf2d9e7b1b95
-  data.tar.gz: 4311903fb7f15aa7b070e2ac36ff530bc6e4a7750ac011a7843d34a85921483e
+  metadata.gz: 64c0c348910ec6e2795eebf4add22342e4f99c1e0a190a9a8f37299b542c5804
+  data.tar.gz: d128c7801a01c1beb02c52c3033b90128a6a33e2a93737972f4475a18e7d0112
 SHA512:
-  metadata.gz: 37288f9d151624cb72e6c7567e6fdb875d91b5945baf3d66e045c640fa500d3ff3f1a90cbd6bd76aa898562c0c6b8f9d09aceddd287975f456af068b3310cee3
-  data.tar.gz: 63d8f3e1d03d521db97cae73cde5908342bbcd9dc44913289f516ee0c932b63fcdb6e626ed6a575556f04b651315293f7315b5d0e1ed69471f750dfa14fc2375
+  metadata.gz: 1561850b970f4c782facbdca1169edda0264795e3f67c7be1525a08bd4bb6405b2b43e57b54ba5d0e24d62423185b205f3e9491b98559da444515aa9e79d6a10
+  data.tar.gz: e57dfba1fbbe3adbbcf8019807bfd5cdddc3fc7a97a2081e381ab369ebf7b8c35cda2fcd97fa22af64c030140c5c51caa4fb257444fa4d662dbc4d2a85a6449c

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

@@ -23,7 +23,11 @@ $values: 0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100;
 }
 
 // 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 {
+.listado tr:has(td:hover):has(.bi-eye-fill):not(:has(.actions-wrapper:hover)):not(:has(a:hover)):not(:has(.inline-edit:hover)):not(:has(.inline-no-edit:hover)) td {
+	background-color: #f2f2f2;
+	cursor: pointer;
+}
+.listado tr:has(td:hover):has(.main-row-link):not(:has(.actions-wrapper:hover)):not(:has(a:hover)):not(:has(.inline-edit:hover)):not(:has(.inline-no-edit:hover)) td {
 	background-color: #f2f2f2;
 	cursor: pointer;
 }

data/pg_engine/app/components/inline_edit/inline_show_component.html.slim

@@ -14,4 +14,5 @@
       i.bi.bi-pencil
     span = @model.decorate.send(@attribute)
 - else
-  = @model.decorate.send(@attribute)
+  span.inline-no-edit
+    = @model.decorate.send(@attribute)

data/pg_engine/app/controllers/users/accounts_controller.rb

@@ -75,7 +75,7 @@ module Users
     end
 
     def atributos_para_listar
-      %i[nombre owner]
+      %i[logo_f nombre owner]
     end
   end
 end

data/pg_engine/app/decorators/account_decorator.rb

@@ -33,4 +33,12 @@ class AccountDecorator < PgEngine::BaseRecordDecorator
       end
     end
   end
+
+  def logo_f
+    if logo.present?
+      image_tag logo.variant(:thumb), style: 'max-height:3em'
+    else
+      content_tag 'i', nil, class: 'bi bi-bag-fill text-center d-inline-block', style: 'font-size: 1.7em; width: 1.6em'
+    end
+  end
 end

data/pg_engine/app/decorators/user_account_decorator.rb

@@ -15,7 +15,7 @@ class UserAccountDecorator < PgEngine::BaseRecordDecorator
     helpers.content_tag :span do
       h.link_to h.tenant_root_path(tid: object.to_param),
                 'data-turbo-frame': :_top,
-                class: 'btn btn-sm btn-primary' do
+                class: 'btn btn-sm btn-primary main-row-link' do
         '<i class="bi bi-box-arrow-in-right"></i> Ingresar'.html_safe
       end
     end

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

@@ -53,6 +53,8 @@
           tr
             th
             - atributos_para_listar.each do |att|
+              / TODO: poder configurar el ordenable en false
+              / Sería ideal hacer algo OOP, pero es medio bardo
               th.text-nowrap style="font-size: 0.8em" = encabezado att, ordenable: true
             - if action_name == 'archived'
               th.text-nowrap style="font-size: 0.8em" = encabezado :discarded_at, ordenable: true

data/pg_engine/app/views/users/accounts/index.html.slim

@@ -1,4 +1,10 @@
 - content_for(:container_class) { 'container border p-0 my-3' }
 - content_for(:container_style) { 'max-width: 50em; xborder-left: 1px solid grey' }
+- content_for(:padding_top_class) { 'pt-0' }
 
 = render template: 'pg_engine/base/index'
+
+css:
+  .listado {
+    vertical-align: middle;
+  }

data/pg_engine/app/views/users/accounts/show.html.slim

@@ -5,7 +5,7 @@
 .text-center
   .d-flex.justify-content-center.gap-2.align-items-center.m-3
     - if @account.logo.present?
-      = image_tag @account.logo, style: 'max-height:3em'
+      = image_tag @account.logo.variant(:thumb), style: 'max-height:3em'
     .fs-1
       = @account
 

data/pg_engine/config/locales/es.yml

@@ -187,6 +187,8 @@ es:
     attributes:
       account:
         owner: Administrado por
+        logo/scoped:
+          listado_header: ""
       user_account:
         membership_status: Estado
         user: Nombre

data/pg_layout/app/assets/stylesheets/sidebar.scss

@@ -54,13 +54,16 @@ $chevron-color: 200,200,200,.5;
 
 .navbar__nav-button[aria-expanded=true] {
   font-weight: bold;
+  background-color: tint-color($primary, 5%);
 }
 
 // Child entries
-#sidebar .collapse-inner {
-  background-color: tint-color($primary, 5%);
-  padding-bottom: 0.1em;
-  padding-top: 0.1em;
+#sidebar, .offcanvas {
+  .collapse-inner {
+    background-color: tint-color($primary, 5%);
+    padding-bottom: 0.1em;
+    padding-top: 0.1em;
+  }
 }
 
 // Los small-items están deprecados

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

@@ -11,14 +11,20 @@ function bindListingClick () {
   document.body.onclick = (ev) => {
     if (ev.target.closest('a')) return
     if (ev.target.closest('.inline-edit')) return
+    if (ev.target.closest('.inline-no-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()
+        const mainRowLink = row.querySelector('.main-row-link')
+        if (mainRowLink) {
+          mainRowLink.click()
+        } else {
+          const show = row.querySelector('.bi-eye-fill')
+          if (show) {
+            const link = show.closest('a')
+            if (link) {
+              link.click()
+            }
           }
         }
       }

data/pg_layout/app/lib/navbar.rb

@@ -77,7 +77,6 @@ class Navbar
 
   def any_children_active?(entry, request)
     entry[:children].any? { |child| active_entry?(child, request) }
-    # TODO: quitar
   end
 
   def hide_entry?(entry)

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

@@ -1,6 +1,8 @@
 - content_for :content do
   - klass = modal_targeted? ? '' : (yield(:container_class).presence || 'container-fluid')
-  div class="pt-3 #{klass}" style=yield(:container_style)
+  - padding_top_class = yield(:padding_top_class).presence || 'pt-3'
+
+  div class="#{padding_top_class} #{klass}" style=yield(:container_style)
     = content_for?(:containerized_content) ? yield(:containerized_content) : yield
 
 = render template: 'layouts/pg_layout/base'

data/pg_layout/app/views/pg_layout/_sidebar.html.slim

@@ -5,18 +5,19 @@ div id="sidebar" class="#{@navbar_opened_class} flex-shrink-0 d-none d-#{@breakp
     ul.list-unstyled.ps-0.mt-5
       - @navbar.sidebar.each do |entry|
         - next if @navbar.hide_entry?(entry)
+        - active = @navbar.active_entry?(entry, request)
         li.mb-1
           - if entry[:children].present?
             - entry_id = "nav-entry-#{entry[:orig_idx]}"
-            - active = @navbar.active_entry?(entry, request)
             a class="d-inline-flex text-decoration-none navbar__nav-button #{ active ? '' : 'collapsed'} #{entry[:attributes]}" data-bs-toggle="collapse" href="##{entry_id}" role="button" aria-expanded="#{ active ? 'true' : 'false'}" aria-controls=entry_id
               = entry[:title]
               - if active
-                span.bi.bi-chevron-down.ms-1 style="font-size: 0.7em"
+                span.bi.bi-chevron-down.ms-1.align-text-bottom style="font-size: 0.7em"
               - else
-                span.bi.bi-chevron-right.ms-1 style="font-size: 0.7em"
+                span.bi.bi-chevron-right.ms-1.align-text-bottom style="font-size: 0.7em"
 
-            .collapse data-turbo-temporary=('true' unless @navbar.active_entry?(entry, request)) class="#{ 'show' if @navbar.active_entry?(entry, request)}" id=entry_id
+            / data-turbo-temporary=('true' unless active)
+            .collapse class="#{ 'show' if active}" id=entry_id
               .collapse-inner
                 - entry[:children].each do |child|
                   - next if @navbar.hide_entry?(child)
@@ -24,5 +25,5 @@ div id="sidebar" class="#{@navbar_opened_class} flex-shrink-0 d-none d-#{@breakp
                     a href=child[:path] class="d-inline-flex text-decoration-none navbar__nav-button #{@navbar.active_entry?(child, request) ? 'active' : ''} #{child[:attributes]}"
                       = child[:title]
           - else
-            a href=entry[:path] class="d-inline-flex text-decoration-none navbar__nav-button #{@navbar.active_entry?(entry, request) ? 'active' : ''} #{entry[:attributes]}"
+            a href=entry[:path] class="d-inline-flex text-decoration-none navbar__nav-button #{active ? 'active' : ''} #{entry[:attributes]}"
               = entry[:title]

data/pg_layout/app/views/pg_layout/_sidebar_mobile.html.slim

@@ -9,9 +9,29 @@
       ul.list-unstyled.mt-4
         - @navbar.sidebar.each do |entry|
           - next if @navbar.hide_entry?(entry)
+          - active = @navbar.active_entry?(entry, request)
           li
-            a href=entry[:path] class="navbar__nav-button pe-4 text-light #{@navbar.active_entry?(entry, request) ? 'active' : ''} #{entry[:attributes]}"
-              = entry[:title]
+            - if entry[:children].present?
+              - entry_id = "nav-entry-#{entry[:orig_idx]}"
+
+              a class="d-inline-flex text-decoration-none navbar__nav-button text-light #{ active ? '' : 'collapsed'} #{entry[:attributes]}" data-bs-toggle="collapse" href="##{entry_id}" role="button" aria-expanded="#{ active ? 'true' : 'false'}" aria-controls=entry_id
+                = entry[:title]
+                - if active
+                  span.bi.bi-chevron-down.ms-1.align-text-bottom style="font-size: 0.7em"
+                - else
+                  span.bi.bi-chevron-right.ms-1.align-text-bottom style="font-size: 0.7em"
+
+              / data-turbo-temporary=('true' unless active)
+              .collapse class="#{ 'show' if active}" id=entry_id
+                .collapse-inner
+                  - entry[:children].each do |child|
+                    - next if @navbar.hide_entry?(child)
+                    .mb-1
+                      a href=child[:path] class="d-inline-flex text-decoration-none navbar__nav-button text-light #{@navbar.active_entry?(child, request) ? 'active' : ''} #{child[:attributes]}"
+                        = child[:title]
+            - else
+              a href=entry[:path] class="navbar__nav-button pe-4 text-light #{active ? 'active' : ''} #{entry[:attributes]}"
+                = entry[:title]
 css:
   .offcanvas a { text-decoration: none; }
   .offcanvas li { xmargin-top: 0.75em; }

data/pg_layout/app/views/pg_layout/_signed_in_links.html.slim

@@ -15,7 +15,13 @@ ul.navbar-nav.gap-3.align-items-center class="gap-#{@breakpoint_navbar_expand}-0
         - if @other_active_accounts&.any?
           h6.dropdown-header Cambiar a:
           - @other_active_accounts.each do |ua|
-            li = link_to ua.account, tenant_root_path(tid: ua.to_param), class: 'dropdown-item'
+            li
+              = link_to tenant_root_path(tid: ua.to_param), class: 'dropdown-item' do
+                - if ua.account.logo.present?
+                  span = image_tag ua.account.logo.variant(:thumb), class: 'rounded-circle border border-2 me-2', width: 40, height: 40
+                - else
+                  i.bi.bi-bag-fill.me-2.d-inline-block.text-center style="font-size: 1.7em; width: 1.6em"
+                span = ua.account
           li
             hr.dropdown-divider
         li = link_to "Administrar #{Account.nombre_plural.downcase}", users_accounts_path(tid: nil), class: 'dropdown-item'
@@ -27,7 +33,11 @@ ul.navbar-nav.gap-3.align-items-center class="gap-#{@breakpoint_navbar_expand}-0
         = Account.nombre_plural
       ul.dropdown-menu
         - @other_active_accounts.each do |ua|
-          li = link_to ua.account, tenant_root_path(tid: ua.to_param), class: 'dropdown-item'
+          li
+            = link_to tenant_root_path(tid: ua.to_param), class: 'dropdown-item' do
+              - if ua.account.logo.present?
+                span = image_tag ua.account.logo.variant(:thumb), class: 'rounded-circle border border-2 me-2', width: 40, height: 40
+              span = ua.account
         li
           hr.dropdown-divider
         li = link_to "Administrar #{Account.nombre_plural.downcase}", users_accounts_path(tid: nil), class: 'dropdown-item'

data/pg_rails/lib/version.rb

@@ -2,6 +2,6 @@
 
 # :nocov:
 module PgRails
-  VERSION = '7.6.39'
+  VERSION = '7.6.41'
 end
 # :nocov:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.39
+  version: 7.6.41
 platform: ruby
 authors:
 - Martín Rosso