effective_reports 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc5e577b9e0f7dbcd5425889023bc698c029deda52104a0a36e9ab3c5eb4a353
-  data.tar.gz: 01ebdb1ecff80758de3a495dee72919e514ded99b4c831e1995ab1f6ca7b28d3
+  metadata.gz: 1305cf7f8937e178a2d5eb94df49644b7249f01a856e1cd42b47277fca4f70b8
+  data.tar.gz: aeb156bd5fdaef4b66bb31546511ed06735374f939280d952a0530b9ff3b0a76
 SHA512:
-  metadata.gz: fed92ce6f5d9c049fae81dea487c1f061c4b05aed86202042fcbd5f4eb01de6b2bb2662d89b73fb9917fc79e188e500e3ab76be94e5c845f5005cad77734e6ff
-  data.tar.gz: 7b90bca9c8cc801a7cdf5cb4e25603e94ee313a8a6ae607e30fedbe0c95dfc134f832af88467b2c7b3bbf348c1cad62370f789d98d014d9945a025bef9e66a8e
+  metadata.gz: 46a1c37be1ab24c71263269ef3b981a66bb9854b18349821190c298a24d96b7bace90565173153eb468b32ec3fe5c9f9f3295201f8e1359a5236c6ea5cd1dd68
+  data.tar.gz: fef84a63e254279dfb27d8b0c9c31991c7f6232e6fc4af6923e1607ae440575eba691fff37dbe46ef2800dbdc283fa87d8e0ef8f1754e94d441c2bc4b2ba7494

data/app/datatables/effective_report_datatable.rb

@@ -23,7 +23,7 @@ class EffectiveReportDatatable < Effective::Datatable
   end
 
   def report
-    Effective::Report.find(attributes[:report_id])
+    Effective::Report.deep.find(attributes[:report_id])
   end
 
 end

data/app/models/concerns/acts_as_reportable.rb

@@ -6,6 +6,7 @@ module ActsAsReportable
   extend ActiveSupport::Concern
 
   PRICE_NAME_ATTRIBUTES = ['price', 'subtotal', 'tax', 'total', 'current_revenue', 'current_revenue_subtotal', 'current_revenue_tax', 'deferred_revenue', 'deferred_revenue_subtotal', 'deferred_revenue_tax', 'amount_owing', 'surcharge']
+  DENY_LIST = [:logged_changes, :password, :encrypted_password]
 
   module Base
     def acts_as_reportable(options = nil)
@@ -80,7 +81,7 @@ module ActsAsReportable
       end; h
     end
 
-    atts.merge(associated)
+    atts.merge(associated).except(*DENY_LIST)
   end
 
 end

data/app/models/effective/report.rb

@@ -29,13 +29,28 @@ module Effective
       timestamps
     end
 
-    scope :deep, -> { includes(:report_columns, :report_scopes) }
+    scope :deep, -> { 
+      base = includes(:report_columns, :report_scopes) 
+      base = base.includes(:notifications) if defined?(EffectiveMessaging)
+      base
+    }
+
     scope :sorted, -> { order(:title) }
     scope :notifiable, -> { where(id: ReportColumn.notifiable.select(:report_id)) }
 
     validates :title, presence: true, uniqueness: true
     validates :reportable_class_name, presence: true
 
+    validate do
+      error = begin
+        collection().to_sql; nil
+      rescue StandardError => e
+        e.message
+      end
+
+      errors.add(:base, "Invalid Report: #{error}") if error.present?
+    end
+
     def to_s
       title.presence || 'report'
     end
@@ -107,7 +122,7 @@ module Effective
 
       # Apply Scopes
       report_scopes.each do |scope|
-        collection = (scope.value.nil? ? collection.send(scope.name) : collection.send(scope.name, scope.value))
+        collection = scope.apply_scope(collection)
       end
 
       # Apply Includes

data/app/models/effective/report_scope.rb

@@ -37,9 +37,19 @@ module Effective
     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")
+      reportable = report.reportable
+
+      if reportable.new.reportable_scopes.key?(name.to_sym) == false
+        errors.add(:name, "acts_as_reportable #{reportable} reportable_scopes() missing :#{name} scope")
+      end
+
+      scope_error = begin
+        apply_scope(reportable.all).to_sql; nil
+      rescue StandardError => e
+        e.message
       end
+
+      self.errors.add(:name, scope_error) if scope_error.present?
     end
 
     def to_s
@@ -54,5 +64,9 @@ module Effective
       return '=' if advanced?
     end
 
+    def apply_scope(collection)
+      value.nil? ? collection.send(name) : collection.send(name, value)
+    end
+
   end
 end

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

@@ -1,23 +1,24 @@
-- if report.description.present?
-  %p= simple_format(report.description)
+= card do
+  - if report.description.present?
+    %p= simple_format(report.description)
 
-- if report.filtered_report_columns.present? || report.report_scopes.present?
-  %p The results of this report have been filtered by the following:
+  - if report.filtered_report_columns.present? || report.report_scopes.present?
+    %p The results of this report have been filtered by the following:
 
-- if report.filtered_report_columns.present?
-  %p= badges(report.filtered_report_columns.map(&:to_s))
+  - if report.filtered_report_columns.present?
+    %p= badges(report.filtered_report_columns.map(&:to_s))
 
-- if report.report_scopes.present?
-  %p= badges(report.report_scopes.map(&:to_s))
+  - if report.report_scopes.present?
+    %p= badges(report.report_scopes.map(&:to_s))
 
-= collapse('Show SQL') do
-  %p= report.collection.to_sql
+  = 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')
+  - 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)
+  - datatable = EffectiveReportDatatable.new(report: report)
+  = render_datatable(datatable)

data/lib/effective_reports/version.rb

@@ -1,3 +1,3 @@
 module EffectiveReports
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_reports
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-26 00:00:00.000000000 Z
+date: 2023-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails