pg_rails 7.6.20 → 7.6.21.pre.2

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

@@ -0,0 +1,52 @@
+- if user_signed_in?
+  .xcollapse.xnavbar-collapse.justify-content-end
+    ul.navbar-nav.flex-row
+      - if Current.account.present?
+        li.nav-item.dropdown
+          = link_to '#', class: 'nav-link dropdown-toggle py-0 d-flex align-items-center',
+                         role: :button, 'data-bs-toggle': :dropdown, 'aria-expanded': 'false' do
+            - if Current.account.logo.present?
+              = image_tag Current.account.logo.variant(:thumb), class: 'rounded-circle border border-2 me-2', width: 40, height: 40
+            - else
+              i.bi.bi-bag-fill.me-2 style="font-size: 1.7em"
+            = Current.account
+          ul.dropdown-menu
+            - if @other_active_accounts&.any?
+              h6.dropdown-header Cambiar a:
+              - @other_active_accounts.each do |ua|
+                li = link_to ua.account, tenant_root_path(tid: ua.to_param), class: 'dropdown-item'
+              li
+                hr.dropdown-divider
+            li = link_to "Administrar #{Account.model_name.human(count: 2)}", users_accounts_path(tid: nil), class: 'dropdown-item'
+      - elsif @other_active_accounts&.any?
+        li.nav-item.dropdown.d-flex
+          = link_to '#', class: 'nav-link dropdown-toggle py-0 d-flex align-items-center',
+                         role: :button, 'data-bs-toggle': :dropdown, 'aria-expanded': 'false' do
+            i.bi.bi-bag-fill.me-2 style="font-size: 1.7em"
+            = Account.model_name.human(count: 2)
+          ul.dropdown-menu
+            - @other_active_accounts.each do |ua|
+              li = link_to ua.account, tenant_root_path(tid: ua.to_param), class: 'dropdown-item'
+            li
+              hr.dropdown-divider
+            li = link_to "Administrar #{Account.model_name.human(count: 2).downcase}", users_accounts_path(tid: nil), class: 'dropdown-item'
+
+      .vr.bg-white.mx-3
+      - if Current.user.present? && @notifications_bell.present?
+        = render @notifications_bell
+      .vr.bg-white.mx-3
+      li.nav-item.dropdown.me-3
+        = link_to '#', class: 'nav-link dropdown-toggle py-0 d-flex align-items-center',
+                       role: :button, 'data-bs-toggle': :dropdown, 'aria-expanded': 'false' do
+          - if Current.user.avatar.present?
+            = image_tag Current.user.avatar.variant(:thumb), class: 'rounded-circle border border-2 me-2', width: 40, height: 40
+          - else
+            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 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'
+          li = link_to 'Cerrar sesión', destroy_user_session_path(tid: nil),
+                       'data-turbo-method': :delete, class: 'dropdown-item'

data/pg_layout/lib/pg_layout.rb

@@ -1,8 +1,3 @@
-# Para que la viewpath de pg_layout tenga precedencia sobre las de kaminari y devise
-require 'kaminari'
-require 'devise'
-require 'devise-i18n'
-
 require_relative 'pg_layout/engine'
 
 module PgLayout

data/pg_rails/lib/pg_rails/pundit_matchers.rb

@@ -0,0 +1,21 @@
+# :nocov:
+RSpec::Matchers.define :permit do |action|
+  match do |policy|
+    policy.public_send("#{action}?")
+  end
+
+  failure_message do |policy|
+    <<~STRING
+      #{policy.class} does not permit #{action}
+       on #{policy.record} for #{policy.user.inspect}.
+    STRING
+  end
+
+  failure_message_when_negated do |policy|
+    <<~STRING
+      #{policy.class} does not forbid #{action} on
+       #{policy.record} for #{policy.user.inspect}.
+    STRING
+  end
+end
+# :nocov:

data/pg_rails/lib/pg_rails/tpath_support.rb

@@ -0,0 +1,73 @@
+# :nocov:
+module PgEngine
+  module TpathSupport
+    module RequestsPatch
+      def get(url, **)
+        super(tpath(url), **)
+      end
+
+      def post(url, **)
+        super(tpath(url), **)
+      end
+
+      def put(url, **)
+        super(tpath(url), **)
+      end
+
+      def patch(url, **)
+        super(tpath(url), **)
+      end
+
+      def delete(url, **)
+        super(tpath(url), **)
+      end
+
+      def redirect_to(arg, tpath: true)
+        if tpath
+          super(tpath(arg, query_string: false))
+        else
+          super(arg)
+        end
+      end
+    end
+
+    module ControllersPatch
+      def redirect_to(arg, tpath: true)
+        if tpath
+          super(tpath(arg, query_string: false))
+        else
+          super(arg)
+        end
+      end
+    end
+
+    def _tpath_ua
+      usr = if respond_to?(:logged_user)
+              logged_user
+            elsif respond_to?(:user)
+              user
+            else
+              raise 'no user available'
+            end
+
+      raise 'user is null' if usr.nil?
+
+      usr.active_user_account_for(ActsAsTenant.current_tenant)
+    end
+
+    def tpath(arg, query_string: true)
+      ua = _tpath_ua
+      return arg.push(tid: ua.to_param) if arg.is_a? Array
+
+      path = arg
+
+      if query_string
+        "#{path}?tid=#{ua.to_param}"
+      else
+        # "/u/t/#{ua.to_param}#{path}"
+        path.sub('/u/t/', "/u/t/#{ua.to_param}/")
+      end
+    end
+  end
+end
+# :nocov:

data/pg_rails/lib/pg_rails.rb

@@ -1,3 +1,9 @@
+# Para que la viewpath y localepath de pg_rails tengan precedencia sobre las de kaminari y devise
+require 'kaminari'
+require 'devise'
+require 'devise-i18n'
+require 'devise_invitable'
+
 require "#{__dir__}/../../pg_engine/lib/pg_engine"
 require "#{__dir__}/../../pg_associable/lib/pg_associable"
 require "#{__dir__}/../../pg_scaffold/lib/pg_scaffold" if Rails.env.local?

data/pg_rails/lib/version.rb

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

data/pg_rails/scss/pg_rails.scss

@@ -77,7 +77,7 @@ $values: 0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100;
     white-space: nowrap;
     min-width: 30em * $value * 0.01;
 
-    // FIXME: con css grid esto se debería poder hacer mejor
+    // TODO: con css grid esto se debería poder hacer mejor
     // además, el pg_asociable directamente se rompe
     &:has(form) {
       min-width: 28em;

data/pg_scaffold/lib/generators/pg_rspec/scaffold/templates/controller_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# FIXME: reemplazar por requests spec
+# TODO: reemplazar por requests spec
 # generado con pg_rails
 
 require 'rails_helper'

data/pg_scaffold/lib/generators/pg_slim/templates/index.html.slim

@@ -9,7 +9,7 @@
   = @clase_modelo.new.decorate.new_link
   .ms-1
   = @clase_modelo.new.decorate.export_link(request.url)
-/ FIXME: update
+/ TODO: update
 .collapse.p-2.border-bottom#filtros class="#{ 'show' if show_filters? }"
   .d-flex.align-items-center
     .px-2.d-none.d-sm-inline-block

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.20
+  version: 7.6.21.pre.2
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-22 00:00:00.000000000 Z
+date: 2024-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -206,6 +206,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.12.0
+- !ruby/object:Gem::Dependency
+  name: devise_invitable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.9
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -695,8 +709,8 @@ files:
 - pg_engine/app/controllers/admin/simple_user_notifiers_controller.rb
 - pg_engine/app/controllers/admin/user_accounts_controller.rb
 - pg_engine/app/controllers/admin/users_controller.rb
-- pg_engine/app/controllers/concerns/pg_engine/require_tenant_set.rb
 - pg_engine/app/controllers/concerns/pg_engine/resource.rb
+- pg_engine/app/controllers/concerns/pg_engine/tenant_helper.rb
 - pg_engine/app/controllers/pg_engine/base_admin_controller.rb
 - pg_engine/app/controllers/pg_engine/base_controller.rb
 - pg_engine/app/controllers/pg_engine/base_public_controller.rb
@@ -704,14 +718,16 @@ files:
 - pg_engine/app/controllers/pg_engine/devise_controller.rb
 - pg_engine/app/controllers/pg_engine/health_controller.rb
 - pg_engine/app/controllers/pg_engine/require_sign_in.rb
+- pg_engine/app/controllers/pg_engine/tenant_controller.rb
 - pg_engine/app/controllers/public/mensaje_contactos_controller.rb
 - pg_engine/app/controllers/public/webhooks_controller.rb
-- pg_engine/app/controllers/users/account_switcher_controller.rb
+- pg_engine/app/controllers/tenant/dashboard_controller.rb
+- pg_engine/app/controllers/tenant/inline_edit_controller.rb
+- pg_engine/app/controllers/tenant/user_accounts_controller.rb
 - pg_engine/app/controllers/users/accounts_controller.rb
 - pg_engine/app/controllers/users/confirmations_controller.rb
-- pg_engine/app/controllers/users/dashboard_controller.rb
 - pg_engine/app/controllers/users/date_jumper_controller.rb
-- pg_engine/app/controllers/users/inline_edit_controller.rb
+- pg_engine/app/controllers/users/invitations_controller.rb
 - pg_engine/app/controllers/users/notifications_controller.rb
 - pg_engine/app/controllers/users/registrations_controller.rb
 - pg_engine/app/decorators/account_decorator.rb
@@ -722,6 +738,7 @@ files:
 - pg_engine/app/decorators/pg_engine/base_record_decorator.rb
 - pg_engine/app/decorators/user_account_decorator.rb
 - pg_engine/app/decorators/user_decorator.rb
+- pg_engine/app/helpers/pg_engine/accounts_helper.rb
 - pg_engine/app/helpers/pg_engine/flash_helper.rb
 - pg_engine/app/helpers/pg_engine/form_helper.rb
 - pg_engine/app/helpers/pg_engine/frame_helper.rb
@@ -734,6 +751,7 @@ files:
 - pg_engine/app/inputs/pg_engine/fecha_input.rb
 - pg_engine/app/lib/pg_engine/bootstrap5_breadcrumbs_builder.rb
 - pg_engine/app/lib/pg_engine/date_jumper.rb
+- pg_engine/app/lib/pg_engine/default_url_options.rb
 - pg_engine/app/lib/pg_engine/devise_failure_app.rb
 - pg_engine/app/lib/pg_engine/error_helper.rb
 - pg_engine/app/lib/pg_engine/filtros_builder.rb
@@ -742,6 +760,7 @@ files:
 - pg_engine/app/mailers/pg_engine/base_mailer.rb
 - pg_engine/app/mailers/pg_engine/user_mailer.rb
 - pg_engine/app/models/account.rb
+- pg_engine/app/models/concerns/pg_engine/child_record.rb
 - pg_engine/app/models/concerns/pg_engine/naming.rb
 - pg_engine/app/models/current.rb
 - pg_engine/app/models/email.rb
@@ -797,9 +816,12 @@ files:
 - pg_engine/app/views/pg_engine/user_mailer/notification.text.slim
 - pg_engine/app/views/public/mensaje_contactos/_gracias.html.slim
 - pg_engine/app/views/public/mensaje_contactos/new.html.slim
-- pg_engine/app/views/users/account_switcher/list.html.slim
+- pg_engine/app/views/tenant/dashboard/dashboard.html.slim
+- pg_engine/app/views/tenant/user_accounts/_fields.html.slim
+- 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/show.html.slim
-- pg_engine/app/views/users/dashboard/dashboard.html.slim
 - pg_engine/config/initializers/action_controller.rb
 - pg_engine/config/initializers/action_mailer.rb
 - pg_engine/config/initializers/active_admin.rb
@@ -837,6 +859,8 @@ files:
 - pg_engine/db/migrate/20240611000220_add_notifications_count_to_noticed_event.noticed.rb
 - pg_engine/db/migrate/20240614130246_create_action_text_tables.action_text.rb
 - pg_engine/db/migrate/20240905154330_account_tenant_columns.rb
+- pg_engine/db/migrate/20241023203849_devise_invitable.rb
+- pg_engine/db/migrate/20241027225618_add_membership_status_to_user_accounts.rb
 - pg_engine/db/seeds.rb
 - pg_engine/lib/pg_engine.rb
 - pg_engine/lib/pg_engine/configuracion.rb
@@ -890,6 +914,7 @@ files:
 - pg_engine/spec/lib/pg_form_builder_spec.rb
 - pg_engine/spec/mailers/previews/devise_preview.rb
 - pg_engine/spec/models/account_spec.rb
+- pg_engine/spec/models/concerns/pg_engine/child_record_spec.rb
 - pg_engine/spec/models/email_log_spec.rb
 - pg_engine/spec/models/email_spec.rb
 - pg_engine/spec/models/mensaje_contacto_spec.rb
@@ -898,10 +923,12 @@ files:
 - pg_engine/spec/models/user_spec.rb
 - pg_engine/spec/overrides/audited_audit_spec.rb
 - pg_engine/spec/pg_engine/pdf_preview_generator_spec.rb
+- pg_engine/spec/policies/account_policy_spec.rb
 - pg_engine/spec/requests/active_storage_spec.rb
 - pg_engine/spec/requests/admin/eventos_spec.rb
 - pg_engine/spec/requests/base_controller_requests_spec.rb
 - pg_engine/spec/requests/current_attributes_spec.rb
+- pg_engine/spec/requests/devise/invitations_spec.rb
 - pg_engine/spec/requests/devise_spec.rb
 - pg_engine/spec/requests/public/webhooks_spec.rb
 - pg_engine/spec/requests/resource_spec.rb
@@ -911,7 +938,7 @@ files:
 - pg_engine/spec/requests/users/date_jumper_spec.rb
 - pg_engine/spec/requests/users/inline_edit_spec.rb
 - pg_engine/spec/requests/users/registrations_spec.rb
-- pg_engine/spec/requests/users/switcher_spec.rb
+- pg_engine/spec/requests/users/user_accounts_spec.rb
 - pg_engine/spec/system/alerts_spec.rb
 - pg_engine/spec/system/breadcrumbs_spec.rb
 - pg_engine/spec/system/date_selector_spec.rb
@@ -960,8 +987,12 @@ files:
 - pg_layout/app/javascript/utils/utils.ts
 - pg_layout/app/lib/navbar.rb
 - pg_layout/app/views/devise/confirmations/new.html.erb
+- pg_layout/app/views/devise/invitations/edit.html.erb
+- pg_layout/app/views/devise/invitations/new.html.erb
 - pg_layout/app/views/devise/mailer/confirmation_instructions.html.erb
 - pg_layout/app/views/devise/mailer/email_changed.html.erb
+- pg_layout/app/views/devise/mailer/invitation_instructions.html.erb
+- pg_layout/app/views/devise/mailer/invitation_instructions.text.erb
 - pg_layout/app/views/devise/mailer/password_change.html.erb
 - pg_layout/app/views/devise/mailer/reset_password_instructions.html.erb
 - pg_layout/app/views/devise/mailer/unlock_instructions.html.erb
@@ -993,6 +1024,7 @@ files:
 - pg_layout/app/views/pg_layout/_navbar.html.erb
 - pg_layout/app/views/pg_layout/_sidebar.html.erb
 - pg_layout/app/views/pg_layout/_sidebar_mobile.html.erb
+- pg_layout/app/views/pg_layout/_signed_in_links.html.slim
 - pg_layout/lib/pg_layout.rb
 - pg_layout/lib/pg_layout/engine.rb
 - pg_layout/spec/lib/navbar_spec.rb
@@ -1001,9 +1033,11 @@ files:
 - pg_rails/lib/pg_rails/capybara_support.rb
 - pg_rails/lib/pg_rails/current_attributes_support.rb
 - pg_rails/lib/pg_rails/dotenv_support.rb
+- pg_rails/lib/pg_rails/pundit_matchers.rb
 - pg_rails/lib/pg_rails/redis_support.rb
 - pg_rails/lib/pg_rails/rspec_logger_matchers.rb
 - pg_rails/lib/pg_rails/tom_select_helpers.rb
+- pg_rails/lib/pg_rails/tpath_support.rb
 - pg_rails/lib/pg_rails/vcr_support.rb
 - pg_rails/lib/version.rb
 - pg_rails/scss/bootstrap_overrides.scss

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

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module PgEngine
-  module RequireTenantSet
-    def self.included(klass)
-      klass.before_action :require_tenant_set
-    end
-
-    def require_tenant_set
-      return if ActsAsTenant.current_tenant.present?
-
-      raise ActsAsTenant::Errors::NoTenantSet
-    end
-  end
-end

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

@@ -1,30 +0,0 @@
-module Users
-  class AccountSwitcherController < PgEngine.config.users_controller
-    rescue_from ActsAsTenant::Errors::NoTenantSet, with: :internal_error
-    skip_before_action :require_tenant_set
-
-    before_action do
-      @no_main_frame = true
-    end
-
-    layout 'pg_layout/centered'
-
-    around_action :set_without_tenant
-
-    def set_without_tenant(&)
-      ActsAsTenant.without_tenant(&)
-    end
-
-    def list
-      @user_accounts = Current.user.user_accounts.kept
-    end
-
-    def switch
-      # FIXME: handle not found
-      scope = Current.user.user_accounts.kept
-      user_account = scope.find(UserAccount.decode_id(params[:user_account_id]))
-      session['current_user_account'] = user_account.id
-      redirect_to root_path
-    end
-  end
-end

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

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

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

@@ -1,24 +0,0 @@
-h1 ¿Qué cuenta te gustaría utilizar?
-
-/ FIXME!: user_accounts add active column
-- if @user_accounts.empty?
-  p No tenés ninguna cuenta disponible
-- else
-  - 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
-
-  ul.m-auto.list-group style="max-width: 20em"
-    - @user_accounts.each do |user_account|
-      li.list-group-item
-        - if @current_tenant_set_by_domain_or_subdomain
-          = user_account.account
-        - elsif user_account.account == ActsAsTenant.current_tenant
-          b
-            = user_account.account
-            |  (Actual)
-        - else
-          = link_to user_account.account, users_account_switch_path(user_account),
-                    'data-turbo-method': :post

data/pg_engine/app/views/users/dashboard/dashboard.html.slim

@@ -1 +0,0 @@
-h1 Dashboard

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

@@ -1,84 +0,0 @@
-require 'rails_helper'
-
-describe 'redirection' do
-  let(:logged_user) { create :user }
-
-  before do
-    sign_in logged_user
-  end
-
-  context 'when switcher controller raises no tenant set' do
-    # This is to prevent a redirect loop
-    before do
-      allow_any_instance_of(User).to receive(:user_accounts).and_raise(ActsAsTenant::Errors::NoTenantSet)
-    end
-
-    it 'shows the error' do
-      get '/u/switcher'
-
-      expect(response).to have_http_status(:internal_server_error)
-    end
-  end
-
-  it do
-    get '/u/cosas'
-
-    expect(response).to have_http_status(:ok)
-  end
-
-  context 'when account is discarded' do
-    it do
-      get '/u/cosas'
-      expect(response.body).to include 'No hay ningún coso que mostrar'
-      logged_user.user_accounts.first.account.discard!
-      get '/u/cosas'
-      expect(response).to redirect_to users_account_switcher_path
-    end
-  end
-
-  context 'when has been removed from account' do
-    let!(:other_account) { create :account }
-    let!(:other_user_account) do
-      ActsAsTenant.with_tenant(other_account) do
-        logged_user.user_accounts.create!
-      end
-    end
-
-    before do
-      third_account = create :account
-      ActsAsTenant.with_tenant(third_account) do
-        logged_user.user_accounts.create!
-      end
-    end
-
-    it 'redirects to switcher' do
-      get '/u/cosas'
-      expect(response).to redirect_to users_account_switcher_path
-      follow_redirect!
-      expect(response.body).to include '¿Qué cuenta te gustaría utilizar?'
-      post "/u/switcher/#{other_user_account.to_param}"
-      expect(response).to redirect_to(root_path)
-      follow_redirect!
-      get '/u/cosas'
-      expect(response).to have_http_status(:ok)
-      expect(response.body).to include other_account.to_s
-      expect(response.body).to include 'No hay ningún coso que mostrar'
-      other_user_account.destroy!
-      get '/u/cosas'
-      expect(response).to redirect_to users_account_switcher_path
-    end
-  end
-
-  context 'when belongs to other account' do
-    before do
-      create :account, subdomain: 'other'
-      host! 'other.example.com'
-    end
-
-    it do
-      get '/u/cosas'
-
-      expect(response).to redirect_to new_user_session_path
-    end
-  end
-end