pageflow 17.1.0 → 17.2.0

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

@@ -33,15 +33,16 @@ module PageflowScrolled
 
     # @api private
     class Batch
-      def initialize(section, items)
+      def initialize(section, items, comment_thread_subject_ranges: nil)
         @section = section
         @storyline = section.chapter.storyline
         @items = items
+        @comment_thread_subject_ranges = comment_thread_subject_ranges
       end
 
       def save!
         ContentElement.transaction do
-          @items.map.with_index { |item, index|
+          result = @items.map.with_index { |item, index|
             if item[:_delete]
               @section.content_elements.delete(item[:id])
               nil
@@ -49,6 +50,10 @@ module PageflowScrolled
               create_or_update(item, index)
             end
           }.compact
+
+          update_subject_ranges
+          reconcile_section_perma_ids
+          result
         end
       end
 
@@ -60,11 +65,48 @@ module PageflowScrolled
           position: index
         }.merge(item.slice(:type_name, :configuration))
 
-        if item[:id]
-          @storyline.content_elements.update(item[:id], attributes)
-        else
-          @section.content_elements.create(attributes)
-        end
+        content_element = if item[:id]
+                            @storyline.content_elements.update(item[:id], attributes)
+                          else
+                            @section.content_elements.create(attributes)
+                          end
+
+        migrate_comment_threads(content_element, item[:migrate_comment_threads])
+        content_element
+      end
+
+      def migrate_comment_threads(content_element, thread_ids)
+        Pageflow::CommentThread.migrate_to_subject(
+          revision: @storyline.revision,
+          subject_type: 'ContentElement',
+          subject_id: content_element.perma_id,
+          thread_ids:
+        )
+      end
+
+      def update_subject_ranges
+        return if @comment_thread_subject_ranges.blank?
+
+        Pageflow::CommentThread.update_subject_ranges_for(
+          revision: @storyline.revision,
+          subject_type: 'ContentElement',
+          subject_id: @section.content_elements.pluck(:perma_id),
+          ranges: @comment_thread_subject_ranges
+        )
+      end
+
+      # A comment thread's section follows its content element. Reconcile
+      # the section perma id of threads on this section's content elements
+      # so threads stay relocatable to the right section once their
+      # content element is deleted — e.g. after a content element was
+      # moved here from another section.
+      def reconcile_section_perma_ids
+        Pageflow::CommentThread.update_section_perma_id_for(
+          revision: @storyline.revision,
+          subject_type: 'ContentElement',
+          subject_id: @section.content_elements.pluck(:perma_id),
+          section_perma_id: @section.perma_id
+        )
       end
     end
   end

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

@@ -0,0 +1,6 @@
+module PageflowScrolled
+  # @api private
+  class LottieFile < Pageflow::ApplicationRecord
+    include Pageflow::UploadableFile
+  end
+end

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

@@ -0,0 +1,16 @@
+module PageflowScrolled
+  # @api private
+  class LottieFileUrlTemplates
+    def call
+      {
+        original: Pageflow::UrlTemplate.from_attachment(example_file.attachment, :original)
+      }
+    end
+
+    private
+
+    def example_file
+      @example_file ||= LottieFile.new(id: 0, file_name: ':basename.:extension')
+    end
+  end
+end

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

@@ -34,6 +34,7 @@ module PageflowScrolled
 
     def self.create_defaults(draft)
       create!(revision: draft, configuration: {main: true})
+      create!(revision: draft, position: 1)
     end
 
     private

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

@@ -1,4 +1,4 @@
-<%= cache_scrolled_entry(entry: entry, widget_scope: widget_scope) do %>
+<%= cache_scrolled_entry(entry: entry, entry_mode: entry_mode) do %>
   <!DOCTYPE html>
   <%= content_tag(:html, lang: entry.locale, dir: text_direction(entry.locale)) do %>
     <head>
@@ -7,21 +7,25 @@
       <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 name="robots" content="max-image-preview:large">
+      <% if seed_options[:load_commenting] %>
+        <%= csrf_meta_tags %>
+      <% end %>
 
       <%= social_share_meta_tags_for(entry) %>
       <%= meta_tags_for_entry(entry) %>
       <%= hreflang_link_tags_for_entry(entry) unless local_assigns[:skip_hreflang_link_tags] %>
       <%= 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: entry_mode) %>
 
-      <%= javascript_include_tag 'pageflow_scrolled/legacy' %>
-      <%= scrolled_frontend_stylesheet_packs_tag(entry, widget_scope: widget_scope) %>
+      <%= scrolled_sprockets_asset_tags(entry, entry_mode: entry_mode) %>
+      <%= scrolled_frontend_stylesheet_packs_tag(entry, entry_mode: entry_mode, seed_options: seed_options) %>
 
+      <%= scrolled_theme_font_preload_link_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: entry_mode) %>
 
       <% if Rails.env.development? %>
         <script>
@@ -35,11 +39,8 @@
         </script>
       <% end %>
 
-      <% ssr_html = local_assigns[:skip_ssr] ? '' : render_scrolled_entry(entry) %>
+      <% ssr_html = local_assigns[:skip_ssr] ? '' : render_scrolled_entry(entry, seed_options) %>
 
-      <% 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] %>
@@ -50,13 +51,13 @@
       <div id="root"><%= ssr_html %></div>
 
       <div id='template-widget-container'>
-        <%= render_widgets(entry, scope: widget_scope, insert_point: :bottom_of_entry) %>
+        <%= render_widgets(entry, scope: entry_mode, insert_point: :bottom_of_entry) %>
       </div>
 
       <%= scrolled_webpack_public_path_script_tag %>
-      <%= scrolled_frontend_javascript_packs_tag(entry, widget_scope: widget_scope) %>
+      <%= scrolled_frontend_javascript_packs_tag(entry, entry_mode: entry_mode) %>
 
-      <%= scrolled_entry_json_seed_script_tag(entry, local_assigns[:seed_options] || {}) %>
+      <%= scrolled_entry_json_seed_script_tag(entry, seed_options) %>
     </body>
   <% end %>
 <% end %>

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

@@ -8,20 +8,26 @@ json.config do
     config_file_model_types_seed(json, entry_config)
   end
 
+  json.file_reference_locations do
+    json.content_elements file_reference_locations.content_element_locations
+    json.sections file_reference_locations.section_locations
+    json.entry file_reference_locations.entry_locations
+  end
+
   json.pretty_url pretty_entry_url(entry)
   json.share_url_templates share_provider_url_templates
 
   json.default_file_rights entry.account.default_file_rights
 
   json.legal_info do
-    site = entry.site
+    legal_info = entry.legal_info
     json.imprint do
-      json.label raw(site.imprint_link_label)
-      json.url site.imprint_link_url
+      json.label raw(legal_info.imprint.label)
+      json.url legal_info.imprint.url
     end
     json.copyright do
-      json.label raw(site.copyright_link_label)
-      json.url site.copyright_link_url
+      json.label raw(legal_info.copyright.label)
+      json.url legal_info.copyright.url
     end
     json.privacy do
       json.label I18n.t('pageflow.public.privacy_notice')
@@ -30,7 +36,10 @@ json.config do
   end
 
   json.enabled_feature_names entry.enabled_feature_names
-  json.partial!('pageflow_scrolled/entry_json_seed/theme', theme: entry.theme, entry_config:)
+  json.partial!('pageflow_scrolled/entry_json_seed/theme',
+                theme: entry.theme,
+                entry_config:,
+                include_theme_translations: options[:include_theme_translations])
 
   json.additional_seed_data(
     entry_config
@@ -48,14 +57,24 @@ json.config do
   )
 
   json.cut_off entry.cutoff_mode_enabled_for?(request)
+  json.embed options.fetch(:embed, false)
+  json.origin_url options[:origin_url] if options[:origin_url]
+  json.load_inline_editing true if options[:load_inline_editing]
+  json.load_commenting true if options[:load_commenting]
 end
 
 unless options[:skip_i18n]
+  ui_locale = options[:ui_locale] || I18n.locale
+
   json.i18n do
     json.default_locale I18n.default_locale
-    json.locale I18n.locale
-    json.translations scrolled_i18n_translations(entry,
-                                                 **options.fetch(:translations, {}))
+    json.locale ui_locale
+    json.translations scrolled_i18n_translations(
+      entry,
+      ui_locale:,
+      include_inline_editing: !!options[:load_inline_editing],
+      include_review: !!options[:load_commenting]
+    )
   end
 end
 
@@ -63,7 +82,8 @@ unless options[:skip_collections]
   json.collections do
     json.entries do
       json.array!([entry]) do |entry|
-        json.call(entry, :id, :locale, :share_providers, :share_url, :credits, :configuration)
+        json.call(entry, :id, :locale, :share_providers, :share_url, :share_image_id,
+                  :credits, :configuration)
         json.published_at entry.published_at.try(:iso8601, 0)
         json.permaId entry.id # required as keyAttribute in EntryStateProvider
       end

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

@@ -36,4 +36,13 @@ json.theme do
     end
   end
   json.options(theme.options.deep_transform_keys { |key| key.to_s.camelize(:lower) })
+
+  if include_theme_translations
+    json.translations do
+      generic_scales = I18n.t('pageflow_scrolled.editor.scales', default: {})
+      theme_scales = I18n.t("pageflow_scrolled.editor.themes.#{theme.name}.scales", default: {})
+      json.scales(generic_scales.deep_merge(theme_scales)
+                    .deep_transform_keys { |key| key.to_s.camelize(:lower) })
+    end
+  end
 end

data/entry_types/scrolled/app/views/pageflow_scrolled/favicons/_entry.html.erb

@@ -13,4 +13,4 @@
   <link rel="manifest" href="<%= manifest_path %>">
 <% end %>
 
-<meta name="theme-color" content="<%= theme_color %>">
+<meta name="theme-color" content="#fff">

data/entry_types/scrolled/config/configuration_schemas/pageflow-scrolled.json

@@ -0,0 +1,414 @@
+[
+  {
+    "$id": "pageflow-scrolled/contentElements/counter",
+    "x-subject": {
+      "model": "contentElement",
+      "typeName": "counter"
+    },
+    "type": "object",
+    "properties": {}
+  },
+  {
+    "$id": "pageflow-scrolled/contentElements/dataWrapperChart",
+    "x-subject": {
+      "model": "contentElement",
+      "typeName": "dataWrapperChart"
+    },
+    "type": "object",
+    "properties": {}
+  },
+  {
+    "$id": "pageflow-scrolled/contentElements/externalLinkList",
+    "x-subject": {
+      "model": "contentElement",
+      "typeName": "externalLinkList"
+    },
+    "type": "object",
+    "properties": {
+      "links": {
+        "type": "array",
+        "items": {
+          "$ref": "#/$defs/link"
+        }
+      }
+    },
+    "$defs": {
+      "link": {
+        "type": "object",
+        "properties": {
+          "thumbnail": {
+            "type": "integer",
+            "x-fileCollection": "image_files"
+          }
+        }
+      }
+    }
+  },
+  {
+    "$id": "pageflow-scrolled/contentElements/heading",
+    "x-subject": {
+      "model": "contentElement",
+      "typeName": "heading"
+    },
+    "type": "object",
+    "properties": {}
+  },
+  {
+    "$id": "pageflow-scrolled/contentElements/hotspots",
+    "x-subject": {
+      "model": "contentElement",
+      "typeName": "hotspots"
+    },
+    "type": "object",
+    "properties": {
+      "image": {
+        "type": "integer",
+        "x-fileCollection": "image_files"
+      },
+      "portraitImage": {
+        "type": "integer",
+        "x-fileCollection": "image_files"
+      },
+      "areas": {
+        "type": "array",
+        "items": {
+          "$ref": "#/$defs/area"
+        }
+      }
+    },
+    "$defs": {
+      "area": {
+        "type": "object",
+        "properties": {
+          "activeImage": {
+            "type": "integer",
+            "x-fileCollection": "image_files"
+          },
+          "tooltipImage": {
+            "type": "integer",
+            "x-fileCollection": "image_files"
+          },
+          "portraitActiveImage": {
+            "type": "integer",
+            "x-fileCollection": "image_files",
+            "x-activeIf": {
+              "path": [
+                "portraitImage"
+              ],
+              "present": true
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "$id": "pageflow-scrolled/contentElements/iframeEmbed",
+    "x-subject": {
+      "model": "contentElement",
+      "typeName": "iframeEmbed"
+    },
+    "type": "object",
+    "properties": {}
+  },
+  {
+    "$id": "pageflow-scrolled/contentElements/imageGallery",
+    "x-subject": {
+      "model": "contentElement",
+      "typeName": "imageGallery"
+    },
+    "type": "object",
+    "properties": {
+      "items": {
+        "type": "array",
+        "items": {
+          "$ref": "#/$defs/item"
+        }
+      }
+    },
+    "$defs": {
+      "item": {
+        "type": "object",
+        "properties": {
+          "image": {
+            "type": "integer",
+            "x-fileCollection": "image_files"
+          },
+          "portraitImage": {
+            "type": "integer",
+            "x-fileCollection": "image_files"
+          }
+        }
+      }
+    }
+  },
+  {
+    "$id": "pageflow-scrolled/contentElements/infoTable",
+    "x-subject": {
+      "model": "contentElement",
+      "typeName": "infoTable"
+    },
+    "type": "object",
+    "properties": {}
+  },
+  {
+    "$id": "pageflow-scrolled/contentElements/inlineAudio",
+    "x-subject": {
+      "model": "contentElement",
+      "typeName": "inlineAudio"
+    },
+    "type": "object",
+    "properties": {
+      "id": {
+        "type": "integer",
+        "x-fileCollection": "audio_files"
+      },
+      "posterId": {
+        "type": "integer",
+        "x-fileCollection": "image_files"
+      }
+    }
+  },
+  {
+    "$id": "pageflow-scrolled/contentElements/inlineBeforeAfter",
+    "x-subject": {
+      "model": "contentElement",
+      "typeName": "inlineBeforeAfter"
+    },
+    "type": "object",
+    "properties": {
+      "before_id": {
+        "type": "integer",
+        "x-fileCollection": "image_files"
+      },
+      "after_id": {
+        "type": "integer",
+        "x-fileCollection": "image_files"
+      }
+    }
+  },
+  {
+    "$id": "pageflow-scrolled/contentElements/inlineImage",
+    "x-subject": {
+      "model": "contentElement",
+      "typeName": "inlineImage"
+    },
+    "type": "object",
+    "properties": {
+      "id": {
+        "type": "integer",
+        "x-fileCollection": "image_files"
+      },
+      "portraitId": {
+        "type": "integer",
+        "x-fileCollection": "image_files"
+      }
+    }
+  },
+  {
+    "$id": "pageflow-scrolled/contentElements/inlineVideo",
+    "x-subject": {
+      "model": "contentElement",
+      "typeName": "inlineVideo"
+    },
+    "type": "object",
+    "properties": {
+      "id": {
+        "type": "integer",
+        "x-fileCollection": "video_files"
+      },
+      "posterId": {
+        "type": "integer",
+        "x-fileCollection": "image_files"
+      },
+      "portraitId": {
+        "type": "integer",
+        "x-fileCollection": "video_files"
+      },
+      "portraitPosterId": {
+        "type": "integer",
+        "x-fileCollection": "image_files",
+        "x-activeIf": {
+          "path": [
+            "portraitId"
+          ],
+          "present": true
+        }
+      }
+    }
+  },
+  {
+    "$id": "pageflow-scrolled/contentElements/lottieAnimation",
+    "x-subject": {
+      "model": "contentElement",
+      "typeName": "lottieAnimation"
+    },
+    "type": "object",
+    "properties": {
+      "id": {
+        "type": "integer",
+        "x-fileCollection": "lottie_files"
+      }
+    }
+  },
+  {
+    "$id": "pageflow-scrolled/contentElements/question",
+    "x-subject": {
+      "model": "contentElement",
+      "typeName": "question"
+    },
+    "type": "object",
+    "properties": {}
+  },
+  {
+    "$id": "pageflow-scrolled/contentElements/quote",
+    "x-subject": {
+      "model": "contentElement",
+      "typeName": "quote"
+    },
+    "type": "object",
+    "properties": {}
+  },
+  {
+    "$id": "pageflow-scrolled/contentElements/socialEmbed",
+    "x-subject": {
+      "model": "contentElement",
+      "typeName": "socialEmbed"
+    },
+    "type": "object",
+    "properties": {}
+  },
+  {
+    "$id": "pageflow-scrolled/contentElements/soundDisclaimer",
+    "x-subject": {
+      "model": "contentElement",
+      "typeName": "soundDisclaimer"
+    },
+    "type": "object",
+    "properties": {}
+  },
+  {
+    "$id": "pageflow-scrolled/contentElements/textBlock",
+    "x-subject": {
+      "model": "contentElement",
+      "typeName": "textBlock"
+    },
+    "type": "object",
+    "properties": {}
+  },
+  {
+    "$id": "pageflow-scrolled/contentElements/tikTokEmbed",
+    "x-subject": {
+      "model": "contentElement",
+      "typeName": "tikTokEmbed"
+    },
+    "type": "object",
+    "properties": {}
+  },
+  {
+    "$id": "pageflow-scrolled/contentElements/twitterEmbed",
+    "x-subject": {
+      "model": "contentElement",
+      "typeName": "twitterEmbed"
+    },
+    "type": "object",
+    "properties": {}
+  },
+  {
+    "$id": "pageflow-scrolled/contentElements/videoEmbed",
+    "x-subject": {
+      "model": "contentElement",
+      "typeName": "videoEmbed"
+    },
+    "type": "object",
+    "properties": {
+      "posterId": {
+        "type": "integer",
+        "x-fileCollection": "image_files"
+      }
+    }
+  },
+  {
+    "$id": "pageflow-scrolled/contentElements/vrImage",
+    "x-subject": {
+      "model": "contentElement",
+      "typeName": "vrImage"
+    },
+    "type": "object",
+    "properties": {
+      "image": {
+        "type": "integer",
+        "x-fileCollection": "image_files"
+      }
+    }
+  },
+  {
+    "$id": "pageflow-scrolled/entry",
+    "x-subject": {
+      "model": "entry"
+    },
+    "type": "object",
+    "properties": {
+      "shareImageId": {
+        "type": "integer",
+        "x-fileCollection": "image_files"
+      }
+    }
+  },
+  {
+    "$id": "pageflow-scrolled/section",
+    "x-subject": {
+      "model": "section"
+    },
+    "type": "object",
+    "properties": {
+      "backdrop": {
+        "type": "object",
+        "anyOf": [
+          {
+            "properties": {
+              "image": {
+                "type": "integer",
+                "x-fileCollection": "image_files"
+              },
+              "imageMobile": {
+                "type": "integer",
+                "x-fileCollection": "image_files"
+              }
+            }
+          },
+          {
+            "properties": {
+              "video": {
+                "type": "integer",
+                "x-fileCollection": "video_files"
+              },
+              "videoMobile": {
+                "type": "integer",
+                "x-fileCollection": "video_files"
+              }
+            }
+          },
+          {
+            "properties": {
+              "color": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "properties": {
+              "contentElement": {
+                "type": "integer"
+              }
+            }
+          }
+        ]
+      },
+      "atmoAudioFileId": {
+        "type": "integer",
+        "x-fileCollection": "audio_files"
+      }
+    }
+  }
+]