pageflow 17.0.5 → 17.1.0

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

@@ -0,0 +1,102 @@
+module Pageflow
+  module Admin
+    # @api private
+    class EntryTranslationsTab < ViewComponent
+      def build(entry)
+        default_translation_hint(entry)
+
+        embedded_index_table(
+          entry.translations.preload(:draft, :published_revision, :translation_group),
+          blank_slate_text: I18n.t('pageflow.admin.entry_translations.no_translations')
+        ) do
+          table_for_collection i18n: Entry do
+            column class: 'publication_state' do |translated_entry|
+              entry_publication_state_indicator(translated_entry)
+            end
+            column :title do |translated_entry|
+              entry_link_or_title(entry, translated_entry)
+            end
+            column :locale do |translated_entry|
+              entry_translation_display_locale(translated_entry)
+            end
+            column do |translated_entry|
+              mark_as_default_link(entry, translated_entry)
+            end
+            column do |translated_entry|
+              remove_link(entry, translated_entry)
+            end
+          end
+        end
+
+        add_link(entry)
+        generate_link(entry)
+      end
+
+      private
+
+      def default_translation_hint(entry)
+        return if entry.translations.none?
+
+        div class: 'side_hint' do
+          para text_node I18n.t('pageflow.admin.entry_translations.default_translation_hint')
+        end
+      end
+
+      def entry_link_or_title(entry, translated_entry)
+        if authorized?(:read, translated_entry) && translated_entry != entry
+          link_to(translated_entry.title,
+                  admin_entry_path(translated_entry, tab: 'translations'))
+        else
+          translated_entry.title
+        end
+      end
+
+      def mark_as_default_link(entry, translated_entry)
+        return unless authorized?(:manage_translations, entry)
+        return if translated_entry.default_translation?
+
+        link_to(
+          I18n.t('pageflow.admin.entry_translations.mark_as_default'),
+          default_admin_entry_translation_path(entry, translated_entry),
+          method: :put,
+          data: {
+            confirm: I18n.t('pageflow.admin.entry_translations.mark_as_default_confirmation')
+          }
+        )
+      end
+
+      def remove_link(entry, translated_entry)
+        return unless authorized?(:manage_translations, entry)
+
+        link_to(
+          I18n.t('pageflow.admin.entry_translations.remove'),
+          admin_entry_translation_path(entry, translated_entry),
+          method: :delete,
+          data: {
+            confirm: I18n.t('pageflow.admin.entry_translations.remove_confirmation')
+          }
+        )
+      end
+
+      def add_link(entry)
+        return unless authorized?(:manage_translations, entry)
+
+        text_node(link_to(t('pageflow.admin.entry_translations.add'),
+                          new_admin_entry_translation_path(entry),
+                          class: 'button'))
+      end
+
+      def generate_link(entry)
+        return unless authorized?(:manage_translations, entry)
+
+        entry_translator_url = Pageflow.config_for(entry).entry_translator_url
+        return if entry_translator_url.blank?
+
+        text_node(link_to(t('pageflow.admin.entry_translations.generate'),
+                          entry_translator_url.call(entry),
+                          class: 'button',
+                          style: 'margin-left: 8px'))
+      end
+    end
+  end
+end

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

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

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

@@ -1,6 +1,7 @@
 module Pageflow
   module Admin
     class ExtensibleAttributesTable < ActiveAdmin::Views::AttributesTable
+      # @api private
       module BuilderMethods
         def extensible_attributes_table_for(model, additional_rows, &block)
           attributes_table_for(model) do
@@ -11,6 +12,7 @@ module Pageflow
         end
       end
 
+      # @api private
       class RowInserter
         def initialize(context, additional_rows)
           @context = context
@@ -18,9 +20,9 @@ module Pageflow
           @rendered_rows = []
         end
 
-        def row(name, options = {}, &block)
+        def row(name, options = {}, &)
           render_additional_rows(rows_at(:before, name))
-          context.row(name, options, &block)
+          context.row(name, options, &)
           render_additional_rows(rows_at(:after, name))
         end
 
@@ -55,14 +57,15 @@ module Pageflow
         end
       end
 
+      # @api private
       class RowDelegator
         def initialize(context, row_handler)
           @context = context
           @row_handler = row_handler
         end
 
-        def row(name, options = {}, &block)
-          @row_handler.row(name, options, &block)
+        def row(name, options = {}, &)
+          @row_handler.row(name, options, &)
         end
 
         private
@@ -71,17 +74,15 @@ module Pageflow
           @context.respond_to?(name)
         end
 
-        # rubocop:disable Style/MethodMissing
         # Normally we would delegate to super if context does not
         # respond_to? method. But Arbre appears to report not to
         # repond to helpers like authorized? even if it does.
         #
         # This is also the reason we can not use SimpleDelegator here
         # and also delegate_missing in Rails 5 would not work.
-        def method_missing(method, *args, **kwargs, &block)
-          @context.public_send(method, *args, **kwargs, &block)
+        def method_missing(method, ...)
+          @context.public_send(method, ...)
         end
-        # rubocop:enable Style/MethodMissing
       end
     end
   end

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

@@ -1,5 +1,6 @@
 module Pageflow
   module Admin
+    # @api private
     class FeaturesTab < ViewComponent
       def build(resource)
         feature_target = resource.is_a?(Site) ? resource.account : resource

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

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

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

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

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

@@ -1,5 +1,6 @@
 module Pageflow
   module Admin
+    # @api private
     class MembersTab < ViewComponent
       def build(entry)
         embedded_index_table(entry.memberships.includes(:user).references(:users),
@@ -50,9 +51,9 @@ module Pageflow
           para text_node I18n.t('pageflow.admin.resource_tabs.account_editor_hint')
         end
 
-        if authorized?(:add_member_to, entry)
-          add_membership_button(current_user, entry, 'entry')
-        end
+        return unless authorized?(:add_member_to, entry)
+
+        add_membership_button(current_user, entry, 'entry')
       end
     end
   end

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

@@ -1,13 +1,14 @@
 module Pageflow
   module Admin
+    # @api private
     class MembershipRoleWithTooltip < ViewComponent
       builder_method :membership_role_with_tooltip
 
       def build(role, options = {})
         span t(role, scope: 'activerecord.values.pageflow/membership.role'),
-        class: "membership_role #{role} tooltip_clue" do
+             class: "membership_role #{role} tooltip_clue" do
           div t(role, scope: tooltip_scope(options)),
-          class: 'tooltip_bubble'
+              class: 'tooltip_bubble'
         end
       end
 

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

@@ -1,15 +1,17 @@
 module Pageflow
   module Admin
+    # @api private
     class RevisionsTab < ViewComponent
       def build(entry)
-        embedded_index_table entry.revisions, :blank_slate_text => I18n.t('pageflow.admin.entries.no_revisions') do
+        embedded_index_table entry.revisions,
+                             blank_slate_text: I18n.t('pageflow.admin.entries.no_revisions') do
           scope(:publications)
           scope(:publications_and_user_snapshots)
           scope(:frozen)
 
-          table_for_collection :class => 'revisions', :i18n => Pageflow::Revision do
+          table_for_collection class: 'revisions', i18n: Pageflow::Revision do
             row_attributes do |revision|
-              {:class => revision_css_class(revision)}
+              {class: revision_css_class(revision)}
             end
 
             column :frozen_at
@@ -56,7 +58,8 @@ module Pageflow
               end
             end
             column do |revision|
-              text_node(link_to(t('pageflow.admin.entries.show'), pageflow.revision_path(revision), :class => 'show'))
+              text_node(link_to(t('pageflow.admin.entries.show'), pageflow.revision_path(revision),
+                                class: 'show'))
               if authorized?(:restore, entry)
                 text_node(link_to(t('pageflow.admin.entries.restore'),
                                   restore_admin_revision_path(revision, params.permit(:tab)),
@@ -72,13 +75,14 @@ module Pageflow
           end
         end
 
-        para(I18n.t('pageflow.admin.entries.published_revision_legend'), :class => 'legend published')
+        para(I18n.t('pageflow.admin.entries.published_revision_legend'),
+             class: 'legend published')
 
-        if authorized?(:snapshot, entry)
-          text_node(button_to(t('pageflow.admin.entries.snapshot'),
-                              snapshot_admin_entry_path(entry, params.permit(:tab)),
-                              method: :post))
-        end
+        return unless authorized?(:snapshot, entry)
+
+        text_node(button_to(t('pageflow.admin.entries.snapshot'),
+                            snapshot_admin_entry_path(entry, params.permit(:tab)),
+                            method: :post))
       end
     end
   end

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

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

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

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

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

@@ -1,14 +1,15 @@
 module Pageflow
   module Admin
+    # @api private
     class Timestamp < ViewComponent
       builder_method :timestamp
 
       def build(time)
-        if time
-          span class: 'tooltip_clue' do
-            text_node(l(time, format: time.today? ? :time_today : :date))
-            span(l(time, format: :long), class: 'tooltip_bubble')
-          end
+        return unless time
+
+        span class: 'tooltip_clue' do
+          text_node(l(time, format: time.today? ? :time_today : :date))
+          span(l(time, format: :long), class: 'tooltip_bubble')
         end
       end
 

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

@@ -1,14 +1,13 @@
 module Pageflow
   module Admin
+    # @api private
     class UserAccountBadgeList < ViewComponent
       builder_method :user_account_badge_list
 
       def build(user)
         ul class: 'badge_list' do
           user.account_memberships.each do |membership|
-            if authorized?(:see_badge_belonging_to, membership.entity)
-              build_badge(membership)
-            end
+            build_badge(membership) if authorized?(:see_badge_belonging_to, membership.entity)
           end
 
           build_admin_badge if user.admin?

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

@@ -1,5 +1,6 @@
 module Pageflow
   module Admin
+    # @api private
     class UserAccountsTab < ViewComponent
       def build(user)
         embedded_index_table(user.memberships.on_accounts

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

@@ -1,5 +1,6 @@
 module Pageflow
   module Admin
+    # @api private
     class UserEntriesTab < ViewComponent
       def build(user)
         embedded_index_table(user.memberships.on_entries

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

@@ -1,5 +1,6 @@
 module Pageflow
   module Admin
+    # @api private
     class UsersTab < ViewComponent
       def build(account)
         embedded_index_table(account.memberships.on_accounts.includes(:user)

data/app/views/pageflow/editor/config/_seeds.json.jbuilder

@@ -20,7 +20,7 @@ end
 
 json.file_importers Pageflow.config_for(entry).file_importers do |file_importer|
   json.importer_name file_importer.name
-  json.logo_source file_importer.logo_source
+  json.logo_source asset_url(file_importer.logo_source)
   json.authentication_provider file_importer.authentication_provider
   json.authentication_required file_importer.authentication_required current_user
 end

data/app/views/pageflow/editor/entries/index.json.jbuilder

@@ -1 +1 @@
-json.array!(@entries, :partial => 'other_entry', :as => :other_entry)
+json.array!(@entries, partial: 'other_entry', as: :other_entry)

data/app/views/pageflow/editor/entries/show.json.jbuilder

@@ -3,7 +3,7 @@ Pageflow.config.file_types.each do |file_type|
     json.cache!(file) do
       json.partial!(object: file,
                     partial: 'pageflow/editor/files/file',
-                    locals: {file_type: file_type},
+                    locals: {file_type:},
                     as: :file)
     end
   end

data/app/views/pageflow/editor/entry_publications/check.json.jbuilder

@@ -13,5 +13,5 @@ json.exhausted_html(render_html_partial('pageflow/editor/quotas/published_entrie
                                         quota: @entry_publication.quota,
                                         account: @entry_publication.quota.account))
 json.published_message_html(render_html_partial('published_message',
-                                                 entry: @entry_publication.entry,
-                                                 account: @entry_publication.quota.account))
+                                                entry: @entry_publication.entry,
+                                                account: @entry_publication.quota.account))

data/app/views/pageflow/editor/files/_file.json.jbuilder

@@ -1,30 +1,22 @@
 json.partial!(partial: 'pageflow/files/file',
               object: file,
-              locals: {file_type: file_type})
+              locals: {file_type:})
 
 json.call(file,
           :state,
           :rights,
           :usage_id)
 
-if file.can_upload?
-  json.direct_upload_config(file.direct_upload_config)
-end
+json.direct_upload_config(file.direct_upload_config) if file.can_upload?
 
 json.retryable(file.retryable?)
 json.file_name(file.file_name)
 
-if file.url.present?
-  json.url(file.url)
-end
+json.url(file.url) if file.url.present?
 
-if file.original_url.present?
-  json.original_url(file.original_url)
-end
+json.original_url(file.original_url) if file.original_url.present?
 
-if file_type.editor_partial.present?
-  json.partial!(object: file, partial: file_type.editor_partial)
-end
+json.partial!(object: file, partial: file_type.editor_partial) if file_type.editor_partial.present?
 
 if file.respond_to?(:thumbnail_url)
   json.thumbnail_url(asset_path(file.thumbnail_url(:thumbnail)))

data/app/views/pageflow/editor/files/create.json.jbuilder

@@ -1 +1 @@
-json.partial!(partial: 'pageflow/editor/files/file', object: @file, locals: {file_type: file_type})
+json.partial!(partial: 'pageflow/editor/files/file', object: @file, locals: {file_type:})

data/app/views/pageflow/editor/files/index.json.jbuilder

@@ -1,4 +1,4 @@
 json.partial!(collection: @files,
               partial: 'pageflow/editor/files/file',
-              locals: {file_type: file_type},
+              locals: {file_type:},
               as: :file)

data/app/views/pageflow/editor/sites/_site.json.jbuilder

@@ -1 +1,2 @@
+json.(site, :cutoff_mode_name)
 json.pretty_url pretty_site_url(site)

data/app/views/pageflow/editor/video_files/_video_file.json.jbuilder

@@ -12,6 +12,4 @@ if video_file.state == 'encoded'
   end
 end
 
-if video_file.poster.present?
-  json.poster_url(video_file.poster.url(:large))
-end
+json.poster_url(video_file.poster.url(:large)) if video_file.poster.present?

data/app/views/pageflow/entries/share_menu/_bluesky_link.html.erb

@@ -0,0 +1,8 @@
+<%= social_share_link(:bluesky, entry) do %>
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
+    <path d="M111.8 62.2C170.2 105.9 233 194.7 256 242.4c23-47.6 85.8-136.4 144.2-180.2c42.1-31.6 110.3-56 110.3 21.8c0 15.5-8.9 130.5-14.1 149.2C478.2 298 412 314.6 353.1 304.5c102.9 17.5 129.1 75.5 72.5 133.5c-107.4 110.2-154.3-27.6-166.3-62.9l0 0c-1.7-4.9-2.6-7.8-3.3-7.8s-1.6 3-3.3 7.8l0 0c-12 35.3-59 173.1-166.3 62.9c-56.5-58-30.4-116 72.5-133.5C100 314.6 33.8 298 15.7 233.1C10.4 214.4 1.5 99.4 1.5 83.9c0-77.8 68.2-53.4 110.3-21.8z"/>
+  </svg>
+
+  <span class="hint"><%= t('pageflow.public.share_on_bluesky') %></span>
+  <p>Bluesky</p>
+<% end %>

data/app/views/pageflow/entries/share_menu/_threads_link.html.erb

@@ -0,0 +1,8 @@
+<%= social_share_link(:threads, entry) do %>
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512">
+    <path d="M331.5 235.7c2.2 .9 4.2 1.9 6.3 2.8c29.2 14.1 50.6 35.2 61.8 61.4c15.7 36.5 17.2 95.8-30.3 143.2c-36.2 36.2-80.3 52.5-142.6 53h-.3c-70.2-.5-124.1-24.1-160.4-70.2c-32.3-41-48.9-98.1-49.5-169.6V256v-.2C17 184.3 33.6 127.2 65.9 86.2C102.2 40.1 156.2 16.5 226.4 16h.3c70.3 .5 124.9 24 162.3 69.9c18.4 22.7 32 50 40.6 81.7l-40.4 10.8c-7.1-25.8-17.8-47.8-32.2-65.4c-29.2-35.8-73-54.2-130.5-54.6c-57 .5-100.1 18.8-128.2 54.4C72.1 146.1 58.5 194.3 58 256c.5 61.7 14.1 109.9 40.3 143.3c28 35.6 71.2 53.9 128.2 54.4c51.4-.4 85.4-12.6 113.7-40.9c32.3-32.2 31.7-71.8 21.4-95.9c-6.1-14.2-17.1-26-31.9-34.9c-3.7 26.9-11.8 48.3-24.7 64.8c-17.1 21.8-41.4 33.6-72.7 35.3c-23.6 1.3-46.3-4.4-63.9-16c-20.8-13.8-33-34.8-34.3-59.3c-2.5-48.3 35.7-83 95.2-86.4c21.1-1.2 40.9-.3 59.2 2.8c-2.4-14.8-7.3-26.6-14.6-35.2c-10-11.7-25.6-17.7-46.2-17.8H227c-16.6 0-39 4.6-53.3 26.3l-34.4-23.6c19.2-29.1 50.3-45.1 87.8-45.1h.8c62.6 .4 99.9 39.5 103.7 107.7l-.2 .2zm-156 68.8c1.3 25.1 28.4 36.8 54.6 35.3c25.6-1.4 54.6-11.4 59.5-73.2c-13.2-2.9-27.8-4.4-43.4-4.4c-4.8 0-9.6 .1-14.4 .4c-42.9 2.4-57.2 23.2-56.2 41.8l-.1 .1z"/>
+  </svg>
+
+  <span class="hint"><%= t('pageflow.public.share_on_threads') %></span>
+  <p>Threads</p>
+<% end %>

data/app/views/pageflow/files/_file.json.jbuilder

@@ -8,8 +8,8 @@ json.call(file,
           :parent_file_id,
           :parent_file_model_type)
 
+json.display_name(file.display_name.presence || file.file_name)
+
 json.is_ready(file.ready?)
 
-if file_type.partial.present?
-  json.partial!(object: file, partial: file_type.partial)
-end
+json.partial!(object: file, partial: file_type.partial) if file_type.partial.present?

data/app/views/pageflow/sitemaps/index.xml.builder

@@ -1,9 +1,17 @@
 xml.instruct!
-xml.urlset xmlns: 'http://www.sitemaps.org/schemas/sitemap/0.9' do
+xml.urlset xmlns: 'http://www.sitemaps.org/schemas/sitemap/0.9',
+           'xmlns:xhtml': 'http://www.w3.org/1999/xhtml' do
   @entries.each do |entry|
     xml.url do
       xml.loc(social_share_entry_url(entry))
       xml.lastmod(entry.published_at.utc.xmlschema)
+
+      entry.translations.each do |translation|
+        xml.tag!('xhtml:link',
+                 rel: 'alternate',
+                 hreflang: translation.locale,
+                 href: social_share_entry_url(translation))
+      end
     end
   end
 end

data/app/views/pageflow/social_share/_entry_meta_tags.html.erb

@@ -5,7 +5,7 @@
 <%= tag :meta, property: "og:title", content: pretty_entry_title(entry) %>
 <%= tag :meta, property: "og:description", name: "description", content: social_share_entry_description(entry) %>
 <%= tag :meta, property: "og:url", content: social_share_entry_url(entry) %>
-<%= tag :meta, property: "og:site_name", content: entry.site.cname_domain %>
+<%= tag :meta, property: "og:site_name", content: entry.site.display_title %>
 <%= tag :meta, property: "og:type", content: "website" %>
 
 <%= tag :meta, name: "twitter:card", content: "summary_large_image" %>

data/app/views/pageflow/social_share/_page_meta_tags.html.erb

@@ -5,7 +5,7 @@
 <%= tag :meta, property: "og:title", content: social_share_page_title(page) %>
 <%= tag :meta, property: "og:description", name: "description", content: social_share_page_description(entry, page) %>
 <%= tag :meta, property: "og:url", content: social_share_page_url(entry, page) %>
-<%= tag :meta, property: "og:site_name", content: entry.site.cname_domain %>
+<%= tag :meta, property: "og:site_name", content: entry.site.display_title %>
 <%= tag :meta, property: "og:type", content: "website" %>
 
 <%= tag :meta, name: "twitter:card", content: "summary_large_image" %>

data/config/initializers/active_admin_patches.rb

@@ -1,10 +1,7 @@
 Rails.application.config.to_prepare do
-  ActiveAdmin::Views::AttributesTable.send(:include,
-                                           Pageflow::ActiveAdminPatches::Views::AttributesTable)
+  ActiveAdmin::Views::AttributesTable.include Pageflow::ActiveAdminPatches::Views::AttributesTable
 
-  ActiveAdmin::Views::TableFor.send(:include,
-                                    Pageflow::ActiveAdminPatches::Views::TableFor)
+  ActiveAdmin::Views::TableFor.include Pageflow::ActiveAdminPatches::Views::TableFor
 
-  ActiveAdmin::Views::Pages::Base.send(:include,
-                                       Pageflow::ActiveAdminPatches::Views::Pages::Base)
+  ActiveAdmin::Views::Pages::Base.include Pageflow::ActiveAdminPatches::Views::Pages::Base
 end

data/config/initializers/admin_resource_tabs.rb

@@ -5,6 +5,9 @@ Pageflow.configure do |config|
   config.admin_resource_tabs.register(:entry,
                                       name: :revisions,
                                       component: Pageflow::Admin::RevisionsTab)
+  config.admin_resource_tabs.register(:entry,
+                                      name: :translations,
+                                      component: Pageflow::Admin::EntryTranslationsTab)
 
   config.admin_resource_tabs.register(:user,
                                       name: :accounts,

data/config/initializers/paperclip.rb

@@ -14,6 +14,7 @@ end
 Paperclip.interpolates(:attachments_path_name) do |attachment, style|
   record = attachment.instance
   return record.attachments_path_name if record.respond_to?(:attachments_path_name)
+
   self.attachment(attachment, style)
 end
 

data/config/initializers/symmetric_encryption.rb

@@ -3,7 +3,7 @@ require 'symmetric_encryption/core'
 Pageflow.after_global_configure do |config|
   SymmetricEncryption.cipher = SymmetricEncryption::Cipher.new(
     key: config.encryption_options[:key],
-    iv:  config.encryption_options[:iv],
+    iv: config.encryption_options[:iv],
     cipher_name: 'aes-128-cbc'
   )
 end