pg_rails 7.6.14 → 7.6.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa1826517f886fd0a5fd3ea458411cd600181118fd4494563f6fbe78e32d65c9
-  data.tar.gz: d0d832af6e4c1912a3edf1f3a65fefcb36541773e65d681a1697e75d96ad85a7
+  metadata.gz: f1be39ed176491e2f5da66a9a1764f6c2f8c8509c7510999f72007cd0a1bb0f7
+  data.tar.gz: 591fe03520a040b5651b3a8153d7bdc7bc42afd6c8b6b44cfbf5a6525d883e89
 SHA512:
-  metadata.gz: 672e3fe48b7a305c61ab0e2eb5cbf218dc0e56fcfbd23a0faec4c5dc655a08b01170a98ce280781b14e1a3547538afc69d48d95756090348c4544dd69835364c
-  data.tar.gz: a648588c54f6e1f72265c511164b2109120f8813423f9c9d9d428f87441e90aaf8835953e906ab041a20378d744ef9b7651d7dde30087cd630c87a45561f3d18
+  metadata.gz: 06c346252f40b648dc108ada25a3a4ab7dda9cb8ead20964d835aa19231063b165e56c2565d7b854ca8aa073245346c7b269852e4f392ae5d1139acef3cbe629
+  data.tar.gz: 619cc8ab8f5ef3ab61f8e825b9c3ca3ba8767a77ee35ebe7e0f6dc23add99b33075d8049f89f2022d42417a94b06ec19c81fc5b36fb8271d42132183d32fce08

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

@@ -0,0 +1,75 @@
+module Admin
+  class SimpleUserNotifiersController < AdminController
+    include PgEngine::Resource
+
+    self.clase_modelo = SimpleUserNotifier
+
+    before_action :set_instancia_modelo, only: %i[new create show edit update destroy]
+
+    def column_options_for(object, attribute)
+      case attribute
+      when :message
+        { class: 'column-truncate-30', title: object.send(attribute).to_s }
+      else
+        super
+      end
+    end
+
+    # rubocop:disable Metrics/MethodLength
+    def create
+      @event = SimpleUserNotifier.new(modelo_params)
+      # @event.message.save!
+      unless @event.valid?
+        render :new, status: :unprocessable_entity
+        return
+      end
+      json_params_for_event = {
+        message: @event.message,
+        tooltip: @event.tooltip
+      }
+      notifier = SimpleUserNotifier.with(json_params_for_event)
+
+      case @event.target
+      when 'todos'
+        notifier.deliver(User.all)
+      when 'devs'
+        notifier.deliver(User.where(developer: true))
+      when 'user_ids'
+        notifier.deliver(User.where(email: @event.user_ids.split(',')))
+      else
+        # :nocov:
+        'shouldnt happen'
+        # :nocov:
+      end
+
+      redirect_to admin_simple_user_notifiers_path
+    rescue StandardError => e
+      # :nocov:
+      flash.now[:alert] = e.to_s
+      render :new, status: :unprocessable_entity
+      # :nocov:
+    end
+    # rubocop:enable Metrics/MethodLength
+
+    private
+
+    def atributos_permitidos
+      %i[
+        type message tooltip record_type record_id target subject
+        user_ids message_text
+      ]
+    end
+
+    def atributos_para_buscar
+      %i[]
+    end
+
+    def atributos_para_listar
+      %i[message tooltip created_at notifications_count]
+    end
+
+    def atributos_para_mostrar
+      %i[tooltip]
+    end
+  end
+end

data/pg_engine/app/notifiers/simple_user_notifier.rb

@@ -29,4 +29,21 @@ class SimpleUserNotifier < ApplicationNotifier
   # Add required params
   #
   required_param :message
+
+  attr_accessor :target, :user_ids
+
+  enumerize :target, in: { todos: 0, devs: 1, user_ids: 2 }
+
+  %i[message message_text tooltip subject].each do |field|
+    define_method :"#{field}" do
+      params[field]
+    end
+    define_method :"#{field}=" do |value|
+      params[field] = value
+    end
+  end
+
+  def self.policy_class
+    ApplicationPolicy
+  end
 end

data/pg_engine/app/views/admin/simple_user_notifiers/_form.html.slim

@@ -0,0 +1,14 @@
+= pg_form_for @simple_user_notifier do |f|
+  - if params[:plain_text]
+    = link_to 'Change to rich text', url_for
+    = f.input :message, as: :text
+  - else
+    = link_to 'Change to plain text', url_for(plain_text: true)
+    = f.rich_text_area :message
+  = f.input :tooltip
+  / = f.input :record_type
+  / = f.input :record_id
+  - unless @simple_user_notifier.persisted?
+    = f.input :target
+    = f.input :user_ids, label: 'User emails'
+  = f.submit

data/pg_engine/app/views/admin/simple_user_notifiers/show.html.slim

@@ -0,0 +1,29 @@
+- content_for :actions do
+  = @simple_user_notifier.destroy_link_redirect
+  .ms-1
+  = @simple_user_notifier.edit_link
+
+table.table.table-borderless.table-sm.w-auto.mb-0.m-3
+  - atributos_para_mostrar.each do |att|
+    tr
+      th = @clase_modelo.human_attribute_name(att)
+      td = render InlineShowComponent.new(@simple_user_notifier.object, att)
+  tr
+    th = t('attributes.created_at')
+    td = @simple_user_notifier.created_at
+  tr
+    th = t('attributes.updated_at')
+    td = @simple_user_notifier.updated_at
+
+.bg-secondary-subtle.p-4.mt-3.trix-content
+  = @simple_user_notifier.message.html_safe
+
+div style="max-width: 30em"
+  table.table.table-sm
+    tr
+      th Destinatario
+      th Visto
+    - @simple_user_notifier.notifications.order('seen_at desc nulls last').each do |notification|
+      tr
+        td = notification.recipient
+        td = dmy_time notification.seen_at

data/pg_engine/config/routes.rb

@@ -42,7 +42,7 @@ Rails.application.routes.draw do
 
   namespace :admin, path: 'a' do
     pg_resource(:emails)
-    pg_resource(:eventos)
+    pg_resource(:simple_user_notifiers)
     pg_resource(:email_logs) do
       collection do
         post :mailgun_sync

data/pg_engine/lib/pg_engine/navigator.rb

@@ -39,7 +39,7 @@ module PgEngine
 
       navbar.add_item('sidebar.signed_in', {
                         name: 'Eventos',
-                        path: 'admin_eventos_path'
+                        path: 'admin_simple_user_notifiers_path'
                       })
       navbar.add_item('sidebar.signed_in', {
                         name: 'Emails',

data/pg_layout/app/javascript/application.js

@@ -48,10 +48,12 @@ document.addEventListener('pg:record-created', (ev) => {
 })
 
 document.addEventListener('pg:record-updated', (ev) => {
-  Turbo.visit(window.location)
-  setTimeout(() => {
-    Turbo.cache.clear()
-  }, 1000)
+  if (!ev.data.dataset.inline) {
+    Turbo.visit(window.location)
+    setTimeout(() => {
+      Turbo.cache.clear()
+    }, 1000)
+  }
 })
 
 document.addEventListener('pg:record-destroyed', (ev) => {

data/pg_rails/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.14
+  version: 7.6.16
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-11 00:00:00.000000000 Z
+date: 2024-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -693,7 +693,7 @@ files:
 - pg_engine/app/controllers/admin/accounts_controller.rb
 - pg_engine/app/controllers/admin/email_logs_controller.rb
 - pg_engine/app/controllers/admin/emails_controller.rb
-- pg_engine/app/controllers/admin/eventos_controller.rb
+- pg_engine/app/controllers/admin/simple_user_notifiers_controller.rb
 - pg_engine/app/controllers/admin/user_accounts_controller.rb
 - pg_engine/app/controllers/admin/users_controller.rb
 - pg_engine/app/controllers/concerns/pg_engine/require_tenant_set.rb
@@ -746,7 +746,6 @@ files:
 - pg_engine/app/models/current.rb
 - pg_engine/app/models/email.rb
 - pg_engine/app/models/email_log.rb
-- pg_engine/app/models/evento.rb
 - pg_engine/app/models/mensaje_contacto.rb
 - pg_engine/app/models/pg_engine/base_record.rb
 - pg_engine/app/models/user.rb
@@ -776,8 +775,8 @@ files:
 - pg_engine/app/views/admin/emails/_form.html.slim
 - pg_engine/app/views/admin/emails/_send.html.slim
 - pg_engine/app/views/admin/emails/show.html.slim
-- pg_engine/app/views/admin/eventos/index.html.slim
-- pg_engine/app/views/admin/eventos/new.html.slim
+- pg_engine/app/views/admin/simple_user_notifiers/_form.html.slim
+- pg_engine/app/views/admin/simple_user_notifiers/show.html.slim
 - pg_engine/app/views/admin/user_accounts/_form.html.slim
 - pg_engine/app/views/admin/user_accounts/_user_account.html.slim
 - pg_engine/app/views/admin/user_accounts/edit.html.slim

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

@@ -1,83 +0,0 @@
-module Admin
-  class EventosController < AdminController
-    layout 'pg_layout/containerized'
-
-    add_breadcrumb 'Eventos'
-
-    before_action do
-      @notifier_types = %w[
-        EmailUserNotifier
-        SimpleUserNotifier
-      ]
-    end
-
-    def index
-      @events = Noticed::Event.order(id: :desc)
-    end
-
-    # rubocop:disable Metrics/AbcSize
-    def new
-      @event = Evento.new(type: 'SimpleUserNotifier')
-      return if params[:event_id].blank?
-
-      reference = Noticed::Event.find(params[:event_id])
-      @event.type = reference.type
-      @event.message = reference.params[:message]
-      @event.message_text = reference.params[:message_text]
-      @event.tooltip = reference.params[:tooltip]
-      @event.subject = reference.params[:subject]
-      @event.record_type = reference.record_type
-      @event.record_id = reference.record_id
-    end
-    # rubocop:enable Metrics/AbcSize
-
-    # rubocop:disable Metrics/MethodLength
-    def create # rubocop:disable Metrics/AbcSize
-      @event = Evento.new(event_params)
-      # @event.message.save!
-      unless @event.valid?
-        render :new, status: :unprocessable_entity
-        return
-      end
-      json_params_for_event = {
-        record: @event.record,
-        message: @event.message,
-        message_text: @event.message_text,
-        tooltip: @event.tooltip,
-        subject: @event.subject
-      }
-      notifier_class = @event.type.constantize
-      notifier = notifier_class.with(json_params_for_event)
-
-      case @event.target
-      when 'todos'
-        notifier.deliver(User.all)
-      when 'devs'
-        notifier.deliver(User.where(developer: true))
-      when 'user_ids'
-        notifier.deliver(User.where(email: @event.user_ids.split(',')))
-      else
-        # :nocov:
-        'shouldnt happen'
-        # :nocov:
-      end
-
-      redirect_to admin_eventos_path
-    rescue StandardError => e
-      # :nocov:
-      flash.now[:alert] = e.to_s
-      render :new, status: :unprocessable_entity
-      # :nocov:
-    end
-    # rubocop:enable Metrics/MethodLength
-
-    private
-
-    def event_params
-      params.require(:evento).permit(
-        :type, :message, :tooltip, :record_type, :record_id, :target, :subject,
-        :user_ids, :message_text
-      )
-    end
-  end
-end

data/pg_engine/app/models/evento.rb

@@ -1,27 +0,0 @@
-class Evento
-  include ActiveModel::API
-  include ActionText::Attribute
-  extend Enumerize
-
-  attr_accessor :tooltip, :target, :message, :message_text, :type,
-                :record_type, :record_id,
-                :subject, :user_ids
-
-  validates :target, :type, :message, presence: true
-
-  enumerize :target, in: { todos: 0, devs: 1, user_ids: 2 }
-
-  validates :message_text, :subject, presence: true, if: lambda {
-    type == 'EmailUserNotifier'
-  }
-
-  validates :user_ids, presence: true, if: lambda {
-    target == 'user_ids'
-  }
-
-  def record
-    return if record_id.blank?
-
-    record_type.constantize.find(record_id)
-  end
-end

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

@@ -1,6 +0,0 @@
-- content_for :actions do
-  = link_to 'Nuevo', new_admin_evento_path
-h1 Eventos
-
-- @events.each do |event|
-  pre.mb-5 = JSON.pretty_generate event.as_json

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

@@ -1,16 +0,0 @@
-= pg_form_for @event, url: admin_eventos_path do |f|
-  = f.input :type, as: :select, collection: @notifier_types
-  - if params[:plain_text]
-    = link_to 'Change to rich text', url_for
-    = f.input :message, as: :text
-  - else
-    = link_to 'Change to plain text', url_for(plain_text: true)
-    = f.rich_text_area :message
-  = 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
-  = f.input :record_id
-  = f.input :target
-  = f.input :user_ids, label: 'User emails'
-  = f.submit