pages_core 3.11.3 → 3.12.1

data/app/controllers/admin/pages_controller.rb

@@ -3,7 +3,6 @@
 module Admin
   class PagesController < Admin::AdminController
     include PagesCore::Admin::PageJsonHelper
-    include PagesCore::Admin::NewsPageController
 
     before_action :find_categories
     before_action :find_page, only: %i[show edit update destroy move]
@@ -34,6 +33,8 @@ module Admin
                      end
     end
 
+    def edit; end
+
     def create
       @page = build_page(@locale, page_params, param_categories)
       if @page.valid?
@@ -46,8 +47,6 @@ module Admin
       end
     end
 
-    def edit; end
-
     def update
       if @page.update(page_params)
         @page.categories = param_categories

data/app/controllers/admin/password_resets_controller.rb

@@ -8,6 +8,10 @@ module Admin
 
     layout "admin"
 
+    def show
+      @user = @password_reset_token.user
+    end
+
     def create
       @user = find_user_by_email(params[:email])
       if @user
@@ -20,10 +24,6 @@ module Admin
       redirect_to login_admin_users_url
     end
 
-    def show
-      @user = @password_reset_token.user
-    end
-
     def update
       @user = @password_reset_token.user
       if user_params[:password].present? && @user.update(user_params)

data/app/controllers/admin/users_controller.rb

@@ -25,10 +25,14 @@ module Admin
       redirect_to admin_default_url
     end
 
+    def show; end
+
     def new
       @user = User.new
     end
 
+    def edit; end
+
     def create
       @user = PagesCore::CreateUserService.call(user_params)
       if @user.valid?
@@ -39,10 +43,6 @@ module Admin
       end
     end
 
-    def show; end
-
-    def edit; end
-
     def update
       if @user.update(user_params_with_roles)
         flash[:notice] = "Your changed to #{@user.name} were saved."

data/app/controllers/errors_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class ErrorsController < ::ApplicationController
+class ErrorsController < ApplicationController
   layout "errors"
 
   def show

data/app/controllers/sessions_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class SessionsController < ::ApplicationController
+class SessionsController < ApplicationController
   def create
     user = find_user(params[:email], params[:password])
     authenticate!(user) if user

data/app/formatters/pages_core/image_embedder.rb

@@ -21,12 +21,10 @@ module PagesCore
     end
 
     def embed_image(id, size:, class_name:, link:)
-      image = Image.find(id).localize(I18n.locale)
-      class_name = ["image", image_class_name(image), class_name].compact
-      image_tag = dynamic_image_tag(image,
-                                    size: size, crop: false, upscale: false)
-      tag.figure((link ? link_to(image_tag, link) : image_tag) +
-                  image_caption(image), class: class_name)
+      image_figure(
+        Image.find(id).localize(I18n.locale),
+        size: size, class_name: class_name, link: link
+      )
     rescue ActiveRecord::RecordNotFound
       nil
     end
@@ -35,30 +33,10 @@ module PagesCore
       if str =~ /size="(\d*x\d*)"/
         Regexp.last_match(1)
       else
-        "2000x2000"
+        default_image_size
       end
     end
 
-    def image_caption(image)
-      return unless image.caption?
-
-      tag.figcaption(image.caption)
-    end
-
-    def image_class_name(image)
-      if image.size.x == image.size.y
-        "square"
-      elsif image.size.x > image.size.y
-        "landscape"
-      else
-        "portrait"
-      end
-    end
-
-    def link_to(content, href)
-      tag.a(content, href: href)
-    end
-
     def parse_image(str)
       id = str.match(image_expression)[1]
       options = str.match(image_expression)[2]

data/app/helpers/admin/calendars_helper.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Admin
+  module CalendarsHelper
+    def calendar_pages(locale)
+      Page.where(
+        id: Page.with_dates.visible.pluck(:parent_page_id).uniq.compact
+      ).in_locale(locale)
+    end
+
+    def calendar_page_options(locale)
+      options_for_select(
+        calendar_pages(locale).map do |p|
+          [page_name(p, include_parents: true).gsub("»", "»"), p.id]
+        end
+      )
+    end
+
+    def calendar_years_with_count
+      calendar_counts.each_with_object({}) do |entry, obj|
+        obj[entry[:year]] ||= 0
+        obj[entry[:year]] += entry[:count]
+      end
+    end
+
+    def calendar_months_count(year)
+      calendar_counts.filter { |e| e[:year] == year }
+                     .map { |e| [e[:month], e[:count]] }
+    end
+
+    private
+
+    def calendar_counts
+      @calendar_counts ||= Page.count_by_month
+    end
+  end
+end

data/app/helpers/admin/news_helper.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Admin
+  module NewsHelper
+    def news_page_options(news_pages)
+      options_for_select(
+        news_pages.map do |p|
+          [news_section_name(p, news_pages).gsub("»", "»"), p.id]
+        end
+      )
+    end
+  end
+end

data/app/helpers/pages_core/admin/admin_helper.rb

@@ -4,6 +4,7 @@ module PagesCore
   module Admin
     module AdminHelper
       include PagesCore::Admin::ContentTabsHelper
+      include PagesCore::Admin::DeprecatedAdminHelper
       include PagesCore::Admin::DateRangeHelper
       include PagesCore::Admin::ImageUploadsHelper
       include PagesCore::Admin::LocalesHelper
@@ -11,20 +12,6 @@ module PagesCore
       include PagesCore::Admin::LabelledFieldHelper
       include PagesCore::Admin::TagEditorHelper
 
-      attr_writer :page_title, :page_description, :page_description_class,
-                  :page_description_links
-
-      def add_body_class(class_name)
-        @body_classes ||= []
-        @body_classes << class_name
-      end
-
-      def body_classes
-        classes = @body_classes || []
-        classes << "with_notice" if flash[:notice]
-        classes
-      end
-
       def rich_text_area_tag(name, content = nil, options = {})
         react_component("RichTextArea",
                         options.merge(id: sanitize_to_id(name),
@@ -32,50 +19,20 @@ module PagesCore
                                       value: content))
       end
 
-      def link_separator
-        safe_join [" ", tag.span("|", class: "separator"), " "]
-      end
-
-      def deprecate_page_description_args(string = nil, class_name = nil)
-        if class_name
-          ActiveSupport::Deprecation.warn("Setting class through " \
-                                          "page_description is deprecated, " \
-                                          "use page_description_class=")
-        end
-        return unless string
+      def locale_links(&block)
+        return unless PagesCore.config.localizations?
 
-        ActiveSupport::Deprecation.warn("Setting description with " \
-                                        "page_description is deprecated, " \
-                                        "use page_description=")
-      end
-
-      def page_description(string = nil, class_name = nil)
-        deprecate_page_description_args(string, class_name)
-        @page_description_class = class_name if class_name
-        if string
-          @page_description = string
-        else
-          @page_description
-        end
-      end
-
-      def page_description_links(links = nil)
-        return @page_description_links unless links
-
-        ActiveSupport::Deprecation.warn(
-          "Setting page description_links with page_description_links " \
-          "is deprecated, use page_description_links="
+        safe_join(
+          PagesCore.config.locales.map do |locale, name|
+            link_to(name, block.call(locale),
+                    class: ("current" if locale == params[:locale].to_sym))
+          end
         )
-        @page_description_links = links
       end
 
-      def page_title(title = nil)
-        return @page_title unless title
-
-        ActiveSupport::Deprecation.warn(
-          "Setting page title with page_title is deprecated, use page_title="
-        )
-        @page_title = title
+      def month_name(month)
+        %w[January February March April May June July August September October
+           November December][month - 1]
       end
     end
   end

data/app/helpers/pages_core/admin/content_tabs_helper.rb

@@ -23,6 +23,7 @@ module PagesCore
         tag.div(content,
                 class: "content-tab",
                 id: "content-tab-#{key}",
+                role: "tabpanel",
                 data: { tab: key,
                         "main-target" => "tab" })
       end

data/app/helpers/pages_core/admin/deprecated_admin_helper.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module PagesCore
+  module Admin
+    module DeprecatedAdminHelper
+      def link_separator
+        ActiveSupport::Deprecation.warn("link_separator is deprecated")
+
+        safe_join [" ", tag.span("|", class: "separator"), " "]
+      end
+
+      def page_description=(description)
+        ActiveSupport::Deprecation.warn(content_helper_deprecation)
+        content_for(:page_description, description.html_safe)
+      end
+      alias page_description page_description=
+
+      def page_description_links=(links)
+        ActiveSupport::Deprecation.warn(content_helper_deprecation)
+        content_for(:page_description_links, links.html_safe)
+      end
+      alias page_description_links page_description_links=
+
+      def page_title=(title)
+        ActiveSupport::Deprecation.warn(content_helper_deprecation)
+        content_for(:page_title, title)
+      end
+      alias page_title page_title=
+
+      private
+
+      def content_helper_deprecation
+        name = caller_locations(1, 1)[0].label
+        replacement = name.gsub(/=$/, "")
+
+        "The #{name} helper is deprecated, use content_for(:#{replacement})"
+      end
+    end
+  end
+end

data/app/helpers/pages_core/admin/labelled_field_helper.rb

@@ -53,7 +53,7 @@ module PagesCore
 
       def labelled_field_label(label, options = {})
         tag.label do
-          label + labelled_field_errors(options[:errors])
+          safe_join([label, labelled_field_errors(options[:errors])])
         end
       end
 

data/app/helpers/pages_core/application_helper.rb

@@ -28,7 +28,7 @@ module PagesCore
         output = capture(page.localize(locale), &block)
         concat(output)
       end
-      page ? page.localize(locale) : nil
+      page&.localize(locale)
     end
 
     private

data/app/helpers/pages_core/images_helper.rb

@@ -11,6 +11,25 @@ module PagesCore
       )
     end
 
+    def image_caption(image, caption: nil)
+      return if caption == false
+
+      caption = image.caption unless caption.is_a?(String)
+      return if caption.blank?
+
+      tag.figcaption(caption)
+    end
+
+    def image_figure(image, size: nil, class_name: nil, link: nil, caption: nil)
+      class_name = ["image", image_class_name(image), class_name].compact
+      size ||= default_image_size
+      image_tag = dynamic_image_tag(image,
+                                    size: size, crop: false, upscale: false)
+      tag.figure((link ? image_link_to(image_tag, link) : image_tag) +
+                 image_caption(image, caption: caption),
+                 class: class_name)
+    end
+
     def original_dynamic_image_tag(record_or_array, options = {})
       super(
         record_or_array,
@@ -27,11 +46,29 @@ module PagesCore
 
     private
 
+    def default_image_size
+      "2000x2000"
+    end
+
     def extract_alt_text(record_or_array)
       record = extract_dynamic_image_record(record_or_array)
       return {} unless record.alternative?
 
       { alt: record.alternative }
     end
+
+    def image_class_name(image)
+      if image.size.x == image.size.y
+        "square"
+      elsif image.size.x > image.size.y
+        "landscape"
+      else
+        "portrait"
+      end
+    end
+
+    def image_link_to(content, href)
+      tag.a(content, href: href)
+    end
   end
 end

data/app/javascript/components/Attachments/Attachment.jsx

@@ -62,7 +62,7 @@ export default function Attachment(props) {
     classes.push("uploading");
   }
 
-  const icon = uploading ? "cloud-upload" : "paperclip";
+  const icon = uploading ? "cloud-arrow-up" : "paperclip";
 
   const localeDir = (locales && locales[locale] && locales[locale].dir) || "ltr";
 
@@ -95,7 +95,7 @@ export default function Attachment(props) {
     {attachment &&
      <div className="attachment-info">
        <h3>
-         <i className={`fa fa-${icon} icon`} />
+         <i className={`fa-solid fa-${icon} icon`} />
          {name() || <em>Untitled</em>}<br />
        </h3>
        {!uploading &&

data/app/javascript/components/EditableImage.jsx

@@ -40,7 +40,7 @@ export default function EditableImage(props) {
     <div className="editable-image">
       {altWarning &&
        <span className="alt-warning" title="Alternative text is missing">
-         <i className="fa fa-exclamation-triangle icon" />
+         <i className="fa-solid fa-triangle-exclamation icon" />
        </span>}
       <img src={src}
            width={props.width}

data/app/javascript/components/ImageCropper/Toolbar.jsx

@@ -30,12 +30,12 @@ export default function Toolbar(props) {
         <button title="Crop image"
                 onClick={props.toggleCrop}
                 className={cropping ? "active" : ""}>
-          <i className="fa fa-crop" />
+          <i className="fa-solid fa-crop" />
         </button>
         <button disabled={cropping}
                 title="Toggle focal point"
                 onClick={props.toggleFocal}>
-          <i className="fa fa-bullseye" />
+          <i className="fa-solid fa-bullseye" />
         </button>
         <a href={props.image.original_url}
            className="button"
@@ -43,7 +43,7 @@ export default function Toolbar(props) {
            disabled={cropping}
            download={props.image.filename}
            onClick={evt => cropping && evt.preventDefault()}>
-          <i className="fa fa-download" />
+          <i className="fa-solid fa-download" />
         </a>
       </div>
       {cropping && (

data/app/javascript/components/PageTreeNode.jsx

@@ -54,7 +54,7 @@ export default class PageTreeNode extends React.Component {
           <button type="button"
                   className="add"
                   onClick={() => this.props.addChild(this.props.index)}>
-            <i className="fa fa-plus icon" />
+            <i className="fa-solid fa-plus icon" />
             Add child
           </button>
         </span>
@@ -113,7 +113,7 @@ export default class PageTreeNode extends React.Component {
   }
 
   button(label, options) {
-    let icon = "fa fa-" + options.icon + " icon";
+    let icon = "fa-solid fa-" + options.icon + " icon";
     return (
       <button type="button"
               className={options.className}
@@ -182,9 +182,9 @@ export default class PageTreeNode extends React.Component {
       var classnames = null;
 
       if (collapsed) {
-        classnames = "collapse fa fa-caret-right";
+        classnames = "collapse fa-solid fa-caret-right";
       } else {
-        classnames = "collapse fa fa-caret-down";
+        classnames = "collapse fa-solid fa-caret-down";
       }
 
       return (
@@ -302,7 +302,7 @@ export default class PageTreeNode extends React.Component {
 
     return (
       <div className="page edit">
-        <i className="fa fa-file-o icon"></i>
+        <i className="fa-regular fa-file icon"></i>
         <form onSubmit={performEdit}>
           <input type="text"
                  value={this.state.newName}
@@ -311,7 +311,7 @@ export default class PageTreeNode extends React.Component {
                  autoFocus
                  onChange={handleNameChange} />
           <button className="save" type="submit">
-            <i className="fa fa-cloud icon"></i>
+            <i className="fa-solid fa-cloud icon"></i>
             Save
           </button>
           {this.button("Cancel", {
@@ -328,11 +328,10 @@ export default class PageTreeNode extends React.Component {
     let index = this.props.index;
     let node = index.node;
 
-    var dateLabel = "";
     var pageName = <span className="name">{this.pageName()}</span>;
     var className = "page";
 
-    var iconClass = "fa fa-file-o icon";
+    var iconClass = "fa-regular fa-file icon";
 
     if (typeof(node.status) != "undefined") {
       className = `page status-${this.node().status}`;
@@ -344,23 +343,16 @@ export default class PageTreeNode extends React.Component {
       </a>;
     }
 
-    if (node.id && node.starts_at) {
-      dateLabel = <span className="date">
-        {node.starts_at}
-      </span>;
-    }
-
     if (node.news_page) {
-      iconClass = "fa fa-newspaper-o icon";
+      iconClass = "fa-regular fa-file-lines icon";
     } else if (node.pinned) {
-      iconClass = "fa fa-flag-o icon";
+      iconClass = "fa-regular fa-flag icon";
     }
 
     return (
       <div className={className}>
         <i className={iconClass}></i>
         {pageName}
-        {dateLabel}
         {this.statusLabel()}
         {this.collapsedLabel()}
         {this.actions()}

data/app/javascript/components/RichTextToolbarButton.jsx

@@ -7,7 +7,7 @@ export default class RichTextToolbarButton extends React.Component {
       <a title={this.props.name}
          className={"button " + this.props.className}
          onClick={this.props.onClick}>
-        <i className={"fa fa-" + this.props.className} />
+        <i className={"fa-solid fa-" + this.props.className} />
       </a>
     );
   }

data/app/javascript/components/Toast.jsx

@@ -55,7 +55,7 @@ export default class Toast extends React.Component {
     }
 
     return (
-      <div className="toast-wrapper">
+      <div className="toast-wrapper" aria-live="polite">
         {toast && (
           <div className={classNames.join(" ")}>
             {toast.message}

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/category.rb

@@ -15,7 +15,7 @@ class Category < ApplicationRecord
   def set_slug
     self.slug = name.downcase
                     .gsub(/[^\w\s]/, "")
-                    .split(/[^\w\d\-]+/)
+                    .split(/[^\w\d-]+/)
                     .compact
                     .join("-")
   end

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

@@ -11,9 +11,47 @@ module PagesCore
 
         scope :upcoming, -> { where("ends_at > ?", Time.zone.now) }
         scope :past, -> { where("ends_at <= ?", Time.zone.now) }
+        scope :with_dates, -> { where.not(starts_at: nil) }
       end
 
       module ClassMethods
+        def count_by_month
+          connection.select_all(count_by_month_query).map(&:symbolize_keys)
+        end
+
+        def in_year(year)
+          time = Date.new(year.to_i).to_time
+          where("ends_at >= ? AND starts_at <= ?",
+                time.beginning_of_year,
+                time.end_of_year)
+        end
+
+        def in_year_and_month(year, month)
+          time = Date.new(year.to_i, month.to_i).to_time
+          where("ends_at >= ? AND starts_at <= ?",
+                time.beginning_of_month,
+                time.end_of_month)
+        end
+
+        private
+
+        def count_by_month_query
+          <<-SQL.squish
+            SELECT extract('year' FROM s.d)::integer AS year,
+                   extract('month' FROM s.d)::integer AS month,
+                   count(p.id) AS count
+            FROM (SELECT generate_series(
+                    date_trunc('month', min(starts_at)::date),
+                    max(ends_at)::date,
+                    '1 month'::interval)::date AS d FROM pages) s
+            RIGHT JOIN pages p
+              ON p.ends_at::date >= s.d
+              AND p.starts_at::date <= (s.d + interval '1 month - 1 day')::date
+            WHERE p.starts_at IS NOT NULL
+            GROUP BY s.d
+            ORDER BY s.d DESC
+          SQL
+        end
       end
 
       # Finds the page's next sibling by date. Returns nil if there

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/models/page.rb

@@ -29,7 +29,7 @@ class Page < ApplicationRecord
   has_many :categories, through: :page_categories
 
   validates(:unique_name,
-            format: { with: /\A[\w\d_\-]+\z/,
+            format: { with: /\A[\w\d_-]+\z/,
                       allow_blank: true },
             uniqueness: { allow_blank: true })