pageflow 15.4.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,6 +7,7 @@
   "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",
@@ -22,19 +23,16 @@
     "react-tooltip": "^3.11.1",
     "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": "6.2.7",
-    "videojs-contrib-dash": "2.11.0",
+    "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"
   },
-  "resolutions": {
-    "video.js": "6.2.7"
-  },
   "peerDependencies": {
     "pageflow": "15.1.0",
     "react": "^16.9.0",

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

@@ -5,7 +5,6 @@ Pageflow.configure do |config|
 
   # Entry type plugins
   config.plugin(PageflowPaged.plugin)
-  config.plugin(PageflowScrolled.plugin)
 
   # Plugins that provide page types and widget types.
   config.plugin(Pageflow.built_in_page_types_plugin)
@@ -23,12 +22,6 @@ Pageflow.configure do |config|
     # config.themes.register(:my_custom_theme)
   end
 
-  config.for_entry_type(PageflowScrolled.entry_type) do |entry_type_config|
-    entry_type_config.themes.register(:default,
-                                      logo_alt_text: 'Pageflow',
-                                      theme_color: '#ffffff')
-  end
-
   # String to interpolate into paths of files generated by paperclip
   # preprocessors. This allows to refresh cdn caches after
   # reprocessing attachments.

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,6 +11,7 @@ module Pageflow
 
     attr_reader :features
 
+    delegate :file_importers, to: :@config
     delegate :file_types, to: :@config
     delegate :help_entries, to: :@config
     delegate :hooks, to: :@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/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/user_mixin.rb

@@ -24,6 +24,7 @@ module Pageflow
       has_many :revisions, class_name: 'Pageflow::Revision', foreign_key: :creator_id
 
       validates :first_name, :last_name, presence: true
+      validates_inclusion_of :locale, in: Pageflow.config.available_locales.map(&:to_s)
 
       scope :admins, -> { where(admin: true) }
     end
@@ -41,7 +42,7 @@ module Pageflow
     end
 
     def locale
-      super.presence || I18n.default_locale
+      super.presence || I18n.default_locale.to_s
     end
 
     def update_with_password(attributes)

data/lib/pageflow/version.rb

@@ -1,3 +1,3 @@
 module Pageflow
-  VERSION = '15.4.0'.freeze
+  VERSION = '15.5.0'.freeze
 end

data/package/editor.js

@@ -3578,7 +3578,8 @@ var ForeignKeySubsetCollection = SubsetCollection.extend({
 
       model.set(options.foreignKeyAttribute, parentModel.id);
     });
-    this.listenTo(parentModel, 'destroy', function () {
+    this.listenTo(parentModel, 'destroy dependentDestroy', function () {
+      this.invoke('trigger', 'dependentDestroy');
       this.clear();
     });
 

data/package/frontend.js

@@ -1911,7 +1911,11 @@ var createMediaPlayer = function createMediaPlayer(options) {
     loop: options.loop,
     controls: options.controls,
     html5: {
-      nativeCaptions: !isAudio && browser.has('iphone platform')
+      nativeCaptions: !isAudio && browser.has('iphone platform'),
+      // Only used by pageflow-scrolled
+      vhs: {
+        useBandwidthFromLocalStorage: true
+      }
     },
     bufferUnderrunWaiting: true,
     fallbackToMutedAutoplay: !isAudio,
@@ -2017,7 +2021,8 @@ function () {
           loop = _ref$loop === void 0 ? false : _ref$loop,
           _ref$controls = _ref.controls,
           controls = _ref$controls === void 0 ? false : _ref$controls,
-          altText = _ref.altText;
+          altText = _ref.altText,
+          onRelease = _ref.onRelease;
       var player = undefined;
 
       if (!this.unAllocatedPlayers[playerType]) {
@@ -2045,6 +2050,7 @@ function () {
         player.updateMediaEventsContext(mediaEventsContextData);
         this.allocatedPlayers[playerType].push(player);
         player.playerId = playerId || this.allocatedPlayers[playerType].length;
+        player.releaseCallback = onRelease;
         return player;
       } else {
         console.log('no player found for allocation');
@@ -2070,6 +2076,11 @@ function () {
         player.poster('');
         clearTextTracks(player);
         this.unAllocatedPlayers[type].push(player);
+
+        if (player.releaseCallback) {
+          player.releaseCallback();
+          player.releaseCallback = null;
+        }
       }
     }
   }, {

data/package/ui.js

@@ -2243,6 +2243,21 @@ var TextAreaInputView = Marionette.ItemView.extend({
   }
 });
 
+function _defineProperty(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+
+  return obj;
+}
+
 function template$9(data) {
 var __p = '';
 __p += '<label>\n  <span class="name"></span>\n  <span class="inline_help"></span>\n</label>\n<input type="text" />\n<div class="validation"></div>\n';
@@ -2285,24 +2300,32 @@ var UrlInputView = Marionette.Layout.extend(
     this.validate();
   },
   onChange: function onChange() {
-    var view = this;
-    this.saveDisplayProperty();
-    this.validate().done(function () {
-      view.save();
+    var _this = this;
+
+    this.validate().then(function () {
+      return _this.save();
+    }, function () {
+      return _this.saveDisplayProperty();
     });
   },
   saveDisplayProperty: function saveDisplayProperty() {
+    this.model.unset(this.options.propertyName, {
+      silent: true
+    });
     this.model.set(this.options.displayPropertyName, this.ui.input.val());
-    this.model.unset(this.options.propertyName);
   },
   save: function save() {
-    var view = this;
-    $.when(this.transformPropertyValue(this.ui.input.val())).then(function (value) {
-      view.model.set(view.options.propertyName, value);
+    var _this2 = this;
+
+    var value = this.ui.input.val();
+    $.when(this.transformPropertyValue(value)).then(function (transformedValue) {
+      var _this2$model$set;
+
+      _this2.model.set((_this2$model$set = {}, _defineProperty(_this2$model$set, _this2.options.displayPropertyName, value), _defineProperty(_this2$model$set, _this2.options.propertyName, transformedValue), _this2$model$set));
     });
   },
   load: function load() {
-    this.ui.input.val(this.model.get(this.options.displayPropertyName));
+    this.ui.input.val(this.model.has(this.options.displayPropertyName) ? this.model.get(this.options.displayPropertyName) : this.model.get(this.options.propertyName));
     this.onLoad();
   },
 

data/spec/factories/test_revision_components.rb

@@ -3,5 +3,9 @@ module Pageflow
     factory :test_revision_component, class: 'Pageflow::TestRevisionComponent' do
       text { 'Some text' }
     end
+
+    factory :test_composite_revision_component, class: 'Pageflow::TestCompositeRevisionComponent' do
+      text { 'Some text' }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow
 version: !ruby/object:Gem::Version
-  version: 15.4.0
+  version: 15.5.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-08 00:00:00.000000000 Z
+date: 2021-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.7.3
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -1602,6 +1602,7 @@ files:
 - config/initializers/features.rb
 - config/initializers/help_entries.rb
 - config/initializers/paperclip.rb
+- config/initializers/revision_components.rb
 - config/initializers/symmetric_encryption.rb
 - config/initializers/view_components.rb
 - config/initializers/zencoder.rb
@@ -1720,6 +1721,7 @@ files:
 - entry_types/scrolled/app/views/pageflow_scrolled/editor/entries/_body.html.erb
 - entry_types/scrolled/app/views/pageflow_scrolled/editor/entries/_head.html.erb
 - entry_types/scrolled/app/views/pageflow_scrolled/editor/entries/_seed.json.jbuilder
+- entry_types/scrolled/app/views/pageflow_scrolled/entries/_global_notices.html.erb
 - entry_types/scrolled/app/views/pageflow_scrolled/entries/show.html.erb
 - entry_types/scrolled/app/views/pageflow_scrolled/entry_json_seed/_entry.json.jbuilder
 - entry_types/scrolled/app/views/pageflow_scrolled/entry_json_seed/_theme.json.jbuilder
@@ -1743,23 +1745,29 @@ files:
 - entry_types/scrolled/lib/generators/pageflow_scrolled/install/templates/theme/logoDesktop.svg
 - entry_types/scrolled/lib/generators/pageflow_scrolled/install/templates/theme/logoMobile.svg
 - entry_types/scrolled/lib/generators/pageflow_scrolled/install/templates/theme/unmute.mp3
+- entry_types/scrolled/lib/generators/pageflow_scrolled/install/templates/themes_plugin.rb.tt
 - entry_types/scrolled/lib/pageflow_scrolled.rb
 - entry_types/scrolled/lib/pageflow_scrolled/configuration.rb
 - entry_types/scrolled/lib/pageflow_scrolled/engine.rb
 - entry_types/scrolled/lib/pageflow_scrolled/plugin.rb
 - entry_types/scrolled/lib/pageflow_scrolled/seeds.rb
-- entry_types/scrolled/lib/tasks/pageflow_scrolled_tasks.rake
+- entry_types/scrolled/lib/tasks/pageflow_scrolled/create_bundle_symlinks_for_yarn.rake
+- entry_types/scrolled/lib/tasks/pageflow_scrolled/dummy.rake
+- entry_types/scrolled/lib/tasks/pageflow_scrolled/storybook.rake
 - entry_types/scrolled/package/contentElements-editor.js
 - entry_types/scrolled/package/contentElements-frontend.css
 - entry_types/scrolled/package/contentElements-frontend.js
 - entry_types/scrolled/package/editor.js
 - entry_types/scrolled/package/frontend-server.js
-- entry_types/scrolled/package/frontend/EditableText-43c50894.js
-- entry_types/scrolled/package/frontend/Wavesurfer-b88b02e0.js
-- entry_types/scrolled/package/frontend/components-3ead1b4a.js
+- entry_types/scrolled/package/frontend/EditableText-7093fd0e.js
+- entry_types/scrolled/package/frontend/Viewer-e49e7807.js
+- entry_types/scrolled/package/frontend/Wavesurfer-0adf5667.js
+- entry_types/scrolled/package/frontend/components-6a6793ca.js
 - entry_types/scrolled/package/frontend/getPrototypeOf-63c7c8e8.js
+- entry_types/scrolled/package/frontend/i18n-4dc6c377.js
 - entry_types/scrolled/package/frontend/index.css
 - entry_types/scrolled/package/frontend/index.js
+- entry_types/scrolled/package/frontend/useBrowserFeature-91a4c29d.js
 - entry_types/scrolled/package/package.json
 - entry_types/scrolled/spec/factories/chapters.rb
 - entry_types/scrolled/spec/factories/content_elements.rb
@@ -1850,6 +1858,7 @@ files:
 - lib/pageflow/help_entries.rb
 - lib/pageflow/help_entry.rb
 - lib/pageflow/hooks.rb
+- lib/pageflow/nested_revision_component.rb
 - lib/pageflow/news_item_api.rb
 - lib/pageflow/page_type.rb
 - lib/pageflow/page_type_feature.rb
@@ -1956,8 +1965,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Multimedia story telling for the web.