pg_rails 7.1.1.pre.3 → 7.1.1.pre.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08c5ab91e5c32e537c33112965e6be68eb7d5992e236f27752a182af7cf584ff'
-  data.tar.gz: 32461e729fa13575fbd61f9c02e5907e06e6b8acabd18068db0c049483a83536
+  metadata.gz: 8ed654c2ed0008b0a029aafcf59fbf1fb11d681b091852cdf91075eb59027b4e
+  data.tar.gz: 8c5030277d34251d6e214697475c1e79121a40b1c5c9b757eb9ca95d04261bfb
 SHA512:
-  metadata.gz: 1b0caab961e097ce6a9b770fecbc02c179013987d20fdd016f44f2675084555b44ff700f94abe07f748fb4a55466614ef44c28758420881c096781936edbb9bb
-  data.tar.gz: 6652961ad489a6a699819874c79c69356f6a9f8882f1c4ed195556b16d8836c440886db77bee3f2a60f2fda6c07e9a68f525c2c91ceba9748c01caf89449e421
+  metadata.gz: f2a334fbf6cf1e62e629bb231ab9ecca2300b30db6f04e1fb6360e7d9d2688a9399398d860cc0930418889b5960dfe900eb6e7bd8a7be8ff0e32d8e48513244b
+  data.tar.gz: f3686b6c215d38d54147e1506d7645b36ccf29ed2fde0dae04574662a649550d952deb5bce503a6ff3403dc98c77235364485e04e3dc4171f39af7ee4db672cf

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

@@ -64,8 +64,7 @@ input[type=datetime-local], input[type=datetime] {
     padding: 0.25rem 1rem;
   }
 }
-.listado td:has(.btn) {
-  // FIXME: rompe porque es una tabla y tiene que tener su propio display
+.listado .actions-wrapper {
   display: flex;
   justify-content: flex-end;
   gap: 4px;

data/pg_engine/app/controllers/concerns/pg_engine/resource.rb

@@ -24,7 +24,7 @@ module PgEngine
     end
 
     def show
-      add_breadcrumb instancia_modelo, instancia_modelo.target_object
+      add_breadcrumb instancia_modelo.to_s_short, instancia_modelo.target_object
 
       pg_respond_show
     end
@@ -34,7 +34,7 @@ module PgEngine
     end
 
     def edit
-      add_breadcrumb instancia_modelo, instancia_modelo.target_object
+      add_breadcrumb instancia_modelo.to_s_short, instancia_modelo.target_object
       add_breadcrumb 'Editando'
     end
 
@@ -160,7 +160,9 @@ module PgEngine
             end
           else
             format.turbo_stream do
-              render turbo_stream: turbo_stream.remove(model)
+              # Esto no es totalmente limpio pero funciona tanto en los listados como en los
+              # modal show
+              render turbo_stream: turbo_stream.remove(model) + turbo_stream.remove_all('.modal')
             end
             format.html do
               redirect_back(fallback_location: root_path, notice: msg, status: 303)

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

@@ -113,6 +113,12 @@ module PgEngine
     protected
 
     def render_my_component(component, status)
+      # Esto es para que saltee los turbo frames y genere
+      # un full reload. El turbo_no_cache no es estrictamente necesario
+      # pero lo dejo por las dudas
+      @turbo_page_requires_reload = true
+      @turbo_no_cache = true
+
       respond_to do |format|
         format.html do
           render component.alert_wrapped(view_context),
@@ -128,6 +134,11 @@ module PgEngine
                  status:
         end
 
+        format.json do
+          html = component.render_in(view_context)
+          render json: { html: }, status:
+        end
+
         format.any do
           head status
         end

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

@@ -1,7 +1,7 @@
 module Users
   class ConfirmationsController < Devise::ConfirmationsController
     # GET /resource/confirmation?confirmation_token=abcdef
-    def show # rubocop:disable Metrics/AbcSize
+    def show
       self.resource = resource_class.confirm_by_token(params[:confirmation_token])
       yield resource if block_given?
 

data/pg_engine/app/decorators/pg_engine/base_record_decorator.rb

@@ -22,6 +22,10 @@ module PgEngine
       object.as_json(options).tap { |o| o[:to_s] = to_s }
     end
 
+    def to_s_short
+      truncate(object.to_s)
+    end
+
     # rubocop:disable Style/MissingRespondToMissing
     def method_missing(method_name, *args, &)
       valor = object.attributes[method_name.to_s]

data/pg_engine/app/views/admin/eventos/new.html.slim

@@ -6,7 +6,7 @@
     = f.input :message, as: :text
   - else
     = f.rich_text_area :message
-  = f.input :message_text, as: :text
+  = f.input :message_text, as: :text, hint: 'Solo para emails, para la plain/text part'
   = f.input :tooltip
   = f.input :subject
   = f.input :record_type

data/pg_engine/app/views/pg_engine/base/index.html.slim

@@ -53,10 +53,11 @@ div
               - atributos_para_listar.each do |att|
                 td.text-nowrap = object.send(att)
               td.text-nowrap.text-end.ps-5
-                = object.extra_actions(size: :sm) if object.respond_to? :extra_actions
-                = object.show_link
-                = object.edit_link(text: '', klass: 'btn-light')
-                = object.destroy_link
+                .actions-wrapper
+                  = object.extra_actions(size: :sm) if object.respond_to? :extra_actions
+                  = object.show_link
+                  = object.edit_link(text: '', klass: 'btn-light')
+                  = object.destroy_link
 
     .ps-3.justify-content-center
       = paginate(@collection)

data/pg_engine/db/seeds.rb

@@ -1,8 +1,6 @@
 DatabaseCleaner.clean_with(:truncation, except: %w(ar_internal_metadata))
 
-MAIL = 'mrosso10@gmail.com'
+FactoryBot.create :user, email: 'mrosso10@gmail.com', nombre: 'Martín', apellido: 'Rosso', password: 'admin123',
+                         confirmed_at: Time.now, developer: true
 
-unless User.where(email: MAIL).exists?
-  FactoryBot.create :user, email: MAIL, nombre: 'Martín', apellido: 'Rosso', password: 'admin123',
-                           confirmed_at: Time.now, developer: true
-end
+Account.first.users << FactoryBot.create(:user, orphan: true)

data/pg_engine/lib/pg_engine/email_observer.rb

@@ -2,7 +2,7 @@
 
 module PgEngine
   class EmailObserver
-    def self.delivered_email(message) # rubocop:disable Metrics/AbcSize
+    def self.delivered_email(message)
       message_id = message.message_id
       mailer = message.delivery_handler.to_s
       status = get_status(message)

data/pg_engine/spec/factories/users.rb

@@ -37,8 +37,8 @@
 
 FactoryBot.define do
   factory :user, class: 'User' do
-    nombre { Faker::Name.name }
-    apellido { Faker::Name.name }
+    nombre { Faker::Name.first_name }
+    apellido { Faker::Name.last_name }
     email { Faker::Internet.email }
     password { "password#{rand(99_999)}" }
     confirmed_at { Faker::Date.backward }

data/pg_layout/app/javascript/utils/cookies.js

@@ -1,5 +1,7 @@
+// TODO: borrar deprecated file
 export default class {
   setCookie (cname, cvalue, exdays) {
+    console.log('DEPRECATED setCookie')
     const d = new Date()
     d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000))
     const expires = 'expires=' + d.toUTCString()
@@ -7,6 +9,7 @@ export default class {
   }
 
   getCookie (cname) {
+    console.log('DEPRECATED getCookie')
     const name = cname + '='
     const ca = document.cookie.split(';')
     for (let i = 0; i < ca.length; i++) {

data/pg_layout/app/javascript/utils/utils.ts

@@ -1,3 +1,25 @@
+export function setCookie (cname, cvalue, exdays) {
+  const d = new Date()
+  d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000))
+  const expires = 'expires=' + d.toUTCString()
+  document.cookie = cname + '=' + cvalue + ';' + expires + ';path=/'
+}
+
+export function getCookie (cname) {
+  const name = cname + '='
+  const ca = document.cookie.split(';')
+  for (let i = 0; i < ca.length; i++) {
+    let c = ca[i]
+    while (c.charAt(0) === ' ') {
+      c = c.substring(1)
+    }
+    if (c.indexOf(name) === 0) {
+      return c.substring(name.length, c.length)
+    }
+  }
+  return ''
+}
+
 export function round (value) {
   return Math.round(value * 100) / 100
 }

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

@@ -5,6 +5,9 @@ html
     meta charset="UTF-8"
     meta http-equiv="X-UA-Compatible" content="IE=edge"
     meta name="viewport" content="width=device-width,initial-scale=1"
+    - if @turbo_page_requires_reload
+      meta name="turbo-visit-control" content="reload"
+
     - cache :title_icon
       title = t('app_name')
       - begin

data/pg_layout/app/views/pg_layout/_modal_show.html.slim

@@ -1,9 +1,14 @@
-.modal.modal-lg.modal-asociable[tabindex="-1" data-controller="modal" data-remove-on-hide="true"]
+.modal.modal-lg.modal-asociable[tabindex="-1" data-controller="modal"
+                      data-remove-on-hide="true" data-turbo-temporary="true"]
   .modal-dialog
     .modal-content
       .modal-header
-        .modal-title
-          h3 Item
+        = link_to object.target_object do
+          | Ir al #{object.class.nombre_singular.downcase}
         a.btn-close[type="button" data-bs-dismiss="modal" aria-label="Close"]
       .modal-body
-        = render object
+        = turbo_frame_tag :modal_generic, target: :_top do
+          .float-end
+            = object.edit_link
+            = object.destroy_link
+          = render object

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.1.1-3'
+  VERSION = '7.1.1-5'
 end

data/pg_scaffold/lib/generators/pg_slim/templates/index.html.slim

@@ -41,9 +41,10 @@ div
               - atributos_para_listar.each do |att|
                 th = object.send(att)
               td.text-nowrap.text-end.ps-5
-                = object.show_link
-                = object.edit_link(text: '', klass: 'btn-light')
-                = object.destroy_link
+                .actions-wrapper
+                  = object.show_link
+                  = object.edit_link(text: '', klass: 'btn-light')
+                  = object.destroy_link
 
     .ps-3.justify-content-center
       = paginate(@collection)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.1.1.pre.3
+  version: 7.1.1.pre.5
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-18 00:00:00.000000000 Z
+date: 2024-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails