pg_rails 7.6.20 → 7.6.21.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a76ffabfe4b54636335deff5bc216c0de26d6f0a6a7e42a5b54c6d3e1c065a7
-  data.tar.gz: 72bd49ecd3d237d6aa083d54ec04f2d473a1c427e1c971b0ae77e65da94a4044
+  metadata.gz: 6698336321ce3bb886aa1de70219bab209e2f8b2f1b3f867282a29f1f1ebf5a5
+  data.tar.gz: fae76eef1209ba3e463740c8818ebd406a0b387eab151d964519fe0f5a389cec
 SHA512:
-  metadata.gz: 3199b9c236fc31a94710715e1c64f6a40d90c0c3b391a3e7c73dc79723bdab3ecf4a55adba024002efbf5a95d3990aa0569c6ef08f4acfc55bc88a9f2bfc862f
-  data.tar.gz: f4037520fd19acdf4e0c2b1564519431d35c5c6dd65dca12ee7b78bb97b83dd2b787077295e951cc28f4767dd3f71bede2b5fa52716b919c94256df9a0616245
+  metadata.gz: 55b7bc4417466c09110d4e48c4ee7355fdfc7bcf8e153592f9e0418fe518803953b73a6c3584274992aa3624cf6073b0ddab327e9971d7bb17923fbd176322ed
+  data.tar.gz: c51ce96d9af18a24111adc2130ae196290df313198561b4d6b23f59447b6d5d7762c5907bb1bcac59c7aabfbfc439b75324e06901d48de98181462b95c7e4582

data/pg_associable/app/javascript/modal_controller.js

@@ -90,12 +90,16 @@ export default class extends Controller {
   }
 
   reloadTop () {
-    // FIXME: rename to main?
+    // TODO!!: rename to main?
     const topFrame = document.querySelector('#top')
-    if (topFrame.attributes.src) {
-      topFrame.reload()
+    if (topFrame) {
+      if (topFrame.attributes.src) {
+        topFrame.reload()
+      } else {
+        topFrame.setAttribute('src', window.location)
+      }
     } else {
-      topFrame.setAttribute('src', window.location)
+      window.location.reload()
     }
   }
 

data/pg_associable/spec/pg_associable/helpers_spec.rb

@@ -3,16 +3,8 @@ require 'rails_helper'
 describe PgAssociable::Helpers do
   include ActiveSupport::CurrentAttributes::TestHelper
 
-  describe 'current attributes gets reset' do
-    it 'sets a current attribute' do
-      Current.user = 1
-      expect(Current.namespace).to be_nil
-    end
-
-    it 'the attribute gets reset' do
-      Current.namespace = 2
-      expect(Current.user).to be_nil
-    end
+  before do
+    Current.namespace = :admin
   end
 
   # DEPRECATED
@@ -21,10 +13,13 @@ describe PgAssociable::Helpers do
       Admin::CategoriaDeCosasController.new
     end
     let!(:categoria_de_cosa) { create :categoria_de_cosa }
+    let(:tid) do
+      Current.user.user_account_for(Current.account).to_param
+    end
 
     before do
-      Current.user = create :user, :developer
-      allow(ctrl).to receive_messages(params: { id: 123, query: categoria_de_cosa.nombre })
+      Current.user = create :user, :owner
+      allow(ctrl).to receive_messages(params: { id: 123, query: categoria_de_cosa.nombre, tid: })
       allow(ctrl).to receive(:render)
     end
 
@@ -42,7 +37,7 @@ describe PgAssociable::Helpers do
     let!(:cosa) { create :cosa }
 
     before do
-      Current.user = create :user, :developer
+      Current.user = create :user, :owner
       allow(ctrl).to receive_messages(params: { id: 123, query: cosa.id })
       allow(ctrl).to receive(:render)
     end

data/pg_engine/app/components/inline_edit/inline_edit_component.html.slim

@@ -13,7 +13,7 @@
         = button_tag class: 'btn btn-sm btn-primary',
                      data: { controller: 'tooltip', 'bs-title': 'Guardar' } do
           i.bi.bi-check-lg
-        = link_to users_inline_show_path(model: @model.to_gid, attribute: @attribute),
+        = link_to tenant_inline_show_path(model: @model.to_gid, attribute: @attribute),
                   class: 'btn btn-sm btn-secondary',
                   data: { controller: 'tooltip', 'bs-title': 'Cancelar' } do
           i.bi.bi-x-lg

data/pg_engine/app/components/inline_edit/inline_show_component.html.slim

@@ -1,10 +1,10 @@
-- if Current.namespace == :users && \
+- if Current.namespace == :tenant && \
      @model.class.inline_editable?(@unsuffixed_attribute) && helpers.policy(@model).edit?
   = helpers.turbo_frame_tag(@frame_id, class: 'inline-edit')
     - if @record_updated
       pg-event[data-event-name="pg:record-updated" data-inline="true" data-turbo-temporary=""
                data-response='#{@model.decorate.to_json}']
-    = link_to users_inline_edit_path(model: @model.to_gid, attribute: @attribute),
+    = link_to tenant_inline_edit_path(model: @model.to_gid, attribute: @attribute),
               data: { \
                 controller: :tooltip,
                 'bs-title': "Modificar #{@model.class.human_attribute_name(@attribute).downcase}" },

data/pg_engine/app/components/notifications_bell_component.rb

@@ -6,7 +6,7 @@ class NotificationsBellComponent < BaseComponent
   end
 
   erb_template <<~ERB
-    <div>
+    <div class="d-flex">
       <% if @tooltip.present? %>
         <div class="d-inline-block text-white pg--notifications-bell--tooltip">
           <%= @tooltip %>

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

@@ -19,11 +19,11 @@ module Admin
     end
 
     def atributos_para_listar
-      atributos_permitidos
+      %i[plan nombre domain subdomain owner]
     end
 
     def atributos_para_mostrar
-      atributos_permitidos
+      %i[plan nombre domain subdomain owner]
     end
   end
 end

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

@@ -21,15 +21,15 @@ module Admin
     end
 
     def atributos_para_buscar
-      %i[user account profiles]
+      %i[user account profiles_arr_cont]
     end
 
     def atributos_para_listar
-      %i[user account profiles]
+      %i[user user_email_f account profiles_f]
     end
 
     def atributos_para_mostrar
-      %i[user account profiles]
+      %i[user account]
     end
   end
 end

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

@@ -39,7 +39,10 @@ module Admin
     end
 
     def atributos_para_mostrar
-      %i[email nombre apellido confirmed_at developer]
+      %i[email nombre apellido confirmed_at developer
+         current_sign_in_at current_sign_in_ip last_sign_in_at last_sign_in_ip
+         invitation_created_at invitation_sent_at invitation_accepted_at
+         invitation_limit invited_by]
     end
   end
 end

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

@@ -171,7 +171,7 @@ module PgEngine
       pg_respond_show
     end
 
-    # FIXME: refactor
+    # TODO!: refactor
     def respond_with_modal(component)
       content = component.render_in(view_context)
 
@@ -199,7 +199,8 @@ module PgEngine
         component = ModalContentComponent.new(src: path)
         respond_with_modal(component)
       else
-        if modal_targeted? && referred_by?(instancia_modelo)
+        if (modal_targeted? && referred_by?(instancia_modelo)) ||
+           !policy(instancia_modelo.object).show?
           add_breadcrumb instancia_modelo.to_s_short
         else
           add_breadcrumb instancia_modelo.to_s_short,
@@ -282,7 +283,7 @@ module PgEngine
                            .gsub('%action_name%', action_name)
                            .gsub('%request_format%', request.format.symbol.to_s)
                            .gsub('%turbo_frame%', request.headers['Turbo-Frame'] || 'top')
-      # FIXME: rename to main?
+      # TODO!!: rename to main?
     end
 
     def show_filters?
@@ -384,6 +385,7 @@ module PgEngine
         format.xlsx do
           render xlsx: 'download',
                  filename: "#{clase_modelo.nombre_plural.gsub(' ', '-').downcase}" \
+                           "#{action_name == 'archived' ? '-archivados' : ''}" \
                            "-#{Time.zone.now.strftime('%Y-%m-%d-%H.%M.%S')}.xlsx"
         end
       end
@@ -414,7 +416,7 @@ module PgEngine
     # rubocop:disable Metrics/PerceivedComplexity
     def pg_respond_destroy(model, land_on = nil)
       if destroy_model(model)
-        # FIXME: rename to main
+        # TODO!!: rename to main
         if turbo_frame? && current_turbo_frame != 'top'
           body = <<~HTML.html_safe
             <pg-event data-event-name="pg:record-destroyed" data-turbo-temporary>
@@ -529,9 +531,12 @@ module PgEngine
     end
 
     def filtros_y_policy(campos, dflt_sort = nil, archived: false)
-      @filtros = PgEngine::FiltrosBuilder.new(
-        self, clase_modelo, campos
-      )
+      if campos.any?
+        @filtros = PgEngine::FiltrosBuilder.new(
+          self, clase_modelo, campos
+        )
+      end
+
       scope = default_scope_for_current_model(archived:)
 
       shared_context = Ransack::Adapters::ActiveRecord::Context.new(scope)

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module PgEngine
+  module TenantHelper
+    # rubocop:disable Metrics/AbcSize
+    def set_tenant_from_params_or_fail!
+      if ActsAsTenant.current_tenant.present?
+        return unless Rails.env.test?
+
+        # Si es un controller test
+        # TODO: migrar a request
+        ua = Current.user.user_accounts.ua_active.where(account: ActsAsTenant.current_tenant).first
+        Current.active_user_account = ua
+
+        # Si no fue seteado por el domain
+
+        return
+      end
+
+      uaid = UserAccount.decode_id(params[:tid]) if params[:tid].present?
+
+      ua = ActsAsTenant.without_tenant do
+        Current.user.user_accounts.ua_active.where(id: uaid).first if uaid.present?
+      end
+
+      raise ActsAsTenant::Errors::NoTenantSet if ua.blank?
+
+      set_current_tenant(ua.account)
+      Current.active_user_account = ua
+    end
+    # rubocop:enable Metrics/AbcSize
+  end
+end

data/pg_engine/app/controllers/pg_engine/base_admin_controller.rb

@@ -11,7 +11,6 @@ module PgEngine
     end
 
     around_action :set_without_tenant
-
     def set_without_tenant(&)
       ActsAsTenant.without_tenant(&)
     end

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

@@ -10,20 +10,20 @@ module PgEngine
     set_current_tenant_by_subdomain_or_domain(:account, :subdomain, :domain)
     set_current_tenant_through_filter
 
+    include DefaultUrlOptions
+
     before_action do
       Current.user = current_user
       Current.controller = self
 
-      # if ActsAsTenant.current_tenant.blank? && !global_domain?
-      #   raise ActsAsTenant::Errors::NoTenantSet
-      # end
-      # FIXME: if current_tenant.present? check it's not discarded
-      # FIXME: if session['current_user_account'] present? check
-      #        user belongs to it, and if not, cleanup
       if Current.user.present?
-        user_accounts = Current.user.user_accounts.kept
-        if ActsAsTenant.current_tenant.present?
-          unless user_accounts.exists?(account: ActsAsTenant.current_tenant)
+        active_user_accounts = Current.user.user_accounts.ua_active.to_a
+        if ActsAsTenant.current_tenant.present? && !Rails.env.test?
+          # TODO: los controller tests pasan por acá porque no se ejecuta
+          # el tenant middleware. afortunadamente eso hace que no haga falta
+          # el tid. igualmente cambiarlos a requests specs
+          # TODO: testear
+          unless active_user_accounts.any? { |uac| uac.account == ActsAsTenant.current_tenant }
             pg_warn <<~WARN
               #{Current.user.to_gid} not belongs to \
               #{ActsAsTenant.current_tenant.to_gid}. Signed out
@@ -34,14 +34,6 @@ module PgEngine
           end
 
           @current_tenant_set_by_domain_or_subdomain = true
-        else
-          account = if user_accounts.count == 1
-                      user_accounts.first.account
-                    elsif session['current_user_account'].present?
-                      user_accounts.where(id: session['current_user_account']).first&.account
-                    end
-
-          set_current_tenant(account)
         end
       end
     end
@@ -88,9 +80,17 @@ module PgEngine
     end
 
     def no_tenant_set(error)
+      pg_debug(error)
       return internal_error(error) if Current.user.blank?
 
-      redirect_to users_account_switcher_path
+      active_user_accounts = ActsAsTenant.without_tenant do
+        Current.user.user_accounts.ua_active.to_a
+      end
+      if active_user_accounts.length == 1 && params[:tid].blank?
+        redirect_to url_for(tid: active_user_accounts.first.to_param)
+      else
+        redirect_to users_accounts_path
+      end
     end
 
     def bad_user_input(error)
@@ -150,9 +150,6 @@ module PgEngine
       @navbar_opened_class = navbar_expanded ? 'opened' : ''
       @navbar_chevron_class = navbar_expanded ? 'bi-chevron-left' : 'bi-chevron-right'
       @navbar = Navbar.new
-      PgEngine.configuracion.navigators.each do |navigator|
-        navigator.configure(@navbar)
-      end
 
       if defined?(Rollbar) && Rollbar.configuration.enabled && Rails.application.credentials.rollbar.present?
         @rollbar_token = Rails.application.credentials.rollbar.access_token_client

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

@@ -6,7 +6,7 @@ module PgEngine
 
     # :nocov:
     def login_as
-      # FIXME: make a POST route
+      # TODO!: make a POST route
       return head :bad_request unless dev_user_or_env?
 
       Current.namespace = nil

data/pg_engine/app/controllers/pg_engine/base_users_controller.rb

@@ -1,13 +1,15 @@
 module PgEngine
   class BaseUsersController < ApplicationController
     include PgEngine::RequireSignIn
-    include PgEngine::RequireTenantSet
 
     before_action do
-      # FIXME: requisito que esto esté seteado
+      # TODO!: requisito que esto esté seteado
       Current.namespace = :users
 
-      add_breadcrumb 'Inicio', :users_root_path unless using_modal2? || frame_embedded?
+      @other_active_accounts = ActsAsTenant.without_tenant do
+        Current.user.user_accounts.ua_active.to_a
+      end
+      @sidebar = false
     end
   end
 end

data/pg_engine/app/controllers/pg_engine/devise_controller.rb

@@ -13,6 +13,7 @@ module PgEngine
     before_action :configure_permitted_parameters
     before_action do
       @no_main_frame = true
+      @sidebar = false
     end
 
     layout :layout_by_user
@@ -25,7 +26,9 @@ module PgEngine
 
     def configure_permitted_parameters
       devise_parameter_sanitizer.permit(:sign_up, keys: %i[nombre apellido accept_terms])
-      devise_parameter_sanitizer.permit(:account_update, keys: %i[nombre apellido])
+      devise_parameter_sanitizer.permit(:account_update, keys: %i[nombre apellido avatar])
+      devise_parameter_sanitizer.permit(:invite, keys: [{ user_accounts_attributes: [{ profiles: [] }] }])
+      devise_parameter_sanitizer.permit(:accept_invitation, keys: %i[nombre apellido accept_terms])
     end
   end
 end

data/pg_engine/app/controllers/pg_engine/tenant_controller.rb

@@ -0,0 +1,22 @@
+module PgEngine
+  class TenantController < ApplicationController
+    include PgEngine::RequireSignIn
+    include PgEngine::TenantHelper
+
+    before_action do
+      Current.namespace = :tenant
+
+      set_tenant_from_params_or_fail!
+
+      cid = Current.account.id
+      @other_active_accounts = ActsAsTenant.without_tenant do
+        Current.user.user_accounts.ua_active.where.not(account_id: cid).to_a
+      end
+
+      unless using_modal2? || frame_embedded? ||
+             (self.class.respond_to?(:skip_default_breadcrumb) && self.class.skip_default_breadcrumb)
+        add_breadcrumb 'Inicio', :tenant_root_path
+      end
+    end
+  end
+end

data/pg_engine/app/controllers/{users → tenant}/dashboard_controller.rb

@@ -1,5 +1,5 @@
-module Users
-  class DashboardController < PgEngine.config.users_controller
+module Tenant
+  class DashboardController < PgEngine::TenantController
     layout 'pg_layout/containerized'
 
     def dashboard

data/pg_engine/app/controllers/tenant/inline_edit_controller.rb

@@ -0,0 +1,22 @@
+module Tenant
+  class InlineEditController < PgEngine::TenantController
+    before_action do
+      if current_turbo_frame.blank?
+        render_my_component(BadRequestComponent.new, :bad_request)
+      else
+        @model = GlobalID::Locator.locate params[:model]
+        authorize(@model)
+      end
+    end
+
+    def edit
+      attribute = params[:attribute]
+      render InlineEditComponent.new(@model, attribute), layout: false
+    end
+
+    def show
+      attribute = params[:attribute]
+      render InlineShowComponent.new(@model, attribute), layout: false
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+module Tenant
+  class UserAccountsController < PgEngine::TenantController
+    include PgEngine::Resource
+
+    self.clase_modelo = UserAccount
+    self.skip_default_breadcrumb = true
+
+    before_action do
+      @sidebar = false
+      unless modal_targeted? || frame_embedded?
+        add_breadcrumb Account.model_name.human(count: 2), ->(h) { h.users_accounts_path(tid: nil) }
+        add_breadcrumb ActsAsTenant.current_tenant, users_account_path(Current.account, tid: nil)
+      end
+      unless modal_targeted?
+        add_breadcrumb 'Usuarios', tenant_user_accounts_path
+      end
+      @actions = [
+        [
+          'Agregar usuario',
+          new_user_invitation_path(tid: Current.tid),
+          { class: 'me-1 btn btn-warning btn-sm', 'data-turbo-frame': :_top }
+        ]
+      ]
+    end
+
+    before_action do
+      unless modal_targeted?
+        # add_breadcrumb @user_account.account, users_account_path(@user_account.account, tid: nil)
+      end
+    end
+
+    def default_sort
+      'id asc'
+    end
+
+    private
+
+    def atributos_permitidos
+      [
+        :membership_status, { profiles: [] }
+      ]
+    end
+
+    def atributos_para_buscar
+      []
+    end
+
+    def atributos_para_listar
+      %i[user user_email_f profiles_f estado_f]
+    end
+  end
+end

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

@@ -2,30 +2,61 @@
 
 # generado con pg_rails
 
+# TODO!: on index: (para cuando active los subdomains)
+#  - 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
+
 module Users
   class AccountsController < UsersController
     include PgEngine::Resource
-
     self.clase_modelo = Account
-    add_breadcrumb 'Cuentas'
     self.skip_default_breadcrumb = true
 
-    # private
+    add_breadcrumb Account.model_name.human(count: 2), ->(h) { h.users_accounts_path(tid: nil) }
+
+    # La user_account puede estar disabled
+    def show
+      add_breadcrumb @account, users_account_path(@account, tid: nil)
+
+      @user_account = Current.user.user_account_for(@account).decorate
+    end
+
+    def update_invitation
+      set_instancia_modelo
+      @user_account = Current.user.user_account_for(@account)
+
+      invitation_status = if params[:reject] == '1'
+                            :ist_rejected
+                          elsif params[:sign_off] == '1'
+                            :ist_signed_off
+                          elsif params[:accept] == '1'
+                            :ist_accepted
+                          else
+                            # :nocov:
+                            raise PgEngine::BadUserInput, 'Solicitud incorrecta'
+                            # :nocov:
+                          end
+
+      @user_account.update(invitation_status:)
+
+      redirect_to users_accounts_path
+    end
 
-    # def atributos_permitidos
-    #   %i[plan nombre domain subdomain]
-    # end
+    private
 
-    # def atributos_para_buscar
-    #   atributos_permitidos
-    # end
+    def atributos_permitidos
+      %i[nombre logo plan]
+    end
 
-    # def atributos_para_listar
-    #   atributos_permitidos
-    # end
+    def atributos_para_buscar
+      []
+    end
 
-    # def atributos_para_mostrar
-    #   atributos_permitidos
-    # end
+    def atributos_para_listar
+      %i[nombre plan owner]
+    end
   end
 end

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

@@ -0,0 +1,78 @@
+module Users
+  class InvitationsController < Devise::InvitationsController
+    include PgEngine::TenantHelper
+    before_action only: %i[new create] do
+      set_tenant_from_params_or_fail!
+
+      add_breadcrumb Account.model_name.human(count: 2), ->(h) { h.users_accounts_path(tid: nil) }
+      add_breadcrumb ActsAsTenant.current_tenant, users_account_path(ActsAsTenant.current_tenant)
+      add_breadcrumb 'Usuarios'
+      add_breadcrumb 'Agregar usuario'
+      @sidebar = false
+      @no_main_frame = true
+    end
+
+    def new
+      self.resource = resource_class.new
+      resource.user_accounts.build
+      render :new
+    end
+
+    def create
+      if params['user'].present? && params['user']['email'].present?
+        email = params['user']['email']
+        self.resource = ActsAsTenant.without_tenant do
+          User.find_by(email:)
+        end
+      end
+
+      if resource.present?
+        if resource.kept?
+          add_to_account(resource)
+        else
+          render_error(resource)
+        end
+      else
+        super
+      end
+    end
+
+    def after_invite_path_for(_inviter, _invitee)
+      # tenant_user_accounts_path
+      users_account_path(ActsAsTenant.current_tenant)
+    end
+
+    protected
+
+    def render_error(_resource)
+      new_user = User.new(invite_params)
+      self.resource = new_user
+      resource.errors.add(:email, 'pertenece a un usuario que no está disponible')
+      render :new, status: :unprocessable_entity
+    end
+
+    def add_to_account(resource)
+      new_user = User.new(invite_params)
+
+      user_account = new_user.user_accounts.first
+      user_account.invitation_status = :ist_invited
+      resource.user_accounts << user_account
+      if resource.valid?
+        respond_with resource, location: after_invite_path_for(current_inviter, resource)
+      else
+        if user_account_exists?(resource)
+          new_user.errors.add(:email, 'pertenece a un usuario de la cuenta')
+        else
+          new_user.errors.add(:base, resource.errors.full_messages.join(', '))
+        end
+        self.resource = new_user
+        render :new, status: :unprocessable_entity
+      end
+    end
+
+    def user_account_exists?(resource)
+      first = resource.errors.first
+      first.present? && first.attribute == :'user_accounts.user_id' && first.type == :taken
+    end
+  end
+end

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

@@ -1,5 +1,6 @@
 module Users
   class NotificationsController < PgEngine.config.users_controller
+    # TODO: authorize
     def mark_as_unseen
       notification = Noticed::Notification.find(params[:id])
       notification.mark_as_unseen!