effective_reports 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fdd496c78cd961c97fd7fdcac5a24fe50dd30d9b924df9dd3373a9dd9968ca0
-  data.tar.gz: be36d71a6214183561fc381c9e74c28ce8875ff394ac91571bac8e2c5ebd9bfb
+  metadata.gz: 114ad37c7da77453343c93c770d85db4d7dc03a75a151e7fead6f94110ecd6e3
+  data.tar.gz: 6b0a1b43d71bef9780bffeaccb546146316dc3ce5f918fed73bfac0be0ce860c
 SHA512:
-  metadata.gz: a7b6ce19b19f82a91518b9b9de083935eb213c15a1cfc09ea4b25c07cddbd8282f68622cf15749550df48170dabc42ed565fea368b0f096d00911e772abbbcb2
-  data.tar.gz: 0bb82f6cb3fb21984886cfdb7faa36d221b3dd800364d3bfe1176a93ad8fe159f19ea4d012bac985893b68b5b2badd841918e7878e21466b1c06fe1b2f326192
+  metadata.gz: 4ab9954ca02cdd90510cfbc8c28c8554d9c17acc5014d2b8cdc502d5318cec92d325c2396e8f952df70dbbaf07d0355f3757e56b9c88582da82c5b4a266fb705
+  data.tar.gz: 25d4851233da531115e1d480a765f50a5b26c6d6f54782e631a3c26a64af45cb70d20002f3cc8b2604c574ff48f9e85cacc4124d011c3cb9ace5faf68dac0b8b

data/app/datatables/admin/effective_reports_datatable.rb

@@ -16,6 +16,10 @@ module Admin
       col :report_columns, label: 'Columns', visible: false
       col :report_scopes, label: 'Scopes', visible: false
 
+      if defined?(EffectiveMessaging)
+        col :notifications, label: 'Notifications'
+      end
+
       col(:current_rows_count) do |report|
         report.collection().count
       end

data/app/datatables/effective_report_datatable.rb

@@ -8,6 +8,10 @@ class EffectiveReportDatatable < Effective::Datatable
 
     col :id, visible: false
 
+    if report.reportable.column_names.include?('token')
+      col :token, visible: false
+    end
+
     report.report_columns.each do |column|
       col(column.name, as: column.as.to_sym)
     end

data/app/models/concerns/acts_as_reportable.rb

@@ -29,6 +29,11 @@ module ActsAsReportable
     {}
   end
 
+  # Something that returns an email
+  def reportable_email
+    try(:email) || try(:user).try(:email) || try(:owner).try(:email) || raise("No reportable_email found")
+  end
+
   private
 
   def all_reportable_attributes

data/app/models/effective/report.rb

@@ -10,6 +10,11 @@ module Effective
     has_many :report_scopes, -> { ReportScope.sorted }, inverse_of: :report, dependent: :delete_all
     accepts_nested_attributes_for :report_scopes, allow_destroy: true, reject_if: proc { |atts| atts['name'].blank? }
 
+    if defined?(EffectiveMessaging)
+      has_many :notifications, inverse_of: :report, dependent: :delete_all
+      accepts_nested_attributes_for :notifications, allow_destroy: true
+    end
+
     log_changes if respond_to?(:log_changes)
 
     DATATYPES = [:boolean, :date, :decimal, :integer, :price, :string, :belongs_to, :belongs_to_polymorphic, :has_many, :has_one]
@@ -26,7 +31,7 @@ module Effective
 
     scope :deep, -> { includes(:report_columns, :report_scopes) }
     scope :sorted, -> { order(:title) }
-    scope :emails, -> { where(id: ReportColumn.emails.select(:report_id)) }
+    scope :notifiable, -> { where(id: ReportColumn.notifiable.select(:report_id)) }
 
     validates :title, presence: true, uniqueness: true
     validates :reportable_class_name, presence: true
@@ -39,6 +44,23 @@ module Effective
       reportable_class_name.constantize if reportable_class_name.present?
     end
 
+    # Find or build
+    def col(name, atts = {})
+      atts[:name] ||= name.to_sym
+      atts[:as] ||= reportable_attributes[name]
+
+      report_columns.find { |col| atts.all? { |k, v| col.send(k).to_s == v.to_s } } || report_columns.build(atts)
+    end
+
+    def scope(name, atts = {})
+      atts[:name] ||= name.to_sym
+      report_scopes.find { |scope| scope.name == name.to_s } || report_scopes.build(atts)
+    end
+
+    def notification(atts = {})
+      notifications.find { |col| atts.all? { |k, v| col.send(k).to_s == v.to_s } } || notifications.build(atts)
+    end
+
     def filtered_report_columns
       report_columns.select(&:filter?)
     end
@@ -47,6 +69,12 @@ module Effective
       report_columns.find { |column| column.name == 'email' } || report_columns.find { |column| column.name.include?('email') }
     end
 
+    def user_report_column
+      report_columns.find { |column| column.name == 'user' } ||
+      report_columns.find { |column| column.name == 'owner' } ||
+      report_columns.find { |column| column.name.include?('user') }
+    end
+
     # Used to build the Reports form
     # { id: :integer, archived: :boolean }
     def reportable_attributes

data/app/models/effective/report_column.rb

@@ -27,7 +27,7 @@ module Effective
 
     scope :deep, -> { includes(:report) }
     scope :sorted, -> { order(:position) }
-    scope :emails, -> { where('name ILIKE ?', "%email%") }
+    scope :notifiable, -> { where('name ILIKE ?', "%email%").or(where(name: 'user')).or(where(name: 'owner')) }
 
     before_validation(if: -> { report.present? }) do
       self.position ||= (report.report_columns.map(&:position).compact.max || -1) + 1
@@ -54,6 +54,12 @@ module Effective
       end
     end
 
+    validate(if: -> { report&.reportable }) do
+      unless report.reportable.new.reportable_attributes.key?(name.to_sym)
+        errors.add(:name, "acts_as_reportable #{report.reportable} reportable_attributes() missing :#{name} attribute")
+      end
+    end
+
     def to_s
       [name, operation_label, value, days_label].compact.join(' ').presence || 'report column'
     end

data/app/models/effective/report_scope.rb

@@ -36,6 +36,12 @@ module Effective
       end
     end
 
+    validate(if: -> {report&.reportable }) do
+      unless report.reportable.new.reportable_scopes.key?(name.to_sym)
+        errors.add(:name, "acts_as_reportable #{report.reportable} reportable_scopes() missing :#{name} scope")
+      end
+    end
+
     def to_s
       [name, operation_label, value].compact.join(' ').presence || 'report scope'
     end

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

@@ -3,6 +3,11 @@
     = render 'admin/reports/form_report', report: report
 
   - if report.persisted?
+    - if report.respond_to?(:notifications)
+      = tab 'Notifications' do
+        - datatable = Admin::EffectiveNotificationsDatatable.new(report: report)
+        = render_inline_datatable(datatable)
+
     - if report.respond_to?(:log_changes_datatable)
       = tab 'Logs' do
         = render_inline_datatable(report.log_changes_datatable)

data/app/views/admin/reports/_report.html.haml

@@ -13,5 +13,11 @@
 = collapse('Show SQL') do
   %p= report.collection.to_sql
 
+- if (notifications = report.try(:notifications)).present?
+  %p.mt-3
+    The following notifications are sent based on this report:
+    - notifications.each do |notification|
+      = link_to(notification, effective_messaging.edit_admin_notification_path(notification), target: '_blank')
+
 - datatable = EffectiveReportDatatable.new(report: report)
 = render_datatable(datatable)

data/lib/effective_reports/version.rb

@@ -1,3 +1,3 @@
 module EffectiveReports
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.2.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_reports
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-11 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails