pg_rails 7.5.0 → 7.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9044a5f343884a27bcfdb2be81907fcaaa743b4c1419c4dd1646214a50c5f7e
-  data.tar.gz: 2542d054eb7ec2ae29e95fdff5a7a0d8cccdef4d57e5a7073b4c0fe945f91fff
+  metadata.gz: cbc9c1b9067850c9f99c3a28d9252248c8657cacbd7cade188c50bced6d4559d
+  data.tar.gz: 4a9b8e39d04fa9837a488262f679c93f946461140229d7da84c124ade30bd120
 SHA512:
-  metadata.gz: 19ebd2bc479aab28961ba3280a2c0bf276e202501eecfc0474863a00e89882c79bef6c369e9d1ae7a533ad9118716389af0964ae66395a34ff0572011fb5e4ac
-  data.tar.gz: 5a37d34ab77355940e8c8988af1a9c4d839069b9b37bf645088ea5325c18f8e4829c99ae31877c53195d08caf22bae6ba01efa0d55cf8d95872056a481d51473
+  metadata.gz: dec0fda9ea266e4a8b57d186f70bf3395bb4ee2220cbc302556048d600014c7fee086e6dbec2fbfa3189cfe381221b06966e2a5d0afd2fe5d2754044067aee6d
+  data.tar.gz: a6dd1b4a963542a169fd2a3e67ef9003e4f37b0c549ddf59118f4b402f373c64708d92bca3a257342b75c9b83af74d39edbff162a4e91f9dcbd01bc98ebb5ddb

data/pg_associable/app/javascript/modal_controller.js

@@ -105,9 +105,14 @@ export default class extends Controller {
     //        this.modalPuntero.hide()
     // pero tiraba a veces error:
     // TypeError: can't convert null to object, _isWithActiveTrigger
-    document.querySelectorAll('.modal-backdrop').forEach((el) => {
-      el.remove()
-    })
+    // document.querySelectorAll('.modal-backdrop').forEach((el) => {
+    //   el.remove()
+    // })
+    // UPDATE: 11-09-2024, vuelvo a poner el hide, porque en parece que
+    // el problema de _isWithActiveTrigger viene por el lado de los
+    // tooltips:
+    // https://github.com/twbs/bootstrap/issues/37474
+    this.modalPuntero.hide()
     document.dispatchEvent(new Event('hidden.bs.modal'))
     this.modalPuntero.dispose()
   }

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

@@ -28,23 +28,6 @@ module Admin
       pg_respond_update
     end
 
-    # TODO: sacar este método a otro lado, que no sea AdminController
-    skip_before_action :authenticate_user!, only: [:login_as]
-
-    # :nocov:
-    def login_as
-      return unless dev_user_or_env?
-
-      usuario = User.find(params[:id])
-      if usuario.confirmed_at.present?
-        sign_in(:user, usuario)
-        redirect_to after_sign_in_path_for(usuario)
-      else
-        go_back('No está confirmado')
-      end
-    end
-    # :nocov:
-
     private
 
     def atributos_permitidos

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module PgEngine
+  module RequireTenantSet
+    def self.included(klass)
+      klass.before_action :require_tenant_set
+    end
+
+    def require_tenant_set
+      return if ActsAsTenant.current_tenant.present?
+
+      redirect_to users_account_switcher_path
+    end
+  end
+end

data/pg_engine/app/controllers/pg_engine/base_admin_controller.rb

@@ -0,0 +1,19 @@
+module PgEngine
+  class BaseAdminController < ApplicationController
+    include PgEngine::RequireSignIn
+
+    before_action do
+      raise Pundit::NotAuthorizedError unless Current.user&.developer?
+
+      Current.namespace = :admin
+
+      add_breadcrumb 'Admin'
+    end
+
+    around_action :set_without_tenant
+
+    def set_without_tenant(&)
+      ActsAsTenant.without_tenant(&)
+    end
+  end
+end

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

@@ -29,12 +29,10 @@ module PgEngine
           account = if session['current_user_account'].present?
                       UserAccount.where(id: session['current_user_account']).first&.account
                     elsif Current.user.user_accounts.count == 1
-                      Current.user.user_accounts.first
+                      Current.user.user_accounts.first.account
                     end
           set_current_tenant(account)
-          # FIXME: un concern que redirija al switcher si no hay current tenant
         end
-        Current.account = ActsAsTenant.current_tenant
       end
     end
     # rubocop:enable Rails/ApplicationController

data/pg_engine/app/controllers/pg_engine/base_public_controller.rb

@@ -0,0 +1,17 @@
+module PgEngine
+  class BasePublicController < ApplicationController
+    # :nocov:
+    def login_as
+      return head :bad_request unless dev_user_or_env?
+
+      usuario = User.find(params[:id])
+      if usuario.confirmed_at.present?
+        sign_in(:user, usuario)
+        redirect_to after_sign_in_path_for(usuario)
+      else
+        go_back('No está confirmado')
+      end
+    end
+    # :nocov:
+  end
+end

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

@@ -0,0 +1,17 @@
+module PgEngine
+  class BaseUsersController < ApplicationController
+    include PgEngine::RequireSignIn
+    include PgEngine::RequireTenantSet
+
+    before_action do
+      # FIXME: requisito que esto esté seteado
+      Current.namespace = :users
+
+      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/users/account_switcher_controller.rb

@@ -1,6 +1,7 @@
 module Users
   class AccountSwitcherController < PgEngine.config.users_controller
     rescue_from ActsAsTenant::Errors::NoTenantSet, with: :internal_error
+    skip_before_action :require_tenant_set
 
     before_action do
       @no_main_frame = true

data/pg_engine/app/models/current.rb

@@ -9,4 +9,6 @@ class Current < ActiveSupport::CurrentAttributes
   #
   #   Time.zone    = user.time_zone
   # end
+
+  deprecate :account, deprecator: PgEngine.deprecator
 end

data/pg_engine/app/models/email.rb

@@ -46,7 +46,10 @@ class Email < ApplicationRecord
 
   has_one_attached :encoded_eml
 
-  belongs_to :associated, polymorphic: true, optional: true
+  acts_as_tenant :account, optional: true
+
+  tenantable_belongs_to :associated, polymorphic: true, optional: true,
+                                     assign_tenant_from_associated: true
 
   belongs_to :creado_por, optional: true, class_name: 'User'
   belongs_to :actualizado_por, optional: true, class_name: 'User'

data/pg_engine/app/models/email_log.rb

@@ -23,7 +23,8 @@
 class EmailLog < ApplicationRecord
   audited
 
-  belongs_to :email, optional: true
+  acts_as_tenant :account, optional: true
+  tenantable_belongs_to :email, optional: true, assign_tenant_from_associated: true
 
   after_create_commit do
     email.update_status! if email.present?

data/pg_engine/app/models/user.rb

@@ -76,16 +76,16 @@ class User < ApplicationRecord
   end
 
   def create_account
-    # rubocop:disable Rails/Presence
     account =
       if ActsAsTenant.current_tenant.present?
-        # FIXME!: raise PgEngine::Error unless invited
+        # :nocov:
+        raise PgEngine::Error, 'user not invited' unless Rails.env.test?
+        # :nocov:
+
         ActsAsTenant.current_tenant
       else
         Account.create(nombre: email, plan: 0)
       end
-    # rubocop:enable Rails/Presence
-
     ua = user_accounts.create(account:)
 
     raise(Error, 'no se pudo crear la cuenta') unless ua.persisted?

data/pg_engine/app/overrides/audited_audit.rb

@@ -0,0 +1,15 @@
+Audited::Audit.class_eval do
+  before_validation do
+    if account_id.nil?
+      if auditable.respond_to?(:account_id)
+        self.account_id = auditable.account_id
+      elsif auditable_type == 'Account'
+        self.account_id = auditable.id
+      elsif ActsAsTenant.current_tenant.present?
+        self.account = ActsAsTenant.current_tenant
+      end
+    end
+  end
+
+  belongs_to :account, optional: true
+end

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

@@ -5,7 +5,7 @@
   .ms-1
   = @user.edit_link
   .ms-1
-  = link_to admin_login_as_path(id: @user.id), class: 'btn btn-light btn-sm' do
+  = link_to login_as_path(id: @user.id), class: 'btn btn-light btn-sm' do
     span.bi.bi-arrow-right
     |  Login as
 

data/pg_engine/config/routes.rb

@@ -13,6 +13,9 @@ Rails.application.routes.draw do
     pg_resource(:mensaje_contactos, only: [:new, :create], path: 'contacto')
     post 'webhook/mailgun', to: 'webhooks#mailgun'
   end
+
+  get 'login_as', to: 'public#login_as'
+
   devise_for :users, controllers: {
     confirmations: 'users/confirmations',
     registrations: 'users/registrations'
@@ -26,6 +29,9 @@ Rails.application.routes.draw do
       post ':user_account_id', action: 'switch', as: 'account_switch'
     end
   end
+
+  get '/u', to: 'users#home', as: :users_root
+
   namespace :admin, path: 'a' do
     pg_resource(:emails)
     pg_resource(:eventos)
@@ -37,7 +43,6 @@ Rails.application.routes.draw do
     pg_resource(:users)
     pg_resource(:accounts)
     pg_resource(:user_accounts)
-    get 'login_as', to: 'users#login_as'
   end
   if defined? ActiveAdmin
     ActiveAdmin.routes(self)

data/pg_engine/lib/pg_engine/configuracion.rb

@@ -9,8 +9,6 @@ module PgEngine
     def initialize
       if defined? UsersController
         @users_controller = UsersController
-      elsif defined? FrontendController
-        @users_controller = FrontendController
       end
 
       @global_domains = ['app.localhost.com', 'test.host', 'localhost']

data/pg_engine/spec/controllers/admin/email_logs_controller_spec.rb

@@ -33,9 +33,11 @@ RSpec.describe Admin::EmailLogsController do
   # EmailLog. As you add validations to EmailLog, be sure to
   # adjust the attributes here as well.
   let(:valid_attributes) do
-    attributes_for(:email_log)
+    attributes_for(:email_log).merge(email_id: email.id)
   end
 
+  let(:email) { create :email }
+
   let(:logged_user) { create :user, :developer }
 
   before do

data/pg_engine/spec/overrides/audited_audit_spec.rb

@@ -0,0 +1,16 @@
+require 'rails_helper'
+
+describe 'Audited::Audit' do
+  subject do
+    create :categoria_de_cosa
+  end
+
+  it 'creates the audits' do
+    expect { subject }.to change(Audited::Audit, :count).by(1)
+  end
+
+  it 'assigns the tenant to audits' do
+    subject
+    expect(Audited::Audit.last.account).to eq ActsAsTenant.current_tenant
+  end
+end

data/pg_engine/spec/system/breadcrumbs_spec.rb

@@ -15,7 +15,6 @@ describe 'Breadcrumbs' do
   let(:path) { "/a/cosas/#{cosa.id}" }
   let(:cosa) { create :cosa }
   let(:logged_user) { create :user, :developer }
-  let(:account) { logged_user.current_account }
 
   before do
     login_as logged_user

data/pg_engine/spec/system/date_selector_spec.rb

@@ -13,7 +13,6 @@ describe 'Date selector' do
   end
 
   let(:logged_user) { create :user, :developer }
-  let(:account) { logged_user.current_account }
   let(:categoria_de_cosa) { create :categoria_de_cosa, fecha: }
   let(:fecha) { Date.new(2024, 8, 12) }
 

data/pg_engine/spec/system/login_spec.rb

@@ -5,7 +5,7 @@ require 'rails_helper'
 describe 'Sign in' do
   shared_examples 'sign_in' do
     subject do
-      visit '/users/sign_in'
+      visit '/u/categoria_de_cosas'
       fill_in 'user_email', with: user.email
       fill_in 'user_password', with: password
       find('input[type=submit]').click

data/pg_engine/spec/system/modal_windows_spec.rb

@@ -13,7 +13,6 @@ describe 'Modal windows' do
   end
 
   let(:logged_user) { create :user, :developer }
-  let(:account) { logged_user.current_account }
   let!(:categoria_de_cosa) { create :categoria_de_cosa }
 
   before do

data/pg_engine/spec/system/tenants_spec.rb

@@ -42,6 +42,7 @@ describe 'Tenants' do
         visitar
 
         click_on other_account.to_s
+        visit '/u/categoria_de_cosas'
         expect(page).to have_text 'No hay categorías de cosas que mostrar'
       end
 

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

@@ -24,7 +24,11 @@ export default class extends Controller {
 
   disconnect () {
     if (this.popover) {
-      this.popover.dispose()
+      // setTimeout because of:
+      // https://github.com/twbs/bootstrap/issues/37474
+      setTimeout(() => {
+        this.popover.dispose()
+      }, 300)
     }
   }
 }

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

@@ -30,7 +30,11 @@ export default class extends Controller {
 
   disconnect () {
     if (this.tooltip) {
-      this.tooltip.dispose()
+      // setTimeout because of:
+      // https://github.com/twbs/bootstrap/issues/37474
+      setTimeout(() => {
+        this.tooltip.dispose()
+      }, 300)
     }
   }
 }

data/pg_layout/app/views/devise/sessions/new.html.erb

@@ -33,7 +33,7 @@
   <br>
   <ul style="max-width: 500px">
     <% User.order(:id).each do |user| %>
-      <li><%= link_to user, admin_login_as_path(id: user.id) %></li>
+      <li><%= link_to user, login_as_path(id: user.id) %></li>
     <% end %>
   </ul>
   </div>

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

@@ -8,9 +8,8 @@
       <%= link_to users_account_switcher_path do %>
         <% if Rails.env.development? %>
           <span class="d-block px-3 text-secondary">Tenant: <%= ActsAsTenant.current_tenant || 'Global' %></span>
-          <span class="d-block px-3 text-secondary">Cuenta: <%= Current.account || 'Global' %></span>
-        <% elsif Current.account.present? %>
-          <span class="d-block px-3 text-secondary"><%= Current.account %></span>
+        <% else %>
+          <span class="d-block px-3 text-secondary"><%= ActsAsTenant.current_tenant %></span>
         <% end %>
       <% end %>
       <hr>

data/pg_rails/lib/version.rb

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

data/pg_scaffold/spec/generators_spec.rb

@@ -17,7 +17,7 @@ describe 'Generators', type: :generator do
     before { prepare_destination }
 
     it do
-      run_generator(['Frontend/Modelo', 'bla:integer'])
+      run_generator(['users/modelo', 'bla:integer'])
 
       my_assert_file 'app/decorators/modelo_decorator.rb' do |content|
         expect(content).to match(/delegate_all/)
@@ -31,9 +31,9 @@ describe 'Generators', type: :generator do
     before { prepare_destination }
 
     it do
-      run_generator(['Frontend/Modelo', 'bla:integer'])
+      run_generator(['users/modelo', 'bla:integer'])
 
-      my_assert_file 'spec/controllers/frontend/modelos_controller_spec.rb' do |content|
+      my_assert_file 'spec/controllers/users/modelos_controller_spec.rb' do |content|
         expect(content).to match(/routing/)
         expect(content).to match(/sign_in/)
       end
@@ -46,7 +46,7 @@ describe 'Generators', type: :generator do
     before { prepare_destination }
 
     it do
-      run_generator(['Frontend/Modelo', 'bla:integer', 'cosa:references', '--activeadmin'])
+      run_generator(['users/modelo', 'bla:integer', 'cosa:references', '--activeadmin'])
 
       my_assert_file 'app/admin/modelos.rb' do |content|
         expect(content).to match(/permit_params.*cosa_id/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.5.0
+  version: 7.5.2
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-10 00:00:00.000000000 Z
+date: 2024-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -677,8 +677,12 @@ files:
 - pg_engine/app/controllers/admin/eventos_controller.rb
 - pg_engine/app/controllers/admin/user_accounts_controller.rb
 - pg_engine/app/controllers/admin/users_controller.rb
+- pg_engine/app/controllers/concerns/pg_engine/require_tenant_set.rb
 - pg_engine/app/controllers/concerns/pg_engine/resource.rb
+- pg_engine/app/controllers/pg_engine/base_admin_controller.rb
 - pg_engine/app/controllers/pg_engine/base_controller.rb
+- pg_engine/app/controllers/pg_engine/base_public_controller.rb
+- pg_engine/app/controllers/pg_engine/base_users_controller.rb
 - pg_engine/app/controllers/pg_engine/devise_controller.rb
 - pg_engine/app/controllers/pg_engine/health_controller.rb
 - pg_engine/app/controllers/pg_engine/require_sign_in.rb
@@ -729,6 +733,7 @@ files:
 - pg_engine/app/notifiers/email_user_notifier.rb
 - pg_engine/app/notifiers/simple_user_notifier.rb
 - pg_engine/app/overrides/activestorage_direct_uploads.rb
+- pg_engine/app/overrides/audited_audit.rb
 - pg_engine/app/policies/account_policy.rb
 - pg_engine/app/policies/email_log_policy.rb
 - pg_engine/app/policies/email_policy.rb
@@ -867,6 +872,7 @@ files:
 - pg_engine/spec/models/pg_engine/base_record_spec.rb
 - pg_engine/spec/models/user_account_spec.rb
 - pg_engine/spec/models/user_spec.rb
+- pg_engine/spec/overrides/audited_audit_spec.rb
 - pg_engine/spec/pg_engine/pdf_preview_generator_spec.rb
 - pg_engine/spec/requests/admin/eventos_spec.rb
 - pg_engine/spec/requests/base_controller_requests_spec.rb