pg_rails 7.5.7 → 7.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d700901741523887ccac3c92bc1e266a4ec57f1cf2794865aa2c1bc4a30a5ae2
-  data.tar.gz: e8e55331eb22f7168d483ce8e1eec5965b23cec8f8421bfbe4ff58e870d874af
+  metadata.gz: 9e8749da8dcc608499fc64c9af83a9889069d9384e861508688c40e41b33ae52
+  data.tar.gz: 51fcd1231c11477379842419333ceda58bd14b1ca5d058fdf0775b92b6caf867
 SHA512:
-  metadata.gz: 63ea0b3be1e39bcdc8436269b539945000b11e6f40f03e69eb3f5e897bf1ba1ca45a5a054d13c0e3f37c5fd5eb878d91b092b31174a796012b5a8b87ccd0e625
-  data.tar.gz: c6808a080fe3a4dc2769bf35ac29662f4875229d323c31f793481c3460b44d41a8984010f328a4a380d842f2aa3e5ddbeaed9853ce5013b4913cf53516dc848d
+  metadata.gz: 06c02fbcf25d4eb7c34c8272d9b3e3f0af6a93052a882cdc8adb1f17452b39dc002145e19cd17321e6a273216393309e7b9d0efac307aa9fc33b9348fd9dc999
+  data.tar.gz: 2a3bc5f762458f385813fbba264e9644843680d6d924a77bbb671711bd6c3fe06adb14cae59453dc38f2614fbefda264101f12106f0720e12c66c8d2bd967c39

data/pg_associable/app/helpers/pg_associable/form_builder_methods.rb

@@ -20,7 +20,7 @@ module PgAssociable
       # porque de todos modos se pisaría en el create
       if !object.persisted? &&
          template.nested_record.present? &&
-         object.send(template.nested_key) == (template.nested_record.id)
+         object.send(atributo) == (template.nested_record)
         options[:disabled] = true
       end
 

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

@@ -1,3 +1,4 @@
+/ TODO: usar ModalComponent?
 .modal[class="#{@klass} modal-#{@modal_id}" tabindex="-1" data-controller="modal"
        data-auto-show="true" data-remove-on-hide="false"
        data-modal-asociable-outlet=".asociable-#{@modal_id}"

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

@@ -76,6 +76,7 @@ module PgEngine
     rescue_from ActsAsTenant::Errors::NoTenantSet, with: :no_tenant_set
 
     rescue_from PgEngine::BadUserInput, with: :bad_user_input
+    rescue_from ActionController::UnknownFormat, with: :unknown_format
 
     rescue_from ActionController::InvalidAuthenticityToken,
                 with: :invalid_authenticity_token
@@ -96,6 +97,10 @@ module PgEngine
       render_my_component(BadUserInputComponent.new(error_msg: error.message), :bad_request)
     end
 
+    def unknown_format(_error)
+      render_my_component(BadUserInputComponent.new(error_msg: 'Formato incorrecto'), :bad_request)
+    end
+
     def internal_error(error)
       pg_err error
 
@@ -144,7 +149,10 @@ module PgEngine
       navbar_expanded = cookies[:navbar_expand] != 'false'
       @navbar_opened_class = navbar_expanded ? 'opened' : ''
       @navbar_chevron_class = navbar_expanded ? 'bi-chevron-left' : 'bi-chevron-right'
-      @navbar = Navbar.new(Current.user)
+      @navbar = Navbar.new
+      PgEngine.configuracion.navigators.each do |navigator|
+        navigator.configure(@navbar)
+      end
 
       if defined?(Rollbar) && Rollbar.configuration.enabled && Rails.application.credentials.rollbar.present?
         @rollbar_token = Rails.application.credentials.rollbar.access_token_client

data/pg_engine/app/controllers/pg_engine/base_users_controller.rb

@@ -9,9 +9,5 @@ module PgEngine
 
       add_breadcrumb 'Inicio', :users_root_path unless using_modal2? || frame_embedded?
     end
-
-    def home
-      render html: '<h1>Inicio</h1>'.html_safe, layout: 'pg_layout/centered'
-    end
   end
 end

data/pg_engine/app/controllers/public/webhooks_controller.rb

@@ -2,6 +2,12 @@ module Public
   class WebhooksController < PublicController
     skip_before_action :verify_authenticity_token
 
+    # TODO: mover a un namespace de webhooks
+    around_action :set_without_tenant
+    def set_without_tenant(&)
+      ActsAsTenant.without_tenant(&)
+    end
+
     before_action :verify_signature, only: :mailgun
 
     rescue_from StandardError do |err|

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

@@ -0,0 +1,9 @@
+module Users
+  class DashboardController < PgEngine.config.users_controller
+    layout 'pg_layout/containerized'
+
+    def dashboard
+      add_breadcrumb 'Resumen'
+    end
+  end
+end

data/pg_engine/app/models/user.rb

@@ -102,6 +102,12 @@ class User < ApplicationRecord
 
   class Error < PgEngine::Error; end
 
+  def user_accounts_without_tenant
+    ActsAsTenant.without_tenant do
+      user_accounts.to_a
+    end
+  end
+
   def default_account
     raise Error, 'El usuario debe tener cuenta' if accounts.empty?
 

data/pg_engine/app/views/users/account_switcher/list.html.slim

@@ -1,4 +1,4 @@
-h1 Cambiar a otra cuenta
+h1 ¿Qué cuenta te gustaría utilizar?
 
 / FIXME!: user_accounts add active column
 - if @user_accounts.empty?

data/pg_engine/app/views/users/dashboard/dashboard.html.slim

@@ -0,0 +1 @@
+h1 Dashboard

data/pg_engine/config/initializers/action_controller.rb

@@ -0,0 +1,7 @@
+ActiveSupport.on_load :action_controller do
+  if defined? UsersController
+    PgEngine.configurar do |config|
+      config.users_controller = UsersController
+    end
+  end
+end

data/pg_engine/config/routes.rb

@@ -21,6 +21,7 @@ Rails.application.routes.draw do
     registrations: 'users/registrations'
   }, failure_app: PgEngine::DeviseFailureApp
   namespace :users, path: 'u' do
+    get 'dashboard', to: 'dashboard#dashboard'
     post 'notifications/mark_as_seen', to: 'notifications#mark_as_seen'
     post 'notifications/mark_as_unseen', to: 'notifications#mark_as_unseen'
     get 'date_jumper/jump'
@@ -33,7 +34,7 @@ Rails.application.routes.draw do
     # get 'account', to: 'accounts#show'
   end
 
-  get '/u', to: 'users#home', as: :users_root
+  get '/u', to: 'users/dashboard#dashboard', as: :users_root
 
   namespace :admin, path: 'a' do
     pg_resource(:emails)

data/pg_engine/lib/pg_engine/configuracion.rb

@@ -4,14 +4,11 @@
 
 module PgEngine
   class Configuracion
-    attr_accessor :users_controller, :global_domains
+    attr_accessor :users_controller, :global_domains, :navigators
 
     def initialize
-      if defined? UsersController
-        @users_controller = UsersController
-      end
-
       @global_domains = ['app.localhost.com', 'test.host', 'localhost']
+      @navigators = [PgEngine::Navigator.new]
     end
   end
 end

data/pg_engine/lib/pg_engine/navigator.rb

@@ -0,0 +1,67 @@
+module PgEngine
+  class Navigator
+    # rubocop:disable Metrics/MethodLength
+    def configure(navbar)
+      navbar.add_item('sidebar.not_signed_in', {
+                        name: 'Crear una cuenta',
+                        path: 'new_user_registration_path'
+                      })
+      navbar.add_item('sidebar.not_signed_in', {
+                        name: 'Iniciar sesión',
+                        path: 'new_user_session_path'
+                      })
+      navbar.add_item('sidebar.not_signed_in', {
+                        name: 'Contacto',
+                        path: 'new_public_mensaje_contacto_path'
+                      })
+
+      # *****************************************************
+
+      navbar.add_item('sidebar.signed_in', {
+                        name: 'Inicio',
+                        path: 'users_root_path',
+                        priority: 0
+                      })
+      navbar.add_item('sidebar.signed_in', {
+                        name: 'Mi perfil',
+                        path: 'edit_user_registration_path',
+                        policy: 'policy(Current.user).edit?'
+                      })
+      navbar.add_item('sidebar.signed_in', {
+                        name: 'Cerrar sesión',
+                        path: 'destroy_user_session_path',
+                        attributes: 'data-turbo-method="delete"'
+                      })
+
+      # *****************************************************
+
+      return unless Current.user&.developer?
+
+      navbar.add_item('sidebar.signed_in', {
+                        name: 'Eventos',
+                        path: 'admin_eventos_path'
+                      })
+      navbar.add_item('sidebar.signed_in', {
+                        name: 'Emails',
+                        path: 'admin_emails_path'
+                      })
+      navbar.add_item('sidebar.signed_in', {
+                        name: 'Email logs',
+                        path: 'admin_email_logs_path'
+                      })
+      navbar.add_item('sidebar.signed_in', {
+                        name: 'Users',
+                        path: 'admin_users_path'
+                      })
+      navbar.add_item('sidebar.signed_in', {
+                        name: 'Accounts',
+                        path: 'admin_accounts_path'
+                      })
+      navbar.add_item('sidebar.signed_in', {
+                        name: 'User Accounts',
+                        path: 'admin_user_accounts_path'
+                      })
+    end
+    # rubocop:enable Metrics/MethodLength
+  end
+end

data/pg_engine/lib/pg_engine.rb

@@ -4,6 +4,7 @@ require_relative 'pg_engine/engine'
 require_relative 'pg_engine/core_ext'
 require_relative 'pg_engine/error'
 require_relative 'pg_engine/configuracion'
+require_relative 'pg_engine/navigator'
 require_relative 'pg_engine/email_observer'
 require_relative 'pg_engine/mailgun/log_sync'
 require_relative 'pg_engine/route_helpers'

data/pg_engine/spec/requests/base_controller_requests_spec.rb

@@ -76,4 +76,15 @@ describe 'Base requests' do
       include_examples 'manda el status correcto'
     end
   end
+
+  describe 'unknown format' do
+    subject do
+      get '/users/sign_in', headers: { accept: 'application/json' }
+    end
+
+    it 'returns bad request' do
+      subject
+      expect(response).to have_http_status(:bad_request)
+    end
+  end
 end

data/pg_engine/spec/{controllers/public/webhooks_controller_spec.rb → requests/public/webhooks_spec.rb}

@@ -26,14 +26,18 @@ def build_body(log_id, signature, timestamp)
   JSON
 end
 
-describe Public::WebhooksController do
+describe 'webhooks' do
   include ActiveSupport::Testing::TimeHelpers
 
-  before { travel_to Time.zone.at(1_716_564_587) }
+  before do
+    travel_to Time.zone.at(1_716_564_587)
+    ActsAsTenant.current_tenant = nil
+    ActsAsTenant.test_tenant = nil
+  end
 
   describe '#mailgun' do
     subject do
-      post :mailgun, body:, as: :json
+      post '/webhook/mailgun', params: body, headers: { 'content-type': 'application/json' }
     end
 
     let(:signature) { 'c524037907046276117758afae8a340e77a43a6e48eb35a9521426e7a3ff675b' }
@@ -114,11 +118,15 @@ describe Public::WebhooksController do
 
     context 'cuando ya se usó el token' do
       subject do
-        post :mailgun, body: build_body('otro id', signature, timestamp), as: :json
+        post '/webhook/mailgun',
+             params: build_body('otro id', signature, timestamp),
+             headers: { 'content-type': 'application/json' }
       end
 
       before do
-        post :mailgun, body: build_body(log_id, signature, timestamp), as: :json
+        post '/webhook/mailgun',
+             params: build_body(log_id, signature, timestamp),
+             headers: { 'content-type': 'application/json' }
       end
 
       it_behaves_like 'todo bien pero no guarda el log'

data/pg_engine/spec/requests/users/dashboard_spec.rb

@@ -0,0 +1,19 @@
+require 'rails_helper'
+
+describe 'DASHBOARD' do
+  let(:logged_user) { create :user }
+
+  before do
+    sign_in logged_user
+  end
+
+  it 'when requesting /u' do
+    get '/u'
+    expect(response.body).to include '<h1>Dashboard</h1>'
+  end
+
+  it 'when requesting /u/dashboard' do
+    get '/u/dashboard'
+    expect(response.body).to include '<h1>Dashboard</h1>'
+  end
+end

data/pg_engine/spec/requests/users/switcher_spec.rb

@@ -55,7 +55,7 @@ describe 'redirection' do
       get '/u/cosas'
       expect(response).to redirect_to users_account_switcher_path
       follow_redirect!
-      expect(response.body).to include 'Cambiar a otra cuenta'
+      expect(response.body).to include '¿Qué cuenta te gustaría utilizar?'
       post "/u/switcher/#{other_user_account.to_param}"
       expect(response).to redirect_to(root_path)
       follow_redirect!

data/pg_engine/spec/system/noticed_spec.rb

@@ -8,7 +8,6 @@ describe 'Notifications' do
   let(:user) { create :user }
 
   before do
-    driven_by ENV['DRIVER']&.to_sym || :selenium_chrome_headless_iphone
     login_as user
   end
 

data/pg_engine/spec/system/tenants_spec.rb

@@ -37,7 +37,7 @@ describe 'Tenants' do
       it 'shows the switcher' do
         visitar
 
-        expect(page).to have_text 'Cambiar a otra cuenta'
+        expect(page).to have_text '¿Qué cuenta te gustaría utilizar?'
       end
 
       it 'switches to account' do

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

@@ -3,11 +3,24 @@ import { Controller } from '@hotwired/stimulus'
 // Connects to data-controller="clear-timeout"
 export default class extends Controller {
   connect () {
-    this.element.dataset.timeoutId.split(',').forEach((el) => {
-      const timeoutId = parseInt(el)
-      clearTimeout(timeoutId)
-      console.log(`clearedTimeout: ${timeoutId}`)
-    })
+    if (this.element.dataset.timeoutId) {
+      this.element.dataset.timeoutId.split(',').forEach((el) => {
+        this.clear(el)
+      })
+    } else {
+      const headId = document.head.dataset.timeoutId
+      if (headId) {
+        headId.split(',').forEach((el) => {
+          this.clear(el)
+        })
+      }
+    }
     this.element.remove()
   }
+
+  clear (id) {
+    const timeoutId = parseInt(id)
+    clearTimeout(timeoutId)
+    console.log(`clearedTimeout: ${timeoutId}`)
+  }
 }

data/pg_layout/app/lib/navbar.rb

@@ -4,10 +4,9 @@ class Navbar
   attr_reader :extensiones
   attr_accessor :logo, :logo_xl, :logo_xl_url
 
-  def initialize(user)
-    @user = user
-    @yaml_data = YAML.load_file("#{Rails.application.root}/config/pg_rails.yml")
-    @yaml_data = ActiveSupport::HashWithIndifferentAccess.new(@yaml_data)
+  def initialize
+    @user = Current.user
+    @yaml_data = ActiveSupport::HashWithIndifferentAccess.new({})
     @extensiones = []
   end
 
@@ -31,15 +30,21 @@ class Navbar
     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
+        show: item['policy'] ? eval(item['policy']) : true,
+        priority: item['priority'] || 999_999,
+        orig_idx:
       }
-    end
+    end.sort_by { |a| [a[:priority], a[:orig_idx]] }
     # rubocop:enable Security/Eval
+    # rubocop:enable Style/MultilineBlockChain:
   end
 
   def all_children_hidden?(entry)

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

@@ -6,7 +6,7 @@
     <% if user_signed_in? %>
       <span class="d-inline-block px-3 text-end text-light"><%= Current.user %></span>
       <span class="d-block px-3 text-secondary">
-        <% if Current.user.user_accounts.count > 1 %>
+        <% if Current.user.user_accounts_without_tenant.count > 1 %>
           <%= link_to ActsAsTenant.current_tenant, [:users, ActsAsTenant.current_tenant] if ActsAsTenant.current_tenant.present? %>
           <%= link_to users_account_switcher_path do %>
             <% if ActsAsTenant.current_tenant.present? %>

data/pg_layout/spec/lib/navbar_spec.rb

@@ -2,7 +2,11 @@ require 'rails_helper'
 
 describe Navbar do
   let(:user) { create :user }
-  let(:instancia) { described_class.new(user) }
+  let(:instancia) { described_class.new }
+
+  before do
+    Current.user = user
+  end
 
   describe '#add_html' do
     subject { instancia.add_html(some_html) }

data/pg_rails/lib/pg_rails/capybara_support.rb

@@ -49,4 +49,4 @@ Capybara.register_driver :selenium_chrome_headless_iphone,
                          &chrome_driver_gen(headless: true, emulate_device: 'iPhone 6')
 Capybara.register_driver :selenium_chrome_debugger, &chrome_driver_gen(headless: false, debugger: true)
 
-Capybara.javascript_driver = ENV.fetch('WEBDRIVER') { 'selenium_chrome_notebook' }.to_sym
+Capybara.javascript_driver = ENV.fetch('DRIVER') { 'selenium_chrome_notebook' }.to_sym

data/pg_rails/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.5.7
+  version: 7.6.1
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-20 00:00:00.000000000 Z
+date: 2024-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -691,6 +691,7 @@ files:
 - pg_engine/app/controllers/users/account_switcher_controller.rb
 - pg_engine/app/controllers/users/accounts_controller.rb
 - pg_engine/app/controllers/users/confirmations_controller.rb
+- pg_engine/app/controllers/users/dashboard_controller.rb
 - pg_engine/app/controllers/users/date_jumper_controller.rb
 - pg_engine/app/controllers/users/notifications_controller.rb
 - pg_engine/app/controllers/users/registrations_controller.rb
@@ -779,6 +780,8 @@ files:
 - pg_engine/app/views/public/mensaje_contactos/new.html.slim
 - pg_engine/app/views/users/account_switcher/list.html.slim
 - pg_engine/app/views/users/accounts/show.html.slim
+- pg_engine/app/views/users/dashboard/dashboard.html.slim
+- pg_engine/config/initializers/action_controller.rb
 - pg_engine/config/initializers/action_mailer.rb
 - pg_engine/config/initializers/active_admin.rb
 - pg_engine/config/initializers/acts_as_tenant.rb
@@ -822,6 +825,7 @@ files:
 - pg_engine/lib/pg_engine/engine.rb
 - pg_engine/lib/pg_engine/error.rb
 - pg_engine/lib/pg_engine/mailgun/log_sync.rb
+- pg_engine/lib/pg_engine/navigator.rb
 - pg_engine/lib/pg_engine/route_helpers.rb
 - pg_engine/lib/pg_engine/utils/check_invalid_records.rb
 - pg_engine/lib/pg_engine/utils/pdf_preview_generator.rb
@@ -847,7 +851,6 @@ files:
 - pg_engine/spec/controllers/devise/sessions_controller_spec.rb
 - pg_engine/spec/controllers/pg_engine/base_controller_spec.rb
 - pg_engine/spec/controllers/public/mensaje_contactos_controller_spec.rb
-- pg_engine/spec/controllers/public/webhooks_controller_spec.rb
 - pg_engine/spec/controllers/users/confirmations_controller_spec.rb
 - pg_engine/spec/decorators/email_decorator_spec.rb
 - pg_engine/spec/factories/accounts.rb
@@ -880,8 +883,10 @@ files:
 - pg_engine/spec/requests/base_controller_requests_spec.rb
 - pg_engine/spec/requests/current_attributes_spec.rb
 - pg_engine/spec/requests/devise_spec.rb
+- pg_engine/spec/requests/public/webhooks_spec.rb
 - pg_engine/spec/requests/users/accounts_spec.rb
 - pg_engine/spec/requests/users/base_controller_spec.rb
+- pg_engine/spec/requests/users/dashboard_spec.rb
 - pg_engine/spec/requests/users/date_jumper_spec.rb
 - pg_engine/spec/requests/users/registrations_spec.rb
 - pg_engine/spec/requests/users/switcher_spec.rb