pg_rails 7.6.24 → 7.6.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5202df927d12827a79e5c89d668cc344dfbd434a266b39810d5585ffdc3ac932
-  data.tar.gz: d74570bcf0eeb4a5d9f11fb5baf720585458a2026bb0683966a37556d7f2bf69
+  metadata.gz: 4b2c5672f192482e718fb6f12e66e7cfcd376e916c7663f13931aa526d931f42
+  data.tar.gz: cb427f6f6dd542648c697f53b3ddc688f8506919a809bfff3e32c6119612b1a4
 SHA512:
-  metadata.gz: d83f4adfce2d2ad3b22996b88dd61df4818e5ee824f66a3b0ac8d5817063e653b4bcbe5c60d98363040ae72886437b4a4a752f2a41bcd36d692e51eca1374b49
-  data.tar.gz: 45adb571a8d819d11d23a66ef49882496119e3e97e0741e63b59c5f0091d7686189564eabb60ee1c78d6da7fa57139d28340bbcc4a5d41bf7ceb396a28624567
+  metadata.gz: e98643fa17d81bcdfa0993cd66dbf532d36a6e1935a0144f88e67f2b54dad6e0ec81795fb9a5be9c35c42f6737e1ff8a51ed77f871104f691e711d8a16a8ffb5
+  data.tar.gz: df1e9eae5424d3ea481be959d24f33b09a5433ce0660f2bdc55ddda5595926ae753c7489c6ac90cc0956219b0909b0d6dd82cb784b2538d00f80820eb654d7cf

data/pg_engine/app/assets/stylesheets/pg_engine.scss

@@ -16,6 +16,12 @@ nav[aria-label=breadcrumb] a {
   display: inline-block;
 }
 
+// Signup
+
+#form-signup .form-inputs abbr {
+  display: none;
+}
+
 // FORMS
 
 // Radio buttons

data/pg_engine/app/components/flash_container_component.rb

@@ -1,6 +1,8 @@
 class FlashContainerComponent < ViewComponent::Base
+  # z-1 es para que no se superponga con el dropdown de la navbar,
+  # ya que sticky-top setea un z-index de 1020 y el del dropdown es de 1000
   erb_template <<~HTML
-    <div id="flash-container" class="d-flex justify-content-around sticky-top">
+    <div id="flash-container" class="d-flex justify-content-around sticky-top z-1">
       <div id="flash" class="flash position-relative w-100 d-flex justify-content-center">
         <%= content || render(partial: 'pg_layout/flash') %>
       </div>

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

@@ -15,7 +15,7 @@ module PgEngine
       if usuario.confirmed_at.present?
         sign_in(:user, usuario)
         # redirect_to after_sign_in_path_for(usuario)
-        redirect_to users_root_path
+        redirect_to user_root_path
       else
         go_back('No está confirmado')
       end

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

@@ -36,6 +36,16 @@ module Users
       end
     end
 
+    def user_root
+      scope = policy_scope(Account)
+      if scope.count == 1
+        ua = Current.user.user_account_for(scope.first)
+        redirect_to tenant_root_path(ua.to_param)
+      else
+        redirect_to users_accounts_path
+      end
+    end
+
     # La user_account puede estar disabled
     def show
       add_breadcrumb @account, users_account_path(@account, tid: nil)

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

@@ -6,6 +6,7 @@ module Users
       yield resource if block_given?
 
       if resource.errors.empty?
+        sign_in(resource)
         set_flash_message!(:notice, :confirmed)
         respond_with_navigational(resource) { redirect_to after_confirmation_path_for(resource_name, resource) }
       else

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

@@ -4,6 +4,13 @@ module Users
       authorize resource, nil, policy_class: UserRegistrationPolicy
     end
 
+    # GET /resource/sign_up
+    def new
+      build_resource(accept_terms: true)
+      yield resource if block_given?
+      respond_with resource
+    end
+
     def create
       build_resource(sign_up_params)
 

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

@@ -72,8 +72,15 @@ module PgEngine
       if Current.tid.present?
         tenant_root_path(tid: Current.tid)
       else
-        (Current.user.present? ? users_root_path : root_path)
+        (Current.user.present? ? user_root_path : root_path)
       end
     end
+
+    # :nocov:
+    deprecate :users_root_path, deprecator: PgEngine.deprecator
+    def users_root_path
+      user_root_path
+    end
+    # :nocov:
   end
 end

data/pg_engine/app/lib/pg_form_builder.rb

@@ -23,6 +23,12 @@ class PgFormBuilder < SimpleForm::FormBuilder
   def input(attribute_name, options = {}, &)
     options[:error_prefix] ||= default_prefix(attribute_name)
 
+    # Bootstraps's floating labels require an empty placeholder attribute
+    merged_wrapper = self.options[:wrapper].to_s + options[:wrapper].to_s
+    if merged_wrapper.include?('floating')
+      options[:placeholder] = ''
+    end
+
     super
   end
 

data/pg_engine/app/models/user.rb

@@ -66,7 +66,7 @@ class User < ApplicationRecord
 
   has_many :notifications, as: :recipient, class_name: 'Noticed::Notification'
 
-  validates :nombre, :apellido, presence: true
+  # validates :nombre, :apellido, presence: true
 
   has_one_attached :avatar do |attachable|
     attachable.variant :thumb, resize_to_fill: [80, 80]

data/pg_engine/config/locales/es.yml

@@ -43,7 +43,7 @@ es:
     confirmed_at: Fecha de confirmación
     actualizado_por: Actualizado por
     creado_por: Creado por
-    accept_terms: Acepto los <a href="/terminos_y_condiciones" target="_blank">Términos y condiciones</a> y la <a href="/privacidad" target="_blank">Política de privacidad</a>
+    accept_terms: Acepto los <a href="/terminos_y_condiciones" target="_blank">términos y condiciones</a>
   enumerize:
     user_account:
       membership_status:
@@ -117,7 +117,7 @@ es:
         header: "Aceptar invitación"
         submit_button: "Aceptar"
     confirmations:
-      confirmed: ¡Tu cuenta está confirmada! Ya podés iniciar sesión
+      confirmed: ¡Bien! Ahora tu cuenta está confirmada
     sessions:
       signed_in: ''
       signed_out: ''
@@ -128,7 +128,7 @@ es:
       unauthenticated: ''
       invited: "Tenés una invitación pendiente en tu correo electrónico"
     registrations:
-      signed_up_but_unconfirmed: Te enviamos un correo electrónico con instrucciones para confirmar tu cuenta.
+      signed_up_but_unconfirmed: Por favor, revisá en tu bandeja de entrada las instrucciones para confirmar tu cuenta.
       new:
         sign_up: Crear una cuenta
     passwords:

data/pg_engine/config/routes.rb

@@ -31,10 +31,11 @@ Rails.application.routes.draw do
         put :update_invitation
       end
     end
-
-    root to: 'accounts#index'
   end
 
+  # User root for devise's signed_in_root_path
+  get '/u', to: 'users/accounts#user_root', as: :user_root
+
   namespace :tenant, path: 'u/t(/:tid)' do
     pg_resource(:user_accounts, only: [:index, :show, :edit, :update, :destroy])
     scope controller: 'inline_edit', path: 'inline', as: :inline do
@@ -47,8 +48,7 @@ Rails.application.routes.draw do
     root to: 'dashboard#dashboard'
   end
 
-  # root to: 'users/accounts#index'
-  # FIXME: qué onda
+  # Si en la main app no se define una root path, se redirige al user_root
   root to: redirect('/u')
 
   namespace :admin, path: 'a' do

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

@@ -88,6 +88,44 @@ describe 'Users::AccountsController' do
     end
   end
 
+  describe 'user_root' do
+    subject do
+      get '/u'
+    end
+
+    context 'when no accounts' do
+      let(:user) { create :user }
+
+      it do
+        subject
+        expect(response).to redirect_to(users_accounts_path)
+      end
+    end
+
+    context 'when one account' do
+      it do
+        subject
+        ua = user.user_account_for(account)
+        expect(response).to redirect_to(tenant_root_path(ua.to_param))
+        # File.write(Rails.root.join('out.html'), response.body)
+      end
+    end
+
+    context 'when multiple accounts' do
+      before do
+        other_account = create(:account)
+        ActsAsTenant.without_tenant do
+          create(:user_account, account: other_account, user:)
+        end
+      end
+
+      it do
+        subject
+        expect(response).to redirect_to(users_accounts_path)
+      end
+    end
+  end
+
   describe 'index' do
     subject do
       get '/u/espacios'

data/pg_engine/spec/system/signup_spec.rb

@@ -18,10 +18,7 @@ describe 'Al Registrarse' do
       perform_enqueued_jobs do
         visit '/users/sign_up'
         fill_in 'user_email', with: Faker::Internet.email
-        fill_in 'user_nombre', with: Faker::Name.name
-        fill_in 'user_apellido', with: Faker::Name.name
         fill_in 'user_password', with: 'admin123'
-        fill_in 'user_password_confirmation', with: 'admin123'
 
         accept_terms
 
@@ -31,7 +28,7 @@ describe 'Al Registrarse' do
 
     context 'cuando acepta los términos' do
       let(:accept_terms) do
-        check 'user_accept_terms'
+        nil
       end
 
       it 'guarda el user' do
@@ -39,13 +36,13 @@ describe 'Al Registrarse' do
         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')
+        expect(page).to have_text('las instrucciones para confirmar')
       end
     end
 
     context 'si no acepta los terms' do
       let(:accept_terms) do
-        nil
+        uncheck 'user_accept_terms'
       end
 
       it do
@@ -77,12 +74,6 @@ describe 'Al Registrarse' do
     end
   end
 
-  # drivers = %i[
-  #   selenium_headless
-  #   selenium_chrome_headless
-  #   selenium_chrome_headless_notebook
-  #   selenium_chrome_headless_iphone
-  # ]
   drivers = %i[selenium_chrome_headless_iphone]
   drivers = [ENV['DRIVER'].to_sym] if ENV['DRIVER'].present?
 

data/pg_layout/app/views/devise/registrations/_signup_info.html.slim

@@ -0,0 +1 @@
+p Creá tu cuenta!

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

@@ -1,27 +1,29 @@
-<h2><%= t(".sign_up") %></h2>
-<div id="form-signup" data-controller="pg_form">
-  <%= pg_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
-    <div class="form-inputs">
-      <%= f.input :nombre, required: true, autofocus: true %>
-      <%= f.input :apellido, required: true %>
-      <%= f.input :email,
-                  required: true,
-                  input_html: { autocomplete: "email" }%>
-      <%= 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" } %>
-      <%= f.input :accept_terms, as: :boolean, label: t('attributes.accept_terms').html_safe, error_prefix: '' %>
+<div class="container mt-5"  style="max-width: 80em">
+  <div class="row flex-wrap-reverse">
+    <div class="col-sm">
+      <%= render partial: 'signup_info' %>
     </div>
+    <div class="col-sm">
+      <div class="position-sticky z-1" style="top: 0.5em">
+        <h1 class="mb-4">Creá tu cuenta</h1>
+        <%# #form-signup se reemplaza por el mensaje de revisar la bandeja de entrada %>
+        <div class="text-center" id="form-signup" data-controller="pg_form">
+          <%= pg_form_for(resource, as: resource_name, url: registration_path(resource_name), wrapper: :floating_labels_form) do |f| %>
+            <div class="form-inputs m-auto d-inline-block" style="max-width: 20em">
+              <%= f.input :email, label: 'Tu email', input_html: { class: 'form-control-lg', autocomplete: "email" }%>
+              <%= f.input :password, label: 'Elegí una contraseña',
+                          input_html: { class: 'form-control-lg', autocomplete: "new-password" } %>
+              <%= f.input :accept_terms, as: :boolean, label: t('attributes.accept_terms').html_safe, error_prefix: '', wrapper_html: { class: 'justify-content-center' } %>
+            </div>
 
-    <div class="form-actions">
-      <%= f.button :submit, t(".sign_up") %>
-    </div>
-  <% end %>
+            <div class="form-actions">
+              <%= f.button :submit, 'Registrarme' %>
+            </div>
+          <% end %>
 
-  <%= render "devise/shared/links" %>
+          <%= render "devise/shared/links" %>
+        </div>
+      </div>
+    </div>
+  </div>
 </div>
-

data/pg_rails/lib/version.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# :nocov:
 module PgRails
-  VERSION = '7.6.24'
+  VERSION = '7.6.26'
 end
+# :nocov:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.24
+  version: 7.6.26
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-01-07 00:00:00.000000000 Z
+date: 2025-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1020,6 +1020,7 @@ files:
 - pg_layout/app/views/devise/mailer/unlock_instructions.html.erb
 - pg_layout/app/views/devise/passwords/edit.html.erb
 - pg_layout/app/views/devise/passwords/new.html.erb
+- pg_layout/app/views/devise/registrations/_signup_info.html.slim
 - pg_layout/app/views/devise/registrations/edit.html.erb
 - pg_layout/app/views/devise/registrations/new.html.erb
 - pg_layout/app/views/devise/sessions/new.html.erb