pages_core 3.12.1 → 3.12.2

data/app/assets/builds/pages_core/admin.css

@@ -8690,6 +8690,38 @@ body.modal > .wrapper {
   margin: 20px -2px;
 }
 
+.search-bar {
+  display: flex;
+}
+
+.search-bar input {
+    flex: 1 1 auto;
+    border-right: none;
+    max-width: 600px;
+    min-width: 50px;
+  }
+
+.search-bar input:focus {
+      z-index: 20;
+    }
+
+.search-bar button {
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+    white-space: nowrap;
+  }
+
+main .search-bar {
+  background: #f8f8f8;
+  background: var(--background-disabled-color);
+  padding: 16px 32px;
+  margin: 0px 0px 16px 0px;
+}
+
+.sidebar .search-bar {
+  margin-top: 16px;
+}
+
 .sidebar {
   background: #f8f8f8;
   background: var(--background-disabled-color);
@@ -9131,6 +9163,13 @@ td.drag-handle {
       font-weight: normal;
     }
 
+.news-item-list .autopublish-notice, .calendar-item-list .autopublish-notice {
+    font-size: 0.75rem;
+    font-weight: normal;
+    color: #666;
+    color: var(--text-light-color);
+  }
+
 .news-item-list .draft,
   .calendar-item-list .draft,
   .news-item-list .hidden,

data/app/assets/stylesheets/pages_core/admin/components/search.css

@@ -0,0 +1,27 @@
+.search-bar {
+  display: flex;
+  & input {
+    flex: 1 1 auto;
+    border-right: none;
+    max-width: 600px;
+    min-width: 50px;
+    &:focus {
+      z-index: 20;
+    }
+  }
+  & button {
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+    white-space: nowrap;
+  }
+}
+
+main .search-bar {
+  background: var(--background-disabled-color);
+  padding: 16px 32px;
+  margin: 0px 0px 16px 0px;
+}
+
+.sidebar .search-bar {
+  margin-top: 16px;
+}

data/app/assets/stylesheets/pages_core/admin/controllers/pages.css

@@ -122,6 +122,12 @@ td.drag-handle {
     }
   }
 
+  & .autopublish-notice {
+    font-size: 0.75rem;
+    font-weight: normal;
+    color: var(--text-light-color);
+  }
+
   & .draft,
   & .hidden,
   & .autopublish,

data/app/controllers/admin/pages_controller.rb

@@ -9,8 +9,6 @@ module Admin
 
     require_authorization
 
-    helper_method :page_json
-
     def index
       @pages = Page.admin_list(@locale)
     end
@@ -19,6 +17,15 @@ module Admin
       @pages = Page.deleted.by_updated_at.in_locale(@locale)
     end
 
+    def search
+      return if search_query.blank?
+
+      @search_documents =
+        SearchDocument.where(searchable_type: "Page")
+                      .search(search_query, locale: @locale)
+                      .paginate(per_page: 50, page: params[:page])
+    end
+
     def show
       redirect_to edit_admin_page_url(@locale, @page)
     end
@@ -26,19 +33,14 @@ module Admin
     def new
       build_params = params[:page] ? page_params : nil
       @page = build_page(@locale, build_params)
-      @page.parent = if params[:parent]
-                       Page.find(params[:parent])
-                     elsif @news_pages
-                       @news_pages.first
-                     end
+      @page.parent = Page.find_by(id: params[:parent])
     end
 
     def edit; end
 
     def create
-      @page = build_page(@locale, page_params, param_categories)
+      @page = build_page(@locale, page_params, param_categories).tap(&:save)
       if @page.valid?
-        @page.save
         respond_with_page(@page) do
           redirect_to(edit_admin_page_url(@locale, @page))
         end
@@ -103,8 +105,7 @@ module Admin
     def param_categories
       return [] unless params[:category]
 
-      params.permit(category: {})[:category]
-            .to_hash
+      params.permit(category: {})[:category].to_hash
             .map { |id, _| Category.find(id) }
     end
 

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

@@ -11,10 +11,26 @@ module PagesCore
       Page.where(parent_page_id: feeds)
           .order("published_at DESC")
           .published
-          .limit(20)
           .localized(locale)
     end
 
+    def per_page_rss_param(default = 20, max = 1000)
+      return default unless params[:per_page].is_a?(String)
+
+      params[:per_page].to_i.clamp(1, max)
+    end
+
+    def render_page_rss(page, pagination_page = 1)
+      if page.feed_enabled?
+        render_rss(page.pages.paginate(per_page: per_page_rss_param,
+                                       page: pagination_page)
+                       .includes(:image, :author),
+                   title: page.name)
+      else
+        render_error 404
+      end
+    end
+
     def render_rss(items, title: nil)
       @title = PagesCore.config.site_name
       @title += ": #{title}" if title

data/app/controllers/pages_core/admin_controller.rb

@@ -13,6 +13,8 @@ module PagesCore
 
     layout "admin"
 
+    helper_method :search_query
+
     class << self
       # Get name of class with in lowercase, with underscores.
       def underscore
@@ -30,6 +32,10 @@ module PagesCore
 
     protected
 
+    def search_query
+      params[:q] || ""
+    end
+
     def set_i18n_locale
       I18n.locale = :en
     end

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/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/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"];
@@ -64,7 +84,10 @@ export default function Attachment(props) {
 
   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(" ")}
@@ -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];
@@ -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
-};

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

@@ -1,13 +1,19 @@
-import React, { useRef } from "react";
-import PropTypes from "prop-types";
+import React, { ChangeEvent, useRef } from "react";
 
-export default function FileUploadButton(props) {
-  const inputRef = useRef();
+interface FileUploadButtonProps {
+  callback: (files: File[]) => void,
+  type: string,
+  multiple: boolean,
+  multiline: boolean
+}
+
+export default function FileUploadButton(props: FileUploadButtonProps) {
+  const inputRef = useRef<HTMLInputElement>();
 
-  const handleChange = (evt) => {
-    let fileList = evt.target.files;
-    let files = [];
-    for (var i = 0; i < fileList.length; i++) {
+  const handleChange = (evt: ChangeEvent<HTMLInputElement>) => {
+    const fileList = evt.target.files;
+    const files: File[] = [];
+    for (let i = 0; i < fileList.length; i++) {
       files.push(fileList[i]);
     }
     if (files.length > 0) {
@@ -15,7 +21,7 @@ export default function FileUploadButton(props) {
     }
   };
 
-  const triggerDialog = (evt) => {
+  const triggerDialog = (evt: Event) => {
     evt.preventDefault();
     inputRef.current.click();
   };
@@ -38,10 +44,3 @@ export default function FileUploadButton(props) {
     </div>
   );
 }
-
-FileUploadButton.propTypes = {
-  callback: PropTypes.func,
-  type: PropTypes.string,
-  multiple: PropTypes.bool,
-  multiline: PropTypes.bool
-};