pg_rails 7.0.6 → 7.0.8.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c4644fc0bcd9abce95b7cd8ac88f7779b7d8e6096590863d11fd1bbad1f1b7b
-  data.tar.gz: df1ffd480c688adc40f24613b9d00eb57fe45940067191a942bd18e9d53e1209
+  metadata.gz: a6d74fa06142003ba7e436907908f3f7ca491e8ab6367796424de5af92d19217
+  data.tar.gz: a8a7545e0881a3fb79d3d2185314619341286488d7b1eeacb265c0adacb1b371
 SHA512:
-  metadata.gz: c9afa947ca3962f7e81973a798664900bccdc15ab6dd500c5b8573f5177212585cf35e78194c1219b6137f6dd3198d4e23ffd982702fdc2cac3cbf8ae1f2c8df
-  data.tar.gz: 4f26bb070447c9c07829628a2d99a7a8a0ec9a7ac8298ab2f4118444316cffa775ff3254577488d2c139d637468c995bc97c5b9d4adf561f17529cfe398d89c5
+  metadata.gz: 3f27603a1c050b0c5aada27652696a5b5cff62041d51b31ad99e4b09494a5b5f6b3f2376ce56bf725ae7bc7a3effcbb10d2851e5c9df7530902dec5a2d885f09
+  data.tar.gz: ce9641619c78d375984b774fd007c7054e8ac6fe605d0f2c95c0f71bddfe498b081f64589c8a566a4da48d82f60b332d20f1359c937aa8cb34c137fa7a497014

data/README.md

@@ -73,3 +73,16 @@ Acceder a la app en <http://localhost:3000/>.
 4. `bundle exec rails g pg_scaffold Admin/CategoriaDeCosa nombre:string{required} "tipo:integer{enum,required}" fecha:date tiempo:datetime --model-name=CategoriaDeCosa --discard --activeadmin`
 5. `bundle exec rails g pg_scaffold Admin/Cosa  nombre:string{required} "tipo:integer{enum,required}" categoria_de_cosa:references{required}  --model-name=Cosa --discard --activeadmin`
 6. Setup asociacion creable en cosas/_form
+
+
+
+be rake app:pg_engine_engine:install:migrations
+
+be rails pg_engine_engine:install:migrations
+
+
+    "build": "esbuild pg_rails/js/index.js --bundle --sourcemap --format=esm --outdir=pg_rails/builds --public-path=/assets",
+    "build:css:compile": "sass ./pg_rails/scss/pg_rails.scss:./pg_rails/builds/application.css --no-source-map --load-path=node_modules",
+    "build:css:prefix": "postcss ./pg_rails/builds/application.css --use=autoprefixer --output=./pg_rails/builds/application.css",
+    "build:css": "yarn build:css:compile && yarn build:css:prefix",
+

data/pg_associable/app/assets/{css → stylesheets}/pg_associable.scss

@@ -7,7 +7,7 @@
   display: none;
 }
 .pg-form {
-  .pg_associable_inline, .pg_associable {
+  .pg_associable {
     .limpiar {
       display: none;
       position: absolute;

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

@@ -6,26 +6,9 @@ module PgAssociable
     end
 
     def pg_associable(atributo, options = {})
-      url_modal = namespaced_path(clase_asociacion(atributo), prefix: :abrir_modal)
-      options[:as] = 'pg_associable/pg_associable'
-      options[:wrapper] = :pg_associable
-      options[:url_modal] = url_modal
+      options[:as] = 'pg_associable'
+      options[:wrapper_html] = { data: { controller: 'asociable', 'asociable-modal-outlet': '.modal' } }
       association atributo, options
     end
-
-    def pg_associable_inline(atributo, options = {})
-      url_search = namespaced_path(clase_asociacion(atributo), prefix: :buscar)
-      options[:as] = 'pg_associable/pg_associable_inline'
-      options[:wrapper] = :pg_associable_inline
-      options[:url_search] = url_search
-      association atributo, options
-    end
-
-    def clase_asociacion(atributo)
-      asociacion = object.class.reflect_on_all_associations.find { |a| a.name == atributo.to_sym }
-      nombre_clase = asociacion.options[:class_name]
-      nombre_clase = asociacion.name.to_s.camelize if nombre_clase.nil?
-      Object.const_get(nombre_clase)
-    end
   end
 end

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

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

data/pg_associable/app/inputs/pg_associable_input.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+class PgAssociableInput < SimpleForm::Inputs::StringInput
+  include ActionView::Helpers::FormTagHelper
+  include Rails.application.routes.url_helpers
+  include PgEngine::RouteHelper
+
+  def hidden_input(_wrapper_options = {})
+    @builder.hidden_field(attribute_name)
+  end
+
+  def controller
+    # Para que no rompa polymorphic_url en NamespaceDeductor
+  end
+
+  def input(wrapper_options = nil)
+    atributo = attribute_name.to_s.gsub('_id', '')
+    url_modal = namespaced_path(clase_asociacion(atributo), prefix: :abrir_modal)
+    url_search = namespaced_path(clase_asociacion(atributo), prefix: :buscar)
+
+    input_html_options[:data] = { url_search:, url_modal: }
+    input_html_options[:type] = 'text'
+
+    merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
+
+    build_input(merged_input_options)
+  end
+
+  def clase_asociacion(atributo)
+    asociacion = object.class.reflect_on_all_associations.find { |a| a.name == atributo.to_sym }
+    nombre_clase = asociacion.options[:class_name]
+    nombre_clase = asociacion.name.to_s.camelize if nombre_clase.nil?
+    Object.const_get(nombre_clase)
+  end
+
+  def build_input(input_options)
+    content_tag('div', class: 'position-relative') do
+      hidden_input + text_field_tag(nil, object.send(reflection.name).to_s,
+                                    input_options) + limpiar + pencil
+    end
+  end
+
+  def limpiar(_wrapper_options = nil)
+    content_tag('a', href: 'javascript:void(0)', class: 'limpiar', title: 'Limpiar', tabindex: '0',
+                     data: { action: 'asociable#selectItem' }) do
+      '<i class="bi bi-x-lg"></i>'.html_safe
+    end
+  end
+
+  def pencil(_wrapper_options = nil)
+    '<i tabindex="-1" class="bi bi-pencil pencil"></i>'.html_safe
+  end
+end

data/pg_associable/app/javascript/asociable_controller.tsx

@@ -0,0 +1,171 @@
+import { Controller } from '@hotwired/stimulus'
+import * as React from 'react'
+import { renderToStaticMarkup } from 'react-dom/server'
+
+export default class extends Controller {
+  static outlets = ['modal']
+
+  lastValue = null
+  result = null
+  elemId = null
+  input = null
+
+  connect () {
+    console.log('connect asociable')
+
+    // ID único para identificar el campo y el modal
+    this.elemId = Math.trunc(Math.random() * 1000000000)
+
+    this.input = this.element.querySelector('input[type=text]')
+
+    this.element.setAttribute('data-asociable-modal-outlet', `.modal-${this.elemId}`)
+    this.element.classList.add(`asociable-${this.elemId}`)
+
+    this.result = document.createElement('div')
+    this.result.setAttribute('id', `resultados-inline-${this.elemId}`)
+    this.result.classList.add('resultados-wrapper')
+    this.input.parentNode.appendChild(this.result)
+
+    const input = this.element.querySelector('input[type=text]')
+    if (input.value) {
+      this.element.classList.add('filled')
+    }
+    this.element.querySelector('.pencil').onclick = () => {
+      input.focus()
+    }
+
+    const debounce = function (callback, wait) {
+      let timerId
+      return (...args) => {
+        clearTimeout(timerId)
+        timerId = setTimeout(() => {
+          callback(...args)
+        }, wait)
+      }
+    }
+    const doSearchBounce = debounce((force) => {
+      this.doSearch(force)
+    }, 200)
+
+    this.input.addEventListener('blur', () => {
+      this.input.placeholder = ''
+    })
+    this.input.onfocus = () => {
+      this.input.select()
+      if (this.input.value.length === 0) {
+        this.escribiAlgo()
+      }
+    }
+    this.input.onkeyup = (e) => {
+      if (this.input.value.length === 0) {
+        this.escribiAlgo()
+      }
+      if (e.keyCode === 13) {
+        doSearchBounce(true)
+      } else {
+        doSearchBounce()
+      }
+    }
+    this.input.onkeydown = (e) => {
+      if (e.keyCode === 13) {
+        e.preventDefault()
+        return false
+      }
+    }
+  }
+
+  crearItem () {
+    // Si ya hay un modal abierto lo abro y retorno
+    if (this.modalOutlets.length > 0) {
+      this.modalOutlet.openModal()
+      return
+    }
+
+    const elem = (
+      <form method="get" action={this.input.dataset.url_modal} data-turbo-stream="true">
+        <input type="hidden" name="id" value={this.elemId} />
+      </form>
+    )
+    const form = document.createElement('div')
+    form.innerHTML = renderToStaticMarkup(elem)
+    document.body.prepend(form)
+    form.childNodes[0].requestSubmit()
+    form.remove()
+  }
+
+  escribiAlgo () {
+    this.input.placeholder = 'Escribí algo para buscar'
+  }
+
+  buscando () {
+    this.result.innerHTML = renderToStaticMarkup(
+      <div className="resultados" tabIndex={-1}>
+        <div className="fst-italic text-secondary">Buscando...</div>
+      </div>
+    )
+  }
+
+  selectItem (e) {
+    if (e.target.dataset.object) {
+      this.completarCampo(JSON.parse(e.target.dataset.object))
+    } else {
+      this.completarCampo(null)
+    }
+    this.result.innerHTML = ''
+  }
+
+  doSearch (force = false) {
+    if (!force && this.input.value.length < 3) {
+      return
+    }
+    if (!force && this.input.value === this.lastValue) {
+      return
+    }
+    this.lastValue = this.input.value
+
+    const timerId = setTimeout(() => {
+      this.buscando()
+    }, 200)
+    document.addEventListener('turbo:before-stream-render', function () {
+      clearTimeout(timerId)
+    })
+    const elem = (
+      <form method="post" action={this.input.dataset.url_search} data-turbo-stream="true">
+        <input type="hidden" name="id" value={this.elemId} />
+        <input type="hidden" name="partial" value="pg_associable/resultados_inline" />
+        <input type="hidden" name="resultados" value="resultados-inline" />
+        <input type="hidden" name="query" value={this.input.value} />
+      </form>
+    )
+    const form = document.createElement('div')
+    form.innerHTML = renderToStaticMarkup(elem)
+    document.body.prepend(form)
+    form.childNodes[0].requestSubmit()
+    form.remove()
+  }
+
+  completarCampo (object) {
+    const textField = this.element.querySelector('input[type=text]')
+    const hiddenField = this.element.querySelector('input[type=hidden]')
+    if (object) {
+      hiddenField.value = object.id
+      textField.value = object.to_s
+      this.element.classList.add('filled')
+      this.element.dataset.object = object
+      const event = new CustomEvent('pg_associable:changed', { detail: object })
+      this.element.dispatchEvent(event)
+    } else {
+      textField.value = null
+      hiddenField.value = null
+      this.element.classList.remove('filled')
+      this.element.dataset.object = null
+      const event = new CustomEvent('pg_associable:changed')
+      this.element.dispatchEvent(event)
+    }
+    this.result.innerHTML = ''
+  }
+
+  disconnect () {
+    console.log('disconnect asociable')
+  }
+}

data/pg_associable/app/{assets/js → javascript}/modal_controller.js

@@ -78,15 +78,18 @@ export default class extends Controller {
 
   selectItem (e) {
     const asociable = this.asociableOutlet
-    // TODO: text en data
-    asociable.completarCampo(e.target.dataset.id, e.target.text)
+    if (e.target.dataset.object) {
+      asociable.completarCampo(JSON.parse(e.target.dataset.object))
+    } else {
+      asociable.completarCampo(null)
+    }
     this.remove()
   }
 
   responseTargetConnected (e) {
     const newObject = JSON.parse(e.dataset.response)
     const asociable = this.asociableOutlet
-    asociable.completarCampo(newObject.id, newObject.to_s)
+    asociable.completarCampo(newObject)
     this.remove()
   }
 

data/pg_associable/app/views/pg_associable/_resultados.html.slim

@@ -3,7 +3,9 @@
     .list-group.list-group-flush
       - collection.each do |object|
         = link_to object.to_s, 'javascript:void(0)',
-                  class: 'list-group-item', data: { action: 'modal#selectItem', id: object.id }
+                  class: 'list-group-item',
+                  data: { action: 'modal#selectItem', id: object.id, \
+                          object: object.decorate.to_json }
   - else
     ul.list-group.list-group-flush
       li.list-group-item No hay resultados para "#{params[:query]}"

data/pg_associable/app/views/pg_associable/_resultados_inline.html.slim

@@ -1,12 +1,15 @@
 .resultados tabindex="-1"
   - if collection.any?
     .list-group.list-group-flush
+      = link_to 'Crear', 'javascript:void(0)',
+                class: 'list-group-item', data: { action: 'asociable#crearItem' }
       = link_to 'Ninguno', 'javascript:void(0)',
-                class: 'list-group-item', data: { action: 'asociable_inline#selectItem' }
+                class: 'list-group-item', data: { action: 'asociable#selectItem' }
       - collection.each do |object|
         = link_to object.to_s, 'javascript:void(0)',
                   class: 'list-group-item',
-                  data: { action: 'asociable_inline#selectItem', id: object.id }
+                  data: { action: 'asociable#selectItem',
+                          id: object.id, object: object.decorate.to_json }
   - else
     ul.list-group.list-group-flush
       li.list-group-item No hay resultados para "#{params[:query]}"

data/pg_associable/index.js

@@ -1,7 +1,5 @@
-import AsociableInlineController from './app/assets/js/asociable_inline_controller'
-import AsociableController from './app/assets/js/asociable_controller'
-import ModalController from './app/assets/js/modal_controller'
+import AsociableController from './app/javascript/asociable_controller'
+import ModalController from './app/javascript/modal_controller'
 
-window.Stimulus.register('asociable_inline', AsociableInlineController)
 window.Stimulus.register('asociable', AsociableController)
 window.Stimulus.register('modal', ModalController)

data/pg_associable/lib/pg_associable/engine.rb

@@ -1,12 +1,4 @@
-require "#{__dir__}/../../app/helpers/pg_associable/helpers"
-require "#{__dir__}/../../app/helpers/pg_associable/form_builder_methods"
-
 module PgAssociable
   class Engine < ::Rails::Engine
-    isolate_namespace PgAssociable
-    # initializer 'configurar_simple_form', after: 'factory_bot.set_fixture_replacement' do
-    initializer 'configurar_pg_scaffold' do
-      require 'pg_associable/simple_form_initializer'
-    end
   end
 end

data/pg_associable/spec/pg_associable/helpers_spec.rb

@@ -2,10 +2,11 @@ require 'rails_helper'
 
 describe PgAssociable::Helpers do
   describe '#pg_respond_buscar' do
-    let(:user) { create :user }
+    let(:user) { create :user, :developer }
     let(:ctrl) do
-      clazz = Class.new(PgEngine::BaseController)
-      clazz.new
+      # clazz = Class.new(Admin::CosasController)
+      # clazz.new
+      Admin::CosasController.new
     end
     let!(:cosa) { create :cosa }
 

data/pg_engine/app/admin/accounts.rb

@@ -0,0 +1,25 @@
+ActiveAdmin.register Account do
+  permit_params :plan, :nombre, :hashid
+
+  index do
+    selectable_column
+    id_column
+    column :plan
+    column :nombre
+    column :hashid
+    actions
+  end
+
+  filter :plan
+  filter :nombre
+  filter :hashid
+
+  form do |f|
+    f.inputs do
+      f.input :plan
+      f.input :nombre
+      f.input :hashid
+    end
+    f.actions
+  end
+end

data/pg_engine/{lib/templates/activeadmin → app/admin}/audits.rb

@@ -1,7 +1,7 @@
 ActiveAdmin.register Audited::Audit do
-  permit_params [:auditable_id, :auditable_type, :associated_id, :associated_type, :user_id,
-                 :user_type, :username, :action, :audited_changes, :version, :comment,
-                 :remote_address, :request_uuid, :created_at]
+  permit_params %i[auditable_id auditable_type associated_id associated_type user_id
+                   user_type username action audited_changes version comment
+                   remote_address request_uuid created_at]
 
   # :id
   # :discarded_at, :fecha, :nombre, :tiempo, :tipo, :created_at, :updated_at, :actualizado_por_id, :creado_por_id

data/pg_engine/app/admin/dashboard.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+ActiveAdmin.register_page 'Dashboard' do
+  menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
+
+  content title: proc { I18n.t('active_admin.dashboard') } do
+    div class: 'blank_slate_container', id: 'dashboard_default_message' do
+      span class: 'blank_slate' do
+        span I18n.t('active_admin.dashboard_welcome.welcome')
+        small I18n.t('active_admin.dashboard_welcome.call_to_action')
+      end
+    end
+
+    # Here is an example of a simple dashboard with columns and panels.
+    #
+    # columns do
+    #   column do
+    #     panel "Recent Posts" do
+    #       ul do
+    #         Post.recent(5).map do |post|
+    #           li link_to(post.title, admin_post_path(post))
+    #         end
+    #       end
+    #     end
+    #   end
+
+    #   column do
+    #     panel "Info" do
+    #       para "Welcome to ActiveAdmin."
+    #     end
+    #   end
+    # end
+  end
+end

data/pg_engine/app/admin/user_accounts.rb

@@ -0,0 +1,26 @@
+ActiveAdmin.register UserAccount do
+  decorate_with UserAccountDecorator
+  permit_params :user_id, :account_id, profiles: []
+
+  index do
+    selectable_column
+    id_column
+    column :user
+    column :account
+    column :profiles
+    actions
+  end
+
+  filter :user
+  filter :account
+  filter :profiles
+
+  form do |f|
+    f.inputs do
+      f.input :user
+      f.input :account
+      f.input :profiles, as: :select
+    end
+    f.actions
+  end
+end

data/pg_engine/{lib/templates/activeadmin → app/admin}/users.rb

@@ -1,6 +1,6 @@
 ActiveAdmin.register User do
   decorate_with UserDecorator
-  permit_params :email, :password, :password_confirmation, :confirmed_at, profiles: []
+  permit_params :email, :password, :password_confirmation, :confirmed_at
 
   index do
     selectable_column
@@ -19,7 +19,6 @@ ActiveAdmin.register User do
       else
         f.input :email
         f.input :password unless f.object.persisted?
-        f.input :profiles, as: :select
       end
     end
     f.actions

data/pg_engine/app/assets/javascripts/active_admin.js

@@ -0,0 +1 @@
+//= require active_admin/base

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

@@ -0,0 +1,17 @@
+// Sass variable overrides must be declared before loading up Active Admin's styles.
+//
+// To view the variables that Active Admin provides, take a look at
+// `app/assets/stylesheets/active_admin/mixins/_variables.scss` in the
+// Active Admin source.
+//
+// For example, to change the sidebar width:
+// $sidebar-width: 242px;
+
+// Active Admin's got SASS!
+@import "active_admin/mixins";
+@import "active_admin/base";
+
+// Overriding any non-variable Sass must be done after the fact.
+// For example, to change the default status-tag color:
+//
+//   .status_tag { background: #6090DB; }

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+module Admin
+  class AccountsController < AdminController
+    before_action { @clase_modelo = Account }
+
+    before_action(only: :index) { authorize Account }
+
+    before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
+
+    add_breadcrumb Account.nombre_plural, :admin_accounts_path
+
+    private
+
+    def atributos_permitidos
+      %i[plan nombre hashid]
+    end
+
+    def atributos_para_buscar
+      %i[plan nombre hashid]
+    end
+
+    def atributos_para_listar
+      %i[plan nombre hashid]
+    end
+
+    def atributos_para_mostrar
+      %i[plan nombre hashid]
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+module Admin
+  class UserAccountsController < AdminController
+    before_action { @clase_modelo = UserAccount }
+
+    before_action(only: :index) { authorize UserAccount }
+
+    before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
+
+    add_breadcrumb UserAccount.nombre_plural, :admin_user_accounts_path
+
+    private
+
+    def atributos_permitidos
+      %i[user_id account_id profiles]
+    end
+
+    def atributos_para_buscar
+      %i[user account profiles]
+    end
+
+    def atributos_para_listar
+      %i[user account profiles]
+    end
+
+    def atributos_para_mostrar
+      %i[user account profiles]
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+module Admin
+  class UsersController < AdminController
+    before_action { @clase_modelo = User }
+
+    before_action(only: :index) { authorize User }
+
+    before_action only: %i[update] do
+      params[:user].delete(:password) if params[:user][:password].blank?
+    end
+
+    before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
+
+    add_breadcrumb User.nombre_plural, :admin_users_path
+
+    def create
+      @user.skip_confirmation!
+      pg_respond_create
+    end
+
+    def update
+      @user.skip_reconfirmation!
+      pg_respond_update
+    end
+
+    private
+
+    def atributos_permitidos
+      %i[email password developer]
+    end
+
+    def atributos_para_buscar
+      %i[email developer]
+    end
+
+    def atributos_para_listar
+      %i[email developer]
+    end
+
+    def atributos_para_mostrar
+      %i[email developer]
+    end
+  end
+end

data/pg_engine/app/controllers/pg_engine/resource_helper.rb

@@ -225,6 +225,7 @@ module PgEngine
       authorize instancia_modelo
 
       # TODO: problema en create y update cuando falla la validacion
+      # Reproducir el error antes de arreglarlo
       self.instancia_modelo = instancia_modelo.decorate if action_name.in? %w[show edit new]
     end