pages_core 3.7.0 → 3.8.0

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

@@ -11,71 +11,45 @@
   end
 %>
 
-
-
-<%# #### SIDEBAR ########################################################### %>
-
-<% content_for :sidebar do %>
+<% content_for :main_wrapper do %>
   <%= form_for(@page,
                url: admin_page_url(@locale, @page),
-               html: {class: "edit-page", id: 'page-form-sidebar'},
-               builder: PagesCore::Admin::FormBuilder) do |f| %>
-    <%= render partial: 'edit_options', locals: {f: f} %>
-  <% end %>
-<% end %>
-
-
-
-<%# #### EDIT AREA ######################################################### %>
-
-<%= form_for(@page,
-             url: admin_page_url(@locale, @page),
-             html: {
-               class: "edit-page",
-               id: 'page-form',
-               method: :put,
-               multipart: true
-             },
-             builder: PagesCore::Admin::FormBuilder
-) do |f| %>
-
-  <div class="hidden-options">
-    <%= render partial: 'edit_options', locals: {f: f} %>
-  </div>
-
-  <%# #### CONTENT #### %>
-  <%= content_tab "Content" do %>
-    <%= render partial: 'edit_content', locals: {f: f} %>
-  <% end %>
-
-  <%# #### IMAGES #### %>
-  <% if @page.template_config.value(:images) || @page.template_config.value(:image) %>
-    <%= content_tab "Images" do %>
-      <%= render partial: 'edit_images', locals: {f: f} %>
-    <% end %>
-  <% end %>
-
-
-  <%# #### FILES #### %>
-  <% if @page.template_config.value(:files) %>
-    <%= content_tab "Files" do %>
-      <%= render partial: 'edit_files', locals: {f: f} %>
+               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 %>
-  <% end %>
 
+    <main data-controller="main">
+      <%= render(partial: "layouts/admin/page_header") %>
+      <%= yield :main %>
+    </main>
 
-  <%# #### METADATA #### %>
-  <%= content_tab "Metadata" do %>
-    <%= render partial: 'edit_metadata', locals: {f: f} %>
+    <aside class="sidebar" id="page-form-sidebar">
+      <%= render partial: 'edit_options', locals: { f: f } %>
+    </aside>
   <% end %>
-
-  <div class="buttons">
-    <button type="button" id="previewButton" data-url="<%= preview_page_url(@page.locale, @page) %>">
-      Preview
-    </button>
-    <button type="submit">
-      Save
-    </button>
-  </div>
-
 <% end %>

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

@@ -14,7 +14,6 @@
   <% cache Page.visible.roots.to_a + [current_user, @locale] do %>
     <%= react_component(
       "PageTree", {
-        csrf_token: form_authenticity_token,
         pages: @pages.map { |p| page_json(p) },
         locale: @locale,
         permissions: [(:create if policy(Page).create?)] }

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

@@ -11,39 +11,39 @@
   @url_options[:parent] = @page.parent if @page.parent
 %>
 
-<% content_for :sidebar do %>
+<% content_for :main_wrapper do %>
   <%= form_for(@page,
                url: admin_pages_url(@locale),
-               html: {class: "edit-page", id: 'page-form-sidebar'}) do |f| %>
-    <%= render partial: 'edit_options', locals: {f: f} %>
+               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 %>
-
-<%= form_for(@page,
-             url: admin_pages_url(@locale),
-             builder: PagesCore::Admin::FormBuilder,
-             html: {
-               class: "edit-page",
-               id: 'page-form',
-               method: :post,
-               multipart: true
-             }
-) do |f| %>
-
-  <div class="hidden-options">
-    <%= render partial: 'edit_options', locals: {f: f} %>
-  </div>
-
-  <%= hidden_field_tag 'locale', @locale %>
-  <%= f.hidden_field 'parent_page_id' if @page.parent %>
-
-  <%# #### CONTENT #### %>
-  <%= content_tab "Content" do %>
-    <%= render partial: 'edit_content', locals: {f: f} %>
-  <% end %>
-
-  <p>
-    <%= submit_tag "Save" %>
-  </p>
-
-<% end %>

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

@@ -10,8 +10,12 @@
       <%= check_box_tag("#{model_name_from_record_or_class(f.object).param_key}[role_names][]",
                         role.name,
                         f.object.role?(role.name.to_sym),
+                        id: "role-#{role.name}",
                         class: "role") %>
-      <%= role.description %><br>
+      <label for="role-<%= role.name %>">
+        <%= role.description %>
+      </label>
+      <br>
     <% end %>
   </p>
 <% end %>

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

@@ -11,8 +11,11 @@
   </p>
 <% end %>
 
-<div class="login-form">
-  <div class="login-tab password">
+<div class="login-form"
+     data-controller="login">
+  <div class="login-tab password"
+       data-login-target="tab"
+       data-tab="password">
     <%= form_tag session_path do %>
       <p>
         <label>Email address</label>
@@ -29,13 +32,18 @@
         <li>
           <%= link_to("<b>Help!</b> I forgot my password!".html_safe,
                       login_admin_users_path,
-                      class: 'show-password-reset') %>
+                      data: {
+                        action: "click->login#changeTab",
+                        tab: "password-reset"
+          }) %>
         </li>
       </ul>
     <% end %>
   </div>
 
-  <div class="login-tab password-reset">
+  <div class="login-tab password-reset"
+       data-login-target="tab"
+       data-tab="password-reset">
     <%= form_tag admin_password_resets_path do %>
       <h2>
         Forgot your password?

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

@@ -26,10 +26,9 @@ xml.rss("version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/") do
         xml.pubDate item.published_at.to_formatted_s(:rfc822)
         xml.tag!("dc:creator", item.author.name)
         if item.image
-          image_size = item.image.data.try(&:length)
           xml.enclosure(
             url: dynamic_image_url(item.image, size: "2000x2000"),
-            length: image_size,
+            length: item.image.content_length,
             type: item.image.content_type
           )
         end

data/app/views/layouts/admin/_header.html.erb

@@ -24,7 +24,7 @@
   </div>
 </header>
 
-<% if flash[:error] %>
+<% if flash[:error] && false %>
   <div id="flash-error">
     <%= flash[:error] %>
   </div>

data/app/views/layouts/admin/_page_header.html.erb

@@ -0,0 +1,33 @@
+<% if @page_description || @content_tabs %>
+  <div id="page-description"<% if @content_tabs %> class="with_content_tabs"<% end %>>
+    <% if @page_description_links -%>
+      <div class="links">
+        <%= @page_description_links.html_safe %>
+      </div>
+    <% end %>
+    <h3>
+      <%= (@page_description || @page_title).html_safe %>
+    </h3>
+    <% if @content_tabs %>
+      <ul id="content-tabs">
+        <% @content_tabs.map do |t| %>
+          <li id="content-tab-link-<%= t[:key] %>"
+              data-tab="<%= t[:key] %>"
+              data-main-target="link">
+            <% if t[:options][:disabled] == true %>
+              <%= t[:name] %>
+            <% else %>
+              <%= link_to(
+                t[:name],
+                { anchor: "#{t[:key]}" },
+                data: {
+                  action: "click->main#changeTab",
+                  tab: t[:key]
+              }) %>
+            <% end %>
+          </li>
+        <% end %>
+      </ul>
+    <% end %>
+  </div>
+<% end %>

data/app/views/layouts/admin.html.erb

@@ -19,14 +19,19 @@
       <%= stylesheet_link_tag "admin" %>
     <% end %>
 
-    <%= javascript_include_tag "pages/admin" %>
-    <% if Dir.glob(Rails.root.join("app/assets/javascripts/admin.*")).any? %>
-      <%= javascript_include_tag "admin" %>
+    <% if File.exist?(Rails.root.join("app/assets/builds/admin.js")) %>
+      <%= javascript_include_tag("admin", defer: true) %>
+    <% else %>
+      <%= javascript_include_tag("pages_core/admin-dist", defer: true) %>
+      <% if Dir.glob(Rails.root.join("app/assets/javascripts/admin.*")).any? %>
+        <%= javascript_include_tag("admin", defer: true) %>
+      <% end %>
     <% end %>
 
     <%= csrf_meta_tag %>
     <meta name="viewport"
           content="width=device-width, initial-scale=1, user-scalable=no">
+    <%= google_analytics_tags "UA-5468672-21" %>
   </head>
 
   <body class="<%= body_classes.join(" ") %>"
@@ -35,49 +40,25 @@
         data-locale="<%= @locale %>">
 
     <div class="wrapper">
-
       <%= render partial: "layouts/admin/header" %>
+      <% if content_for?(:main_wrapper) %>
+        <%= yield :main_wrapper %>
+      <% else %>
+        <div class="main-wrapper">
+          <main data-controller="main">
+            <%= render(partial: "layouts/admin/page_header") %>
+            <%= yield %>
+          </main>
 
-      <div class="main-wrapper">
-        <main>
-          <% if @page_description || @content_tabs %>
-            <div id="page-description"<% if @content_tabs %> class="with_content_tabs"<% end %>>
-              <% if @page_description_links -%>
-                <div class="links">
-                  <%= @page_description_links.html_safe %>
-                </div>
-              <% end %>
-              <h3>
-                <%= (@page_description || @page_title).html_safe %>
-              </h3>
-              <% if @content_tabs %>
-                <ul id="content-tabs">
-                  <% @content_tabs.map do |t| %>
-                    <li id="content-tab-link-<%= t[:key] %>" data-tab-name="<%= t[:key] %>">
-                      <% if t[:options][:disabled] == true %>
-                        <%= t[:name] %>
-                      <% else %>
-                        <%= link_to(t[:name], anchor: "#{t[:key]}") %>
-                      <% end %>
-                    </li>
-                  <% end %>
-                </ul>
-              <% end %>
-            </div>
+          <% if content_for?(:sidebar) %>
+            <aside class="sidebar">
+              <%= content_for(:sidebar) %>
+            </aside>
           <% end %>
-
-          <%= yield %>
-        </main>
-
-        <% if content_for?(:sidebar) %>
-          <aside class="sidebar">
-            <%= content_for(:sidebar) %>
-          </aside>
-        <% end %>
-      </div>
+        </div>
+      <% end %>
     </div>
     <%= react_component "Modal", {} %>
-    <%= react_component "Toast", { notice: flash[:notice] } %>
-    <%= render partial: "layouts/admin/analytics" %>
+    <%= react_component "Toast", { notice: flash[:notice], error: flash[:error] } %>
   </body>
 </html>

data/app/views/pages_core/_google_analytics.html.erb

@@ -0,0 +1,8 @@
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=<%= account_id %>"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+  gtag('config', '<%= account_id %>', { 'anonymize_ip': true });
+</script>

data/db/migrate/20180625154059_enable_search_extensions.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class EnableSearchExtensions < ActiveRecord::Migration[5.2]
+  def change
+    ActiveRecord::Base.connection.execute <<-SQL.squish
+      CREATE EXTENSION IF NOT EXISTS unaccent;
+      CREATE EXTENSION IF NOT EXISTS pg_trgm;
+    SQL
+  end
+end

data/db/migrate/20210209151400_create_search_configurations.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class CreateSearchConfigurations < ActiveRecord::Migration[5.2]
+  def up
+    dictionaries.each do |dict|
+      stem = dict == "simple" ? "simple" : "#{dict}_stem"
+
+      ActiveRecord::Base.connection.execute <<-SQL.squish
+        DROP TEXT SEARCH CONFIGURATION IF EXISTS #{dict}_unaccent;
+        CREATE TEXT SEARCH CONFIGURATION #{dict}_unaccent
+          (COPY = pg_catalog.#{dict});
+        ALTER TEXT SEARCH CONFIGURATION #{dict}_unaccent
+          ALTER MAPPING FOR hword, hword_part, word
+          WITH unaccent, #{stem};
+      SQL
+    end
+  end
+
+  def down
+    dictionaries.each do |dict|
+      ActiveRecord::Base.connection.execute <<-SQL.squish
+        DROP TEXT SEARCH CONFIGURATION IF EXISTS #{dict}_unaccent;
+      SQL
+    end
+  end
+
+  private
+
+  def dictionaries
+    %w[arabic danish dutch english finnish french german
+       hungarian indonesian irish italian lithuanian nepali
+       norwegian portuguese romanian russian spanish swedish
+       tamil turkish simple]
+  end
+end

data/db/migrate/20210210235200_create_search_documents.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+class CreateSearchDocuments < ActiveRecord::Migration[6.0]
+  def change
+    create_table :search_documents do |t|
+      t.references :searchable, polymorphic: true, index: true, null: false
+      t.string :locale, null: false
+
+      t.text :name
+      t.text :description
+      t.text :content
+      t.text :tags
+      t.boolean :published, null: false, default: true
+      t.timestamps
+      t.datetime :record_updated_at, null: false
+
+      t.index %i[searchable_type searchable_id locale],
+              name: :search_documents_unique_index,
+              unique: true
+
+      # Tsvector index
+      t.string :tsv_config, null: false, default: "simple_unaccent"
+      t.tsvector :tsv
+      t.index :tsv, using: :gin
+
+      # Trigram index
+      t.index :name,
+              name: :search_documents_trgm_idx,
+              using: :gin,
+              opclass: { title: :gin_trgm_ops }
+    end
+
+    reversible do |dir|
+      dir.up do
+        ActiveRecord::Base.connection.execute <<-SQL.squish
+          DROP FUNCTION IF EXISTS tsvector_search_documents_trigger;
+          CREATE FUNCTION tsvector_search_documents_trigger()
+            RETURNS trigger AS $$
+            begin
+              new.tsv :=
+                setweight(to_tsvector(new.tsv_config::regconfig,
+                                      coalesce(new.name, '')), 'A') ||
+                setweight(to_tsvector(new.tsv_config::regconfig,
+                                      coalesce(new.description, '')), 'B') ||
+                setweight(to_tsvector(new.tsv_config::regconfig,
+                                      coalesce(new.content, '')), 'C') ||
+                setweight(to_tsvector(new.tsv_config::regconfig,
+                                      coalesce(new.tags, '')), 'B');
+              return new;
+            end
+            $$ LANGUAGE plpgsql;
+
+          DROP TRIGGER IF EXISTS tsvector_search_documents_update
+            ON search_documents;
+
+          CREATE TRIGGER tsvector_search_documents_update
+            BEFORE INSERT OR UPDATE
+            ON search_documents FOR EACH ROW EXECUTE PROCEDURE
+            tsvector_search_documents_trigger();
+        SQL
+
+        # Index all pages
+        PagesCore::SearchableDocument::Indexer.index_all!(Page)
+      end
+      dir.down do
+        ActiveRecord::Base.connection.execute <<-SQL.squish
+          DROP TRIGGER IF EXISTS tsvector_search_documents_update
+            ON search_documents;
+          DROP FUNCTION IF EXISTS tsvector_search_documents_trigger;
+        SQL
+      end
+    end
+  end
+end

data/lib/pages_core/engine.rb

@@ -27,7 +27,7 @@ module PagesCore
     # Enable asset precompilation
     initializer :assets do |_config|
       Rails.application.config.assets.precompile += %w[
-        pages/admin.js
+        pages_core/admin-dist.js
         pages/admin.css
         pages/errors.css
         pages/favicon.gif
@@ -38,10 +38,6 @@ module PagesCore
       ]
     end
 
-    initializer :enable_recursive_serialization do |_app|
-      ActiveModelSerializers.config.default_includes = "**"
-    end
-
     initializer :handle_exceptions do |app|
       app.config.exceptions_app = app.routes
       ActionDispatch::ExceptionWrapper.rescue_responses.merge!(

data/lib/pages_core/templates/block_configuration.rb

@@ -11,7 +11,7 @@ module PagesCore
       end
 
       def large?
-        small? ? false : true
+        !small?
       end
     end
   end

data/lib/pages_core/templates/configuration_handler.rb

@@ -49,7 +49,7 @@ module PagesCore
         value = false if value == :disabled
         stack = [stack] unless stack.is_a?(Enumerable)
         partial_hash = stack.reverse.inject(value) do |hash, key|
-          Hash[key => hash]
+          { key => hash }
         end
         @configuration = @configuration.deep_merge(partial_hash)
         value

data/lib/pages_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PagesCore
-  VERSION = "3.7.0" unless PagesCore.const_defined?("VERSION")
+  VERSION = "3.8.0" unless PagesCore.const_defined?("VERSION")
 end

data/lib/pages_core.rb

@@ -17,12 +17,11 @@ require "action_mailer"
 
 # Gems
 require "actionpack/page_caching"
-require "active_model_serializers"
 require "acts_as_list"
+require "alba"
 require "bcrypt"
-require "coffee-script"
 require "country_select"
-require "delayed_job"
+require "delayed_job_active_record"
 require "dis"
 require "dynamic_image"
 require "healthcheck"
@@ -30,6 +29,7 @@ require "localizable_model"
 require "lograge"
 require "nokogiri"
 require "json"
+require "pg_search"
 require "progress_bar"
 require "rails_i18n"
 require "RedCloth"
@@ -42,8 +42,6 @@ require "will_paginate/view_helpers/action_view"
 
 # Assets
 require "font-awesome-rails"
-require "jquery-ui-rails"
-require "jquery/rails/engine"
 require "react-rails"
 
 # Pages

data/lib/rails/generators/pages_core/frontend/frontend_generator.rb

@@ -51,13 +51,6 @@ module PagesCore
           File.join("app/assets/stylesheets/components/base.scss")
         )
       end
-
-      def create_application_js
-        template(
-          "application.js.erb",
-          File.join("app/assets/javascripts/application.js")
-        )
-      end
     end
   end
 end

data/lib/rails/generators/pages_core/install/templates/page_templates_initializer.rb

@@ -12,7 +12,7 @@ PagesCore::Templates.configure do |config|
         "Headline",
         size: :field,
         description: "The main statement, usually largest and boldest, " \
-          "describing the main story."
+                     "describing the main story."
       )
       block.excerpt(
         "Standfirst",
@@ -22,7 +22,7 @@ PagesCore::Templates.configure do |config|
       block.boxout(
         "Boxout",
         description: "Part of the page, usually background info or facts " \
-          "related to the article."
+                     "related to the article."
       )
     end