pageflow 15.2.2 → 15.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96f84a19d2aa50c2afc00d37aa82fc7c80ac4a8670667ac5823494cf8af4d221
-  data.tar.gz: b50cf792f81b8b7e61df6d22876dca72eaa1b0728549bb378f9641bbba4763fd
+  metadata.gz: 6388531c85a2d391a0a61f48054aad19cd68a59e3d8c80484ca660ae8b5d88c9
+  data.tar.gz: c07d1a7b17523b5257587582b81379890e90fdcb15547d875447fcd34493f759
 SHA512:
-  metadata.gz: 21d633f0e23d4c1e97739acbee71d940a934221d7c72f1e2293ac00a758f96c8f624090dd1970b2690b04da8df6fb70a0330fe930e9b7365faf848b68b54abfc
-  data.tar.gz: 69776aa736a02178d13001e8ac627a42b4db1ebf1a4386d2a337d9adcdf6035b6da78fb88f9db26094cd4b14c35acf8d12fb5df01427130af155c8ce9eeff900
+  metadata.gz: 5e0a92e7a71d751dcaafc8bac07e0fae1369323864d4911c90b51c017c2aa24a383df87c811a85216ae29de00e7f3dc4a3f15493a00500b6793fc097378eb241
+  data.tar.gz: 7581eed1244ccce3eb97a2ad3698120e24f848e0fbf23e76b251775fc3b8525554b5ed8d2fa711409b6c726c0919d43cf7842dd59ec3f7454d4d05159596d1c4

data/CHANGELOG.md

@@ -1,130 +1,23 @@
 # CHANGELOG
 
-### Version 15.2.2
+### Version 15.6.1
 
-2020-07-15
+2021-05-10
 
-[Compare changes](https://github.com/codevise/pageflow/compare/v15.2.1.0...v15.2.2)
+[Compare changes](https://github.com/codevise/pageflow/compare/v15.6.0...v15.6.1)
 
-- Fix dummy app generation with Thor 1.0
-  ([#1526](https://github.com/codevise/pageflow/pull/1526))
+- Include shared config from `pageflow-scrolled` package in gem.
+  ([#1690](https://github.com/codevise/pageflow/pull/1690))
 
-### Version 15.2.1
+### Version 15.6.0
 
-2020-04-02
+2021-05-10
 
-[Compare changes](https://github.com/codevise/pageflow/compare/v15.2.0...v15.2.1)
+[Compare changes](https://github.com/codevise/pageflow/compare/15-5-stable...v15.6.0)
 
-- Fix disabling home button input in account form based on theme (15.2 Backport)
-  ([#1376](https://github.com/codevise/pageflow/pull/1376))
-- Include scrolled content element js files in gem (15.2 Backport)
-  ([#1374](https://github.com/codevise/pageflow/pull/1374))
-
-### Version 15.2.0
-
-2020-04-01
-
-[Compare changes](https://github.com/codevise/pageflow/compare/15-1-stable...v15.2.0)
-
-#### Core
-
-##### Editor
-
-- Bug fix: Re-add entry.configuration in editor for backwards compatibility
-  ([#1331](https://github.com/codevise/pageflow/pull/1331))
-- Bug fix: Fix help link in editor page type drop down
-  ([#1372](https://github.com/codevise/pageflow/pull/1372))
-
-##### Documentation
-
-- Remind developers to configure their editor with ESLint before starting to contribute
-  ([#1369](https://github.com/codevise/pageflow/pull/1369))
-- Move troubleshooting to docs
-  ([#1327](https://github.com/codevise/pageflow/pull/1327))
-
-##### Internal
-
-- Extract entry template from theming
-  ([#1315](https://github.com/codevise/pageflow/pull/1315))
-- Use Ruby 2.6.5 in Travis
-  ([#1334](https://github.com/codevise/pageflow/pull/1334))
-- Remove pageflow-react from yarn workspace list
-  ([#1329](https://github.com/codevise/pageflow/pull/1329))
-
-#### Paged Entry Type
-
-##### Published Entry
-
-- Allow hiding the logo on page level
-  ([#1356](https://github.com/codevise/pageflow/pull/1356))
-- Bug fix: Make multimedia alert and new pages box display again for
-  new entries
-  ([#1366](https://github.com/codevise/pageflow/pull/1366))
-
-#### Scrolled Entry Type
-
-##### Content Elements
-
-- Add before/after content element
-  ([#1351](https://github.com/codevise/pageflow/pull/1351))
-- dataWrapperChart content element
-  ([#1349](https://github.com/codevise/pageflow/pull/1349),
-   [#1355](https://github.com/codevise/pageflow/pull/1355))
-- External link content element
-  ([#1346](https://github.com/codevise/pageflow/pull/1346))
-- Add videoEmbed content element
-  ([#1336](https://github.com/codevise/pageflow/pull/1336))
-
-##### Widgets
-
-- Improve navigation
-  ([#1347](https://github.com/codevise/pageflow/pull/1347))
-
-##### Editor
-
-- Adding content elements
-  ([#1337](https://github.com/codevise/pageflow/pull/1337))
-- Edit content elements in the editor
-  ([#1335](https://github.com/codevise/pageflow/pull/1335))
-- Add inline help texts for scrolled editor
-  ([#1353](https://github.com/codevise/pageflow/pull/1353))
-- Add section editing options in editor sidebar
-  ([#1363](https://github.com/codevise/pageflow/pull/1363))
-
-##### JavaScript API
-
-- Export useFile hook from scrolled frontend
-  ([#1371](https://github.com/codevise/pageflow/pull/1371))
-- Fix useFileRights hook
-  ([#1357](https://github.com/codevise/pageflow/pull/1357))
-- I18n for scrolled frontend
-  ([#1342](https://github.com/codevise/pageflow/pull/1342))
-- Content element frontend api
-  ([#1324](https://github.com/codevise/pageflow/pull/1324))
-- Enable registering content elements with default config
-  ([#1354](https://github.com/codevise/pageflow/pull/1354),
-   [#1360](https://github.com/codevise/pageflow/pull/1360))
-- Introduce configuration editor groups in scrolled editor
-  ([#1352](https://github.com/codevise/pageflow/pull/1352),
-   [#1365](https://github.com/codevise/pageflow/pull/1365))
-- Improve guides
-  ([#1362](https://github.com/codevise/pageflow/pull/1362),
-   [#1348](https://github.com/codevise/pageflow/pull/1348),
-   [#1344](https://github.com/codevise/pageflow/pull/1344))
-
-##### Internal
-
-- Make package imports external by default in Rollup config
-  ([#1341](https://github.com/codevise/pageflow/pull/1341))
-- Make pageflow-scrolled Capybara specs less flaky
-  ([#1339](https://github.com/codevise/pageflow/pull/1339))
-- Prevent Percy from reporting different video loading progress
-  ([#1343](https://github.com/codevise/pageflow/pull/1343))
-- Enable React devtools in editor iframe
-  ([#1338](https://github.com/codevise/pageflow/pull/1338))
-- Setup Storybook for content element development
-  ([#1326](https://github.com/codevise/pageflow/pull/1326))
+- Support non-root packages in `create_bundle_symlinks_for_yarn` tasks
+  ([#1689](https://github.com/codevise/pageflow/pull/1689))
 
 See
-[15-1-stable branch](https://github.com/codevise/pageflow/blob/15-1-stable/CHANGELOG.md)
+[15-5-stable branch](https://github.com/codevise/pageflow/blob/15-5-stable/CHANGELOG.md)
 for previous changes.

data/README.md

@@ -1,7 +1,7 @@
 # Pageflow
 
 [![Gem Version](https://badge.fury.io/rb/pageflow.svg)](http://badge.fury.io/rb/pageflow)
-[![Build Status](https://travis-ci.org/codevise/pageflow.svg?branch=master)](https://travis-ci.org/codevise/pageflow)
+[![Build Status](https://github.com/codevise/pageflow/workflows/tests/badge.svg)](https://github.com/codevise/pageflow/actions)
 [![Coverage Status](https://coveralls.io/repos/github/codevise/pageflow/badge.svg?branch=master)](https://coveralls.io/github/codevise/pageflow?branch=master)
 [![Code Climate](https://codeclimate.com/github/codevise/pageflow/badges/gpa.svg)](https://codeclimate.com/github/codevise/pageflow)
 [![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
@@ -53,7 +53,7 @@ Pageflow assumes the following choice of libraries:
 Pageflow runs in environments with:
 
 * Ruby >= 2.1 (see `.travis.yml` for supported versions)
-* Node >= 10.0
+* Node >= 10.18
 * Rails 4.2
 * Redis server (for Resque)
 * A database server supported by Active Record (tested with MySQL)
@@ -212,4 +212,3 @@ We would like to express our special thanks to the following services
 for supporting Pageflow through free open source plans:
 
 [![BrowserStack](doc/supporter_logos/browser_stack.png)](https://browserstack.com)
-[![Travis CI](doc/supporter_logos/travis_ci.png)](https://travis-ci.com/)

data/admins/pageflow/accounts.rb

@@ -30,9 +30,6 @@ module Pageflow
           membership_role_with_tooltip(own_role, scope: 'own_account_role')
         end
       end
-      column :default_theming do |account|
-        account.first_paged_entry_template.theme_name if authorized?(:read, account)
-      end
     end
 
     csv do
@@ -63,7 +60,6 @@ module Pageflow
     show :title => :name do |account|
       render 'account_details', :account => account
       render 'theming_details', :account => account
-      render 'entry_template_details', account: account
 
       tabs_view(Pageflow.config.admin_resource_tabs.find_by_resource(account.default_theming),
                 i18n: 'pageflow.admin.resource_tabs',
@@ -76,76 +72,25 @@ module Pageflow
       helper Pageflow::Admin::FormHelper
       helper Pageflow::Admin::LocalesHelper
       helper Pageflow::Admin::MembershipsHelper
-      helper Pageflow::Admin::WidgetsHelper
       helper ThemesHelper
 
       def new
         @account = Account.new
         @account.build_default_theming
-        @entry_template = @account.entry_templates.build(
-          default_locale: current_user.locale,
-          share_providers: Pageflow.config.default_share_providers,
-          entry_type: 'paged'
-        )
       end
 
       def create
-        account_params = (permitted_params[:account] || {})
-                         .except(:paged_entry_template_attributes)
+        account_params = permitted_params[:account] || {}
         @account = Account.new(account_params)
         @account.build_default_theming(permitted_params.fetch(:account, {})[
                                          :default_theming_attributes])
-        @entry_template = @account.entry_templates.build({entry_type: 'paged'}
-                                                  .merge(entry_template_params))
-
-        super
-        update_widgets('paged')
-      end
-
-      def edit
-        @entry_template = resource.first_paged_entry_template
         super
       end
 
       def update
-        @entry_template = resource.entry_templates.find_or_initialize_by(
-          entry_type: 'paged'
-        )
-        @entry_template.assign_attributes(entry_template_params)
-        @entry_template.save
         update! do |success, failure|
           success.html { redirect_to(admin_account_path(resource, params.permit(:tab))) }
         end
-        update_widgets('paged')
-      end
-
-      def entry_template_params
-        current_params = permitted_params_with_entry_template_attributes.fetch(:account, {})[
-          :paged_entry_template_attributes]&.to_hash
-        if current_params
-          config = true_false_strings_to_booleans_or_numbers(
-            current_params['configuration']
-          )
-          share_providers = true_false_strings_to_booleans_or_numbers(
-            current_params['share_providers']
-          )
-          current_params.merge('configuration' => config, 'share_providers' => share_providers)
-        else
-          {}
-        end
-      end
-
-      def update_widgets(entry_type)
-        if @account.valid?
-          EntryTemplate.find_by(account_id: @account.id, entry_type: entry_type)
-            &.widgets&.batch_update!(widgets_params)
-        end
-      end
-
-      def widgets_params
-        (params[:widgets].try(:permit!).to_h || {}).map do |role, type_name|
-          {role: role, type_name: type_name}
-        end
       end
 
       def permitted_params
@@ -154,12 +99,6 @@ module Pageflow
         with_permitted_feature_states(result)
       end
 
-      def permitted_params_with_entry_template_attributes
-        result = params.permit(account: permitted_account_attributes_plus_entry_template)
-
-        with_permitted_feature_states(result)
-      end
-
       def scoped_collection
         super.includes(:default_theming)
       end
@@ -172,25 +111,6 @@ module Pageflow
         result
       end
 
-      def true_false_strings_to_booleans_or_numbers(hash)
-        hash&.map { |k, v| [k, to_boolean_or_number(v)] }&.to_h
-      end
-
-      def to_boolean_or_number(value)
-        case value
-        when 'false'
-          false
-        when 'true'
-          true
-        when '0'
-          0
-        when '1'
-          1
-        else
-          value
-        end
-      end
-
       def permitted_account_attributes
         [
           :name,
@@ -200,11 +120,6 @@ module Pageflow
           permitted_attributes_for(:account)
       end
 
-      def permitted_account_attributes_plus_entry_template
-        permitted_account_attributes +
-          [paged_entry_template_attributes: permitted_entry_template_attributes]
-      end
-
       def permitted_theming_attributes
         [
           :cname,
@@ -219,18 +134,6 @@ module Pageflow
           permitted_attributes_for(:theming)
       end
 
-      def permitted_entry_template_attributes
-        [
-          :theme_name,
-          :default_author,
-          :default_publisher,
-          :default_keywords,
-          :default_locale,
-          share_providers: {},
-          configuration: {}
-        ]
-      end
-
       def permitted_attributes_for(resource_name)
         if params[:id]
           Pageflow.config_for(resource).admin_form_inputs.permitted_attributes_for(resource_name)

data/admins/pageflow/entry.rb

@@ -130,6 +130,14 @@ module Pageflow
                   input_html: {style: 'width: 200px'})
         end
 
+        if f.object.new_record?
+          f.input :type_name,
+                  as: :select,
+                  include_blank: false,
+                  collection: entry_type_collection,
+                  wrapper_html: {style: 'display: none'}
+        end
+
         if authorized?(:configure_folder_for, resource)
           folder_collection = collection_for_folders(resource.account, resource.folder)
           f.input(:folder,
@@ -168,6 +176,18 @@ module Pageflow
       end
     end
 
+    collection_action :entry_types do
+      account = Pageflow::Account.find(params[:account_id])
+
+      if authorized?(:see_entry_types, account)
+        @entry_types = helpers.entry_type_collection_for_account(account)
+
+        render(layout: false)
+      else
+        render(partial: 'not_allowed_to_see_entry_types', status: 403)
+      end
+    end
+
     member_action :duplicate, method: :post do
       entry = Entry.find(params[:id])
       authorize!(:duplicate, entry)
@@ -251,7 +271,7 @@ module Pageflow
       end
 
       def permitted_attributes
-        result = [:title]
+        result = [:title, :type_name]
         target = if !params[:id] && current_user.admin?
                    Account.first
                  elsif params[:id]

data/admins/pageflow/entry_templates.rb

@@ -0,0 +1,140 @@
+module Pageflow
+  ActiveAdmin.register EntryTemplate, as: 'EntryTemplate' do
+    menu false
+    config.batch_actions = false
+    actions :index, :new, :create, :edit, :update
+    form partial: 'form'
+
+    belongs_to :account, parent_class: Pageflow::Account
+
+    breadcrumb do
+      breadcrumb_links.first 3
+    end
+
+    controller do
+      helper Pageflow::Admin::FormHelper
+      helper Pageflow::Admin::WidgetsHelper
+
+      def index
+        redirect_to redirect_path
+      end
+
+      def new
+        account = Account.find(params[:account_id])
+        @entry_template = EntryTemplate.new(
+          account: account,
+          entry_type_name: params[:entry_type_name]
+        )
+
+        @page_title = page_title('new', params[:entry_type_name])
+
+        super
+      end
+
+      def create
+        @entry_template = EntryTemplate.new(
+          entry_template_params.merge(account_id: permitted_params[:account_id])
+        )
+        @page_title = page_title('new', @entry_template.entry_type_name)
+        authorize!(:create, @entry_template)
+        create! { redirect_path }
+        update_widgets if @entry_template.errors.empty?
+      end
+
+      def edit
+        @page_title = page_title('edit', resource.entry_type_name)
+        super
+      end
+
+      def update
+        @entry_template = EntryTemplate.find(params[:id])
+        @entry_template.assign_attributes(entry_template_params)
+        @page_title = page_title('edit', @entry_template.entry_type_name)
+        params[:entry_template].delete('share_providers')
+        params[:entry_template].delete('configuration')
+        authorize!(:update, @entry_template)
+        update! { redirect_path }
+        update_widgets if @entry_template.errors.empty?
+      end
+
+      private
+
+      def page_title(rest_verb, entry_type_name)
+        "#{I18n.t('pageflow.admin.entry_templates.page_title.' + rest_verb)} "\
+        "#{I18n.t('activerecord.values.pageflow/entry.type_names.' + entry_type_name)}"
+      end
+
+      def permitted_params
+        params.permit(
+          :account_id,
+          entry_template: permitted_entry_template_attributes
+        )
+      end
+
+      def permitted_entry_template_attributes
+        [
+          :id,
+          :account_id,
+          :entry_type_name,
+          :theme_name,
+          :default_author,
+          :default_publisher,
+          :default_keywords,
+          :default_locale,
+          share_providers: {},
+          configuration: {}
+        ]
+      end
+
+      def redirect_path
+        admin_account_path(params[:account_id], tab: 'entry_templates')
+      end
+
+      def entry_template_params
+        current_params = permitted_params[:entry_template]&.to_hash
+
+        if current_params
+          config = true_false_strings_to_booleans_or_numbers(
+            current_params['configuration']
+          )
+          share_providers = true_false_strings_to_booleans_or_numbers(
+            current_params['share_providers']
+          )
+          current_params.merge('configuration' => config,
+                               'share_providers' => share_providers)
+        else
+          {}
+        end
+      end
+
+      def true_false_strings_to_booleans_or_numbers(hash)
+        hash&.map { |k, v| [k, to_boolean_or_number(v)] }&.to_h
+      end
+
+      def to_boolean_or_number(value)
+        case value
+        when 'false'
+          false
+        when 'true'
+          true
+        when '0'
+          0
+        when '1'
+          1
+        else
+          value
+        end
+      end
+
+      def update_widgets
+        resource.widgets&.batch_update!(widgets_params)
+      end
+
+      def widgets_params
+        (params[:widgets].try(:permit!).to_h || {}).map do |role, type_name|
+          {role: role, type_name: type_name}
+        end
+      end
+    end
+  end
+end