pages_core 3.12.0 → 3.12.2

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/mailers/admin_mailer.rb

@@ -2,6 +2,7 @@
 
 class AdminMailer < ApplicationMailer
   default from: proc { "\"Pages\" <no-reply@anyone.no>" }
+  layout false
 
   def password_reset(user, url)
     @user = user

data/app/models/invite.rb

@@ -15,9 +15,17 @@ class Invite < ApplicationRecord
 
   validates :token, presence: true
 
+  validate :user_already_exists
+
   private
 
   def ensure_token
     self.token ||= SecureRandom.hex(32)
   end
+
+  def user_already_exists
+    return unless User.find_by_email(email)
+
+    errors.add(:email, :taken)
+  end
 end

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

@@ -0,0 +1,50 @@
+<%= render(partial: "admin/pages/search_bar",
+           locals: { query: search_query }) %>
+
+<% if policy(Page).new? %>
+  <h2>
+    New entry
+  </h2>
+  <p>
+    <%= form_tag new_admin_page_path, method: :get do %>
+      In
+      <%= select_tag("parent", calendar_page_options(locale)) %>
+      <button type="submit">
+        Go
+      </button>
+    <% end %>
+  </p>
+<% end %>
+
+<div class="archive-index">
+  <% calendar_years_with_count.each do |year, year_count| %>
+    <h2>
+      <%= link_to_unless_current(
+        year,
+        admin_calendar_path(locale, year: year)
+      ) %>
+      <span class="count">
+        (<%= year_count %>)
+      </span>
+    </h2>
+    <ul>
+      <% calendar_months_count(year).each do |month, month_count| %>
+        <li>
+          <% if year == @year && month == @month %>
+            <strong>
+              <%= month_name(month) %>
+            </strong>
+          <% else %>
+            <%= link_to_unless_current(
+              month_name(month),
+              admin_calendar_path(locale, month: month, year: year)
+            ) %>
+          <% end %>
+          <span class="count">
+            (<%= month_count %>)
+          </span>
+        </li>
+      <% end %>
+    </ul>
+  <% end %>
+</div>

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

@@ -1,57 +1,20 @@
-<%
-  month_names = %w{January February March April May June July August September October November December}
-  page_title "Calendar"
-  page_description "Calendar"
+<% content_for :page_title, "Calendar" %>
+<% content_for(:page_description) do %>
+  Calendar:
+  <em>
+    <% if @month %>
+      <%= month_name(@month) %>
+    <% end %>
+    <%= @year %>
+  </em>
+<% end %>
 
-  if PagesCore.config.localizations?
-    self.page_description_links = 'In ' + PagesCore.config.locales.map{ |l, n| link_to_unless_current n, calendar_admin_pages_path(l) }.join(link_separator)
-  end
-%>
+<% content_for :page_description_links do %>
+  <%= locale_links { |l| admin_calendar_path(l, @year) } %>
+<% end %>
 
 <% content_for :sidebar do %>
-  <h2>New entry</h2>
-  <p>
-    <%= form_tag new_admin_page_path, method: :get do %>
-      In <%= select_tag('parent',
-                        options_for_select(calendar_pages(@locale).map{|p| [page_name(p, include_parents: true).gsub("&raquo;", "»"), p.id] })) %>
-      <%= submit_tag "Go", name: nil %>
-    <% end %>
-  </p>
-
-  <div class="archive-index">
-    <% calendar_years_with_count.each do |year, year_count| %>
-      <h2>
-        <%= link_to_unless_current(year,
-                                   admin_calendar_path(
-                                     @locale,
-                                     year: year)
-        ) %>
-        <span class="count">
-          (<%= year_count %>)
-        </span>
-      </h2>
-      <ul>
-        <% calendar_months_count(year).each do |month, month_count| %>
-          <li>
-            <% if year == @year && month == @month %>
-              <strong>
-                <%= month_names[month-1] %>
-              </strong>
-            <% else %>
-              <%= link_to_unless_current(
-                month_names[month-1],
-                admin_calendar_path(@locale,
-                                    month: month,
-                                    year: year)) %>
-            <% end %>
-            <span class="count">
-              (<%= month_count %>)
-            </span>
-          </li>
-        <% end %>
-      </ul>
-    <% end %>
-  </div>
+  <%= render(partial: "sidebar", locals: { locale: @locale }) %>
 <% end %>
 
 <% if @pages.any? %>
@@ -72,8 +35,7 @@
                  }) %>
     <% end %>
   </table>
-
-  <%= will_paginate @pages %>
+  <%= will_paginate @pages, renderer: PagesCore::LinkRenderer %>
 <% else %>
   <div class="content">
     <p>

data/app/views/admin/invites/new.html.erb

@@ -1,11 +1,5 @@
-<%
-  self.page_title = "New invite"
-  self.page_description = "New invite"
-%>
-
-<% content_for(:sidebar) do %>
-  &nbsp;
-<% end %>
+<% content_for :page_title, "New invite" %>
+<% content_for :page_description, "New invite" %>
 
 <%= form_for [:admin, @invite], builder: PagesCore::FormBuilder do |f| %>
   <%= f.labelled_text_field :email %>

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

@@ -1,7 +1,5 @@
-<%
-  self.page_title = "Welcome"
-  self.page_description = "Welcome to Pages"
-%>
+<% content_for :page_title, "Welcome" %>
+<% content_for :page_description, "Welcome to Pages" %>
 
 <div class="content">
   <p>

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

@@ -0,0 +1,51 @@
+<%= render(partial: "admin/pages/search_bar",
+           locals: { query: search_query }) %>
+
+<% if policy(Page).new? %>
+  <h2>New article</h2>
+  <p>
+    <%= form_tag new_admin_page_path, method: :get do %>
+      In
+      <%= select_tag("parent", news_page_options(news_pages)) %>
+      <button type="submit">
+        Go
+      </button>
+    <% end %>
+  </p>
+<% end %>
+
+<div class="archive-index">
+  <% archive_finder.years_with_count.reverse.each do |year, year_count| %>
+    <h2>
+      <%= link_to_unless_current(
+        year,
+        admin_news_index_path(locale, year: year, category: category&.slug)
+      ) %>
+      <%= ": #{@category.name}" if @category %>
+      <span class="count">
+        (<%= year_count %>)
+      </span>
+    </h2>
+    <ul>
+      <% archive_finder.months_in_year_with_count(year).reverse.each do |month, page_count| %>
+        <li>
+          <% if year == @year && month == @month %>
+            <strong>
+              <%= month_name(month) %>
+            </strong>
+            (<%= page_count %>)
+          <% else %>
+            <%= link_to(
+              month_name(month),
+              admin_news_index_path(locale, year: year, month: month,
+                                    category: category&.slug)
+            ) %>
+            <span class="count">
+              (<%= page_count %>)
+            </span>
+          <% end %>
+        </li>
+      <% end %>
+    </ul>
+  <% end %>
+</div>

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

@@ -1,62 +1,27 @@
-<%
-  month_names = %w{January February March April May June July August September October November December}
-  page_title "News"
-  page_description "<em>News: #{month_names[@month - 1] if @month} #{@year}</em>"
+<% content_for(:page_title, "News") %>
 
-  if PagesCore.config.localizations?
-    self.page_description_links = 'In ' + PagesCore.config.locales.map{ |l, n| link_to_unless_current n, admin_news_path(l) }.join(link_separator)
-  end
-%>
+<% content_for(:page_description) do %>
+  News:
+  <em>
+    <% if @month %>
+      <%= month_name(@month) %>
+    <% end %>
+    <%= @year %>
+  </em>
+<% end %>
+
+<% content_for :page_description_links do %>
+  <%= locale_links { |l| admin_news_index_path(l, @year) } %>
+<% end %>
 
 <% content_for :sidebar do %>
-  <% if policy(Page).new? %>
-    <h2>New article</h2>
-    <p>
-      <%= form_tag new_admin_page_path, method: :get do %>
-        In
-        <%= select_tag('parent',
-                       options_for_select(@news_pages.map{|p| [news_section_name(p, @news_pages).gsub("&raquo;", "»"), p.id] })) %>
-        <%= submit_tag "Go", name: nil %>
-      <% end %>
-    </p>
-  <% end %>
-  <div class="archive-index">
-    <% @archive_finder.years_with_count.reverse.each do |year, year_count| %>
-      <h2>
-        <%= link_to_unless_current(year,
-                                   admin_news_index_path(
-                                     @locale,
-                                     year: year,
-                                     category: @category&.slug)
-        ) %>
-        <%= ": #{@category.name}" if @category %>
-        <span class="count">
-          (<%= year_count %>)
-        </span>
-      </h2>
-      <ul>
-        <% @archive_finder.months_in_year_with_count(year).reverse.each do |month, page_count| %>
-          <li>
-            <% if year == @year && month == @month %>
-              <strong>
-                <%= month_names[month-1] %>
-              </strong>
-              (<%= page_count %>)
-            <% else %>
-              <%= link_to(month_names[month-1],
-                          admin_news_index_path(@locale,
-                                                month: month,
-                                                year: year,
-                                                category: @category&.slug)) %>
-              <span class="count">
-                (<%= page_count %>)
-              </span>
-            <% end %>
-          </li>
-        <% end %>
-      </ul>
-    <% end %>
-  </div>
+  <%= render(partial: "sidebar",
+             locals: {
+               locale: @locale,
+               category: @category,
+               news_pages: @news_pages,
+               archive_finder: @archive_finder
+             }) %>
 <% end %>
 
 <% if @pages.length > 0 %>

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/deleted.html.erb

@@ -1,11 +1,13 @@
-<%
-  self.page_title = "Pages"
-  self.page_description = link_to("All pages", admin_pages_path(@locale)) +
-                          " / Deleted pages"
-  if PagesCore.config.localizations?
-    self.page_description_links = 'In ' + PagesCore.config.locales.map{ |l, n| link_to_unless_current n, deleted_admin_pages_path(l) }.join(link_separator)
-  end
-%>
+<% content_for :page_title, "Deleted pages" %>
+
+<% content_for :page_description do %>
+  <%= link_to("All pages", admin_pages_path(@locale)) %> /
+  Deleted pages
+<% end %>
+
+<% content_for :page_description_links do %>
+  <%= locale_links { |l| deleted_admin_pages_path(l) } %>
+<% end %>
 
 <% if @pages.any? %>
   <table class="deleted-pages list">

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

@@ -1,15 +1,24 @@
-<%
-  self.page_title = "Editing “" + @page.name.to_s + "”"
-  self.page_description = "Editing " + [@page.ancestors.reverse,@page].flatten.map{|page| link_to((page.name rescue "(Untitled)"), edit_admin_page_path(@locale, page))}.join(" &raquo; ")
+<% content_for :page_title do %>
+  <% if @page.name? %>
+    Edit “<%= @page.name %>”
+  <% else %>
+    Edit page
+  <% end %>
+<% end %>
+<% content_for :page_description do %>
+  Editing
+  <% @page.ancestors.reverse.each do |page| %>
+    <%= link_to(page.name? ? page.name : tag.i("Untitled"),
+                edit_admin_page_path(@locale, page)) %>
+    &raquo;
+  <% end %>
+  <%= link_to(@page.name? ? @page.name : tag.i("Untitled"),
+              edit_admin_page_path(@locale, @page)) %>
+<% end %>
 
-  if PagesCore.config.localizations?
-    self.page_description_links = "In " + safe_join(
-      PagesCore.config.locales.map do |l, name|
-        link_to_unless((l == @locale.to_sym), name, edit_admin_page_path(l, @page.localize(l)))
-      end,
-      link_separator)
-  end
-%>
+<% content_for :page_description_links do %>
+  <%= locale_links { |l| edit_admin_page_path(l, @page.localize(l)) } %>
+<% end %>
 
 <% content_for :main_wrapper do %>
   <%= form_for(@page,

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

@@ -1,15 +1,17 @@
-<%
-  self.page_title = "Pages"
-  self.page_description = "All pages / " + link_to("Deleted pages", deleted_admin_pages_path(@locale))
+<% content_for :page_title, "Pages" %>
 
-  if PagesCore.config.localizations?
-    self.page_description_links = 'In ' + PagesCore.config.locales.map{ |l, n| link_to_unless_current n, admin_pages_path(l) }.join(link_separator)
-  end
-%>
+<% content_for :page_description do %>
+  All pages /
+  <%= link_to("Deleted pages", deleted_admin_pages_path(@locale)) %>
+<% end %>
 
-<% content_for :sidebar do %>
+<% content_for :page_description_links do %>
+  <%= 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/new.html.erb

@@ -1,15 +1,11 @@
-<%
-  if @page.parent
-    self.page_title = "New page"
-    self.page_description = "<em>#{@page.parent.name}</em> &raquo; New Page"
-  else
-    self.page_title = "Create new page"
-    self.page_description = "You are creating a new root page"
-  end
-
-  @url_options = { action: :new }
-  @url_options[:parent] = @page.parent if @page.parent
-%>
+<% content_for :page_title, "New page" %>
+<% content_for :page_description do %>
+  <% if @page.parent %>
+    <em><%= @page.parent.name %></em> &raquo; New Page
+  <% else %>
+    You are creating a new root page
+  <% end %>
+<% end %>
 
 <% content_for :main_wrapper do %>
   <%= form_for(@page,
@@ -25,7 +21,7 @@
 
     <% content_for :main do %>
       <div class="content">
-        <%= f.hidden_field 'parent_page_id' if @page.parent %>
+        <%= f.hidden_field "parent_page_id" if @page.parent %>
 
         <%= render(partial: "form", locals: { f: f }) %>
 
@@ -43,7 +39,7 @@
     </main>
 
     <aside class="sidebar" id="page-form-sidebar">
-      <%= render partial: 'edit_options', locals: { f: f } %>
+      <%= render partial: "edit_options", locals: { f: f } %>
     </aside>
   <% end %>
 <% end %>

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/admin/password_resets/show.html.erb

@@ -1,8 +1,6 @@
-<%
-  self.page_title = "Reset password"
-  self.page_description = "Please choose a new password to proceed"
-  add_body_class "login"
--%>
+<% content_for :page_title, "Reset password" %>
+<% content_for :page_description, "Please choose a new password to proceed" %>
+<% content_for :body_class, "login" %>
 
 <div class="login-form">
   <%= form_for(@user,