effective_mentorships 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d108b6f623e6830dc7f8472bc8a6b24a5bd0e5f960cf681e7d9a0af91fb96c76
-  data.tar.gz: 3ec7750b99ee913338db52f3c5993ee52f1835573d7e64516ff85098bd6b3c60
+  metadata.gz: daf88eccf64adbd6f9aed6c91a541659eb618e31e8ed705ba598d9709423b9cb
+  data.tar.gz: 822762c46281f00aae727442ad8110c5f54e0f626a123d8c571cf0ffca32b57f
 SHA512:
-  metadata.gz: 8dea56a517526afddbe848866e61ae143b51a55076ed1780ee6d250fbd2200e94bc20520c2d8abedf8851821770bf5694126b3ff5a5b587577b7658aaae067c5
-  data.tar.gz: 0ef916d861109f3b03f1533d416b36683e75016e3f1aeb6a974191df60ca4dac59e25472f0f6a430921d249fac7d62ad28ae8241b336e2a14a021f0746849e31
+  metadata.gz: 31ceaea33ba4c1c0384ced66025089f0575747bab9fb917d0fdd6c9006b1b0182d2253e16a08baf88a6a6e57848ca7b9b0c11f941a0ea227e76aeac38efbd612
+  data.tar.gz: d70dc8510ba436a7a7adc28880817132f9e3474d0a337d48efb444b6c1a9396b32023514f7f2dfabee64f05d0e3b39985ea626a6383b7e397664bc8786192e65

data/app/datatables/admin/effective_mentorship_bulk_group_mentees_datatable.rb

@@ -21,7 +21,7 @@ module Admin
           collection.where(user_id: memberships.select('owner_id'))
         end
 
-        col(:membership_categories, label: 'Member Category', sort: false, visible: false, search: EffectiveMemberships.Category.sorted.all) do |registration|
+        col(:membership_categories, label: 'Member Category', sort: false, visible: false, search: effective_memberships_categories) do |registration|
           Array(registration.user.try(:membership).try(:membership_categories)).each do |membership_category|
             content_tag(:div, membership_category, class: 'col-resource')
           end.join.html_safe
@@ -30,7 +30,7 @@ module Admin
           collection.where(user_id: memberships.select('owner_id'))
         end
 
-        col(:membership_statuses, label: 'Member Status', sort: false, visible: false, search: EffectiveMemberships.Status.sorted.all) do |registration|
+        col(:membership_statuses, label: 'Member Status', sort: false, visible: false, search: effective_memberships_statuses) do |registration|
           Array(registration.user.try(:membership).try(:statuses)).each do |status|
             content_tag(:div, status, class: 'col-resource')
           end.join.html_safe

data/app/datatables/admin/effective_mentorship_bulk_group_mentors_datatable.rb

@@ -21,7 +21,7 @@ module Admin
           collection.where(user_id: memberships.select('owner_id'))
         end
 
-        col(:membership_categories, label: 'Member Category', sort: false, visible: false, search: EffectiveMemberships.Category.sorted.all) do |registration|
+        col(:membership_categories, label: 'Member Category', sort: false, visible: false, search: effective_memberships_categories) do |registration|
           Array(registration.user.try(:membership).try(:membership_categories)).each do |membership_category|
             content_tag(:div, membership_category, class: 'col-resource')
           end.join.html_safe
@@ -30,7 +30,7 @@ module Admin
           collection.where(user_id: memberships.select('owner_id'))
         end
 
-        col(:membership_statuses, label: 'Member Status', sort: false, visible: false, search: EffectiveMemberships.Status.sorted.all) do |registration|
+        col(:membership_statuses, label: 'Member Status', sort: false, visible: false, search: effective_memberships_statuses) do |registration|
           Array(registration.user.try(:membership).try(:statuses)).each do |status|
             content_tag(:div, status, class: 'col-resource')
           end.join.html_safe

data/app/datatables/admin/effective_mentorship_bulk_groups_datatable.rb

@@ -10,11 +10,11 @@ module Admin
 
       col :to_s, label: 'Title'
 
-      col :mentorship_cycle
+      col :mentorship_cycle, search: :select
       col :last_completed_step
 
       col :mentorship_groups_count, label: "#{mentorship_groups_label} count"
-      col :mentorship_groups, label: "#{mentorship_groups_label}", search: :string, visible: false
+      col :mentorship_groups, label: "#{mentorship_groups_label}", visible: false
       col :email_form_skip, label: "Skip email"
 
       col :job_status, visible: false

data/app/datatables/admin/effective_mentorship_group_users_datatable.rb

@@ -7,7 +7,7 @@ module Admin
       col :created_at, visible: false
       col :id, visible: false
 
-      col :mentorship_cycle
+      col :mentorship_cycle, search: :select
       col :mentorship_group
       col :mentorship_role
       col :user

data/app/datatables/admin/effective_mentorship_groups_datatable.rb

@@ -37,7 +37,7 @@ module Admin
       col :token, visible: false
 
       col :mentorship_bulk_group, visible: false
-      col :mentorship_cycle, visible: attributes[:mentorship_bulk_group_id].blank?
+      col :mentorship_cycle, search: :select, visible: attributes[:mentorship_bulk_group_id].blank?
 
       col :published?, as: :boolean
       col :published_start_at, label: "Published start", visible: false

data/app/datatables/admin/effective_mentorship_registrations_datatable.rb

@@ -15,7 +15,7 @@ module Admin
       col :id, visible: false
       col :token, visible: false
 
-      col :mentorship_cycle
+      col :mentorship_cycle, search: :select
       col :user
 
       col :opt_in, visible: attributes[:opt_in_without_groups].blank?
@@ -32,7 +32,7 @@ module Admin
       col :parent, visible: false
       col :rich_text_comments, label: "Comments", visible: false
 
-      col(:mentorship_groups, search: :string, visible: false) do |registration|
+      col(:mentorship_groups, visible: false) do |registration|
         registration.mentorship_groups.map do |mentorship_group|
           content_tag(:div, class: 'col-resource_item') do
             link_to(mentorship_group, effective_mentorships.edit_admin_mentorship_group_path(mentorship_group), target: '_blank')

data/app/datatables/effective_mentorships_groups_datatable.rb

@@ -6,7 +6,7 @@ class EffectiveMentorshipsGroupsDatatable < Effective::Datatable
     col :mentorship_cycle
     col :title
 
-    col :mentorship_group_users, search: :string do |mentorship_group|
+    col :mentorship_group_users do |mentorship_group|
       mentorship_group.mentorship_group_users.map do |mentorship_group_user| 
         user = mentorship_group_user.user
 

data/app/models/concerns/effective_mentorships_user.rb

@@ -103,6 +103,10 @@ module EffectiveMentorshipsUser
     scope :mentorships_mentee_in_mentorship_cycle_id, -> (membership_cycle_id) {
       mentorships_mentees_with_groups(membership_cycle_id)
     }
+
+    scope :mentorships_opted_in_but_not_grouped_in_mentorship_cycle_id, -> (membership_cycle_id) {
+      mentorships_opted_in(membership_cycle_id).where(id: mentorships_without_groups(membership_cycle_id))
+    }
   end
 
   # Used for the dashboard datatables. Which cycles can we register for?

data/app/models/effective/mentorship_group_user.rb

@@ -10,6 +10,8 @@ module Effective
     belongs_to :mentorship_registration, polymorphic: true, optional: true
     belongs_to :user, polymorphic: true
 
+    MENTORSHIP_ROLES = ['mentor', 'mentee']
+
     effective_resource do
       mentorship_role   :string
 

data/lib/effective_mentorships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMentorships
-  VERSION = '0.3.3'
+  VERSION = '0.3.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_mentorships
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-27 00:00:00.000000000 Z
+date: 2025-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails