pg_rails 7.6.34 → 7.6.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8275648df93248ebda5f17d4b05ebbfb78bc465e1a79287229523135ddaf3954
-  data.tar.gz: cf6723fbdc3fb9c432e3be09eb1b8fcd1607a26fe3e9253283605c10660d0f30
+  metadata.gz: b2749a5b4bfd158279a0e768b5a8e379302b2c71d0ace5e6162a2ad1eef01adc
+  data.tar.gz: 649a2ab01df77e08404832d84b17ae66fd64e383343a165e2c83d6856dd93467
 SHA512:
-  metadata.gz: 63b38d4ee27e7688bfb1138fc02bf578b62b692d4efbc80b0fdc129d0868f98fb6f9c4bde061110e0f1136fea26f8c890051bd0c876983dee5c3ada07309e43e
-  data.tar.gz: 405c40bce987d0963295515b8c5803dc4f146a71f518b7862bc6f2b00cac3657e7a9fcd78b24101683788ab82a039ba8f509115cdaad4fb8023ae1340519164e
+  metadata.gz: 8b5a1340887f5c9be83055c40e2316741176aea1810fc28dfe77f3475cefebb557e07f6de6f2e081517fafc6d53a6f14106e9145101d8316b2b91421f114fdf3
+  data.tar.gz: 4b3974156468841816dddefa932d7f132448f3e3218e9a41f2911f646361e74bd4c7ed4a2bf6cd98e57cf6dc11f7383f2f98eec9d5107ed4dfe3213f306b1270

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

@@ -53,7 +53,7 @@ module PgAssociable
       reflect = associacion_for(atributo)
       fkid = object.send(reflect.foreign_key)
       if fkid
-        # FIXME: write some tests
+        # Include the actual value
         collection = collection.or(klass.where(id: fkid))
       end
 
@@ -75,6 +75,7 @@ module PgAssociable
       options.deep_merge!({ wrapper_html: { data: { controller: 'asociable',
                                                     'asociable-modal-outlet': '.modal' } } })
       options[:as] = 'pg_associable'
+      options[:collection] = []
 
       association atributo, options
     end

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

@@ -26,16 +26,6 @@ module Users
       end
     end
 
-    before_action do
-      if action_name.in? %w[index]
-        @container_class = 'container border p-0 my-3'
-        @container_style = 'max-width: 50em; xborder-left: 1px solid grey'
-      elsif action_name.in? %w[edit update]
-        @container_class = 'container border pb-3 my-3'
-        @container_style = 'max-width: 50em; xborder-left: 1px solid grey'
-      end
-    end
-
     def user_root
       scope = policy_scope(Account)
       if scope.count == 1

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

@@ -18,8 +18,6 @@ module Users
       add_breadcrumb UserAccount.new.decorate.submit_default_value
 
       @no_main_frame = true
-      @container_class = 'container border pb-3 my-3'
-      @container_style = 'max-width: 50em; xborder-left: 1px solid grey'
     end
 
     def new

data/pg_engine/app/lib/pg_engine/filtros_builder.rb

@@ -228,6 +228,11 @@ module PgEngine
 
       # TODO: default sort
 
+      # include all values that are present in the DB
+      # TODO: test
+      existing_value = clase_asociacion.where(id: @clase_modelo.pluck(sin_sufijo(campo)).uniq)
+
+      scope = scope.or(existing_value)
       map = scope.map { |o| [o.to_s, o.id] }
 
       content_tag :div, class: 'col-auto' do

data/pg_engine/app/lib/pg_form_builder.rb

@@ -32,6 +32,12 @@ class PgFormBuilder < SimpleForm::FormBuilder
     super
   end
 
+  # :nocov:
+  def fetch_association_collection(_reflection, _options)
+    raise PgEngine::Error, 'collection option must be passed'
+  end
+  # :nocov:
+
   def field(attribute_name, options = {}, &)
     model = convert_to_model(object)
 

data/pg_engine/app/models/user.rb

@@ -29,14 +29,25 @@
 #
 
 class User < ApplicationRecord
+  # Places where the default_scope applies:
+  #  _  v  en los pg_associable inputs
+  #  _  v  en los select de filtros de listados
+  #     O  en los preload e includes de listados
+  #     O  en los get de belongs_to
   default_scope lambda {
     if Current.namespace == :tenant
       if ActsAsTenant.unscoped?
         all
       else
-        ids = Current.account.user_accounts.ua_active.pluck(:user_id)
-        # ids = ids.push(Current.user.id) ?
-        where(id: ids)
+        ids = Current.account.user_accounts.pluck(:user_id)
+
+        # Es importante no hacer:
+        # where(id: ids)
+        # Ya que eso supone el riesgo de ser sobreescrita, por ejemplo
+        # en el getter de un belongs_to
+        # rubocop:disable Rails/WhereEquals
+        where('users.id IN (?)', ids)
+        # rubocop:enable Rails/WhereEquals
       end
     else
       all

data/pg_engine/app/models/user_account.rb

@@ -39,19 +39,37 @@ class UserAccount < ApplicationRecord
 
   after_destroy :cleanup_invitation
   def cleanup_invitation
-    usr = User.unscoped.find(user_id)
-    return unless usr.invited_to_sign_up? && !usr.confirmed?
-    return if usr.destroy
-    # :nocov:
+    return unless app_invitation_pending?
+
+    # unscoped: necesario porque ya la UserAccount fue borrada
+    # entonces el User quedaría por fuera de la default_scope
+    return if User.unscoped.find(user_id).destroy
 
+    # :nocov:
     pg_err 'User couldnt be deleted on invitation cleanup'
     # :nocov:
   end
+
+  # The user was invited to the platform and didn't
+  # confirm yet
+  def app_invitation_pending?
+    # usr = User.find(user_id)
+
+    # invited_to_sign_up? devise_invitable method that
+    # indicates if the user was created by invitation
+    user.invited_to_sign_up? && !user.confirmed?
+  end
+
   # El problema está en el joins(:user), ya que la default scope de user está scopeada dentro
   # del current_tenant entonces vuelve sobre la tabla user_accounts y bardea
   #
   # Tengo que escribir el user joins a mano porque de lo contrario sumaría la default_scope de
   # User, que a su vez joinea con user_accounts
+  #
+  # 07-03-2025
+  # esto ya no es así, la default scope de User no joinea más con user_accounts
+  # FIXME: ver si se podría hacer el joins(:user) normalmente y quitar el unscoped
+  #
   USER_JOINS = 'INNER JOIN users ON users.id = user_accounts.user_id'
   scope :kept, -> { joins(USER_JOINS, :account).merge(Account.kept).merge(User.unscoped.kept) }
 

data/pg_engine/app/policies/user_account_policy.rb

@@ -41,7 +41,8 @@ class UserAccountPolicy < ApplicationPolicy
   end
 
   def destroy?
-    Current.namespace == :admin || (user_is_account_owner? && !record.profiles.account__owner?)
+    Current.namespace == :admin ||
+      (user_is_account_owner? && !record.profiles.account__owner? && record.app_invitation_pending?)
   end
 
   def show?

data/pg_engine/app/policies/user_policy.rb

@@ -20,9 +20,10 @@ class UserPolicy < ApplicationPolicy
   #   acceso_total? && !record.readonly?
   # end
 
-  # def puede_crear?
-  #   acceso_total? || user.asesor?
-  # end
+  def puede_crear?
+    # acceso_total? || user.asesor?
+    true
+  end
 
   # def puede_borrar?
   #   acceso_total? && !record.readonly?

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

@@ -8,15 +8,16 @@ h3 = t('pg_engine.base.index.bulk_edit.title', model: @clase_modelo)
     .col-auto
       p.text-center.fw-bold
         = t('pg_engine.base.index.bulk_edit.count', model: @clase_modelo, count: @collection.count)
-      table.table style="min-width: 20em; max-width: 40em"
-        - @collection.each do |model|
-          tr
-            td style="width: 1em"
-              .form-check.xform-check-lg
-                = check_box_tag 'ids[]', model.to_key, true, class: 'form-check-input'
-            td.column-truncate-90 data-bs-title=model.to_s data-controller="tooltip"
-              = link_to model, model.decorate.object_url, target: :_blank, rel: :noopener
-              / = hidden_field_tag 'ids[]', model.to_key
+      .table-responsive
+        table.table style="min-width: 20em; max-width: 40em"
+          - @collection.each do |model|
+            tr
+              td style="width: 1em"
+                .form-check.xform-check-lg
+                  = check_box_tag 'ids[]', model.to_key, true, class: 'form-check-input'
+              td.column-truncate-90 data-bs-title=model.to_s data-controller="tooltip"
+                = link_to model, model.decorate.object_url, target: :_blank, rel: :noopener
+                / = hidden_field_tag 'ids[]', model.to_key
     .col.border-start
       = render BulkEditComponent.new(@clase_modelo, params:, form: f)
 

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

@@ -0,0 +1,4 @@
+- content_for(:container_class) { 'container border pb-3 my-3' }
+- content_for(:container_style) { 'max-width: 50em; xborder-left: 1px solid grey' }
+
+= render template: 'pg_engine/base/edit'

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

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

data/pg_engine/lib/pg_engine/engine.rb

@@ -75,19 +75,19 @@ module PgEngine
       end
     end
 
-    initializer 'byebug_bullet' do
+    initializer 'bye_bug_bullet' do
       if Rails.env.local?
         # :nocov:
         if ENV['RUBY_DEBUG_OPEN']
           require 'byebug/core'
           begin
             Byebug.start_server 'localhost', ENV.fetch('BYEBUG_SERVER_PORT', 8989).to_i
-            if ENV.fetch('SLEEP_AFTER_BYEBUG', false)
-              puts 'waiting 3 secs after starting byebug server for connections'
+            if ENV.fetch('SLEEP_AFTER_BYE_BUG', false)
+              puts 'waiting 3 secs after starting bye bug server for connections'
               sleep 3
             end
           rescue Errno::EADDRINUSE
-            Rails.logger.debug 'Byebug server already running'
+            Rails.logger.debug 'Bye bug server already running'
           end
         end
         # :nocov:

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

@@ -15,8 +15,6 @@ def pg_err(*args)
     # :nocov:
   end
 
-  byebug if ENV.fetch('BYEBUG_ERRORS', false) # rubocop:disable Lint/Debugger
-
   pg_log(:error, *args)
 end
 

data/pg_engine/spec/factories/users.rb

@@ -77,7 +77,13 @@ FactoryBot.define do
 
     trait :guest do
       after(:create) do |model|
-        model.user_accounts.create!(profiles: [])
+        model.user_accounts.create(profiles: [])
+      end
+    end
+
+    trait :disabled do
+      after(:create) do |model|
+        model.user_accounts.update_all(membership_status: :ms_disabled)
       end
     end
   end

data/pg_engine/spec/lib/pg_form_builder_spec.rb

@@ -70,4 +70,73 @@ describe PgFormBuilder do
       it { expect(subject).to eq 'La fecha' }
     end
   end
+
+  describe '#collection_pc' do
+    subject do
+      Current.namespace = :tenant
+
+      instancia.collection_pc(:creado_por, {})
+    end
+
+    context 'when user is foreign' do
+      let!(:user) { create :user }
+
+      context 'when category has not an actual value' do
+        let(:categoria) { create :categoria_de_cosa, creado_por: nil }
+
+        it do
+          expect(subject[0]).to eq []
+        end
+      end
+
+      context 'when category has an actual value' do
+        let(:categoria) { create :categoria_de_cosa, creado_por: user }
+
+        it 'doent show even when it is the actual value' do
+          expect(categoria.reload.creado_por).to eq user
+          expect(subject[0]).to eq []
+        end
+      end
+    end
+
+    context 'when its active' do
+      let!(:user) { create :user, :guest }
+
+      context 'when category has not an actual value' do
+        let(:categoria) { create :categoria_de_cosa, creado_por: nil }
+
+        it do
+          expect(subject[0]).to eq [user]
+        end
+      end
+
+      context 'when category has an actual value' do
+        let(:categoria) { create :categoria_de_cosa, creado_por: user }
+
+        it do
+          expect(subject[0]).to include user
+        end
+      end
+    end
+
+    context 'when its disabled' do
+      let!(:user) { create :user, :guest, :disabled }
+
+      context 'when category has not an actual value' do
+        let(:categoria) { create :categoria_de_cosa, creado_por: nil }
+
+        it do
+          expect(subject[0]).to eq []
+        end
+      end
+
+      context 'when category has an actual value' do
+        let(:categoria) { create :categoria_de_cosa, creado_por: user }
+
+        it do
+          expect(subject[0]).to include user
+        end
+      end
+    end
+  end
 end

data/pg_engine/spec/requests/devise/invitations_spec.rb

@@ -192,7 +192,8 @@ describe 'invite users to the platform and to an account #' do
       end
 
       it 'removes the UserAccount but not the User' do
-        expect { subject }.to change { UserAccount.unscoped.count }.by(-1).and(not_change(User.unscoped, :count))
+        subject
+        expect(response).to have_http_status(:unauthorized)
       end
     end
 

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

@@ -84,7 +84,8 @@ describe 'user accounts', :tpath_req do
     end
 
     it do
-      expect { subject }.to change(UserAccount.unscoped, :count).by(-1)
+      subject
+      expect(response).to have_http_status(:unauthorized)
     end
   end
 end

data/pg_layout/app/views/devise/invitations/edit.html.erb

@@ -2,7 +2,7 @@
 
 <h3>
 <%= resource.invited_by %>
- te invitó a su cuenta en ProcuraBien
+te invitó a su cuenta en <%= PgEngine.site_brand.name %>
 </h3>
 <% if User.require_password_on_accepting %>
 <p>

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

@@ -1,9 +1,12 @@
+<% content_for(:container_class) { 'container border pb-3 my-3' } %>
+<% content_for(:container_style) { 'max-width: 50em; xborder-left: 1px solid grey' } %>
+
 <h2><%= UserAccount.new.decorate.submit_default_value %></h2>
 
 <div style="max-width: 40em" data-controller="pg_form">
   <%= pg_form_for(resource, as: resource_name, url: invitation_path(resource_name), html: { method: :post }) do |f| %>
     <div class="form-inputs">
-      <%= f.input :email, hint: 'Si la persona aún no tiene cuenta en ProcuraBien, se le enviará una invitación para que se registre' %>
+      <%= f.input :email, hint: "Si la persona aún no tiene cuenta en #{PgEngine.site_brand.name}, se le enviará una invitación para que se registre" %>
     </div>
     <%= f.fields_for :user_accounts do |nf| %>
       <%= render partial: 'tenant/user_accounts/fields', locals: { f: nf } %>

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

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

data/pg_rails/lib/version.rb

@@ -2,6 +2,6 @@
 
 # :nocov:
 module PgRails
-  VERSION = '7.6.34'
+  VERSION = '7.6.35'
 end
 # :nocov:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.34
+  version: 7.6.35
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-03-06 00:00:00.000000000 Z
+date: 2025-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -840,6 +840,8 @@ files:
 - pg_engine/app/views/tenant/user_accounts/_form.html.slim
 - pg_engine/app/views/tenant/user_accounts/show.html.slim
 - pg_engine/app/views/users/accounts/_form.html.slim
+- pg_engine/app/views/users/accounts/edit.html.slim
+- pg_engine/app/views/users/accounts/index.html.slim
 - pg_engine/app/views/users/accounts/show.html.slim
 - pg_engine/config/initializers/action_controller.rb
 - pg_engine/config/initializers/action_mailer.rb