pageflow 17.0.5 → 17.2.0

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,30 +36,45 @@ json.config do
   end
 
   json.enabled_feature_names entry.enabled_feature_names
-  json.partial! 'pageflow_scrolled/entry_json_seed/theme', theme: entry.theme
+  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
       .additional_frontend_seed_data
       .for(entry,
-           self,
+           request,
            include_unused: options[:include_unused_additional_seed_data])
   )
 
-  json.partial! 'pageflow_scrolled/entry_json_seed/consent_vendors',
-                entry: entry, entry_config: entry_config
+  json.partial!('pageflow_scrolled/entry_json_seed/consent_vendors', entry:, entry_config:)
+  json.partial!('pageflow_scrolled/entry_json_seed/entry_translations', entry:)
 
   json.file_licenses(
     I18n.t('pageflow.file_licenses', default: {}).slice(*entry_config.available_file_licenses)
   )
+
+  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
 
@@ -61,35 +82,42 @@ 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)
+        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
     end
 
+    json.storylines do
+      json.array!(storylines) do |storyline|
+        json.partial! 'pageflow_scrolled/storylines/storyline', storyline:
+      end
+    end
+
     json.chapters do
       json.array!(chapters) do |chapter|
-        json.partial! 'pageflow_scrolled/chapters/chapter', chapter: chapter
+        json.partial! 'pageflow_scrolled/chapters/chapter', chapter:
       end
     end
 
     json.sections do
       json.array!(sections) do |section|
-        json.partial! 'pageflow_scrolled/sections/section', section: section
+        json.partial! 'pageflow_scrolled/sections/section', section:
       end
     end
 
     json.content_elements do
       json.array!(content_elements) do |content_element|
         json.partial! 'pageflow_scrolled/content_elements/content_element',
-                      content_element: content_element
+                      content_element:
       end
     end
 
     json.widgets do
       json.array!(widgets) do |widget|
         json.partial! 'pageflow_scrolled/entry_json_seed/widget',
-                      widget: widget
+                      widget:
       end
     end
 

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

@@ -0,0 +1,14 @@
+json.entry_translations do
+  json.array!(entry.translations(lambda {
+                                   preload(:site, :account)
+                                 }, include_noindex: true)) do |translation|
+    json.(translation, :id, :locale)
+    json.display_locale public_locale_name_for(translation.locale)
+
+    if translation.published_revision?
+      json.url social_share_entry_url(translation)
+    else
+      json.url main_app.preview_admin_entry_path(translation)
+    end
+  end
+end

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

@@ -1,19 +1,48 @@
 json.theme do
   json.assets do
-    json.logo_desktop scrolled_theme_asset_path(theme, 'logoDesktop.svg',
-                                                theme_file_role: :logo_desktop)
-    json.logo_mobile scrolled_theme_asset_path(theme, 'logoMobile.svg',
-                                               theme_file_role: :logo_mobile)
+    json.logo_desktop scrolled_theme_asset_path(
+      theme, 'logoDesktop.svg',
+      theme_file_role: :logo_desktop
+    )
+    json.logo_mobile scrolled_theme_asset_path(
+      theme, 'logoMobile.svg',
+      theme_file_role: :logo_mobile
+    )
+    json.logo_dark_variant_desktop scrolled_theme_asset_path(
+      theme, 'logoDarkVariantDesktop.svg',
+      theme_file_role: :logo_dark_variant_desktop
+    )
+    json.logo_dark_variant_mobile scrolled_theme_asset_path(
+      theme, 'logoDarkVariantMobile.svg',
+      theme_file_role: :logo_dark_variant_mobile
+    )
+
     json.unmute scrolled_theme_asset_path(theme, 'unmute.mp3')
 
     json.icons({})
     json.icons do
+      icons_directory = theme.options.fetch(:custom_icons_directory, 'icons')
+
       theme.options.fetch(:custom_icons, []).each do |icon_name|
         json.set!(icon_name,
-                  scrolled_theme_asset_path(theme, "icons/#{icon_name}.svg",
+                  scrolled_theme_asset_path(theme, File.join(icons_directory, "#{icon_name}.svg"),
                                             relative_url: true))
       end
     end
+
+    entry_config.additional_theme_assets.each do |asset|
+      json.set!(asset.theme_file_role, theme.files.dig(asset.theme_file_role,
+                                                       asset.theme_file_style))
+    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/app/views/pageflow_scrolled/storylines/_storyline.json.jbuilder

@@ -0,0 +1,7 @@
+json.key_format!(camelize: :lower)
+
+json.call(storyline,
+          :id,
+          :perma_id,
+          :position,
+          :configuration)

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"
+      }
+    }
+  }
+]