pageflow 15.7.0 → 15.8.0

data/app/assets/stylesheets/pageflow/admin.scss

@@ -31,6 +31,7 @@ $pageflow-hint-color: #666 !default;
 @import "pageflow/admin/hint";
 @import "pageflow/admin/icon_button";
 @import "pageflow/admin/icon_link";
+@import "pageflow/admin/permalink_input";
 @import "pageflow/admin/publication_state_indicator";
 @import "pageflow/admin/quotas";
 @import "pageflow/admin/status_tags";

data/app/assets/stylesheets/pageflow/editor/base.scss

@@ -40,7 +40,7 @@
     padding: 0;
   }
 
-  h2 {
+  .sidebar-header {
     font-size: inherit;
     font-weight: 500;
     margin: 15px 0 5px 0;
@@ -159,12 +159,8 @@ main.ui-layout-pane {
   border-bottom-right-radius: rounded(lg);
 }
 
-main > div {
+#entry_preview {
   height: 100%;
-
-  > .container {
-    height: 100%;
-  }
 }
 
 #help_entries_seed {

data/app/assets/stylesheets/pageflow/editor/dialogs.scss

@@ -56,6 +56,8 @@
   }
 
   .dialog-sub_header {
+    font-size: inherit;
+    font-weight: 500;
     border-bottom: solid 1px var(--ui-on-surface-color-lighter);
     margin: 0;
     padding: space(1) 0;

data/app/assets/stylesheets/pageflow/editor/drop_down_button.scss

@@ -9,6 +9,14 @@
   > button.has_icon_only {
     @include icon-only-button;
   }
+
+  &.full_width {
+    width: 100%;
+
+    > button {
+      width: 100%;
+    }
+  }
 }
 
 .drop_down_button_menu {
@@ -24,6 +32,7 @@
   border-radius: rounded(sm);
   box-shadow: var(--ui-box-shadow);
   background-color: var(--ui-surface-color);
+  box-sizing: border-box;
 
   &.is_visible {
     @include transition(visibility 0ms, opacity 100ms);

data/app/assets/stylesheets/pageflow/editor/info_box.scss

@@ -5,8 +5,9 @@
 
   .shortcuts {
     dt {
-      display: inline-block;
-      margin-top: 0.5em;
+      display: block;
+      margin: space(3) 0 space(2.5);
+      position: relative;
     }
 
     dd {
@@ -17,8 +18,17 @@
       border: solid 1px currentColor;
       border-radius: 4px;
       padding: 3px 5px;
-      display: inline-block;
       font-size: 11px;
     }
   }
+
+  .inline_help {
+    padding-top: 36px;
+  }
+
+  // Make sure the label is on top when an inline help text is displayed
+  dt:hover .shortcut {
+    z-index: 4;
+    position: relative;
+  }
 }

data/app/assets/stylesheets/pageflow/mixins/buttons.scss

@@ -59,6 +59,7 @@
         color: var(--ui-on-error-color);
       }
     } @else {
+      &.hover:not(:disabled):not(.disabled),
       &:hover:not(:disabled):not(.disabled) {
         border: 1px solid var(--ui-primary-color);
       }

data/app/assets/stylesheets/pageflow/page.scss

@@ -39,7 +39,6 @@
   }
 
   .scroller > div {
-    pointer-events: none;
     width: 75%;
 
     @include mobile {
@@ -70,7 +69,6 @@
   }
 
   .scroller > div {
-    pointer-events: none;
     width: 100%;
 
     @include mobile {

data/app/assets/stylesheets/pageflow/themes/default/page.scss

@@ -9,7 +9,7 @@ $page-typography: () !default;
 $page-content-text-typography: () !default;
 
 /// Typography for content text in phone layout.
-$page-content-text-phone-typography: () !default
+$page-content-text-phone-typography: () !default;
 
 /// Base font size for page content
 $page-content-font-size: 1em !default;

data/app/assets/stylesheets/pageflow/ui/forms.scss

@@ -32,7 +32,8 @@ textarea,
 [type="tel"],
 [type="time"],
 [type="week"],
-[multiple] {
+[multiple],
+button[aria-haspopup] {
   font-size: 13px;
   display: block;
   width: 100%;
@@ -43,6 +44,7 @@ textarea,
   border-radius: rounded();
   color: var(--ui-on-surface-color);
 
+  &[aria-expanded=true],
   &:focus {
     border-color: var(--ui-on-surface-color-light);
     box-shadow: 0 0 0 2px var(--ui-selection-color-light);
@@ -222,6 +224,7 @@ textarea.short {
 }
 
 .input-disabled {
+  button,
   select,
   input,
   textarea,

data/app/controllers/pageflow/editor/file_import_controller.rb

@@ -4,7 +4,6 @@ module Pageflow
     # appropriate file importer
     class FileImportController < Pageflow::ApplicationController
       before_action :authenticate_user!
-      respond_to :json
 
       def search
         result = file_importer.search file_importer_credentials, search_query
@@ -12,30 +11,35 @@ module Pageflow
       end
 
       def files_meta_data
-        result = file_importer.files_meta_data file_importer_credentials, selected_files
+        result = file_importer.files_meta_data(file_importer_credentials,
+                                               params.require(:files))
         render json: {data: result}
       end
 
       def start_import_job
         entry = DraftEntry.find(entry_name)
-        result = []
-        selected_files.each do |key, file|
-          file = key if file.nil?
-          file = file.permit(:file_name,
-                             :rights,
-                             :content_type,
-                             :file_size,
-                             :url,
-                             configuration: :alt)
-          entry_file, import_model = create_import_model entry, file
-          FileImportJob.perform_later import_model.id, file_importer_credentials
-          result.push file_response(entry_file, file)
+        authorize!(:edit, entry.to_model)
+
+        @items = files_params.map do |file_params|
+          file = entry.create_file!(file_type, file_params.except(:url))
+          file_import = create_file_import(file, file_params)
+
+          FileImportJob.perform_later(file_import.id, file_importer_credentials)
+
+          {file: file, source_url: file_params[:url]}
         end
-        render json: {data: result}
       end
 
       private
 
+      def create_file_import(file, file_params)
+        FileImport.create!(entry: file.entry,
+                           file_id: file.id,
+                           file_type: file_type.model.name,
+                           file_importer: file_importer.name,
+                           download_options: file_params.to_json)
+      end
+
       def authentication_provider
         file_importer.authentication_provider
       end
@@ -48,35 +52,21 @@ module Pageflow
         params.require(:entry_id)
       end
 
-      def selected_files
-        params.require(:files)
-      end
-
-      def collection_name
-        params.require(:collection)
-      end
-
-      def create_import_model(entry, file)
-        entry_file, file_type = create_entry_file entry, file
-        download_options = file.as_json
-        import_model = FileImport.create!(entry: entry_file.entry,
-                                          file_id: entry_file.id,
-                                          file_type: file_type.model.name,
-                                          file_importer: file_importer.name,
-                                          download_options: download_options.to_json)
-        [entry_file, import_model]
-      end
-
-      def create_entry_file(entry, file)
-        file_type = Pageflow.config.file_types.find_by_collection_name!(collection_name)
-        [entry.create_file!(file_type, file.except(:url)), file_type]
+      def files_params
+        params
+          .permit(files: [:file_name,
+                          :rights,
+                          :content_type,
+                          :file_size,
+                          :url,
+                          configuration: :alt])
+          .require(:files)
       end
 
-      def file_response(entry_file, file)
-        entry_file = entry_file.as_json
-        entry_file['type'] = params[:collection]
-        entry_file['source_url'] = file[:url]
-        entry_file
+      def file_type
+        @file_type ||= Pageflow.config.file_types.find_by_collection_name!(
+          params.require(:collection)
+        )
       end
 
       def file_importer

data/app/controllers/pageflow/entries_controller.rb

@@ -14,7 +14,7 @@ module Pageflow
     def show
       respond_to do |format|
         format.html do
-          entry = PublishedEntry.find(params[:id], entry_request_scope)
+          entry = find_by_permalink || find_by_slug
 
           return if redirect_according_to_entry_redirect(entry)
           return if redirect_according_to_public_https_mode
@@ -25,6 +25,18 @@ module Pageflow
       end
     end
 
+    def manifest
+      respond_to do |format|
+        format.webmanifest do
+          entry = PublishedEntry.find(params[:id], entry_request_scope)
+
+          return head :not_found unless entry.entry_type.web_app_manifest
+
+          render json: entry.entry_type.web_app_manifest.call(entry)
+        end
+      end
+    end
+
     def stylesheet
       respond_to do |format|
         format.css do
@@ -42,6 +54,18 @@ module Pageflow
 
     protected
 
+    def find_by_permalink
+      PublishedEntry.find_by_permalink(
+        directory: params[:directory],
+        slug: params[:id],
+        scope: entry_request_scope
+      )
+    end
+
+    def find_by_slug
+      PublishedEntry.find(params[:id], entry_request_scope)
+    end
+
     def entry_request_scope
       Pageflow.config.public_entry_request_scope.call(Entry, request)
     end

data/app/helpers/pageflow/admin/permalinks_helper.rb

@@ -0,0 +1,15 @@
+module Pageflow
+  module Admin
+    # @api private
+    module PermalinksHelper
+      def collection_for_permalink_directories(theming, permalink)
+        options_from_collection_for_select(
+          theming.permalink_directories,
+          'id',
+          'path',
+          permalink.directory_id
+        )
+      end
+    end
+  end
+end

data/app/helpers/pageflow/entries_helper.rb

@@ -36,7 +36,15 @@ module Pageflow
           .reverse_merge(trailing_slash: entry.theming.trailing_slash_in_canonical_urls)
           .reverse_merge(Pageflow.config.theming_url_options(entry.theming) || {})
 
-        routes.short_entry_url(entry.to_model, params)
+        if entry.permalink.present?
+          routes.permalink_url(
+            entry.permalink.directory&.path || '',
+            entry.permalink.slug,
+            params
+          )
+        else
+          routes.short_entry_url(entry.to_model, params)
+        end
       end
 
       def ensure_entry_with_revision(entry)

data/app/helpers/pageflow/themings_helper.rb

@@ -5,7 +5,7 @@ module Pageflow
     end
 
     def pretty_theming_url(theming)
-      public_root_url(Pageflow.config.theming_url_options(theming))
+      pageflow.public_root_url(Pageflow.config.theming_url_options(theming))
     end
   end
 end

data/app/inputs/pageflow_permalink_input.rb

@@ -0,0 +1,47 @@
+class PageflowPermalinkInput
+  include Formtastic::Inputs::Base
+  include Formtastic::Inputs::Base::Stringish
+
+  def to_html
+    input_wrapping do
+      label_html << permalink_html
+    end
+  end
+
+  private
+
+  def permalink_html
+    template.content_tag(
+      :div,
+      base_url_html << permalink_inputs_html,
+      class: 'permalink'
+    )
+  end
+
+  def base_url_html
+    template.content_tag(
+      :div,
+      options[:base_url].gsub(%r{^https?://}, ''),
+      class: 'permalink_base_url'
+    )
+  end
+
+  def permalink_inputs_html
+    return '' if options[:directory_collection].empty?
+
+    builder.select(:directory_id, options[:directory_collection]) <<
+      builder.text_field(:slug, placeholder: options[:slug_placeholder])
+  end
+
+  def error_keys
+    [:directory, :slug]
+  end
+
+  def wrapper_html_options
+    if options[:directory_collection].empty?
+      super.merge(style: 'display: none')
+    else
+      super
+    end
+  end
+end

data/app/models/concerns/pageflow/permalinkable.rb

@@ -0,0 +1,12 @@
+module Pageflow
+  # @api private
+  module Permalinkable
+    extend ActiveSupport::Concern
+
+    included do
+      belongs_to :permalink, optional: true
+
+      accepts_nested_attributes_for :permalink, update_only: true
+    end
+  end
+end

data/app/models/concerns/pageflow/reusable_file.rb

@@ -87,6 +87,11 @@ module Pageflow
       'unused'
     end
 
+    # Overwritten with the extension of the file.
+    def extension
+      'unused'
+    end
+
     # Overwritten in UploadableFile with attachment filename.
     def file_name
       'unused'

data/app/models/concerns/pageflow/uploadable_file.rb

@@ -80,6 +80,10 @@ module Pageflow
       File.basename(attachment.original_filename, '.*')
     end
 
+    def extension
+      File.extname(attachment.original_filename).sub(/\A\./, '')
+    end
+
     def can_upload?
       uploading?
     end

data/app/models/pageflow/customized_theme.rb

@@ -26,11 +26,13 @@ module Pageflow
       new(theme,
           config.transform_theme_customization_overrides.call(
             theme_customization.overrides,
-            entry
+            entry: entry,
+            theme: theme
           ),
           config.transform_theme_customization_files.call(
             theme_customization.selected_files.transform_values(&:urls),
-            entry
+            entry: entry,
+            theme: theme
           ))
     end
   end

data/app/models/pageflow/entry.rb

@@ -5,6 +5,7 @@ module Pageflow
 
     include FeatureTarget
     include EntryPublicationStates
+    include Permalinkable
     include SerializationBlacklist
 
     extend FriendlyId
@@ -126,6 +127,18 @@ module Pageflow
       [:title, [:title, :id]]
     end
 
+    def default_permalink_slug
+      title.to_s.parameterize
+    end
+
+    def self.ransackable_attributes(_auth_object)
+      %w[title type_name created_at edited_at first_published_at]
+    end
+
+    def self.ransackable_associations(_auth_object)
+      %w[account published_revision]
+    end
+
     def self.ransackable_scopes(_)
       [:with_publication_state, :published]
     end

data/app/models/pageflow/entry_at_revision.rb

@@ -16,6 +16,7 @@ module Pageflow
     delegate(:id, :slug,
              :entry_type,
              :account, :theming,
+             :permalink,
              :feature_state, :enabled_feature_names,
              :edit_lock,
              :password_digest,
@@ -42,7 +43,7 @@ module Pageflow
     end
 
     def theme
-      @theme ||= CustomizedTheme.find(entry: self, theme: revision.theme)
+      @theme ||= CustomizedTheme.find(entry: entry, theme: revision.theme)
     end
 
     def home_button

data/app/models/pageflow/entry_duplicate.rb

@@ -3,6 +3,7 @@ module Pageflow
     def create!
       create_entry
 
+      copy_permalink
       copy_draft
       copy_memberships
 
@@ -21,6 +22,12 @@ module Pageflow
       @new_entry = Entry.create!(new_attributes)
     end
 
+    def copy_permalink
+      return if original_entry.permalink.blank?
+
+      new_entry.create_permalink!(directory: original_entry.permalink.directory)
+    end
+
     def copy_draft
       original_entry.draft.copy do |revision|
         revision.entry = new_entry

data/app/models/pageflow/image_file_url_templates.rb

@@ -9,11 +9,11 @@ module Pageflow
     private
 
     def styles
-      example_file.attachment_styles(example_file.attachment).keys
+      example_file.attachment_styles(example_file.attachment).keys + [:original]
     end
 
     def example_file
-      @example_file ||= ImageFile.new(id: 0, file_name: ':basename.jpg')
+      @example_file ||= ImageFile.new(id: 0, file_name: ':basename.:extension')
     end
   end
 end

data/app/models/pageflow/permalink.rb

@@ -0,0 +1,39 @@
+module Pageflow
+  # @api private
+  class Permalink < ApplicationRecord
+    extend FriendlyId
+    friendly_id :slug_candidates, use: :scoped, scope: :directory
+
+    before_validation :set_default_slug
+
+    has_one :entry
+
+    belongs_to :directory, class_name: 'PermalinkDirectory'
+
+    validates(:slug,
+              format: /\A[0-9a-zA-Z_-]+\z/,
+              uniqueness: {scope: :directory})
+
+    validate :belongs_to_same_theming_as_entry
+
+    private
+
+    def set_default_slug
+      self.slug = entry.default_permalink_slug if slug == ''
+    end
+
+    def slug_candidates
+      [entry.title, "#{entry.title}-#{entry.id}"]
+    end
+
+    def should_generate_new_friendly_id?
+      slug.nil?
+    end
+
+    def belongs_to_same_theming_as_entry
+      return if !directory || !entry || entry.theming_id == directory.theming_id
+
+      errors.add(:directory, :invalid)
+    end
+  end
+end

data/app/models/pageflow/permalink_directory.rb

@@ -0,0 +1,10 @@
+module Pageflow
+  # @api private
+  class PermalinkDirectory < ApplicationRecord
+    belongs_to :theming
+
+    validates(:path,
+              format: %r{\A([0-9a-zA-Z-]+/)*\z},
+              uniqueness: {scope: :theming_id})
+  end
+end

data/app/models/pageflow/published_entry.rb

@@ -46,6 +46,15 @@ module Pageflow
       PublishedEntry.new(scope.published.find(id))
     end
 
+    def self.find_by_permalink(directory: nil, slug:, scope:)
+      wrap(
+        scope.published.includes(permalink: :directory).where(
+          pageflow_permalink_directories: {path: directory || ''},
+          pageflow_permalinks: {slug: slug}
+        ).first
+      )
+    end
+
     def cache_key
       [
         self.class.model_name.cache_key,
@@ -72,5 +81,13 @@ module Pageflow
     def share_image_file
       PositionedFile.wrap(find_file_by_perma_id(ImageFile, share_image_id), share_image_x, share_image_y)
     end
+
+    class << self
+      private
+
+      def wrap(entry)
+        entry && new(entry)
+      end
+    end
   end
 end

data/app/models/pageflow/revision.rb

@@ -230,7 +230,7 @@ module Pageflow
     end
 
     def available_themes
-      Pageflow.config_for(entry).themes
+      @available_themes ||= Pageflow.config_for(entry).themes
     end
   end
 end

data/app/models/pageflow/theme_customization_file.rb

@@ -39,7 +39,7 @@ module Pageflow
     # A hash of urls based on the styles that were defined when
     # registering the entry type.
     def urls
-      attachment_styles.map { |style, _|
+      styles_from_options.map { |style, _|
         [style, attachment.url(style)]
       }.to_h
     end
@@ -51,6 +51,11 @@ module Pageflow
 
     # @api private
     def attachment_styles
+      styles_from_options.except(:original)
+    end
+
+    # @api private
+    def styles_from_options
       styles = options_from_entry_type.fetch(:styles, {})
       styles.respond_to?(:call) ? styles.call(self) : styles
     end

data/app/models/pageflow/theming.rb

@@ -3,6 +3,7 @@ module Pageflow
     belongs_to :account
 
     has_many :entries
+    has_many :permalink_directories, -> { order('path ASC') }
 
     scope :with_home_url, -> { where.not(home_url: '') }
     scope :for_request, ->(request) { Pageflow.config.theming_request_scope.call(all, request) }