pageflow 17.1.0 → 17.2.0

data/README.md

@@ -48,9 +48,9 @@ Pageflow assumes the following choice of libraries:
 
 Pageflow runs in environments with:
 
-* Ruby >= 3.2
-* Node >= 18
-* Rails 7.1
+* Ruby >= 3.4
+* Node >= 22
+* Rails >= 7.2, < 8.2
 * Redis server (for Resque)
 * A database server supported by Active Record (tested with MySQL)
 * ImageMagick
@@ -95,7 +95,6 @@ for details.
     # The install generator sets up Resque as Active Job backend
     gem 'resque', '~> 1.25'
     gem 'resque-scheduler', '~> 4.10'
-    gem 'ar_after_transaction', '~> 0.8.0'
     gem 'redis', '~> 3.0'
     gem 'redis-namespace', '~> 1.5'
 

data/admins/pageflow/accounts.rb

@@ -21,8 +21,8 @@ module Pageflow
         account.memberships.size if authorized?(:read, account)
       end
       account_memberships = current_user.memberships.on_accounts
-      account_roles = account_memberships.each_with_object({}) do |membership, roles|
-        roles[membership.entity_id] = membership.role
+      account_roles = account_memberships.to_h do |membership|
+        [membership.entity_id, membership.role]
       end
       if authorized?(:see_own_role_on, :accounts)
         column :own_role do |account|
@@ -43,16 +43,16 @@ module Pageflow
     searchable_select_options(text_attribute: :name,
                               scope: lambda do
                                 Account
-                                  .accessible_by(current_ability, :read)
-                                  .order(:name)
+                                .accessible_by(current_ability, :read)
+                                .order(:name)
                               end)
 
     searchable_select_options(name: :member_addable,
                               text_attribute: :name,
                               scope: lambda do
                                 AccountPolicy::Scope.new(current_user, Account)
-                                  .member_addable
-                                  .order(:name)
+                                                    .member_addable
+                                                    .order(:name)
                               end)
 
     form partial: 'form'

data/admins/pageflow/entry.rb

@@ -9,7 +9,8 @@ module Pageflow
         entry_publication_state_indicator(entry)
       end
       column :title, sortable: 'title' do |entry|
-        link_to(entry.title, admin_entry_path(entry))
+        safe_join([link_to(entry.title, admin_entry_path(entry)),
+                   entry_comments_indicator(entry)].compact)
       end
       column I18n.t('pageflow.admin.entries.members'), class: 'members' do |entry|
         entry_user_badge_list(entry)
@@ -101,9 +102,9 @@ module Pageflow
                               text_attribute: :name,
                               scope: lambda do
                                 AccountPolicy::Scope
-                                  .new(current_user, Account)
-                                  .entry_movable
-                                  .order(:name)
+                                .new(current_user, Account)
+                                .entry_movable
+                                .order(:name)
                               end)
 
     searchable_select_options(name: :eligible_sites,
@@ -111,8 +112,8 @@ module Pageflow
                               scope: lambda do |params|
                                 account = Account.find(params[:account_id])
                                 SitePolicy::Scope
-                                  .new(current_user, Site)
-                                  .sites_allowed_for(account)
+                                .new(current_user, Site)
+                                .sites_allowed_for(account)
                               end,
                               filter: lambda do |term, scope|
                                 scope.ransack(account_name_cont: term).result
@@ -318,7 +319,7 @@ module Pageflow
       end
 
       # rubocop:todo Metrics/PerceivedComplexity
-      def permitted_attributes # rubocop:todo Metrics/AbcSize
+      def permitted_attributes # rubocop:todo Metrics/AbcSize, Metrics/CyclomaticComplexity
         result = [:title, :type_name, {permalink_attributes: [:slug, :directory_id]}]
         target = if !params[:id] && current_user.admin?
                    Account.first
@@ -330,7 +331,8 @@ module Pageflow
         result += Pageflow.config_for(target).admin_form_inputs.permitted_attributes_for(:entry)
         result += permitted_account_attributes
 
-        result << :folder_id if params[:id] && authorized?(:configure_folder_for, resource)
+        result << :folder_id if create_or_new_action? ||
+                                (params[:id] && authorized?(:configure_folder_for, resource))
 
         accounts = if params[:id]
                      resource.account

data/admins/pageflow/membership.rb

@@ -12,9 +12,9 @@ module Pageflow
                                 user = User.find(params[:parent_id])
 
                                 PotentialMemberships
-                                  .creatable_by(current_user)
-                                  .accounts_for_user(user)
-                                  .order(:name)
+                                .creatable_by(current_user)
+                                .accounts_for_user(user)
+                                .order(:name)
                               end)
 
     searchable_select_options(name: :potential_entries_for_user,
@@ -24,8 +24,8 @@ module Pageflow
                               scope: lambda do |params|
                                 user = User.find(params[:parent_id])
                                 entries = PotentialMemberships
-                                  .creatable_by(current_user)
-                                  .entries_for_user(user)
+                                          .creatable_by(current_user)
+                                          .entries_for_user(user)
 
                                 if can?(:see, :accounts)
                                   entries.include_account_name.order('account_name', :title)
@@ -42,9 +42,9 @@ module Pageflow
                               scope: lambda do |params|
                                 account = Account.find(params[:parent_id])
                                 PotentialMemberships
-                                  .creatable_by(current_user)
-                                  .users_for_account(account)
-                                  .order(:last_name, :first_name)
+                                .creatable_by(current_user)
+                                .users_for_account(account)
+                                .order(:last_name, :first_name)
                               end,
                               filter: lambda do |term, scope|
                                 UserNameQuery::Scope.new(term, scope).resolve
@@ -55,9 +55,9 @@ module Pageflow
                               scope: lambda do |params|
                                 entry = Entry.find(params[:parent_id])
                                 PotentialMemberships
-                                  .creatable_by(current_user)
-                                  .users_for_entry(entry)
-                                  .order(:last_name, :first_name)
+                                .creatable_by(current_user)
+                                .users_for_entry(entry)
+                                .order(:last_name, :first_name)
                               end,
                               filter: lambda do |term, scope|
                                 UserNameQuery::Scope.new(term, scope).resolve

data/admins/pageflow/translations.rb

@@ -14,11 +14,11 @@ module Pageflow
                               display_text: lambda do |entry|
                                 if entry.translation_group
                                   entry.translation_group
-                                    .entries
-                                    .order('title ASC')
-                                    .map(&:title)
-                                    .join(' / ')
-                                    .presence
+                                       .entries
+                                       .order('title ASC')
+                                       .map(&:title)
+                                       .join(' / ')
+                                       .presence
                                 else
                                   entry.title
                                 end

data/app/assets/images/pageflow/admin/icons/comment.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="#8a5a00" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" width="16" height="16"><path d="M22 17a2 2 0 0 1-2 2H6.828a2 2 0 0 0-1.414.586l-2.202 2.202A.71.71 0 0 1 2 21.286V5a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2z"/><path d="M7 11h10"/><path d="M7 15h6"/><path d="M7 7h8"/></svg>