pageflow 17.0.5 → 17.1.0

data/app/policies/pageflow/file_policy.rb

@@ -1,4 +1,5 @@
 module Pageflow
+  # @api private
   class FilePolicy < ApplicationPolicy
     def initialize(user, file)
       @user = user
@@ -6,11 +7,7 @@ module Pageflow
     end
 
     def manage?
-      if @file.parent_file
-        can_edit_any_entry_using_file?(@file.parent_file)
-      else
-        can_edit_any_entry_using_file?(@file)
-      end
+      can_edit_any_entry_using_file?(@file.parent_file || @file)
     end
 
     def use?
@@ -26,7 +23,7 @@ module Pageflow
     def previewer_of_any_entry_using_file_or_its_account?(user, file)
       entries_user_is_previewer_or_above_on = EntryPolicy::Scope
                                               .new(user, Entry).resolve
-      (entries_user_is_previewer_or_above_on.map(&:id) & file.using_entry_ids).any?
+      entries_user_is_previewer_or_above_on.map(&:id).intersect?(file.using_entry_ids)
     end
 
     def can_edit_any_entry_using_file?(file)
@@ -36,7 +33,7 @@ module Pageflow
     def editor_of_any_entry_using_file_or_its_account?(user, file)
       entries_user_is_editor_or_above_on = EntryPolicy::Scope
                                            .new(user, Entry).editor_or_above
-      (entries_user_is_editor_or_above_on.map(&:id) & file.using_entry_ids).any?
+      entries_user_is_editor_or_above_on.map(&:id).intersect?(file.using_entry_ids)
     end
   end
 end

data/app/policies/pageflow/folder_policy.rb

@@ -1,5 +1,7 @@
 module Pageflow
+  # @api private
   class FolderPolicy < ApplicationPolicy
+    # @api private
     class Scope < Scope
       attr_reader :user, :scope
 
@@ -21,13 +23,21 @@ module Pageflow
       private
 
       def accounts_where_user_is_at_least_previewer(user)
-        user.accounts.joins(sanitize_sql_array([
-          'LEFT OUTER JOIN pageflow_memberships as pageflow_memberships_2 ON ' \
-          'pageflow_memberships_2.user_id = :user_id AND ' \
-          'pageflow_memberships_2.entity_type = \'Pageflow::Account\' AND ' \
-          'pageflow_memberships_2.entity_id = pageflow_accounts.id AND ' \
-          'pageflow_memberships_2.role IN (\'previewer\', \'editor\', \'publisher\', \'manager\')',
-          user_id: user.id])).where('pageflow_memberships_2.entity_id IS NOT NULL')
+        user.accounts
+            .joins(
+              sanitize_sql_array(
+                [
+                  'LEFT OUTER JOIN pageflow_memberships as pageflow_memberships_2 ON ' \
+                  'pageflow_memberships_2.user_id = :user_id AND ' \
+                  'pageflow_memberships_2.entity_type = \'Pageflow::Account\' AND ' \
+                  'pageflow_memberships_2.entity_id = pageflow_accounts.id AND ' \
+                  'pageflow_memberships_2.role IN (\'previewer\', ' \
+                  "'editor', 'publisher', 'manager')",
+                  {user_id: user.id}
+                ]
+              )
+            )
+            .where('pageflow_memberships_2.entity_id IS NOT NULL')
       end
     end
 
@@ -37,7 +47,7 @@ module Pageflow
     end
 
     def manage?
-      allows?(%w(publisher manager))
+      allows?(%w[publisher manager])
     end
 
     def show_account_selection_on?

data/app/policies/pageflow/membership_policy.rb

@@ -1,5 +1,7 @@
 module Pageflow
+  # @api private
   class MembershipPolicy < ApplicationPolicy
+    # @api private
     class Scope < Scope
       attr_reader :user, :scope
 
@@ -22,11 +24,11 @@ module Pageflow
         sanitize_sql_array(['pageflow_memberships.entity_type = \'Pageflow::Account\' AND ' \
                             'pageflow_memberships.entity_id IN (:managed_account_ids) OR ' \
                             'pageflow_memberships.entity_type = \'Pageflow::Entry\' AND ' \
-                            'pageflow_memberships.entity_id IN (:common_entry_ids) OR '\
+                            'pageflow_memberships.entity_id IN (:common_entry_ids) OR ' \
                             'pageflow_memberships.user_id = :user_id',
-                            managed_account_ids: managed_account_ids,
-                            common_entry_ids: common_entry_ids,
-                            user_id: @user.id])
+                            {managed_account_ids:,
+                             common_entry_ids:,
+                             user_id: @user.id}])
       end
 
       def managed_account_ids

data/app/policies/pageflow/site_policy.rb

@@ -1,5 +1,7 @@
 module Pageflow
+  # @api private
   class SitePolicy < ApplicationPolicy
+    # @api private
     class Scope < Scope
       attr_reader :user, :scope
 
@@ -12,9 +14,9 @@ module Pageflow
         if user.admin?
           scope.all
         else
-          accounts_ids = accounts.try(:id) || accounts.try(:length) && accounts.map(&:id)
+          accounts_ids = accounts.try(:id) || (accounts.try(:length) && accounts.map(&:id))
           scope.joins(publisher_memberships_for_accounts(user, accounts_ids))
-            .where(membership_is_present)
+               .where(membership_is_present)
         end
       end
 
@@ -27,7 +29,7 @@ module Pageflow
                             'pageflow_memberships.entity_id IN (:accounts_ids) AND ' \
                             'pageflow_memberships.entity_type = \'Pageflow::Account\' AND ' \
                             'pageflow_memberships.role IN (\'publisher\', \'manager\')',
-                            user_id: user.id, accounts_ids: accounts_ids])
+                            {user_id: user.id, accounts_ids:}])
       end
 
       def membership_is_present
@@ -51,5 +53,10 @@ module Pageflow
     def update?
       read?
     end
+
+    def manage_root_entry?
+      @user.admin? ||
+        @account_role_query.has_at_least_role?(:manager)
+    end
   end
 end

data/app/policies/pageflow/user_policy.rb

@@ -1,5 +1,7 @@
 module Pageflow
+  # @api private
   class UserPolicy < ApplicationPolicy
+    # @api private
     class Scope < Scope
       attr_reader :user, :scope
 
@@ -16,8 +18,8 @@ module Pageflow
                                  .new(@user, Account).member_addable.map(&:id)
 
           scope.joins(:memberships)
-            .where('pageflow_memberships.entity_type = \'Pageflow::Account\'')
-            .where(membership_in_managed_account(manager_accounts_ids)).distinct
+               .where('pageflow_memberships.entity_type = \'Pageflow::Account\'')
+               .where(membership_in_managed_account(manager_accounts_ids)).distinct
         end
       end
 
@@ -25,7 +27,7 @@ module Pageflow
 
       def membership_in_managed_account(accounts_ids)
         sanitize_sql_array(['pageflow_memberships.entity_id IN (:accounts_ids)',
-                            accounts_ids: accounts_ids])
+                            {accounts_ids:}])
       end
     end
 
@@ -58,7 +60,7 @@ module Pageflow
                          .new(@user, Account).member_addable
       managed_user_accounts = AccountPolicy::Scope
                               .new(@managed_user, Account).resolve
-      (manager_accounts & managed_user_accounts).any?
+      manager_accounts.intersect?(managed_user_accounts)
     end
 
     def redirect_to_user?

data/app/state_machines/pageflow/image_and_text_track_processing_state_machine.rb

@@ -1,4 +1,5 @@
 module Pageflow
+  # @api private
   module ImageAndTextTrackProcessingStateMachine
     extend ActiveSupport::Concern
 
@@ -17,8 +18,8 @@ module Pageflow
 
         job ProcessImageOrTextTrackJob do
           on_enter 'processing'
-          result :ok => 'processed'
-          result :error => 'processing_failed'
+          result ok: 'processed'
+          result error: 'processing_failed'
         end
       end
     end

data/app/state_machines/pageflow/media_encoding_state_machine.rb

@@ -1,4 +1,5 @@
 module Pageflow
+  # @api private
   module MediaEncodingStateMachine
     extend ActiveSupport::Concern
 
@@ -55,11 +56,11 @@ module Pageflow
         end
 
         after_transition 'waiting_for_confirmation' => 'waiting_for_encoding' do |file|
-          Pageflow.config.hooks.invoke(:file_encoding_confirmed, file: file)
+          Pageflow.config.hooks.invoke(:file_encoding_confirmed, file:)
         end
 
         after_transition any => 'waiting_for_encoding' do |file|
-          Pageflow.config.hooks.invoke(:file_encoding, file: file)
+          Pageflow.config.hooks.invoke(:file_encoding, file:)
         end
 
         job SubmitFileToZencoderJob do
@@ -76,11 +77,11 @@ module Pageflow
         end
 
         after_transition any => 'encoded' do |file|
-          Pageflow.config.hooks.invoke(:file_encoded, file: file)
+          Pageflow.config.hooks.invoke(:file_encoded, file:)
         end
 
         after_transition any => 'encoding_failed' do |file|
-          Pageflow.config.hooks.invoke(:file_encoding_failed, file: file)
+          Pageflow.config.hooks.invoke(:file_encoding_failed, file:)
         end
       end
     end

data/app/views/admin/accounts/_entry_template_details.html.arb

@@ -7,13 +7,13 @@ extensible_attributes_table_for(entry_template,
     entry_template.theme_name
   end
   row :default_locale, class: 'default_locale' do
-    t('pageflow.public._language', locale: entry_template.default_locale)
+    public_locale_name_for(entry_template.default_locale)
   end
   row :default_author, class: 'default_author'
   row :default_publisher, class: 'default_publisher'
   row :default_keywords, class: 'default_keywords'
   row :default_share_providers, class: 'default_share_providers' do
     entry_template.default_share_providers
-           .select { |_k, v| v == true }.keys.map(&:camelize).join(', ')
+                  .select { |_k, v| v == true }.keys.map(&:camelize).join(', ')
   end
 end

data/app/views/admin/entries/_attributes_table.html.arb

@@ -1,7 +1,7 @@
 extensible_attributes_table_for(entry,
                                 Pageflow.config_for(entry)
                                   .admin_attributes_table_rows.for(:entry)) do
-  row :title, :class => 'title'
+  row :title, class: 'title'
   if authorized?(:see_own_role_on, :entries)
     row :own_role do
       own_role = Pageflow::Roles.high(current_user, entry)
@@ -9,7 +9,7 @@ extensible_attributes_table_for(entry,
     end
   end
   if authorized?(:see, :accounts)
-    row :account, :class => 'account' do
+    row :account, class: 'account' do
       if authorized?(:read, entry.account)
         link_to(entry.account.name,
                 admin_account_path(entry.account),
@@ -26,11 +26,12 @@ extensible_attributes_table_for(entry,
   end
   row :created_at
   row :edited_at
-  row :published?, :class => 'published' do
-    span :'data-published' => entry.published? do
+  row :published?, class: 'published' do
+    span 'data-published': entry.published? do
       if entry.published?
         if entry.published_until
-          I18n.t('pageflow.admin.entries.published_until', :published_until => I18n.l(entry.published_until))
+          I18n.t('pageflow.admin.entries.published_until',
+                 published_until: I18n.l(entry.published_until))
         else
           I18n.t('pageflow.admin.entries.published_forever')
         end

data/app/views/admin/entries/_form.html.erb

@@ -1,4 +1,5 @@
-<%= admin_form_for([:admin, resource]) do |f| %>
+<%= admin_form_for([:admin, resource],
+                   data: {root_permalink: @entry.persisted? && @entry&.permalink&.slug == ''}) do |f| %>
   <%= f.inputs do %>
     <%= f.input(:title,
                 hint: @entry.site.permalink_directories.blank? &&

data/app/views/admin/entries/_permalink_inputs.html.erb

@@ -1,5 +1,12 @@
 <%= form.input(:permalink,
                as: :pageflow_permalink,
-               base_url: pretty_site_url(entry.site),
+               base_url: entry.site.canonical_entry_url_prefix.presence ||
+                         pretty_site_url(entry.site),
                site: entry.site,
-               slug_placeholder: entry.default_permalink_slug) %>
+               only_root: entry.permalink&.allow_root_path,
+               slug_placeholder: entry.default_permalink_slug,
+               hint: entry.new_record? ? nil : t('pageflow.admin.entries.permalink_hint'))%>
+
+<% if entry.permalink&.allow_root_path %>
+  <%= hidden_field_tag(:at, 'root') %>
+<% end %>

data/app/views/admin/entry_templates/_form.html.erb

@@ -9,9 +9,7 @@
       <%= f.input :default_locale,
                         as: :select,
                         include_blank: false,
-                        collection: Pageflow.config.available_public_locales.map{ |locale|
-                          [t('pageflow.public._language', locale: locale), locale.to_s]
-                        },
+                        collection: available_public_locales_collection,
                         hint: t('pageflow.admin.sites.default_locale_hint') %>
       <%= f.input :default_author,
         hint: t('pageflow.admin.sites.default_author_hint'),

data/app/views/admin/site_root_entry/choose.html.erb

@@ -0,0 +1,19 @@
+<%= admin_form_for(@site_root_entry_form,
+                   url: admin_site_root_entry_choose_path(site_id: @site)) do |f| %>
+  <%= t('pageflow.admin.site_root_entry.intro_html', site_host: @site.host) %>
+
+  <%= f.semantic_errors :entry %>
+
+  <%= f.inputs do %>
+    <%= f.input(:entry_id,
+                as: :searchable_select,
+                ajax: {
+                  resource: Pageflow::Entry,
+                  params: {site_id: @site.id}
+                },
+                hint: t('pageflow.admin.site_root_entry.hint')) %>
+  <% end %>
+  <%= f.actions do %>
+    <%= f.action(:submit, label: t('pageflow.admin.site_root_entry.submit')) %>
+  <% end %>
+<% end %>

data/app/views/admin/sites/_fields.html.erb

@@ -2,7 +2,8 @@
   <%= f.input :title, hint: t('pageflow.admin.sites.title_hint') %>
   <%= f.input :cname, hint: t('pageflow.admin.sites.cname_hint') %>
   <%= f.input :additional_cnames, hint: t('pageflow.admin.sites.additional_cnames_hint') %>
-  <%= f.input :home_url, hint: t('pageflow.admin.sites.home_url_hint') %>
+
+  <%= f.input(:home_url, hint: site_home_url_hint(@site)) %>
 <% end %>
 
 <%= f.inputs do %>
@@ -12,11 +13,23 @@
   <%= f.input :copyright_link_url %>
   <%= f.input :privacy_link_url %>
 
+  <% if cutoff_modes_collection(account_config).present? %>
+    <%= f.input(:cutoff_mode_name,
+                collection: cutoff_modes_collection(account_config),
+                include_blank: t('pageflow.cutoff_modes.none')) %>
+  <% end %>
+
   <%= f.input :feeds_enabled, hint: t('pageflow.admin.sites.feeds_hint',
                                       site_host: @site&.persisted? ? @site.host : '<host>') %>
   <%= f.input :sitemap_enabled, hint: t('pageflow.admin.sites.sitemap_hint',
                                         site_host: @site&.persisted? ? @site.host : '<host>') %>
 
+  <%= f.input :custom_404_entry_id,
+              as: :select,
+              collection: @site&.persisted? ? @site.entries.published_without_password_protection.pluck(:title, :id) : [],
+              include_blank: t('pageflow.admin.sites.custom_404_entry.none'),
+              hint: t('pageflow.admin.sites.custom_404_entry.hint') %>
+
   <% account_config.admin_form_inputs.find_all_for(:site).each do |form_input| %>
     <%= form_input.build(f) %>
   <% end %>

data/app/views/admin/translations/_form.html.erb

@@ -0,0 +1,31 @@
+<%= admin_form_for resource, url: admin_entry_translations_path(parent) do |f| %>
+  <%= f.inputs do %>
+    <li class="side_hint">
+      <p>
+        <%= t('pageflow.admin.entry_translations.new_hint_html') %>
+      </p>
+    </li>
+    <%= f.input(:entry_id,
+                as: :searchable_select,
+                collection: [[parent.title, parent.id]],
+                label: t('pageflow.admin.entry_translations.entry_id'),
+                selected: parent.id,
+                input_html: {
+                  value: parent.id,
+                  disabled: true
+    }) %>
+    <%= f.input(:id,
+                as: :searchable_select,
+                label: t('pageflow.admin.entry_translations.id'),
+                ajax: {
+                  resource: 'Translations',
+                  collection_name: :potential_entry_translations,
+                  path_params: {entry_id: parent.id}
+                },
+                include_blank: false) %>
+  <% end %>
+  <%= f.actions do %>
+    <%= f.action(:submit, label: t('pageflow.admin.entry_translations.create_model')) %>
+    <%= f.action(:cancel, :wrapper_html => {:class => 'cancel'}) %>
+  <% end %>
+<% end %>

data/app/views/admin/users/_attributes_table.html.arb

@@ -0,0 +1,13 @@
+extensible_attributes_table_for(user, Pageflow.config.admin_attributes_table_rows.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
+  boolean_status_tag_row(:admin?, 'admin warning') if authorized?(:see_admin_status, user)
+end

data/app/views/components/pageflow/admin/add_membership_button.rb

@@ -1,5 +1,6 @@
 module Pageflow
   module Admin
+    # @api private
     class AddMembershipButton < ViewComponent
       builder_method :add_membership_button
 
@@ -9,7 +10,7 @@ module Pageflow
           path = new_admin_user_membership_path(
             parent, entity_type: to_class_name(entity_type)
           )
-          data_tooltip = I18n.t("pageflow.admin.#{entity_type}."\
+          data_tooltip = I18n.t("pageflow.admin.#{entity_type}." \
                                 'none_addable_tooltip')
           rel = "add_#{entity_type}_membership"
         elsif parent.is_a?(Entry)
@@ -30,26 +31,26 @@ module Pageflow
         end
 
         if parent.is_a?(Entry) && parent.account.users.length < 2
-          render 'pageflow/admin/entries/cannot_add_user',
-                 user: user,
-                 parent: parent,
-                 entity_type: entity_type,
-                 quota: quota
+          render('pageflow/admin/entries/cannot_add_user',
+                 user:,
+                 parent:,
+                 entity_type:,
+                 quota:)
         elsif membership_possible_for(user, parent, entity_type)
           para do
-            link_to(button_label, path, class: 'button', data: {rel: rel})
+            link_to(button_label, path, class: 'button', data: {rel:})
           end
         else
           para(content_tag('a',
                            button_label,
                            class: 'button disabled',
-                           data: {rel: rel}),
+                           data: {rel:}),
                'data-tooltip' => data_tooltip)
           render 'pageflow/admin/users/cannot_add',
-                 user: user,
-                 parent: parent,
-                 entity_type: entity_type,
-                 quota: quota
+                 user:,
+                 parent:,
+                 entity_type:,
+                 quota:
         end
       end
 

data/app/views/components/pageflow/admin/custom_scopes_renderer.rb

@@ -1,5 +1,6 @@
 module Pageflow
   module Admin
+    # @api private
     class CustomScopesRenderer < ActiveAdmin::Views::Scopes
       builder_method :custom_scopes_renderer
 

data/app/views/components/pageflow/admin/embed_code_field.rb

@@ -1,5 +1,6 @@
 module Pageflow
   module Admin
+    # @api private
     class EmbedCodeField < Pageflow::ViewComponent
       builder_method :embed_code_field
 

data/app/views/components/pageflow/admin/embedded_index_table.rb

@@ -1,5 +1,6 @@
 module Pageflow
   module Admin
+    # @api private
     class EmbeddedIndexTable < ViewComponent
       builder_method :embedded_index_table
 
@@ -22,15 +23,13 @@ module Pageflow
         scopes << ActiveAdmin::Scope.new(title, method, options)
       end
 
-      def table_for_collection(options = {}, &block)
-        if scopes.any?
-          custom_scopes_renderer(scopes, default_scope: scopes.first.id)
-        end
+      def table_for_collection(options = {}, &)
+        custom_scopes_renderer(scopes, default_scope: scopes.first.id) if scopes.any?
 
-        record_sort_columns(&block) if options[:sortable]
+        record_sort_columns(&) if options[:sortable]
 
         if scoped_collection.any?
-          build_table(options, &block)
+          build_table(options, &)
         else
           build_blank_slate
         end
@@ -92,12 +91,13 @@ module Pageflow
           @sort_columns.include?(params[:order].gsub('_asc', '').gsub('_desc', ''))
       end
 
-      def record_sort_columns(&block)
+      def record_sort_columns(&)
         recorder = SortColumnRecorder.new
-        recorder.instance_eval(&block)
+        recorder.instance_eval(&)
         @sort_columns = recorder.columns
       end
 
+      # @api private
       class SortColumnRecorder
         attr_reader :columns
 
@@ -113,8 +113,7 @@ module Pageflow
           end
         end
 
-        def row_attributes
-        end
+        def row_attributes; end
       end
     end
   end

data/app/views/components/pageflow/admin/entries_tab.rb

@@ -1,5 +1,6 @@
 module Pageflow
   module Admin
+    # @api private
     class EntriesTab < ViewComponent
       def build(account)
         embedded_index_table(account.entries,

data/app/views/components/pageflow/admin/entry_publication_state_indicator.rb

@@ -1,20 +1,21 @@
 module Pageflow
   module Admin
+    # @api private
     class EntryPublicationStateIndicator < ViewComponent
       builder_method :entry_publication_state_indicator
 
       def build(entry)
-        if entry.published?
-          span(class: css_class(entry)) do
-            span(tooltip_text(entry), class: 'tooltip_bubble')
-          end
+        return unless entry.published?
+
+        span(class: css_class(entry)) do
+          span(tooltip_text(entry), class: 'tooltip_bubble')
         end
       end
 
       private
 
       def css_class(entry)
-        ['publication_state_indicator', entry.publication_state] * ' '
+        ['publication_state_indicator', entry.publication_state].join(' ')
       end
 
       def tooltip_text(entry)

data/app/views/components/pageflow/admin/entry_templates_tab.rb

@@ -1,5 +1,6 @@
 module Pageflow
   module Admin
+    # @api private
     class EntryTemplatesTab < ViewComponent
       def build(site)
         table_subjects = site.existing_and_potential_entry_templates
@@ -7,7 +8,7 @@ module Pageflow
         table_for(table_subjects, i18n: Pageflow::EntryTemplate) do
           column do |entry_template|
             if entry_template.id
-              render 'admin/accounts/entry_template_details', entry_template: entry_template
+              render('admin/accounts/entry_template_details', entry_template:)
             else
               h5(entry_template.translated_entry_type_name)
             end