pages_core 3.12.4 → 3.12.5

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

@@ -25,8 +25,7 @@ function hideDraggable(draggable: Draggable | null, callback: () => void) {
     const result = callback();
     draggable.ref.current.style.display = prevDisplay;
     return result;
-  }
-  else {
+  } else {
     return callback();
   }
 }
@@ -36,67 +35,62 @@ function insertFiles(state: Draggable[], files: Draggable[]): Draggable[] {
   if (index === -1 || !files) {
     return state;
   } else {
-    return [
-      ...state.slice(0, index),
-      ...files,
-      ...state.slice(index + 1)
-    ];
+    return [...state.slice(0, index), ...files, ...state.slice(index + 1)];
   }
 }
 
 function dragCollectionReducer(
-  state: Draggable[], action: DragCollectionAction
+  state: Draggable[],
+  action: DragCollectionAction
 ): Draggable[] {
   switch (action.type) {
-  case "append":
-    return [...state, ...action.payload as Draggable[]];
-  case "prepend":
-    return [...action.payload as Draggable[], ...state];
-  case "insertFiles":
-    return insertFiles(state, action.payload);
-  case "update":
-    return state.map(d => {
-      return (d.handle === action.payload.handle) ? action.payload : d;
-    });
-  case "updatePositions":
-    return hideDraggable(action.payload, () => {
-      return state.map(d => {
-        return { ...d, rect: getPosition(d) };
+    case "append":
+      return [...state, ...(action.payload as Draggable[])];
+    case "prepend":
+      return [...(action.payload as Draggable[]), ...state];
+    case "insertFiles":
+      return insertFiles(state, action.payload);
+    case "update":
+      return state.map((d) => {
+        return d.handle === action.payload.handle ? action.payload : d;
       });
-    });
-  case "remove":
-    return state.filter(d => d.handle !== action.payload.handle);
-  case "replace":
-    return action.payload;
-  case "reorder":
-    return action.payload;
-  default:
-    return state;
+    case "updatePositions":
+      return hideDraggable(action.payload, () => {
+        return state.map((d) => {
+          return { ...d, rect: getPosition(d) };
+        });
+      });
+    case "remove":
+      return state.filter((d) => d.handle !== action.payload.handle);
+    case "replace":
+      return action.payload;
+    case "reorder":
+      return action.payload;
+    default:
+      return state;
   }
 }
 
 export function createDraggable(record: Record<string, unknown>): Draggable {
-  return { record: record,
-           rect: null,
-           ref: createRef(),
-           handle: uniqueId("draggable") };
+  return {
+    record: record,
+    rect: null,
+    ref: createRef(),
+    handle: uniqueId("draggable")
+  };
 }
 
 export default function useDragCollection(
   records: DraggableRecord[]
 ): DragCollection {
   const containerRef = useRef<HTMLElement>(null);
-  const [draggables, dispatch] = useReducer(
-    dragCollectionReducer,
-    [],
-    () => records.map(r => createDraggable(r))
+  const [draggables, dispatch] = useReducer(dragCollectionReducer, [], () =>
+    records.map((r) => createDraggable(r))
   ) as [Draggables, (Draggables) => Draggable[]];
 
   useEffect(() => {
     dispatch({ type: "updatePositions" });
   }, []);
 
-  return { ref: containerRef,
-           draggables: draggables,
-           dispatch: dispatch };
+  return { ref: containerRef, draggables: draggables, dispatch: dispatch };
 }

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

@@ -51,13 +51,14 @@ export default function useDragUploader(
 ) {
   const initialState: DragState = {
     dragging: false,
-    x: null, y: null
+    x: null,
+    y: null
   };
 
   const [dragState, setDragState] = useState(initialState);
 
   const updatePositions = (dragging: Draggable | null) => {
-    collections.forEach(c => {
+    collections.forEach((c) => {
       c.dispatch({ type: "updatePositions", payload: dragging });
     });
   };

data/app/javascript/components/drag.ts

@@ -1,7 +1,8 @@
 export { Draggable, DragState } from "./drag/types";
-export { default as useDragCollection,
-         createDraggable } from "./drag/useDragCollection";
+export {
+  default as useDragCollection,
+  createDraggable
+} from "./drag/useDragCollection";
 export { default as useDragUploader } from "./drag/useDragUploader";
 export { default as useDraggable } from "./drag/useDraggable";
-export { default as draggedOrder,
-         collectionOrder } from "./drag/draggedOrder";
+export { default as draggedOrder, collectionOrder } from "./drag/draggedOrder";

data/app/javascript/controllers/LoginController.ts

@@ -13,7 +13,6 @@ export default class LoginController extends Controller {
     }
   }
 
-
   changeTab(evt: Event) {
     evt.preventDefault();
     if ("dataset" in evt.target && "tab" in evt.target.dataset) {

data/app/javascript/controllers/MainController.ts

@@ -42,7 +42,11 @@ export default class MainController extends Controller {
     if ("dataset" in evt.target && "tab" in evt.target.dataset) {
       const tab = evt.target.dataset.tab as string;
       this.showTab(tab);
-      history.pushState({ tabId: tab }, "", `${window.location.pathname}#${tab}`);
+      history.pushState(
+        { tabId: tab },
+        "",
+        `${window.location.pathname}#${tab}`
+      );
     }
   }
 
@@ -64,7 +68,7 @@ export default class MainController extends Controller {
     });
   }
 
-  tabNames (): string[] {
+  tabNames(): string[] {
     return this.linkTargets.map((l) => l.dataset.tab);
   }
 }

data/app/javascript/controllers/PageOptionsController.js

@@ -2,7 +2,12 @@ import { Controller } from "@hotwired/stimulus";
 
 export default class PageOptionsController extends Controller {
   static get targets() {
-    return ["advancedOptions", "autoPublishNotice", "published", "publishedDate"];
+    return [
+      "advancedOptions",
+      "autoPublishNotice",
+      "published",
+      "publishedDate"
+    ];
   }
 
   connect() {
@@ -32,7 +37,7 @@ export default class PageOptionsController extends Controller {
     };
     return new Date(
       lookup("year"),
-      (lookup("month") - 1),
+      lookup("month") - 1,
       lookup("day"),
       lookup("hour"),
       lookup("minute")

data/app/javascript/features/RichText.tsx

@@ -4,27 +4,29 @@ import RichTextArea from "../components/RichTextArea";
 import readyHandler from "../lib/readyHandler";
 
 class RichText {
-  apply () {
+  apply() {
     const elems = document.querySelectorAll("textarea.rich");
     elems.forEach((elem) => {
       this.enhance(elem);
     });
   }
 
-  enhance (elem: HTMLTextAreaElement) {
+  enhance(elem: HTMLTextAreaElement) {
     const container = document.createElement("div");
     elem.parentNode.appendChild(container);
     createRoot(container).render(
-      <RichTextArea value={elem.value}
-                    name={elem.name}
-                    rows={elem.rows}
-                    id={elem.id} />,
+      <RichTextArea
+        value={elem.value}
+        name={elem.name}
+        rows={elem.rows}
+        id={elem.id}
+      />,
       container
     );
     elem.parentNode.removeChild(elem);
   }
 
-  start () {
+  start() {
     readyHandler.ready(() => {
       this.apply();
     });

data/app/javascript/index.ts

@@ -16,7 +16,7 @@ export function registerComponent(name: string, component: FC) {
   window[name] = component;
 }
 
-export default function startPages () {
+export default function startPages() {
   startRails();
   for (const name in Components) {
     registerComponent(name, Components[name] as FC);
@@ -35,5 +35,7 @@ export * from "./hooks";
 export * from "./stores";
 
 export * from "./lib/request";
-export { default as copyToClipboard,
-         copySupported } from "./lib/copyToClipboard";
+export {
+  default as copyToClipboard,
+  copySupported
+} from "./lib/copyToClipboard";

data/app/javascript/lib/Tree.ts

@@ -54,19 +54,19 @@ export type TreeId = number | string;
 type MovePlacement = "before" | "after" | "prepend" | "append";
 
 export interface TreeNode {
-  children: TreeNode[],
-  collapsed: boolean
+  children: TreeNode[];
+  collapsed: boolean;
 }
 
 export interface TreeIndex<T extends TreeNode = TreeNode> {
-  id: number,
-  node: T,
-  children: TreeIndex<T>[],
-  parent: TreeIndex<T>
-  next: TreeIndex<T> | null,
-  prev: TreeIndex<T> | null,
-  top: number,
-  height: number
+  id: number;
+  node: T;
+  children: TreeIndex<T>[];
+  parent: TreeIndex<T>;
+  next: TreeIndex<T> | null;
+  prev: TreeIndex<T> | null;
+  top: number;
+  height: number;
 }
 
 function indexName(id: number | string): string {
@@ -114,13 +114,13 @@ export default class Tree<N extends TreeNode = TreeNode> {
       });
       parent.children = children;
 
-      children.forEach(function(id, i) {
+      children.forEach(function (id, i) {
         const index = indexes[indexName(id)];
         if (i > 0) {
           index.prev = children[i - 1];
         }
-        if (i < children.length-1) {
-          index.next = children[i+1];
+        if (i < children.length - 1) {
+          index.next = children[i + 1];
         }
       });
     };
@@ -173,10 +173,10 @@ export default class Tree<N extends TreeNode = TreeNode> {
       const index = this.getIndex(id);
       index.prev = index.next = null;
       if (i > 0) {
-        index.prev = children[i-1];
+        index.prev = children[i - 1];
       }
-      if (i < children.length-1) {
-        index.next = children[i+1];
+      if (i < children.length - 1) {
+        index.next = children[i + 1];
       }
     });
   }
@@ -213,7 +213,7 @@ export default class Tree<N extends TreeNode = TreeNode> {
     const destIndex = this.getIndex(destId);
     const parentId = destIndex.parent;
     const i = this.getIndex(parentId).children.indexOf(destId);
-    return this.insert(obj, parentId, i+1);
+    return this.insert(obj, parentId, i + 1);
   }
 
   prepend(obj: N, destId: TreeId): TreeIndex<N> {
@@ -237,7 +237,10 @@ export default class Tree<N extends TreeNode = TreeNode> {
     root.left = left++;
 
     const walk = (
-      children: TreeIndex<N>[], parent: TreeIndex<N>, left: number, collapsed: boolean
+      children: TreeIndex<N>[],
+      parent: TreeIndex<N>,
+      left: number,
+      collapsed: boolean
     ) => {
       let height = 1;
       children.forEach((id: TreeId) => {
@@ -254,7 +257,7 @@ export default class Tree<N extends TreeNode = TreeNode> {
           height += walk(
             node.children,
             node,
-            left+1,
+            left + 1,
             collapsed || node.node.collapsed
           );
         } else {
@@ -263,7 +266,7 @@ export default class Tree<N extends TreeNode = TreeNode> {
         }
       });
 
-      if(parent.node.collapsed) parent.height = 1;
+      if (parent.node.collapsed) parent.height = 1;
       else parent.height = height;
       return parent.height;
     };
@@ -285,9 +288,9 @@ export default class Tree<N extends TreeNode = TreeNode> {
       index = this.insertBefore(obj, toId);
     } else if (placement === "after") {
       index = this.insertAfter(obj, toId);
-    } else if(placement === "prepend") {
+    } else if (placement === "prepend") {
       index = this.prepend(obj, toId);
-    } else if(placement === "append") {
+    } else if (placement === "append") {
       index = this.append(obj, toId);
     }
 
@@ -305,9 +308,9 @@ export default class Tree<N extends TreeNode = TreeNode> {
 
   getNodeByTop(top) {
     const indexes = this.indexes;
-    for(const id in indexes) {
+    for (const id in indexes) {
       if (Object.prototype.hasOwnProperty.call(indexes, id)) {
-        if(indexes[id].top === top) {
+        if (indexes[id].top === top) {
           return indexes[id];
         }
       }

data/app/javascript/lib/copyToClipboard.ts

@@ -1,9 +1,10 @@
-export function copySupported () {
-  return document.queryCommandSupported &&
-    document.queryCommandSupported("copy");
+export function copySupported() {
+  return (
+    document.queryCommandSupported && document.queryCommandSupported("copy")
+  );
 }
 
-export default function copyToClipboard (str: string) {
+export default function copyToClipboard(str: string) {
   const el = document.createElement("textarea");
   el.value = str;
   document.body.appendChild(el);

data/app/javascript/lib/readyHandler.ts

@@ -4,18 +4,18 @@ const readyHandlers: ReadyHandlerFunc[] = [];
 
 const handleState = () => {
   if (["interactive", "complete"].indexOf(document.readyState) > -1) {
-    while(readyHandlers.length > 0) {
-      (readyHandlers.shift())();
+    while (readyHandlers.length > 0) {
+      readyHandlers.shift()();
     }
   }
 };
 
 class ReadyHandler {
-  constructor () {
+  constructor() {
     document.onreadystatechange = handleState;
   }
 
-  ready (handler: ReadyHandlerFunc) {
+  ready(handler: ReadyHandlerFunc) {
     readyHandlers.push(handler);
     handleState();
   }

data/app/javascript/lib/request.ts

@@ -9,9 +9,13 @@ export function csrfToken(): string {
 }
 
 function jsonFetchOptions() {
-  return({ method: "POST",
-           headers: { "Content-Type": "application/json; charset=utf-8",
-                      "X-CSRF-Token": csrfToken() } });
+  return {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json; charset=utf-8",
+      "X-CSRF-Token": csrfToken()
+    }
+  };
 }
 
 export async function postJson(url: string, data: Record<string, unknown>) {

data/app/javascript/stores/useModalStore.ts

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

data/app/javascript/stores/useToastStore.ts

@@ -1,25 +1,27 @@
 import { create } from "zustand";
 
 export interface Toast {
-  type: string,
-  message: string
+  type: string;
+  message: string;
 }
 
 interface ToastState {
-  toasts: Toast[],
-  error: (msg: string) => void,
-  notice: (msg: string) => void,
-  next: () => void
+  toasts: Toast[];
+  error: (msg: string) => void;
+  notice: (msg: string) => void;
+  next: () => void;
 }
 
 const useToastStore = create<ToastState>((set) => ({
   toasts: [],
-  error: (msg: string) => set((state) => (
-    { toasts: [...state.toasts, { message: msg, type: "error" }] }
-  )),
-  notice: (msg: string) => set((state) => (
-    { toasts: [...state.toasts, { message: msg, type: "notice" }] }
-  )),
+  error: (msg: string) =>
+    set((state) => ({
+      toasts: [...state.toasts, { message: msg, type: "error" }]
+    })),
+  notice: (msg: string) =>
+    set((state) => ({
+      toasts: [...state.toasts, { message: msg, type: "notice" }]
+    })),
   next: () => set((state) => ({ toasts: state.toasts.slice(1) }))
 }));
 

data/app/javascript/types.ts

@@ -1,30 +1,30 @@
 export interface Locale {
-  name: string,
-  dir: "ltr" | "rtl"
+  name: string;
+  dir: "ltr" | "rtl";
 }
 
 export interface AttachmentResource {
-  id: number | null,
-  name: Record<string, string>,
-  description: Record<string, string>,
-  url: string
+  id: number | null;
+  name: Record<string, string>;
+  description: Record<string, string>;
+  url: string;
 }
 
 export interface ImageResource {
-  id: number | null,
-  alternative: Record<string, string>,
-  caption: Record<string, string>,
-  content_type: string,
-  filename: string,
-  crop_start_x: number | null,
-  crop_start_y: number | null,
-  crop_width: number | null,
-  crop_height: number | null,
-  crop_gravity_x: number,
-  crop_gravity_y: number,
-  real_width: number,
-  real_height: number,
-  original_url: string,
-  thumbnail_url: string
-  uncropped_url: string
+  id: number | null;
+  alternative: Record<string, string>;
+  caption: Record<string, string>;
+  content_type: string;
+  filename: string;
+  crop_start_x: number | null;
+  crop_start_y: number | null;
+  crop_width: number | null;
+  crop_height: number | null;
+  crop_gravity_x: number;
+  crop_gravity_y: number;
+  real_width: number;
+  real_height: number;
+  original_url: string;
+  thumbnail_url: string;
+  uncropped_url: string;
 }

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

@@ -47,7 +47,7 @@ module PagesCore
       end
 
       def base_template
-        template.split(/_/)
+        template.split("_")
                 .reject { |w| %w[index list archive liste arkiv].include?(w) }
                 .join(" ")
       end

data/app/views/admin/calendars/show.html.erb

@@ -14,7 +14,7 @@
 <% end %>
 
 <% content_for :sidebar do %>
-  <%= render(partial: "sidebar", locals: { locale: @locale }) %>
+  <%= render(partial: "sidebar", locals: { locale: content_locale }) %>
 <% end %>
 
 <% if @pages.any? %>

data/app/views/admin/news/index.html.erb

@@ -17,7 +17,7 @@
 <% content_for :sidebar do %>
   <%= render(partial: "sidebar",
              locals: {
-               locale: @locale,
+               locale: content_locale,
                category: @category,
                news_pages: @news_pages,
                archive_finder: @archive_finder

data/app/views/admin/pages/_edit_files.html.erb

@@ -1,4 +1,4 @@
 <%= react_component("PageFiles",
-                    locale: @locale,
+                    locale: content_locale,
                     locales: locales_with_dir,
                     records: @page.files.map { |pf| Admin::PageFileResource.new(pf).to_hash }) %>

data/app/views/admin/pages/_edit_images.html.erb

@@ -1,4 +1,4 @@
 <%= react_component("PageImages",
-                    locale: @locale,
+                    locale: content_locale,
                     locales: locales_with_dir,
                     records: @page.page_images.map { |pi| Admin::PageImageResource.new(pi).to_hash }) %>

data/app/views/admin/pages/_list_item.html.erb

@@ -8,7 +8,7 @@
   <td class="name">
     <%= link_to_if(policy(page).edit?,
                    page_name(page),
-                   edit_admin_page_url(@locale, page),
+                   edit_admin_page_url(content_locale, page),
                    class: 'name_link') %>
     <%= autopublish_notice(page) %>
   </td>

data/app/views/admin/pages/_search_bar.html.erb

@@ -1,5 +1,5 @@
 <% query ||= "" %>
-<%= form_tag(search_admin_pages_path(@locale),
+<%= form_tag(search_admin_pages_path(content_locale),
              method: "get",
              class: "search-bar") do %>
   <%= text_field_tag(:q, query,

data/app/views/admin/pages/deleted.html.erb

@@ -1,7 +1,7 @@
 <% content_for :page_title, "Deleted pages" %>
 
 <% content_for :page_description do %>
-  <%= link_to("All pages", admin_pages_path(@locale)) %> /
+  <%= link_to("All pages", admin_pages_path(content_locale)) %> /
   Deleted pages
 <% end %>
 
@@ -22,7 +22,7 @@
         <td class="name">
           <%= link_to_if(policy(page).edit?,
                          page_name(page),
-                         edit_admin_page_url(@locale, page),
+                         edit_admin_page_url(content_locale, page),
                          class: 'name_link') %>
         </td>
         <td>

data/app/views/admin/pages/edit.html.erb

@@ -9,11 +9,11 @@
   Editing
   <% @page.ancestors.reverse.each do |page| %>
     <%= link_to(page.name? ? page.name : tag.i("Untitled"),
-                edit_admin_page_path(@locale, page)) %>
+                edit_admin_page_path(content_locale, page)) %>
     &raquo;
   <% end %>
   <%= link_to(@page.name? ? @page.name : tag.i("Untitled"),
-              edit_admin_page_path(@locale, @page)) %>
+              edit_admin_page_path(content_locale, @page)) %>
 <% end %>
 
 <% content_for :page_description_links do %>
@@ -22,7 +22,7 @@
 
 <% content_for :main_wrapper do %>
   <%= form_for(@page,
-               url: admin_page_url(@locale, @page),
+               url: admin_page_url(content_locale, @page),
                builder: PagesCore::Admin::FormBuilder,
                html: {
                  class: "edit-page main-wrapper",