pages_core 3.12.1 → 3.12.2

data/app/javascript/lib/{Tree.js → Tree.ts}

@@ -48,43 +48,65 @@
   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
   SOFTWARE.
-*/
+ */
 
-export default class Tree {
-  constructor(obj) {
+export type TreeId = number | string;
+type MovePlacement = "before" | "after" | "prepend" | "append";
+
+export interface TreeNode {
+  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
+}
+
+function indexName(id: number | string): string {
+  return `${id}`;
+}
+
+export default class Tree<N extends TreeNode = TreeNode> {
+  cnt: number;
+  obj: N;
+  indexes: Record<string, TreeIndex<N>>;
+
+  constructor(obj: N) {
     this.cnt = 1;
     this.obj = obj || { children: [] };
     this.indexes = {};
     this.build(this.obj);
   }
 
-  build(obj) {
-    var indexes = this.indexes;
-    var startId = this.cnt;
-    var self = this;
+  build(obj: N): TreeIndex<N> {
+    const indexes = this.indexes;
+    const startId = this.cnt;
 
-    var index = { id: startId, node: obj };
-    indexes[this.cnt + ""] = index;
+    const index = { id: startId, node: obj };
+    indexes[indexName(this.cnt)] = index;
     this.cnt++;
 
-    if (obj.children && obj.children.length) {
-      walk(obj.children, index);
-    }
-
-    function walk(objs, parent) {
-      var children = [];
-      objs.forEach(function(obj) {
-        var index = {};
-        index.id = self.cnt;
+    const walk = (objs: TreeIndex<N>[], parent: TreeIndex<N>) => {
+      const children: TreeIndex<N>[] = [];
+      objs.forEach((obj) => {
+        const index: TreeIndex<N> = {};
+        index.id = this.cnt;
         index.node = obj;
 
         if (parent) {
           index.parent = parent.id;
         }
 
-        indexes[self.cnt + ""] = index;
-        children.push(self.cnt);
-        self.cnt++;
+        indexes[indexName(this.cnt)] = index;
+        children.push(this.cnt);
+        this.cnt++;
 
         if (obj.children && obj.children.length) {
           walk(obj.children, index);
@@ -93,7 +115,7 @@ export default class Tree {
       parent.children = children;
 
       children.forEach(function(id, i) {
-        var index = indexes[id + ""];
+        const index = indexes[indexName(id)];
         if (i > 0) {
           index.prev = children[i - 1];
         }
@@ -101,56 +123,54 @@ export default class Tree {
           index.next = children[i+1];
         }
       });
+    };
+
+    if (obj.children && obj.children.length) {
+      walk(obj.children, index);
     }
 
     return index;
   }
 
-  getIndex(id) {
-    var index = this.indexes[id + ""];
-    if (index) {
-      return index;
-    }
+  getIndex(id: TreeId): TreeIndex<N> {
+    return this.indexes[indexName(id)];
   }
 
-  removeIndex(index) {
-    var self = this;
-    del(index);
-
-    function del(index) {
-      delete self.indexes[index.id + ""];
+  removeIndex(index: TreeIndex<N>) {
+    const del = (index: TreeIndex<N>) => {
+      delete this.indexes[indexName(index.id)];
       if (index.children && index.children.length) {
-        index.children.forEach(function(child) {
-          del(self.getIndex(child));
+        index.children.forEach((child) => {
+          del(this.getIndex(child));
         });
       }
-    }
+    };
+    del(index);
   }
 
-  get(id) {
-    var index = this.getIndex(id);
-    if (index && index.node) {
-      return index.node;
-    }
-    return null;
+  get(id: TreeId): N {
+    return this.getIndex(id).node;
   }
 
-  remove(id) {
-    var index = this.getIndex(id);
-    var node = this.get(id);
-    var parentIndex = this.getIndex(index.parent);
-    var parentNode = this.get(index.parent);
+  remove(id: TreeId): N {
+    const index = this.getIndex(id);
+    const node = this.get(id);
+
+    const parentIndex = this.getIndex(index.parent);
+    const parentNode = this.get(index.parent);
+
     parentNode.children.splice(parentNode.children.indexOf(node), 1);
     parentIndex.children.splice(parentIndex.children.indexOf(id), 1);
+
     this.removeIndex(index);
     this.updateChildren(parentIndex.children);
 
     return node;
   }
 
-  updateChildren(children) {
-    children.forEach(function(id, i) {
-      var index = this.getIndex(id);
+  updateChildren(children: TreeIndex<N>[]) {
+    children.forEach((id, i) => {
+      const index = this.getIndex(id);
       index.prev = index.next = null;
       if (i > 0) {
         index.prev = children[i-1];
@@ -158,14 +178,14 @@ export default class Tree {
       if (i < children.length-1) {
         index.next = children[i+1];
       }
-    }.bind(this));
+    });
   }
 
-  insert(obj, parentId, i) {
-    var parentIndex = this.getIndex(parentId);
-    var parentNode = this.get(parentId);
+  insert(obj: N, parentId: TreeId, i: number): TreeIndex<N> {
+    const parentIndex = this.getIndex(parentId);
+    const parentNode = this.get(parentId);
 
-    var index = this.build(obj);
+    const index = this.build(obj);
     index.parent = parentId;
 
     parentNode.children = parentNode.children || [];
@@ -182,26 +202,26 @@ export default class Tree {
     return index;
   }
 
-  insertBefore(obj, destId) {
-    var destIndex = this.getIndex(destId);
-    var parentId = destIndex.parent;
-    var i = this.getIndex(parentId).children.indexOf(destId);
+  insertBefore(obj: N, destId: TreeId): TreeIndex<N> {
+    const destIndex = this.getIndex(destId);
+    const parentId = destIndex.parent;
+    const i = this.getIndex(parentId).children.indexOf(destId);
     return this.insert(obj, parentId, i);
   }
 
-  insertAfter(obj, destId) {
-    var destIndex = this.getIndex(destId);
-    var parentId = destIndex.parent;
-    var i = this.getIndex(parentId).children.indexOf(destId);
+  insertAfter(obj: N, destId: TreeId): TreeIndex<N> {
+    const destIndex = this.getIndex(destId);
+    const parentId = destIndex.parent;
+    const i = this.getIndex(parentId).children.indexOf(destId);
     return this.insert(obj, parentId, i+1);
   }
 
-  prepend(obj, destId) {
+  prepend(obj: N, destId: TreeId): TreeIndex<N> {
     return this.insert(obj, destId, 0);
   }
 
-  append(obj, destId) {
-    var destIndex = this.getIndex(destId);
+  append(obj: N, destId: TreeId): TreeIndex<N> {
+    const destIndex = this.getIndex(destId);
     destIndex.children = destIndex.children || [];
     return this.insert(obj, destId, destIndex.children.length);
   }
@@ -209,22 +229,19 @@ export default class Tree {
   // react-ui-tree methods
 
   updateNodesPosition() {
-    var top = 1;
-    var left = 1;
-    var root = this.getIndex(1);
-    var self = this;
+    let top = 1;
+    let left = 1;
+    const root = this.getIndex(1);
 
     root.top = top++;
     root.left = left++;
 
-    if (root.children && root.children.length) {
-      walk(root.children, root, left, root.node.collapsed);
-    }
-
-    function walk(children, parent, left, collapsed) {
-      var height = 1;
-      children.forEach(function(id) {
-        var node = self.getIndex(id);
+    const walk = (
+      children: TreeIndex<N>[], parent: TreeIndex<N>, left: number, collapsed: boolean
+    ) => {
+      let height = 1;
+      children.forEach((id: TreeId) => {
+        const node = this.getIndex(id);
         if (collapsed) {
           node.top = null;
           node.left = null;
@@ -249,16 +266,20 @@ export default class Tree {
       if(parent.node.collapsed) parent.height = 1;
       else parent.height = height;
       return parent.height;
+    };
+
+    if (root.children && root.children.length) {
+      walk(root.children, root, left, root.node.collapsed);
     }
   }
 
-  move(fromId, toId, placement) {
+  move(fromId: TreeId, toId: TreeId, placement: MovePlacement): TreeIndex<N> {
     if (fromId === toId || toId === 1) {
       return;
     }
 
-    var obj = this.remove(fromId);
-    var index = null;
+    const obj = this.remove(fromId);
+    let index: TreeIndex<N>;
 
     if (placement === "before") {
       index = this.insertBefore(obj, toId);
@@ -275,16 +296,16 @@ export default class Tree {
     return index;
   }
 
-  getParent(id) {
-    var indexes = this.indexes;
+  getParent(id: string) {
+    const indexes = this.indexes;
     if (Object.prototype.hasOwnProperty.call(indexes, id)) {
       return this.getIndex(indexes[id].parent);
     }
   }
 
   getNodeByTop(top) {
-    var indexes = this.indexes;
-    for(var id in indexes) {
+    const indexes = this.indexes;
+    for(const id in indexes) {
       if (Object.prototype.hasOwnProperty.call(indexes, id)) {
         if(indexes[id].top === top) {
           return indexes[id];

data/app/javascript/lib/{copyToClipboard.js → copyToClipboard.ts}

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

data/app/javascript/lib/{readyHandler.js → readyHandler.ts}

@@ -1,4 +1,6 @@
-let readyHandlers = [];
+type ReadyHandlerFunc = () => void;
+
+const readyHandlers: ReadyHandlerFunc[] = [];
 
 const handleState = () => {
   if (["interactive", "complete"].indexOf(document.readyState) > -1) {
@@ -13,7 +15,7 @@ class ReadyHandler {
     document.onreadystatechange = handleState;
   }
 
-  ready (handler) {
+  ready (handler: ReadyHandlerFunc) {
     readyHandlers.push(handler);
     handleState();
   }

data/app/javascript/lib/{request.js → request.ts}

@@ -1,5 +1,11 @@
-export function csrfToken() {
-  return document.querySelector("[name=csrf-token]").content;
+export function csrfToken(): string {
+  const elem = document.querySelector("[name=csrf-token]");
+
+  if (!elem) {
+    return "";
+  }
+
+  return elem.getAttribute("content") || "";
 }
 
 function jsonFetchOptions() {
@@ -8,7 +14,7 @@ function jsonFetchOptions() {
                       "X-CSRF-Token": csrfToken() } });
 }
 
-export async function postJson(url, data) {
+export async function postJson(url: string, data: Record<string, unknown>) {
   const options = { ...jsonFetchOptions(), method: "POST" };
   if (data) {
     options.body = JSON.stringify(data);
@@ -17,7 +23,7 @@ export async function postJson(url, data) {
   return response.json();
 }
 
-export async function putJson(url, data) {
+export async function putJson(url: string, data: Record<string, unknown>) {
   const options = { ...jsonFetchOptions(), method: "PUT" };
   if (data) {
     options.body = JSON.stringify(data);
@@ -26,7 +32,7 @@ export async function putJson(url, data) {
   return response.json();
 }
 
-export async function post(url, data) {
+export async function post(url: string, data: Record<string, unknown>) {
   const response = await fetch(url, {
     method: "POST",
     body: data,

data/app/javascript/stores/useModalStore.ts

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

data/app/javascript/stores/useToastStore.ts

@@ -0,0 +1,26 @@
+import { create } from "zustand";
+
+export interface Toast {
+  type: string,
+  message: string
+}
+
+interface ToastState {
+  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" }] }
+  )),
+  next: () => set((state) => ({ toasts: state.toasts.slice(1) }))
+}));
+
+export default useToastStore;

data/app/javascript/stores.ts

@@ -0,0 +1,2 @@
+export { default as useModalStore } from "./stores/useModalStore";
+export { default as useToastStore } from "./stores/useToastStore";

data/app/javascript/types.ts

@@ -0,0 +1,30 @@
+export interface Locale {
+  name: string,
+  dir: "ltr" | "rtl"
+}
+
+export interface AttachmentResource {
+  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
+}

data/app/policies/page_policy.rb

@@ -13,6 +13,10 @@ class PagePolicy < Policy
     index?
   end
 
+  def search?
+    index?
+  end
+
   def new?
     user.role?(:pages)
   end

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

@@ -1,3 +1,6 @@
+<%= render(partial: "admin/pages/search_bar",
+           locals: { query: search_query }) %>
+
 <% if policy(Page).new? %>
   <h2>
     New entry

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

@@ -1,3 +1,6 @@
+<%= render(partial: "admin/pages/search_bar",
+           locals: { query: search_query }) %>
+
 <% if policy(Page).new? %>
   <h2>New article</h2>
   <p>

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

@@ -4,19 +4,13 @@
   section ||= false
   sections ||= []
 %>
-<tr class="<%= [page.status_label.downcase,((page.autopublish?) ? 'autopublish' : nil), ((page.pinned?) ? 'pinned' : nil)].join(' ') %>">
+<%= page_list_row(page) do %>
   <td class="name">
     <%= link_to_if(policy(page).edit?,
                    page_name(page),
                    edit_admin_page_url(@locale, page),
                    class: 'name_link') %>
-    <% if page.autopublish? %>
-      <br />
-      <small>
-        This page will be published
-        <strong><%= publish_time(page.published_at) %></strong>
-      </small>
-    <% end %>
+    <%= autopublish_notice(page) %>
   </td>
   <% if date %>
     <td class="date">
@@ -24,19 +18,7 @@
     </td>
   <% end %>
   <td>
-    <% if page.published? %>
-      <% 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 %>
-    <% else %>
-      <% if page.status_label == 'Published' %>
-        <em>Not published</em>
-      <% else %>
-        <em><%= page.status_label %></em>
-      <% end %>
-    <% end %>
+    <%= page_published_status(page) %>
   </td>
   <% if author %>
     <td>
@@ -48,4 +30,4 @@
       <%= news_section_name(page.parent, sections) %>
     </td>
   <% end %>
-</tr>
+<% end %>

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

@@ -0,0 +1,12 @@
+<% query ||= "" %>
+<%= form_tag(search_admin_pages_path(@locale),
+             method: "get",
+             class: "search-bar") do %>
+  <%= text_field_tag(:q, query,
+                     placeholder: "Search all pages",
+                     aria: { label: "Search all pages" }) %>
+  <button type="submit">
+    <i class="fa-solid fa-magnifying-glass"></i>
+    Search
+  </button>
+<% end %>

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

@@ -9,6 +9,9 @@
   <%= locale_links { |l| admin_pages_path(l) } %>
 <% end %>
 
+<%= render(partial: "admin/pages/search_bar",
+           locals: { query: search_query }) %>
+
 <div class="content">
   <% cache Page.visible.roots.to_a + [current_user, @locale] do %>
     <%= react_component(

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

@@ -0,0 +1,54 @@
+<% content_for :page_title, "Search pages" %>
+
+<% content_for :page_description do %>
+  Search pages
+<% end %>
+
+<% content_for :page_description_links do %>
+  <%= locale_links { |l| search_admin_pages_path(l, q: search_query) } %>
+<% end %>
+
+<%= render(partial: "admin/pages/search_bar",
+           locals: { query: search_query }) %>
+
+<% if @search_documents.any? %>
+  <table class="list calendar-item-list">
+    <tr>
+      <th>Name</th>
+      <th>Published</th>
+      <th>Author</th>
+      <th>Location</th>
+    </tr>
+    <% @search_documents.results.each do |page| %>
+      <%= page_list_row(page) do %>
+        <td class="name">
+          <%= link_to_if(policy(page).edit?,
+                         page_name(page),
+                         edit_admin_page_url(@locale, page),
+                         class: 'name_link') %>
+          <%= autopublish_notice(page) %>
+        </td>
+        <td>
+          <%= page_published_status(page) %>
+        </td>
+        <td>
+          <%= link_to(page.author.name, admin_user_path(page.author)) %>
+        </td>
+        <td>
+          <% if page.parent %>
+            <%= page_name(page.parent, include_parents: true) %>
+          <% else %>
+            Top level
+          <% end %>
+        </td>
+      <% end %>
+    <% end %>
+  </table>
+  <%= will_paginate(@search_documents, renderer: PagesCore::LinkRenderer) %>
+<% else %>
+  <div class="content">
+    <p>
+      Found no results for your search query.
+    </p>
+  </div>
+<% end %>

data/app/views/feeds/pages.rss.builder

@@ -4,9 +4,7 @@ xml << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 xml.rss("version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/") do
   xml.channel do
     xml.title(@title || PagesCore.config(:site_name))
-    xml.link(
-      url_for(controller: "pages", action: "index", only_path: false)
-    )
+    xml.link(root_url)
     xml.description "Recent items"
     xml.language locale
     xml.generator "Pages"
@@ -15,12 +13,8 @@ xml.rss("version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/") do
       xml.item do
         xml.title { xml.cdata! item.name.to_s }
         xml.link page_url(@locale, item, only_path: false)
-        if PagesCore.config.rss_fulltext?
-          xml.description { xml.cdata! item.body.to_html }
-        else
-          xml.description do
-            xml.cdata!((item.extended? ? item.excerpt : item.body).to_html)
-          end
+        xml.description do
+          xml.cdata! item.excerpt.to_html + item.body.to_html
         end
         xml.guid page_url(@locale, item, only_path: false)
         xml.pubDate item.published_at.to_fs(:rfc822)

data/config/routes.rb

@@ -88,6 +88,7 @@ Rails.application.routes.draw do
       resources :pages do
         collection do
           get "deleted"
+          get "search"
         end
 
         member do

data/lib/pages_core/configuration/pages.rb

@@ -11,7 +11,6 @@ module PagesCore
       setting :localizations,         :boolean, false
       setting :locales,               :hash
       setting :text_filter,           :symbol, :textile
-      setting :rss_fulltext,          :boolean, true
       setting :image_fallback_url,    :string
       setting :default_author,        :string
       setting :error_404_layout,      :string