pages_core 3.12.0 → 3.12.2

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

@@ -20,7 +20,10 @@ module PagesCore
       def index
         respond_to do |format|
           format.html { render_published_page(root_pages.try(&:first)) }
-          format.rss { render_rss(all_feed_items) }
+          format.rss do
+            render_rss(all_feed_items.paginate(per_page: per_page_rss_param,
+                                               page: page_param))
+          end
         end
       end
 
@@ -28,10 +31,7 @@ module PagesCore
         respond_to do |format|
           format.html { render_published_page(@page) }
           format.json { render json: PageResource.new(@page) }
-          format.rss do
-            render_rss(@page.pages.limit(20).includes(:image, :author),
-                       title: @page.name)
-          end
+          format.rss { render_page_rss(@page, page_param) }
         end
       end
 
@@ -64,6 +64,10 @@ module PagesCore
         super
       end
 
+      def page_param
+        params[:page].is_a?(String) ? params[:page] : 1
+      end
+
       def page_template(page)
         if PagesCore::Templates.names.include?(page.template)
           page.template

data/app/controllers/pages_core/sitemaps_controller.rb

@@ -20,10 +20,8 @@ module PagesCore
     end
 
     def format_record(record)
-      {
-        loc: record_url(record),
-        lastmod: format_time(record.updated_at)
-      }
+      { loc: record_url(record),
+        lastmod: format_time(record.updated_at) }
     end
 
     def formatted_entries
@@ -46,7 +44,7 @@ module PagesCore
       ([Page.root.try(:localize, I18n.default_locale)] +
        locales.flat_map do |locale|
          Page.published.localized(locale).includes(:parent)
-       end).compact.uniq
+       end).compact
     end
 
     def page_record_url(record)

data/app/formatters/pages_core/image_embedder.rb

@@ -21,12 +21,10 @@ module PagesCore
     end
 
     def embed_image(id, size:, class_name:, link:)
-      image = Image.find(id).localize(I18n.locale)
-      class_name = ["image", image_class_name(image), class_name].compact
-      image_tag = dynamic_image_tag(image,
-                                    size: size, crop: false, upscale: false)
-      tag.figure((link ? link_to(image_tag, link) : image_tag) +
-                  image_caption(image), class: class_name)
+      image_figure(
+        Image.find(id).localize(I18n.locale),
+        size: size, class_name: class_name, link: link
+      )
     rescue ActiveRecord::RecordNotFound
       nil
     end
@@ -35,30 +33,10 @@ module PagesCore
       if str =~ /size="(\d*x\d*)"/
         Regexp.last_match(1)
       else
-        "2000x2000"
+        default_image_size
       end
     end
 
-    def image_caption(image)
-      return unless image.caption?
-
-      tag.figcaption(image.caption)
-    end
-
-    def image_class_name(image)
-      if image.size.x == image.size.y
-        "square"
-      elsif image.size.x > image.size.y
-        "landscape"
-      else
-        "portrait"
-      end
-    end
-
-    def link_to(content, href)
-      tag.a(content, href: href)
-    end
-
     def parse_image(str)
       id = str.match(image_expression)[1]
       options = str.match(image_expression)[2]

data/app/helpers/admin/calendars_helper.rb

@@ -8,6 +8,14 @@ module Admin
       ).in_locale(locale)
     end
 
+    def calendar_page_options(locale)
+      options_for_select(
+        calendar_pages(locale).map do |p|
+          [page_name(p, include_parents: true).gsub("»", "»"), p.id]
+        end
+      )
+    end
+
     def calendar_years_with_count
       calendar_counts.each_with_object({}) do |entry, obj|
         obj[entry[:year]] ||= 0

data/app/helpers/admin/news_helper.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Admin
+  module NewsHelper
+    def news_page_options(news_pages)
+      options_for_select(
+        news_pages.map do |p|
+          [news_section_name(p, news_pages).gsub("»", "»"), p.id]
+        end
+      )
+    end
+  end
+end

data/app/helpers/admin/pages_helper.rb

@@ -4,6 +4,15 @@ module Admin
   module PagesHelper
     include PagesCore::Admin::PageBlocksHelper
 
+    def autopublish_notice(page)
+      return unless page.autopublish?
+
+      tag.div(class: "autopublish-notice") do
+        safe_join(["This page will be published",
+                   tag.b(publish_time(page.published_at))], " ")
+      end
+    end
+
     def available_templates_for_select
       PagesCore::Templates.names.collect do |template|
         if template == "index"
@@ -30,6 +39,14 @@ module Admin
       ([page.author] + User.activated).uniq
     end
 
+    def page_list_row(page, &block)
+      classes = [page.status_label.downcase]
+      classes << "autopublish" if page.autopublish?
+      classes << "pinned" if page.pinned?
+
+      tag.tr(capture(&block), class: classes.join(" "))
+    end
+
     def page_name(page, options = {})
       page_names = if options[:include_parents]
                      page.self_and_ancestors.reverse
@@ -42,6 +59,21 @@ module Admin
       )
     end
 
+    def page_published_status(page)
+      return page_published_date(page) if page.published?
+      return tag.em("Not published") if page.status_label == "Published"
+
+      tag.em(page.status_label)
+    end
+
+    def page_published_date(page)
+      if page.published_at.year == Time.zone.now.year
+        l(page.published_at, format: :pages_date)
+      else
+        l(page.published_at, format: :pages_full)
+      end
+    end
+
     def publish_time(time)
       if time.year != Time.zone.now.year
         time.strftime("on %b %d %Y at %H:%M")

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

@@ -4,6 +4,7 @@ module PagesCore
   module Admin
     module AdminHelper
       include PagesCore::Admin::ContentTabsHelper
+      include PagesCore::Admin::DeprecatedAdminHelper
       include PagesCore::Admin::DateRangeHelper
       include PagesCore::Admin::ImageUploadsHelper
       include PagesCore::Admin::LocalesHelper
@@ -11,20 +12,6 @@ module PagesCore
       include PagesCore::Admin::LabelledFieldHelper
       include PagesCore::Admin::TagEditorHelper
 
-      attr_writer :page_title, :page_description, :page_description_class,
-                  :page_description_links
-
-      def add_body_class(class_name)
-        @body_classes ||= []
-        @body_classes << class_name
-      end
-
-      def body_classes
-        classes = @body_classes || []
-        classes << "with_notice" if flash[:notice]
-        classes
-      end
-
       def rich_text_area_tag(name, content = nil, options = {})
         react_component("RichTextArea",
                         options.merge(id: sanitize_to_id(name),
@@ -32,50 +19,20 @@ module PagesCore
                                       value: content))
       end
 
-      def link_separator
-        safe_join [" ", tag.span("|", class: "separator"), " "]
-      end
-
-      def deprecate_page_description_args(string = nil, class_name = nil)
-        if class_name
-          ActiveSupport::Deprecation.warn("Setting class through " \
-                                          "page_description is deprecated, " \
-                                          "use page_description_class=")
-        end
-        return unless string
+      def locale_links(&block)
+        return unless PagesCore.config.localizations?
 
-        ActiveSupport::Deprecation.warn("Setting description with " \
-                                        "page_description is deprecated, " \
-                                        "use page_description=")
-      end
-
-      def page_description(string = nil, class_name = nil)
-        deprecate_page_description_args(string, class_name)
-        @page_description_class = class_name if class_name
-        if string
-          @page_description = string
-        else
-          @page_description
-        end
-      end
-
-      def page_description_links(links = nil)
-        return @page_description_links unless links
-
-        ActiveSupport::Deprecation.warn(
-          "Setting page description_links with page_description_links " \
-          "is deprecated, use page_description_links="
+        safe_join(
+          PagesCore.config.locales.map do |locale, name|
+            link_to(name, block.call(locale),
+                    class: ("current" if locale == params[:locale].to_sym))
+          end
         )
-        @page_description_links = links
       end
 
-      def page_title(title = nil)
-        return @page_title unless title
-
-        ActiveSupport::Deprecation.warn(
-          "Setting page title with page_title is deprecated, use page_title="
-        )
-        @page_title = title
+      def month_name(month)
+        %w[January February March April May June July August September October
+           November December][month - 1]
       end
     end
   end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module PagesCore
+  module Admin
+    module DeprecatedAdminHelper
+      def link_separator
+        ActiveSupport::Deprecation.warn("link_separator is deprecated")
+
+        safe_join [" ", tag.span("|", class: "separator"), " "]
+      end
+
+      def page_description=(description)
+        ActiveSupport::Deprecation.warn(content_helper_deprecation)
+        content_for(:page_description, description.html_safe)
+      end
+      alias page_description page_description=
+
+      def page_description_links=(links)
+        ActiveSupport::Deprecation.warn(content_helper_deprecation)
+        content_for(:page_description_links, links.html_safe)
+      end
+      alias page_description_links page_description_links=
+
+      def page_title=(title)
+        ActiveSupport::Deprecation.warn(content_helper_deprecation)
+        content_for(:page_title, title)
+      end
+      alias page_title page_title=
+
+      private
+
+      def content_helper_deprecation
+        name = caller_locations(1, 1)[0].label
+        replacement = name.gsub(/=$/, "")
+
+        "The #{name} helper is deprecated, use content_for(:#{replacement})"
+      end
+    end
+  end
+end

data/app/helpers/pages_core/images_helper.rb

@@ -11,6 +11,25 @@ module PagesCore
       )
     end
 
+    def image_caption(image, caption: nil)
+      return if caption == false
+
+      caption = image.caption unless caption.is_a?(String)
+      return if caption.blank?
+
+      tag.figcaption(caption)
+    end
+
+    def image_figure(image, size: nil, class_name: nil, link: nil, caption: nil)
+      class_name = ["image", image_class_name(image), class_name].compact
+      size ||= default_image_size
+      image_tag = dynamic_image_tag(image,
+                                    size: size, crop: false, upscale: false)
+      tag.figure((link ? image_link_to(image_tag, link) : image_tag) +
+                 image_caption(image, caption: caption),
+                 class: class_name)
+    end
+
     def original_dynamic_image_tag(record_or_array, options = {})
       super(
         record_or_array,
@@ -27,11 +46,29 @@ module PagesCore
 
     private
 
+    def default_image_size
+      "2000x2000"
+    end
+
     def extract_alt_text(record_or_array)
       record = extract_dynamic_image_record(record_or_array)
       return {} unless record.alternative?
 
       { alt: record.alternative }
     end
+
+    def image_class_name(image)
+      if image.size.x == image.size.y
+        "square"
+      elsif image.size.x > image.size.y
+        "landscape"
+      else
+        "portrait"
+      end
+    end
+
+    def image_link_to(content, href)
+      tag.a(content, href: href)
+    end
   end
 end

data/app/javascript/admin-dist.ts

@@ -0,0 +1,2 @@
+import startPages from "./index";
+startPages();

data/app/javascript/components/Attachments/{Attachment.jsx → Attachment.tsx}

@@ -1,28 +1,48 @@
 import React from "react";
-import PropTypes from "prop-types";
 import copyToClipboard from "../../lib/copyToClipboard";
 import AttachmentEditor from "./AttachmentEditor";
-import ModalStore from "../../stores/ModalStore";
-import ToastStore from "../../stores/ToastStore";
+import useModalStore from "../../stores/useModalStore";
+import useToastStore from "../../stores/useToastStore";
+import { AttachmentResource, Locale } from "../../types";
 
-import { useDraggable } from "../drag";
+import { useDraggable, Draggable } from "../drag";
 
-export default function Attachment(props) {
+interface Record {
+  id: number | null,
+  attachment: AttachmentResource,
+  uploading: boolean
+}
+
+interface AttachmentProps {
+  attributeName: string,
+  placeholder: boolean,
+  draggable: { record: 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
+}
+
+export default function Attachment(props: AttachmentProps) {
   const { attributeName, draggable, locales, locale } = props;
   const { record } = draggable;
   const { attachment, uploading } = record;
 
+  const openModal = useModalStore((state) => state.open);
+  const notice = useToastStore((state) => state.notice);
+
   const listeners = useDraggable(draggable, props.startDrag);
 
-  const copyEmbed = (evt) => {
+  const copyEmbed = (evt: Event) => {
     evt.preventDefault();
     copyToClipboard(`[attachment:${attachment.id}]`);
-    ToastStore.dispatch({
-      type: "NOTICE", message: "Embed code copied to clipboard"
-    });
+    notice("Embed code copied to clipboard");
   };
 
-  const deleteRecord = (evt) => {
+  const deleteRecord = (evt: Event) => {
     evt.preventDefault();
     if (props.deleteRecord) {
       props.deleteRecord();
@@ -43,15 +63,15 @@ export default function Attachment(props) {
     return null;
   };
 
-  const editAttachment = (evt) => {
+  const editAttachment = (evt: Event) => {
     evt.preventDefault();
-    ModalStore.dispatch({
-      type: "OPEN",
-      payload: <AttachmentEditor attachment={attachment}
-                                 locale={locale}
-                                 locales={locales}
-                                 onUpdate={props.onUpdate} />
-    });
+    openModal(
+      <AttachmentEditor
+        attachment={attachment}
+        locale={locale}
+        locales={locales}
+        onUpdate={props.onUpdate} />
+    );
   };
 
   const classes = ["attachment"];
@@ -62,9 +82,12 @@ export default function Attachment(props) {
     classes.push("uploading");
   }
 
-  const icon = uploading ? "cloud-upload" : "paperclip";
+  const icon = uploading ? "cloud-arrow-up" : "paperclip";
 
-  const localeDir = (locales && locales[locale] && locales[locale].dir) || "ltr";
+  let localeDir = "ltr";
+  if (locale in locales && locales[locale].dir) {
+    localeDir = locales[locale].dir;
+  }
 
   return (
     <div className={classes.join(" ")}
@@ -95,7 +118,7 @@ export default function Attachment(props) {
     {attachment &&
      <div className="attachment-info">
        <h3>
-         <i className={`fa fa-${icon} icon`} />
+         <i className={`fa-solid fa-${icon} icon`} />
          {name() || <em>Untitled</em>}<br />
        </h3>
        {!uploading &&
@@ -108,17 +131,3 @@ export default function Attachment(props) {
     </div>
   );
 }
-
-Attachment.propTypes = {
-  locale: PropTypes.string,
-  locales: PropTypes.object,
-  draggable: PropTypes.object,
-  deleteRecord: PropTypes.func,
-  startDrag: PropTypes.func,
-  showEmbed: PropTypes.bool,
-  onUpdate: PropTypes.func,
-  attributeName: PropTypes.string,
-  placeholder: PropTypes.bool,
-  position: PropTypes.number,
-  ref: PropTypes.object
-};

data/app/javascript/components/Attachments/{AttachmentEditor.jsx → AttachmentEditor.tsx}

@@ -1,11 +1,18 @@
-import React, { useState } from "react";
-import PropTypes from "prop-types";
+import React, { ChangeEvent, useState } from "react";
 import copyToClipboard, { copySupported } from "../../lib/copyToClipboard";
-import ModalStore from "../../stores/ModalStore";
-import ToastStore from "../../stores/ToastStore";
+import useModalStore from "../../stores/useModalStore";
+import useToastStore from "../../stores/useToastStore";
+import { AttachmentResource, Locale } from "../../types";
 import { putJson } from "../../lib/request";
 
-export default function AttachmentEditor(props) {
+interface AttachmentEditorProps {
+  attachment: AttachmentResource,
+  locale: string,
+  locales: { [index: string]: Locale },
+  onUpdate: (localizations: Record<string, Record<string, string>>) => void
+}
+
+export default function AttachmentEditor(props: AttachmentEditorProps) {
   const { attachment, locales } = props;
 
   const [locale, setLocale] = useState(props.locale);
@@ -14,7 +21,10 @@ export default function AttachmentEditor(props) {
     description: attachment.description || {},
   });
 
-  const updateLocalization = (name) => (evt) => {
+  const notice = useToastStore((state) => state.notice);
+  const closeModal = useModalStore((state) => state.close);
+
+  const updateLocalization = (name: "name" | "description") => (evt: ChangeEvent<HTMLInputElement>) => {
     setLocalizations({
       ...localizations,
       [name]: { ...localizations[name],
@@ -22,27 +32,24 @@ export default function AttachmentEditor(props) {
     });
   };
 
-  const copyEmbedCode = (evt) => {
+  const copyEmbedCode = (evt: Event) => {
     evt.preventDefault();
     copyToClipboard(`[attachment:${attachment.id}]`);
-    ToastStore.dispatch({
-      type: "NOTICE", message: "Embed code copied to clipboard"
-    });
+    notice("Embed code copied to clipboard");
   };
 
-  const save = (evt) => {
+  const save = (evt: Event) => {
     evt.preventDefault();
     evt.stopPropagation();
 
-    let data = { ...localizations };
+    const data = { ...localizations };
 
-    putJson(`/admin/attachments/${attachment.id}`,
-            { attachment: data });
+    void putJson(`/admin/attachments/${attachment.id}`, { attachment: data });
 
     if (props.onUpdate) {
       props.onUpdate(data);
     }
-    ModalStore.dispatch({ type: "CLOSE" });
+    closeModal();
   };
 
   const inputDir = (locales && locales[locale] && locales[locale].dir) || "ltr";
@@ -106,7 +113,7 @@ export default function AttachmentEditor(props) {
           <button onClick={save}>
             Save
           </button>
-          <button onClick={() => ModalStore.dispatch({ type: "CLOSE" })}>
+          <button onClick={closeModal}>
             Cancel
           </button>
         </div>
@@ -114,10 +121,3 @@ export default function AttachmentEditor(props) {
     </div>
   );
 }
-
-AttachmentEditor.propTypes = {
-  attachment: PropTypes.object,
-  locale: PropTypes.string,
-  locales: PropTypes.object,
-  onUpdate: PropTypes.func
-};

data/app/javascript/components/{EditableImage.jsx → EditableImage.tsx}

@@ -1,20 +1,33 @@
 import React, { useState } from "react";
-import PropTypes from "prop-types";
 import ImageEditor from "./ImageEditor";
-import ModalStore from "../stores/ModalStore";
+import useModalStore from "../stores/useModalStore";
 
-export default function EditableImage(props) {
+import { Locale, ImageResource } from "../types";
+
+interface EditableImageProps {
+  image: ImageResource,
+  src: string,
+  caption: boolean,
+  locale: string,
+  locales: Record<string, Locale>,
+  width: number,
+  onUpdate?: (newImage: ImageResource, src: string) => void
+}
+
+export default function EditableImage(props: EditableImageProps) {
   const [image, setImage] = useState(props.image);
   const [src, setSrc] = useState(props.src);
 
+  const openModal = useModalStore((state) => state.open);
+
   const height = () => {
     const width = image.crop_width || image.real_width;
     const height = image.crop_height || image.real_height;
     return Math.round((height / width) * props.width);
   };
 
-  const updateImage = (updatedImage, src) => {
-    let newImage = { ...image, ...updatedImage };
+  const updateImage = (updatedImage: ImageResource, src: string) => {
+    const newImage = { ...image, ...updatedImage };
     setSrc(src);
     setImage(newImage);
     if (props.onUpdate) {
@@ -22,16 +35,16 @@ export default function EditableImage(props) {
     }
   };
 
-  const handleClick = (evt) => {
+  const handleClick = (evt: Event) => {
     evt.preventDefault();
-    ModalStore.dispatch({
-      type: "OPEN",
-      payload: <ImageEditor image={image}
-                            caption={props.caption}
-                            locale={props.locale}
-                            locales={props.locales}
-                            onUpdate={updateImage} />
-    });
+    openModal(
+      <ImageEditor
+        image={image}
+        caption={props.caption}
+        locale={props.locale}
+        locales={props.locales}
+        onUpdate={updateImage} />
+    );
   };
 
   const altWarning = !image.alternative[props.locale];
@@ -40,7 +53,7 @@ export default function EditableImage(props) {
     <div className="editable-image">
       {altWarning &&
        <span className="alt-warning" title="Alternative text is missing">
-         <i className="fa fa-exclamation-triangle icon" />
+         <i className="fa-solid fa-triangle-exclamation icon" />
        </span>}
       <img src={src}
            width={props.width}
@@ -49,13 +62,3 @@ export default function EditableImage(props) {
     </div>
   );
 }
-
-EditableImage.propTypes = {
-  image: PropTypes.object,
-  src: PropTypes.string,
-  caption: PropTypes.bool,
-  locale: PropTypes.string,
-  locales: PropTypes.object,
-  width: PropTypes.number,
-  onUpdate: PropTypes.func
-};