effective_committees 0.7.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd7f7ca3651fae0aeaa1458a33fd814895747906994053d880107e070bfe8ce4
-  data.tar.gz: 1fa89b6eefec4c1dc5490f3662912877593b0852f2d798ac174921f886de87dc
+  metadata.gz: e6806153b45de4da4f91304e9ec17c0ddd0d95c08b50e5146cb337ee5bff08da
+  data.tar.gz: 020324e85cf563846560aaf8fc3f687a4879af060e32d2dcec55a85f04692fdb
 SHA512:
-  metadata.gz: 80902269847863c77c1f2846b1cdd6b8dbb62dd99bc754f6a476581373b314e05e6df06390f419259a3c97d90080c05ad9b9f621072d5177719f3d29b33ffa96
-  data.tar.gz: a31af6920becc2f6b3de9928b86f1da3210ac1c2de9b941022b511b7e4eff2b7d2769fc5b3c0ad6f1e064003b3b930ae310b7c5423437871aff7391205237f5e
+  metadata.gz: 0d1b17f664da9c321f122671106b97dc0d6fb9e83d29fc33d6b4d88d66c2c1dbb1e23f7c5cd233a96504729e72a3d181e40e3eb7e58f5ce26603fc2fb55e617a
+  data.tar.gz: 13e80bc61b9abb5fa24774d3e34f88a2799189caf12b973e165a898c7254551a0a564122074dd0503a5f4b2f4647a37dbc4fd67f2ad94b4d75c977eb603faf2d

data/app/controllers/admin/committee_files_controller.rb

@@ -5,6 +5,28 @@ module Admin
 
     include Effective::CrudController
 
+    def bulk_move
+      committee_folder = Effective::CommitteeFolder.find_by_id(params[:committee_folder_id])
+      committee_files = Effective::CommitteeFile.sorted.where(id: params[:ids])
+      original_folder = Effective::CommitteeFolder.find_by_id(committee_files.first.committee_folder_id)
+
+      # Update the position of the files in the new folder
+      position = (committee_folder.committee_files.map { |file| file.position }.compact.max || -1) + 1
+
+      committee_files.each_with_index do |committee_file, index|
+        committee_file.update!(committee_folder: committee_folder, position: position + index)
+      end
+
+      # Update the position of the files in the original folder
+      original_folder.committee_files.each_with_index do |committee_file, index|
+        committee_file.update!(position: index)
+      end
+
+      render json: { status: 200, message: "Successfully moved #{committee_files.length} files to #{committee_folder.title}" }
+    rescue => e
+      render json: { status: 500, message: "Unable to move files: #{e.message}" }
+    end
+
     private
 
     def permitted_params

data/app/controllers/effective/committees_controller.rb

@@ -9,7 +9,7 @@ module Effective
     page_title "More Activity", only: [:activity]
 
     def index
-      @committees = resource_scope.for_dashboard
+      @committees = resource_scope.for_dashboard.sorted
       @page_title = "My #{EffectiveResources.et('effective_committees.name')}"
 
       EffectiveResources.authorize!(self, :index, Effective::Committee)
@@ -18,7 +18,7 @@ module Effective
     end
 
     def volunteers_and_committees
-      @committees = resource_scope.for_index
+      @committees = resource_scope.for_index.sorted
       @page_title = "Volunteers and Committees"
 
       EffectiveResources.authorize!(self, :index, Effective::Committee)

data/app/datatables/admin/effective_committee_files_datatable.rb

@@ -1,8 +1,34 @@
 module Admin
   class EffectiveCommitteeFilesDatatable < Effective::Datatable
+    bulk_actions do
+      committee_folder.parents.each do |committee_folder|
+        bulk_action(
+          "Move to #{committee_folder.title}",
+          effective_committees.bulk_move_admin_committee_files_path(committee_folder_id: committee_folder.id),
+          data: { confirm: "Move selected files to #{committee_folder.title}?" }
+        )
+      end
+
+      if committee_folder.committee_folder.present? && committee_folder.committee_folders.present?
+        bulk_action_divider
+      end
+
+      committee_folder.children.each do |committee_folder|
+        bulk_action(
+          "Move to #{committee_folder.title}",
+          effective_committees.bulk_move_admin_committee_files_path(committee_folder_id: committee_folder.id),
+          data: { confirm: "Move selected files to #{committee_folder.title}?" }
+        )
+      end
+    end
+
     datatable do
       reorder :position
 
+      if attributes[:committee_folder_id].present?
+        bulk_actions_col
+      end
+
       col :updated_at, visible: false
       col :created_at, visible: false
 
@@ -28,5 +54,13 @@ module Admin
       Effective::CommitteeFile.deep.all
     end
 
+    def committee_folder
+      if attributes[:committee_folder_id].present?
+        @committee_folder ||= Effective::CommitteeFolder.find_by_id(attributes[:committee_folder_id])
+      else
+        @committee_folder ||= Effective::CommitteeFolder.new
+      end
+    end
+
   end
 end

data/app/datatables/admin/effective_committees_datatable.rb

@@ -1,13 +1,14 @@
 module Admin
   class EffectiveCommitteesDatatable < Effective::Datatable
     datatable do
+      reorder :position
       length 100
-      order :title
 
       col :updated_at, visible: false
       col :created_at, visible: false
 
       col :id, visible: false
+      col :position, visible: false
 
       col :title, label: committee_label
       col :slug, visible: false

data/app/models/effective/committee.rb

@@ -22,6 +22,8 @@ module Effective
       title                     :string
       slug                      :string
 
+      position                  :integer
+
       committee_members_count   :integer # Counter Cache
       committee_folders_count   :integer # Counter Cache
       committee_files_count     :integer # Counter Cache
@@ -29,13 +31,18 @@ module Effective
       timestamps
     end
 
-    scope :sorted, -> { order(:title) }
+    scope :sorted, -> { order(:position) }
     scope :deep, -> { with_rich_text_body.includes(committee_members: [:user], committee_folders: [:committee_files, :rich_text_body]) }
 
     scope :for_dashboard, -> { where(display_on_dashboard: true) }
     scope :for_index, -> { where(display_on_index: true) }
 
+    before_validation do
+      self.position ||= (self.class.maximum(:position) || -1) + 1
+    end
+
     validates :title, presence: true, uniqueness: true, length: { maximum: 255 }
+    validates :position, presence: true
 
     def to_s
       title.presence || 'New Committee'

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

@@ -1,15 +1,24 @@
+- if committee_folder.persisted?
+  %p= admin_committees_parents(committee_folder)
+
 = tabs do
   - if committee_folder.persisted?
     = tab 'Folder' do
       %h3 Folders
+      %p.text-muted
+        %small Refresh the page after creating a new folder to move files to it.
+
       - datatable = Admin::EffectiveCommitteeFoldersDatatable.new(committee_folder: committee_folder, committee: committee_folder.committee)
       = render_datatable(datatable, inline: true, simple: true)
 
       %h3 Files
+      %p.text-muted
+        %small Select the files, then use the Bulk Actions dropdown to move them to another folder
+
       .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_datatable(datatable, inline: true, simple: true)
+      = render_datatable(datatable, inline: true)
 
   = tab 'Folder Details' do
     = render 'admin/committee_folders/form_committee_folder', committee_folder: committee_folder

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

@@ -1,6 +1,7 @@
 = render('layout') do
   - @committees.each do |committee|
     %h3= committee
+    = committee.body.to_s
 
     - members = committee.committee_members.select(&:active?).sort_by(&:to_s)
     %ul

data/config/routes.rb

@@ -23,7 +23,9 @@ EffectiveCommittees::Engine.routes.draw do
     resources :committees, except: [:show]
     resources :committee_members, except: [:show]
     resources :committee_folders, except: [:show]
-    resources :committee_files, except: [:show]
+    resources :committee_files, except: [:show] do
+      post :bulk_move, on: :collection
+    end
   end
 
 end

data/db/migrate/101_create_effective_committees.rb

@@ -4,6 +4,7 @@ class CreateEffectiveCommittees < ActiveRecord::Migration[6.0]
     create_table :committees do |t|
       t.string :title
       t.string :slug
+      t.integer :position, default: 0
 
       t.integer :committee_members_count, default: 0
       t.integer :committee_folders_count, default: 0

data/lib/effective_committees/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCommittees
-  VERSION = '0.7.4'.freeze
+  VERSION = '0.8.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_committees
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-09 00:00:00.000000000 Z
+date: 2026-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: haml
+  name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -136,6 +136,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: wicked
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: effective_logging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: effective_test_bot
   requirement: !ruby/object:Gem::Requirement
@@ -175,8 +217,8 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/effective_committees_manifest.js
+- app/assets/javascripts/effective_committees.js
 - app/assets/javascripts/effective_committees/base.js
-- app/assets/javascripts/effective_committeesjs
 - app/assets/stylesheets/effective_committees.scss
 - app/assets/stylesheets/effective_committees/base.scss
 - app/controllers/admin/committee_files_controller.rb
@@ -257,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Committees are groups of users that can all share files.