pageflow 15.2.0 → 15.5.0

data/entry_types/scrolled/package/frontend/useBrowserFeature-91a4c29d.js

@@ -0,0 +1,33 @@
+import { browser } from 'pageflow/frontend';
+import React, { createContext, useContext, useState, useEffect } from 'react';
+import { _ as _slicedToArray } from './i18n-4dc6c377.js';
+
+var BrowserFeaturesAvailableContext = createContext(); // Browser feature detection is not available during server side
+// rendering. To prevent mismatches during hydration, we keep features
+// disabled in the initial render. Since hydration only starts after
+// feature detection has finished, we can immediately re-render once
+// the provider has mounted.
+
+function BrowserFeaturesProvider(_ref) {
+  var children = _ref.children;
+
+  var _useState = useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      isAvailable = _useState2[0],
+      setIsAvailable = _useState2[1];
+
+  useEffect(function () {
+    return setIsAvailable(true);
+  }, []);
+  return (
+    /*#__PURE__*/
+    React.createElement(BrowserFeaturesAvailableContext.Provider, {
+      value: isAvailable
+    }, children)
+  );
+}
+function useBrowserFeature(name) {
+  return useContext(BrowserFeaturesAvailableContext) && browser.has(name);
+}
+
+export { BrowserFeaturesProvider as B, useBrowserFeature as u };

data/entry_types/scrolled/package/package.json

@@ -7,22 +7,43 @@
   "author": "Codevise Solutions GmbH <info@codevise.de>",
   "license": "MIT",
   "dependencies": {
+    "@egjs/view360": "^3.4.3",
+    "core-js": "^3.6.5",
+    "debounce": "^1.2.0",
+    "deep-assign": "^3.0.0",
+    "intersection-observer": "^0.7.0",
+    "invert-color": "^2.0.0",
     "prop-types": "^15.7.2",
-    "react": "^16.9.0",
-    "react-dom": "^16.9.0",
+    "react-compare-image": "https://github.com/codevise/react-compare-image#offset-width-fix",
+    "react-dnd": "^11.1.3",
+    "react-dnd-html5-backend": "^11.1.3",
+    "react-draggable": "^4.4.2",
+    "react-measure": "^2.3.0",
     "react-player": "^1.15.2",
     "react-tooltip": "^3.11.1",
-    "react-compare-image": "^2.0.4"
+    "react_ujs": "^2.6.1",
+    "reselect": "^4.0.0",
+    "screenfull": "^5.1.0",
+    "slate": "^0.57.3",
+    "slate-react": "^0.57.3",
+    "slugify": "^1.4.6",
+    "striptags": "^3.1.1",
+    "use-context-selector": "^1.2.11",
+    "video.js": "https://github.com/tf/video.js#pageflow-scrolled-5",
+    "wavesurfer.js": "https://github.com/tf/wavesurfer.js#patches",
+    "whatwg-fetch": "^3.0.0"
   },
   "peerDependencies": {
-    "pageflow": "15.1.0"
+    "pageflow": "15.1.0",
+    "react": "^16.9.0",
+    "react-dom": "^16.9.0"
   },
   "devDependencies": {
     "@percy/storybook": "^3.2.0",
     "@storybook/addon-viewport": "^5.3.13",
     "@storybook/react": "^5.3.9",
     "@testing-library/jest-dom": "^4.2.4",
-    "@testing-library/react": "^9.4.0",
+    "@testing-library/react": "^10.3.0",
     "@testing-library/react-hooks": "^3.2.1",
     "@typescript-eslint/eslint-plugin": "2.x",
     "@typescript-eslint/parser": "2.x",
@@ -39,15 +60,15 @@
     "eslint-plugin-react": "7.x",
     "eslint-plugin-react-hooks": "1.x",
     "jest": "^24.9.0",
-    "jest-css-modules-transform": "^3.1.0",
     "jest-svg-transformer": "^1.0.0",
+    "react-svg-loader": "^3.0.3",
     "react-test-renderer": "^16.9.0"
   },
   "scripts": {
     "test": "jest",
     "lint": "eslint .",
-    "start-storybook": "start-storybook",
-    "build-storybook": "build-storybook -o .storybook/out",
-    "snapshot": "STORYBOOK_SPLIT=true build-storybook --quiet -o .storybook/out && PERCY_TOKEN=${PERCY_TOKEN:-$PT} percy-storybook --widths=1280 --build_dir=.storybook/out"
+    "start-storybook": "start-storybook -s .storybook/static",
+    "build-storybook": "build-storybook -s .storybook/static -o .storybook/out",
+    "snapshot": "STORYBOOK_SPLIT=true build-storybook --quiet -s .storybook/static -o .storybook/out && PERCY_TOKEN=${PERCY_TOKEN:-$PT} percy-storybook --widths=1280 --build_dir=.storybook/out"
   }
 }

data/lib/generators/pageflow/initializer/templates/pageflow.rb

@@ -3,19 +3,24 @@ Pageflow.configure do |config|
   # users.
   config.mailer_sender = 'change-me-at-config-initializers-pageflow@example.com'
 
-  # Plugins provide page types and widget types.
+  # Entry type plugins
+  config.plugin(PageflowPaged.plugin)
+
+  # Plugins that provide page types and widget types.
   config.plugin(Pageflow.built_in_page_types_plugin)
   config.plugin(Pageflow.built_in_widget_types_plugin)
   # config.plugin(Pageflow::Rainbow.plugin)
 
-  # Add custom themes by invoking the pageflow:theme generator and
-  # registering the theme here.
-  #
-  #     $ rails generate pageflow:theme my_custom_theme
-  #     => creates app/assets/stylesheets/pageflow/themes/my_custom_theme.css.scss
-  #
-  config.themes.register(:default)
-  # config.themes.register(:my_custom_theme)
+  config.for_entry_type(PageflowPaged.entry_type) do |entry_type_config|
+    # Add custom themes by invoking the pageflow:theme generator and
+    # registering the theme here.
+    #
+    #     $ rails generate pageflow:theme my_custom_theme
+    #     => creates app/assets/stylesheets/pageflow/themes/my_custom_theme.css.scss
+    #
+    entry_type_config.themes.register(:default)
+    # config.themes.register(:my_custom_theme)
+  end
 
   # String to interpolate into paths of files generated by paperclip
   # preprocessors. This allows to refresh cdn caches after

data/lib/pageflow/ability_mixin.rb

@@ -23,6 +23,10 @@ module Pageflow
         AccountPolicy.new(user, account).add_member_to?
       end
 
+      can :see_user_quota, Account do |account|
+        AccountPolicy.new(user, account).see_user_quota?
+      end
+
       can :see_badge_belonging_to, Account do |account|
         AccountPolicy.new(user, account).see_badge_belonging_to?
       end
@@ -95,6 +99,10 @@ module Pageflow
         Admin::AdminOnlyTabPolicy.new(user, tab).see?
       end
 
+      can :see_entry_types, Account do |account|
+        AccountPolicy.new(user, account).see_entry_types?
+      end
+
       unless user.admin?
         can :configure_folder_on, Account do |account|
           AccountPolicy.new(user, account).configure_folder_on?
@@ -214,8 +222,12 @@ module Pageflow
           ThemingPolicy.new(user, theming).edit?
         end
 
-        can :edit, EntryTemplate do |entry_template|
-          EntryTemplatePolicy.new(user, entry_template).edit?
+        can :create, EntryTemplate do |entry_template|
+          EntryTemplatePolicy.new(user, entry_template).create?
+        end
+
+        can :update, EntryTemplate do |entry_template|
+          EntryTemplatePolicy.new(user, entry_template).update?
         end
 
         can :create, ::User do |managed_user|

data/lib/pageflow/configuration.rb

@@ -500,13 +500,14 @@ module Pageflow
     # Restricts the configuration interface to those parts which can
     # be used from inside features.
     FeatureLevelConfiguration = Struct.new(:config) do
-      delegate :page_types, to: :config
-      delegate :widget_types, to: :config
-      delegate :help_entries, to: :config
-      delegate :admin_form_inputs, to: :config
       delegate :admin_attributes_table_rows, to: :config
-      delegate :themes, to: :config
+      delegate :admin_form_inputs, to: :config
+      delegate :entry_types, to: :config
       delegate :file_importers, to: :config
+      delegate :help_entries, to: :config
+      delegate :page_types, to: :config
+      delegate :themes, to: :config
+      delegate :widget_types, to: :config
 
       delegate :for_entry_type, to: :config
     end

data/lib/pageflow/entry_export_import/revision_serialization.rb

@@ -10,19 +10,6 @@ module Pageflow
           widgets: {
             except: [:subject_id, :subject_type]
           },
-          storylines: {
-            except: :revision_id,
-            include: {
-              chapters: {
-                except: :storyline_id,
-                include: {
-                  pages: {
-                    except: :chapter_id
-                  }
-                }
-              }
-            }
-          },
           file_usages: {
             except: [:revision_id],
             include: {
@@ -51,6 +38,21 @@ module Pageflow
           revision_component
             .attributes.except('revision_id')
             .merge('class_name' => revision_component.class.name)
+            .merge('components' => serialize_nested_revision_components(revision_component))
+        end
+      end
+
+      def serialize_nested_revision_components(revision_component)
+        collection_names = revision_component.nested_revision_component_collection_names
+
+        collection_names.each_with_object({}) do |collection_name, result|
+          collection = revision_component.send(collection_name)
+
+          result[collection_name] = collection.map do |nested_component|
+            nested_component
+              .attributes
+              .merge('components' => serialize_nested_revision_components(nested_component))
+          end
         end
       end
     end

data/lib/pageflow/entry_export_import/revision_serialization/import.rb

@@ -17,7 +17,6 @@ module Pageflow
           Revision.transaction do
             revision = create_revision(data)
 
-            create_storylines_chapters_and_pages(revision, data['storylines'])
             create_widgets(revision, data['widgets'])
             create_revision_components(revision, data['components'])
             create_files(revision, data['file_usages'])
@@ -46,30 +45,6 @@ module Pageflow
           end
         end
 
-        def create_storylines_chapters_and_pages(revision, storylines_data)
-          storylines_data.each do |storyline_data|
-            chapters_data = storyline_data.delete('chapters')
-            storyline = revision.storylines.create!(storyline_data.except(*DEFAULT_REMOVAL_COLUMNS))
-
-            create_chapters_and_pages(storyline, chapters_data)
-          end
-        end
-
-        def create_chapters_and_pages(storyline, chapters_data)
-          chapters_data.each do |chapter_data|
-            pages_data = chapter_data.delete('pages')
-            chapter = storyline.chapters.create!(chapter_data.except(*DEFAULT_REMOVAL_COLUMNS))
-
-            create_pages(chapter, pages_data)
-          end
-        end
-
-        def create_pages(chapter, pages_data)
-          pages_data.each do |page_data|
-            chapter.pages.create!(page_data.except(*DEFAULT_REMOVAL_COLUMNS))
-          end
-        end
-
         def create_widgets(revision, widgets_data)
           widgets_data.each do |widget_data|
             revision.widgets.create!(widget_data.except(*DEFAULT_REMOVAL_COLUMNS))
@@ -78,9 +53,26 @@ module Pageflow
 
         def create_revision_components(revision, revision_components_data)
           revision_components_data.each do |component_data|
+            nested_compontents_data = component_data.delete('components')
+
             component_model = component_data.delete('class_name').constantize
             component_data['revision_id'] = revision.id
-            component_model.create!(component_data.except(*DEFAULT_REMOVAL_COLUMNS))
+            component = component_model.create!(component_data.except(*DEFAULT_REMOVAL_COLUMNS))
+
+            create_nested_revision_components(component, nested_compontents_data)
+          end
+        end
+
+        def create_nested_revision_components(revision_component, nested_compontents_data)
+          nested_compontents_data.each do |collection_name, components_data|
+            components_data.each do |component_data|
+              nested_compontents_data = component_data.delete('components')
+
+              collection = revision_component.send(collection_name)
+              nested_component = collection.create!(component_data.except(*DEFAULT_REMOVAL_COLUMNS))
+
+              create_nested_revision_components(nested_component, nested_compontents_data)
+            end
           end
         end
 

data/lib/pageflow/entry_type_configuration.rb

@@ -11,10 +11,12 @@ module Pageflow
 
     attr_reader :features
 
+    delegate :file_importers, to: :@config
     delegate :file_types, to: :@config
     delegate :help_entries, to: :@config
     delegate :hooks, to: :@config
     delegate :revision_components, to: :@config
+    delegate :themes, to: :@config
     delegate :widget_types, to: :@config
 
     def plugin(plugin)

data/lib/pageflow/global_config_api.rb

@@ -44,13 +44,14 @@ module Pageflow
     # @return [Configuration]
     # @since 0.9
     def config_for(target)
-      config = build_config(target.respond_to?(:type_name) && target.type_name) do |c|
+      config = build_config(
+        target.respond_to?(:entry_type) && target.entry_type.name
+      ) do |c|
         c.enable_features(target.enabled_feature_names(c))
       end
 
-      if target.respond_to?(:type_name)
-        config = Configuration::ConfigView.new(config,
-                                               config.entry_types.find_by_name!(target.type_name))
+      if target.respond_to?(:entry_type)
+        config = Configuration::ConfigView.new(config, target.entry_type)
       end
 
       config

data/lib/pageflow/nested_revision_component.rb

@@ -0,0 +1,49 @@
+module Pageflow
+  # Include in models that are declared as nested revision components
+  # of other revision components.
+  #
+  # @since 15.5
+  module NestedRevisionComponent
+    # Shared functionality of revision components and nested revision
+    # components.
+    module Container
+      extend ActiveSupport::Concern
+
+      included do
+        cattr_accessor :nested_revision_component_collection_names, default: []
+      end
+
+      # @api private
+      def copy_nested_revision_component_to(record)
+        nested_revision_component_collection_names.each do |collection_name|
+          send(collection_name).each do |nested|
+            nested.copy_to(record.send(collection_name))
+          end
+        end
+      end
+
+      # Macro methods to declare nested revision components
+      module ClassMethods
+        # Call this macro in the body of a class which includes
+        # `RevisionComponent` or `NestedRevisionComponent` and pass
+        # the name of an association that shall be included when the
+        # revision component is copied to a new revision. The
+        # associated model needs to be a `NestedRevisionComponent`.
+        def nested_revision_components(*collection_names)
+          self.nested_revision_component_collection_names = collection_names
+        end
+      end
+    end
+
+    extend ActiveSupport::Concern
+    include Container
+
+    # @api private
+    def copy_to(collection)
+      record = dup
+      collection << record
+
+      copy_nested_revision_component_to(record)
+    end
+  end
+end

data/lib/pageflow/react.rb

@@ -1,11 +1,13 @@
 module Pageflow
   module React
+    # @deprecated Use `PageflowPaged::React.create_page_type` instead.
     def self.create_page_type(name, options = {})
-      Pageflow::React::PageType.new(name, options)
+      PageflowPaged::React.create_page_type(name, options)
     end
 
+    # @deprecated Use `PageflowPaged::React.create_widget_type` instead.
     def self.create_widget_type(name, role, options = {})
-      Pageflow::React::WidgetType.new(name, role, options)
+      PageflowPaged::React.create_widget_type(name, role, options)
     end
   end
 end

data/lib/pageflow/revision_component.rb

@@ -2,8 +2,9 @@ module Pageflow
   # RevisionComponent represents a model that is attached to the revision
   # mechanism of Pageflow.
   #
-  # In order to be used as a ComponentModel a model is required to
-  # have an integer field `perma_id` and a belongs_to field `revision`.
+  # In order to be used as a revision component, a model is required
+  # to have an integer field `perma_id` and a `revision_id` foreign
+  # key.
   module RevisionComponent
     extend ActiveSupport::Concern
 
@@ -13,6 +14,7 @@ module Pageflow
 
     included do
       include AutoGeneratedPermaId
+      include NestedRevisionComponent::Container
 
       belongs_to :revision, class_name: 'Pageflow::Revision', touch: true
     end
@@ -21,6 +23,8 @@ module Pageflow
       record = dup
       record.revision = revision
       record.save!
+
+      copy_nested_revision_component_to(record)
     end
 
     module ClassMethods

data/lib/pageflow/themes.rb

@@ -36,6 +36,10 @@ module Pageflow
     # @option options :hide_logo_option [Boolean]
     #   Pass true if hiding the logo on specific pages should be supported
     #   as an option in the editor.
+    #
+    # @option options :logo_url [String]
+    #   Pass logo url as string to turn the logo in navigation bar into a link.
+    #
     def register(name, options = {})
       @themes[name] = Theme.new(name, options)
     end