pg_rails 7.4.2 → 7.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55cfb59ec05d90c2944001cb69e2625c8d4f8e8a1eb460427dca95daf25b4ba4
-  data.tar.gz: eb5c2a073a6a1d69a0307e2ae16e9550dc852e2a45bd28aebb2ccc0ef6b0d5d6
+  metadata.gz: c9044a5f343884a27bcfdb2be81907fcaaa743b4c1419c4dd1646214a50c5f7e
+  data.tar.gz: 2542d054eb7ec2ae29e95fdff5a7a0d8cccdef4d57e5a7073b4c0fe945f91fff
 SHA512:
-  metadata.gz: 890f2a67f70994285f1c5cefd90f8cd36c3604bcb368345e9e5331afa805fa99bb5f15e5bfd81e9e78e0948621f6356df0c855c22fb70d0c10722f974e0438f4
-  data.tar.gz: db292c14db052409f0b27c9d11fafce68471f387c633799a7caf2c9f3b49e59829ad14ee3d41976a133d3f5912c56a087fa54068974cd2b42194b97a1d8f4cee
+  metadata.gz: 19ebd2bc479aab28961ba3280a2c0bf276e202501eecfc0474863a00e89882c79bef6c369e9d1ae7a533ad9118716389af0964ae66395a34ff0572011fb5e4ac
+  data.tar.gz: 5a37d34ab77355940e8c8988af1a9c4d839069b9b37bf645088ea5325c18f8e4829c99ae31877c53195d08caf22bae6ba01efa0d55cf8d95872056a481d51473

data/pg_associable/spec/system/associable_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 describe 'Associable' do
   let(:user) { create :user, :developer }
 
-  let(:path) { '/admin/cosas/new' }
+  let(:path) { '/a/cosas/new' }
 
   before do
     login_as user
@@ -16,16 +16,17 @@ describe 'Associable' do
     find('.cosa_categoria_de_cosa input[type=text]').click
     expect(page).to have_text :all, 'Nuevo'
     find('.cosa_categoria_de_cosa .list-group-item').click
+    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'
     click_on 'Cargar Coso'
-    expect(page).to have_text 'Creado por'
+    expect(page).to have_text 'La cosa'
   end
 
   context 'cuando crea desde el nested' do
     let!(:categ) { create :categoria_de_cosa }
-    let(:path) { "/admin/categoria_de_cosas/#{categ.hashid}/cosas/new" }
+    let(:path) { "/a/categoria_de_cosas/#{categ.hashid}/cosas/new" }
 
     it do
       input = find_by_id('cosa_categoria_de_cosa')
@@ -36,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) { "/admin/categoria_de_cosas/#{categ.hashid}/cosas/#{cosa.id}/edit" }
+    let(:path) { "/a/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/controllers/admin/accounts_controller.rb

@@ -12,24 +12,22 @@ module Admin
 
     before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
 
-    add_breadcrumb Account.nombre_plural, :admin_accounts_path
-
     private
 
     def atributos_permitidos
-      %i[plan nombre]
+      %i[plan nombre domain subdomain]
     end
 
     def atributos_para_buscar
-      %i[plan nombre]
+      atributos_permitidos
     end
 
     def atributos_para_listar
-      %i[plan nombre]
+      atributos_permitidos
     end
 
     def atributos_para_mostrar
-      %i[plan nombre]
+      atributos_permitidos
     end
   end
 end

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

@@ -12,8 +12,6 @@ module Admin
 
     before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
 
-    add_breadcrumb EmailLog.nombre_plural, :admin_email_logs_path
-
     before_action do
       @actions = [
         ["Mailgun sync: #{ENV.fetch('MAILGUN_DOMAIN', nil)}", mailgun_sync_admin_email_logs_path, {

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

@@ -12,8 +12,6 @@ module Admin
 
     before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
 
-    add_breadcrumb Email.nombre_plural, :admin_emails_path
-
     after_action only: :create do
       if @saved
         PgEngine::AdminMailer.with(email_object: @email).admin_mail.deliver_later

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

@@ -12,8 +12,6 @@ module Admin
 
     before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
 
-    add_breadcrumb UserAccount.nombre_plural, :admin_user_accounts_path
-
     private
 
     def atributos_permitidos

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

@@ -16,11 +16,10 @@ module Admin
 
     before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
 
-    add_breadcrumb User.nombre_plural, :admin_users_path
-
     def create
       @user.skip_confirmation!
-      @user.user_accounts << UserAccount.new(account: Current.account)
+      @user.orphan = true
+
       pg_respond_create
     end
 

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

@@ -91,6 +91,9 @@ module PgEngine
       return if nested_id.blank?
 
       nested_class.find(nested_id)
+    rescue ActiveRecord::RecordNotFound => e
+      pg_warn(e)
+      raise PgEngine::PageNotFoundError
     end
 
     def accepts_turbo_stream?

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

@@ -2,12 +2,51 @@
 
 module PgEngine
   # rubocop:disable Rails/ApplicationController
+  # rubocop:disable Metrics/ClassLength
   class BaseController < ActionController::Base
+    # Importante que esta línea esté al principio
+    protect_from_forgery with: :exception
+
+    set_current_tenant_by_subdomain_or_domain(:account, :subdomain, :domain)
+    set_current_tenant_through_filter
+
     before_action do
+      Current.user = current_user
       Current.controller = self
-    end
 
+      # if ActsAsTenant.current_tenant.blank? && !global_domain?
+      #   raise ActsAsTenant::Errors::NoTenantSet
+      # end
+
+      if Current.user.present?
+        if ActsAsTenant.current_tenant.present?
+          unless Current.user.user_accounts.exists?(account: ActsAsTenant.current_tenant)
+            sign_out(Current.user)
+            throw :warden, scope: :user, message: :invalid
+          end
+
+        else
+          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
+                    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
+
+    # :nocov:
+    def global_domain?
+      return true if Rails.env.test?
+
+      request.host.in? PgEngine.config.global_domains
+    end
+    # :nocov:
+
     include Pundit::Authorization
     include PrintHelper
     include PostgresHelper
@@ -25,10 +64,11 @@ module PgEngine
       end
     end
 
-    protect_from_forgery with: :exception
-
     rescue_from StandardError, with: :internal_error
+    rescue_from ActsAsTenant::Errors::NoTenantSet, with: :no_tenant_set
+
     rescue_from PgEngine::BadUserInput, with: :bad_user_input
+
     rescue_from ActionController::InvalidAuthenticityToken,
                 with: :invalid_authenticity_token
 
@@ -38,6 +78,12 @@ module PgEngine
       redirect_to e.url
     end
 
+    def no_tenant_set(error)
+      return internal_error(error) if Current.user.blank?
+
+      redirect_to users_account_switcher_path
+    end
+
     def bad_user_input(error)
       render_my_component(BadUserInputComponent.new(error_msg: error.message), :bad_request)
     end
@@ -63,10 +109,6 @@ module PgEngine
       render_my_component(InternalErrorComponent.new, :ok)
     end
 
-    before_action do
-      Current.user = current_user
-    end
-
     helper_method :dev_user_or_env?
     def dev_user_or_env?
       Rails.env.development? || dev_user?
@@ -181,4 +223,5 @@ module PgEngine
       redirect_back fallback_location: root_path
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end

data/pg_engine/app/controllers/pg_engine/require_sign_in.rb

@@ -4,7 +4,7 @@ module PgEngine
   module RequireSignIn
     def self.included(clazz)
       clazz.include RansackMemory::Concern
-      clazz.before_action :authenticate_user!
+      clazz.prepend_before_action :authenticate_user!
       clazz.before_action :save_and_load_filters
     end
   end

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

@@ -0,0 +1,19 @@
+module Users
+  class AccountSwitcherController < PgEngine.config.users_controller
+    rescue_from ActsAsTenant::Errors::NoTenantSet, with: :internal_error
+
+    before_action do
+      @no_main_frame = true
+    end
+
+    def list
+      @user_accounts = Current.user.user_accounts
+    end
+
+    def switch
+      user_account = UserAccount.find(params[:user_account_id])
+      session['current_user_account'] = user_account.id
+      redirect_to root_path
+    end
+  end
+end

data/pg_engine/app/helpers/pg_engine/form_helper.rb

@@ -12,7 +12,6 @@ module PgEngine
             object.decorator_class <= PgEngine::BaseRecordDecorator
         object = object.decorate.target_object
       end
-      # byebug
       options = args.extract_options!
 
       options[:builder] = PgFormBuilder

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

@@ -3,21 +3,25 @@
 module PgEngine
   module RouteHelper
     class NamespaceDeductor
-      def self.request(context)
+      def self.controller(context)
         if context.respond_to?(:request) && context.request
           # Controllers
-          context.request
+          context
         elsif context.respond_to?(:helpers) && context.helpers
           # Decorators
-          context.helpers.request
+          context.helpers.controller
         elsif context.respond_to?(:template) && context.template
           # FormBuilders
-          context.template.request
+          context.template.controller
         end
       end
 
       def self.current_route(context)
-        req = request(context)
+        controller = controller(context)
+        # Sólo si hay un controller de verdá
+        return if controller.instance_of? ApplicationController
+
+        req = controller.request
         Rails.application.routes.recognize_path(req.path, method: req.env['REQUEST_METHOD'])
       end
 
@@ -25,6 +29,8 @@ module PgEngine
         return Current.namespace if Current.namespace.present?
 
         route = current_route(context)
+        return if route.blank?
+
         parts = route[:controller].split('/')
         return unless parts.length > 1
 

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

@@ -64,7 +64,8 @@ module PgEngine
       @filtros[campo][:scope_asociacion] = block
     end
 
-    # FIXME: deprecar
+    deprecate :filtrar, deprecator: PgEngine.deprecator
+
     def filtrar(query, parametros = nil)
       parametros_controller if parametros.nil?
 

data/pg_engine/app/models/account.rb

@@ -32,4 +32,8 @@ class Account < ApplicationRecord
   enumerize :plan, in: { completar: 0, los: 1, valores: 2 }
 
   validates :plan, :nombre, presence: true
+
+  def to_s
+    nombre
+  end
 end

data/pg_engine/app/models/current.rb

@@ -4,9 +4,9 @@ class Current < ActiveSupport::CurrentAttributes
 
   # resets { Time.zone = nil }
 
-  def user=(user)
-    super
-    self.account = user&.current_account
-    # Time.zone    = user.time_zone
-  end
+  # def user=(user)
+  #   super
+  #
+  #   Time.zone    = user.time_zone
+  # end
 end

data/pg_engine/app/models/user.rb

@@ -37,7 +37,22 @@ class User < ApplicationRecord
   include Discard::Model
 
   has_many :user_accounts
+
+  # Hace falta?
   has_many :accounts, through: :user_accounts
+
+  # default_scope lambda {
+  #   if ActsAsTenant.current_tenant.present?
+  #     joins(:user_accounts).where('user_accounts.account_id': ActsAsTenant.current_tenant.id)
+  #   else
+  #     raise ActsAsTenant::Errors::NoTenantSet unless Current.user.blank? || ActsAsTenant.unscoped?
+
+  #     # Aún no autenticó devise o es el admin
+  #     all
+
+  #   end
+  # }
+
   has_many :notifications, as: :recipient, class_name: 'Noticed::Notification'
 
   validates :nombre, :apellido, presence: true
@@ -57,14 +72,23 @@ class User < ApplicationRecord
   attr_accessor :orphan
 
   after_create do
-    # TODO: si fue invitado, sumar a la account del invitador
     create_account unless orphan
   end
 
   def create_account
-    account = Account.create(nombre: email, plan: 0)
+    # rubocop:disable Rails/Presence
+    account =
+      if ActsAsTenant.current_tenant.present?
+        # FIXME!: raise PgEngine::Error unless invited
+        ActsAsTenant.current_tenant
+      else
+        Account.create(nombre: email, plan: 0)
+      end
+    # rubocop:enable Rails/Presence
+
     ua = user_accounts.create(account:)
-    raise(ActiveRecord::Rollback) unless ua.persisted?
+
+    raise(Error, 'no se pudo crear la cuenta') unless ua.persisted?
   end
 
   def password_required?
@@ -87,9 +111,16 @@ class User < ApplicationRecord
 
   class Error < PgEngine::Error; end
 
-  def current_account
+  def default_account
     raise Error, 'El usuario debe tener cuenta' if accounts.empty?
 
-    accounts.first
+    user_accounts.first.account
+    # throw :warden, scope: :user, message: :user_not_belongs_to_account
+  end
+
+  deprecate :current_account, deprecator: PgEngine.deprecator
+
+  def current_account
+    ActsAsTenant.current_tenant
   end
 end

data/pg_engine/app/models/user_account.rb

@@ -23,6 +23,7 @@
 
 class UserAccount < ApplicationRecord
   audited
+  include Hashid::Rails
 
   belongs_to :user
   belongs_to :account

data/pg_engine/app/policies/user_account_policy.rb

@@ -4,6 +4,7 @@
 
 class UserAccountPolicy < ApplicationPolicy
   class Scope < ApplicationPolicy::Scope
+    # FIXME: quizá scopear las user_accounts según user y/o según account
     # def resolve
     #   if policy.acceso_total?
     #     scope.all

data/pg_engine/app/policies/user_policy.rb

@@ -4,17 +4,6 @@
 
 class UserPolicy < ApplicationPolicy
   class Scope < ApplicationPolicy::Scope
-    def resolve
-      if policy.acceso_total?
-        if Current.account.present?
-          scope.joins(:user_accounts).where('user_accounts.account_id': Current.account.id)
-        else
-          scope.none
-        end
-      else
-        scope.none
-      end
-    end
   end
 
   # def puede_editar?
@@ -29,7 +18,11 @@ class UserPolicy < ApplicationPolicy
   #   acceso_total? && !record.readonly?
   # end
 
-  def acceso_total?
-    user.present?
+  def base_access_to_record?
+    user.developer? || user == record
   end
+
+  # def base_access_to_collection?
+  #   user&.present?
+  # end
 end

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

@@ -4,5 +4,7 @@ div style="max-width: 22em"
   = pg_form_for(@account || object) do |f|
     = f.input :plan
     = f.input :nombre
+    = f.input :domain
+    = f.input :subdomain
     .mt-2
     = f.button :submit

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

@@ -22,7 +22,7 @@ div
         thead.table-light
           tr
             - atributos_para_listar.each do |att|
-              th = encabezado att, ordenable: true
+              th.text-nowrap style="font-size: 0.8em" = encabezado att, ordenable: true
             th.text-end
               - unless @export_link == false
                 = @clase_modelo.new.decorate.export_link(request.url)

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

@@ -0,0 +1,6 @@
+h1 Switcher
+
+ul
+  - @user_accounts.each do |user_account|
+    li = link_to user_account.account, users_account_switch_path(user_account),
+                 'data-turbo-method': :post

data/pg_engine/config/initializers/acts_as_tenant.rb

@@ -0,0 +1,38 @@
+ActsAsTenant.configure do |config|
+  config.require_tenant = true
+  # config.require_tenant = lambda do |options|
+  #   # if options[:scope] == User && true # global_domain?
+  #   #   # tal vez en algunos casos de devise sí requeriría el tenant?
+  #   #   #   creería que no, el único lugar en donde se debería queriar
+  #   #   #   User es en devise y es para obtener el current_user
+  #   #   #   hay que ver luego qué pasa con invitable
+  #   #   false
+  #   # else
+  #   #   true
+  #   # end
+  # end
+
+  # Customize the query for loading the tenant in background jobs
+  # config.job_scope = ->{ all }
+end
+
+SET_TENANT_PROC = lambda do
+  if defined?(Rails::Console)
+    puts "> ActsAsTenant.current_tenant = Account.first"
+    ActsAsTenant.current_tenant = Account.first
+  end
+end
+
+Rails.application.configure do
+  if Rails.env.development?
+    # Set the tenant to the first account in development on load
+    config.after_initialize do
+      SET_TENANT_PROC.call
+    end
+
+    # Reset the tenant after calling 'reload!' in the console
+    ActiveSupport::Reloader.to_complete do
+      SET_TENANT_PROC.call
+    end
+  end
+end

data/pg_engine/config/routes.rb

@@ -21,6 +21,10 @@ Rails.application.routes.draw do
     post 'notifications/mark_as_seen', to: 'notifications#mark_as_seen'
     post 'notifications/mark_as_unseen', to: 'notifications#mark_as_unseen'
     get 'date_jumper/jump'
+    scope controller: 'account_switcher', path: 'switcher' do
+      get '', action: 'list', as: 'account_switcher'
+      post ':user_account_id', action: 'switch', as: 'account_switch'
+    end
   end
   namespace :admin, path: 'a' do
     pg_resource(:emails)

data/pg_engine/db/migrate/20240905154330_account_tenant_columns.rb

@@ -0,0 +1,10 @@
+class AccountTenantColumns < ActiveRecord::Migration[7.2]
+  def change
+    add_column :accounts, :domain, :string
+    add_column :accounts, :subdomain, :string
+
+    add_reference :audits, :account, index: true, foreign_key: true
+    add_reference :emails, :account, index: true, foreign_key: true
+    add_reference :email_logs, :account, index: true, foreign_key: true
+  end
+end

data/pg_engine/db/seeds.rb

@@ -1,6 +1,15 @@
-DatabaseCleaner.clean_with(:truncation, except: %w(ar_internal_metadata))
+ActsAsTenant.without_tenant do
+  DatabaseCleaner.clean_with(:truncation, except: %w(ar_internal_metadata))
 
-FactoryBot.create :user, email: 'mrosso10@gmail.com', nombre: 'Martín', apellido: 'Rosso', password: 'admin123',
-                         confirmed_at: Time.now, developer: true
 
-Account.first.users << FactoryBot.create(:user, orphan: true)
+  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
+
+  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
+
+  mal.users << otro
+end

data/pg_engine/lib/pg_engine/configuracion.rb

@@ -4,30 +4,16 @@
 
 module PgEngine
   class Configuracion
-    attr_accessor :sistema_iconos, :clase_botones_chicos,
-                  :boton_destroy, :boton_edit, :boton_show,
-                  :boton_light, :icono_destroy, :icono_edit,
-                  :icono_show, :boton_export, :bootstrap_version,
-                  :users_controller
+    attr_accessor :users_controller, :global_domains
 
     def initialize
-      @sistema_iconos = 'bi'
-      @clase_botones_chicos = 'btn-sm'
-      @boton_destroy = 'light'
-      @boton_export = 'warning'
-      @boton_edit = 'light'
-      @boton_show = 'light'
-      @boton_light = 'light'
-      @icono_destroy = 'trash-fill'
-      @icono_edit = 'pencil'
-      @icono_show = 'eye-fill'
-      @bootstrap_version = 5
-
       if defined? UsersController
         @users_controller = UsersController
       elsif defined? FrontendController
         @users_controller = FrontendController
       end
+
+      @global_domains = ['app.localhost.com', 'test.host', 'localhost']
     end
   end
 end

data/pg_engine/lib/pg_engine/engine.rb

@@ -59,7 +59,6 @@ module PgEngine
 
     initializer 'byebug_bullet' do
       if Rails.env.local?
-        # Byebug
         # :nocov:
         if ENV['RUBY_DEBUG_OPEN']
           require 'byebug/core'

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

@@ -3,9 +3,10 @@
 require 'rainbow'
 
 # TODO: poder pasar blocks
+# TODO: loguear paralelamente a otro file
 
 def pg_err(*args)
-  if ENV.fetch('RAISE_ERRORS', false)
+  if ENV.fetch('RAISE_ERRORS', false) == '1'
     # :nocov:
     raise args.first if args.first.is_a?(Exception)
 

data/pg_engine/lib/pg_engine.rb

@@ -16,6 +16,7 @@ require 'rails'
 require 'anycable'
 require 'anycable-rails'
 require 'anycable-rails-jwt'
+require 'acts_as_tenant'
 require 'cable_ready'
 require 'caxlsx_rails'
 require 'draper'
@@ -105,4 +106,8 @@ module PgEngine
       https://fonts.googleapis.com/css2?family=Ubuntu:ital,wght@0,300;0,400;\
       0,500;0,700;1,300;1,400;1,500;1,700&display=swap
     URL
+
+  def self.deprecator
+    @deprecator ||= ActiveSupport::Deprecation.new('7.5', 'PgEngine')
+  end
 end