pg_rails 7.5.2 → 7.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbc9c1b9067850c9f99c3a28d9252248c8657cacbd7cade188c50bced6d4559d
-  data.tar.gz: 4a9b8e39d04fa9837a488262f679c93f946461140229d7da84c124ade30bd120
+  metadata.gz: b312261e863e04fcc457b8b773531325d1c69f9b4ef0ca1269b39853f737844a
+  data.tar.gz: 641bbe1b7b128e67ec7ffb874765dfeae35aac6dadf917fcbe4367b3c98939cb
 SHA512:
-  metadata.gz: dec0fda9ea266e4a8b57d186f70bf3395bb4ee2220cbc302556048d600014c7fee086e6dbec2fbfa3189cfe381221b06966e2a5d0afd2fe5d2754044067aee6d
-  data.tar.gz: a6dd1b4a963542a169fd2a3e67ef9003e4f37b0c549ddf59118f4b402f373c64708d92bca3a257342b75c9b83af74d39edbff162a4e91f9dcbd01bc98ebb5ddb
+  metadata.gz: 66f4093830e6a889cf66cfc39e6b0bfb015e93ad8e48c0e33a2c3292363f7511dbc1062b7b9993d0e0e2277ae49986c9eb0390572d63a2100a6057fb6b20e213
+  data.tar.gz: dc1b35305080b8bd01dbafeea7453bcf8f7bd85fe4609ee7657f18985402b86f755c170b39ce28b55e5c3939a2f5659f57e9ba3ee8336877ef8c18712fcf01be

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

@@ -3,7 +3,7 @@ module PgAssociable
     MAX_RESULTS = 8
 
     def pg_respond_abrir_modal
-      src = @clase_modelo.new.decorate.new_object_url
+      src = clase_modelo.new.decorate.new_object_url
       content = ModalContentComponent.new(src:).render_in(view_context)
       modal = AsociableModalComponent.new(modal_id: params[:id]).with_content(content)
       render turbo_stream: turbo_stream.append_all('body', modal)
@@ -14,10 +14,27 @@ module PgAssociable
       resultados_prefix = 'resultados-inline'
       query = params[:query]
       timeout_id = params[:timeout_id]
-      @collection = policy_scope(@clase_modelo).kept.query(query).limit(MAX_RESULTS)
+      @collection = search_in_scope(query)
       render turbo_stream:
         turbo_stream.update("#{resultados_prefix}-#{params[:id]}",
                             partial:, locals: { collection: @collection, query:, timeout_id: })
     end
+
+    def search_in_scope(query)
+      scope = policy_scope(clase_modelo).kept
+
+      if clase_modelo.ransackable_attributes.include?('search')
+        scope.ransack(search_cont: query).result
+      else
+        Rails.logger.warn("WARNING: #{clase_modelo} should implement a 'search' ransacker")
+
+        if scope.respond_to?(:query)
+          Rails.logger.warn("DEPRECATED WARNING: #{clase_modelo}#query is deprecated in favor of 'search' ransacker")
+          scope.query(query)
+        else
+          scope.where(id: query)
+        end
+      end
+    end
   end
 end

data/pg_associable/app/javascript/asociable_controller.tsx

@@ -66,7 +66,7 @@ export default class extends Controller {
     }
     const doSearchBounce = debounce((force) => {
       this.doSearch(force)
-    }, 900)
+    }, 200)
 
     this.input.addEventListener('blur', () => {
       this.input.placeholder = this.originalPlaceholder

data/pg_associable/spec/pg_associable/helpers_spec.rb

@@ -1,7 +1,27 @@
 require 'rails_helper'
 
 describe PgAssociable::Helpers do
-  describe '#pg_respond_buscar' do
+  # DEPRECATED
+  describe '#pg_respond_buscar with query scope' do
+    let(:ctrl) do
+      Admin::CategoriaDeCosasController.new
+    end
+    let!(:categoria_de_cosa) { create :categoria_de_cosa }
+
+    before do
+      Current.user = create :user, :developer
+      allow(ctrl).to receive_messages(params: { id: 123, query: categoria_de_cosa.nombre })
+      allow(ctrl).to receive(:render)
+    end
+
+    it do
+      ctrl.pg_respond_buscar
+      categoria_de_cosas = ctrl.instance_variable_get(:@collection)
+      expect(categoria_de_cosas).to eq [categoria_de_cosa]
+    end
+  end
+
+  describe '#pg_respond_buscar with id' do
     let(:ctrl) do
       Admin::CosasController.new
     end
@@ -11,7 +31,6 @@ describe PgAssociable::Helpers do
       Current.user = create :user, :developer
       allow(ctrl).to receive_messages(params: { id: 123, query: cosa.id })
       allow(ctrl).to receive(:render)
-      ctrl.instance_variable_set(:@clase_modelo, Cosa)
     end
 
     it do
@@ -20,4 +39,23 @@ describe PgAssociable::Helpers do
       expect(cosas).to eq [cosa]
     end
   end
+
+  describe '#pg_respond_buscar with ransack' do
+    let(:ctrl) do
+      Admin::AccountsController.new
+    end
+    let!(:account) { create :account }
+
+    before do
+      Current.user = create :user, :developer
+      allow(ctrl).to receive_messages(params: { id: 123, query: account.nombre })
+      allow(ctrl).to receive(:render)
+    end
+
+    it do
+      ctrl.pg_respond_buscar
+      accounts = ctrl.instance_variable_get(:@collection)
+      expect(accounts).to eq [account]
+    end
+  end
 end

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

@@ -15,7 +15,11 @@ module Admin
     private
 
     def atributos_permitidos
-      %i[user_id account_id profiles]
+      [
+        :user_id,
+        :account_id,
+        { profiles: [] }
+      ]
     end
 
     def atributos_para_buscar

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

@@ -418,9 +418,7 @@ module PgEngine
         instancia_modelo.assign_attributes(modelo_params) if action_name.in? %w[update]
       end
 
-      # FIXME: estaría bueno delegar directamente a pundit, pero habría que
-      # arreglar tema policies
-      Current.user&.developer? || authorize(instancia_modelo)
+      authorize(instancia_modelo)
 
       # TODO: problema en create y update cuando falla la validacion
       # Reproducir el error antes de arreglarlo

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

@@ -25,11 +25,12 @@ module PgEngine
             throw :warden, scope: :user, message: :invalid
           end
 
+          @current_tenant_set_by_domain_or_subdomain = true
         else
-          account = if session['current_user_account'].present?
-                      UserAccount.where(id: session['current_user_account']).first&.account
-                    elsif Current.user.user_accounts.count == 1
+          account = if Current.user.user_accounts.count == 1
                       Current.user.user_accounts.first.account
+                    elsif session['current_user_account'].present?
+                      UserAccount.where(id: session['current_user_account']).first&.account
                     end
           set_current_tenant(account)
         end

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

@@ -7,6 +7,8 @@ module Users
       @no_main_frame = true
     end
 
+    layout 'pg_layout/centered'
+
     def list
       @user_accounts = Current.user.user_accounts
     end

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+module Users
+  class AccountsController < UsersController
+    include PgEngine::Resource
+
+    self.clase_modelo = Account
+    add_breadcrumb 'Cuentas'
+    self.skip_default_breadcrumb = true
+
+    before_action(only: :index) { authorize Account }
+
+    before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
+
+    # private
+
+    # def atributos_permitidos
+    #   %i[plan nombre domain subdomain]
+    # end
+
+    # def atributos_para_buscar
+    #   atributos_permitidos
+    # end
+
+    # def atributos_para_listar
+    #   atributos_permitidos
+    # end
+
+    # def atributos_para_mostrar
+    #   atributos_permitidos
+    # end
+  end
+end

data/pg_engine/app/helpers/pg_engine/flash_helper.rb

@@ -9,9 +9,8 @@ module PgEngine
     end
 
     def render_turbo_stream_title
-      title = [breadcrumbs.last&.name, I18n.t('app_name')].compact.join(' - ')
+      title = [breadcrumbs.last&.name, ActsAsTenant.current_tenant, I18n.t('app_name')].compact.join(' - ')
       turbo_stream.update_all 'title', title
-      # rubocop:enable Rails/SkipsModelValidations
     end
   end
 end

data/pg_engine/app/models/account.rb

@@ -22,6 +22,7 @@
 class Account < ApplicationRecord
   audited
   include Discard::Model
+  include Hashid::Rails
 
   has_many :user_accounts
   has_many :users, through: :user_accounts
@@ -33,6 +34,10 @@ class Account < ApplicationRecord
 
   validates :plan, :nombre, presence: true
 
+  ransacker :search do |parent|
+    parent.table[:nombre]
+  end
+
   def to_s
     nombre
   end

data/pg_engine/app/models/pg_engine/base_record.rb

@@ -19,7 +19,9 @@ module PgEngine
       attr_accessor :default_modal
     end
 
-    scope :query, ->(param) { param.present? ? where(id: param) : all }
+    # ransacker :search do |parent|
+    #   parent.table[:nombre]
+    # end
 
     def self.ransackable_associations(_auth_object = nil)
       authorizable_ransackable_associations

data/pg_engine/app/models/user.rb

@@ -99,8 +99,20 @@ class User < ApplicationRecord
   #   true
   # end
 
+  # DEPRECATED
   scope :query, ->(param) { where('email ILIKE ?', "%#{param}%") }
 
+  ransacker :search do |parent|
+    Arel::Nodes::InfixOperation.new(
+      '||',
+      Arel::Nodes::InfixOperation.new(
+        '||',
+        parent.table[:nombre], parent.table[:apellido]
+      ),
+      parent.table[:email]
+    )
+  end
+
   def to_s
     nombre_completo
   end

data/pg_engine/app/models/user_account.rb

@@ -21,6 +21,7 @@
 #  fk_rails_...  (user_id => users.id)
 #
 
+# FIXME: add column active?
 class UserAccount < ApplicationRecord
   audited
   include Hashid::Rails
@@ -33,7 +34,6 @@ class UserAccount < ApplicationRecord
 
   enumerize :profiles, in: {
     admin: 1,
-    dueño: 2,
-    invitado: 3
+    editor: 2
   }, multiple: true
 end

data/pg_engine/app/policies/account_policy.rb

@@ -28,4 +28,8 @@ class AccountPolicy < ApplicationPolicy
   # def acceso_total?
   #   user.developer?
   # end
+  def base_access_to_record?
+    ActsAsTenant.unscoped? ||
+      record.user_accounts.pluck(:user_id).include?(user.id)
+  end
 end

data/pg_engine/app/views/admin/user_accounts/_form.html.slim

@@ -2,8 +2,8 @@
 
 div style="max-width: 22em"
   = pg_form_for(@user_account || object) do |f|
-    = f.pg_associable :user
-    = f.pg_associable :account
+    = f.pg_associable :user, preload: 10
+    = f.pg_associable :account, preload: 5
     = f.input :profiles
     .mt-2
     = f.button :submit

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

@@ -1,6 +1,20 @@
-h1 Switcher
+h1 Cambiar a otra cuenta
 
-ul
+- if @current_tenant_set_by_domain_or_subdomain
+  p Estás en el dominio de #{ActsAsTenant.current_tenant} (#{request.host})
+  p
+    | Para cambiar de cuenta vas a tener que iniciar sesión en el dominio
+    |< de Bien o de la cuenta específica a la que quieras cambiar
+
+ul.m-auto.list-group style="max-width: 20em"
   - @user_accounts.each do |user_account|
-    li = link_to user_account.account, users_account_switch_path(user_account),
-                 'data-turbo-method': :post
+    li.list-group-item
+      - if @current_tenant_set_by_domain_or_subdomain
+        = user_account.account
+      - elsif user_account.account == ActsAsTenant.current_tenant
+        b
+          = user_account.account
+          |  (Actual)
+      - else
+        = link_to user_account.account, users_account_switch_path(user_account),
+                  'data-turbo-method': :post

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

@@ -0,0 +1,13 @@
+h1
+  |> Usuarios de la cuenta:
+  = @account
+
+div style="max-width: 30em"
+  table.table.table-sm
+    tr
+      th Nombre
+      th Roles
+    - @account.user_accounts.each do |user_account|
+      tr
+        td = user_account.user
+        td = user_account.profiles.texts.join(', ')

data/pg_engine/config/routes.rb

@@ -28,6 +28,9 @@ Rails.application.routes.draw do
       get '', action: 'list', as: 'account_switcher'
       post ':user_account_id', action: 'switch', as: 'account_switch'
     end
+
+    pg_resource(:accounts, path: 'cuentas', only: [:show])
+    # get 'account', to: 'accounts#show'
   end
 
   get '/u', to: 'users#home', as: :users_root

data/pg_engine/db/seeds.rb

@@ -1,15 +1,17 @@
-ActsAsTenant.without_tenant do
-  DatabaseCleaner.clean_with(:truncation, except: %w(ar_internal_metadata))
+DatabaseCleaner.clean_with(:truncation, except: %w(ar_internal_metadata))
 
 
-  bien = FactoryBot.create :account, nombre: 'Bien', subdomain: 'bien'
-  uno = FactoryBot.create :user, email: 'mrosso10@gmail.com', nombre: 'Martín', apellido: 'Rosso', password: 'admin123',
-                           confirmed_at: Time.now, developer: true, orphan: true
-  bien.users << uno
+bien = FactoryBot.create(:account, nombre: 'Bien', subdomain: 'bien')
+rosso = FactoryBot.create(:user, email: 'mrosso10@gmail.com', nombre: 'Martín', apellido: 'Rosso', password: 'admin123',
+                                 confirmed_at: Time.now, developer: true, orphan: true)
 
-  mal = FactoryBot.create :account, nombre: 'Mal', subdomain: 'mal'
-  otro = FactoryBot.create :user, email: 'mal@gmail.com', nombre: 'Mal', apellido: 'Mal', password: 'admin123',
-                           confirmed_at: Time.now, developer: true, orphan: true
+bien.user_accounts.create(user: rosso, profiles: [:admin])
 
-  mal.users << otro
-end
+racionalismo = FactoryBot.create(:account, nombre: 'Racionalismo', subdomain: 'racionalismo')
+baruch = FactoryBot.create(:user, email: 'baruch@bien.com', nombre: 'Baruch', apellido: 'Spinoza', password: 'admin123',
+                                  confirmed_at: Time.now, orphan: true)
+rené = FactoryBot.create(:user, email: 'rene@bien.com', nombre: 'René', apellido: 'Descartes', password: 'admin123',
+                                confirmed_at: Time.now, orphan: true)
+
+racionalismo.user_accounts.create(user: baruch, profiles: [:admin])
+racionalismo.user_accounts.create(user: rené, profiles: [:editor])

data/pg_engine/spec/models/user_spec.rb

@@ -56,4 +56,11 @@ RSpec.describe User do
       expect(user).not_to be_persisted
     end
   end
+
+  describe 'search ransacker' do
+    it 'searchs' do
+      results = described_class.ransack(search_cont: user.nombre).result.to_a
+      expect(results).to eq [user]
+    end
+  end
 end

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

@@ -0,0 +1,22 @@
+require 'rails_helper'
+
+describe 'Users::AccountsController' do
+  let(:account) { ActsAsTenant.current_tenant }
+  let(:user) { create :user }
+
+  before do
+    sign_in user
+  end
+
+  it 'shows the owned account' do
+    get "/u/cuentas/#{account.to_param}"
+    expect(response).to have_http_status(:ok)
+  end
+
+  it 'denies foreign account' do
+    other_account = create :account
+    get "/u/cuentas/#{other_account.to_param}"
+    expect(response).to have_http_status(:redirect)
+    expect(flash[:alert]).to eq 'Acceso no autorizado'
+  end
+end

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

@@ -30,15 +30,23 @@ describe 'redirection' do
     let!(:other_account) { create :account }
     let!(:other_user_account) { logged_user.user_accounts.create(account: other_account) }
 
+    before do
+      third_account = create :account
+      logged_user.user_accounts.create(account: third_account)
+    end
+
     it 'redirects to switcher' do
       get '/u/cosas'
       expect(response).to redirect_to users_account_switcher_path
       follow_redirect!
-      expect(response.body).to include 'Switcher'
+      expect(response.body).to include 'Cambiar a otra cuenta'
       post "/u/switcher/#{other_user_account.to_param}"
       expect(response).to redirect_to(root_path)
       follow_redirect!
+      get '/u/cosas'
+      expect(response).to have_http_status(:ok)
       expect(response.body).to include other_account.to_s
+      expect(response.body).to include 'No hay cosos que mostrar'
       other_user_account.destroy!
       get '/'
       expect(response).to redirect_to users_account_switcher_path

data/pg_engine/spec/system/tenants_spec.rb

@@ -35,7 +35,7 @@ describe 'Tenants' do
       it 'shows the switcher' do
         visitar
 
-        expect(page).to have_text 'Switcher'
+        expect(page).to have_text 'Cambiar a otra cuenta'
       end
 
       it 'switches to account' do

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

@@ -5,13 +5,20 @@
     </div>
     <% if user_signed_in? %>
       <span class="d-inline-block px-3 text-end text-light"><%= Current.user %></span>
-      <%= 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">
+        <% if Current.user.user_accounts.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? %>
+              (Cambiar)
+            <% else %>
+              Elegir cuenta
+            <% end %>
+          <% end %>
         <% else %>
-          <span class="d-block px-3 text-secondary"><%= ActsAsTenant.current_tenant %></span>
+          <%= link_to ActsAsTenant.current_tenant, [:users, ActsAsTenant.current_tenant] if ActsAsTenant.current_tenant.present? %>
         <% end %>
-      <% end %>
+      </span>
       <hr>
     <% end %>
     <ul class="list-unstyled ps-0">

data/pg_rails/lib/version.rb

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

data/pg_scaffold/lib/generators/pg_rspec/scaffold/templates/controller_spec.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# FIXME: reemplazar por requests spec
 # generado con pg_rails
 
 require 'rails_helper'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.5.2
+  version: 7.5.3
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-11 00:00:00.000000000 Z
+date: 2024-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -689,6 +689,7 @@ files:
 - pg_engine/app/controllers/public/mensaje_contactos_controller.rb
 - pg_engine/app/controllers/public/webhooks_controller.rb
 - 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/date_jumper_controller.rb
 - pg_engine/app/controllers/users/notifications_controller.rb
@@ -777,6 +778,7 @@ files:
 - pg_engine/app/views/public/mensaje_contactos/_gracias.html.slim
 - 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/config/initializers/action_mailer.rb
 - pg_engine/config/initializers/active_admin.rb
 - pg_engine/config/initializers/acts_as_tenant.rb
@@ -876,6 +878,7 @@ files:
 - 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
+- pg_engine/spec/requests/users/accounts_spec.rb
 - pg_engine/spec/requests/users/base_controller_spec.rb
 - pg_engine/spec/requests/users/date_jumper_spec.rb
 - pg_engine/spec/requests/users/switcher_spec.rb