pages_core 3.14.0 → 3.15.0

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

@@ -29,21 +29,6 @@ module PagesCore
           template
       end
 
-      def unconfigured_blocks
-        blocks = (localizations.where(locale:).pluck(:name)
-                               .map(&:to_sym) -
-                  configured_blocks) &
-                 PagesCore::Templates::TemplateConfiguration.all_blocks
-
-        if block_given?
-          blocks.each do |block_name|
-            yield block_name, template_config.block(block_name)
-          end
-        end
-
-        blocks
-      end
-
       private
 
       def configured_blocks
@@ -69,8 +54,9 @@ module PagesCore
       end
 
       def base_template
+        reject_words = %w[index list archive liste arkiv]
         template.split("_")
-                .reject { |w| %w[index list archive liste arkiv].include?(w) }
+                .reject { |w| reject_words.include?(w) }
                 .join(" ")
       end
 

data/app/models/invite.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class Invite < ApplicationRecord
+  include PagesCore::Emailable
   include PagesCore::HasRoles
 
   belongs_to :user
@@ -8,11 +9,6 @@ class Invite < ApplicationRecord
 
   before_validation :ensure_token
 
-  validates :email,
-            presence: true,
-            format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i },
-            uniqueness: { case_sensitive: false }
-
   validates :token, presence: true
 
   validate :user_already_exists
@@ -24,7 +20,7 @@ class Invite < ApplicationRecord
   end
 
   def user_already_exists
-    return unless User.find_by_email(email)
+    return unless User.find_by(email:)
 
     errors.add(:email, :taken)
   end

data/app/models/otp_secret.rb

@@ -31,7 +31,7 @@ class OtpSecret
   end
 
   def generate_recovery_codes
-    10.times.map { SecureRandom.alphanumeric(16) }
+    Array.new(10) { SecureRandom.alphanumeric(16) }
   end
 
   def provisioning_uri
@@ -58,7 +58,7 @@ class OtpSecret
   end
 
   def validate_otp_or_recovery_code!(code)
-    if code =~ /^[\d]{6}$/
+    if /^[\d]{6}$/.match?(code)
       validate_otp!(code)
     else
       validate_recovery_code!(code)
@@ -81,7 +81,7 @@ class OtpSecret
   end
 
   def totp
-    ROTP::TOTP.new(secret)
+    ROTP::TOTP.new(secret, issuer: PagesCore.config.site_name)
   end
 
   def valid_otp?(otp)
@@ -93,7 +93,7 @@ class OtpSecret
   end
 
   def verify_secret(signed)
-    payload = message_verifier.verify(signed)
+    payload = message_verifier.verify(signed).symbolize_keys
     raise "Wrong user" unless payload[:user_id] == user.id
 
     payload[:secret]

data/app/models/page.rb

@@ -25,9 +25,6 @@ class Page < ApplicationRecord
              optional: true,
              inverse_of: :pages
 
-  has_many :page_categories, dependent: :destroy
-  has_many :categories, through: :page_categories
-
   validates(:unique_name,
             format: { with: /\A[\w\d_-]+\z/,
                       allow_blank: true },

data/app/models/user.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
 class User < ApplicationRecord
-  include PagesCore::HasOtp
+  include PagesCore::AuthenticableUser
+  include PagesCore::Emailable
   include PagesCore::HasRoles
 
-  has_secure_password
-
   belongs_to(:creator,
              class_name: "User",
              foreign_key: "created_by",
@@ -21,50 +20,14 @@ class User < ApplicationRecord
   has_many :invites, dependent: :destroy
   belongs_to_image :image, foreign_key: :image_id, optional: true
 
-  serialize :persistent_data
-
   validates :name, presence: true
 
-  validates :email,
-            presence: true,
-            format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i },
-            uniqueness: { case_sensitive: false }
-
-  validates :password,
-            length: {
-              minimum: 8,
-              maximum: ActiveModel::SecurePassword::MAX_PASSWORD_LENGTH_ALLOWED,
-              allow_blank: true
-            }
-
-  before_save :update_session_token
   before_create :ensure_first_user_has_all_roles
 
   scope :by_name,     -> { order("name ASC") }
   scope :activated,   -> { by_name.includes(:roles).where(activated: true) }
   scope :deactivated, -> { by_name.includes(:roles).where(activated: false) }
 
-  class << self
-    def authenticate(email, password:)
-      User.find_by_email(email).try(:authenticate, password)
-    end
-
-    def find_by_email(str)
-      find_by("LOWER(email) = ?", str.to_s.downcase.strip)
-    end
-  end
-
-  def authenticate!(password)
-    return false unless can_login? && valid_password?(password)
-
-    rehash_password!(password) if password_needs_rehash?
-    true
-  end
-
-  def can_login?
-    activated?
-  end
-
   def mark_active!
     return if last_login_at && last_login_at > 10.minutes.ago
 
@@ -93,11 +56,4 @@ class User < ApplicationRecord
       roles.new(name: r.name) unless role?(r.name)
     end
   end
-
-  def update_session_token
-    return unless !session_token? || password_digest_changed? ||
-                  otp_enabled_changed?
-
-    self.session_token = SecureRandom.hex(32)
-  end
 end

data/app/policies/page_policy.rb

@@ -18,7 +18,7 @@ class PagePolicy < Policy
   end
 
   def new?
-    user.role?(:pages)
+    user&.role?(:pages)
   end
 
   def show?
@@ -26,7 +26,11 @@ class PagePolicy < Policy
   end
 
   def edit?
-    user.role?(:pages)
+    user&.role?(:pages)
+  end
+
+  def edit2?
+    edit?
   end
 
   def move?

data/app/resources/admin/page_resource.rb

@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+module Admin
+  class PageResource
+    include Alba::Resource
+    include Rails.application.routes.url_helpers
+    include PagesCore::PagePathHelper
+    include DynamicImage::Helper
+
+    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
+
+    has_many :page_images, resource: Admin::PageImageResource
+    has_many :page_files, resource: Admin::PageFileResource
+
+    attribute :blocks do
+      PagesCore::Templates::TemplateConfiguration.all_blocks
+                                                 .index_with do |attr|
+        if object.template_config.block(attr)[:localized]
+          localized_attribute(object, attr)
+        else
+          object.send(attr)
+        end
+      end
+    end
+
+    attribute :errors do
+      object.errors.map do |e|
+        { attribute: e.attribute,
+          message: e.message }
+      end
+    end
+
+    attribute :urls do
+      if object.id?
+        localized_objects.filter(&:name?).each_with_object({}) do |p, obj|
+          obj[p.locale] = page_path(p.locale, p)
+          obj
+        end
+      else
+        {}
+      end
+    end
+
+    attribute :enabled_tags do
+      object.tags.map(&:name)
+    end
+
+    attribute :tags_and_suggestions do
+      Tag.tags_and_suggestions_for(object, limit: 20)
+         .map(&:name)
+    end
+
+    attribute :meta_image do
+      image_uploader(object.meta_image)
+    end
+
+    attribute :path_segment do
+      localized_attribute(object, :path_segment)
+    end
+
+    attribute :ancestors do
+      object.ancestors.map do |p|
+        { id: p.id,
+          name: localized_attribute(p, :name),
+          path_segment: localized_attribute(p, :path_segment) }
+      end
+    end
+
+    attribute :permissions do
+      [(:edit if Policy.for(params[:user], object).edit?),
+       (:create if Policy.for(params[:user], object).edit?)].compact
+    end
+
+    private
+
+    def image_uploader(image)
+      return { src: nil, image: nil } unless image
+
+      { src: dynamic_image_path(image, size: "500x"),
+        image: ::Admin::ImageResource.new(image).to_hash }
+    end
+
+    def localized_objects
+      object.locales.map { |l| object.localize(l) }
+    end
+
+    def localized_attribute(record, attr)
+      record.locales.index_with do |locale|
+        record.localize(locale).send(attr)
+      end
+    end
+  end
+end

data/app/resources/admin/page_tree_resource.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Admin
+  class PageTreeResource
+    include Alba::Resource
+
+    attributes :id, :parent_page_id, :status, :news_page, :pinned,
+               :published_at
+
+    attribute :blocks do
+      { name: localized_attribute(object, :name) }
+    end
+
+    attribute :permissions do
+      [(:edit if Policy.for(params[:user], object).edit?),
+       (:create if Policy.for(params[:user], object).edit?)].compact
+    end
+
+    private
+
+    def localized_attribute(record, attr)
+      record.locales.index_with do |locale|
+        record.localize(locale).send(attr)
+      end
+    end
+  end
+end

data/app/resources/admin/template_configuration_resource.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Admin
+  class TemplateConfigurationResource
+    include Alba::Resource
+
+    attributes :name, :template_name
+
+    attribute :blocks do
+      object.enabled_blocks.map do |block_name|
+        block(block_name)
+      end
+    end
+
+    attribute :metadata_blocks do
+      object.metadata_blocks.map do |block_name|
+        block(block_name)
+      end
+    end
+
+    attribute :images do
+      object.value(:images) || object.value(:image)
+    end
+
+    %i[dates tags files].each do |attr|
+      attribute attr do
+        object.value(attr)
+      end
+    end
+
+    private
+
+    def block(block_name)
+      reify_options(object.block(block_name).merge(name: block_name))
+    end
+
+    def reify_options(block)
+      return block unless block.key?(:options)
+
+      opts = block[:options]
+      opts = opts.call if opts.is_a?(Proc)
+      unless opts.present? && opts.first.is_a?(Array)
+        opts = opts.map { |v| [v, v] }
+      end
+      opts = ([["", nil]] + opts).uniq
+
+      block.merge(options: opts)
+    end
+  end
+end

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

@@ -19,9 +19,8 @@
     <h2>
       <%= link_to_unless_current(
         year,
-        admin_news_index_path(locale, year: year, category: category&.slug)
+        admin_news_index_path(locale, year: year)
       ) %>
-      <%= ": #{@category.name}" if @category %>
       <span class="count">
         (<%= year_count %>)
       </span>
@@ -37,8 +36,7 @@
           <% else %>
             <%= link_to(
               month_name(month),
-              admin_news_index_path(locale, year: year, month: month,
-                                    category: category&.slug)
+              admin_news_index_path(locale, year: year, month: month)
             ) %>
             <span class="count">
               (<%= page_count %>)

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

@@ -18,7 +18,6 @@
   <%= render(partial: "sidebar",
              locals: {
                locale: content_locale,
-               category: @category,
                news_pages: @news_pages,
                archive_finder: @archive_finder
              }) %>

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

@@ -1,31 +1,11 @@
-<%= content_tab "Content" do %>
-  <%= render partial: "edit_content", locals: { f: f } %>
-<% end %>
-
-<% if @page.unconfigured_blocks.any? %>
-  <%= content_tab "Unconfigured content" do %>
-    <p>
-      This page has additional content fields not enabled by the
-      selected template.
-    </p>
-    <% @page.unconfigured_blocks do |block_name, block_options| %>
-      <%= page_block_field(f, block_name, block_options) %>
-    <% end %>
-  <% end %>
-<% end %>
-
-<% if @page.template_config.value(:images) || @page.template_config.value(:image) %>
-  <%= content_tab "Images" do %>
-    <%= render partial: "edit_images", locals: { f: f } %>
-  <% end %>
-<% end %>
-
-<% if @page.template_config.value(:files) %>
-  <%= content_tab "Files" do %>
-    <%= render partial: "edit_files", locals: { f: f } %>
-  <% end %>
-<% end %>
-
-<%= content_tab "Metadata" do %>
-  <%= render partial: "edit_metadata", locals: { f: f } %>
+<% content_for :main_wrapper do %>
+  <%= react_component(
+    "PageForm",
+    { locale: content_locale,
+      locales: locales_with_dir,
+      page: Admin::PageResource.new(page, params: { user: current_user }),
+      templates: PagesCore::Templates.all.map { |t| Admin::TemplateConfigurationResource.new(t) },
+      authors: page_authors(page).map{ |a| [a.name, a.id] },
+      statuses: Page.status_labels }
+  ) %>
 <% end %>

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

@@ -1,7 +1,7 @@
 <% query ||= "" %>
 <%= form_tag(search_admin_pages_path(content_locale),
              method: "get",
-             class: "search-bar") do %>
+             class: "search-bar inline-form") do %>
   <%= text_field_tag(:q, query,
                      placeholder: "Search all pages",
                      aria: { label: "Search all pages" }) %>

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

@@ -5,60 +5,4 @@
     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(content_locale, page)) %>
-    &raquo;
-  <% end %>
-  <%= link_to(@page.name? ? @page.name : tag.i("Untitled"),
-              edit_admin_page_path(content_locale, @page)) %>
-<% 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,
-               url: admin_page_url(content_locale, @page),
-               builder: PagesCore::Admin::FormBuilder,
-               html: {
-                 class: "edit-page main-wrapper",
-                 method: :put,
-                 data: {
-                   controller: "edit-page",
-                   "edit-page-target": "form",
-                   "preview-url": preview_page_url(@page.locale, @page)
-                 }
-               }) do |f| %>
-
-    <% content_for :main do %>
-      <div class="content">
-        <%= render(partial: "form", locals: { f: f }) %>
-
-        <div class="buttons">
-          <button type="button"
-                  id="previewButton"
-                  data-action="click->edit-page#preview"
-                  data-url="<%= preview_page_url(@page.locale, @page) %>">
-            Preview
-          </button>
-          <button type="submit">
-            Save
-          </button>
-        </div>
-      </div>
-    <% end %>
-
-    <main data-controller="main">
-      <%= render(partial: "layouts/admin/page_header") %>
-      <%= yield :main %>
-    </main>
-
-    <aside class="sidebar" id="page-form-sidebar">
-      <%= render partial: 'edit_options', locals: { f: f } %>
-    </aside>
-  <% end %>
-<% end %>
+<%= render(partial: "form", locals: { page: @page }) %>

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

@@ -16,7 +16,7 @@
   <% cache Page.visible.roots.to_a + [current_user, content_locale] do %>
     <%= react_component(
       "PageTree", {
-        pages: @pages.map { |p| page_json(p) },
+        pages: @pages.map { |p| ::Admin::PageTreeResource.new(p, params: { user: current_user }) },
         locale: content_locale,
         dir: locale_direction(content_locale),
         permissions: [(:create if policy(Page).create?)] }

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

@@ -1,45 +1,2 @@
 <% 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,
-               url: admin_pages_url(content_locale),
-               builder: PagesCore::Admin::FormBuilder,
-               html: {
-                 class: "edit-page main-wrapper",
-                 data: {
-                   controller: "edit-page",
-                   "edit-page-target": "form"
-                 }
-               }) do |f| %>
-
-    <% content_for :main do %>
-      <div class="content">
-        <%= f.hidden_field "parent_page_id" if @page.parent %>
-
-        <%= render(partial: "form", locals: { f: f }) %>
-
-        <div class="buttons">
-          <button type="submit">
-            Save
-          </button>
-        </div>
-      </div>
-    <% end %>
-
-    <main data-controller="main">
-      <%= render(partial: "layouts/admin/page_header") %>
-      <%= yield :main %>
-    </main>
-
-    <aside class="sidebar" id="page-form-sidebar">
-      <%= render partial: "edit_options", locals: { f: f } %>
-    </aside>
-  <% end %>
-<% end %>
+<%= render(partial: "form", locals: { page: @page }) %>

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

@@ -12,22 +12,20 @@
 
 <div class="login-form">
   <%= form_tag admin_session_path do %>
-    <p>
+    <div class="field">
       <label>Email address</label>
       <%= text_field_tag(:email, "", autocomplete: "email") %>
-    </p>
-    <p>
+    </div>
+    <div class="field">
       <label>Password</label>
       <%= password_field_tag(:password, "", autocomplete: "current-password") %>
-    </p>
-    <p>
+    </div>
+    <div class="buttons">
       <button type="submit">Sign in</button>
+    </div>
+    <p>
+      <%= link_to("<b>Help!</b> I forgot my password!".html_safe,
+                  new_admin_account_recovery_path) %>
     </p>
-    <ul>
-      <li>
-        <%= link_to("<b>Help!</b> I forgot my password!".html_safe,
-                    new_admin_account_recovery_path) %>
-      </li>
-    </ul>
   <% end %>
 </div>

data/app/views/admin/users/_access_control.html.erb

@@ -4,7 +4,11 @@
   </h2>
   <p>
     <% if f.object.kind_of?(User) && f.object != current_user %>
-      <%= f.check_box :activated %> The user account is activated<br />
+      <%= f.check_box :activated %>
+      <label for="user_activated">
+        The user account is activated
+      </label>
+      <br />
     <% end %>
     <% Role.roles.each do |role| %>
       <%= check_box_tag("#{model_name_from_record_or_class(f.object).param_key}[role_names][]",

data/app/views/admin/users/_list.html.erb

@@ -3,8 +3,9 @@
     <th>Name</th>
     <th>Email</th>
     <th>Can access</th>
+    <th>2FA</th>
     <th>Last seen</th>
-    <th></th>
+    <th colspan="2"></th>
   </tr>
 <% @invites.each do |invite| %>
   <tr class="invite">
@@ -15,13 +16,14 @@
     <td>
       <%= invite.roles.map(&:to_s).sort.to_sentence %>
     </td>
+    <td></td>
     <td>
       <% if invite.sent_at? %>
         Invited
         <%= time_ago_in_words(invite.sent_at) %> ago
       <% end %>
     </td>
-    <td>
+    <td colspan="2">
       <% if current_user.role?(:users) %>
         <%= link_to("View invite",
                     admin_invite_with_token_url(invite, invite.token)) %> /
@@ -36,16 +38,14 @@
 <% end %>
 <% @users.each do |user| -%>
   <tr class="user-<%= user.id %>">
-    <td>
-      <strong><%= link_to user.name, admin_user_url( user ) %></strong>
-      <% if policy(user).edit? %>
-        (<%= link_to "edit", edit_admin_user_url( user ), class: :edit %>)
-      <% end %>
+    <td class="name">
+      <%= link_to user.name, admin_user_url( user ) %>
     </td>
     <td>
       <%= user.email %>
     </td>
     <td><%= user.roles.map(&:to_s).sort.to_sentence %></td>
+    <td><%= user.otp_enabled? ? "Enabled" : "" %></td>
     <td>
       <% if user.online? -%>
         <strong>Online now</strong>
@@ -62,6 +62,11 @@
         notes.join( ", " )
       %>
     </td>
+    <td>
+      <% if policy(user).edit? %>
+        <%= link_to("Edit", edit_admin_user_url(user), class: :edit) %>
+      <% end %>
+    </td>
   </tr>
 <% end -%>
 </table>