effective_resources 2.25.4 → 2.25.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2967108f64775ddd3de0531e80509fe3f4c4b369fdb3b2b59a96103b2082e516
-  data.tar.gz: 1a53e6935d666e80676aed79910447929aad82d45dad2430a82093d85af70056
+  metadata.gz: 281dfe01432d3d514f46f43b7c0d76478b4675827581c2b9867ab14af1f51aae
+  data.tar.gz: 7edf326e2bd629a49b812e5ee96749e0ad95fb5b81d87d18b14a7452134af78a
 SHA512:
-  metadata.gz: f3e0d13115d6e1acdea84ee206a3bfc31fe3885b2f6384332a36f1bedeaf33f85f5066c8e364396998a627249df7d99ba3495c0d14117139ad9d6db0e09d76eb
-  data.tar.gz: e35ddd7ed8a8dcfce32a96a205a4aa9b8ca050b64d6accc3b7e4f134c9e7c04dd728a84426671f72afa3f2512d38f9f752b9e043a7c01efc7b19aa3c09a20e23
+  metadata.gz: 5e0af3a5c4f970d6c637a1429cf252875274a605c92c328fa87e05b9df4366b1924e466ab76e12c8be12f0980ae8dc091de5bc665de34307e6774d9c96bd7fe1
+  data.tar.gz: 85ea2f2757651bd051e549da3356d79729ec235776ae8eb35f00037f9616cd16ce5b08772a39fef6656f3926b137e4d6a1fdb9650cb45a60082b88cd29fbc07f

data/app/controllers/concerns/effective/crud_controller/actions.rb

@@ -42,7 +42,8 @@ module Effective
 
         # Duplicate if possible
         if params[:duplicate_id].present?
-          duplicate = resource_scope.find(params[:duplicate_id])
+          duplicate = (resource_scope.find(params[:duplicate_id]) rescue false)
+          duplicate ||= resource_scope.find_by_id(params[:duplicate_id])
 
           EffectiveResources.authorize!(self, :show, duplicate)
 

data/app/controllers/concerns/effective/select2_ajax_controller.rb

@@ -56,6 +56,15 @@ module Effective
 
     private
 
+    def to_masked_select2(resource)
+      if resource.respond_to?(:public_email)
+        "<span>#{resource}</span> <small>#{view_context.masked_email(resource)}</small>"
+      elsif resource.try(:email).present?
+        "<span>#{resource}</span> <small>#{resource.email}</small>"
+      else
+        "<span>#{resource}</span>"
+      end
+
     def to_select2(resource)
       if resource.try(:email).present?
         "<span>#{resource}</span> <small>#{resource.email}</small>"

data/app/helpers/effective_resources_email_helper.rb

@@ -11,7 +11,7 @@ module EffectiveResourcesEmailHelper
   end
 
   # acts_as_email_form
-  def email_form_fields(form, action = nil, skip: true, to: nil, variables: nil, partial: nil)
+  def email_form_fields(form, action = nil, skip: true, skip_link: nil, to: nil, variables: nil, partial: nil)
     raise('expected a form') unless form.respond_to?(:object)
 
     resource = form.object
@@ -26,7 +26,11 @@ module EffectiveResourcesEmailHelper
       action.kind_of?(Effective::EmailTemplate) ? action : Effective::EmailTemplate.where(template_name: action).first!
     end
 
+    # Display link to the admin email template
+    skip_link = !request.path.start_with?('/admin/') if skip_link.nil?
+
     # These defaults are only used when there is no email_template
+    # This can't happen right now.
     email_defaults = form.object.email_form_defaults(action) unless email_template.present?
 
     from = email_template&.from || email_defaults[:from] || EffectiveResources.mailer_froms.first
@@ -44,7 +48,8 @@ module EffectiveResourcesEmailHelper
       email_skip: skip,
       email_action: (action || true),
       email_template: email_template,
-      email_variables: variables
+      email_variables: variables,
+      email_skip_link: skip_link
     }
 
     render(partial: (partial || 'effective/acts_as_email_form/fields'), locals: locals)

data/app/helpers/effective_resources_helper.rb

@@ -323,6 +323,18 @@ module EffectiveResourcesHelper
     EffectiveResources.etsd(resource, attribute)
   end
 
+  def masked_email(resource)
+    public_email = resource.try(:public_email)
+    return public_email if public_email.present?
 
+    email = resource.email
+    return email if email.blank?
+
+    local, domain = email.split('@')
+    masked_local = local[0..1] + '*' * (local.length - 2)
+    masked_domain = domain.split('.').first[0..1] + '*' * (domain.split('.').first.length - 2) + '.' + domain.split('.').last
+
+    "#{masked_local}@#{masked_domain}"
+  end
 
 end

data/app/models/concerns/acts_as_published.rb

@@ -22,8 +22,12 @@ module ActsAsPublished
   included do
     attr_writer :save_as_draft
 
-    before_validation do
-      assign_attributes(published_start_at: nil, published_end_at: nil) if EffectiveResources.truthy?(@save_as_draft)
+    before_validation(if: -> { EffectiveResources.falsey?(@save_as_draft) && @save_as_draft.present? }) do
+      self.published_start_at ||= Time.zone.now
+    end
+
+    before_validation(if: -> { EffectiveResources.truthy?(@save_as_draft) }) do
+      assign_attributes(published_start_at: nil, published_end_at: nil)
     end
 
     validate(if: -> { published_start_at.present? && published_end_at.present? }) do

data/app/models/concerns/effective_devise_user.rb

@@ -291,4 +291,8 @@ module EffectiveDeviseUser
     devise_mailer.send(notification, self, *args).deliver_now
   end
 
+  def to_select2_search_columns
+    [:email, :public_email, :first_name, :last_name, :name]
+  end
+
 end

data/app/views/effective/acts_as_email_form/_fields.html.haml

@@ -1,5 +1,8 @@
 = form.hidden_field :email_form_action, value: email_action
 
+- if email_template.present? && !email_skip_link
+  %p The following #{link_to(email_template, effective_email_templates.edit_admin_email_template_path(email_template), target: '_blank')} email will be sent:
+
 - if email_skip
   = form.check_box :email_form_skip, label: 'Do not send email'
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.25.4'.freeze
+  VERSION = '2.25.6'.freeze
 end

data/lib/effective_resources.rb

@@ -127,6 +127,10 @@ module EffectiveResources
     end
   end
 
+  def self.falsey?(value)
+    !truthy?(value)
+  end
+
   def self.advance_date(date, business_days: 1, holidays: [:us, :observed])
     raise('business_days must be an integer <= 365') unless business_days.kind_of?(Integer) && business_days <= 365
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.25.4
+  version: 2.25.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-02 00:00:00.000000000 Z
+date: 2024-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails