effective_committees 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 687b287a684219a3c2f0214c4639db991e8a5cb02566179c555326f4436e5a3d
-  data.tar.gz: 28fb6cf8554ada01a148d4ceac2bb2abc453f8a20c8122ba2aee226f95b7c479
+  metadata.gz: 0bc2c949cff1b747488c7c18ea3def8acb9541e3278b5ae7e6f82cccf6d45c60
+  data.tar.gz: ea5794494521b25fa243a7c9bce9cf491cbeb49204c1d8405f0cd1a87b67ae07
 SHA512:
-  metadata.gz: d9614f730cfc7c9bf4aa56ceb4363235e8082016273bee4c3623fac416d1ec8cdd9790f3e230bef4b20491c817ad960ff7c38c3341780dbb7136f36721f4fa0a
-  data.tar.gz: 55379c626f837d6ed6f69698c2c7cac186af00d12021c6e1e800dd3caedb39286d66f0896f3f32db6d18e0ec923293693dd7bf0b9cf87c0fbfe6302a1750138f
+  metadata.gz: 7ba1a02a5ae937c6d409c7828038e2217ea94c03ef545b01d530e1309738f03a520f7cf173a0d697cbfe92daffc8202998093c29a8d3187a3bfcddced5dfde35
+  data.tar.gz: dfe2891d1b287231ac3a987503eb16f3b00d4a55508a073abf9ee3eaa2b444b5d43a4a8c2e44dd578e96283fe971b16bab17c87a11c262b9ad177150f5fab79e

data/app/controllers/admin/committee_folders_controller.rb

@@ -5,6 +5,8 @@ module Admin
 
     include Effective::CrudController
 
+    submit :bulk_upload, 'Bulk upload'
+
     private
 
     def permitted_params

data/app/datatables/admin/effective_committee_files_datatable.rb

@@ -9,8 +9,12 @@ module Admin
       col :id, visible: false
 
       col :committee
-      col :committee_folder, label: "Folder"
-      col :file
+
+      col :committee_folder, label: "Folder" do |committee_file|
+        admin_committees_parents(committee_file.committee_folder)
+      end
+
+      col :file, label: "Files"
       col :title, visible: false
       col :notes
 

data/app/datatables/admin/effective_committee_folders_datatable.rb

@@ -10,7 +10,10 @@ module Admin
 
       col :committee
 
-      col :title, label: 'Folder'
+      col :parents, label: "Folders" do |committee_folder|
+        admin_committees_parents(committee_folder)
+      end
+
       col :slug, visible: false
       col :body, visible: false
 
@@ -21,7 +24,17 @@ module Admin
     end
 
     collection do
-      Effective::CommitteeFolder.deep.all
+      folders = Effective::CommitteeFolder.deep.sorted.all
+
+      if attributes[:committee_folder_id].present?
+        folders = folders.where(id: committee_folder.children)
+      end
+
+      folders
+    end
+
+    def committee_folder
+      @committee_folder ||= Effective::CommitteeFolder.find_by_id(attributes[:committee_folder_id])
     end
 
   end

data/app/datatables/admin/effective_committees_datatable.rb

@@ -29,10 +29,16 @@ module Admin
 
       col :committee_members_count, label: "#{committee_members_label} Count", visible: false
 
-      col :committee_folders, label: 'Folders', visible: false
+      col(:committee_folders, label: 'Folders', visible: false) do |committee|
+        committee.committee_folders.map { |folder| admin_committees_parents(folder) }.join("<br>").html_safe
+      end
+
       col :committee_folders_count, label: 'Folders Count', visible: false
 
-      col :committee_files, label: 'Files', visible: false
+      col(:committee_files, label: 'Files', visible: false) do |committee|
+        committee.committee_files.map { |file| admin_committees_parents(file) }.join("<br>").html_safe
+      end
+
       col :committee_files_count, label: 'Files Count', visible: false
 
       actions_col do |committee|

data/app/helpers/effective_committees_helper.rb

@@ -35,4 +35,10 @@ module EffectiveCommitteesHelper
   def committee_files_label
     ets(Effective::CommitteeFile)
   end
+
+  def admin_committees_parents(resource)
+    parents = resource.parents + [resource]
+    render(partial: 'admin/committees/parents', locals: { parents: parents }, formats: [:html])
+  end
+
 end

data/app/models/effective/committee.rb

@@ -58,5 +58,11 @@ module Effective
       committee_members.reject(&:marked_for_destruction?).select(&:active?).map(&:email).compact.join(', ')
     end
 
+    def children
+      committee_folders
+        .select { |folder| folder.committee_folder_id.blank? }
+        .flat_map { |folder| [folder] + folder.children }
+    end
+
   end
 end

data/app/models/effective/committee_file.rb

@@ -43,5 +43,10 @@ module Effective
       title.presence || 'file'
     end
 
+    def parents
+      return [] if committee_folder.blank?
+      committee_folder.parents + [committee_folder]
+    end
+
   end
 end

data/app/models/effective/committee_folder.rb

@@ -8,10 +8,14 @@ module Effective
     log_changes(to: :committee) if respond_to?(:log_changes)
 
     belongs_to :committee, polymorphic: true, counter_cache: true
+    belongs_to :committee_folder, optional: true
 
     has_rich_text :body
+    has_many :committee_folders, -> { Effective::CommitteeFolder.sorted.deep }, dependent: :destroy, inverse_of: :committee_folder
     has_many :committee_files, -> { Effective::CommitteeFile.sorted.deep }, dependent: :destroy, inverse_of: :committee_folder
 
+    has_many_attached :files
+
     effective_resource do
       title         :string
       slug          :string
@@ -35,7 +39,32 @@ module Effective
     validates :position, presence: true
 
     def to_s
-      title.presence || 'folder'
+      (parents + [self]).map { |folder| (folder.title || 'folder') }.join(' / ')
+    end
+
+    def bulk_upload!
+      files.each { |file| committee_files.create(file: file.blob) }
+      true
+    end
+
+    def parent
+      committee_folder || committee
+    end
+
+    def parents
+      folder = self
+      parents = []
+
+      while folder.committee_folder.present?
+        parents << folder.committee_folder
+        folder = folder.committee_folder
+      end
+
+      parents.reverse
+    end
+
+    def children
+      committee_folders.flat_map { |folder| [folder] + folder.children }
     end
 
   end

data/app/views/admin/committee_files/_form_committee_file.html.haml

@@ -6,11 +6,16 @@
 
   - if inline_datatable? && inline_datatable.attributes[:committee_folder_id].present?
     = f.hidden_field :committee_folder_id
-  - elsif inline_datatable?
-    = f.select :committee_folder_id, Effective::CommitteeFolder.deep.where(committee: committee_file.committee_id), label: "Folder"
+  - elsif f.object.persisted?
+    = f.static_field :committee
+    = f.select :committee_folder_id, Effective::CommitteeFolder.sorted.where(committee: f.object.committee), label: "Folder"
   - else
-    = f.select :committee_id, Effective::Committee.sorted.all
-    = f.select :committee_folder_id, Effective::CommitteeFolder.sorted.all, label: "Folder"
+    = f.select :committee_id, Effective::Committee.sorted.all,
+      'data-load-ajax-url': effective_committees.new_admin_committee_file_path,
+      'data-load-ajax-div': '#effective-committees-ajax'
+
+    #effective-committees-ajax
+      = f.select :committee_folder_id, Effective::CommitteeFolder.sorted.where(committee: f.object.committee), label: "Folder"
 
   = f.file_field :file
   = f.text_area :notes

data/app/views/admin/committee_folders/_form.html.haml

@@ -1,8 +1,15 @@
 = tabs do
   - if committee_folder.persisted?
-    = tab 'Folder Files' do
+    = tab 'Folder' do
+      %h3 Folders
+      - datatable = Admin::EffectiveCommitteeFoldersDatatable.new(committee_folder: committee_folder, committee: committee_folder.committee)
+      = render_datatable(datatable, inline: true, simple: true)
+
+      %h3 Files
+      .mt-4= render('admin/committee_folders/form_bulk_upload', committee_folder: committee_folder)
+
       - datatable = Admin::EffectiveCommitteeFilesDatatable.new(committee_folder: committee_folder, committee: committee_folder.committee)
-      = render_inline_datatable(datatable)
+      = render_datatable(datatable, inline: true, simple: true)
 
   = tab 'Folder Details' do
     = render 'admin/committee_folders/form_committee_folder', committee_folder: committee_folder

data/app/views/admin/committee_folders/_form_bulk_upload.html.haml

@@ -0,0 +1,3 @@
+= effective_form_with(model: [:admin, committee_folder], engine: true, autosave: true) do |f|
+  = f.file_field :files, multiple: true, label: 'Bulk upload', hint: 'Select or drag and drop multiple files to upload'
+  %div{style: 'display: none;'}= f.save 'Bulk upload'

data/app/views/admin/committee_folders/_form_committee_folder.html.haml

@@ -1,9 +1,21 @@
 = effective_form_with(model: [:admin, committee_folder], engine: true) do |f|
-  - if inline_datatable?
-    = f.hidden_field :committee_id
-    = f.hidden_field :committee_type
+  - f.object.committee_type ||= Effective::Committee.name
+
+  = f.hidden_field :committee_type
+  = f.hidden_field :committee_id
+
+  - if inline_datatable? && inline_datatable.attributes[:committee_folder_id].present?
+    = f.hidden_field :committee_folder_id
+  - elsif f.object.persisted?
+    = f.static_field :committee
+    = f.select :committee_folder_id, Effective::CommitteeFolder.sorted.where(committee: f.object.committee), label: "Parent Folder", hint: "Leave blank to create a top-level folder"
   - else
-    = f.select :committee, { committees_label => Effective::Committee.sorted }, polymorphic: true
+    = f.select :committee_id, Effective::Committee.sorted.all,
+      'data-load-ajax-url': effective_committees.new_admin_committee_folder_path,
+      'data-load-ajax-div': '#effective-committees-ajax'
+
+    #effective-committees-ajax
+      = f.select :committee_folder_id, Effective::CommitteeFolder.sorted.where(committee: f.object.committee), label: "Parent Folder", hint: "Leave blank to create a top-level folder"
 
   = f.text_field :title
 
@@ -14,4 +26,4 @@
   - else
     = f.rich_text_area :body, hint: "Displayed on the #{committee_folder_label} page"
 
-  = effective_submit(f)
+  = f.submit

data/app/views/admin/committees/_fields.html.haml

@@ -2,8 +2,8 @@
 
 = acts_as_slugged_fields(f, url: (effective_committees.committee_url(f.object) rescue nil))
 
-= f.check_box :display_on_index, label: "Show on the member-only #{link_to "Volunteers and Committees", effective_committees.volunteers_and_committees_path} page"
-= f.check_box :display_on_dashboard, label: "Show on the <a href='/committees'>My #{committee_label.pluralize}</a> page".html_safe
+= f.check_box :display_on_index, label: "Show on the member-only #{link_to "Volunteers and Committees", effective_committees.volunteers_and_committees_path, target: '_blank'} page"
+= f.check_box :display_on_dashboard, label: "Show on the #{link_to "My #{committee_label.pluralize}", effective_committees.committees_path, target: '_blank'} page".html_safe
 
 - if defined?(EffectiveArticleEditor)
   = f.article_editor :body, hint: "Shown on the #{committee_label} page."

data/app/views/admin/committees/_parents.html.haml

@@ -0,0 +1,12 @@
+- parents.each do |parent|
+  - if parent.kind_of?(Effective::CommitteeFolder)
+    = link_to(parent.title, effective_committees.edit_admin_committee_folder_path(parent))
+  - elsif parent.kind_of?(Effective::Committee)
+    = link_to(parent.title, effective_committees.edit_admin_committee_path(parent))
+  - elsif parent.kind_of?(Effective::CommitteeFile)
+    = link_to(parent.title, effective_committees.edit_admin_committee_file_path(parent))
+  - else
+    - raise("unexpected parent")
+
+  - if parent != parents.last
+    %span.mx-1 /

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

@@ -1,19 +1,33 @@
 = render('layout') do
+  - committee = committee_folder.committee
+
   %nav{'aria-label': 'breadcrumb'}
     %ol.breadcrumb
       %li.breadcrumb-item= link_to("My Dashboard", return_to_dashboard_path)
       %li.breadcrumb-item= link_to("My #{committees_label}", effective_committees.committees_path)
-      %li.breadcrumb-item= link_to(committee_folder.committee, effective_committees.committee_path(committee_folder.committee))
-      %li.breadcrumb-item.active{'aria-current': 'page'}= committee_folder
+      %li.breadcrumb-item= link_to(committee, effective_committees.committee_path(committee))
+
+      - committee_folder.parents.each do |parent|
+        %li.breadcrumb-item= link_to(parent.title, effective_committees.committee_committee_folder_path(committee, parent))
+
+      %li.breadcrumb-item.active{'aria-current': 'page'}= committee_folder.title
 
   .effective-committee-folder
-    %h1= committee_folder
+    %h1= committee_folder.title
 
     - if committee_folder.rich_text_body.present?
       .mb-4= committee_folder.rich_text_body.to_s
 
     .my-4
 
+    - if committee_folder.committee_folders.present?
+      %h3 Folders
+      .card
+        .card-body
+          %ul
+            - committee_folder.committee_folders.each do |committee_folder|
+              %li= link_to(committee_folder.title, effective_committees.committee_committee_folder_path(committee, committee_folder))
+
     %h3 Files
     .card
       .card-body

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

@@ -20,8 +20,8 @@
         .card
           .list-group.list-group-flush
             - if committee.committee_folders.present?
-              - committee.committee_folders.each do |folder|
-                = link_to folder.to_s, effective_committees.committee_committee_folder_path(committee, folder), class: 'list-group-item list-group-action'
+              - committee.children.each do |committee_folder|
+                = link_to(committee_folder.to_s, effective_committees.committee_committee_folder_path(committee, committee_folder), class: 'list-group-item list-group-action')
             - else
               .list-group-item No files or folders.
 

data/db/migrate/101_create_effective_committees.rb

@@ -46,6 +46,8 @@ class CreateEffectiveCommittees < ActiveRecord::Migration[6.0]
       t.integer :committee_id
       t.string :committee_type
 
+      t.string :committee_folder_id
+
       t.string :title
       t.string :slug
 

data/lib/effective_committees/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCommittees
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_committees
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-17 00:00:00.000000000 Z
+date: 2025-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -202,6 +202,7 @@ files:
 - app/views/admin/committee_files/_form.html.haml
 - app/views/admin/committee_files/_form_committee_file.html.haml
 - app/views/admin/committee_folders/_form.html.haml
+- app/views/admin/committee_folders/_form_bulk_upload.html.haml
 - app/views/admin/committee_folders/_form_committee_folder.html.haml
 - app/views/admin/committee_members/_form.html.haml
 - app/views/admin/committee_members/_form_committee_member.html.haml
@@ -209,6 +210,7 @@ files:
 - app/views/admin/committees/_fields.html.haml
 - app/views/admin/committees/_form.html.haml
 - app/views/admin/committees/_form_committee.html.haml
+- app/views/admin/committees/_parents.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