pg_rails 7.6.25 → 7.6.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18003c61fd4e38fc6e7a70402aa0eaba4f335390e50061b1569bbea56c604a83
-  data.tar.gz: f2732b2e071e3672cc8e4b6d16e2e577f7b6bf3590a8a6c3d76ef45215bdb67f
+  metadata.gz: 01d6c43a4f1804b0b45e92ebaeea5411deb1fa6dafd9a886d3ca6fe9f5151fb3
+  data.tar.gz: 0b1eaf69bc0fd4d9164329b90c45ed1e206195a411b060cb0ab41ec28e3eae62
 SHA512:
-  metadata.gz: 9953c023fe35b70091a3ddc70b4a49f8cc7975476388835f1a0c7b286132afa68c4f5eaf35b6b1e80345fb2ff20251c35b9e238293b43cb217e445e226080598
-  data.tar.gz: 39911c247bdd17a3828a378478d03bb4027326b9c9b72d9ad5c0db1dc1b0e4d491dc6b2e37d899a02043a3446818feb304969c4a828b91dc3f7bf9a0adcf89c6
+  metadata.gz: d2521275d846111b2386211c36524c21b0d13de8db05cc0e28fd713021ece959a0f9deb7887d9d0ec8cf20229509dff6c1feed6d67cc14934beeb44fd38feed9
+  data.tar.gz: 90fc3ad22510450edc3d19c0bc11f9dfba1de6471a42c2478541d4808abe69eb668f3506b44137dd815e4067d81f632ed91bdb457145eec6d11d508ae310239f

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

@@ -15,7 +15,7 @@ module PgEngine
       if usuario.confirmed_at.present?
         sign_in(:user, usuario)
         # redirect_to after_sign_in_path_for(usuario)
-        redirect_to users_root_path
+        redirect_to user_root_path
       else
         go_back('No está confirmado')
       end

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

@@ -36,6 +36,16 @@ module Users
       end
     end
 
+    def user_root
+      scope = policy_scope(Account)
+      if scope.count == 1
+        ua = Current.user.user_account_for(scope.first)
+        redirect_to tenant_root_path(ua.to_param)
+      else
+        redirect_to users_accounts_path
+      end
+    end
+
     # La user_account puede estar disabled
     def show
       add_breadcrumb @account, users_account_path(@account, tid: nil)

data/pg_engine/app/helpers/pg_engine/route_helper.rb

@@ -72,8 +72,15 @@ module PgEngine
       if Current.tid.present?
         tenant_root_path(tid: Current.tid)
       else
-        (Current.user.present? ? users_root_path : root_path)
+        (Current.user.present? ? user_root_path : root_path)
       end
     end
+
+    # :nocov:
+    deprecate :users_root_path, deprecator: PgEngine.deprecator
+    def users_root_path
+      user_root_path
+    end
+    # :nocov:
   end
 end

data/pg_engine/app/models/user.rb

@@ -123,6 +123,10 @@ class User < ApplicationRecord
   end
 
   def to_s
+    nombre_completo_o_email
+  end
+
+  def nombre_completo_o_email
     nombre_completo.strip.presence || email
   end
 

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

@@ -9,13 +9,6 @@
     .fs-1
       = @account
 
-  / h6
-    |> Administrado por:
-    = @account.owner.nombre_completo
-    |< (
-    = @account.owner.email
-    | )
-
 - if @user_account.membership_status.ms_disabled?
   p.text-danger Deshabilitado
 

data/pg_engine/config/routes.rb

@@ -31,12 +31,10 @@ Rails.application.routes.draw do
         put :update_invitation
       end
     end
-
-    root to: 'accounts#index'
   end
 
   # User root for devise's signed_in_root_path
-  get '/u', to: 'accounts#index', as: :user_root
+  get '/u', to: 'users/accounts#user_root', as: :user_root
 
   namespace :tenant, path: 'u/t(/:tid)' do
     pg_resource(:user_accounts, only: [:index, :show, :edit, :update, :destroy])
@@ -50,8 +48,7 @@ Rails.application.routes.draw do
     root to: 'dashboard#dashboard'
   end
 
-  # root to: 'users/accounts#index'
-  # FIXME: qué onda
+  # Si en la main app no se define una root path, se redirige al user_root
   root to: redirect('/u')
 
   namespace :admin, path: 'a' do

data/pg_engine/spec/factories/users.rb

@@ -37,8 +37,8 @@
 
 FactoryBot.define do
   factory :user, class: 'User' do
-    nombre { Faker::Name.first_name }
-    apellido { Faker::Name.last_name }
+    nombre { '' }
+    apellido { '' }
     email { Faker::Internet.email }
     password { "password#{rand(99_999)}" }
     confirmed_at { Faker::Date.backward }

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

@@ -88,6 +88,44 @@ describe 'Users::AccountsController' do
     end
   end
 
+  describe 'user_root' do
+    subject do
+      get '/u'
+    end
+
+    context 'when no accounts' do
+      let(:user) { create :user }
+
+      it do
+        subject
+        expect(response).to redirect_to(users_accounts_path)
+      end
+    end
+
+    context 'when one account' do
+      it do
+        subject
+        ua = user.user_account_for(account)
+        expect(response).to redirect_to(tenant_root_path(ua.to_param))
+        # File.write(Rails.root.join('out.html'), response.body)
+      end
+    end
+
+    context 'when multiple accounts' do
+      before do
+        other_account = create(:account)
+        ActsAsTenant.without_tenant do
+          create(:user_account, account: other_account, user:)
+        end
+      end
+
+      it do
+        subject
+        expect(response).to redirect_to(users_accounts_path)
+      end
+    end
+  end
+
   describe 'index' do
     subject do
       get '/u/espacios'

data/pg_rails/lib/version.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# :nocov:
 module PgRails
-  VERSION = '7.6.25'
+  VERSION = '7.6.27'
 end
+# :nocov:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.25
+  version: 7.6.27
 platform: ruby
 authors:
 - Martín Rosso