effective_committees 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 104dc7680378fa73b91bd1d46dbc850322a082964d9a99cdbe0d0d49d434f84e
-  data.tar.gz: 216d28fd5efabaf608d07766bd33068db2198f8b92d7afc8f5d8189679a6b2ef
+  metadata.gz: e2a318a62bd5057b979e35eb0280f7db899f83367a80726e13471444bd80d758
+  data.tar.gz: 01d660c74f301d9a82627cf7d15782db30bac3bee2e717720fd1d54b77bdd3fb
 SHA512:
-  metadata.gz: 6dcdea843b50069451c4d224bfab85a2f9ed57af9a2e1cfd3741cdefd70bcf9036419da031a8c82ae95e71c4f6674acbf6e0937183d81436abe26dcff151150f
-  data.tar.gz: 53f044a8752b22d9bda868c8156be5820e3a507bc261e35f74b0990c3f8398c11eb49b1d2cf89283c66994e538aff37ddba46d4230a4250bbdd44640bb36ab4f
+  metadata.gz: f07fb6ef7c974f646a35186845541752b522a286657efe3158eb99262244274efc09d610d7799218c0a92931cab86394946dd83f5b1ba91a7b3bad4cea43b40d
+  data.tar.gz: dfa60d6d7d0926ec9ada024243139fce61088251bff4da53b8a69a94b6db46207535f8ab9c785c46f992d1f346b387b96f6b89ced4697d6805199f23263f42d3

data/app/controllers/effective/committees_controller.rb

@@ -6,16 +6,21 @@ module Effective
     log_page_views(if: -> { EffectiveCommittees.log_page_views? })
 
     resource_scope -> { Effective::Committee.all.deep }
+    page_title "More Activity", only: [:activity]
 
     def index
       @committees = resource_scope.for_index
       @page_title = EffectiveResources.et('effective_committees.name')
 
       EffectiveResources.authorize!(self, :index, Effective::Committee)
+      EffectiveResources.authorize!(self, :all_committees, Effective::Committee)
 
       render 'index'
     end
 
+    # activity
+    # my_committees
+
     private
 
     def permitted_params

data/app/datatables/admin/effective_committee_members_datatable.rb

@@ -7,7 +7,7 @@ module Admin
       col :committee
       col :user
 
-      if defined?(EffectiveMemberships)
+      if current_user.class.try(:effective_memberships_owner?)
         col(:member_number, label: 'Member #', sort: false) do |committee_member|
           committee_member.user.try(:membership).try(:number)
         end.search do |collection, term|
@@ -34,7 +34,11 @@ module Admin
         col :roles, search: roles_collection
       end
 
-      actions_col
+      actions_col do |committee_member|
+        if EffectiveResources.authorized?(self, :impersonate, committee_member.user)
+          dropdown_link_to("Impersonate", "/admin/users/#{committee_member.user_id}/impersonate", data: { confirm: "Really impersonate #{committee_member.user}?", method: :post, remote: true })
+        end
+      end
     end
 
     collection do

data/app/datatables/effective_committees_activity_datatable.rb

@@ -0,0 +1,42 @@
+# For the /committees/activity More Activity page
+# Displays all the logged changes for this user's committees
+class EffectiveCommitteesActivityDatatable < Effective::Datatable
+  datatable do
+    order :id, :desc
+
+    col :updated_at, label: 'Date'
+    col :id, visible: false
+
+    col :user, label: 'Changed by', search: :string, sort: false
+    col :changes_to, label: committee_label, search: current_user.committees
+    col :associated, visible: false
+
+    col :message, sort: false do |log|
+      message = (log.message || '').gsub("\n", '<br>')
+      associated_type = log.associated_type.gsub('Effective::', '').gsub('ActiveStorage::', '')
+
+      if log.associated_id == attributes[:changes_to_id] && log.associated_type == attributes[:changes_to_type]
+        message
+      else
+        "#{associated_type} #{log.associated_to_s} - #{message}"
+      end
+
+    end.search do |collection, term, column, sql_column|
+      ilike = effective_resource.ilike
+      collection.where("associated_type #{ilike} ? OR associated_to_s #{ilike} ? OR message #{ilike} ?", "%#{term}%", "%#{term}%", "%#{term}%")
+    end
+
+    col :details, visible: false, sort: false do |log|
+      tableize_hash(log.details)
+    end
+
+    actions_col
+  end
+
+  collection do
+    EffectiveLogging.Log.logged_changes.deep
+      .where(changes_to_type: 'Effective::Committee', changes_to_id: current_user.committees.map(&:id))
+      .where.not(associated_type: 'ActiveStorage::Attachment')
+  end
+
+end

data/app/datatables/effective_committees_datatable.rb

@@ -10,7 +10,7 @@ class EffectiveCommitteesDatatable < Effective::Datatable
     col(:committee_members, label: committee_members_label, visible: false) do |committee|
       committee.committee_members.select(&:active?).sort_by(&:to_s).map do |member|
         content_tag(:div, class: 'col-resource_item') do
-          label = link_to(member.to_s, "/admin/users/#{member.user_id}/edit")
+          label = member.to_s
           badge = badge(member.category) if member.category.present?
 
           [label, badge].compact.join(' ').html_safe

data/app/models/concerns/effective_committees_user.rb

@@ -45,4 +45,28 @@ module EffectiveCommitteesUser
     committee_members.select { |cm| cm.active? && !cm.marked_for_destruction? }.map { |cm| cm.committee }
   end
 
+  # When activity is for sequential uploaded files, group them together like: "12 files were added to Board of Directors - April 2025 Meeting"
+  def committees_recent_activity(limit: 100)
+    logs = EffectiveLogging.Log.logged_changes.deep
+      .where(changes_to_type: 'Effective::Committee', changes_to_id: committees.map(&:id))
+      .order(created_at: :desc)
+
+    # Recent activity should be for folders being created and files being uploaded/replaced
+    logs = logs.select do |log|
+      folder_created = (log.associated_type == 'Effective::CommitteeFolder' && log.message == 'Created')
+      file_changed = (log.associated_type == 'Effective::CommitteeFile' && (log.message == 'Created' || log.details.dig(:changes, 'File').present?))
+      folder_created || file_changed
+    end
+
+    # Returns an Array of Arrays where some are 1 length groups
+    # Others are multiple length groups of file changes to one folder
+    logs = logs.slice_when do |a, b|
+      (a.changes_to_id != b.changes_to_id) || 
+      (a.associated_type != b.associated_type) || 
+      (b.associated_type == "Effective::CommitteeFolder") ||
+      (a.associated.try(:committee_folder_id) != b.associated.try(:committee_folder_id))
+    end
+
+    logs.take(limit)
+  end
 end

data/app/models/effective/committee_file.rb

@@ -15,6 +15,9 @@ module Effective
       title         :string
       notes         :text
 
+      file_id          :integer
+      file_created_at  :datetime
+
       timestamps
     end
 
@@ -23,7 +26,7 @@ module Effective
     end
 
     before_validation(if: -> { file.attached? }) do
-      self.title ||= file.filename.to_s
+      assign_attributes(title: file.filename.to_s, file_id: file.attachment.blob.id, file_created_at: file.attachment.blob.created_at)
     end
 
     scope :deep, -> { with_attached_file.includes(:committee, :committee_folder) }

data/app/views/effective/committee_folders/_committee_folder.html.haml

@@ -1,7 +1,7 @@
 = render('layout') do
   %nav{'aria-label': 'breadcrumb'}
     %ol.breadcrumb
-      - if EffectiveResources.authorized?(self, :index, Effective::Committee)
+      - if EffectiveResources.authorized?(self, :all_committees, Effective::Committee)
         %li.breadcrumb-item= link_to("All #{committees_label}", effective_committees.committees_path)
       - elsif EffectiveResources.authorized?(self, :my_committees, Effective::Committee)
         %li.breadcrumb-item= link_to("My #{committees_label}", effective_committees.my_committees_path)

data/app/views/effective/committee_folders/show.html.haml

@@ -0,0 +1,13 @@
+- resource = (@_effective_resource || Effective::Resource.new(controller_path))
+- @resource = instance_variable_get('@' + resource.name) if resource.name
+
+- if @resource
+  .resource-buttons
+    = render_resource_buttons(@resource, show: false)
+
+  = render_resource_partial(@resource)
+
+.my-4
+
+-# .form-actions
+-#   = link_to 'Continue', return_to_dashboard_path, class: 'btn btn-primary mb-4'

data/app/views/effective/committees/_committee.html.haml

@@ -1,7 +1,7 @@
 = render('layout') do
   %nav{'aria-label': 'breadcrumb'}
     %ol.breadcrumb
-      - if EffectiveResources.authorized?(self, :index, Effective::Committee)
+      - if EffectiveResources.authorized?(self, :all_committees, Effective::Committee)
         %li.breadcrumb-item= link_to("All #{committees_label}", effective_committees.committees_path)
       - elsif EffectiveResources.authorized?(self, :my_committees, Effective::Committee)
         %li.breadcrumb-item= link_to("My #{committees_label}", effective_committees.my_committees_path)

data/app/views/effective/committees/_dashboard.html.haml

@@ -4,7 +4,7 @@
   %p 
     You have access to #{pluralize(current_user.committees.length, committee_label.downcase)}.
 
-    - if EffectiveResources.authorized?(self, :index, Effective::Committee)
+    - if EffectiveResources.authorized?(self, :all_committees, Effective::Committee)
       Please
       = link_to('click here', effective_committees.committees_path)
       to view all #{committees_label.downcase}.

data/app/views/effective/committees/_dashboard_activity.html.haml

@@ -0,0 +1,30 @@
+%h2 #{committees_label} Recent Activity
+
+- if current_user.committees.present?
+  - current_user.committees_recent_activity(limit: 5).each do |logs|
+    - log = logs.first
+
+    - committee = log.changes_to
+    - link_to_committee = link_to(committee, effective_committees.committee_path(committee))
+
+    - committee_folder = log.associated.try(:committee_folder) || log.associated
+    - link_to_committee_folder = link_to(committee_folder, effective_committees.committee_committee_folder_path(committee, committee_folder))
+
+    - link_to_file = link_to(log.associated, url_for(log.associated.try(:file)))
+
+    - if logs.length == 1 && log.associated_type == 'Effective::CommitteeFolder'
+      %p Folder #{link_to_committee_folder} was added to #{link_to_committee}.
+
+    - elsif logs.length == 1 && log.associated_type == 'Effective::CommitteeFile'
+      %p File #{link_to_file} was added to #{link_to_committee} - #{link_to_committee_folder}.
+
+    - elsif logs.length > 1 && logs.all? { |log| log.associated_type == 'Effective::CommitteeFile' }
+      %p #{logs.length} files were added to #{link_to_committee} - #{link_to_committee_folder}.
+
+    - else
+      - raise("Unexpected logs: #{logs.inspect}")
+
+  %p= link_to('View more activity', effective_committees.activity_committees_path)
+
+- else
+  %p There's no activity to display. When there is, we'll show it here.

data/app/views/effective/committees/activity.html.haml

@@ -0,0 +1,19 @@
+- committees = @committees.sorted
+
+= render('layout') do
+  %nav{'aria-label': 'breadcrumb'}
+    %ol.breadcrumb
+      %li.breadcrumb-item= link_to("Home", root_path)
+      %li.breadcrumb-item.active{'aria-current': 'page'}= @page_title
+
+  %h1= @page_title
+
+  - if committees.blank?
+    %p There are no #{committees_label.downcase} to display.
+  - else
+    - datatable = EffectiveResources.best('EffectiveCommitteesActivityDatatable').new(self, namespace: :effective)
+    = render_datatable(datatable, inline: true)
+  .my-4
+
+  .form-actions
+    = link_to 'Continue', return_to_dashboard_path, class: 'btn btn-primary mb-4'

data/app/views/effective/committees/my_committees.html.haml

@@ -3,7 +3,7 @@
 = render('layout') do
   %nav{'aria-label': 'breadcrumb'}
     %ol.breadcrumb
-      - if EffectiveResources.authorized?(self, :index, Effective::Committee)
+      - if EffectiveResources.authorized?(self, :all_committees, Effective::Committee)
         %li.breadcrumb-item= link_to("All #{committees_label}", effective_committees.committees_path)
       - else
         %li.breadcrumb-item= link_to("Home", root_path)

data/app/views/effective/committees/show.html.haml

@@ -0,0 +1,13 @@
+- resource = (@_effective_resource || Effective::Resource.new(controller_path))
+- @resource = instance_variable_get('@' + resource.name) if resource.name
+
+- if @resource
+  .resource-buttons
+    = render_resource_buttons(@resource, show: false)
+
+  = render_resource_partial(@resource)
+
+.my-4
+
+-# .form-actions
+-#   = link_to 'Continue', return_to_dashboard_path, class: 'btn btn-primary mb-4'

data/config/routes.rb

@@ -8,10 +8,13 @@ EffectiveCommittees::Engine.routes.draw do
   # Public routes
   scope module: 'effective' do
     resources :committees, only: [:index, :show] do
+      get 'activity', on: :collection
+
       resources :committee_folders, only: [:show]
     end
 
     get 'my-committees', to: 'committees#my_committees'
+    get 'my_committees', to: 'committees#my_committees'
 
     resources :committee_members, except: [:show]
   end

data/db/migrate/101_create_effective_committees.rb

@@ -66,6 +66,9 @@ class CreateEffectiveCommittees < ActiveRecord::Migration[6.0]
 
       t.integer :committee_folder_id
 
+      t.integer :file_id
+      t.datetime :file_created_at
+
       t.string :title
       t.text :notes
 

data/lib/effective_committees/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCommittees
-  VERSION = '0.4.3'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_committees
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-26 00:00:00.000000000 Z
+date: 2025-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -191,6 +191,7 @@ files:
 - app/datatables/admin/effective_committee_members_datatable.rb
 - app/datatables/admin/effective_committees_datatable.rb
 - app/datatables/effective_committee_members_datatable.rb
+- app/datatables/effective_committees_activity_datatable.rb
 - app/datatables/effective_committees_datatable.rb
 - app/helpers/effective_committees_helper.rb
 - app/models/concerns/effective_committees_user.rb
@@ -207,16 +208,20 @@ files:
 - app/views/admin/committees/_form_committee.html.haml
 - app/views/effective/committee_folders/_committee_folder.html.haml
 - app/views/effective/committee_folders/_layout.html.haml
+- app/views/effective/committee_folders/show.html.haml
 - app/views/effective/committee_members/_form.html.haml
 - app/views/effective/committee_members/_user_fields.html.haml
 - app/views/effective/committees/_committee.html.haml
 - app/views/effective/committees/_dashboard.html.haml
+- app/views/effective/committees/_dashboard_activity.html.haml
 - app/views/effective/committees/_fields.html.haml
 - app/views/effective/committees/_form.html.haml
 - app/views/effective/committees/_form_committee.html.haml
 - app/views/effective/committees/_layout.html.haml
+- app/views/effective/committees/activity.html.haml
 - app/views/effective/committees/index.html.haml
 - app/views/effective/committees/my_committees.html.haml
+- app/views/effective/committees/show.html.haml
 - config/effective_committees.rb
 - config/locales/effective_committees.en.yml
 - config/routes.rb