effective_resources 2.25.15 → 2.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbde5a40ed9d45271d9e3d8c7c935c59dd6a8ec709106a171efa00b4039d08d6
-  data.tar.gz: ecb7387a65cf50a43a1d9087fde4bfb77f54a9150b0275d36ce1d9fe1c93a8d3
+  metadata.gz: 76931ae3422d0b14af4c84ed8670f0a03eba10ffb55804850d8d6aa23409d947
+  data.tar.gz: 9a8f17357dd11e73cc82070c20825fa63e89701ec80f1de679479c6b1f1123a9
 SHA512:
-  metadata.gz: 44a87836e25135b42fad6d47c66b734574084d7cd13707380725d52280a18b6417117eb0a4f4025868c9b597c00e767bf1e2df28c75c38f418be744b422e451a
-  data.tar.gz: d1381999ffa3539a7a79f555b02bd7912bf786ae865d920a471a344591da29eb62962eedfe6446b607615e6199b2b06277ffd6c8622352b41530600366e60449
+  metadata.gz: 20bc96638e82faf39e0595eee398104967dbc273e308c15768f32d55e518430698017c63a233b84a192a0be6a7ade9bb3a80c344274271a230e839d55c8b5672
+  data.tar.gz: 7eacea35ae629bcd2b6febb4d548bf15c239d3c5422b01633dd967f780b2590c94ca8bf92ca27832a430f45d74e51e90a2150c16715e0b2e7bc4b8c00eb91d78

data/README.md

@@ -374,21 +374,20 @@ This gem provides an admin endpoint for select2 AJAX to fetch users.
 To use this endpoint please add
 
 ```
-can :admin, :effective_resources
+can :users, :ajax
 ```
 
 And then create a select field like this:
 
 ```
-  = f.select :user_id, current_user.class.all,
-    ajax_url: effective_resources.users_admin_select2_ajax_index_path
+= f.select :user_id, current_user.class.all, ajax_url: effective_resources.users_effective_ajax_index_path
 ```
 
-To format the results, add a method to your User class. It can return html.
+To format the results, add a method to your User class. Should return HTML with a span tag
 
 ```
 def to_select2
-  "<span>#{user.first_name} #{user.last_name}</span> <small>#{user.email}</small>"
+  "<span>#{first_name} #{last_name}</span> <small>&lt;#{try(:public_email) || email}&gt;</small>"
 end
 ```
 

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

@@ -42,7 +42,7 @@ module Effective
           raise('expected a Hash with id and text params') unless option.kind_of?(Hash) && option[:id] && option[:text]
           option
         else
-          { id: resource.to_param, text: resource.try(:to_select2) || resource.to_s }
+          { id: resource.to_param, text: to_select2(resource) }
         end
       end
 
@@ -56,12 +56,13 @@ module Effective
 
     private
 
-    def to_select2(resource)
-      if resource.try(:email).present?
-        "<span>#{resource}</span> <small>#{resource.email}</small>"
-      else
-        "<span>#{resource}</span>"
-      end
+    def to_select2(resource, with_organizations = false)
+      organizations = Array(resource.try(:organizations)).join(', ') if with_organizations
+
+      [
+        (resource.try(:to_select2) || "<span>#{resource.to_s}</span>"),
+        ("<small>#{organizations}</small>" if organizations.present?)
+      ].compact.join(' ')
     end
 
   end

data/app/controllers/effective/ajax_controller.rb

@@ -0,0 +1,53 @@
+module Effective
+  class AjaxController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+
+    include Effective::Select2AjaxController
+
+    def users
+      EffectiveResources.authorize!(self, :users, :ajax)
+
+      with_organizations = current_user.class.try(:effective_memberships_organization_user?)
+
+      collection = current_user.class.all
+      collection = collection.includes(:organizations) if with_organizations
+
+      respond_with_select2_ajax(collection, skip_authorize: true) do |user|
+        data = { first_name: user.first_name, last_name: user.last_name, email: user.email }
+
+        if with_organizations
+          data[:company] = user.organizations.first.try(:to_s)
+          data[:organization_id] = user.organizations.first.try(:id)
+          data[:organization_type] = user.organizations.first.try(:class).try(:name)
+        end
+
+        { 
+          id: user.to_param, 
+          text: to_select2(user, with_organizations),
+          data: data
+        }
+      end
+    end
+
+    def organizations
+      EffectiveResources.authorize!(self, :organizations, :ajax)
+
+      raise('the effective memberships gem is required') unless defined?(EffectiveMemberships)
+
+      klass = EffectiveMemberships.Organization
+      raise('an EffectiveMemberships.Organization is required') unless klass.try(:effective_memberships_organization?)
+
+      collection = klass.all
+
+      respond_with_select2_ajax(collection) do |organization|
+        data = { title: organization.title, email: organization.email }
+
+        { 
+          id: organization.to_param, 
+          text: to_select2(organization),
+          data: data
+        }
+      end
+    end
+  end
+end

data/app/models/concerns/acts_as_published.rb

@@ -22,7 +22,7 @@ module ActsAsPublished
   included do
     attr_writer :save_as_draft
 
-    before_validation(if: -> { EffectiveResources.falsey?(@save_as_draft) && @save_as_draft.present? }) do
+    before_validation(if: -> { EffectiveResources.falsey?(@save_as_draft) && (@save_as_draft.present? || new_record?) }) do
       self.published_start_at ||= Time.zone.now
     end
 

data/app/models/concerns/effective_devise_user.rb

@@ -292,11 +292,10 @@ module EffectiveDeviseUser
   end
 
   def to_select2_search_columns
-    [:email, :public_email, :first_name, :last_name, :name]
+    [:email, :public_email, :alternate_email, :first_name, :last_name, :name]
   end
 
   def to_select2
-    "<span>#{email_to_s}</span> <small>#{email}</small>"
+    "<span>#{email_to_s}</span> <small>&lt;#{try(:public_email) || email}&gt;</small>"
   end
-
 end

data/config/routes.rb

@@ -3,12 +3,10 @@ Rails.application.routes.draw do
 end
 
 EffectiveResources::Engine.routes.draw do
-
-  namespace :admin do
-    resources :select2_ajax, only: [] do
-      get :users, on: :collection
-      get :organizations, on: :collection
+  namespace :effective do
+    resources :ajax, only: [] do
+      get :users, on: :collection, as: :users
+      get :organizations, on: :collection, as: :organizations
     end
   end
-
 end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.25.15'.freeze
+  VERSION = '2.26.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.25.15
+  version: 2.26.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-18 00:00:00.000000000 Z
+date: 2024-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -175,7 +175,6 @@ files:
 - README.md
 - app/assets/javascripts/effective_resources.js
 - app/assets/javascripts/effective_resources/effective_ujs.js
-- app/controllers/admin/select2_ajax_controller.rb
 - app/controllers/concerns/effective/crud_controller.rb
 - app/controllers/concerns/effective/crud_controller/actions.rb
 - app/controllers/concerns/effective/crud_controller/dsl.rb
@@ -194,6 +193,7 @@ files:
 - app/controllers/concerns/effective/wizard_controller/permitted_params.rb
 - app/controllers/concerns/effective/wizard_controller/save.rb
 - app/controllers/concerns/effective/wizard_controller/wicked_overrides.rb
+- app/controllers/effective/ajax_controller.rb
 - app/helpers/effective_resources_email_helper.rb
 - app/helpers/effective_resources_helper.rb
 - app/helpers/effective_resources_private_helper.rb

data/app/controllers/admin/select2_ajax_controller.rb

@@ -1,29 +0,0 @@
-module Admin
-  class Select2AjaxController < ApplicationController
-    before_action(:authenticate_user!) if defined?(Devise)
-    before_action { EffectiveResources.authorize!(self, :admin, :effective_resources) }
-
-    include Effective::Select2AjaxController
-
-    def users
-      collection = current_user.class.all
-
-      respond_with_select2_ajax(collection) do |user|
-        { id: user.to_param, text: user.try(:to_select2) || to_select2(user) }
-      end
-    end
-
-    def organizations
-      raise('the effective memberships gem is required') unless defined?(EffectiveMemberships)
-
-      klass = EffectiveMemberships.Organization
-      raise('an EffectiveMemberships.Organization is required') unless klass.try(:effective_memberships_organization?)
-
-      collection = klass.all
-
-      respond_with_select2_ajax(collection) do |organization|
-        { id: organization.to_param, text: organization.try(:to_select2) || to_select2(organization) }
-      end
-    end
-  end
-end