pg_rails 7.6.20 → 7.6.21.pre.2

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

@@ -2,20 +2,129 @@ require 'rails_helper'
 
 describe 'Users::AccountsController' do
   let(:account) { ActsAsTenant.current_tenant }
-  let(:user) { create :user }
+  let(:user) { create :user, :owner }
 
   before do
     sign_in user
+    create_list :user, 2
   end
 
-  it 'shows the owned account' do
-    get "/u/cuentas/#{account.to_param}"
-    expect(response).to have_http_status(:ok)
+  describe 'show' do
+    it 'shows the owned account' do
+      get "/u/espacios/#{account.to_param}"
+      expect(response).to have_http_status(:ok)
+    end
+
+    it 'denies foreign account' do
+      other_account = create :account
+      get "/u/espacios/#{other_account.to_param}"
+      expect(response).to have_http_status(:unauthorized)
+    end
+
+    context 'when not the owner' do
+      subject do
+        get "/u/espacios/#{other_account.to_param}"
+      end
+
+      let(:other_account) { create :account }
+      let(:membership_status) { :ms_active }
+      let(:invitation_status) { :ist_accepted }
+      let(:profiles) { [] }
+
+      before do
+        ActsAsTenant.with_tenant(other_account) do
+          create :user, :owner
+          create :user_account, user:, invitation_status:, membership_status:, profiles:
+        end
+      end
+
+      context 'when its active' 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')
+        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')
+        end
+      end
+
+      context 'when its disabled' do
+        let(:membership_status) { :ms_disabled }
+
+        it do
+          subject
+          expect(response.body).to have_text('Deshabilitado')
+          expect(response.body).to have_text('Dejar la cuenta')
+        end
+      end
+
+      context 'when its invited' do
+        let(:invitation_status) { :ist_invited }
+
+        it do
+          subject
+          expect(response).to have_http_status(:unauthorized)
+        end
+      end
+    end
+  end
+
+  describe 'index' do
+    subject do
+      get '/u/espacios'
+    end
+
+    before do
+      other_account = create :account, :with_owner
+      ActsAsTenant.without_tenant do
+        create :user_account, account: other_account, user:, invitation_status:, membership_status:
+      end
+    end
+
+    context 'cuando está invitado' do
+      let(:invitation_status) { :ist_invited }
+      let(:membership_status) { :ms_active }
+
+      it do
+        subject
+        expect(response.body).to have_text('Aceptar invitación')
+        expect(response.body).to have_text('Rechazar')
+      end
+
+      context 'y deshabilitado' do
+        let(:membership_status) { :ms_disabled }
+
+        it do
+          subject
+          expect(response.body).to have_no_text('Aceptar invitación')
+        end
+      end
+    end
   end
 
-  it 'denies foreign account' do
-    other_account = create :account
-    get "/u/cuentas/#{other_account.to_param}"
-    expect(response).to have_http_status(:unauthorized)
+  describe 'create an account' do
+    subject do
+      post '/u/espacios', params: {
+        account: {
+          plan: :completar,
+          nombre: Faker::Lorem.sentence
+        }
+      }
+    end
+
+    it do
+      expect { subject }.to change(Account, :count).by(1)
+      expect(Account.last.owner).to eq user
+    end
   end
 end

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

@@ -12,4 +12,35 @@ describe 'redirection' do
       expect(response).to have_http_status(:internal_server_error)
     end
   end
+
+  context 'when logged in', :tpath_req do
+    let(:logged_user) { create :user, :owner }
+
+    before do
+      sign_in logged_user
+    end
+
+    context 'when account is discarded' do
+      it do
+        get '/u/t/cosas'
+        expect(response.body).to include 'No hay ningún coso que mostrar'
+        logged_user.user_accounts.first.account.discard!
+        get '/u/t/cosas'
+        expect(response).to redirect_to users_accounts_path, tpath: false
+      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
+  end
 end

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

@@ -1,19 +1,14 @@
 require 'rails_helper'
 
-describe 'DASHBOARD' do
-  let(:logged_user) { create :user }
+describe 'DASHBOARD', :tpath_req do
+  let(:logged_user) { create :user, :owner }
 
   before do
     sign_in logged_user
   end
 
-  it 'when requesting /u' do
-    get '/u'
-    expect(response.body).to include '<h1>Dashboard</h1>'
-  end
-
-  it 'when requesting /u/dashboard' do
-    get '/u/dashboard'
+  it 'when requesting /u/t/dashboard' do
+    get '/u/t/dashboard'
     expect(response.body).to include '<h1>Dashboard</h1>'
   end
 end

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

@@ -2,10 +2,11 @@ require 'rails_helper'
 
 RSpec.describe 'Users::DateJumpers' do
   before do
-    user = create :user
     sign_in user
   end
 
+  let(:user) { create :user }
+
   describe 'GET /jump' do
     before do
       stubs if defined? stubs

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

@@ -1,16 +1,17 @@
 require 'rails_helper'
 
-describe 'inline edit' do
+describe 'inline edit', :tpath_req do
   before do
-    user = create :user
     sign_in user
   end
 
+  let(:user) { create :user, :owner }
+
   let(:cosa) { create :cosa }
 
   describe '#show' do
     subject do
-      get '/u/inline/show', params:, headers: { 'Turbo-Frame': turbo_frame_id }
+      get '/u/t/inline/show', params:, headers: { 'Turbo-Frame': turbo_frame_id }
     end
 
     let(:params) do
@@ -37,7 +38,7 @@ describe 'inline edit' do
 
   describe '#edit' do
     subject do
-      get '/u/inline/edit', params:, headers: { 'Turbo-Frame': turbo_frame_id }
+      get '/u/t/inline/edit', params:, headers: { 'Turbo-Frame': turbo_frame_id }
     end
 
     let(:params) do
@@ -64,7 +65,7 @@ describe 'inline edit' do
 
   describe '#update' do
     subject do
-      patch "/u/cosas/#{cosa.to_param}", params:
+      patch "/u/t/cosas/#{cosa.to_param}", params:
     end
 
     let(:params) do

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

@@ -39,7 +39,7 @@ describe 'registrations controller' do
     end
 
     it do
-      subject
+      expect { subject }.to change(User, :count).by(1)
       expect(response.body).to include I18n.t('devise.registrations.signed_up_but_unconfirmed')
     end
 
@@ -80,7 +80,7 @@ describe 'registrations controller' do
         expect { subject }.to change(User, :count).by(1)
       end
 
-      it do
+      it 'creates the user account', pending: 'subdomains not working' do
         expect { subject }.to change(UserAccount, :count).by(1)
       end
 

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

@@ -0,0 +1,54 @@
+require 'rails_helper'
+
+describe 'user accounts', :tpath_req do
+  let!(:logged_user) { create :user, :owner }
+
+  let(:account) { ActsAsTenant.current_tenant }
+  let!(:user_account) { create :user_account, account: }
+
+  before do
+    sign_in logged_user
+  end
+
+  pending 'index'
+
+  describe 'show' do
+    it do
+      get "/u/t/user_accounts/#{user_account.to_param}"
+      expect(response).to have_http_status(:ok)
+    end
+  end
+
+  describe 'edit' do
+    it do
+      get "/u/t/user_accounts/#{user_account.to_param}/edit"
+      expect(response).to have_http_status(:ok)
+    end
+  end
+
+  describe 'update' do
+    subject do
+      params = {
+        user_account: {
+          profiles: ['cosas__read']
+        }
+      }
+      patch "/u/t/user_accounts/#{user_account.to_param}", params:
+    end
+
+    it do
+      expect { subject }.to(change { user_account.reload.profiles }.to(include('cosas__read')))
+      expect(response).to redirect_to([:tenant, user_account])
+    end
+  end
+
+  describe 'destroy' do
+    subject do
+      delete "/u/t/user_accounts/#{user_account.to_param}"
+    end
+
+    it do
+      expect { subject }.to change(UserAccount.unscoped, :count).by(-1)
+    end
+  end
+end

data/pg_engine/spec/system/login_spec.rb

@@ -5,14 +5,14 @@ require 'rails_helper'
 describe 'Sign in' do
   shared_examples 'sign_in' do
     subject do
-      visit '/u/categoria_de_cosas'
+      visit '/u/t/categoria_de_cosas'
       fill_in 'user_email', with: user.email
       fill_in 'user_password', with: password
       find('input[type=submit]').click
     end
 
     let(:password) { 'pass1234' }
-    let!(:user) { create :user, password: }
+    let!(:user) { create :user, :owner, password: }
 
     it do
       subject

data/pg_engine/spec/system/noticed_spec.rb

@@ -33,6 +33,4 @@ describe 'Notifications' do
       expect(page).to have_css('.unseen')
     end
   end
-
-  pending 'with read notifications'
 end

data/pg_engine/spec/system/signup_spec.rb

@@ -34,10 +34,11 @@ describe 'Al Registrarse' do
         check 'user_accept_terms'
       end
 
-      pending 'expect new account created also'
-
       it 'guarda el user' do
-        expect { subject }.to change(User.unscoped, :count).by(1)
+        expect { subject }.to change(User.unscoped, :count).by(1).and(change(Account, :count).by(1))
+        ActsAsTenant.without_tenant do
+          expect(Account.last.owner).to eq User.last
+        end
         expect(page).to have_text('Te enviamos un correo electrónico con instrucciones')
       end
     end

data/pg_engine/spec/system/tenants_spec.rb

@@ -9,16 +9,16 @@ require 'rails_helper'
 # DRIVER=selenium rspec
 describe 'Tenants' do
   subject(:visitar) do
-    visit '/u/cosas'
+    visit '/u/t/cosas'
   end
 
-  let(:logged_user) { create :user }
+  let(:logged_user) { create :user, :owner }
 
   before do
     login_as logged_user
   end
 
-  describe 'switcher' do
+  describe 'account management' do
     it do
       visitar
 
@@ -30,21 +30,22 @@ describe 'Tenants' do
 
       before do
         ActsAsTenant.with_tenant(other_account) do
-          logged_user.user_accounts.create!
+          logged_user.user_accounts.create!(profiles: [:account__owner])
         end
+        driven_by :selenium_chrome_headless_notebook
       end
 
-      it 'shows the switcher' do
+      it 'shows the accounts index' do
         visitar
 
-        expect(page).to have_text '¿Qué cuenta te gustaría utilizar?'
+        expect(page).to have_text 'Mostrando un total de 2 espacios'
       end
 
       it 'switches to account' do
         visitar
-
-        click_on other_account.to_s
-        visit '/u/categoria_de_cosas'
+        find_all('a', text: 'Ingresar').first.click
+        # visit '/u/t/categoria_de_cosas'
+        click_on 'Categorias front'
         expect(page).to have_text 'No hay ninguna categoría de cosa que mostrar'
       end
 

data/pg_layout/app/javascript/application.js

@@ -67,7 +67,7 @@ document.addEventListener('turbo:before-fetch-request', (ev) => {
   // Si es POST, quito la opción text/vnd.turbo-stream.html para que
   // on successful redirect no haya posibilidad de que se abra un modal.
   // Si el link o form tiene data-turbo-stream entonces no se pisa el header.
-  // FIXME: buscar una manera mejor de hacerlo porque es para problemas
+  // TODO!: buscar una manera mejor de hacerlo porque es para problemas
   //        quizás, con la movida de abrir modales desde JS
   if (ev.detail.fetchOptions.method.toLowerCase() === 'post' &&
       ev.target.dataset.turboStream === undefined) {

data/pg_layout/app/javascript/config/turbo_rails/index.js

@@ -10,7 +10,7 @@ import Rollbar from 'rollbar'
 // TODO: testear con capybara
 document.addEventListener('turbo:before-cache', () => {
   document.querySelectorAll('#flash .alert').forEach((el) => {
-    // FIXME: en los destroy desde main frame, turbo llama a before-cache
+    // TODO!: en los destroy desde main frame, turbo llama a before-cache
     // después de renderear el redirect, por eso no puedo hacer el remove
     //
     // el.remove()

data/pg_layout/app/lib/navbar.rb

@@ -1,4 +1,5 @@
 class Navbar
+  include PgEngine::DefaultUrlOptions
   include Rails.application.routes.url_helpers
 
   attr_reader :extensiones
@@ -19,9 +20,22 @@ class Navbar
     @yaml_data[key] << ActiveSupport::HashWithIndifferentAccess.new(obj)
   end
 
+  # Idempotent to be called right before render
+  def configure
+    return if @configured
+
+    PgEngine.configuracion.navigators.each do |navigator|
+      navigator.configure(self)
+    end
+
+    @configured = true
+  end
+
   def sidebar
+    configure
+
     ret = bar(@user.present? ? 'sidebar.signed_in' : 'sidebar.not_signed_in')
-    ret.push(*bar('sidebar.developer')) if @user.present? && @user.developer?
+    ret.push(*bar('sidebar.developer')) if Current.namespace == :admin
     ret
   end
 

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

@@ -0,0 +1,34 @@
+<h2><%#= t "devise.invitations.edit.header" %></h2>
+
+<h3>
+<%= resource.invited_by %>
+ te invitó a su cuenta en ProcuraBien
+</h3>
+<% if User.require_password_on_accepting %>
+<p>
+  Para aceptar la invitación e ingresar al sistema por favor completá los siguientes datos:
+</p>
+<% end %>
+<%= pg_form_for(resource, as: resource_name, url: invitation_path(resource_name), html: { method: :put }) do |f| %>
+  <%= f.hidden_field :invitation_token %>
+
+  <div class="form-inputs">
+    <% if f.object.class.require_password_on_accepting %>
+      <%= f.input :email, disabled: true %>
+      <%= f.input :nombre, required: true, autofocus: true %>
+      <%= f.input :apellido, required: true %>
+      <%= f.input :password,
+                  required: true,
+                  hint: (t('devise.shared.minimum_password_length', count: @minimum_password_length) if @minimum_password_length),
+                  input_html: { autocomplete: "new-password" } %>
+      <%= f.input :password_confirmation,
+                  required: true,
+                  input_html: { autocomplete: "new-password" } %>
+    <% end %>
+    <%= f.input :accept_terms, as: :boolean, label: t('attributes.accept_terms').html_safe, error_prefix: '' %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit, t("devise.invitations.edit.submit_button") %>
+  </div>
+<% end %>

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

@@ -0,0 +1,15 @@
+<h2><%= t "devise.invitations.new.header" %></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">
+      <%= f.input :email, hint: 'Si la persona aún no tiene cuenta en ProcuraBien, se le enviará una invitación para que se registre' %>
+    </div>
+    <%= f.fields_for :user_accounts do |nf| %>
+      <%= render partial: 'tenant/user_accounts/fields', locals: { f: nf } %>
+    <% end %>
+
+    <div class="form-actions">
+      <%= f.button :submit, t("devise.invitations.new.submit_button"), class: 'btn btn-primary' %>
+    </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,11 @@
+<p><%= t("devise.mailer.invitation_instructions.hello", email: @resource.email) %></p>
+
+<p><%= t("devise.mailer.invitation_instructions.someone_invited_you", url: root_url) %></p>
+
+<p><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token) %></p>
+
+<% if @resource.invitation_due_at %>
+  <p><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :'devise.mailer.invitation_instructions.accept_until_format')) %></p>
+<% end %>
+
+<p><%= t("devise.mailer.invitation_instructions.ignore") %></p>

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

@@ -0,0 +1,11 @@
+<%= t("devise.mailer.invitation_instructions.hello", email: @resource.email) %>
+
+<%= t("devise.mailer.invitation_instructions.someone_invited_you", url: root_url) %>
+
+<%= accept_invitation_url(@resource, invitation_token: @token) %>
+
+<% if @resource.invitation_due_at %>
+  <%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :'devise.mailer.invitation_instructions.accept_until_format')) %>
+<% end %>
+
+<%= t("devise.mailer.invitation_instructions.ignore") %>

data/pg_layout/app/views/devise/registrations/edit.html.erb

@@ -5,6 +5,7 @@
     <%= f.input :email, required: true, autofocus: true %>
     <%= f.input :nombre, required: true %>
     <%= f.input :apellido, required: true %>
+    <%= f.input :avatar  %>
 
     <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
       <p><%= t(".currently_waiting_confirmation_for_email", email: resource.unconfirmed_email) %></p>

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

@@ -51,6 +51,7 @@ html
       }
 
   body
+    span#tid.d-none data-tid="#{Current.tid}"
     - sidebar_present = @navbar.present? && @sidebar != false
     - if sidebar_present
       = render partial: 'pg_layout/sidebar_mobile'
@@ -65,17 +66,18 @@ html
             - if user_signed_in? && breadcrumbs.any?
               .d-flex.d-print-none
                 .d-flex.flex-grow-1.px-3.py-1[
-                  class="#{nav_bg} align-items-center justify-content-between"
+                  class="#{nav_bg} align-items-center xjustify-content-between gap-5"
                   style="min-height: 2.5em;"]
                   nav.d-flex aria-label="breadcrumb"
                     - unless frame_embedded?
-                      i.bi-segmented-nav.me-2
+                      i.bi-segmented-nav.me-2 style="transform: rotate(180deg);"
                     ol.breadcrumb
                       = render_breadcrumbs builder: PgEngine::Bootstrap5BreadcrumbsBuilder
-
+                  .vr
                   .btn-toolbar.gap-1
                     = yield(:actions)
                     = yield(:extra_actions)
+
                 - if using_modal?
                   .px-2.d-flex.align-items-center.border.border-start-0
                     = button_tag type: :button, class: 'btn btn-sm btn-link',
@@ -96,7 +98,7 @@ html
 
               / hr.my-0
             - content = content_for?(:content) ? yield(:content) : yield
-            / FIXME: rename to main?
+            / TODO!!: rename to main?
             - if (!turbo_frame? || current_turbo_frame == 'top') && \
                    content.exclude?('flash-container')
               = render FlashContainerComponent.new
@@ -107,7 +109,7 @@ html
           - if @no_main_frame
             = captured_content
           - else
-            / FIXME: rename to main, use a constant
+            / TODO!!: rename to main, use a constant
             = turbo_frame_tag current_turbo_frame || 'top',
                 **{ 'data-turbo-action': (turbo_frame? ? nil : :advance) }.compact do
               = captured_content

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

@@ -1,19 +1,20 @@
 <nav class="navbar navbar-expand-<%= @breakpoint_navbar_expand %>" data-bs-theme="dark">
-  <div class="container-fluid gap-2">
+  <div class="container-fluid xgap-2">
     <% 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 %>"></i>
       </button>
-
     <% end %>
+    <% if @navbar.logo.present? %>
+      <span class="ms-3">
+      <%= render @navbar.logo %>
+      </span>
+    <% end %>
+    <%= render partial: 'pg_layout/signed_in_links' %>
     <% @navbar.extensiones.each do |extension| %>
       <%= extension %>
     <% end %>
-    <% if Current.user.present? && @notifications_bell.present? %>
-      <%= render @notifications_bell %>
-    <% end %>
-    <%= @navbar.logo if @navbar.logo.present? %>
     <% unless @sidebar == false %>
       <button class="btn btn-outline-light d-inline-block
                      d-<%= @breakpoint_navbar_expand %>-none"

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

@@ -1,27 +1,9 @@
 <div id="sidebar" class="<%= @navbar_opened_class %> flex-shrink-0 d-none d-<%= @breakpoint_navbar_expand %>-block">
   <div class="mt-1">
     <div class="m-3">
-      <%= @navbar.logo if @navbar.logo.present? %>
+      <%= render @navbar.logo if @navbar.logo.present? %>
     </div>
-    <% if user_signed_in? %>
-      <span class="d-inline-block px-3 text-end text-light"><%= Current.user %></span>
-      <span class="d-block px-3 text-secondary">
-        <% if Current.user.user_accounts_without_tenant.count > 1 %>
-          <%= link_to ActsAsTenant.current_tenant, [:users, ActsAsTenant.current_tenant] if ActsAsTenant.current_tenant.present? %>
-          <%= link_to users_account_switcher_path do %>
-            <% if ActsAsTenant.current_tenant.present? %>
-              (Cambiar)
-            <% else %>
-              Elegir cuenta
-            <% end %>
-          <% end %>
-        <% else %>
-          <%= link_to ActsAsTenant.current_tenant, [:users, ActsAsTenant.current_tenant] if ActsAsTenant.current_tenant.present? %>
-        <% end %>
-      </span>
-      <hr>
-    <% end %>
-    <ul class="list-unstyled ps-0">
+    <ul class="list-unstyled ps-0 mt-5">
       <% @navbar.sidebar.each do |entry| %>
         <% next if @navbar.hide_entry?(entry) %>