pageflow 16.0.0 → 16.2.0

data/entry_types/scrolled/lib/pageflow_scrolled/content_element_consent_vendors.rb

@@ -0,0 +1,38 @@
+module PageflowScrolled
+  # Register consent vendors based on content element configuration
+  # data.
+  class ContentElementConsentVendors
+    # @api private
+    def initialize
+      @callables = {}
+    end
+
+    # Register callable to determine consent vendor from configuration
+    # attributes for a content element type.
+    #
+    # @param callable [#call]
+    #   Receives configuration keyword argument and returns
+    # @param content_element_type_name [String]
+    def register(callable, content_element_type_name:)
+      @callables[content_element_type_name] = callable
+    end
+
+    # @api private
+    def by_content_element_id(entry)
+      content_elements_with_consent_vendor(entry).each_with_object({}) { |content_element, result|
+        next unless @callables[content_element.type_name]
+
+        result[content_element.id] = @callables[content_element.type_name].call(
+          entry: entry,
+          configuration: content_element.configuration
+        )
+      }.compact
+    end
+
+    private
+
+    def content_elements_with_consent_vendor(entry)
+      ContentElement.all_for_revision(entry.revision).where(type_name: @callables.keys)
+    end
+  end
+end

data/entry_types/scrolled/lib/pageflow_scrolled/engine.rb

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

data/entry_types/scrolled/lib/pageflow_scrolled/plugin.rb

@@ -10,25 +10,55 @@ module PageflowScrolled
         c.file_types.register(Pageflow::BuiltInFileType.image)
         c.file_types.register(Pageflow::BuiltInFileType.video)
         c.file_types.register(Pageflow::BuiltInFileType.audio)
+        c.file_types.register(Pageflow::BuiltInFileType.other)
 
         c.revision_components.register(Storyline)
 
         c.widget_types.register(ReactWidgetType.new(name: 'defaultNavigation',
                                                     role: 'header'),
                                 default: true)
+        c.widget_types.register(ReactWidgetType.new(name: 'consentBar',
+                                                    role: 'consent'),
+                                default: true)
+
+        c.widget_types.register(ReactWidgetType.new(name: 'iconInlineFileRights',
+                                                    role: 'inlineFileRights'),
+                                default: true)
+        c.widget_types.register(ReactWidgetType.new(name: 'textInlineFileRights',
+                                                    role: 'inlineFileRights'))
 
         c.features.register('datawrapper_chart_embed_opt_in')
         c.features.enable_by_default('datawrapper_chart_embed_opt_in')
         c.features.register('iframe_embed_content_element')
+        c.features.register('image_gallery_content_element')
         c.features.register('frontend_v2')
+        c.features.register('scrolled_entry_fragment_caching')
 
         c.additional_frontend_seed_data.register(
           'frontendVersion',
           FRONTEND_VERSION_SEED_DATA
         )
+
+        c.content_element_consent_vendors.register(
+          IFRAME_EMBED_CONSENT_VENDOR,
+          content_element_type_name: 'iframeEmbed'
+        )
       end
     end
 
+    IFRAME_EMBED_CONSENT_VENDOR = lambda do |configuration:, entry:, **|
+      return unless configuration['requireConsent']
+
+      uri = URI.parse(configuration['source'])
+      host_matchers = Pageflow.config_for(entry).consent_vendor_host_matchers
+
+      host_matchers.detect do |matcher, _|
+        uri.host =~ matcher
+      end&.last
+    rescue URI::InvalidURIError
+      nil
+    end
+
     FRONTEND_VERSION_SEED_DATA = lambda do |request:, entry:, **|
       if request.params[:frontend] == 'v2' || entry.feature_state('frontend_v2')
         2

data/entry_types/scrolled/lib/pageflow_scrolled/react_widget_type.rb

@@ -8,9 +8,10 @@ module PageflowScrolled
   #
   # @since 15.7
   class ReactWidgetType < Pageflow::WidgetType
-    def initialize(role:, name:)
+    def initialize(role:, name:, enabled_in_editor: true)
       @role = role
       @name = name
+      @enabled_in_editor = enabled_in_editor
     end
 
     attr_reader :name
@@ -23,6 +24,10 @@ module PageflowScrolled
       [@role]
     end
 
+    def enabled_in_editor?
+      @enabled_in_editor
+    end
+
     def render(*)
       ''
     end

data/entry_types/scrolled/lib/pageflow_scrolled/web_app_manifest.rb

@@ -2,7 +2,7 @@ module PageflowScrolled
   WebAppManifest = lambda do |entry|
     EntriesController.renderer.render(
       partial: 'manifest',
-      formats: 'json',
+      format: 'json',
       locals: {
         theme: entry.theme
       }

data/entry_types/scrolled/lib/tasks/pageflow_scrolled/dummy.rake

@@ -2,7 +2,7 @@ namespace :pageflow_scrolled do
   desc 'Generate dummy app for current Rails version.'
   task :dummy do
     require 'pageflow/support'
-    ENV['PAGEFLOW_INSTALL_WEBPACKER'] = 'true'
+    ENV['PAGEFLOW_INSTALL_SHAKAPACKER'] = 'true'
     Pageflow::Dummy.setup
   end
 end

data/entry_types/scrolled/lib/tasks/pageflow_scrolled/storybook.rake

@@ -33,8 +33,7 @@ namespace :pageflow_scrolled do
 
         account = seeds.account(name: 'storybook-seed') do |account_in_progress|
           account_in_progress.features_configuration =
-            account_in_progress.features_configuration.merge('scrolled_entry_type' => true,
-                                                             'frontend_v2' => true)
+            account_in_progress.features_configuration.merge('scrolled_entry_type' => true)
         end
 
         seeds.sample_scrolled_entry(

data/entry_types/scrolled/package/config/webpack.js

@@ -7,5 +7,31 @@ module.exports = {
       // supported by the browser.
       'video.js$': 'video.js/core.es.js'
     },
+  },
+  entry: {
+    'pageflow-scrolled/widgets/defaultNavigation': {
+      import: [
+        'pageflow-scrolled/widgets/defaultNavigation',
+        'pageflow-scrolled/widgets/defaultNavigation.css'
+      ]
+    },
+    'pageflow-scrolled/widgets/consentBar': {
+      import: [
+        'pageflow-scrolled/widgets/consentBar',
+        'pageflow-scrolled/widgets/consentBar.css'
+      ]
+    },
+    'pageflow-scrolled/widgets/iconInlineFileRights': {
+      import: [
+        'pageflow-scrolled/widgets/iconInlineFileRights',
+        'pageflow-scrolled/widgets/iconInlineFileRights.css'
+      ]
+    },
+    'pageflow-scrolled/widgets/textInlineFileRights': {
+      import: [
+        'pageflow-scrolled/widgets/textInlineFileRights',
+        'pageflow-scrolled/widgets/textInlineFileRights.css'
+      ]
+    }
   }
 };