effective_messaging 0.7.5 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7407b82bbf657f12efd728834391a82d5a3f6d2d45e2833e4e092c442a9f87c8
-  data.tar.gz: 9d5d26c07a3b88e0c8a9786e6c5b35cf75505b647116bd55732b543c163f4756
+  metadata.gz: 8d1af8fb6d222cf7dc1f2ad5c9baaf139607cef5f724879fd3bc037107d56b4d
+  data.tar.gz: f6315751785d8760aee7adb5593826f6b4ed80639ec1d0f54d1ee95f85462828
 SHA512:
-  metadata.gz: 79a35234d7e9857bd44190646ed0cb10eeafe10a92998fe90ca56137ca85943516c6759b3ba0fede7b6902296c5d10a3231569cb49fcd39e5f053be50b83e7f7
-  data.tar.gz: 28e9c078ca521aecdb71da681074cb5e6fc5b9fa6f14f34e4b5a8625a33c6fc7cda767f21b4dcc3fe19f8db804f92b6d95c7b17f31082090adf1593ebecc680e
+  metadata.gz: 657cc27116ca125f8102c2bc4ee1331d9359e673e7b9dc4647509541c217f4ad79c2a11e4dd4014ec0aff7f0b8fab9be45de9a104a8738f2a87d3d16d73dcf64
+  data.tar.gz: 5c0de10cdbbf454298c7033f39ed5ca08cfffb51c1f54cd6ee65f5d23872b08fd93267e1f5281eecbc6205493d99e48d04b9c3f47109c4cf178c6d1d6e75723d

data/app/datatables/admin/effective_notification_logs_datatable.rb

@@ -9,7 +9,7 @@ module Admin
       col :notification
       col :report, visible: !attributes[:inline]
       col :resource, search: :string
-      col :user, search: :string
+      col :user, label: 'Source', search: :string
       col :email
       col :skipped
 

data/app/models/effective/chat_message.rb

@@ -35,7 +35,13 @@ module Effective
     validates :body, presence: true
 
     def to_s
-      body.presence || 'New Chat Message'
+      truncate(body.presence || 'New Chat Message')
+    end
+
+    private
+
+    def truncate(value)
+      value.length > 100 ? (value.first(100) + '...') : value
     end
 
   end

data/app/models/effective/notification.rb

@@ -134,7 +134,7 @@ module Effective
     validates :report, presence: true
 
     validate(if: -> { report.present? }) do
-      errors.add(:report, 'must include an email or user column') unless report.email_report_column || report.user_report_column
+      errors.add(:report, 'must include an email, user, organization or owner column') unless report.email_report_column || report.emailable_report_column
     end
 
     validate(if: -> { report.present? && subject.present? }) do
@@ -347,7 +347,7 @@ module Effective
     end
 
     def already_notified_today?(resource)
-      email = resource_email(resource) || resource_user(resource).try(:email)
+      email = resource_emails_to_s(resource)
       raise("expected an email for #{report} #{report&.id} and #{resource} #{resource&.id}") unless email.present?
 
       logs = notification_logs.select { |log| log.email == email }
@@ -362,7 +362,7 @@ module Effective
     def notifiable_immediate?(resource:, date: nil)
       raise('expected an immediate? notification') unless immediate?
 
-      email = resource_email(resource) || resource_user(resource).try(:email)
+      email = resource_emails_to_s(resource)
       raise("expected an email for #{report} #{report&.id} and #{resource} #{resource&.id}") unless email.present?
 
       logs = notification_logs.select { |log| log.email == email }
@@ -394,12 +394,7 @@ module Effective
     def render_email(resource = nil)
       raise('expected an acts_as_reportable resource') if resource.present? && !resource.class.try(:acts_as_reportable?)
 
-      to = if audience == 'emails'
-        audience_emails.presence
-      elsif audience == 'report'
-        resource_email(resource) || resource_user(resource).try(:email)
-      end
-
+      to = (audience == 'emails' ? audience_emails.presence : resource_emails_to_s(resource))
       raise('expected a to email address') unless to.present?
 
       assigns = assigns_for(resource)
@@ -437,12 +432,12 @@ module Effective
     end
 
     def build_notification_log(resource: nil, skipped: false)
-      user = resource_user(resource)
+      emailable = resource_emailable(resource)
 
-      email = resource_email(resource) || user.try(:email)
+      email = resource_emails_to_s(resource)
       email ||= audience_emails_to_s if scheduled_email?
 
-      notification_logs.build(email: email, report: report, resource: resource, user: user, skipped: skipped)
+      notification_logs.build(email: email, report: report, resource: resource, user: emailable, skipped: skipped)
     end
 
     private
@@ -456,18 +451,31 @@ module Effective
     end
 
     def audience_emails_to_s
-      audience_emails.presence&.join(',')
+      audience_emails.presence&.join(', ')
+    end
+
+    # All emails for this emailable resource
+    def resource_emails_to_s(resource)
+      emails = Array(resource_email(resource)).map(&:presence).compact
+
+      if emails.blank? && (emailable = resource_emailable(resource)).present?
+        emails = Array(emailable.try(:reportable_emails) || emailable.try(:email)).map(&:presence).compact
+      end
+
+      emails.presence&.join(', ')
     end
 
-    def resource_user(resource)
+    # A user, owner, or organization column
+    def resource_emailable(resource)
       return unless resource.present?
 
-      column = report&.user_report_column
+      column = report&.emailable_report_column
       return unless column.present?
 
       resource.public_send(column.name) || (resource if resource.respond_to?(:email))
     end
 
+    # An email column
     def resource_email(resource)
       return unless resource.present?
 

data/app/models/effective/notification_log.rb

@@ -20,7 +20,7 @@ module Effective
     scope :sorted, -> { order(:id) }
     scope :deep, -> { includes(:notification, :report, :resource, :user) }
 
-    validates :email, presence: true, email: true
+    validates :email, presence: true
 
     def to_s
       model_name.human

data/app/views/admin/chat_messages/_form.html.haml

@@ -0,0 +1,9 @@
+= effective_form_with(model: [:admin, chat_message], engine: true) do |f|
+  - unless inline_datatable?
+    = f.static_field :chat, label: et(f.object.chat)
+
+  = f.static_field :name, label: 'From'
+  = f.text_area :body
+
+  = f.submit 'Save'
+

data/app/views/admin/chats/_form.html.haml

@@ -3,6 +3,9 @@
     = render 'admin/chats/form_chat', chat: chat
 
   - if chat.persisted?
+    = tab(chat.chat_messages) do
+      = render_inline_datatable(Admin::EffectiveChatMessagesDatatable.new(chat: chat))
+
     - if chat.respond_to?(:logs_datatable)
       = tab "Logs" do
         = render_inline_datatable(chat.logs_datatable)

data/config/routes.rb

@@ -12,7 +12,7 @@ EffectiveMessaging::Engine.routes.draw do
 
   namespace :admin do
     resources :chats
-    resources :chat_messages, only: [:index, :show, :destroy]
+    resources :chat_messages, except: [:new, :create]
 
     resources :notifications do
       post :enable, on: :member

data/lib/effective_messaging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMessaging
-  VERSION = '0.7.5'.freeze
+  VERSION = '0.8.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_messaging
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.8.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-20 00:00:00.000000000 Z
+date: 2024-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -229,6 +229,7 @@ files:
 - app/models/effective/notification.rb
 - app/models/effective/notification_log.rb
 - app/views/admin/chat_messages/_chat_message.html.haml
+- app/views/admin/chat_messages/_form.html.haml
 - app/views/admin/chats/_chat.html.haml
 - app/views/admin/chats/_form.html.haml
 - app/views/admin/chats/_form_chat.html.haml