pg_rails 7.6.38 → 7.6.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20a3fea092d9387189d95280d69b7019af848c240e1c8a7a93eab799c9e76b17
-  data.tar.gz: 454055be44d495543b4dfa061e279661859c323ad61b9f2a5fd5961fe968348f
+  metadata.gz: cf260a16e98842bebe950a0d4c3253d6c63f2690a922ec767c04d8a99ae7a0f7
+  data.tar.gz: 57dfdff6f3042539d11089edccf7fa32df6c38f86d151256a1536f5efe6d073b
 SHA512:
-  metadata.gz: 0ae918536ff74a313ae01832b3836b3df23cf6012c1d9b77fbc9ad148b50cd1d3cfcbdd9a89db89e607ae6eeb60c2b032714e4fd26cec649b0f4ec5347b8bc7e
-  data.tar.gz: 6cb6ccdc9c247047d2b8a0001387efa332dcd353027d49273176e8d51e13c1f01aa206883cf20409f8cbc449a70818ce25646dd43ac208e6002904654ff99e31
+  metadata.gz: e6fa99a2c8881e8f615839ce690c7cb9bf1d3c3ed3cf31f5490641bc253bd2de7b8826ee7c9c2374716dc8b85653db0d066d5bf5dcd4739d41bac81ff2938fbc
+  data.tar.gz: 65c53c5d31a893c6700347d16f9e3b2146a82b21ca2b5905fc214ab551ff844c9b9880118f59a1adc030cd8636fffd44908c5032482e28e3c1501dc14041af9e

data/pg_associable/app/javascript/modal_controller.js

@@ -39,14 +39,17 @@ export default class extends Controller {
 
     this.element.addEventListener('pg:record-updated', (ev) => {
       if (ev.data.dataset.inline) {
+        // Is an inline edit submit
         this.reloadTop()
         ev.stopPropagation()
       } else {
         if (ev.data.dataset.reload) {
+          // Must reload modal. Ie: on discard/undiscard
           this.reload()
           this.reloadTop()
           ev.stopPropagation()
         } else {
+          // Is a traditional form submit
           this.back(ev)
         }
       }

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

@@ -30,6 +30,9 @@
           i.bi.bi-pencil.lh-1
           = t('pg_engine.base.index.bulk_edit.link', model: clase_modelo)
 
+/ if turbo stream? && Current.account.present?
+/   = turbo_stream_from Current.account, @clase_modelo.model_name.plural
+
 - if action_name == 'archived'
   .text-center.p-3.text-warning-emphasis.border-bottom
     div

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

@@ -1,4 +1,5 @@
 - 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'

data/pg_engine/lib/pg_engine/utils/pg_logger.rb

@@ -55,7 +55,7 @@ module PgEngine
       def notify_all(mensaje, type)
         send_to_logger(mensaje, type)
         send_to_rollbar(mensaje, type)
-        send_to_stdout(mensaje, type) if ENV.fetch('LOG_TO_STDOUT', nil)
+        send_to_stdout(mensaje, type) if ENV.fetch('LOG_TO_STDOUT', nil) || (Rails.env.test? && type == :debug)
         save_internal(mensaje, type) if Rails.env.test?
         nil
       end

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

@@ -47,10 +47,25 @@ $chevron-color: 200,200,200,.5;
   // background-color: #d2f4ea;
 }
 
-.pg--nav-button.active {
+.navbar__nav-button.active {
   --bs-link-color-rgb: white!important;
   background-color: tint-color($primary, 17%);
 }
+
+.navbar__nav-button[aria-expanded=true] {
+  font-weight: bold;
+  background-color: tint-color($primary, 5%);
+}
+
+// Child entries
+#sidebar, .offcanvas {
+  .collapse-inner {
+    background-color: tint-color($primary, 5%);
+    padding-bottom: 0.1em;
+    padding-top: 0.1em;
+  }
+}
+
 // Los small-items están deprecados
 #sidebar {
   &.opened {
@@ -100,7 +115,7 @@ $chevron-color: 200,200,200,.5;
   }
 }
 
-.pg--nav-button {
+.navbar__nav-button {
   padding: 0.4em 1.7em;
   width: 100%;
   text-align: right;
@@ -109,11 +124,11 @@ $chevron-color: 200,200,200,.5;
 .offcanvas-body {
   padding: 0!important;
 }
-.pg--nav-button:hover {
+.navbar__nav-button:hover {
   background-color: tint-color($primary, 20%);
 }
 
-.offcanvas .pg--nav-button {
+.offcanvas .navbar__nav-button {
   padding: 0.7em 1.7em;
   text-align: right;
 }

data/pg_layout/app/lib/navbar.rb

@@ -43,31 +43,40 @@ class Navbar
     bar_data = @yaml_data[key]
     return [] if bar_data.blank?
 
-    # rubocop:disable Security/Eval
     # rubocop:disable Style/MultilineBlockChain:
     orig_idx = 0
     bar_data.map do |item|
       orig_idx += 1
-      {
-        title: item['name'],
-        attributes: item['attributes']&.html_safe,
-        path: eval(item['path']),
-        show: item['policy'] ? eval(item['policy']) : true,
-        priority: item['priority'] || 999_999,
-        orig_idx:
-      }
+      evaluate_node(item, orig_idx)
     end.sort_by { |a| [a[:priority], a[:orig_idx]] }
-    # rubocop:enable Security/Eval
     # rubocop:enable Style/MultilineBlockChain:
   end
 
+  def evaluate_node(item, orig_idx = nil)
+    # rubocop:disable Security/Eval
+    aux = {
+      title: item['name'],
+      attributes: item['attributes']&.html_safe,
+      path: item['path'].present? ? eval(item['path']) : nil,
+      show: item['policy'] ? eval(item['policy']) : true,
+      priority: item['priority'] || 999_999,
+      orig_idx:
+    }
+    # rubocop:enable Security/Eval
+
+    if item[:children].present?
+      aux[:children] = item[:children].map { |it| evaluate_node(it) }
+    end
+
+    aux
+  end
+
   def all_children_hidden?(entry)
     entry[:children].all? { |child| child[:show] == false }
   end
 
   def any_children_active?(entry, request)
     entry[:children].any? { |child| active_entry?(child, request) }
-    true
     # TODO: quitar
   end
 

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,6 +5,24 @@ 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
-          a href=entry[:path] class="d-inline-flex text-decoration-none pg--nav-button #{@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 #{ 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"
+
+            .collapse data-turbo-temporary=('true' unless active) 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 #{@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 #{active ? 'active' : ''} #{entry[:attributes]}"
+              = entry[:title]

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

@@ -9,9 +9,28 @@
       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="pg--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"
+
+              .collapse data-turbo-temporary=('true' unless active) 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_rails/lib/version.rb

@@ -2,6 +2,6 @@
 
 # :nocov:
 module PgRails
-  VERSION = '7.6.38'
+  VERSION = '7.6.40'
 end
 # :nocov:

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

@@ -8,12 +8,15 @@ require 'rails_helper'
 #
 # DRIVER=selenium BROWSER=firefox rspec
 describe '<%= name %>' do
+  # include ActionView::RecordIdentifier
+
   subject(:visitar) do
-    visit 'some url'
+    path = tpath("/u/t/some_tenanted_path", query_string: false)
+    visit path
   end
 
-  let(:logged_user) { create :user }
-  let(:account) { ActsAsTenant.current_tenant }
+  let(:logged_user) { create :user, :owner }
+  # let(:account) { ActsAsTenant.current_tenant }
 
   before do
     login_as logged_user

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.38
+  version: 7.6.40
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-04-03 00:00:00.000000000 Z
+date: 2025-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails