pageflow 17.0.5 → 17.2.0

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)
@@ -90,13 +91,20 @@ module Pageflow
                           grouped_by_accounts: authorized?(:see, :accounts))
     end
 
+    searchable_select_options(text_attribute: :title,
+                              scope: lambda do |params|
+                                scope = EntryPolicy::Scope.new(current_user, Entry).resolve
+                                scope = scope.where(site_id: params[:site_id]) if params[:site_id]
+                                scope
+                              end)
+
     searchable_select_options(name: :eligible_accounts,
                               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,
@@ -104,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
@@ -141,7 +149,7 @@ module Pageflow
 
     collection_action :entry_site_and_type_name_input do
       account = Pageflow::Account.find(params[:account_id])
-      @entry = Pageflow::Entry.new(account: account,
+      @entry = Pageflow::Entry.new(account:,
                                    type_name: params[:entry_type_name])
 
       apply_entry_defaults(@entry)
@@ -186,8 +194,8 @@ module Pageflow
     end
 
     show title: :title do |entry|
-      render 'attributes_table', entry: entry
-      render 'links', entry: entry
+      render('attributes_table', entry:)
+      render('links', entry:)
 
       tabs_view(Pageflow.config.admin_resource_tabs.find_by_resource(entry),
                 i18n: 'pageflow.admin.resource_tabs',
@@ -205,12 +213,15 @@ module Pageflow
       helper Admin::FormHelper
       helper Admin::MembershipsHelper
       helper Admin::RevisionsHelper
+      helper Admin::EntryTranslationsHelper
 
       helper_method :account_policy_scope
       helper_method :site_policy_scope
 
       after_build do |entry|
+        handle_site_param(entry)
         apply_entry_defaults(entry)
+        handle_root_permalink(entry)
 
         if action_name == 'new' &&
            (default_entry_type = Pageflow.config.default_entry_type&.call(entry.account))
@@ -219,12 +230,29 @@ module Pageflow
         end
       end
 
+      after_create do |entry|
+        Pageflow.config.hooks.invoke(:entry_created, entry:) if entry.persisted?
+      end
+
       before_update do |entry|
         if entry.account_id_changed? && !authorized?(:update_site_on, resource)
           entry.site = entry.account.default_site
         end
       end
 
+      def create
+        create! do |success, _|
+          success.html do
+            case Pageflow.config.after_entry_create_redirect_to
+            when :admin
+              redirect_to admin_entry_path(resource)
+            when :editor
+              redirect_to pageflow.editor_entry_path(resource)
+            end
+          end
+        end
+      end
+
       def update
         update! do |success, _|
           success.html { redirect_to(admin_entry_path(resource, params.permit(:tab))) }
@@ -247,20 +275,41 @@ module Pageflow
       def permitted_params
         result = params.permit(entry: permitted_attributes)
 
-        if result[:entry]
-          permit_feature_states(result[:entry])
-        end
+        permit_feature_states(result[:entry]) if result[:entry]
 
         result
       end
 
       private
 
+      def handle_site_param(entry)
+        return unless params[:site_id]
+
+        site = site_policy_scope.sites_allowed_for(
+          account_policy_scope.entry_creatable
+        ).find(params[:site_id])
+
+        entry.site = site
+        entry.account = site.account
+      end
+
       def apply_entry_defaults(entry)
         entry.account ||= account_policy_scope.entry_creatable.first || Account.first
         entry.site ||= entry.account.default_site
       end
 
+      def handle_root_permalink(entry)
+        return unless params[:at] == 'root'
+        return unless authorized?(:manage_root_entry, entry.site)
+
+        entry.build_permalink unless entry.permalink
+        entry.permalink.assign_attributes(
+          directory: entry.site.root_permalink_directory,
+          slug: '',
+          allow_root_path: '1'
+        )
+      end
+
       def account_policy_scope
         AccountPolicy::Scope.new(current_user, Account)
       end
@@ -269,7 +318,8 @@ module Pageflow
         SitePolicy::Scope.new(current_user, Site)
       end
 
-      def permitted_attributes
+      # rubocop:todo Metrics/PerceivedComplexity
+      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
@@ -281,26 +331,26 @@ module Pageflow
         result += Pageflow.config_for(target).admin_form_inputs.permitted_attributes_for(:entry)
         result += permitted_account_attributes
 
-        if params[:id]
-          result << :folder_id if authorized?(:configure_folder_for, resource)
-        end
+        result << :folder_id if create_or_new_action? ||
+                                (params[:id] && authorized?(:configure_folder_for, resource))
 
-        if params[:id]
-          accounts = resource.account
-        else
-          accounts = account_policy_scope.sites_accessible
-        end
+        accounts = if params[:id]
+                     resource.account
+                   else
+                     account_policy_scope.sites_accessible
+                   end
 
         result += permitted_site_attributes(accounts)
 
         result
       end
+      # rubocop:enable Metrics/PerceivedComplexity
 
       def permit_feature_states(attributes)
-        if params[:id] && authorized?(:update_feature_configuration_on, resource)
-          feature_states = params[:entry][:feature_states].try(:permit!)
-          attributes.merge!(feature_states: feature_states || {})
-        end
+        return unless params[:id] && authorized?(:update_feature_configuration_on, resource)
+
+        feature_states = params[:entry][:feature_states].try(:permit!)
+        attributes.merge!(feature_states: feature_states || {})
       end
 
       def permitted_site_attributes(accounts)
@@ -322,7 +372,7 @@ module Pageflow
 
       def site_in_allowed_sites_for?(accounts)
         site_policy_scope.sites_allowed_for(accounts)
-          .include?(Site.find(params[:entry][:site_id]))
+                         .include?(Site.find(params[:entry][:site_id]))
       end
 
       def permitted_account_attributes

data/admins/pageflow/entry_templates.rb

@@ -12,8 +12,9 @@ module Pageflow
     end
 
     controller do
-      helper Pageflow::Admin::FormHelper
-      helper Pageflow::Admin::WidgetsHelper
+      helper Admin::FormHelper
+      helper Admin::WidgetsHelper
+      helper Admin::LocalesHelper
 
       def index
         redirect_to redirect_path
@@ -58,8 +59,8 @@ module Pageflow
       private
 
       def page_title(rest_verb, entry_type_name)
-        "#{I18n.t('pageflow.admin.entry_templates.page_title.' + rest_verb)} "\
-        "#{I18n.t('activerecord.values.pageflow/entry.type_names.' + entry_type_name)}"
+        "#{I18n.t("pageflow.admin.entry_templates.page_title.#{rest_verb}")} " \
+          "#{I18n.t("activerecord.values.pageflow/entry.type_names.#{entry_type_name}")}"
       end
 
       def permitted_params
@@ -79,8 +80,8 @@ module Pageflow
           :default_publisher,
           :default_keywords,
           :default_locale,
-          share_providers: {},
-          configuration: {}
+          {share_providers: {},
+           configuration: {}}
         ]
       end
 
@@ -106,7 +107,7 @@ module Pageflow
       end
 
       def true_false_strings_to_booleans_or_numbers(hash)
-        hash&.map { |k, v| [k, to_boolean_or_number(v)] }&.to_h
+        hash&.transform_values { |v| to_boolean_or_number(v) }
       end
 
       def to_boolean_or_number(value)
@@ -129,8 +130,8 @@ module Pageflow
       end
 
       def widgets_params
-        (params[:widgets].try(:permit!).to_h || {}).map do |role, type_name|
-          {role: role, type_name: type_name}
+        params[:widgets].try(:permit!).to_h.map do |role, type_name|
+          {role:, type_name:}
         end
       end
     end

data/admins/pageflow/folder.rb

@@ -57,7 +57,7 @@ module Pageflow
       def restrict_attributes(attributes)
         if params[:folder] && params[:folder][:account_id] &&
            AccountPolicy::Scope.new(current_user, Account)
-            .folder_addable.exists?(params[:folder][:account_id]) &&
+                               .folder_addable.exists?(params[:folder][:account_id]) &&
            action_name.to_sym == :create
 
           attributes

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
@@ -80,8 +80,8 @@ module Pageflow
       belongs_to :account, parent_class: Pageflow::Account, polymorphic: true
       belongs_to :user, parent_class: User, polymorphic: true
 
-      helper Pageflow::Admin::MembershipsHelper
-      helper Pageflow::Admin::FormHelper
+      helper Admin::MembershipsHelper
+      helper Admin::FormHelper
 
       def index
         if params[:user_id].present?
@@ -119,10 +119,10 @@ module Pageflow
         end
       end
 
-      def redirect_path
+      def redirect_path # rubocop:todo Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         if params[:user_id].present? && authorized?(:redirect_to_user, resource.user)
           tab = resource.entity_type == 'Pageflow::Account' ? 'accounts' : 'entries'
-          admin_user_path(params[:user_id], tab: tab)
+          admin_user_path(params[:user_id], tab:)
         elsif params[:user_id].present? && authorized?(:index, resource.user)
           admin_users_path
         elsif params[:account_id].present? && authorized?(:read, resource.entity)

data/admins/pageflow/revisions.rb

@@ -1,18 +1,18 @@
 module Pageflow
-  ActiveAdmin.register Revision, :as => 'Revision' do
+  ActiveAdmin.register Revision, as: 'Revision' do
     menu false
 
     actions :edit, :update, :show
 
-    form :partial => 'form'
+    form partial: 'form'
 
-    member_action :restore, :method => :post do
+    member_action :restore, method: :post do
       revision = Revision.find(params[:id])
       entry = revision.entry
       authorize!(:restore, entry)
 
       entry.edit_lock.acquire(current_user)
-      revision.entry.restore(revision: revision, creator: current_user)
+      revision.entry.restore(revision:, creator: current_user)
       entry.edit_lock.release(current_user)
       redirect_to(admin_entry_path(entry), notice: I18n.t('pageflow.admin.revisions.restored'))
     end
@@ -20,7 +20,7 @@ module Pageflow
     controller do
       include EditLocking
 
-      helper Pageflow::Admin::FormHelper
+      helper Admin::FormHelper
 
       def permitted_params
         params.permit(revision: [:published_until])

data/admins/pageflow/site_root_entry.rb

@@ -0,0 +1,64 @@
+module Pageflow
+  ActiveAdmin.register_page 'Site Root Entry' do
+    menu false
+
+    breadcrumb do
+      breadcrumb_links.first(1)
+    end
+
+    page_action :choose, method: [:get, :post] do
+      @page_title = t('pageflow.admin.site_root_entry.title')
+
+      @site_root_entry_form = SiteRootEntryForm.new(
+        permitted_params[:site_root_entry_form],
+        @site
+      )
+
+      if request.post? && @site_root_entry_form.save
+        redirect_to(admin_entry_path(@site_root_entry_form.entry),
+                    notice: t('pageflow.admin.site_root_entry.chosen'))
+      end
+    end
+
+    controller do
+      helper Admin::FormHelper
+
+      before_action :find_site
+      before_action :authorize_manage_root_entry!
+      before_action :ensure_root_permalink_directory
+      before_action :ensure_no_root_entry
+
+      def index
+        redirect_to(admin_account_name_setup_path)
+      end
+
+      private
+
+      def find_site
+        @site = Site.find(params[:site_id])
+      end
+
+      def authorize_manage_root_entry!
+        authorize!(:manage_root_entry, @site)
+      end
+
+      def ensure_root_permalink_directory
+        return if @site.root_permalink_directory.present?
+
+        redirect_to(admin_root_path,
+                    alert: t('pageflow.admin.site_root_entry.root_permalink_directory_required'))
+      end
+
+      def ensure_no_root_entry
+        return if @site.root_entry.blank?
+
+        redirect_to(admin_root_path,
+                    alert: t('pageflow.admin.site_root_entry.root_entry_exists'))
+      end
+
+      def permitted_params
+        params.permit(site_root_entry_form: [:entry_id])
+      end
+    end
+  end
+end

data/admins/pageflow/sites.rb

@@ -6,7 +6,7 @@ module Pageflow
     actions :index, :show, :new, :edit, :create, :update
 
     show do
-      render 'attributes_table', site: site
+      render('attributes_table', site:)
 
       tabs_view(Pageflow.config.admin_resource_tabs.find_by_resource(site),
                 i18n: 'pageflow.admin.resource_tabs',
@@ -29,12 +29,21 @@ module Pageflow
         :copyright_link_url,
         :copyright_link_label,
         :privacy_link_url,
-        :home_url
+        :home_url,
+        :cutoff_mode_name,
+        :custom_404_entry_id
       ] + permitted_admin_form_input_params
     end
 
     controller do
-      helper Pageflow::Admin::FormHelper
+      helper Admin::CutoffModesHelper
+      helper Admin::FormHelper
+      helper Admin::SitesHelper
+      helper Pageflow::PublicI18n::LocalesHelper
+
+      before_create do |site|
+        site.build_root_permalink_directory
+      end
 
       def index
         redirect_to admin_account_path(parent, tab: 'sites')

data/admins/pageflow/translations.rb

@@ -0,0 +1,75 @@
+module Pageflow
+  ActiveAdmin.register Entry, as: 'Translations' do
+    menu false
+    belongs_to :entry
+
+    actions :new, :create, :destroy
+
+    searchable_select_options(name: :potential_entry_translations,
+                              scope: lambda do |_params|
+                                authorize!(:manage_translations, parent)
+                                PotentialEntryTranslations.for(parent).resolve
+                              end,
+                              text_attribute: :title,
+                              display_text: lambda do |entry|
+                                if entry.translation_group
+                                  entry.translation_group
+                                       .entries
+                                       .order('title ASC')
+                                       .map(&:title)
+                                       .join(' / ')
+                                       .presence
+                                else
+                                  entry.title
+                                end
+                              end)
+
+    form partial: 'form'
+
+    member_action :default, method: :put do
+      entry = Entry.find(params[:id])
+
+      authorize!(:manage_translations, entry)
+      entry.mark_as_default_translation
+
+      redirect_to(admin_entry_path(parent, tab: 'translations'))
+    end
+
+    controller do
+      helper Admin::FormHelper
+
+      def index
+        redirect_to admin_entry_path(parent, tab: 'translations')
+      end
+
+      def create
+        entry = Entry.find(params.require(:entry)[:id])
+
+        authorize!(:manage_translations, parent)
+        authorize!(:manage_translations, entry)
+        parent.mark_as_translation_of(entry)
+
+        redirect_to(admin_entry_path(parent, tab: 'translations'))
+      end
+
+      def destroy
+        entry = Entry.find(params[:id])
+
+        authorize!(:manage_translations, entry)
+        entry.remove_from_translation_group
+
+        redirect_to(admin_entry_path(parent, tab: 'translations'))
+      end
+
+      protected
+
+      def authorized?(action, subject = nil)
+        if subject.is_a?(Entry) && subject.new_record?
+          super(:manage_translations, parent)
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/admins/pageflow/user.rb

@@ -38,21 +38,7 @@ module Pageflow
 
     show do |user|
       div do
-        attributes_table_for user do
-          row :last_name, class: 'last_name'
-          row :first_name, class: 'first_name'
-          row :email, class: 'email'
-
-          row :created_at
-          row :last_sign_in_at
-          boolean_status_tag_row :suspended?
-          row :locale do
-            I18n.t('language', locale: user.locale)
-          end
-          if authorized?(:see_admin_status, user)
-            boolean_status_tag_row(:admin?, 'admin warning')
-          end
-        end
+        render('attributes_table', user:)
 
         para do
           link_to I18n.t('pageflow.admin.users.resend_invitation'),
@@ -133,23 +119,19 @@ module Pageflow
     collection_action 'me', title: I18n.t('pageflow.admin.users.account'), method: [:get, :patch] do
       @user = User.find(current_user.id)
 
-      if request.patch?
-        if @user.update_with_password(user_profile_params)
-          Pageflow.config.hooks.invoke(:user_changed, @user)
+      if request.patch? && @user.update_with_password(user_profile_params)
+        Pageflow.config.hooks.invoke(:user_changed, @user)
 
-          bypass_sign_in @user, scope: :user
-          redirect_to admin_root_path, notice: I18n.t('pageflow.admin.users.me.updated')
-        end
+        bypass_sign_in @user, scope: :user
+        redirect_to admin_root_path, notice: I18n.t('pageflow.admin.users.me.updated')
       end
     end
 
     collection_action 'delete_me',
                       title: I18n.t('pageflow.admin.users.account'), method: [:get, :delete] do
-      if request.delete?
-        if authorized?(:delete_own_user, current_user) &&
-           current_user.destroy_with_password(params.require(:user)[:current_password])
-          redirect_to admin_root_path, notice: I18n.t('pageflow.admin.users.me.updated')
-        end
+      if request.delete? && authorized?(:delete_own_user, current_user) &&
+         current_user.destroy_with_password(params.require(:user)[:current_password])
+        redirect_to admin_root_path, notice: I18n.t('pageflow.admin.users.me.updated')
       end
     end
 
@@ -157,30 +139,34 @@ module Pageflow
       user = InvitedUser.find(params[:id])
       authorize!(:read, user)
       user.send_invitation!
-      redirect_back fallback_location: admin_user_path(user), notice: I18n.t('pageflow.admin.users.resent_invitation')
+      redirect_back fallback_location: admin_user_path(user),
+                    notice: I18n.t('pageflow.admin.users.resent_invitation')
     end
 
     member_action :suspend, method: :post do
       user = User.find(params[:id])
       authorize!(:suspend, user)
       user.suspend!
-      redirect_back fallback_location: admin_user_path(user), notice: I18n.t('pageflow.admin.users.suspended')
+      redirect_back fallback_location: admin_user_path(user),
+                    notice: I18n.t('pageflow.admin.users.suspended')
     end
 
     member_action :unsuspend, method: :post do
       user = User.find(params[:id])
       authorize!(:suspend, user)
       user.unsuspend!
-      redirect_back fallback_location: admin_user_path(user), notice: I18n.t('pageflow.admin.users.unsuspended')
+      redirect_back fallback_location: admin_user_path(user),
+                    notice: I18n.t('pageflow.admin.users.unsuspended')
     end
 
     controller do
-      include Pageflow::QuotaVerification
-      helper Pageflow::Admin::FormHelper
-      helper Pageflow::Admin::LocalesHelper
-      helper Pageflow::Admin::MembershipsHelper
-      helper Pageflow::Admin::UsersHelper
-      helper Pageflow::QuotaHelper
+      include QuotaVerification
+
+      helper Admin::FormHelper
+      helper Admin::LocalesHelper
+      helper Admin::MembershipsHelper
+      helper Admin::UsersHelper
+      helper QuotaHelper
 
       def scoped_collection
         super.includes(account_memberships: :entity)

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>