pageflow 14.5.2 → 15.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 033f4a8249a6495f4efd89da77551f81f4c2ebc9d52239b556a1bbe8fd5ffc5b
-  data.tar.gz: 7acc4e48d957b31061fe32b5cbc089c446b8b77cfeeecb0524f124bb84625225
+  metadata.gz: 5feb7019e9f96f81e5a8e469ad88fdfd96cd1c9a5ced86b41c5e2f6ee6f1f513
+  data.tar.gz: 1f031ca982c495df641f3ddf97a72fafadcb51134075043c987048dbc147a81f
 SHA512:
-  metadata.gz: aa80c8bff2c29709f64238ded3af623132485aee9b67f30fd90392b2b48015985d52f951bad79f93f546a6cf81505f3560702dd6c53f76def9a82687652cc0f3
-  data.tar.gz: 01c0d4e10ae16e0ecea6d489b1ab3ffa98fa6a8d8ff534cefe83677c9e63bfb891fd0f8f36d9274aae2a4a770808ce3b91fdd9fcb79b06f8444eb3a048ad938c
+  metadata.gz: d1c2e4aed4664e290da0c82c9399a68f35d7ed1a53cfbfa2dabb1f82ffad96f58a7b3a45ccaa4768405ff81a227e4147298955fcf2957f73e687037f277c22c4
+  data.tar.gz: c7cb6b5d037cf93b22046b426ce4ab6e97930a8a3c797ec2873c486a9901f9e684db4a1fffa9a6c88cbf2f26dd2fc3b1b28a49159fec0dbf2d8893febb3d7f32

data/CHANGELOG.md

@@ -1,44 +1,49 @@
 # CHANGELOG
 
-### Version 14.5.2
-
-2022-09-14
-
-[Compare changes](https://github.com/codevise/pageflow/compare/v14.5.1...v14.5.2)
-
-##### Security
-
-- Fix
-  [GHSA-qcqv-38jg-2r43](https://github.com/codevise/pageflow/security/advisories/GHSA-qcqv-38jg-2r43):
-  Insecure direct object reference in membership update endpoint
-  ([#1862](https://github.com/codevise/pageflow/pull/1862))
-- Fix
-  [GHSA-wrrw-crp8-979q](https://github.com/codevise/pageflow/security/advisories/GHSA-wrrw-crp8-979q):
-  Sensitive user data extraction via Ransack query injection
-  ([#1862](https://github.com/codevise/pageflow/pull/1862))
-
-### Version 14.5.1
-
-2019-10-31
-
-[Compare changes](https://github.com/codevise/pageflow/compare/v14.5.0...v14.5.1)
-
-- Require Sprockets < 4 (14.x Backport)
-  ([#1235](https://github.com/codevise/pageflow/pull/1235))
-
-### Version 14.5.0
-
-2019-10-31
-
-[Compare changes](https://github.com/codevise/pageflow/compare/14-4-stable...v14.5.0)
-
-- Info box pointer-events enabled for anchor tag
-  ([#1213](https://github.com/codevise/pageflow/pull/1213))
-- Update Twitter share URL
-  ([#1204](https://github.com/codevise/pageflow/pull/1204))
-- Configurable loading spinner
-  ([#1186](https://github.com/codevise/pageflow/pull/1186))
+### Version 15.0.0.beta1
+
+2019-07-31
+
+[Compare changes](https://github.com/codevise/pageflow/compare/14-x-stable...v15.0.0.beta1)
+
+#### Manual Update Steps
+
+- Refactor file modules
+  ([#1180](https://github.com/codevise/pageflow/pull/1180))
+  
+  This version includes various refactorings and class renamings.
+  If you include any of the files or modules below, you need to update your code accordingly.
+  
+  ##### File modules:
+  HostedFile => UploadableFile (concerning uploading of files)\
+  UploadedFile => ReusableFile (concerning usage of files)
+  
+  ##### StateMachines:
+  ProcessedFileStateMachine => ImageAndTextTrackProcessingStateMachine\
+  EncodedFileStateMachine => MediaEncodingStateMachine
+  
+  ##### StateMachineJobs:
+  ProcessFileJob => ProcessImageOrTextTrackJob 
+  
+- Introduce PermaId on FileUsage, change file lookup to PermaId throughout Pageflow codebase.
+  ([#1179](https://github.com/codevise/pageflow/pull/1179))
+  
+  File lookup is now done via the `perma_id` of the files usage within the revisions scope.
+  Therefore it is strongly advised to change file lookup to the new RevisionFileHelper:
+  
+  I.e.
+  ```
+  Pageflow::Imagefile.find(some_id)
+  ```
+  will become
+  ```
+  include RevisionFileHelper
+  [...]
+  find_file_in_entry(Pageflow::Imagefile, image_file_usage_perma_id)
+  ```
+  
+  Also see migration inside the PR.
 
 See
-[14-4-stable branch](https://github.com/codevise/pageflow/blob/14-4-stable/CHANGELOG.md)
+[14-x-stable branch](https://github.com/codevise/pageflow/blob/14-x-stable/CHANGELOG.md)
 for previous changes.

data/admins/pageflow/membership.rb

@@ -100,11 +100,7 @@ module Pageflow
       private
 
       def permitted_params
-        if [:create, :new].include?(action_name.to_sym)
-          params.permit(membership: [:user_id, :entity_id, :entity_type, :role])
-        else
-          params.permit(membership: [:role])
-        end
+        params.permit(membership: [:user_id, :entity_id, :entity_type, :role])
       end
 
       def redirect_path

data/app/assets/javascripts/pageflow/dist/react-client.js

@@ -8960,7 +8960,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 
 	var _loadingSpinner = __webpack_require__(619);
 
-	var _pageflow = __webpack_require__(623);
+	var _pageflow = __webpack_require__(622);
 
 	var _pageflow2 = _interopRequireDefault(_pageflow);
 
@@ -12016,7 +12016,6 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	});
 	exports.firstPage = exports.selector = exports.pageBackgroundImageUrl = undefined;
 	exports.firstPageAttribures = firstPageAttribures;
-	exports.firstPageAttribute = firstPageAttribute;
 	exports.pageAttribute = pageAttribute;
 	exports.pageAttributes = pageAttributes;
 	exports.pageState = pageState;
@@ -12046,12 +12045,6 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	  });
 	}
 
-	function firstPageAttribute(property) {
-	  return (0, _utils.memoizedSelector)(firstPage, function (page) {
-	    return page && page.attributes[property];
-	  });
-	}
-
 	function pageAttribute(property, options) {
 	  return (0, _utils.memoizedSelector)(selector(options), function (page) {
 	    return page && page.attributes[property];
@@ -24287,7 +24280,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	function autoTextTrackFile(textTrackFiles, defaultTextTrackFileId, locale, volume) {
 	  if (defaultTextTrackFileId) {
 	    var defaultTextTrackFile = textTrackFiles.find(function (textTrackFile) {
-	      return textTrackFile.id == defaultTextTrackFileId;
+	      return textTrackFile.permaId == defaultTextTrackFileId;
 	    });
 
 	    if (defaultTextTrackFile) {
@@ -29932,7 +29925,8 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	        collectionName: (0, _utils.camelize)(collectionName),
 	        dispatch: dispatch,
 
-	        attributes: ['id', 'basename', 'variants', 'is_ready', 'parent_file_id', 'parent_file_model_type', 'width', 'height', 'duration_in_ms', 'rights', 'created_at'],
+	        idAttribute: 'perma_id',
+	        attributes: ['id', 'perma_id', 'basename', 'variants', 'is_ready', 'parent_file_id', 'parent_file_model_type', 'width', 'height', 'duration_in_ms', 'rights', 'created_at'],
 	        includeConfiguration: true
 	      });
 	    });
@@ -29950,7 +29944,9 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	    return {
 	      files: (0, _redux.combineReducers)(Object.keys(files).reduce(function (result, collectionName) {
 	        collectionName = (0, _utils.camelize)(collectionName);
-	        result[collectionName] = (0, _collections.createReducer)(collectionName);
+	        result[collectionName] = (0, _collections.createReducer)(collectionName, {
+	          idAttribute: 'permaId'
+	        });
 	        return result;
 	      }, {})),
 
@@ -31086,14 +31082,11 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 
 	var _ClassicLoadingSpinner = __webpack_require__(620);
 
-	var _MediaLoadingSpinner = __webpack_require__(621);
-
-	var _TitleLoadingSpinner = __webpack_require__(622);
+	var _TitleLoadingSpinner = __webpack_require__(621);
 
 	function registerWidgetTypes() {
 	  (0, _ClassicLoadingSpinner.register)();
 	  (0, _TitleLoadingSpinner.register)();
-	  (0, _MediaLoadingSpinner.register)();
 	}
 
 /***/ }),
@@ -31243,11 +31236,9 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	Object.defineProperty(exports, "__esModule", {
 	  value: true
 	});
-	exports.MediaLoadingSpinner = exports.MediaLoadingSpinnerComponent = undefined;
 
 	var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
-	exports.getInvert = getInvert;
 	exports.register = register;
 
 	var _utils = __webpack_require__(340);
@@ -31282,13 +31273,13 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 
 	function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
-	var MediaLoadingSpinnerComponent = exports.MediaLoadingSpinnerComponent = function (_React$Component) {
-	  _inherits(MediaLoadingSpinnerComponent, _React$Component);
+	var TitleLoadingSpinner = function (_React$Component) {
+	  _inherits(TitleLoadingSpinner, _React$Component);
 
-	  function MediaLoadingSpinnerComponent(props) {
-	    _classCallCheck(this, MediaLoadingSpinnerComponent);
+	  function TitleLoadingSpinner(props) {
+	    _classCallCheck(this, TitleLoadingSpinner);
 
-	    var _this = _possibleConstructorReturn(this, (MediaLoadingSpinnerComponent.__proto__ || Object.getPrototypeOf(MediaLoadingSpinnerComponent)).call(this, props));
+	    var _this = _possibleConstructorReturn(this, (TitleLoadingSpinner.__proto__ || Object.getPrototypeOf(TitleLoadingSpinner)).call(this, props));
 
 	    _this.state = {
 	      hidden: false,
@@ -31297,7 +31288,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	    return _this;
 	  }
 
-	  _createClass(MediaLoadingSpinnerComponent, [{
+	  _createClass(TitleLoadingSpinner, [{
 	    key: 'componentDidMount',
 	    value: function componentDidMount() {
 	      var _this2 = this;
@@ -31338,29 +31329,42 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	    value: function render() {
 	      var _this4 = this;
 
-	      var editing = this.props.editing;
+	      var _props = this.props,
+	          editing = _props.editing,
+	          title = _props.title,
+	          subtitle = _props.subtitle,
+	          entryTitle = _props.entryTitle;
 	      var _state = this.state,
 	          hidden = _state.hidden,
 	          animating = _state.animating;
 
-	      var invert = getInvert(this.props);
-	      var logoElement = _react2.default.createElement('div', { className: (0, _classnames2.default)("media_loading_spinner-logo", { 'media_loading_spinner-logo-invert': invert }) });
-	      if (this.props.removeLogo) {
-	        logoElement = '';
-	      }
+
 	      if (editing || !hidden) {
 	        return _react2.default.createElement(
 	          'div',
-	          { className: (0, _classnames2.default)('media_loading_spinner', { 'media_loading_spinner-fade': animating }, { 'media_loading_spinner-invert': invert }),
+	          { className: (0, _classnames2.default)('title_loading_spinner', { 'title_loading_spinner-fade': animating }),
 	            onAnimationEnd: function onAnimationEnd(event) {
 	              return _this4.hideOrLoop(event);
 	            },
 	            onTouchMove: preventScrollBouncing,
-	            style: inlineStyle(this.props) },
-	          logoElement,
-	          _react2.default.createElement('div', { className: 'media_loading_spinner-image',
+	            style: inlineStyle() },
+	          _react2.default.createElement('div', { className: 'title_loading_spinner-logo' }),
+	          _react2.default.createElement('div', { className: 'title_loading_spinner-image',
 	            style: backgroundImageInlineStyles(this.props) }),
-	          this.props.children
+	          _react2.default.createElement(
+	            'div',
+	            { className: 'title_loading_spinner-titles' },
+	            _react2.default.createElement(
+	              'div',
+	              { className: 'title_loading_spinner-title' },
+	              title || entryTitle
+	            ),
+	            _react2.default.createElement(
+	              'div',
+	              { className: 'title_loading_spinner-subtitle' },
+	              subtitle
+	            )
+	          )
 	        );
 	      } else {
 	        return _react2.default.createElement('noscript', null);
@@ -31368,36 +31372,10 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	    }
 	  }]);
 
-	  return MediaLoadingSpinnerComponent;
+	  return TitleLoadingSpinner;
 	}(_react2.default.Component);
 
-	function preventScrollBouncing(e) {
-	  e.preventDefault();
-	}
-
-	function backgroundImageInlineStyles(_ref) {
-	  var firstPageBackgroundImageUrl = _ref.firstPageBackgroundImageUrl,
-	      backgroundImage = _ref.backgroundImage,
-	      blurStrength = _ref.blurStrength;
-
-	  var url = backgroundImage ? backgroundImage.urls.medium : firstPageBackgroundImageUrl;
-	  if (url) {
-	    return {
-	      backgroundImage: 'url("' + url + '")',
-	      filter: 'blur(' + blurStrength + 'px)'
-	    };
-	  }
-	}
-
-	function getInvert(props) {
-	  if (!props.backgroundImage && props.invert == undefined) {
-	    return props.firstPageInvert;
-	  }
-	  return props.invert;
-	}
-
-	function inlineStyle(props) {
-	  var invert = getInvert(props);
+	function inlineStyle() {
 	  return {
 	    position: 'absolute',
 	    top: 0,
@@ -31405,144 +31383,49 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	    width: '100%',
 	    height: '100%',
 	    zIndex: 100,
-	    backgroundColor: invert ? '#fff' : '#000'
+	    backgroundColor: '#000'
 	  };
 	}
 
-	var MediaLoadingSpinner = exports.MediaLoadingSpinner = (0, _reactRedux.connect)((0, _utils.combineSelectors)({
-	  editing: (0, _selectors2.editingWidget)({ role: 'loading_spinner' }),
-	  firstPageInvert: (0, _selectors4.firstPageAttribute)('invert'),
-	  firstPageBackgroundImageUrl: (0, _selectors4.pageBackgroundImageUrl)({
-	    variant: 'medium',
-	    page: (0, _selectors4.firstPageAttribures)()
-	  }),
-	  backgroundImage: (0, _selectors3.file)('imageFiles', {
-	    id: (0, _selectors2.widgetAttribute)('customBackgroundImageId', {
-	      role: 'loading_spinner'
-	    })
-	  }),
-	  invert: (0, _selectors2.widgetAttribute)('invert', { role: 'loading_spinner' }),
-	  removeLogo: (0, _selectors2.widgetAttribute)('removeLogo', { role: 'loading_spinner' }),
-	  blurStrength: (0, _selectors2.widgetAttribute)('blurStrength', { role: 'loading_spinner' })
-	}))(MediaLoadingSpinnerComponent);
-
-	function register() {
-	  (0, _registerWidgetType2.default)('media_loading_spinner', {
-	    component: MediaLoadingSpinner
-	  });
-	}
-
-/***/ }),
-/* 622 */
-/***/ (function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	Object.defineProperty(exports, "__esModule", {
-	  value: true
-	});
-	exports.TitleLoadingSpinner = undefined;
-
-	var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-	exports.register = register;
-
-	var _utils = __webpack_require__(340);
-
-	var _react = __webpack_require__(334);
-
-	var _react2 = _interopRequireDefault(_react);
-
-	var _reactRedux = __webpack_require__(399);
-
-	var _classnames = __webpack_require__(335);
-
-	var _classnames2 = _interopRequireDefault(_classnames);
-
-	var _registerWidgetType = __webpack_require__(565);
-
-	var _registerWidgetType2 = _interopRequireDefault(_registerWidgetType);
-
-	var _selectors = __webpack_require__(503);
-
-	var _selectors2 = __webpack_require__(376);
-
-	var _selectors3 = __webpack_require__(429);
-
-	var _selectors4 = __webpack_require__(494);
-
-	var _MediaLoadingSpinner = __webpack_require__(621);
-
-	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-	function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-	function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-	var TitleLoadingSpinner = exports.TitleLoadingSpinner = function (_React$Component) {
-	  _inherits(TitleLoadingSpinner, _React$Component);
+	function backgroundImageInlineStyles(_ref) {
+	  var firstPageBackgroundImageUrl = _ref.firstPageBackgroundImageUrl,
+	      backgroundImage = _ref.backgroundImage;
 
-	  function TitleLoadingSpinner() {
-	    _classCallCheck(this, TitleLoadingSpinner);
+	  var url = backgroundImage ? backgroundImage.urls.medium : firstPageBackgroundImageUrl;
 
-	    return _possibleConstructorReturn(this, (TitleLoadingSpinner.__proto__ || Object.getPrototypeOf(TitleLoadingSpinner)).apply(this, arguments));
+	  if (url) {
+	    return {
+	      backgroundImage: 'url("' + url + '")'
+	    };
 	  }
+	}
 
-	  _createClass(TitleLoadingSpinner, [{
-	    key: 'render',
-	    value: function render() {
-	      var _props = this.props,
-	          title = _props.title,
-	          subtitle = _props.subtitle,
-	          entryTitle = _props.entryTitle;
-
-	      var invert = (0, _MediaLoadingSpinner.getInvert)(this.props);
-	      return _react2.default.createElement(
-	        _MediaLoadingSpinner.MediaLoadingSpinner,
-	        null,
-	        _react2.default.createElement(
-	          'div',
-	          { className: (0, _classnames2.default)('media_loading_spinner-titles', { 'media_loading_spinner-invert': invert }) },
-	          _react2.default.createElement(
-	            'div',
-	            { className: 'media_loading_spinner-title' },
-	            title || entryTitle
-	          ),
-	          _react2.default.createElement(
-	            'div',
-	            { className: 'media_loading_spinner-subtitle' },
-	            subtitle
-	          )
-	        )
-	      );
-	    }
-	  }]);
-
-	  return TitleLoadingSpinner;
-	}(_react2.default.Component);
+	function preventScrollBouncing(e) {
+	  e.preventDefault();
+	}
 
 	function register() {
 	  (0, _registerWidgetType2.default)('title_loading_spinner', {
 	    component: (0, _reactRedux.connect)((0, _utils.combineSelectors)({
-	      firstPageInvert: (0, _selectors2.firstPageAttribute)('invert'),
+	      editing: (0, _selectors2.editingWidget)({ role: 'loading_spinner' }),
+	      firstPageBackgroundImageUrl: (0, _selectors4.pageBackgroundImageUrl)({
+	        variant: 'medium',
+	        page: (0, _selectors4.firstPageAttribures)()
+	      }),
 	      backgroundImage: (0, _selectors3.file)('imageFiles', {
-	        id: (0, _selectors4.widgetAttribute)('customBackgroundImageId', {
+	        id: (0, _selectors2.widgetAttribute)('customBackgroundImageId', {
 	          role: 'loading_spinner'
 	        })
 	      }),
 	      entryTitle: (0, _selectors.entryAttribute)('title'),
-	      title: (0, _selectors4.widgetAttribute)('title', { role: 'loading_spinner' }),
-	      subtitle: (0, _selectors4.widgetAttribute)('subtitle', { role: 'loading_spinner' }),
-	      removeLogo: (0, _selectors4.widgetAttribute)('removeLogo', { role: 'loading_spinner' }),
-	      invert: (0, _selectors4.widgetAttribute)('invert', { role: 'loading_spinner' })
+	      title: (0, _selectors2.widgetAttribute)('title', { role: 'loading_spinner' }),
+	      subtitle: (0, _selectors2.widgetAttribute)('subtitle', { role: 'loading_spinner' })
 	    }))(TitleLoadingSpinner)
 	  });
 	}
 
 /***/ }),
-/* 623 */
+/* 622 */
 /***/ (function(module, exports) {
 
 	module.exports = pageflow;