pages_core 3.14.0 → 3.15.0

data/app/controllers/admin/pages_controller.rb

@@ -2,9 +2,8 @@
 
 module Admin
   class PagesController < Admin::AdminController
-    include PagesCore::Admin::PageJsonHelper
+    include PagesCore::PageParameters
 
-    before_action :find_categories
     before_action :find_page, only: %i[show edit update destroy move]
 
     require_authorization
@@ -39,26 +38,26 @@ module Admin
     def edit; end
 
     def create
-      @page = build_page(content_locale, page_params,
-                         param_categories).tap(&:save)
-      if @page.valid?
-        respond_with_page(@page) do
+      @page = build_page(content_locale, page_params).tap(&:save)
+
+      respond_with_page(@page) do
+        if @page.valid?
           redirect_to(edit_admin_page_url(content_locale, @page))
+        else
+          render action: :new
         end
-      else
-        render action: :new
       end
     end
 
     def update
-      if @page.update(page_params)
-        @page.categories = param_categories
-        respond_with_page(@page) do
+      @page.update(page_params)
+      respond_with_page(@page) do
+        if @page.valid?
           flash[:notice] = t("pages_core.changes_saved")
           redirect_to edit_admin_page_url(content_locale, @page)
+        else
+          render action: :edit
         end
-      else
-        render action: :edit
       end
     end
 
@@ -75,53 +74,34 @@ module Admin
 
     private
 
-    def build_page(locale, attributes = nil, categories = nil)
+    def build_page(locale, attributes = nil)
       Page.new.localize(locale).tap do |page|
         page.author = default_author || current_user
         page.attributes = attributes if attributes
-        page.categories = categories if categories
       end
     end
 
     def default_author
-      User.find_by_email(PagesCore.config.default_author)
-    end
-
-    def page_attributes
-      %i[template user_id status feed_enabled published_at redirect_to
-         image_link news_page unique_name pinned parent_page_id serialized_tags
-         meta_image_id starts_at ends_at all_day image_id path_segment
-         meta_title meta_description open_graph_title open_graph_description]
+      User.find_by(email: PagesCore.config.default_author)
     end
 
     def page_params
-      params.require(:page).permit(
-        PagesCore::Templates::TemplateConfiguration.all_blocks +
-        page_attributes,
-        page_images_attributes: %i[id position image_id primary _destroy],
-        page_files_attributes: %i[id position attachment_id _destroy]
-      )
-    end
-
-    def param_categories
-      return [] unless params[:category]
-
-      params.permit(category: {})[:category].to_hash
-            .map { |id, _| Category.find(id) }
+      params.require(:page).permit(page_content_attributes)
     end
 
     def find_page
       @page = Page.find(params[:id]).localize(content_locale)
     end
 
-    def find_categories
-      @categories = Category.order("name")
-    end
-
     def respond_with_page(page, &block)
       respond_to do |format|
-        format.html { block.call }
-        format.json { render json: page_json(page) }
+        format.html(&block)
+        format.json do
+          render json: ::Admin::PageResource.new(
+            page,
+            params: { user: current_user }
+          )
+        end
       end
     end
   end

data/app/controllers/concerns/pages_core/error_reporting.rb

@@ -11,7 +11,7 @@ module PagesCore
     protected
 
     def configure_sentry_scope
-      return if Rails.env.test? || !Object.const_defined?("Sentry")
+      return if Rails.env.test? || !Object.const_defined?(:Sentry)
 
       Sentry.set_context("params", params.to_unsafe_h)
       Sentry.set_tags(locale: params[:locale] || I18n.default_locale.to_s)

data/app/controllers/concerns/pages_core/page_parameters.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module PagesCore
+  module PageParameters
+    extend ActiveSupport::Concern
+
+    def page_attachment_attributes
+      { page_images_attributes: %i[id position image_id primary _destroy],
+        page_files_attributes: %i[id position attachment_id _destroy] }
+    end
+
+    def page_content_attributes
+      locales = PagesCore.config.locales&.keys || [I18n.default_locale]
+      [page_static_attributes,
+       PagesCore::Templates::TemplateConfiguration.all_blocks,
+       :path_segment,
+       (PagesCore::Templates::TemplateConfiguration
+                  .localized_blocks + %i[path_segment])
+         .index_with { locales },
+       page_attachment_attributes]
+    end
+
+    def page_static_attributes
+      %i[template user_id status feed_enabled published_at redirect_to
+         news_page unique_name pinned parent_page_id serialized_tags
+         meta_image_id starts_at ends_at all_day]
+    end
+  end
+end

data/app/controllers/concerns/pages_core/policies_helper.rb

@@ -35,7 +35,7 @@ module PagesCore
     end
 
     def verify_policy(record)
-      return true if policy(record).public_send("#{action_name}?")
+      return true if policy(record).public_send(:"#{action_name}?")
 
       raise PagesCore::NotAuthorized
     end

data/app/controllers/concerns/pages_core/preview_pages_controller.rb

@@ -3,11 +3,27 @@
 module PagesCore
   module PreviewPagesController
     extend ActiveSupport::Concern
+    include PagesCore::PageParameters
+
+    included do
+      before_action :disable_xss_protection, only: %i[preview]
+    end
 
     def preview?
       @preview || false
     end
 
+    def preview
+      render_error 403 unless logged_in?
+
+      @preview = true
+      @page = Page.find_by(id: params[:page_id]) || Page.new
+      @page.readonly!
+      @page.assign_attributes(preview_page_params)
+
+      render_page
+    end
+
     private
 
     def disable_xss_protection
@@ -17,31 +33,15 @@ module PagesCore
       response.headers["X-XSS-Protection"] = "0"
     end
 
-    def permitted_page_attributes
-      %i[template user_id status feed_enabled published_at
-         redirect_to image_link news_page
-         unique_name pinned parent_page_id]
-    end
-
-    def page_params
-      params.require(:page).permit(
-        Page.localized_attributes + permitted_page_attributes
-      )
-    end
-
-    def preview_page(page)
-      redirect_to(page_url(content_locale, page)) && return unless logged_in?
-
-      disable_xss_protection
-
-      @preview = true
-      page.attributes = page_params.merge(
+    def preview_page_params
+      ActionController::Parameters.new(
+        JSON.parse(params.require(:preview_page))
+      ).permit(:id, page_content_attributes).merge(
         status: 2,
         published_at: Time.zone.now,
         locale: content_locale,
         redirect_to: nil
       )
-      render_page
     end
   end
 end

data/app/controllers/pages_core/admin_controller.rb

@@ -4,8 +4,6 @@
 # authorization and other common code for the Admin set of controllers.
 module PagesCore
   class AdminController < ::ApplicationController
-    include PagesCore::Admin::PersistentParams
-
     protect_from_forgery with: :exception
 
     before_action :set_i18n_locale

data/app/controllers/pages_core/frontend/pages_controller.rb

@@ -12,8 +12,8 @@ module PagesCore
 
       before_action :load_root_pages
       before_action :find_page_by_path, only: [:show]
-      before_action :find_page, only: %i[show preview]
-      before_action :require_page, only: %i[show preview]
+      before_action :find_page, only: %i[show]
+      before_action :require_page, only: %i[show]
       before_action :canonicalize_url, only: [:show]
       static_cache :index, :show
 
@@ -27,10 +27,6 @@ module PagesCore
         end
       end
 
-      def preview
-        preview_page(@page)
-      end
-
       def show
         respond_to do |format|
           format.html { render_published_page(@page) }

data/app/formatters/pages_core/html_formatter.rb

@@ -38,8 +38,7 @@ module PagesCore
     def find_attachments(str)
       str.match(attachment_expression)[1]
          .split(",")
-         .map { |id| find_attachment(id) }
-         .compact
+         .filter_map { |id| find_attachment(id) }
     end
 
     def find_file(id)
@@ -51,8 +50,7 @@ module PagesCore
     def find_files(str)
       str.match(file_expression)[1]
          .split(",")
-         .map { |id| find_file(id) }
-         .compact
+         .filter_map { |id| find_file(id) }
     end
 
     def fix_markup(str)

data/app/helpers/admin/menu_helper.rb

@@ -5,12 +5,13 @@ module Admin
     include PagesCore::LocalesHelper
 
     def header_tabs(group)
+      return unless menu_items_for(group).any?
+
       tag.ul(class: group.to_s) do
         safe_join(menu_items_for(group).map do |item|
           tag.li do
             path = instance_eval(&item.path)
-            link_to(item.label,
-                    path,
+            link_to(item.label, path,
                     class: (current_menu_item?(item) ? "current" : ""))
           end
         end)
@@ -24,9 +25,9 @@ module Admin
         .select { |_, routing| routing[:controller] == params[:controller] }
     end
 
-    def find_menu_candidate(&block)
+    def find_menu_candidate(&)
       menu_item_candidates
-        .select { |item, routing| block.call(item, routing) }
+        .select(&)
         .try(&:first)
         .try(&:first)
     end

data/app/helpers/admin/pages_helper.rb

@@ -2,8 +2,6 @@
 
 module Admin
   module PagesHelper
-    include PagesCore::Admin::PageBlocksHelper
-
     def autopublish_notice(page)
       return unless page.autopublish?
 
@@ -13,22 +11,8 @@ module Admin
       end
     end
 
-    def available_templates_for_select
-      PagesCore::Templates.names.collect do |template|
-        if template == "index"
-          ["[Default]", "index"]
-        else
-          [template.humanize, template]
-        end
-      end
-    end
-
-    def file_embed_code(file)
-      "[file:#{file.id}]"
-    end
-
     def news_section_name(page, news_pages)
-      if news_pages.select { |p| p.name == page.name }.length > 1
+      if news_pages.count { |p| p.name == page.name } > 1
         page_name(page, include_parents: true)
       else
         page_name(page)
@@ -83,10 +67,6 @@ module Admin
 
     private
 
-    def nested_array?(array)
-      array.present? && array.first.is_a?(Array)
-    end
-
     def page_name_with_fallback(page)
       if page.name?
         page.name.to_s

data/app/helpers/pages_core/admin/admin_helper.rb

@@ -7,7 +7,6 @@ module PagesCore
       include PagesCore::Admin::DateRangeHelper
       include PagesCore::Admin::ImageUploadsHelper
       include PagesCore::Admin::LocalesHelper
-      include PagesCore::Admin::PageJsonHelper
       include PagesCore::Admin::LabelledFieldHelper
       include PagesCore::Admin::TagEditorHelper
 
@@ -18,12 +17,12 @@ module PagesCore
                                       value: content))
       end
 
-      def locale_links(&block)
+      def locale_links
         return unless PagesCore.config.localizations?
 
         safe_join(
           PagesCore.config.locales.map do |locale, name|
-            link_to(name, block.call(locale),
+            link_to(name, yield(locale),
                     class: ("current" if locale == params[:locale].to_sym))
           end
         )

data/app/helpers/pages_core/admin/content_tabs_helper.rb

@@ -31,8 +31,7 @@ module PagesCore
                 class: "content-tab",
                 id: "content-tab-#{key}",
                 role: "tabpanel",
-                data: { tab: key,
-                        "main-target" => "tab" })
+                data: { tab: key })
       end
     end
   end

data/app/helpers/pages_core/admin/labelled_field_helper.rb

@@ -53,7 +53,7 @@ module PagesCore
 
       def labelled_field_label(label, options = {})
         tag.label do
-          safe_join([label, labelled_field_errors(options[:errors])])
+          safe_join([label, labelled_field_errors(options[:errors])], " ")
         end
       end
 

data/app/helpers/pages_core/frontend_helper.rb

@@ -10,6 +10,6 @@ module PagesCore
       @root_page ||= root_pages.first
     end
 
-    attr_reader :search_query, :search_category_id
+    attr_reader :search_query
   end
 end

data/app/helpers/pages_core/images_helper.rb

@@ -28,7 +28,8 @@ module PagesCore
     # * <tt>:ratio</tt>: Ratio to constrain image by.
     # * <tt>:size</tt>: Max size for image.
     def image_figure(image, opts = {})
-      class_name = ["image", image_class_name(image), opts[:class_name]].compact
+      class_name = ["image", image_class_name(image, ratio: opts[:ratio]),
+                    opts[:class_name]].compact
       image_tag = image_figure_image_tag(image,
                                          size: opts[:size],
                                          ratio: opts[:ratio])
@@ -47,7 +48,8 @@ module PagesCore
     # * <tt>:ratio</tt>: Ratio to constrain image by.
     # * <tt>:sizes</tt>: Sizes attribute for image tag, default: "100vw".
     def picture(image, opts = {})
-      class_name = ["image", image_class_name(image), opts[:class_name]].compact
+      class_name = ["image", image_class_name(image, ratio: opts[:ratio]),
+                    opts[:class_name]].compact
       pict = picture_tag(image, ratio: opts[:ratio], sizes: opts[:sizes])
       content = opts[:link] ? image_link_to(pict, opts[:link]) : pict
       tag.figure(content + image_caption(image, caption: opts[:caption]),
@@ -95,9 +97,11 @@ module PagesCore
       Vector2d.new(v.y * ratio, v.y).fit(v)
     end
 
-    def image_class_name(image)
-      return "square" if image.size.x == image.size.y
-      return "landscape" if image.size.x > image.size.y
+    def image_class_name(image, ratio: nil)
+      size = ratio ? fit_ratio(image.size, ratio) : image.size
+
+      return "square" if size.x == size.y
+      return "landscape" if size.x > size.y
 
       "portrait"
     end
@@ -120,9 +124,7 @@ module PagesCore
     end
 
     def image_widths(image)
-      [233, 350, 700, 1050, 1400, 2100, 2800].select do |w|
-        image.size.x >= w
-      end
+      [233, 350, 700, 1050, 1400, 2100, 2800].select { |w| image.size.x >= w }
     end
 
     def srcset(image, ratio: nil, format: nil)

data/app/helpers/pages_core/labelled_form_builder.rb

@@ -30,15 +30,10 @@ module PagesCore
     end
 
     def labelled_country_select(
-      attr, label = nil, priority = {}, opts = {}, html_opts = {}
+      attr, label = nil, opts = {}, html_opts = {}
     )
-      if priority.is_a?(Hash)
-        return labelled_field(attr, label, priority) do |options|
-          country_select(attr, options, opts, html_opts)
-        end
-      end
       labelled_field(attr, label, opts) do |options|
-        country_select(attr, priority, options, html_opts)
+        country_select(attr, options, html_opts)
       end
     end
 

data/app/helpers/pages_core/page_path_helper.rb

@@ -31,7 +31,7 @@ module PagesCore
 
     def page_redirect_url(locale, page)
       redirect = page.redirect_path(locale:)
-      return redirect if redirect =~ %r{^https?://}
+      return redirect if %r{^https?://}.match?(redirect)
 
       base_page_url + redirect
     end

data/app/javascript/components/Attachments/Attachment.tsx

@@ -1,32 +1,31 @@
-import React from "react";
+import React, { MouseEvent } from "react";
 import copyToClipboard from "../../lib/copyToClipboard";
 import AttachmentEditor from "./AttachmentEditor";
 import useModalStore from "../../stores/useModalStore";
 import useToastStore from "../../stores/useToastStore";
-import { AttachmentResource, Locale } from "../../types";
+import * as Attachments from "../../types/Attachments";
+import * as Drag from "../../types/Drag";
+import { Locale } from "../../types";
 
-import { useDraggable, Draggable } from "../drag";
+import { useDraggable } from "../drag";
 
-interface Record {
-  id: number | null;
-  attachment: AttachmentResource;
-  uploading: boolean;
-}
-
-interface AttachmentProps {
+interface Props {
   attributeName: string;
   placeholder: boolean;
-  draggable: { record: Record };
+  draggable: Drag.Draggable<Attachments.Record>;
   locale: string;
   locales: { [index: string]: Locale };
   deleteRecord: () => void;
   showEmbed: boolean;
   position: number;
-  onUpdate: (localizations: Record<string, Record<string, string>>) => void;
-  startDrag: (evt: Event, draggable: Draggable) => void;
+  onUpdate: (attachment: Partial<Attachments.Resource>) => void;
+  startDrag: (
+    evt: MouseEvent,
+    draggable: Drag.Draggable<Attachments.Record>
+  ) => void;
 }
 
-export default function Attachment(props: AttachmentProps) {
+export default function Attachment(props: Props) {
   const { attributeName, draggable, locales, locale } = props;
   const { record } = draggable;
   const { attachment, uploading } = record;
@@ -34,15 +33,18 @@ export default function Attachment(props: AttachmentProps) {
   const openModal = useModalStore((state) => state.open);
   const notice = useToastStore((state) => state.notice);
 
-  const listeners = useDraggable(draggable, props.startDrag);
+  const listeners = useDraggable<Attachments.Record>(
+    draggable,
+    props.startDrag
+  );
 
-  const copyEmbed = (evt: Event) => {
+  const copyEmbed = (evt: MouseEvent) => {
     evt.preventDefault();
     copyToClipboard(`[attachment:${attachment.id}]`);
     notice("Embed code copied to clipboard");
   };
 
-  const deleteRecord = (evt: Event) => {
+  const deleteRecord = (evt: MouseEvent) => {
     evt.preventDefault();
     if (props.deleteRecord) {
       props.deleteRecord();
@@ -63,7 +65,7 @@ export default function Attachment(props: AttachmentProps) {
     return null;
   };
 
-  const editAttachment = (evt: Event) => {
+  const editAttachment = (evt: MouseEvent) => {
     evt.preventDefault();
     openModal(
       <AttachmentEditor

data/app/javascript/components/Attachments/AttachmentEditor.tsx

@@ -1,18 +1,19 @@
-import React, { ChangeEvent, useState } from "react";
+import React, { ChangeEvent, MouseEvent, useState } from "react";
 import copyToClipboard, { copySupported } from "../../lib/copyToClipboard";
 import useModalStore from "../../stores/useModalStore";
 import useToastStore from "../../stores/useToastStore";
-import { AttachmentResource, Locale } from "../../types";
 import { putJson } from "../../lib/request";
+import * as Attachments from "../../types/Attachments";
+import { Locale } from "../../types";
 
-interface AttachmentEditorProps {
-  attachment: AttachmentResource;
+interface Props {
+  attachment: Attachments.Resource;
   locale: string;
   locales: { [index: string]: Locale };
-  onUpdate: (localizations: Record<string, Record<string, string>>) => void;
+  onUpdate: (attachment: Partial<Attachments.Resource>) => void;
 }
 
-export default function AttachmentEditor(props: AttachmentEditorProps) {
+export default function AttachmentEditor(props: Props) {
   const { attachment, locales } = props;
 
   const [locale, setLocale] = useState(props.locale);
@@ -25,20 +26,21 @@ export default function AttachmentEditor(props: AttachmentEditorProps) {
   const closeModal = useModalStore((state) => state.close);
 
   const updateLocalization =
-    (name: "name" | "description") => (evt: ChangeEvent<HTMLInputElement>) => {
+    (name: "name" | "description") =>
+    (evt: ChangeEvent<HTMLInputElement> | ChangeEvent<HTMLTextAreaElement>) => {
       setLocalizations({
         ...localizations,
         [name]: { ...localizations[name], [locale]: evt.target.value }
       });
     };
 
-  const copyEmbedCode = (evt: Event) => {
+  const copyEmbedCode = (evt: MouseEvent) => {
     evt.preventDefault();
     copyToClipboard(`[attachment:${attachment.id}]`);
     notice("Embed code copied to clipboard");
   };
 
-  const save = (evt: Event) => {
+  const save = (evt: MouseEvent) => {
     evt.preventDefault();
     evt.stopPropagation();