trusty-cms 7.0.24 → 7.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3380e3eea06aeafbcf42ad8bcfbeb6d7aab6b62289265fbc81b74430c4a9c0c0
-  data.tar.gz: c6cac4b877f787958f03862fe734754a08d6f15173579c32c4ec82f6dae90a12
+  metadata.gz: d45d76c458d982e12e398501691b9c80786772ae9a752b2476bcababf4f97ceb
+  data.tar.gz: c5ff04b23662c3df08191e9780008c1f28b7eaffcb6f54a912dda3521f2bf22e
 SHA512:
-  metadata.gz: 353a1a00a9298e3eeec76e1cc0c5785c0be100cc72ac1cba77ed04a23ddefa3e288a606fd2201c54a9fc12dcc8e00ed5216013c773a167e0bf478e10ed283d61
-  data.tar.gz: cbf06b90eb40e47bca28107fc9a3b67dd2c5ab9a8117add664271962730fb04d6eda6631c0408d30e980672c0ac0cb34cff26035d41cfe338e677b29869447a3
+  metadata.gz: 9b73ce6f51a809957d30ca3a51a67f2496db293b1160438608029d3a6e3ec40ea6aea40adad0d60374212a3475a508e900505b957890c486e505d47b15a3a69c
+  data.tar.gz: 0b72e9b00f8dd0b2b5964f4d00f6d6cc085052a7c0e9635f48a6aee8325460d2890449b0a65200b490087c4b3d82c589d63987e987954c9e5278f92a4e315134

data/Gemfile.lock

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

data/README.md

@@ -106,6 +106,11 @@ 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/controllers/admin/pages_controller.rb

@@ -2,7 +2,6 @@ class Admin::PagesController < Admin::ResourceController
   before_action :initialize_meta_rows_and_buttons, only: %i[new edit create update]
   before_action :count_deleted_pages, only: [:destroy]
   before_action :set_page, only: %i[edit restore]
-  before_action :generate_view_page_url, only: [:edit]
   rescue_from ActiveRecord::RecordInvalid, with: :validation_error
   include Admin::NodeHelper
   include Admin::PagesHelper
@@ -75,10 +74,6 @@ class Admin::PagesController < Admin::ResourceController
     @page = Page.find(params[:id])
   end
 
-  def generate_view_page_url
-    @view_page_url = generate_page_url(request.url, @page)
-  end
-
   def set_site_and_homepage
     @site ||= Page.current_site
     @homepage = @site&.homepage || Page.homepage

data/app/controllers/admin/resource_controller.rb

@@ -202,19 +202,9 @@ class Admin::ResourceController < ApplicationController
   end
 
   def redirect_url
-    return edit_admin_page_url(model) if params[:continue]
     return "#{edit_admin_page_url(model)}?view_page=true" if params[:save_and_view]
 
-    admin_pages_url(site_id: model.site.id)
-  end
-
-  def index_page_for_model
-    parts = { action: 'index' }
-    if paginated? && model && i = model_class.all.index(model)
-      p = (i / pagination_parameters[:per_page].to_i) + 1
-      parts[:p] = p if p && p > 1
-    end
-    parts
+    params[:continue] ? { action: 'edit', id: model.id } : { action: 'index' }
   end
 
   def edit_model_path

data/app/models/page.rb

@@ -119,11 +119,9 @@ class Page < ActiveRecord::Base
   end
 
   def path
-    if parent?
-      parent.child_path(self)
-    else
-      clean_path(slug)
-    end
+    return '' if slug.blank?
+
+    parent? ? parent.child_path(self) : clean_path(slug)
   end
 
   alias_method :url, :path

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

@@ -76,20 +76,22 @@
       = save_model_and_view_page_button(@page)
       = t('or')
       = link_to t('cancel'), admin_pages_url(site_id: @site_id), class: 'alt'
-    #view-page-url-data{ data: { url: @view_page_url } }
+    #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() {
-    let params = new URLSearchParams(window.location.search);
-    let dataDiv = document.getElementById("view-page-url-data");
+    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" && dataDiv) {
-      let newTabUrl = dataDiv.dataset.url;
-      if (newTabUrl) {
-        window.open(newTabUrl, '_blank');
-      }
+    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');
     }
   });
+

data/lib/trusty_cms/version.rb

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

data/vendor/extensions/layouts-extension/lib/share_layouts/helpers/action_view.rb

@@ -36,10 +36,15 @@ module ShareLayouts
             end
             
             def find_page
-              page = Page.find_by_path(request.path) rescue nil
+              page = Page.find_by_path(request.path, can_view_drafts?) rescue nil
               page.is_a?(RailsPage) ? page : RailsPage.new(:class_name => "RailsPage")
             end
-            
+
+            private
+
+            def can_view_drafts?
+              user_signed_in? # CMS users can view drafts
+            end
           end
         end
       

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 7.0.24
+  version: 7.0.26
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-31 00:00:00.000000000 Z
+date: 2025-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator