pg_rails 7.2.3 → 7.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2505003e224d063bd2c51742b431b315cef9e83b08c867adb0687f9184ad559
-  data.tar.gz: 0d3e3c74ef4c00f0e369302a592fccc0749ddb53c7143abd0be4dc1cf7da6418
+  metadata.gz: ad67165e1aad7f3b3e31dd236706d4b923eb2139740a095018257899b43928a7
+  data.tar.gz: f3d907a47d97cb7abbfb0e148bb2c2e9466a5255284f14f06c0363966e35e46b
 SHA512:
-  metadata.gz: 64ee127677a3f745bd0d29b8fac8150b03470d4cd03d6d6b37078168a3bfd43ac3332f085942bb9d0ea94b164fdd863f65df76c116f8e1ff708ebe012ac31348
-  data.tar.gz: 6cb3a28799ddd2a7c2fb621a1875b246b825355cd0e7b3a66925030138f46b0d81e1d5c0fa22ce29c4c5c747984145076af5a89085891112230ed34ebcd61732
+  metadata.gz: 3d8482db6b3b8455c819d4db06db374e40785cec70a9737bfca652c2368bddad17ca7a2d3656e1632b48b0ebeb03c5142e83855d3d70cfd9d043de3e7d34609d
+  data.tar.gz: e6e2457ac2a84097209da469aa76dd2538e72c9da05ed383884c19fceddc071b5dc515a82c444c4f3487d7912ca79790bd6eb06f0eed0ae0c4caf48e8797884f

data/pg_associable/app/helpers/pg_associable/form_builder_methods.rb

@@ -16,6 +16,14 @@ module PgAssociable
     end
 
     def pg_associable(atributo, options = {})
+      # Si es new y tiene el nested asignado, no permito que se modifique
+      # porque de todos modos se pisaría en el create
+      if !object.persisted? &&
+         template.nested_record.present? &&
+         object.send(template.nested_key) == (template.nested_record.id)
+        options[:disabled] = true
+      end
+
       return input(atributo, options) if options[:disabled]
 
       collection, puede_crear = collection_pc(atributo, options)
@@ -31,8 +39,7 @@ module PgAssociable
     def collection_pc(atributo, _options)
       klass = clase_asociacion(atributo)
       user = Current.user
-      in_modal = options[:asociable].present?
-      puede_crear = !in_modal && Pundit::PolicyFinder.new(klass).policy.new(user, klass).new?
+      puede_crear = !template.using_modal? && Pundit::PolicyFinder.new(klass).policy.new(user, klass).new?
       collection = Pundit::PolicyFinder.new(klass).scope.new(user, klass).resolve
       [collection, puede_crear]
     end

data/pg_associable/app/helpers/pg_associable/helpers.rb

@@ -3,11 +3,10 @@ module PgAssociable
     MAX_RESULTS = 8
 
     def pg_respond_abrir_modal
-      respond_to do |format|
-        format.turbo_stream do
-          render turbo_stream: turbo_stream.append_all('body', partial: 'pg_associable_modal')
-        end
-      end
+      src = @clase_modelo.new.decorate.new_object_url
+      content = ModalContentComponent.new(src:).render_in(view_context)
+      modal = AsociableModalComponent.new(modal_id: params[:id]).with_content(content)
+      render turbo_stream: turbo_stream.append_all('body', modal)
     end
 
     def pg_respond_buscar

data/pg_associable/app/javascript/modal_controller.js

@@ -3,9 +3,9 @@ import * as bootstrap from 'bootstrap'
 
 export default class extends Controller {
   static outlets = ['asociable']
-  static targets = ['response']
 
   modalPuntero = null
+  history = []
 
   connect (e) {
     this.modalPuntero = new bootstrap.Modal(this.element)
@@ -15,23 +15,97 @@ export default class extends Controller {
       })
     }
     this.modalPuntero.show()
+
+    this.element.addEventListener('turbo:frame-render', (ev) => {
+      if (ev.detail.fetchResponse.response.ok && ev.target.id === 'modal_content') {
+        this.history.push(ev.target.src)
+      }
+    })
+
+    this.element.addEventListener('pg:record-created', (ev) => {
+      const el = ev.data
+      if (this.asociableOutlets.length > 0) {
+        const newObject = JSON.parse(el.dataset.response)
+        this.asociableOutlet.completarCampo(newObject)
+        ev.stopPropagation()
+        this.remove()
+      } else {
+        this.back(ev)
+      }
+    })
+
+    this.element.addEventListener('pg:record-updated', (ev) => {
+      this.back(ev)
+    })
+
+    this.element.addEventListener('pg:record-destroyed', (ev) => {
+      this.remove()
+    })
+
     document.addEventListener('turbo:before-cache', () => {
       this.element.remove()
     }, { once: true })
   }
 
-  responseTargetConnected (e) {
-    const newObject = JSON.parse(e.dataset.response)
-    this.asociableOutlet.completarCampo(newObject)
-    this.element.remove()
+  maximize (ev) {
+    const dialog = this.element.querySelector('.modal-dialog')
+    dialog.classList.toggle('modal-fullscreen')
+    const button = ev.currentTarget
+    const icon = button.querySelector('i')
+    icon.classList.toggle('bi-fullscreen')
+    icon.classList.toggle('bi-fullscreen-exit')
+
+    const tooltip = this.application.getControllerForElementAndIdentifier(button, 'tooltip')
+    if (tooltip) {
+      tooltip.hide()
+      if (icon.classList.contains('bi-fullscreen')) {
+        tooltip.setContent('Maximizar')
+      } else {
+        tooltip.setContent('Restaurar')
+      }
+    }
+  }
+
+  reloadTop () {
+    // FIXME: rename to main?
+    const topFrame = document.querySelector('#top')
+    if (topFrame.attributes.src) {
+      topFrame.reload()
+    } else {
+      topFrame.setAttribute('src', window.location)
+    }
+  }
+
+  back (ev) {
+    this.history.pop()
+    if (this.history.length > 0) {
+      const url = this.history[this.history.length - 1]
+      const frame = this.element.querySelector('#modal_content')
+      frame.src = url
+      frame.innerHTML = '<div style="min-height: 30em">Cargando...</div>'
+    } else {
+      this.modalPuntero.hide()
+    }
+    ev.stopPropagation()
+    this.reloadTop()
   }
 
   openModal () {
     this.modalPuntero.show()
   }
 
+  remove () {
+    this.element.remove()
+  }
+
   disconnect (e) {
-    this.modalPuntero.hide()
+    // Antes, en lugar de quitar el modal-backdrop:
+    //        this.modalPuntero.hide()
+    // pero tiraba a veces error:
+    // TypeError: can't convert null to object, _isWithActiveTrigger
+    document.querySelectorAll('.modal-backdrop').forEach((el) => {
+      el.remove()
+    })
     document.dispatchEvent(new Event('hidden.bs.modal'))
     this.modalPuntero.dispose()
   }

data/pg_associable/spec/system/associable_spec.rb

@@ -3,22 +3,45 @@ require 'rails_helper'
 describe 'Associable' do
   let(:user) { create :user, :developer }
 
+  let(:path) { '/admin/cosas/new' }
+
   before do
     login_as user
-    driven_by :selenium
-    visit '/admin/cosas/new'
-    fill_in 'cosa_nombre', with: 'La cosa'
-    select 'Los', from: 'cosa_tipo'
-    find('.cosa_categoria_de_cosa input[type=text]').click
+    visit path
   end
 
   it do
+    fill_in 'cosa_nombre', with: 'La cosa'
+    select 'Los', from: 'cosa_tipo'
+    find('.cosa_categoria_de_cosa input[type=text]').click
     expect(page).to have_text :all, 'Nuevo'
     find('.cosa_categoria_de_cosa .list-group-item').click
     fill_in 'categoria_de_cosa_nombre', with: 'la categoría'
     select 'Completar', from: 'categoria_de_cosa_tipo'
-    click_on 'Crear Categoría de cosa'
-    click_on 'Crear Coso'
+    click_on 'Agregar Categoría de cosa'
+    click_on 'Cargar Coso'
     expect(page).to have_text 'Creado por'
   end
+
+  context 'cuando crea desde el nested' do
+    let!(:categ) { create :categoria_de_cosa }
+    let(:path) { "/admin/categoria_de_cosas/#{categ.hashid}/cosas/new" }
+
+    it do
+      input = find_by_id('cosa_categoria_de_cosa')
+      expect(input).to be_disabled
+    end
+  end
+
+  context 'cuando edita desde el nested' do
+    let!(:categ) { create :categoria_de_cosa }
+    let!(:cosa) { create :cosa, categoria_de_cosa: categ }
+    let(:path) { "/admin/categoria_de_cosas/#{categ.hashid}/cosas/#{cosa.id}/edit" }
+
+    it do
+      ele = find_by_id('cosa_categoria_de_cosa_id', visible: :all)
+      input = ele.sibling('input[type=text]')
+      expect(input).not_to be_disabled
+    end
+  end
 end

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

@@ -9,6 +9,11 @@
   --bs-form-invalid-border-color: #b50000;
 }
 
+// Navs
+nav[aria-label=breadcrumb] a {
+  font-weight: bold;
+}
+
 // Toasts
 .toast.show {
   display: inline-block;

data/pg_engine/app/components/actions_component.rb

@@ -0,0 +1,14 @@
+class ActionsComponent < ViewComponent::Base
+  def initialize(record)
+    @record = record.decorate
+
+    super
+  end
+
+  erb_template <<~ERB
+    <div>
+      <%= @record.edit_link %>
+      <%= @record.destroy_link_redirect %>
+    </div>
+  ERB
+end

data/pg_engine/app/components/asociable_modal_component.html.slim

@@ -0,0 +1,6 @@
+.modal[class="#{@klass} modal-#{@modal_id}" tabindex="-1" data-controller="modal"
+       data-modal-asociable-outlet=".asociable-#{@modal_id}"
+       data-turbo-temporary="true"]
+  .modal-dialog
+    .modal-content
+      = content

data/pg_engine/app/components/asociable_modal_component.rb

@@ -0,0 +1,7 @@
+class AsociableModalComponent < ModalComponent
+  def initialize(modal_id: nil, **)
+    @modal_id = modal_id
+
+    super(**)
+  end
+end

data/pg_engine/app/components/date_selector_component.rb

@@ -3,9 +3,9 @@ class DateSelectorComponent < ViewComponent::Base
     @field_id = field_id
 
     @types = [
-      ['Días corridos (L a D)', 'calendar_days'],
-      ['Días hábiles (L a V)', 'business_days'],
       ['Días hábiles no feriados', 'business_days_excluding_holidays'],
+      ['Días hábiles (L a V)', 'business_days'],
+      ['Días corridos (L a D)', 'calendar_days'],
       ['Semanas', 'weeks'],
       ['Meses', 'months']
     ]

data/pg_engine/app/components/modal_component.html.slim

@@ -0,0 +1,5 @@
+.modal[class="#{@klass}" tabindex="-1" data-controller="modal"
+       data-remove-on-hide="true" data-turbo-temporary="true"]
+  .modal-dialog
+    .modal-content
+      = content

data/pg_engine/app/components/modal_component.rb

@@ -0,0 +1,11 @@
+class ModalComponent < ViewComponent::Base
+  def initialize(klass: 'modal-xl')
+    @klass = klass
+
+    super
+  end
+
+  def before_render
+    controller.instance_variable_set(:@using_modal, true)
+  end
+end

data/pg_engine/app/components/modal_content_component.rb

@@ -0,0 +1,29 @@
+class ModalContentComponent < ViewComponent::Base
+  def initialize(src: nil)
+    @src = src
+    with_content(loading_html) if @src.present?
+
+    super
+  end
+
+  def loading_html
+    <<~HTML.html_safe
+      <div class="text-center text-body-secondary fs-3" style="min-height: 15em">
+        Cargando...
+      </div>
+    HTML
+  end
+
+  erb_template <<~ERB
+    <div class="modal-body">
+      <div class="d-flex justify-content-around sticky-top">
+        <div class="flash position-relative w-100 d-flex justify-content-center">
+        </div>
+      </div>
+      <%= helpers.turbo_frame_tag :modal_content,
+                                  **{ src: @src, refresh: :morph }.compact do %>
+        <%= content %>
+      <% end %>
+    </div>
+  ERB
+end

data/pg_engine/app/components/search_bar_component.html.slim

@@ -3,7 +3,7 @@
     .d-flex.align-items-center.px-3.py-2
       .px-2.d-none.d-sm-inline-block
         span.bi.bi-funnel-fill
-      = helpers.search_form_for @q, url: url_for, html: { 'data-turbo-action': :advance } do |f|
+      = helpers.search_form_for @q, url: url_for do |f|
         .row.g-1
           .col
             .row.g-1

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

@@ -6,7 +6,7 @@ module Admin
   class AccountsController < AdminController
     include PgEngine::Resource
 
-    before_action { @clase_modelo = Account }
+    self.clase_modelo = Account
 
     before_action(only: :index) { authorize Account }
 

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

@@ -6,7 +6,7 @@ module Admin
   class EmailLogsController < AdminController
     include PgEngine::Resource
 
-    before_action { @clase_modelo = EmailLog }
+    self.clase_modelo = EmailLog
 
     before_action(only: :index) { authorize EmailLog }
 

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

@@ -6,7 +6,7 @@ module Admin
   class EmailsController < AdminController
     include PgEngine::Resource
 
-    before_action { @clase_modelo = Email }
+    self.clase_modelo = Email
 
     before_action(only: :index) { authorize Email }
 
@@ -14,26 +14,9 @@ module Admin
 
     add_breadcrumb Email.nombre_plural, :admin_emails_path
 
-    def new
-      render template: 'admin/emails/_send', locals: { email: @email },
-             layout: 'pg_layout/containerized'
-    end
-
-    def create
-      saved = false
-      ActiveRecord::Base.transaction do
-        # TODO: acá la transaction jode porque el ActiveJob no puede deserializar el Email
-        # Con rails 7.2 esto se debería arreglar
-        if (saved = @email.save)
-          PgEngine::AdminMailer.with(email_object: @email).admin_mail.deliver_later
-        end
-      end
-      if saved
-        redirect_to @email.decorate.target_object
-      else
-        render template: 'admin/emails/_send',
-               layout: 'pg_layout/containerized', status: :unprocessable_entity,
-               locals: { email: @email }
+    after_action only: :create do
+      if @saved
+        PgEngine::AdminMailer.with(email_object: @email).admin_mail.deliver_later
       end
     end
 

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

@@ -6,7 +6,7 @@ module Admin
   class UserAccountsController < AdminController
     include PgEngine::Resource
 
-    before_action { @clase_modelo = UserAccount }
+    self.clase_modelo = UserAccount
 
     before_action(only: :index) { authorize UserAccount }
 

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

@@ -6,7 +6,7 @@ module Admin
   class UsersController < AdminController
     include PgEngine::Resource
 
-    before_action { @clase_modelo = User }
+    self.clase_modelo = User
 
     before_action(only: :index) { authorize User }