pg_rails 7.6.21.pre.11 → 7.6.22.pre.1

data/pg_engine/lib/pg_engine/test/dummy_brand.rb

@@ -0,0 +1,82 @@
+module PgEngine
+  module Test
+    class DummyBrand < PgEngine::SiteBrand
+      def initialize(include_all: false) # rubocop:disable Metrics/MethodLength
+        super()
+
+        @default_site_brand = :factura
+
+        # FIXME: mover los pngs a pg_engine/ dentro de una carpeta test/
+        @options = {
+          landing_site_url: {
+            procura: 'https://bien.com.ar/procura',
+            factura: 'https://bien.com.ar/factura'
+          },
+          logo_navbar_url: {
+            procura: 'test/procura-logo-navbar-1.png',
+            factura: 'test/factura-logo-navbar-1.png'
+          },
+          logo_xl_url: {
+            procura: 'test/procura-logo-xl-light.png',
+            factura: 'test/factura-logo-xl-light.png'
+          },
+          favicon_prefix: {
+            procura: 'test/icon/procura-favicon',
+            factura: 'test/icon/factura-favicon'
+          },
+          mailer_devise_footer_image_src: {
+            factura: 'test/factura-mail-footer-lg.png',
+            procura: 'test/procura-mail-footer-lg.png'
+          },
+          mailer_base_footer_image_src: {
+            factura: 'test/factura-mail-footer-sm.png',
+            procura: 'test/procura-mail-footer-sm.png'
+          },
+          default_mail_from: {
+            procura: 'noreply@procura',
+            factura: 'noreply@factura'
+          },
+          name: {
+            procura: 'Procura Bien',
+            factura: 'Factura Bien'
+          },
+          default_mail_from_name: {
+            procura: 'Procura Bien',
+            factura: 'Factura Bien'
+          },
+          default_url_options: {
+            default: {}
+          }
+        }
+
+        return unless Rails.env.development? || include_all
+
+        @options.merge!({
+                          default_url_options: {
+                            procura: {
+                              host: 'procura.localhost',
+                              port: '3000'
+                            },
+                            factura: {
+                              host: 'factura.localhost',
+                              port: '3000'
+                            }
+                          }
+                        })
+      end
+
+      def account_plan_options
+        { factura: 0, procura: 1 }
+      end
+
+      def detect(request)
+        return :procura if request.host.match(/procura/)
+        return :factura if request.host.match(/factura/)
+
+        pg_warn 'default site_brand assigned'
+
+        :factura
+      end
+    end
+  end
+end

data/pg_engine/lib/pg_engine.rb

@@ -4,7 +4,9 @@ require_relative 'pg_engine/engine'
 require_relative 'pg_engine/core_ext'
 require_relative 'pg_engine/error'
 require_relative 'pg_engine/configuracion'
+require_relative 'pg_engine/site_brand'
 require_relative 'pg_engine/navigator'
+require_relative 'pg_engine/active_job_extensions'
 require_relative 'pg_engine/email_observer'
 require_relative 'pg_engine/mailgun/log_sync'
 require_relative 'pg_engine/route_helpers'
@@ -84,12 +86,16 @@ end
 
 module PgEngine
   class << self
-    attr_writer :configuracion
+    attr_writer :configuracion, :site_brand
 
     def configuracion
       @configuracion ||= Configuracion.new
     end
 
+    def site_brand
+      @site_brand || (raise PgEngine::Error, 'no site brand manager')
+    end
+
     def config
       configuracion
     end
@@ -115,3 +121,7 @@ module PgEngine
     @deprecator ||= ActiveSupport::Deprecation.new('7.5', 'PgEngine')
   end
 end
+
+ActiveSupport.on_load(:active_job) do |base|
+  base.prepend PgEngine::ActiveJobExtensions
+end

data/pg_engine/spec/factories/users.rb

@@ -72,9 +72,12 @@ FactoryBot.define do
     trait :owner do
       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
+
+    trait :guest do
+      after(:create) do |model|
+        model.user_accounts.create!(profiles: [])
       end
     end
   end

data/pg_engine/spec/mailers/pg_engine/base_mailer_spec.rb

@@ -0,0 +1,53 @@
+require 'rails_helper'
+
+class DummyMailer < ApplicationMailer
+  def test_mail
+    mail(to: 'fake@mail.com') do |format|
+      format.html { render inline: erb_template } # rubocop:disable Rails/RenderInline
+    end
+  end
+
+  private
+
+  def erb_template
+    <<-ERB
+      <%= root_url %>
+    ERB
+  end
+end
+
+describe PgEngine::BaseMailer do
+  describe 'default_url_options' do
+    subject do
+      mail.deliver
+    end
+
+    let(:mail) { DummyMailer.test_mail }
+
+    # rubocop:disable Style/GlobalVars
+    before do
+      $site_brand_before = PgEngine.site_brand
+      PgEngine.site_brand = PgEngine::Test::DummyBrand.new(include_all: true)
+    end
+
+    after do
+      PgEngine.site_brand = $site_brand_before
+    end
+    # rubocop:enable Style/GlobalVars
+
+    it 'cuando elige el default' do
+      expect { subject }.to have_warned('Default site brand chosen')
+      expect(mail.body.encoded).to include 'factura.localhost'
+      expect(mail.header_fields.get_field(:from).value).to include 'Factura Bien'
+      expect(mail.header_fields.get_field(:from).value).to include 'noreply@factura'
+    end
+
+    it 'cuando es un brand específico' do
+      Current.app_name = :procura
+      subject
+      expect(mail.body.encoded).to include 'procura.localhost'
+      expect(mail.header_fields.get_field(:from).value).to include 'Procura Bien'
+      expect(mail.header_fields.get_field(:from).value).to include 'noreply@procura'
+    end
+  end
+end

data/pg_engine/spec/requests/devise/invitations_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 
 RSpec::Matchers.define_negated_matcher :not_change, :change
 
-describe 'invite users to the platform and to an account' do
+describe 'invite users to the platform and to an account #' do
   let(:account) { ActsAsTenant.current_tenant }
 
   describe 'send an invitation to the platform', :tpath_req do
@@ -108,7 +108,7 @@ describe 'invite users to the platform and to an account' do
     end
   end
 
-  describe 'update an invitation' do
+  describe 'when updating an invitation' do
     let(:logged_user) { create :user, account: }
     let(:user_account) do
       logged_user.user_accounts.first
@@ -119,7 +119,7 @@ describe 'invite users to the platform and to an account' do
       user_account.update(membership_status:, invitation_status: :ist_invited)
     end
 
-    context 'when accepting an invite' do
+    context 'accepting an invite' do
       subject do
         put "/u/espacios/#{account.to_param}/update_invitation", params: { accept: 1 }
       end
@@ -130,7 +130,16 @@ describe 'invite users to the platform and to an account' do
         expect { subject }.to change { user_account.reload.invitation_status }.to('ist_accepted')
       end
 
-      pending 'and doesnt belong to the account'
+      context 'and doesnt belong to the account' do
+        before do
+          user_account.destroy
+        end
+
+        it 'returns unauthorized' do
+          subject
+          expect(response).to have_http_status(:unauthorized)
+        end
+      end
     end
 
     context 'when rejecting an invite' do

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

@@ -9,7 +9,7 @@ describe 'Users::AccountsController' do
     create_list :user, 2
   end
 
-  describe 'show' do
+  describe '#show' do
     it 'shows the owned account' do
       get "/u/espacios/#{account.to_param}"
       expect(response).to have_http_status(:ok)
@@ -21,7 +21,7 @@ describe 'Users::AccountsController' do
       expect(response).to have_http_status(:unauthorized)
     end
 
-    context 'when not the owner' do
+    context 'when is guest user' do
       subject do
         get "/u/espacios/#{other_account.to_param}"
       end
@@ -38,23 +38,21 @@ describe 'Users::AccountsController' do
         end
       end
 
-      context 'when its active' do
+      context 'and has access to user list' do
         let(:profiles) { [:user_accounts__read] }
 
-        pending 'See the users'
-
         it do
           subject
-          # expect(response.body).to have_text('Lista de usuarios')
-          expect(response.body).to have_text('Dejar la cuenta')
+          expect(response.body).to include('embedded__user_accounts')
+          expect(response.body).to have_text('Dejar el espacio')
         end
       end
 
       context 'when its active and dont have user_accounts__read access' do
         it do
           subject
-          expect(response.body).to have_no_text('Lista de usuarios')
-          expect(response.body).to have_text('Dejar la cuenta')
+          expect(response.body).not_to include('embedded__user_accounts')
+          expect(response.body).to have_text('Dejar el espacio')
         end
       end
 
@@ -64,7 +62,7 @@ describe 'Users::AccountsController' do
         it do
           subject
           expect(response.body).to have_text('Deshabilitado')
-          expect(response.body).to have_text('Dejar la cuenta')
+          expect(response.body).to have_text('Dejar el espacio')
         end
       end
 
@@ -79,6 +77,17 @@ describe 'Users::AccountsController' do
     end
   end
 
+  describe '#edit' do
+    let(:nombre) { Faker::Lorem.sentence }
+
+    it do
+      get "/u/espacios/#{account.to_param}/edit"
+      expect(response).to have_http_status(:ok)
+      patch "/u/espacios/#{account.to_param}", params: { account: { nombre: } }
+      expect(account.reload.nombre).to eq nombre
+    end
+  end
+
   describe 'index' do
     subject do
       get '/u/espacios'

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

@@ -30,17 +30,18 @@ describe 'redirection' do
       end
     end
 
-    context 'when belongs to other account', pending: 'subdomains not ready' do
-      before do
-        create :account, subdomain: 'other'
-        host! 'other.example.com'
-      end
-
-      it do
-        get '/u/t/cosas'
-
-        expect(response).to redirect_to new_user_session_path, tpath: false
-      end
-    end
+    # TODO: activar subdomains
+    # context 'when belongs to other account', pending: 'subdomains not ready' do
+    #   before do
+    #     create :account, subdomain: 'other'
+    #     host! 'other.example.com'
+    #   end
+
+    #   it do
+    #     get '/u/t/cosas'
+
+    #     expect(response).to redirect_to new_user_session_path, tpath: false
+    #   end
+    # end
   end
 end

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

@@ -70,24 +70,25 @@ describe 'registrations controller' do
       end
     end
 
-    context 'cuando hay tenant' do
-      before do
-        host! 'bien.localhost.com'
-        create :account, subdomain: 'bien'
-      end
-
-      it do
-        expect { subject }.to change(User, :count).by(1)
-      end
-
-      it 'creates the user account', pending: 'subdomains not working' do
-        expect { subject }.to change(UserAccount, :count).by(1)
-      end
-
-      it do
-        expect { subject }.not_to change(Account, :count)
-      end
-    end
+    # TODO: activar subdomains
+    # context 'cuando hay tenant' do
+    #   before do
+    #     host! 'bien.localhost.com'
+    #     create :account, subdomain: 'bien'
+    #   end
+
+    #   it do
+    #     expect { subject }.to change(User, :count).by(1)
+    #   end
+
+    #   it 'creates the user account', pending: 'subdomains not working' do
+    #     expect { subject }.to change(UserAccount, :count).by(1)
+    #   end
+
+    #   it do
+    #     expect { subject }.not_to change(Account, :count)
+    #   end
+    # end
   end
 
   describe '#edit' do

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

@@ -10,7 +10,43 @@ describe 'user accounts', :tpath_req do
     sign_in logged_user
   end
 
-  pending 'index'
+  describe '#index' do
+    subject do
+      get '/u/t/user_accounts'
+    end
+
+    it do
+      subject
+      expect(response).to have_http_status(:ok)
+    end
+
+    context 'when user is owner' do
+      it 'shows the permissions' do
+        subject
+        expect(response.body).to have_text('Permisos')
+      end
+    end
+
+    context 'when user is guest' do
+      before do
+        create :user, :owner
+      end
+
+      let!(:logged_user) { create :user, :guest }
+
+      it 'when cant see the user list returns unauthorized' do
+        subject
+        expect(response).to have_http_status(:unauthorized)
+      end
+
+      it 'when can see user list dont shows the permissions' do
+        logged_user.user_account_for(account).update(profiles: [:user_accounts__read])
+        subject
+        expect(response).to have_http_status(:ok)
+        expect(response.body).to have_no_text('Permisos')
+      end
+    end
+  end
 
   describe 'show' do
     it do

data/pg_layout/app/views/devise/invitations/new.html.erb

@@ -1,4 +1,5 @@
-<h2><%= t "devise.invitations.new.header" %></h2>
+<h2><%= UserAccount.new.decorate.submit_default_value %></h2>
+
 <div style="max-width: 40em" data-controller="pg_form">
   <%= pg_form_for(resource, as: resource_name, url: invitation_path(resource_name), html: { method: :post }) do |f| %>
     <div class="form-inputs">

data/pg_layout/app/views/devise/mailer/invitation_instructions.html.erb

@@ -1,4 +1,4 @@
-<p><%= t("devise.mailer.invitation_instructions.someone_invited_you", inviter: @resource.invited_by, app_name: I18n.t(@resource.invited_to_app, scope: 'app_name')) %></p>
+<p><%= t("devise.mailer.invitation_instructions.someone_invited_you", inviter: @resource.invited_by, app_name: PgEngine.site_brand.name) %></p>
 
 <p><%= t("devise.mailer.invitation_instructions.follow_link") %></p>
 

data/pg_layout/app/views/devise/mailer/invitation_instructions.text.erb

@@ -1,4 +1,4 @@
-<%= t("devise.mailer.invitation_instructions.someone_invited_you", inviter: @resource.invited_by, app_name: I18n.t(@resource.invited_to_app, scope: 'app_name')) %>
+<%= t("devise.mailer.invitation_instructions.someone_invited_you", inviter: @resource.invited_by, app_name: PgEngine.site_brand.name) %>
 
 <%= t("devise.mailer.invitation_instructions.follow_link") %>
 

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

@@ -9,7 +9,7 @@ html
       meta name="turbo-visit-control" content="reload"
 
     - cache :title_icon
-      title = t(Current.app_name, scope: 'app_name')
+      title = PgEngine.site_brand.name
       - begin
         = render partial: 'layouts/favicon'
       - rescue ActionView::MissingTemplate => e

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

@@ -1,9 +1,8 @@
 - content_for :content do
   .container-fluid.pt-4
     .text-center
-      - if @navbar.logo_xl_url.present?
-        .mb-4
-          = image_tag @navbar.logo_xl_url, class: 'img-fluid', style: 'max-height: 4em'
+      .mb-4
+        = image_tag PgEngine.site_brand.logo_xl_url, class: 'img-fluid', style: 'max-height: 4em'
 
     = content_for?(:container_logo_content) ? yield(:container_logo_content) : yield
 

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

@@ -1,5 +1,6 @@
 - content_for :content do
-  div class="pt-3 #{modal_targeted? ? '' : @container_class || 'container-fluid'}" style=@container_style
+  - klass = modal_targeted? ? '' : (@container_class || 'container-fluid')
+  div class="pt-3 #{klass}" style=@container_style
     = content_for?(:containerized_content) ? yield(:containerized_content) : yield
 
 = render template: 'layouts/pg_layout/base'

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

@@ -3,10 +3,6 @@ html
     center
       = yield
 
-      - if @footer_href.present?
-        footer style="margin-top: 2em;"
-          = link_to @footer_href, rel: 'noreferrer', target: :_blank do
-            - if @footer_image_src.present?
-              = image_tag @footer_image_src, alt: @footer_image_alt
-            - else
-              = @footer_image_alt
+      footer style="margin-top: 2em;"
+        = link_to PgEngine.site_brand.landing_site_url, rel: 'noreferrer', target: :_blank do
+          = image_tag @footer_image_src, alt: PgEngine.site_brand.name

data/pg_layout/app/views/layouts/pg_layout/devise_mailer.text.erb

@@ -1,7 +1,5 @@
 <%= yield %>
 
-<% if @footer_href.present? %>
 ----------------------
-<%= @footer_image_alt %>
-<%= @footer_href %>
-<% end %>
+<%= PgEngine.site_brand.name %>
+<%= PgEngine.site_brand.landing_site_url %>

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

@@ -2,10 +2,6 @@ html
   body style="font-family: sans-serif"
     = yield
 
-    - if @footer_href.present?
-      footer style="margin-top: 2em;"
-        = link_to @footer_href, rel: 'noreferrer', target: :_blank do
-          - if @footer_image_src.present?
-            = image_tag @footer_image_src, alt: @footer_image_alt
-          - else
-            = @footer_image_alt
+    footer style="margin-top: 2em;"
+      = link_to PgEngine.site_brand.landing_site_url, rel: 'noreferrer', target: :_blank do
+        = image_tag @footer_image_src, alt: PgEngine.site_brand.name

data/pg_layout/app/views/layouts/pg_layout/mailer.text.erb

@@ -1,7 +1,5 @@
 <%= yield %>
 
-<% if @footer_href.present? %>
 ----------------------
-<%= @footer_image_alt %>
-<%= @footer_href %>
-<% end %>
+<%= PgEngine.site_brand.name %>
+<%= PgEngine.site_brand.landing_site_url %>

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

@@ -1,21 +1,20 @@
 nav class="navbar navbar-expand-#{@breakpoint_navbar_expand}" data-bs-theme="dark"
-  .container-fluid.xgap-2
+  .container-fluid.gap-2
     div
       - unless @sidebar == false
         button data-controller="navbar" data-action="navbar#expandNavbar" class="btn btn-outline-light me-2 d-none d-#{@breakpoint_navbar_expand}-inline-block"
           i class="bi #{@navbar_chevron_class}"
-      - if @navbar.logo.present?
-        span.ms-3
-          = render @navbar.logo
+      span.ms-3
+        = render partial: 'layouts/logo'
     - if user_signed_in? && @notifications_bell.present?
       div class="d-#{@breakpoint_navbar_expand}-none"
         = render @notifications_bell
-    div
+    .d-flex
+      - @navbar.extensiones.each do |extension|
+        = extension
       - if user_signed_in?
         .collapse.navbar-collapse.justify-content-end
           = render partial: 'pg_layout/signed_in_links'
-      - @navbar.extensiones.each do |extension|
-        = extension
       div class="d-#{@breakpoint_navbar_expand}-none"
         - if user_signed_in?
           a.d-flex.align-items-center.gap-2 href="#" data-bs-toggle="offcanvas" data-bs-target="#offcanvasExample" aria-controls="offcanvasExample"
@@ -38,7 +37,7 @@ nav class="navbar navbar-expand-#{@breakpoint_navbar_expand}" data-bs-theme="dar
         = render NotificationComponent.with_collection(@notifications) if @notifications&.any?
       - else
         span.text-light.text-center
-          |  No hay notificaciones 
+          |  No hay notificaciones
       .text-center
         button.btn.btn-link.text-light.btn-sm[type="button" data-bs-toggle="collapse" data-bs-target="#notifications-collapse"]
           i.bi-chevron-up.fs-3

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

@@ -1,7 +1,7 @@
 div id="sidebar" class="#{@navbar_opened_class} flex-shrink-0 d-none d-#{@breakpoint_navbar_expand}-block"
   .mt-1
     .m-3
-      = render @navbar.logo if @navbar.logo.present?
+      = render partial: 'layouts/logo'
     ul.list-unstyled.ps-0.mt-5
       - @navbar.sidebar.each do |entry|
         - next if @navbar.hide_entry?(entry)

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

@@ -14,4 +14,4 @@
               = entry[:title]
 css:
   .offcanvas a { text-decoration: none; }
-  .offcanvas li { xmargin-top: 0.75em; } 
+  .offcanvas li { xmargin-top: 0.75em; }

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

@@ -18,19 +18,19 @@ ul.navbar-nav.gap-3.align-items-center class="gap-#{@breakpoint_navbar_expand}-0
             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'
+        li = link_to "Administrar #{Account.nombre_plural.downcase}", 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)
+        = Account.nombre_plural
       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'
+        li = link_to "Administrar #{Account.nombre_plural.downcase}", users_accounts_path(tid: nil), class: 'dropdown-item'
 
   .vr.bg-white.mx-3.d-none class="d-#{@breakpoint_navbar_expand}-inline-block"
   - if Current.user.present? && @notifications_bell.present?
@@ -47,7 +47,7 @@ ul.navbar-nav.gap-3.align-items-center class="gap-#{@breakpoint_navbar_expand}-0
       = Current.user
     ul.dropdown-menu
       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'
+      li = link_to Account.nombre_plural, 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/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.6.21-11'
+  VERSION = '7.6.22-1'
 end