pageflow 16.0.0 → 16.2.0

data/entry_types/paged/app/controllers/pageflow_paged/editor/entries_controller.rb

@@ -6,8 +6,6 @@ module PageflowPaged
 
       skip_before_action :verify_edit_lock, only: :partials
 
-      helper_method :render_to_string
-
       def partials
         I18n.locale = @entry.locale
         render action: 'partials', layout: false

data/entry_types/paged/app/controllers/pageflow_paged/entries_controller.rb

@@ -4,6 +4,7 @@ module PageflowPaged
     include Pageflow::EntriesControllerEnvHelper
     include WithoutControllerNamespacePartialPathPrefix
 
+    helper Pageflow::FeedsHelper
     helper Pageflow::MetaTagsHelper
     helper Pageflow::StructuredDataHelper
     helper Pageflow::PublicI18nHelper
@@ -16,7 +17,7 @@ module PageflowPaged
 
       @entry.share_target =
         if params[:page].present?
-          @entry.pages.find_by_perma_id(params[:page])
+          @entry.pages.find_by_perma_id(params[:page]) || @entry
         else
           @entry
         end

data/entry_types/paged/app/views/pageflow_paged/entries/show.html.erb

@@ -12,6 +12,7 @@
 
     <%= tag :link, :rel => 'icon', :href => image_path("pageflow/themes/#{@entry.theme.directory_name}/favicon.ico"), :type => 'image/ico' %>
     <%= meta_tags_for_entry(@entry) %>
+    <%= feed_link_tags_for_entry(@entry) %>
   <% end %>
 <% end %>
 

data/entry_types/paged/config/initializers/features.rb

@@ -2,7 +2,6 @@ Pageflow.configure do |config|
   config.for_entry_type(PageflowPaged.entry_type) do |entry_type_config|
     entry_type_config.features.register('highdef_background_images')
     entry_type_config.features.register('force_best_video_quality')
-    entry_type_config.features.register('force_fullhd_video_quality')
 
     entry_type_config.features.register('auto_change_page')
     entry_type_config.features.register('delayed_text_fade_in')

data/entry_types/paged/lib/pageflow_paged/engine.rb

@@ -1,9 +1,21 @@
+require 'pageflow/rails_version'
+
 module PageflowPaged
   # Rails integration
   class Engine < ::Rails::Engine
     isolate_namespace PageflowPaged
 
-    config.paths.add('lib', eager_load: true)
+    lib = root.join('lib')
+
+    config.autoload_paths << lib
+    config.eager_load_paths << lib
+
+    initializer 'pageflow_paged.autoloading' do
+      Rails.autoloaders.main.ignore(
+        lib.join('tasks')
+      )
+    end
+
     config.i18n.load_path += Dir[config.root.join('config', 'locales', '**', '*.yml').to_s]
 
     initializer 'pageflow_paged.assets.precompile' do |app|

data/entry_types/scrolled/app/controllers/pageflow_scrolled/editor/chapters_controller.rb

@@ -14,7 +14,7 @@ module PageflowScrolled
 
       def update
         chapter = Chapter.all_for_revision(@entry.draft).find(params[:id])
-        chapter.update_attributes(chapter_params)
+        chapter.update(chapter_params)
 
         head :no_content
       rescue ActiveRecord::RecordNotFound
@@ -35,7 +35,7 @@ module PageflowScrolled
         chapters = Chapter.all_for_revision(@entry.draft)
 
         params.require(:ids).each_with_index do |id, index|
-          chapters.update(id, storyline_id: storyline.id, position: index)
+          chapters.find(id).update(storyline_id: storyline.id, position: index)
         end
 
         head :no_content

data/entry_types/scrolled/app/controllers/pageflow_scrolled/editor/content_elements_controller.rb

@@ -27,7 +27,7 @@ module PageflowScrolled
 
       def update
         content_element = ContentElement.all_for_revision(@entry.draft).find(params[:id])
-        content_element.update_attributes(content_element_params)
+        content_element.update(content_element_params)
 
         head :no_content
       rescue ActiveRecord::RecordNotFound
@@ -48,9 +48,8 @@ module PageflowScrolled
         storyline = section.chapter.storyline
 
         params.require(:ids).each_with_index do |id, index|
-          storyline.content_elements.update(id,
-                                            section_id: section.id,
-                                            position: index)
+          storyline.content_elements.find(id).update(section_id: section.id,
+                                                     position: index)
         end
 
         head :no_content

data/entry_types/scrolled/app/controllers/pageflow_scrolled/editor/sections_controller.rb

@@ -6,16 +6,24 @@ module PageflowScrolled
 
       def create
         chapter = Chapter.all_for_revision(@entry.draft).find(params[:chapter_id])
-        section = chapter.sections.create(section_params)
+        section = chapter.create_section(section_params)
 
-        render partial: 'pageflow_scrolled/sections/section',
+        render partial: 'pageflow_scrolled/editor/sections/section_with_content_elements',
                locals: {section: section},
                status: :created
       end
 
+      def duplicate
+        section = Section.all_for_revision(@entry.draft).find(params[:id])
+
+        render partial: 'pageflow_scrolled/editor/sections/section_with_content_elements',
+               locals: {section: section.chapter.duplicate_section(section)},
+               status: :created
+      end
+
       def update
         section = Section.all_for_revision(@entry.draft).find(params[:id])
-        section.update_attributes(section_params)
+        section.update(section_params)
 
         head :no_content
       rescue ActiveRecord::RecordNotFound
@@ -36,9 +44,8 @@ module PageflowScrolled
         storyline = chapter.storyline
 
         params.require(:ids).each_with_index do |id, index|
-          storyline.sections.update(id,
-                                    chapter_id: chapter.id,
-                                    position: index)
+          storyline.sections.find(id).update(chapter_id: chapter.id,
+                                             position: index)
         end
 
         head :no_content

data/entry_types/scrolled/app/controllers/pageflow_scrolled/entries_controller.rb

@@ -4,17 +4,25 @@ module PageflowScrolled
     include Pageflow::EntriesControllerEnvHelper
 
     helper Pageflow::EntriesHelper
+    helper Pageflow::FeedsHelper
     helper Pageflow::WidgetsHelper
     helper Pageflow::SocialShareHelper
     helper Pageflow::MetaTagsHelper
     helper Pageflow::StructuredDataHelper
+    helper Pageflow::TextDirectionHelper
     helper FaviconHelper
 
     def show
-      @entry = get_published_entry_from_env
-      @widget_scope = get_entry_mode_from_env
+      entry = get_published_entry_from_env
 
-      I18n.locale = @entry.locale
+      I18n.locale = entry.locale
+
+      render(
+        locals: {
+          entry: entry,
+          widget_scope: get_entry_mode_from_env
+        }
+      )
     end
   end
 end

data/entry_types/scrolled/app/helpers/pageflow_scrolled/cache_helper.rb

@@ -0,0 +1,11 @@
+module PageflowScrolled
+  # @api private
+  module CacheHelper
+    def cache_scrolled_entry(entry:, widget_scope:, &block)
+      condition =
+        widget_scope == :published &&
+        entry.feature_state('scrolled_entry_fragment_caching')
+      cache_if(condition, [entry, :head_and_body, widget_scope], &block)
+    end
+  end
+end

data/entry_types/scrolled/app/helpers/pageflow_scrolled/editor/entry_json_seed_helper.rb

@@ -0,0 +1,42 @@
+module PageflowScrolled
+  module Editor
+    # Render editor seed data for scrolled entries.
+    #
+    # @api private
+    module EntryJsonSeedHelper
+      include PageflowScrolled::EntryJsonSeedHelper
+
+      def scrolled_entry_editor_json_seed(json, scrolled_entry)
+        json.key_format!(camelize: :lower)
+        entry_config = Pageflow.config_for(scrolled_entry)
+
+        scrolled_entry_editor_legacy_typography_variants_seed(json, entry_config)
+        scrolled_entry_editor_consent_vendor_host_matchers_seed(json, entry_config)
+
+        scrolled_entry_json_seed(json,
+                                 scrolled_entry,
+                                 skip_files: true,
+                                 skip_i18n: true,
+                                 include_unused_additional_seed_data: true)
+      end
+
+      private
+
+      def scrolled_entry_editor_legacy_typography_variants_seed(json, entry_config)
+        json.legacy_typography_variants(
+          entry_config
+            .legacy_typography_variants
+            .deep_transform_keys { |key| key.to_s.camelize(:lower) }
+        )
+      end
+
+      def scrolled_entry_editor_consent_vendor_host_matchers_seed(json, entry_config)
+        json.consent_vendor_host_matchers(
+          entry_config
+            .consent_vendor_host_matchers
+            .transform_keys { |regexp| regexp.inspect[1..-2] }
+        )
+      end
+    end
+  end
+end

data/entry_types/scrolled/app/helpers/pageflow_scrolled/editor/seed_html_helper.rb

@@ -6,6 +6,8 @@ module PageflowScrolled
       include ReactServerSideRenderingHelper
       include Pageflow::WidgetsHelper
       include Pageflow::StructuredDataHelper
+      include Pageflow::TextDirectionHelper
+      include PageflowScrolled::CacheHelper
       include FaviconHelper
       include PacksHelper
       include WebpackPublicPathHelper
@@ -13,11 +15,12 @@ module PageflowScrolled
       def scrolled_editor_iframe_seed_html_script_tag(entry)
         html = render(template: 'pageflow_scrolled/entries/show',
                       locals: {
-                        :@entry => entry,
-                        :@widget_scope => :editor,
-                        :@skip_ssr => true,
-                        :@skip_structured_data => true,
-                        :@seed_options => {
+                        entry: entry,
+                        widget_scope: :editor,
+                        skip_ssr: true,
+                        skip_structured_data: true,
+                        skip_feed_link_tags: true,
+                        seed_options: {
                           skip_collections: true,
                           include_unused_additional_seed_data: true,
                           translations: {include_inline_editing: true}

data/entry_types/scrolled/app/helpers/pageflow_scrolled/packs_helper.rb

@@ -2,40 +2,41 @@ module PageflowScrolled
   # @api private
   module PacksHelper
     def scrolled_frontend_javascript_packs_tag(entry, options)
-      javascript_packs_with_chunks_tag(
-        *scrolled_frontend_packs(entry, options)
+      javascript_pack_tag(
+        *scrolled_frontend_packs(entry, **options),
+        defer: false
       )
     end
 
     def scrolled_frontend_stylesheet_packs_tag(entry, options)
-      stylesheet_packs_with_chunks_tag(
-        *scrolled_frontend_packs(entry, options),
+      stylesheet_pack_tag(
+        *scrolled_frontend_packs(entry, **options),
         media: 'all'
       )
     end
 
     def scrolled_editor_javascript_packs_tag(entry)
-      javascript_packs_with_chunks_tag(
-        *scrolled_editor_packs(entry)
+      javascript_pack_tag(
+        *scrolled_editor_packs(entry),
+        defer: false
       )
     end
 
     def scrolled_frontend_packs(entry, widget_scope:)
-      widget_types = scrolled_frontend_pack_widget_types(entry, widget_scope)
-
       ['pageflow-scrolled-frontend'] +
-        scrolled_frontend_content_element_packs(entry, widget_scope) +
-        widget_types.map(&:pack)
+        scrolled_additional_frontend_packs(entry, widget_scope) +
+        scrolled_frontend_widget_type_packs(entry, widget_scope)
     end
 
     def scrolled_editor_packs(entry)
       ['pageflow-scrolled-editor'] +
-        Pageflow.config_for(entry).additional_editor_packs.paths
+        Pageflow.config_for(entry).additional_editor_packs.paths +
+        scrolled_frontend_widget_type_packs(entry, :editor)
     end
 
     private
 
-    def scrolled_frontend_content_element_packs(entry, widget_scope)
+    def scrolled_additional_frontend_packs(entry, widget_scope)
       additional_packs = Pageflow.config_for(entry).additional_frontend_packs
       return additional_packs.paths if widget_scope == :editor
 
@@ -47,6 +48,10 @@ module PageflowScrolled
       )
     end
 
+    def scrolled_frontend_widget_type_packs(entry, widget_scope)
+      scrolled_frontend_pack_widget_types(entry, widget_scope).map(&:pack)
+    end
+
     def scrolled_frontend_pack_widget_types(entry, widget_scope)
       if widget_scope == :editor
         ReactWidgetType.all_for(entry)

data/entry_types/scrolled/app/helpers/pageflow_scrolled/react_server_side_rendering_helper.rb

@@ -32,6 +32,9 @@ module PageflowScrolled
 
     # see https://github.com/reactjs/react-rails/issues/970#issuecomment-476338244
     class WebpackerSplitChunksManifestContainer < React::ServerRendering::WebpackerManifestContainer
+      CLIENT_EXEC =
+        %r{__webpack_exec__\("./node_modules/webpack-dev-server\/client\/index\.js[^"]*"\),}
+
       def find_asset(logical_path)
         asset_paths = manifest.lookup_pack_with_chunks(logical_path, type: :javascript)
 
@@ -46,7 +49,12 @@ module PageflowScrolled
                 asset_path.slice!("#{ds.protocol}://#{ds.host_with_port}")
                 dev_server_asset =
                   URI.open("#{ds.protocol}://#{ds.host_with_port}#{asset_path}").read
-                dev_server_asset.sub!(CLIENT_REQUIRE, '//\0')
+
+                # Remove webpack-dev-server client code that tries to
+                # interact with browser globals:
+                dev_server_asset.sub!(CLIENT_REQUIRE, '//\0') # for Webpack 4
+                dev_server_asset.sub!(CLIENT_EXEC, '/*\0*/')  # for Webpack 5
+
                 dev_server_asset
               end
             else

data/entry_types/scrolled/app/helpers/pageflow_scrolled/themes_helper.rb

@@ -8,7 +8,7 @@ module PageflowScrolled
                                   relative_url: false)
       path =
         theme.files.dig(theme_file_role, theme_file_style) ||
-        asset_pack_path("media/pageflow-scrolled/themes/#{theme.name}/#{path}")
+        asset_pack_path("static/pageflow-scrolled/themes/#{theme.name}/#{path}")
 
       if relative_url
         URI.parse(path).path

data/entry_types/scrolled/app/models/pageflow_scrolled/chapter.rb

@@ -16,6 +16,23 @@ module PageflowScrolled
     attr_accessor :revision # used on :create to lazily create storyline
     before_validation :ensure_storyline, on: :create
 
+    def create_section(attributes = {})
+      shift_section_positions(from: attributes[:position])
+
+      section = sections.create!(attributes)
+      section.content_elements.create!(type_name: 'textBlock')
+
+      section
+    end
+
+    def duplicate_section(section)
+      shift_section_positions(from: section.position + 1)
+
+      section.duplicate do |new_section|
+        new_section.position = section.position + 1
+      end
+    end
+
     def self.all_for_revision(revision)
       joins(storyline: :revision)
         .where(pageflow_scrolled_storylines: {revision_id: revision})
@@ -23,6 +40,12 @@ module PageflowScrolled
 
     private
 
+    def shift_section_positions(from:)
+      sections
+        .where('position >= ?', from)
+        .update_all('position = position + 1')
+    end
+
     def ensure_storyline
       return if storyline.present?
       unless Storyline.all_for_revision(revision).exists?

data/entry_types/scrolled/app/views/pageflow_scrolled/editor/entries/_head.html.erb

@@ -1,5 +1,5 @@
 <%= stylesheet_link_tag 'pageflow_paged/editor', media: 'all' %>
-<%= stylesheet_packs_with_chunks_tag 'pageflow-scrolled-frontend' %>
+<%= stylesheet_pack_tag 'pageflow-scrolled-frontend' %>
 
 <%= scrolled_theme_properties_style_tag(entry.theme) %>
 <%= scrolled_theme_stylesheet_pack_tags(entry.theme) %>

data/entry_types/scrolled/app/views/pageflow_scrolled/editor/entries/_seed.json.jbuilder

@@ -1,5 +1 @@
-scrolled_entry_json_seed(json,
-                         entry,
-                         skip_files: true,
-                         skip_i18n: true,
-                         include_unused_additional_seed_data: true)
+scrolled_entry_editor_json_seed(json, entry)

data/entry_types/scrolled/app/views/pageflow_scrolled/editor/sections/_section_with_content_elements.json.jbuilder

@@ -0,0 +1,10 @@
+json.key_format!(camelize: :lower)
+
+json.partial! 'pageflow_scrolled/sections/section', section: section
+
+json.content_elements do
+  json.array!(section.content_elements) do |content_element|
+    json.partial! 'pageflow_scrolled/content_elements/content_element',
+                  content_element: content_element
+  end
+end

data/entry_types/scrolled/app/views/pageflow_scrolled/entries/show.html.erb

@@ -1,58 +1,61 @@
-<!DOCTYPE html>
-<%= content_tag(:html, lang: @entry.locale) do %>
-  <head>
-    <title><%= pretty_entry_title(@entry) %></title>
+<%= cache_scrolled_entry(entry: entry, widget_scope: widget_scope) do %>
+  <!DOCTYPE html>
+  <%= content_tag(:html, lang: entry.locale, dir: text_direction(entry.locale)) do %>
+    <head>
+      <title><%= pretty_entry_title(entry) %></title>
 
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
+      <meta charset="utf-8" />
+      <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
 
 
-    <%= social_share_meta_tags_for(@entry) %>
-    <%= meta_tags_for_entry(@entry) %>
+      <%= social_share_meta_tags_for(entry) %>
+      <%= meta_tags_for_entry(entry) %>
+      <%= feed_link_tags_for_entry(entry) unless local_assigns[:skip_feed_link_tags] %>
 
-    <%= scrolled_favicons_for_entry(@entry, entry_mode: @widget_scope) %>
+      <%= scrolled_favicons_for_entry(entry, entry_mode: widget_scope) %>
 
-    <%= javascript_include_tag 'pageflow_scrolled/legacy' %>
-    <%= scrolled_frontend_stylesheet_packs_tag(@entry, widget_scope: @widget_scope) %>
+      <%= javascript_include_tag 'pageflow_scrolled/legacy' %>
+      <%= scrolled_frontend_stylesheet_packs_tag(entry, widget_scope: widget_scope) %>
 
-    <%= scrolled_theme_properties_style_tag(@entry.theme) %>
-    <%= scrolled_theme_stylesheet_pack_tags(@entry.theme) %>
+      <%= scrolled_theme_properties_style_tag(entry.theme) %>
+      <%= scrolled_theme_stylesheet_pack_tags(entry.theme) %>
 
-    <%= render_widget_head_fragments(@entry, scope: @widget_scope) %>
+      <%= render_widget_head_fragments(entry, scope: widget_scope) %>
 
-    <% if Rails.env.development? %>
-      <script>
-        try {
-          if (window.top !== window) {
-            window.__REACT_DEVTOOLS_GLOBAL_HOOK__ = window.top.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+      <% if Rails.env.development? %>
+        <script>
+          try {
+            if (window.top !== window) {
+              window.__REACT_DEVTOOLS_GLOBAL_HOOK__ = window.top.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+            }
+          } catch (e) {
+            console.warn('unable to connect to top frame for connecting dev tools');
           }
-        } catch (e) {
-          console.warn('unable to connect to top frame for connecting dev tools');
-        }
-      </script>
-    <% end %>
+        </script>
+      <% end %>
 
-    <% ssr_html = @skip_ssr ? '' : render_scrolled_entry(@entry) %>
+      <% ssr_html = local_assigns[:skip_ssr] ? '' : render_scrolled_entry(entry) %>
 
-    <% if !@skip_ssr && (params[:frontend] == 'v2' || @entry.feature_state('frontend_v2')) %>
-      <%= generated_media_queries_tags_for(ssr_html) %>
-    <% end %>
-  </head>
-  <body>
-    <%= structured_data_for_entry(@entry) unless @skip_structured_data %>
+      <% if !local_assigns[:skip_ssr] && (params[:frontend] == 'v2' || entry.feature_state('frontend_v2')) %>
+        <%= generated_media_queries_tags_for(ssr_html) %>
+      <% end %>
+    </head>
+    <body>
+      <%= structured_data_for_entry(entry) unless local_assigns[:skip_structured_data] %>
 
-    <%= render 'pageflow_scrolled/entries/global_notices' %>
+      <%= render 'pageflow_scrolled/entries/global_notices' %>
 
-    <div id="fullscreenRoot"></div>
-    <div id="root"><%= ssr_html %></div>
+      <div id="fullscreenRoot"></div>
+      <div id="root"><%= ssr_html %></div>
 
-    <div id='template-widget-container'>
-      <%= render_widgets(@entry, scope: @widget_scope, insert_point: :bottom_of_entry) %>
-    </div>
+      <div id='template-widget-container'>
+        <%= render_widgets(entry, scope: widget_scope, insert_point: :bottom_of_entry) %>
+      </div>
 
-    <%= scrolled_webpack_public_path_script_tag %>
-    <%= scrolled_frontend_javascript_packs_tag(@entry, widget_scope: @widget_scope) %>
+      <%= scrolled_webpack_public_path_script_tag %>
+      <%= scrolled_frontend_javascript_packs_tag(entry, widget_scope: widget_scope) %>
 
-    <%= scrolled_entry_json_seed_script_tag(@entry, @seed_options || {}) %>
-  </body>
+      <%= scrolled_entry_json_seed_script_tag(entry, local_assigns[:seed_options] || {}) %>
+    </body>
+  <% end %>
 <% end %>

data/entry_types/scrolled/app/views/pageflow_scrolled/entry_json_seed/_consent_vendors.json.jbuilder

@@ -0,0 +1,16 @@
+content_element_vendors =
+  entry_config.content_element_consent_vendors.by_content_element_id(entry)
+
+json.content_element_consent_vendors(content_element_vendors)
+
+I18n.with_locale(entry.locale) do
+  json.consent_vendors do
+    json.array!(content_element_vendors.values.uniq) do |name|
+      json.name name
+      json.display_name t("pageflow_scrolled.consent_vendors.#{name}.name")
+      json.description t("pageflow_scrolled.consent_vendors.#{name}.description")
+      json.opt_in_prompt t("pageflow_scrolled.consent_vendors.#{name}.opt_in_prompt")
+      json.paradigm 'lazy opt-in'
+    end
+  end
+end

data/entry_types/scrolled/app/views/pageflow_scrolled/entry_json_seed/_entry.json.jbuilder

@@ -39,6 +39,13 @@ json.config do
            self,
            include_unused: options[:include_unused_additional_seed_data])
   )
+
+  json.partial! 'pageflow_scrolled/entry_json_seed/consent_vendors',
+                entry: entry, entry_config: entry_config
+
+  json.file_licenses(
+    I18n.t('pageflow.file_licenses', default: {}).slice(*entry_config.available_file_licenses)
+  )
 end
 
 unless options[:skip_i18n]

data/entry_types/scrolled/config/initializers/features.rb

@@ -0,0 +1,5 @@
+Pageflow.configure do |config|
+  config.for_entry_type(PageflowScrolled.entry_type) do |entry_type_config|
+    entry_type_config.features.register('hls_instead_of_dash')
+  end
+end

data/entry_types/scrolled/config/locales/consent_widget.de.yml

@@ -0,0 +1,4 @@
+de:
+  pageflow:
+    consentBar:
+      widget_type_name: "Consent-Leiste"

data/entry_types/scrolled/config/locales/consent_widget.en.yml

@@ -0,0 +1,4 @@
+en:
+  pageflow:
+    consentBar:
+      widget_type_name: "Consent bar"