pg_rails 7.6.21.pre.1 → 7.6.21.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3eab12e3524597cafecf025ff2f374fc8d4e6f263322889fa43f47d8053ce55
-  data.tar.gz: 6f8a4178b6e30326d9d661371273fb0da7c232f413db0de7fd9d715bade85e11
+  metadata.gz: 5c7e8b1261e1be1d5db2d19ca5b4102f0bca77ae9f379da78249d2087e44736b
+  data.tar.gz: 455549bec4416393199d4b713cb653f008e4ff42a4d70f4923a1aff7b9dc1e78
 SHA512:
-  metadata.gz: 1d8f9670e42068df07b4d3e770f412cae71d4477870986067bf95c025b9ab8879590ef688cf07090054e0d1499b8484ac6899f5a30ca9763a1d032aa4e1e9b04
-  data.tar.gz: 78cce58eb9e2da9ac61d2cd469e85e98742e583e4bf3ffc9aea145b9e000cb4101734e9f51acb49813b70826ff6286fce475ce64feb339606deb74f5e9072bc9
+  metadata.gz: a94f33c4e747a6bae8d710c9a25ffea315f8d49cfadee1d111396381203d90c7716e160e45b6e5348b7389d4b0ef409c45c8d67b9df0fd8215ac111e84919b1a
+  data.tar.gz: f399f20faaccb9a7f9d5aa49c349faa67e1b1e7e56f850ba023f3a1b1471c1d35607dac07ee4fd1d8b39f733979add05bb0e98238b6352378cfe9fdb179a040c

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

@@ -2,6 +2,7 @@
 module PgAssociable
   module FormBuilderMethods
     def self.included(mod)
+      mod.include PgEngine::DefaultUrlOptions
       mod.include Rails.application.routes.url_helpers
       mod.include PgEngine::RouteHelper
     end

data/pg_associable/app/inputs/pg_associable_input.rb

@@ -2,6 +2,7 @@
 
 class PgAssociableInput < SimpleForm::Inputs::StringInput
   include ActionView::Helpers::FormTagHelper
+  include PgEngine::DefaultUrlOptions
   include Rails.application.routes.url_helpers
   include PgEngine::RouteHelper
 

data/pg_associable/spec/system/associable_spec.rb

@@ -1,22 +1,22 @@
 require 'rails_helper'
 
 describe 'Associable' do
-  let(:user) { create :user, :developer }
+  let(:user) { create :user, :owner }
 
-  let(:path) { '/a/cosas/new' }
+  let(:path) { '/u/t/cosas/new' }
 
   before do
     login_as user
     visit path
   end
 
-  it do
+  fit do
     fill_in 'cosa_nombre', with: 'La cosa'
     select 'Los', from: 'cosa_tipo'
     find('.cosa_categoria_de_cosa input[type=text]').click
     expect(page).to have_text :all, 'Nueva categoría de cosa'
     find('.cosa_categoria_de_cosa .list-group-item').click
-    select Account.first.to_s
+    # select Account.first.to_s
     fill_in 'categoria_de_cosa_nombre', with: 'la categoría'
     select 'Completar', from: 'categoria_de_cosa_tipo'
     click_on 'Agregar Categoría de cosa'
@@ -26,7 +26,7 @@ describe 'Associable' do
 
   context 'cuando crea desde el nested' do
     let!(:categ) { create :categoria_de_cosa }
-    let(:path) { "/a/categoria_de_cosas/#{categ.hashid}/cosas/new" }
+    let(:path) { "/u/t/categoria_de_cosas/#{categ.hashid}/cosas/new" }
 
     it do
       input = find_by_id('cosa_categoria_de_cosa')
@@ -37,7 +37,7 @@ describe 'Associable' do
   context 'cuando edita desde el nested' do
     let!(:categ) { create :categoria_de_cosa }
     let!(:cosa) { create :cosa, categoria_de_cosa: categ }
-    let(:path) { "/a/categoria_de_cosas/#{categ.hashid}/cosas/#{cosa.id}/edit" }
+    let(:path) { "/u/t/categoria_de_cosas/#{categ.hashid}/cosas/#{cosa.id}/edit" }
 
     it do
       ele = find_by_id('cosa_categoria_de_cosa_id', visible: :all)

data/pg_engine/app/models/current.rb

@@ -3,6 +3,14 @@ class Current < ActiveSupport::CurrentAttributes
   # attribute :request_id, :user_agent, :ip_address
 
   # resets { Time.zone = nil }
+  def active_user_account
+    # Para los jobs
+    if attributes[:active_user_account].nil? && user.present? && account.present?
+      attributes[:active_user_account] = user.active_user_account_for(account)
+    end
+
+    super
+  end
 
   def tid
     active_user_account.to_param

data/pg_engine/app/models/user.rb

@@ -132,12 +132,12 @@ class User < ApplicationRecord
 
   class Error < PgEngine::Error; end
 
-  def default_account
-    raise Error, 'El usuario debe tener cuenta' if accounts.empty?
+  # def default_account
+  #   raise Error, 'El usuario debe tener cuenta' if accounts.empty?
 
-    user_accounts.first.account
-    # throw :warden, scope: :user, message: :user_not_belongs_to_account
-  end
+  #   user_accounts.first.account
+  #   # throw :warden, scope: :user, message: :user_not_belongs_to_account
+  # end
 
   deprecate :current_account, deprecator: PgEngine.deprecator
 

data/pg_engine/app/models/user_account.rb

@@ -39,7 +39,7 @@ class UserAccount < ApplicationRecord
   belongs_to :creado_por, optional: true, class_name: 'User'
   belongs_to :actualizado_por, optional: true, class_name: 'User'
 
-  validates :user_id, uniqueness: { scope: :account_id }
+  validates_uniqueness_to_tenant :user_id
 
   after_destroy :cleanup_invitation
   def cleanup_invitation

data/pg_engine/db/migrate/20241027225618_add_membership_status_to_user_accounts.rb

@@ -3,4 +3,11 @@ class AddMembershipStatusToUserAccounts < ActiveRecord::Migration[7.2]
     add_column :user_accounts, :membership_status, :integer, null: false, default: 1
     add_column :user_accounts, :invitation_status, :integer, null: false, default: 1
   end
+
+  def migrate(direction)
+    if direction == :up
+      UserAccount.update_all(profiles: [0])
+    end
+    super
+  end
 end

data/pg_engine/db/seeds.rb

@@ -13,4 +13,4 @@ rené = FactoryBot.create(:user, email: 'rene@bien.com', nombre: 'René', apelli
                                 confirmed_at: Time.now)
 
 racionalismo.user_accounts.create!(user: baruch, profiles: [:account__owner])
-racionalismo.user_accounts.create!(user: rené, profiles: [:cosas__read])
+racionalismo.user_accounts.create!(user: rené, profiles: [])

data/pg_engine/spec/factories/users.rb

@@ -70,8 +70,11 @@ FactoryBot.define do
     end
 
     trait :owner do
-      user_accounts do
-        [build(:user_account, account: ActsAsTenant.current_tenant, profiles: [:account__owner])]
+      after(:create) do |model|
+        model.user_accounts.create!(profiles: [:account__owner])
+        # ActsAsTenant.with_tenant(create(:account)) do
+        #   model.user_accounts.create!(profiles: [:account__owner])
+        # end
       end
     end
   end

data/pg_engine/spec/models/user_spec.rb

@@ -13,10 +13,6 @@ RSpec.describe User do
     expect(UserAccount.first.profiles).to include(:account__owner)
   end
 
-  it do
-    expect(user.default_account).to be_present
-  end
-
   describe 'search ransacker' do
     it 'searchs' do
       results = described_class.ransack(search_cont: user.nombre).result.to_a

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

@@ -51,6 +51,7 @@ html
       }
 
   body
+    span#tid.d-none data-tid="#{Current.tid}"
     - sidebar_present = @navbar.present? && @sidebar != false
     - if sidebar_present
       = render partial: 'pg_layout/sidebar_mobile'

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

@@ -44,7 +44,7 @@
             i.bi.bi-person-circle.me-2 style="font-size: 1.7em"
           = Current.user
         ul.dropdown-menu
-          li = link_to 'Perfil', edit_user_registration_path(tid: nil), class: 'dropdown-item'
+          li = link_to 'Mi cuenta', edit_user_registration_path(tid: nil), class: 'dropdown-item'
           li = link_to Account.model_name.human(count: 2), users_accounts_path(tid: nil), class: 'dropdown-item'
           - if Current.user.developer?
             li = link_to 'Admin', admin_users_path, class: 'dropdown-item'

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.6.21.pre.1'
+  VERSION = '7.6.21-3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.21.pre.1
+  version: 7.6.21.pre.3
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-02 00:00:00.000000000 Z
+date: 2024-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails