pg_rails 7.0.2 → 7.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fbc8593bcefeb2a4c90325240059ad131837f569c9536415c2de05cc43c87d4
-  data.tar.gz: c99f069a6d7339c335ad74f8e635c9b5878b159045c04d2875a7a5caa340fea1
+  metadata.gz: f938c5e60b8cb063472ebc6a8f42445714d5e2ade2b86d2863b9a98d7bd8eb32
+  data.tar.gz: abea2aba977e1ed3c33a4d0e39e27e84943a0a3066514e1123bec424c03d2014
 SHA512:
-  metadata.gz: 980e5e6f831e0c24c0c07c1e16805dbe042a40ad47924f42a2827d3532cd469c4e58091fc2036e771ddb8ab9387b1a59ce370da503de7a3c8a202a18d8073157
-  data.tar.gz: 514b5334497d070b1a1b9933920984048bf4c58a741af3be050f09c971e4c365bdf85a02227049cacca7b50e5128017553028b3bb6fc358e26a5ad38a28d4629
+  metadata.gz: 1383e921c7de060743dfa1d2d4f68c9bd0b8308cb72c35ed5a41beac46b007281de7427fae3c52930b31f8c77a853c62b4cdf5774d95d5f27ef3fa110e8c1e0b
+  data.tar.gz: dbb40317f97d3d7678140e6d5c92bfdd70119e1eda35093d55d33fe2364156718fcd8a45bebd27ba2c7c388760ef269b594f0c17d65c8c02b6c79eab97c22ac1

data/pg_associable/app/assets/js/asociable_controller.js

@@ -26,21 +26,20 @@ export default class extends Controller {
       }
     }
     const input = this.element.querySelector('input[type=text]')
-    if(input.value) {
+    if (input.value) {
       this.element.classList.add('filled')
     }
-
   }
 
-
   selectItem (e) {
     // TODO: text en data
     this.completarCampo(e.target.dataset.id, e.target.text)
   }
+
   completarCampo (id, text) {
     const textField = this.element.querySelector('input[type=text]')
     const hiddenField = this.element.querySelector('input[type=hidden]')
-    if( id === undefined ) {
+    if (id === undefined) {
       id = null
     }
     hiddenField.value = id

data/pg_associable/app/assets/js/asociable_inline_controller.js

@@ -22,86 +22,88 @@ export default class extends Controller {
     this.element.querySelector('.pencil').onclick = (e) => {
       that.input.focus()
     }
-    if(this.input.value) {
+    if (this.input.value) {
       this.element.classList.add('filled')
     }
 
-    let debounce = function(callback, wait) {
-      let timerId;
+    const debounce = function (callback, wait) {
+      let timerId
       return (...args) => {
-        clearTimeout(timerId);
+        clearTimeout(timerId)
         timerId = setTimeout(() => {
-          callback(...args);
-        }, wait);
-      };
+          callback(...args)
+        }, wait)
+      }
     }
     const doSearchBounce = debounce((force) => {
       that.doSearch(force)
     }, 200)
 
     this.input.addEventListener('blur', (e) => {
-      this.input.placeholder = ""
+      this.input.placeholder = ''
     })
     this.input.onfocus = (e) => {
       this.input.select()
-      if(this.input.value.length == 0) {
+      if (this.input.value.length === 0) {
         this.escribiAlgo()
       }
     }
     this.input.onkeyup = (e) => {
-      if(this.input.value.length == 0) {
+      if (this.input.value.length === 0) {
         this.escribiAlgo()
       }
-      if(e.keyCode == 13) {
+      if (e.keyCode === 13) {
         doSearchBounce(true)
       } else {
         doSearchBounce()
       }
     }
     this.input.onkeydown = (e) => {
-      if(e.keyCode == 13) {
-        e.preventDefault();
-        return false;
+      if (e.keyCode === 13) {
+        e.preventDefault()
+        return false
       }
     }
   }
-  buscando() {
+
+  buscando () {
     this.result.innerHTML = `
 <div class="resultados" tabindex="-1">
   <div class="fst-italic text-secondary">Buscando...</div>
 </div>
 `
   }
-  escribiAlgo() {
-    this.input.placeholder = "Escribí algo para buscar"
+
+  escribiAlgo () {
+    this.input.placeholder = 'Escribí algo para buscar'
   }
 
-  doSearch(force = false) {
-    if(!force && this.input.value.length < 3) {
+  doSearch (force = false) {
+    if (!force && this.input.value.length < 3) {
       return
     }
-    if(!force && this.input.value == this.lastValue) {
+    if (!force && this.input.value === this.lastValue) {
       return
     }
     this.lastValue = this.input.value
 
-    let timerId = setTimeout(() => {
+    const timerId = setTimeout(() => {
       this.buscando()
     }, 200)
-    document.addEventListener("turbo:before-stream-render", function(e) {
+    document.addEventListener('turbo:before-stream-render', function (e) {
       clearTimeout(timerId)
     })
-    let url = `${this.input.dataset.url}?id=${this.elemId}`
+    const url = `${this.input.dataset.url}?id=${this.elemId}`
     const form = document.createElement('form')
     form.setAttribute('method', 'post')
     form.setAttribute('action', url)
     form.setAttribute('data-turbo-stream', true)
-    let partial = document.createElement('input')
+    const partial = document.createElement('input')
     partial.setAttribute('type', 'hidden')
     partial.setAttribute('name', 'partial')
     partial.setAttribute('value', 'pg_associable/resultados_inline')
     form.appendChild(partial)
-    let query = document.createElement('input')
+    const query = document.createElement('input')
     query.setAttribute('type', 'hidden')
     query.setAttribute('name', 'query')
     query.setAttribute('value', this.input.value)
@@ -114,7 +116,7 @@ export default class extends Controller {
   completarCampo (id, text) {
     const textField = this.element.querySelector('input[type=text]')
     const hiddenField = this.element.querySelector('input[type=hidden]')
-    if( id === undefined ) {
+    if (id === undefined) {
       id = null
     }
     hiddenField.value = id
@@ -134,7 +136,6 @@ export default class extends Controller {
     this.result.innerHTML = ''
   }
 
-
   disconnect (e) {
     console.log('disconnect asociable_inline')
   }

data/pg_associable/app/assets/js/modal_controller.js

@@ -3,10 +3,9 @@ import * as bootstrap from 'bootstrap'
 
 export default class extends Controller {
   static outlets = ['asociable']
-  static targets = ['response', 'result']
+  static targets = ['response', 'result', 'searchInput', 'searchForm']
 
   modalPuntero = null
-  input = null
   lastValue = ''
 
   connect (e) {
@@ -15,28 +14,33 @@ export default class extends Controller {
     this.modalPuntero = new bootstrap.Modal(modal)
     this.modalPuntero.show()
 
-    this.input = this.element.querySelector('input[type=text]')
+    if (this.searchInputTargets.length > 0) {
+      this.bindSearchInput()
+    }
+  }
 
-    let debounce = function(callback, wait) {
-      let timerId;
-      return (...args) => {
-        clearTimeout(timerId);
-        timerId = setTimeout(() => {
-          callback(...args);
-        }, wait);
-      };
+  debounce (callback, wait) {
+    let timerId
+    return (...args) => {
+      clearTimeout(timerId)
+      timerId = setTimeout(() => {
+        callback(...args)
+      }, wait)
     }
-    const doSearchBounce = debounce((force) => {
+  }
+
+  bindSearchInput () {
+    const doSearchBounce = this.debounce((force) => {
       this.doSearch(force)
     }, 200)
-    this.input.onkeydown = (e) => {
-      if(e.keyCode == 13) {
-        e.preventDefault();
-        return false;
+    this.searchInputTarget.onkeydown = (e) => {
+      if (e.keyCode === 13) {
+        e.preventDefault()
+        return false
       }
     }
-    this.input.onkeyup = (e) => {
-      if(e.keyCode == 13) {
+    this.searchInputTarget.onkeyup = (e) => {
+      if (e.keyCode === 13) {
         doSearchBounce(true)
       } else {
         doSearchBounce()
@@ -44,7 +48,7 @@ export default class extends Controller {
     }
   }
 
-  buscando() {
+  buscando () {
     this.resultTarget.innerHTML = `
 <ul class="resultados list-group list-group-flush" tabindex="-1">
   <li class="list-group-item">
@@ -53,40 +57,23 @@ export default class extends Controller {
 </ul>
 `
   }
-  doSearch(force = false) {
-    if(!force && this.input.value.length < 3) {
+
+  doSearch (force = false) {
+    if (!force && this.searchInputTarget.value.length < 3) {
       return
     }
-    if(!force && this.input.value == this.lastValue) {
+    if (!force && this.searchInputTarget.value === this.lastValue) {
       return
     }
-    this.lastValue = this.input.value
+    this.lastValue = this.searchInputTarget.value
 
-    let timerId = setTimeout(() => {
+    const timerId = setTimeout(() => {
       this.buscando()
     }, 200)
-    document.addEventListener("turbo:before-stream-render", function(e) {
+    document.addEventListener('turbo:before-stream-render', function (e) {
       clearTimeout(timerId)
     })
-    this.element.querySelector('form').requestSubmit()
-    // let url = `${this.input.dataset.url}?id=${this.elemId}`
-    // const form = document.createElement('form')
-    // form.setAttribute('method', 'post')
-    // form.setAttribute('action', url)
-    // form.setAttribute('data-turbo-stream', true)
-    // let partial = document.createElement('input')
-    // partial.setAttribute('type', 'hidden')
-    // partial.setAttribute('name', 'partial')
-    // partial.setAttribute('value', 'pg_associable/resultados_inline')
-    // form.appendChild(partial)
-    // let query = document.createElement('input')
-    // query.setAttribute('type', 'hidden')
-    // query.setAttribute('name', 'query')
-    // query.setAttribute('value', this.input.value)
-    // form.appendChild(query)
-    // document.body.prepend(form)
-    // form.requestSubmit()
-    // form.remove()
+    this.searchFormTarget.requestSubmit()
   }
 
   selectItem (e) {

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

@@ -10,10 +10,10 @@ module PgAssociable
 
     def pg_respond_buscar
       partial = params[:partial] || 'pg_associable/resultados'
-      collection = @clase_modelo.query(params[:query]).limit(6)
+      @collection = policy_scope(@clase_modelo).kept.query(params[:query]).limit(6)
       render turbo_stream:
         turbo_stream.update("resultados-#{params[:id]}",
-                            partial:, locals: { collection: })
+                            partial:, locals: { collection: @collection })
     end
   end
 end

data/pg_associable/app/views/pg_engine/base/_pg_associable_modal.html.slim

@@ -11,17 +11,19 @@
         a.btn-close[type="button" data-bs-dismiss="modal" aria-label="Close"]
       .modal-body
         .show-on-select-item
-          - if @clase_modelo.count.zero?
+          - if policy_scope(@clase_modelo).kept.count.zero?
             p No hay #{@clase_modelo.nombre_plural.downcase} aún
             = link_to "Crear el primer #{@clase_modelo.nombre_singular.downcase}",
                       'javascript:void(0)', data: { action: 'modal#toggleCrearElegir' }
           - else
             = form_tag namespaced_path(@clase_modelo, prefix: :buscar),
+                       data: { 'modal-target': 'searchForm' },
                        method: :post, class: 'pg-form buscar' do
               = hidden_field_tag :id, params[:id]
               = text_field_tag :query, '', class: 'form-control',
                                            placeholder: 'Escribí algo para buscar',
-                                           autocomplete: 'off'
+                                           autocomplete: 'off',
+                                           data: { 'modal-target': 'searchInput' }
               / = button_tag 'Buscar'
             .resultados-wrapper id="resultados-#{params[:id]}" data-modal-target="result"
         #pg-associable-form.show-on-new-item

data/pg_associable/spec/pg_associable/helpers_spec.rb

@@ -0,0 +1,24 @@
+require 'rails_helper'
+
+describe PgAssociable::Helpers do
+  describe '#pg_respond_buscar' do
+    let(:user) { create :user }
+    let(:ctrl) do
+      clazz = Class.new(PgEngine::BaseController)
+      clazz.new
+    end
+    let!(:cosa) { create :cosa }
+
+    before do
+      allow(ctrl).to receive_messages(current_user: user, params: { id: 123, query: cosa.id })
+      allow(ctrl).to receive(:render)
+      ctrl.instance_variable_set(:@clase_modelo, Cosa)
+    end
+
+    it do
+      ctrl.pg_respond_buscar
+      cosas = ctrl.instance_variable_get(:@collection)
+      expect(cosas).to eq [cosa]
+    end
+  end
+end

data/pg_engine/app/controllers/pg_engine/base_controller.rb

@@ -17,8 +17,6 @@ module PgEngine
     rescue_from Pundit::NotAuthorizedError, with: :not_authorized
 
     helper_method :mobile_device?
-    helper_method :atributos_para_listar
-    helper_method :atributos_para_mostrar
 
     layout 'pg_layout/layout'
 
@@ -36,251 +34,12 @@ module PgEngine
       @navbar = Navbar.new(current_user)
     end
 
-    # Public endpoints
-    def abrir_modal
-      pg_respond_abrir_modal
-    end
-
-    def buscar
-      pg_respond_buscar
-    end
-
-    def index
-      @collection = filtros_y_policy atributos_para_buscar
-      @collection = sort_collection(@collection)
-      pg_respond_index
-    end
-
-    def show
-      add_breadcrumb instancia_modelo, instancia_modelo.target_object
-
-      pg_respond_show
-    end
-
-    def new
-      add_breadcrumb "Crear #{@clase_modelo.nombre_singular.downcase}"
-    end
-
-    def edit
-      add_breadcrumb instancia_modelo, instancia_modelo.target_object
-      add_breadcrumb 'Editando'
-    end
-
-    def create
-      pg_respond_create
-    end
-
-    def update
-      pg_respond_update
-    end
-
-    def destroy
-      url = namespaced_path(@clase_modelo)
-      pg_respond_destroy(instancia_modelo, url)
-    end
-
-    # End public endpoints
-
     def mobile_device?
       request.user_agent =~ /Mobile|webOS/
     end
 
-    helper_method :any_filter?
-
-    def any_filter?
-      params.keys.reject { |a| a.in? %w[controller action page page_size order_by order_direction] }.any?
-    end
-
-    helper_method :current_page_size
-
-    def current_page_size
-      if params[:page_size].present?
-        session[:page_size] = params[:page_size]
-        params[:page_size].to_i
-      else
-        default_page_size
-      end
-    end
-
-    def default_page_size
-      session[:page_size].present? ? session[:page_size].to_i : 10
-    end
-
     protected
 
-    def pg_respond_update(object: nil)
-      object ||= instancia_modelo
-      respond_to do |format|
-        if (@saved = object.save)
-          format.html { redirect_to object.decorate.target_object }
-          format.json { render json: object.decorate }
-        else
-          format.html { render :edit, status: :unprocessable_entity }
-          format.json { render json: object.errors, status: :unprocessable_entity }
-        end
-      end
-    end
-
-    def pg_respond_create(object: nil)
-      object ||= instancia_modelo
-      respond_to do |format|
-        if (@saved = object.save)
-          if params[:asociable]
-            format.turbo_stream do
-              render turbo_stream:
-                turbo_stream.update('pg-associable-form', <<~HTML
-                  <div data-modal-target="response" data-response='#{object.decorate.to_json}'></div>
-                HTML
-                )
-            end
-          end
-          format.html do
-            if params[:save_and_next] == 'true'
-              new_path = "#{url_for(@clase_modelo)}/new"
-              redirect_to new_path, notice: "#{@clase_modelo.nombre_singular} creado."
-            else
-              redirect_to object.decorate.target_object
-            end
-          end
-          format.json { render json: object.decorate }
-        else
-          if params[:asociable]
-            format.turbo_stream do
-              render turbo_stream:
-                turbo_stream.update('pg-associable-form', partial: 'form', locals: { asociable: true })
-            end
-          end
-          format.html { render :new, status: :unprocessable_entity }
-          format.json { render json: object.errors.full_messages, status: :unprocessable_entity }
-        end
-      end
-    end
-
-    def pg_respond_index
-      respond_to do |format|
-        format.json { render json: @collection }
-        format.html { render_listing }
-        format.xlsx do
-          render xlsx: 'download',
-                 filename: "#{@clase_modelo.nombre_plural.gsub(' ', '-').downcase}" \
-                           "-#{Time.zone.now.strftime('%Y-%m-%d-%H.%M.%S')}.xlsx"
-        end
-      end
-    end
-
-    def pg_respond_show(object = nil)
-      respond_to do |format|
-        format.json { render json: object || instancia_modelo }
-        format.html
-      end
-    end
-
-    def pg_respond_destroy(model, redirect_url = nil)
-      if destroy_model(model)
-        respond_to do |format|
-          format.html do
-            if redirect_url.present?
-              redirect_to redirect_url, notice: 'Elemento borrado.', status: :see_other
-            else
-              redirect_back(fallback_location: root_path, notice: 'Elemento borrado.', status: 303)
-            end
-          end
-          format.json { head :no_content }
-        end
-      else
-        respond_to do |format|
-          format.html do
-            if model.respond_to?(:associated_elements) && model.associated_elements.present?
-              @model = model
-              render destroy_error_details_view
-            else
-              flash[:alert] = @error_message
-              # if redirect_url.present?
-              #   redirect_to redirect_url
-              # else
-              redirect_back(fallback_location: root_path, status: 303)
-              # end
-            end
-          end
-          format.json { render json: { error: @error_message }, status: :unprocessable_entity }
-        end
-      end
-    end
-
-    # TODO: crear esta vista en pg_rails
-    def destroy_error_details_view
-      'destroy_error_details'
-    end
-
-    def destroy_model(model)
-      @error_message = 'No se pudo eliminar el registro'
-      begin
-        destroy_method = model.respond_to?(:discard) ? :discard : :destroy
-        return true if model.send(destroy_method)
-
-        @error_message = model.errors.full_messages.join(', ')
-        false
-      rescue ActiveRecord::InvalidForeignKey => e
-        # class_name = /from table \"(?<table_name>[\p{L}_]*)\"/.match(e.message)[:table_name].singularize.camelcase
-        # # pk_id = /from table \"(?<pk_id>[\p{L}_]*)\"/.match(e.message)[:pk_id].singularize.camelcase
-        # clazz = Object.const_get class_name
-        # objects = clazz.where(model.class.table_name.singularize => model)
-        model_name = t("activerecord.models.#{model.class.name.underscore}")
-        @error_message = "#{model_name} no se pudo borrar porque tiene elementos asociados."
-        logger.debug e.message
-      end
-      false
-    end
-
-    def render_listing
-      @collection = @collection.page(params[:page]).per(current_page_size)
-    end
-
-    def buscar_instancia
-      if Object.const_defined?('FriendlyId') && @clase_modelo.is_a?(FriendlyId)
-        @clase_modelo.friendly.find(params[:id])
-      else
-        @clase_modelo.find(params[:id])
-      end
-    end
-
-    def set_instancia_modelo
-      if action_name.in? %w[new create]
-        self.instancia_modelo = @clase_modelo.new(modelo_params)
-      else
-        self.instancia_modelo = buscar_instancia
-
-        instancia_modelo.assign_attributes(modelo_params) if action_name.in? %w[update]
-      end
-
-      instancia_modelo.current_user = send(PgEngine.configuracion.current_user_method)
-
-      authorize instancia_modelo
-
-      # TODO: problema en create y update cuando falla la validacion
-      self.instancia_modelo = instancia_modelo.decorate if action_name.in? %w[show edit new]
-    end
-
-    def instancia_modelo=(val)
-      instance_variable_set(:"@#{nombre_modelo}", val)
-    end
-
-    def instancia_modelo
-      instance_variable_get(:"@#{nombre_modelo}")
-    end
-
-    def modelo_params
-      if action_name == 'new'
-        params.permit(atributos_permitidos)
-      else
-        params.require(nombre_modelo).permit(atributos_permitidos)
-      end
-    end
-
-    def nombre_modelo
-      @clase_modelo.name.underscore
-    end
-
     def default_url_options(options = {})
       if Rails.env.production?
         options.merge(protocol: 'https')
@@ -289,48 +48,6 @@ module PgEngine
       end
     end
 
-    def clase_modelo
-      # agarro la variable o intento con el nombre del controller
-      @clase_modelo ||= self.class.name.singularize.gsub('Controller', '').constantize
-    end
-
-    def filtros_y_policy(campos)
-      @filtros = PgEngine::FiltrosBuilder.new(
-        self, clase_modelo, campos
-      )
-      scope = policy_scope(clase_modelo)
-
-      @filtros.filtrar(scope)
-    end
-
-    def do_sort(scope, field, direction)
-      unless scope.model.column_names.include? field.to_s
-        Utils::Logueador.warning("No existe el campo \"#{field}\"")
-        return scope
-      end
-      scope = scope.order(field => direction)
-      instance_variable_set(:@field, field)
-      instance_variable_set(:@direction, direction)
-      scope
-    rescue ArgumentError => e
-      Utils::Logueador.warning(e.to_s)
-      scope
-    end
-
-    def sort_collection(scope, options = {})
-      if params[:order_by].present?
-        field = params[:order_by]
-        direction = params[:order_direction]
-        do_sort(scope, field, direction)
-      elsif options[:default].present?
-        field = options[:default].first[0]
-        direction = options[:default].first[1]
-        do_sort(scope, field, direction)
-      else
-        scope
-      end
-    end
-
     def fecha_invalida
       respond_to do |format|
         format.json do

data/pg_engine/app/controllers/pg_engine/require_sign_in.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module PgEngine
+  module RequireSignIn
+    def self.included(clazz)
+      clazz.before_action :authenticate_user!
+    end
+  end
+end