pages_core 3.15.3 → 3.15.5

data/app/javascript/components/drag/useDraggable.ts

@@ -1,8 +1,8 @@
-import React, { DragEvent, useEffect, useRef } from "react";
+import { DragEvent, useEffect, useRef } from "react";
 
 import * as Drag from "../../types/Drag";
 
-export default function useDraggable<T = Drag.DraggableRecord>(
+export default function useDraggable<T>(
   draggable: Drag.Draggable<T>,
   startDrag: (evt: React.MouseEvent, draggable: Drag.Draggable<T>) => void
 ) {
@@ -16,7 +16,7 @@ export default function useDraggable<T = Drag.DraggableRecord>(
 
   useEffect(() => {
     draggable.ref.current = ref.current;
-  }, []);
+  }, [draggable.ref]);
 
   return { ref: ref, onDragStart: handleDrag, draggable: true };
 }

data/app/javascript/features/RichText.tsx

@@ -1,4 +1,3 @@
-import React from "react";
 import { createRoot } from "react-dom/client";
 import RichTextArea from "../components/RichTextArea";
 import readyHandler from "../lib/readyHandler";

data/app/javascript/features/contentTabs.ts

@@ -1,8 +1,8 @@
 import readyHandler from "../lib/readyHandler";
 
-interface WindowState {
+type WindowState = {
   tabId: string;
-}
+};
 
 function applyTabs() {
   const tabLinks: HTMLAnchorElement[] = Array.from(

data/app/javascript/stores/useModalStore.ts

@@ -1,6 +1,6 @@
 import { create } from "zustand";
 
-interface ModalState {
+type ModalState = {
   component: JSX.Element | null;
   open: (elem: JSX.Element) => void;
   close: () => void;

data/app/javascript/stores/useToastStore.ts

@@ -1,11 +1,11 @@
 import { create } from "zustand";
 
-interface Toast {
+type Toast = {
   type: string;
   message: string;
 }
 
-interface ToastState {
+type ToastState = {
   toasts: Toast[];
   error: (msg: string) => void;
   notice: (msg: string) => void;

data/app/javascript/types/Attachments.ts

@@ -1,30 +1,30 @@
 import * as Drag from "./Drag";
 import { Locale, LocalizedValue } from "../types";
 
-export interface Resource {
-  id: number | null;
+export type Resource = {
+  id?: number;
   name: LocalizedValue;
-  description: LocalizedValue;
-  url: string;
   filename: string;
-}
+  description?: LocalizedValue;
+  url?: string;
+};
 
-export interface Record extends Drag.DraggableRecord {
+export type Record = {
   id?: number;
   attachment: Resource;
   uploading?: boolean;
-}
+};
 
-export interface Options {
+export type Options = {
   attribute: string;
   locale: string;
   locales: { [index: string]: Locale };
   showEmbed: boolean;
-}
+};
 
-export interface State {
+export type State = {
   collection: Drag.Collection<Record>;
   deleted: Record[];
   setDeleted: (records: Record[]) => void;
   update: (records: Record[]) => void;
-}
+};

data/app/javascript/types/Crop.ts

@@ -1,36 +1,40 @@
 import * as Images from "./Images";
 
-export interface Position {
+export type Position = {
   x: number;
   y: number;
-}
+};
 
-export interface Size {
+export type Ratio = number | null;
+
+export type Size = {
   width: number;
   height: number;
-}
+};
 
-export interface Params {
+export type Params = {
   crop_start_x: number;
   crop_start_y: number;
   crop_width: number;
   crop_height: number;
   crop_gravity_x: number;
   crop_gravity_y: number;
-}
+};
 
-export interface State extends Params {
+export type State = Params & {
   aspect: number | null;
   cropping: boolean;
   image: Images.Resource;
-}
+  focalPoint?: Position;
+};
 
-export interface CropSize extends Position, Size {
-  aspect?: number;
-}
+export type CropSize = Position &
+  Size & {
+    aspect?: number;
+  };
 
 export type Action =
   | { type: "completeCrop" | "startCrop" | "toggleFocal" }
   | { type: "setCrop"; payload: CropSize }
-  | { type: "setAspect"; payload: number }
+  | { type: "setAspect"; payload: Ratio }
   | { type: "setFocal"; payload: Position };

data/app/javascript/types/Drag.ts

@@ -1,35 +1,33 @@
-export type DraggableRecord = Record<string, unknown>;
-
-export interface Draggable<T = DraggableRecord> {
+export type Draggable<T> = {
   record: T;
   ref: React.MutableRefObject<HTMLDivElement>;
   rect: DOMRect | null;
   handle: string;
-}
+};
 
-export type Item<T = DraggableRecord> = Draggable<T> | "Files";
+export type DraggableOrFiles<T> = Draggable<T> | "Files";
 
-export type CollectionAction<T = DraggableRecord> =
-  | {
-      type: "append" | "prepend" | "insertFiles" | "replace" | "reorder";
-      payload: Item<T>[];
-    }
-  | { type: "update"; payload: Item<T> }
+export type CollectionAction<T> =
+  | { type: "append" | "insertFiles" | "replace"; payload: Draggable<T>[] }
+  | { type: "prepend" | "reorder"; payload: DraggableOrFiles<T>[] }
+  | { type: "update"; payload: Draggable<T> }
   | { type: "reinitialize"; payload: Array<T> }
   | { type: "remove"; payload: Draggable<T> }
-  | { type: "updatePositions"; payload?: Draggable<T> };
+  | { type: "updatePositions"; payload?: DraggableOrFiles<T> };
 
-export interface Collection<T = DraggableRecord> {
+export type Collection<T> = {
   ref: React.MutableRefObject<HTMLDivElement>;
-  draggables: Item<T>[];
-  dispatch: (CollectionAction) => void;
-}
+  draggables: DraggableOrFiles<T>[];
+  dispatch: React.Dispatch<CollectionAction<T>>;
+};
 
-export interface Position {
-  x: number | null;
-  y: number | null;
-}
+export type Position = {
+  x: number;
+  y: number;
+};
 
-export interface State<T = DraggableRecord> extends Position {
-  dragging: Item<T> | false;
-}
+export type State<T> = {
+  dragging: DraggableOrFiles<T> | false;
+  x?: number;
+  y?: number;
+};

data/app/javascript/types/Images.ts

@@ -1,7 +1,7 @@
 import * as Drag from "./Drag";
 import { Locale, LocalizedValue } from "../types";
 
-export interface Resource {
+export type Resource = {
   id: number | null;
   alternative: LocalizedValue;
   caption: LocalizedValue;
@@ -18,31 +18,31 @@ export interface Resource {
   original_url: string;
   thumbnail_url: string;
   uncropped_url: string;
-}
+};
 
-export interface Record extends Drag.DraggableRecord {
+export type Record = {
   id?: number;
   image: Resource;
   primary?: boolean;
   src?: string;
   file?: File;
-}
+};
 
 export type Response = Resource | { status: "error"; error: string };
 
-export interface GridOptions {
+export type GridOptions = {
   attribute: string;
   enablePrimary: boolean;
   locale: string;
   locales: { [index: string]: Locale };
   primaryAttribute: string;
   showEmbed: boolean;
-}
+};
 
-export interface GridState {
+export type GridState = {
   primary: Drag.Collection<Record>;
   images: Drag.Collection<Record>;
   deleted: Record[];
   setDeleted: (records: Record[]) => void;
   update: (records: Record[]) => void;
-}
+};

data/app/javascript/types/PageEditor.ts

@@ -9,7 +9,7 @@ export type Action =
   | { type: "update"; payload: Partial<Pages.Resource> }
   | { type: "updateBlocks"; payload: Partial<Pages.Blocks> };
 
-export interface State<T = Pages.Resource> {
+export type State<T = Pages.Resource> = {
   locale: string;
   locales: { [index: string]: Locale };
   page: T;
@@ -17,10 +17,17 @@ export interface State<T = Pages.Resource> {
   datesEnabled?: boolean;
   inputDir?: "ltr" | "rtl";
   templateConfig?: Template.Config;
-}
+};
 
-export interface Tab {
+export type Tab = {
   id: string;
   name: string;
   enabled: boolean;
-}
+};
+
+export type Return = [State, React.Dispatch<Action>];
+
+export type Context = {
+  state: State;
+  dispatch: React.Dispatch<Action>;
+};

data/app/javascript/types/Pages.ts

@@ -1,21 +1,20 @@
 import * as Attachments from "./Attachments";
 import * as Images from "./Images";
-import * as Trees from "./Trees";
 import { LocalizedValue, MaybeLocalizedValue } from "../types";
 
 export type Author = [name: string, id: number];
 
-export interface Ancestor {
+export type Ancestor = {
   id: number;
   name: LocalizedValue;
   path_segment: LocalizedValue;
-}
+};
 
-export interface StatusLabels {
+export type StatusLabels = {
   [index: number]: string;
-}
+};
 
-export interface TreeResource {
+type BaseResource = {
   id?: number;
   blocks: Blocks;
   news_page: boolean;
@@ -24,22 +23,25 @@ export interface TreeResource {
   pinned: boolean;
   published_at: Date;
   status: number;
-}
+};
 
-export interface Blocks {
+export type TreeResource = BaseResource & {
+  editing?: boolean;
+};
+
+export type Blocks = {
   [index: string]: MaybeLocalizedValue;
   name: LocalizedValue;
-}
+};
 
-export interface MetaImage {
+export type MetaImage = {
   src?: string;
   image?: Images.Resource;
-}
+};
 
-export interface Resource extends TreeResource {
+export type Resource = BaseResource & {
   all_day: boolean;
   ancestors: Ancestor[];
-  blocks: Blocks;
   enabled_tags: string[];
   ends_at: Date;
   errors: { attribute: string; message: string }[];
@@ -49,27 +51,20 @@ export interface Resource extends TreeResource {
   page_images: Images.Record[];
   path_segment: MaybeLocalizedValue;
   redirect_to: string;
+  skip_index: boolean;
   starts_at: Date;
   tags_and_suggestions: string[];
   template: string;
   unique_name: string;
   urls: LocalizedValue;
   user_id: number;
-}
+};
 
-export interface SerializedResource
-  extends Omit<Resource, "published_at" | "starts_at" | "ends_at"> {
+export type SerializedResource = Omit<
+  Resource,
+  "published_at" | "starts_at" | "ends_at"
+> & {
   published_at: string;
   starts_at: string;
   ends_at: string;
-}
-
-export interface TreeItem extends Partial<TreeResource> {
-  blocks: Blocks;
-  editing?: boolean;
-  permissions?: string[];
-}
-
-export interface TreeNode extends TreeItem, Trees.Node {
-  children: TreeNode[];
-}
+};

data/app/javascript/types/Tags.ts

@@ -1,9 +1,8 @@
-export interface Action {
-  type: "addTag" | "toggleTag";
-  payload: string;
-}
+export type Action =
+  | { type: "addTag" | "toggleTag"; payload: string }
+  | { type: "update"; payload: State };
 
-export interface State {
+export type State = {
   enabled: string[];
   tags: string[];
-}
+};

data/app/javascript/types/Template.ts

@@ -1,4 +1,4 @@
-export interface Block {
+export type Block = {
   name: string;
   title: string;
   description?: string;
@@ -10,9 +10,9 @@ export interface Block {
   placeholder?: string;
   options?: [string, string][];
   type?: string;
-}
+};
 
-export interface Config {
+export type Config = {
   name: string;
   template_name: string;
   blocks: Block[];
@@ -21,4 +21,4 @@ export interface Config {
   dates: boolean;
   tags: boolean;
   files: boolean;
-}
+};

data/app/javascript/types.ts

@@ -1,7 +1,7 @@
-export interface Locale {
+export type Locale = {
   name: string;
   dir: "ltr" | "rtl";
-}
+};
 
 export type LocalizedValue = Record<string, string>;
 export type MaybeLocalizedValue = LocalizedValue | string;

data/app/models/attachment.rb

@@ -26,15 +26,13 @@ class Attachment < ApplicationRecord
     end
 
     def formats
-      {
-        "audio/mpeg" => :mp3,
+      { "audio/mpeg" => :mp3,
         "image/gif" => :gif,
         "image/jpeg" => :jpg,
         "image/jpg" => :jpg,
         "image/pjpeg" => :jpg,
         "image/png" => :png,
-        "application/pdf" => :pdf
-      }
+        "application/pdf" => :pdf }
     end
   end
 
@@ -53,11 +51,9 @@ class Attachment < ApplicationRecord
   end
 
   def filename_extension
-    if filename_extension?
-      filename.match(/\.([^.]+)$/)[1]
-    else
-      ""
-    end
+    return "" unless filename_extension?
+
+    filename.match(/\.([^.]+)$/)[1]
   end
 
   def filename_extension?

data/app/models/autopublisher.rb

@@ -2,7 +2,7 @@
 
 class Autopublisher
   class << self
-    def run!(_options = {})
+    def run!
       if due_pages.any?
         PagesCore::CacheSweeper.once do
           due_pages.each do |p|

data/app/models/concerns/pages_core/page_model/redirectable.rb

@@ -9,8 +9,7 @@ module PagesCore
 
       included do
         validates(:redirect_to,
-                  format: { with: %r{\A(/|https?://).+\z},
-                            allow_blank: true })
+                  format: { with: %r{\A(/|https?://).+\z}, allow_blank: true })
       end
 
       # Returns boolean true if page has a valid redirect

data/app/models/concerns/pages_core/page_model/searchable.rb

@@ -7,7 +7,7 @@ module PagesCore
 
       def search_document_attributes
         super.merge(
-          published: published?,
+          published: published? && !skip_index?,
           name:,
           description: try(&:meta_description?) ? meta_description : excerpt,
           # content: "",

data/app/models/concerns/pages_core/page_model/status.rb

@@ -7,13 +7,11 @@ module PagesCore
 
       module ClassMethods
         def status_labels
-          {
-            0 => "Draft",
+          { 0 => "Draft",
             1 => "Reviewed",
             2 => "Published",
             3 => "Hidden",
-            4 => "Deleted"
-          }
+            4 => "Deleted" }
         end
       end
 

data/app/models/concerns/pages_core/searchable_document.rb

@@ -26,10 +26,8 @@ module PagesCore
         SearchDocument.transaction do
           record.search_documents.where.not(locale: locales).destroy_all
           locales.each do |locale|
-            update_index(
-              locale,
-              localized_record(locale).search_document_attributes
-            )
+            update_index(locale,
+                         localized_record(locale).search_document_attributes)
           end
         end
       end

data/app/models/image.rb

@@ -11,21 +11,6 @@ class Image < ApplicationRecord
     attribute :caption
   end
 
-  def byline
-    ActiveSupport::Deprecation.warn "Image#byline is deprecated, use #caption"
-    caption
-  end
-
-  def byline?
-    ActiveSupport::Deprecation.warn "Image#byline? is deprecated, use #caption?"
-    caption?
-  end
-
-  def byline=(new_caption)
-    ActiveSupport::Deprecation.warn "Image#byline= is deprecated, use #caption="
-    self.caption = new_caption
-  end
-
   private
 
   def ensure_max_size

data/app/models/page_builder.rb

@@ -18,9 +18,9 @@ class PageBuilder
   attr_reader :user, :locale, :parent
 
   class << self
-    def build(user, locale: nil, parent: nil, &block)
+    def build(user, locale: nil, parent: nil, &)
       new(user, locale:, parent:)
-        .run(&block)
+        .run(&)
     end
   end
 
@@ -49,11 +49,9 @@ class PageBuilder
   private
 
   def default_options
-    {
-      author: user,
+    { author: user,
       parent:,
       status: 2,
-      locale:
-    }
+      locale: }
   end
 end

data/app/resources/admin/page_resource.rb

@@ -9,7 +9,7 @@ module Admin
 
     attributes :id, :starts_at, :ends_at, :all_day, :status, :published_at,
                :pinned, :template, :unique_name, :feed_enabled, :news_page,
-               :parent_page_id, :user_id, :redirect_to
+               :parent_page_id, :user_id, :redirect_to, :skip_index
 
     has_many :page_images, resource: Admin::PageImageResource
     has_many :page_files, resource: Admin::PageFileResource
@@ -79,7 +79,7 @@ module Admin
       return { src: nil, image: nil } unless image
 
       { src: dynamic_image_path(image, size: "500x"),
-        image: ::Admin::ImageResource.new(image).to_hash }
+        image: ::Admin::ImageResource.new(image).to_h }
     end
 
     def localized_objects

data/app/resources/export/page_resource.rb

@@ -7,7 +7,7 @@ module Export
     attributes :id, :locale
     attributes(*PagesCore::Templates::TemplateConfiguration.all_blocks)
     attributes :created_at, :published_at, :pinned, :template, :redirect_to,
-               :starts_at, :ends_at, :all_day
+               :starts_at, :ends_at, :all_day, :skip_index
 
     has_many :attachments, resource: Export::AttachmentResource
 

data/app/services/pages_core/invite_service.rb

@@ -35,8 +35,7 @@ module PagesCore
     def deliver_invite(invite)
       AdminMailer.invite(
         invite,
-        admin_invite_with_token_url(invite, invite.token,
-                                    host:, protocol:)
+        admin_invite_with_token_url(invite, invite.token, host:, protocol:)
       ).deliver_later
     end
   end

data/app/views/layouts/admin.html.erb

@@ -29,6 +29,7 @@
     <% end %>
 
     <%= csrf_meta_tag %>
+    <%= csp_meta_tag %>
     <meta name="viewport"
           content="width=device-width, initial-scale=1, user-scalable=no">
   </head>

data/app/views/pages_core/sitemaps/index.xml.builder

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+xml.instruct!
+xml.sitemapindex xmlns: "http://www.sitemaps.org/schemas/sitemap/0.9" do |index|
+  @sitemaps.each do |url|
+    index.sitemap do |sitemap|
+      sitemap.loc(url)
+    end
+  end
+end

data/config/routes.rb

@@ -19,7 +19,6 @@ Rails.application.routes.draw do
       post "search"
       post "preview"
     end
-    resources :files, controller: "page_files"
   end
 
   get "/:locale/pages/:id/:page" => "pages#show",
@@ -31,8 +30,10 @@ Rails.application.routes.draw do
   get "pages/:locale/*glob" => redirect("/%{locale}/pages/%{glob}"),
       locale: /\w\w\w/
 
-  # Sitemap
-  resource :sitemap, only: [:show]
+  # Sitemaps
+  get("sitemap" => "pages_core/sitemaps#index", as: :sitemap_index)
+  get("/sitemap-pages-:locale" => "pages_core/sitemaps#pages",
+      as: :pages_sitemap)
 
   namespace :admin do
     get "users/login" => redirect("/admin/login")