trusty-cms 7.0.26 → 7.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d45d76c458d982e12e398501691b9c80786772ae9a752b2476bcababf4f97ceb
-  data.tar.gz: c5ff04b23662c3df08191e9780008c1f28b7eaffcb6f54a912dda3521f2bf22e
+  metadata.gz: 16753e005b09f59c333c5e9fd2af4bca3bd0e20f8d2da054500b3d262d1eecfa
+  data.tar.gz: c4159171a6a9f932b685cd3855bd0f931392053d4d797025e73aae1a5aa443fc
 SHA512:
-  metadata.gz: 9b73ce6f51a809957d30ca3a51a67f2496db293b1160438608029d3a6e3ec40ea6aea40adad0d60374212a3475a508e900505b957890c486e505d47b15a3a69c
-  data.tar.gz: 0b72e9b00f8dd0b2b5964f4d00f6d6cc085052a7c0e9635f48a6aee8325460d2890449b0a65200b490087c4b3d82c589d63987e987954c9e5278f92a4e315134
+  metadata.gz: 3f91892e8c3e8b0aa0e3899b7796833a4e2a0e5074eacf92f5e47b7e216559b5c4d32f487f03fb725775d960d20f0cd15cea678a0a14ef42aa65c9d07cb531c2
+  data.tar.gz: f5735dc96aa6cf0c3c80686f36d48cd7d49f5b8865ffd4c2d02ab708170764b5bff91a7fb525acbff932e67c76b9adcd104f35e145ee71ce61c4c897e42c597f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (7.0.26)
+    trusty-cms (7.0.28)
       RedCloth (= 4.3.3)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.3.0)

data/README.md

@@ -77,6 +77,23 @@ Steps:
 
         rspec
 
+### Preview Custom Page Types
+
+TrustyCMS supports a preview feature for standard page types. However, this functionality may not work out of the box for custom page types. To enable the preview feature for your custom page types, follow these steps:
+
+1. In your application, create the following initializer file: `config/initializers/preview_page_types.rb`
+2. Inside this file, define a `PREVIEW_PAGE_TYPES` array constant with the names of the page types you’d like to enable the Preview button for, for example:
+
+   ```ruby
+   PREVIEW_PAGE_TYPES = %w[
+     BlogPage
+     FacilityPage
+     FileNotFoundPage
+   ].freeze
+   ```
+   
+3. Test the Preview button with each custom page type. If a page type does not preview correctly, remove it from the list.
+
 ### Custom Page Type Routes Setup
 Additional configuration is required to ensure correct URL generation in the admin interface — specifically for the "Edit Page" dropdown and the "Save and View Draft" functionality.
 
@@ -106,11 +123,6 @@ DEFAULT_PAGE_TYPE_ROUTES = %w[
 ].freeze
 ```
 
-### Save and View Draft Caching
-To ensure that pages and drafts under development are not cached by the browser or content delivery networks (such as CloudFront), the CMS appends a `trusty-no-cache` URL parameter containing the current date and time when a user selects **Save and View Draft** or **Save and View Page**.
-
-Because the `trusty-no-cache` parameter is always unique, it effectively bypasses caching mechanisms at both the CDN and browser levels, ensuring the user receives the most up-to-date version of the content with every request. Note that additional CDN configuration may be required to ensure query parameters are respected.
-
 ### Page Status Refresh Setup
 
 To ensure **Scheduled Pages** automatically update their status to **Published** after their designated **Publish Date & Time**, follow these steps to set up an automated refresh using **AWS Lambda** and **EventBridge**.  

data/app/assets/javascripts/admin/preview.js

@@ -0,0 +1,40 @@
+(function(Preview, $) {
+    Preview.showPreview = function(form){
+      var oldTarget = form.target;
+      var oldAction = form.action;
+  
+      var $previewer = $('#preview_panel');
+      var $preview_tools = $previewer.find('.preview_tools');
+      var $frame = $('#page-preview');
+  
+      $(window).scrollTop(0);
+      $previewer.show();
+      $preview_tools.css('opacity', 1);
+      $('body').addClass('clipped');
+      form.target = $frame.attr('id');
+      form.action = relative_url_root + '/admin/preview';
+      form.submit();
+  
+      form.target = oldTarget;
+      form.action = oldAction;
+    }
+  
+  }(window.Preview = window.Preview || {}, jQuery));
+  
+  $(function () {
+    $('#show-preview').on('click', function(event){
+      event.preventDefault();
+      Preview.showPreview(this.form);
+    });
+  
+    $('.preview_tools a.cancel').on('click', function(event){
+      event.preventDefault();
+      $('#preview_panel').hide();
+      $('body').removeClass('clipped');
+      $('#page-preview').attr('src', '');
+    });
+  
+    $('iframe').on('load', function(event){
+      $('#preview_panel .preview_tools').css('opacity', null);
+    });
+  });

data/app/assets/javascripts/admin.js

@@ -28,6 +28,7 @@
 //= require 'admin/page-edit'
 //= require 'admin/pagefield'
 //= require 'admin/popup'
+//= require 'admin/preview'
 //= require 'admin/tabcontrol'
 //= require 'admin/utilities'
 //= require 'admin/tags'

data/app/controllers/admin/pages_controller.rb

@@ -3,7 +3,6 @@ class Admin::PagesController < Admin::ResourceController
   before_action :count_deleted_pages, only: [:destroy]
   before_action :set_page, only: %i[edit restore]
   rescue_from ActiveRecord::RecordInvalid, with: :validation_error
-  include Admin::NodeHelper
   include Admin::PagesHelper
   include Admin::UrlHelper
 
@@ -43,6 +42,7 @@ class Admin::PagesController < Admin::ResourceController
     assets = Asset.order('created_at DESC')
     @term = assets.ransack(params[:search] || '')
     @page = self.model = model_class.new_with_defaults(trusty_config)
+    @render_preview_button = render_preview_button?
     assign_page_attributes
     response_for :new
   end
@@ -53,6 +53,7 @@ class Admin::PagesController < Admin::ResourceController
     @page_url = generate_page_url(request.url, @page)
     @page_path = format_path(@page.path)
     @versions = format_versions(@page.versions)
+    @render_preview_button = render_preview_button?
     response_for :edit
   end
 
@@ -62,6 +63,12 @@ class Admin::PagesController < Admin::ResourceController
     redirect_to edit_admin_page_path(@page)
   end
 
+  def preview
+    render_preview
+  rescue PreviewStop => e
+    render text: e.message unless @performed_render
+  end
+
   def save_table_position
     new_position = params[:new_position]
     Page.save_order(new_position)
@@ -152,6 +159,20 @@ class Admin::PagesController < Admin::ResourceController
     end
   end
 
+  def render_preview
+    params.permit!
+    Page.transaction do
+      page = Admin::PreviewPageBuilder.new(
+        model_class:,
+        page_params: params[:page],
+        referer: request.referer,
+      ).build
+
+      page.pagination_parameters = pagination_parameters
+      process_with_exception(page)
+    end
+  end
+
   def process_with_exception(page)
     page.process(request, response)
     @performed_render = true
@@ -177,4 +198,11 @@ class Admin::PagesController < Admin::ResourceController
       raise "I'm not allowed to constantize #{page_class}!"
     end
   end
+
+  def render_preview_button?
+    page_class = @page.class.name
+    previewable_classes = ['Page']
+    previewable_classes += PREVIEW_PAGE_TYPES if defined?(PREVIEW_PAGE_TYPES)
+    previewable_classes.include?(page_class)
+  end
 end

data/app/controllers/admin/resource_controller.rb

@@ -202,8 +202,6 @@ class Admin::ResourceController < ApplicationController
   end
 
   def redirect_url
-    return "#{edit_admin_page_url(model)}?view_page=true" if params[:save_and_view]
-
     params[:continue] ? { action: 'edit', id: model.id } : { action: 'index' }
   end
 

data/app/helpers/admin/node_helper.rb

@@ -1,4 +1,6 @@
 module Admin::NodeHelper
+  include Admin::UrlHelper
+
   def render_nodes(page, starting_index, parent_index = nil, simple = false)
     @rendered_html = ''
     render_node page, starting_index, parent_index, simple
@@ -25,17 +27,6 @@ module Admin::NodeHelper
     page
   end
 
-  def format_path(path)
-    return '' if path.nil? || path.empty?
-
-    parts = path.split('/').reject(&:empty?)
-    return 'Root' if parts.size == 1
-    return '/' if parts.size == 2
-
-    formatted_path = parts[1..-2].join('/')
-    formatted_path.empty? ? '/' : "/#{formatted_path}"
-  end
-
   def homepage
     @homepage ||= Page.find_by_parent_id(nil)
   end

data/app/helpers/admin/url_helper.rb

@@ -1,6 +1,18 @@
 module Admin::UrlHelper
   require 'uri'
 
+  def format_path(path)
+    return '' if path.to_s.empty?
+
+    parts = path.split('/').reject(&:empty?)
+    parts_size = parts.size
+    return 'Root' if parts_size == 1
+    return '/' if parts_size == 2
+
+    formatted_path = parts[1..-2].join('/')
+    formatted_path.empty? ? '/' : "/#{formatted_path}"
+  end
+
   def generate_page_url(url, page)
     base_url = extract_base_url(url)
     build_url(base_url, page)

data/app/helpers/application_helper.rb

@@ -42,16 +42,6 @@ module ApplicationHelper
     submit_tag t('buttons.save_and_continue'), name: 'continue', class: 'button', accesskey: 's', id: 'save-and-continue-button'
   end
 
-  def save_model_and_view_page_button(model, options = {})
-    return nil unless generate_page_url(request.url, model)
-
-    options[:label] ||= model.published? ? t('buttons.save_and_view_page') : t('buttons.save_and_view_draft')
-    options[:class] ||= 'button'
-    options[:name] ||= 'save_and_view'
-    options[:id] ||= 'save-and-view-button'
-    submit_tag options.delete(:label), options
-  end
-
   def current_item?(item)
     if item.tab&.many? { |i| current_url?(i.relative_url) }
       # Accept only stricter URL matches if more than one matches

data/app/models/page.rb

@@ -121,7 +121,7 @@ class Page < ActiveRecord::Base
   def path
     return '' if slug.blank?
 
-    parent? ? parent.child_path(self) : clean_path(slug)
+    parent.present? ? clean_path("#{parent.path}/#{slug}") : clean_path(slug)
   end
 
   alias_method :url, :path

data/app/services/admin/preview_page_builder.rb

@@ -0,0 +1,54 @@
+module Admin
+  class PreviewPageBuilder
+    def initialize(model_class:, page_params:, referer:)
+      @model_class = model_class
+      @page_params = page_params
+      @referer = referer
+    end
+
+    def build
+      editing_existing_page? ? build_existing_page : build_new_page
+    end
+
+    private
+
+    def build_existing_page
+      page = find_page_from_referer.becomes(valid_model_class)
+      page.update(@page_params)
+      page
+    end
+
+    def build_new_page
+      page = valid_model_class.new(@page_params)
+
+      if creating_child_page?
+        parent = find_page_from_referer
+        page.parent = parent
+        page.layout_id ||= parent.layout_id
+      end
+
+      page.save!
+      page
+    end
+
+    def valid_model_class
+      Page.descendants.include?(@model_class) ? @model_class : Page
+    end
+
+    def find_page_from_referer
+      Page.find(extract_page_id_from_referer)
+    end
+
+    def extract_page_id_from_referer
+      @referer[%r{/admin/pages/(\d+)}, 1]
+    end
+
+    def editing_existing_page?
+      @referer =~ %r{/admin/pages/\d+/edit}
+    end
+
+    def creating_child_page?
+      @referer =~ %r{/admin/pages/\d+/children/new}
+    end
+  end
+end

data/app/views/admin/pages/_fields.html.haml

@@ -20,7 +20,8 @@
           = render :partial => 'admin/page_fields/page_field', :collection => @page.fields
           = render_region :extended_metadata, :locals => {:f => fields}
       .drawer_handle
-        %a.toggle{:href=>'#attributes', :rel=>'toggle[attributes]', :class=>"#{(meta_errors? ? 'less' : 'more')}"}
+        - toggle_class = meta_errors? ? 'less' : 'more'
+        %a.toggle{ href: '#attributes', rel: 'toggle[attributes]', class: toggle_class }
           = meta_label
           %i.fas.fa-angle-down
   - form.edit_page_parts do
@@ -66,32 +67,27 @@
 .error.hidden
   %span#published-at-error
 
-- render_region :form_bottom, :locals => {:f => fields} do |form_bottom|
+- render_region :form_bottom, locals: { f: fields } do |form_bottom|
   - form_bottom.edit_buttons do
     - @buttons_partials.each do |partial|
-      = render :partial => partial, :locals => {:f => fields}
+      = render partial: partial, locals: { f: fields }
+
     .page-actions
       = save_model_button(@page)
       = save_model_and_continue_editing_button(@page)
-      = save_model_and_view_page_button(@page)
+      = submit_tag(t('preview'), class: 'button', id: 'show-preview') if @render_preview_button
       = t('or')
       = link_to t('cancel'), admin_pages_url(site_id: @site_id), class: 'alt'
-    #view-page-url-data{ data: { url: @page_url } }
-  - form_bottom.edit_timestamp do
-    = updated_stamp @page
 
--# Opens a new tab with the page URL when "Save and View Page" is selected
-:javascript
-  document.addEventListener("DOMContentLoaded", function() {
-    const params = new URLSearchParams(window.location.search);
-    const dataDiv = document.getElementById("view-page-url-data");
-    const baseUrl = dataDiv?.dataset?.url;
-
-    if (params.get("view_page") === "true" && baseUrl) {
-      const now = new Date().toISOString();
-      const separator = baseUrl.includes("?") ? "&" : "?";
-      const newTabUrl = `${baseUrl}${separator}trusty-no-cache=${encodeURIComponent(now)}`;
-      window.open(newTabUrl, '_blank');
-    }
-  });
+    .fullcover.grey_out#preview_panel{ style: 'display: none;' }
+      %iframe.fullcover#page-preview{
+        name: 'page-preview',
+        src: "#{ActionController::Base.relative_url_root}/loading-iframe.html",
+        frameborder: 0,
+        scrolling: 'auto'
+      }
+      .preview_tools
+        = link_to t('edit_page'), {}, class: 'button cancel'
 
+  - form_bottom.edit_timestamp do
+    = updated_stamp(@page)

data/config/locales/en.yml

@@ -52,8 +52,6 @@ en:
   buttons:
     create: 'Create %{name}'
     save_and_continue: 'Save and Continue Editing'
-    save_and_view_draft: 'Save and View Draft'
-    save_and_view_page: 'Save and View Page'
     save_changes: 'Save Changes'
   cancel: 'Cancel'
   change: 'Change'

data/config/routes.rb

@@ -41,6 +41,7 @@ TrustyCms::Application.routes.draw do
     end
   end
 
+  match 'admin/preview' => 'admin/pages#preview', :as => :preview, :via => %i[post put]
   get 'admin' => 'admin/pages#index'
 
   namespace :admin do

data/lib/trusty_cms/version.rb

@@ -1,3 +1,3 @@
 module TrustyCms
-  VERSION = '7.0.26'.freeze
+  VERSION = '7.0.28'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 7.0.26
+  version: 7.0.28
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-02 00:00:00.000000000 Z
+date: 2025-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -702,6 +702,7 @@ files:
 - app/assets/javascripts/admin/pagefield.js
 - app/assets/javascripts/admin/persist.min.js
 - app/assets/javascripts/admin/popup.js
+- app/assets/javascripts/admin/preview.js
 - app/assets/javascripts/admin/sortable.js
 - app/assets/javascripts/admin/tabcontrol.js.erb
 - app/assets/javascripts/admin/tags.js
@@ -814,6 +815,7 @@ files:
 - app/models/trusty_cms/page_response_cache_director.rb
 - app/models/user.rb
 - app/models/user_action_observer.rb
+- app/services/admin/preview_page_builder.rb
 - app/views/admin/assets/_asset.html.haml
 - app/views/admin/assets/_asset_table.html.haml
 - app/views/admin/assets/_errors.html.haml