panda-cms 0.7.4 → 0.8.0

data/app/controllers/panda/cms/admin/settings/bulk_editor_controller.rb

@@ -1,36 +1,43 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
-    class Admin::Settings::BulkEditorController < ApplicationController
-      before_action :set_initial_breadcrumb, only: %i[new]
+    module Admin
+      module Settings
+        class BulkEditorController < ::Panda::CMS::Admin::BaseController
+          before_action :set_initial_breadcrumb, only: %i[new]
 
-      def new
-        @json_data = BulkEditor.export
-      end
+          def new
+            @json_data = BulkEditor.export
+          end
 
-      def create
-        begin
-          debug_output = BulkEditor.import(params[:site_content])
-        rescue JSON::ParserError
-          redirect_to admin_settings_bulk_editor_path, flash: {error: "Error parsing content; are you sure this update is valid? Reverting..."}
-          return
-        end
+          def create
+            begin
+              debug_output = BulkEditor.import(params[:site_content])
+            rescue JSON::ParserError
+              redirect_to admin_cms_settings_bulk_editor_path,
+                flash: {error: "Error parsing content; are you sure this update is valid? Reverting..."}
+              return
+            end
 
-        # Grab the latest content back so it's all formatted properly
-        @json_data = BulkEditor.export
+            # Grab the latest content back so it's all formatted properly
+            @json_data = BulkEditor.export
 
-        if debug_output[:error].empty? && debug_output[:warning].empty? && debug_output[:success].empty?
-          redirect_to admin_settings_bulk_editor_path, flash: {success: "No changes were found!"}
-        else
-          @debug = debug_output
-          render :new, flash: {warning: "Please review the output below for more information."}
-        end
-      end
+            if debug_output[:error].empty? && debug_output[:warning].empty? && debug_output[:success].empty?
+              redirect_to admin_cms_settings_bulk_editor_path, flash: {success: "No changes were found!"}
+            else
+              @debug = debug_output
+              render :new, flash: {warning: "Please review the output below for more information."}
+            end
+          end
 
-      private
+          private
 
-      def set_initial_breadcrumb
-        add_breadcrumb "Settings", admin_settings_path
-        add_breadcrumb "Bulk Editor", "#"
+          def set_initial_breadcrumb
+            add_breadcrumb "Settings", admin_cms_settings_path
+            add_breadcrumb "Bulk Editor", "#"
+          end
+        end
       end
     end
   end

data/app/controllers/panda/cms/admin/settings_controller.rb

@@ -1,19 +1,22 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
-    class Admin::SettingsController < ApplicationController
-      before_action :set_initial_breadcrumb, only: %i[index show]
-      before_action :authenticate_admin_user!
+    module Admin
+      class SettingsController < ::Panda::CMS::Admin::BaseController
+        before_action :set_initial_breadcrumb, only: %i[index show]
 
-      def index
-      end
+        def index
+        end
 
-      def show
-      end
+        def show
+        end
 
-      private
+        private
 
-      def set_initial_breadcrumb
-        add_breadcrumb "Settings", admin_settings_path
+        def set_initial_breadcrumb
+          add_breadcrumb "Settings", admin_cms_settings_path
+        end
       end
     end
   end

data/app/controllers/panda/cms/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
     class ApplicationController < ::ActionController::Base
@@ -26,31 +28,42 @@ module Panda
       # Set the current request details
       # @return [void]
       def set_current_request_details
+        # Set Core current attributes
+        Panda::Core::Current.request_id = request.uuid
+        Panda::Core::Current.user_agent = request.user_agent
+        Panda::Core::Current.ip_address = request.ip
+        Panda::Core::Current.root = request.base_url
+        Panda::Core::Current.user ||= Panda::Core::User.find_by(id: session[:user_id]) if session[:user_id]
+
+        # Set CMS current attributes (inherits from Core so has access to all Core attributes)
         Panda::CMS::Current.request_id = request.uuid
         Panda::CMS::Current.user_agent = request.user_agent
         Panda::CMS::Current.ip_address = request.ip
         Panda::CMS::Current.root = request.base_url
+        Panda::CMS::Current.user = Panda::Core::Current.user
         Panda::CMS::Current.page = nil
-        Panda::CMS::Current.user ||= User.find_by(id: session[:user_id]) if session[:user_id]
 
-        Panda::CMS.config.url ||= Panda::CMS::Current.root
+        Panda::CMS.config.url ||= Panda::Core::Current.root
       end
 
       def authenticate_user!
-        redirect_to root_path, flash: {error: "Please login to view this!"} unless user_signed_in?
+        redirect_to main_app.root_path, flash: {error: "Please login to view this!"} unless user_signed_in?
       end
 
       def authenticate_admin_user!
-        redirect_to root_path, flash: {error: "Please login to view this!"} unless user_signed_in? && current_user.admin?
+        return if user_signed_in? && current_user.admin?
+
+        redirect_to panda_core.admin_login_path,
+          flash: {error: "Please login to view this!"}
       end
 
       # Required for paper_trail and seems as good as convention these days
       def current_user
-        Panda::CMS::Current.user
+        Panda::Core::Current.user
       end
 
       def user_signed_in?
-        !!Panda::CMS::Current.user
+        !!Panda::Core::Current.user
       end
     end
   end

data/app/controllers/panda/cms/errors_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
     class ErrorsController < ApplicationController
@@ -5,7 +7,8 @@ module Panda
 
       def show
         exception = request.env["action_dispatch.exception"]
-        status_code = exception.try(:status_code) || ActionDispatch::ExceptionWrapper.new(request.env, exception).status_code
+        status_code = exception.try(:status_code) || ActionDispatch::ExceptionWrapper.new(request.env,
+          exception).status_code
 
         render view_for_code(status_code), status: status_code
       end
@@ -17,7 +20,7 @@ module Panda
       private
 
       def view_for_code(code)
-        supported_error_codes.fetch(code) { "404" }
+        supported_error_codes.fetch(code, "404")
       end
 
       def supported_error_codes

data/app/controllers/panda/cms/form_submissions_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
     class FormSubmissionsController < ApplicationController

data/app/controllers/panda/cms/pages_controller.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
     class PagesController < ApplicationController
       include ActionView::Helpers::TagHelper
 
-      before_action :check_login_required, only: [:root, :show]
-      before_action :handle_redirects, only: [:root, :show]
-      after_action :record_visit, only: [:root, :show], unless: :ignore_visit?
+      before_action :check_login_required, only: %i[root show]
+      before_action :handle_redirects, only: %i[root show]
+      after_action :record_visit, only: %i[root show], unless: :ignore_visit?
 
       def root
         params[:path] = ""
@@ -14,15 +16,13 @@ module Panda
 
       def show
         page = if @overrides&.dig(:page_path_match)
-          Panda::CMS::Page.find_by(path: @overrides.dig(:page_path_match))
+          Panda::CMS::Page.find_by(path: @overrides[:page_path_match])
         else
-          Panda::CMS::Page.find_by(path: "/" + params[:path].to_s)
+          Panda::CMS::Page.find_by(path: "/#{params[:path]}")
         end
 
         Panda::CMS::Current.page = page || Panda::CMS::Page.find_by(path: "/404")
-        if @overrides
-          Panda::CMS::Current.page.title = @overrides&.dig(:title) || page.title
-        end
+        Panda::CMS::Current.page.title = @overrides&.dig(:title) || page.title if @overrides
 
         layout = page&.template&.file_path
 
@@ -42,36 +42,39 @@ module Panda
       private
 
       def handle_redirects
-        current_path = "/" + params[:path].to_s
+        current_path = "/#{params[:path]}"
         redirect = Panda::CMS::Redirect.find_by(origin_path: current_path)
 
-        if redirect
-          redirect.increment!(:visits)
+        return unless redirect
 
-          # Check if the destination is also a redirect
-          next_redirect = Panda::CMS::Redirect.find_by(origin_path: redirect.destination_path)
-          if next_redirect
-            next_redirect.increment!(:visits)
-            redirect_to next_redirect.destination_path, status: redirect.status_code and return
-          end
+        redirect.increment!(:visits)
 
-          redirect_to redirect.destination_path, status: redirect.status_code and return
+        # Check if the destination is also a redirect
+        next_redirect = Panda::CMS::Redirect.find_by(origin_path: redirect.destination_path)
+        if next_redirect
+          next_redirect.increment!(:visits)
+          redirect_to next_redirect.destination_path, status: redirect.status_code and return
         end
+
+        redirect_to redirect.destination_path, status: redirect.status_code and return
       end
 
       def check_login_required
-        if Panda::CMS.config.require_login_to_view && !user_signed_in?
-          redirect_to panda_cms_maintenance_path and return
-        end
+        return unless Panda::CMS.config.require_login_to_view && !user_signed_in?
+
+        redirect_to panda_cms_maintenance_path and return
       end
 
       def ignore_visit?
         # Ignore visits from bots (TODO: make this configurable)
         return true if /bot/i.match?(request.user_agent)
         # Ignore visits from Honeybadger
-        return true if request.headers.to_h.key?("Honeybadger-Token") || request.user_agent == "Honeybadger Uptime Check"
+        if request.headers.to_h.key?("Honeybadger-Token") || request.user_agent == "Honeybadger Uptime Check"
+          return true
+        end
         # Ignore visits where we're asking for PHP files
         return true if request.path.ends_with?(".php")
+
         # Otherwise, record the visit
         false
       end
@@ -79,9 +82,9 @@ module Panda
       def record_visit
         RecordVisitJob.perform_later(
           path: request.path,
-          user_id: Current.user&.id,
+          user_id: Panda::Core::Current.user&.id,
           redirect_id: @redirect&.id,
-          page_id: Current.page&.id,
+          page_id: Panda::CMS::Current.page&.id,
           user_agent: request.user_agent,
           ip_address: request.remote_ip,
           referer: request.referer, # TODO: Fix the naming of this column
@@ -90,13 +93,13 @@ module Panda
       end
 
       def create_redirect_if_path_changed
-        if path_changed? && path_was.present?
-          Panda::CMS::Redirect.create!(
-            origin_path: path_was,
-            destination_path: path,
-            status_code: 301
-          )
-        end
+        return unless path_changed? && path_was.present?
+
+        Panda::CMS::Redirect.create!(
+          origin_path: path_was,
+          destination_path: path,
+          status_code: 301
+        )
       end
     end
   end

data/app/controllers/panda/cms/posts_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
     class PostsController < ApplicationController

data/app/helpers/panda/cms/admin/files_helper.rb

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
-    module Admin::FilesHelper
+    module Admin
+      module FilesHelper
+      end
     end
   end
 end

data/app/helpers/panda/cms/admin/pages_helper.rb

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
-    module Admin::PagesHelper
+    module Admin
+      module PagesHelper
+      end
     end
   end
 end

data/app/helpers/panda/cms/application_helper.rb

@@ -24,8 +24,8 @@ module Panda
       end
 
       def panda_cms_editor
-        if Current.user&.admin
-          content_tag(:a, "🐼", href: edit_admin_page_url(Current.page), class: "text-3xl inline absolute right-2 top-2")
+        if Panda::Core::Current.user&.admin
+          content_tag(:a, "🐼", href: edit_admin_cms_page_url(Panda::CMS::Current.page), class: "text-3xl inline absolute right-2 top-2")
         end
       end
 
@@ -45,7 +45,7 @@ module Panda
       end
 
       def panda_cms_form_with(**options, &)
-        options[:builder] = Panda::CMS::FormBuilder
+        options[:builder] = Panda::Core::FormBuilder
         options[:class] = ["block visible p-6 bg-mid/5 rounded-lg border-mid border", options[:class]].compact.join(" ")
         form_with(**options, &)
       end

data/app/helpers/panda/cms/asset_helper.rb

@@ -0,0 +1,195 @@
+# frozen_string_literal: true
+
+require "panda/core"
+
+module Panda
+  module CMS
+    module AssetHelper
+      include Panda::Core::AssetHelper if defined?(Panda::Core::AssetHelper)
+      # Include Panda CMS JavaScript and CSS assets
+      # Automatically chooses between GitHub-hosted assets (production)
+      # and local development assets
+      def panda_cms_assets
+        tags = []
+
+        # Include Core assets first (if Core is available)
+        if defined?(Panda::Core::AssetHelper)
+          tags << panda_core_assets
+        end
+
+        # Then include CMS-specific assets
+        tags << Panda::CMS::AssetLoader.asset_tags
+
+        tags.join("\n").html_safe
+      end
+
+      # Include only Panda CMS JavaScript
+      def panda_cms_javascript
+        js_url = Panda::CMS::AssetLoader.javascript_url
+        return "" unless js_url
+
+        if Panda::CMS::AssetLoader.use_github_assets?
+          # GitHub-hosted assets with integrity check
+          version = Panda::CMS::AssetLoader.send(:asset_version)
+          integrity = asset_integrity(version, "panda-cms-#{version}.js")
+
+          tag_options = {
+            src: js_url
+          }
+          # In CI environment, don't use defer to ensure immediate execution
+          tag_options[:defer] = true unless ENV["GITHUB_ACTIONS"] == "true"
+          # Standalone bundles should NOT use type: "module" - they're regular scripts
+          # Only use type: "module" for importmap/ES module assets
+          if !js_url.include?("panda-cms-assets")
+            tag_options[:type] = "module"
+          end
+          tag_options[:integrity] = integrity if integrity
+          tag_options[:crossorigin] = "anonymous" if integrity
+
+          content_tag(:script, "", tag_options)
+        elsif js_url.include?("panda-cms-assets")
+          # Development assets - check if it's a standalone bundle or importmap
+          defer_option = (ENV["GITHUB_ACTIONS"] == "true") ? {} : {defer: true}
+          javascript_include_tag(js_url, **defer_option)
+        # Standalone bundle - don't use type: "module"
+        else
+          # Importmap asset - use type: "module"
+          defer_option = (ENV["GITHUB_ACTIONS"] == "true") ? {} : {defer: true}
+          javascript_include_tag(js_url, type: "module", **defer_option)
+        end
+      end
+
+      # Include only Panda CMS CSS
+      def panda_cms_stylesheet
+        css_url = Panda::CMS::AssetLoader.css_url
+        return "" unless css_url
+
+        if Panda::CMS::AssetLoader.use_github_assets?
+          # GitHub-hosted assets with integrity check
+          version = Panda::CMS::VERSION
+          integrity = asset_integrity(version, "panda-cms-#{version}.css")
+
+          tag_options = {
+            rel: "stylesheet",
+            href: css_url
+          }
+          tag_options[:integrity] = integrity if integrity
+          tag_options[:crossorigin] = "anonymous" if integrity
+
+          tag(:link, tag_options)
+        else
+          # Development assets
+          stylesheet_link_tag(css_url)
+        end
+      end
+
+      # Get the current Panda CMS version
+      def panda_cms_version
+        Panda::CMS::VERSION
+      end
+
+      # Check if using GitHub-hosted assets
+      def using_github_assets?
+        Panda::CMS::AssetLoader.use_github_assets?
+      end
+
+      # Download and cache assets if needed
+      # Call this in an initializer or controller to pre-cache assets
+      def ensure_panda_cms_assets!
+        Panda::CMS::AssetLoader.ensure_assets_available!
+      end
+
+      # Debug information about asset loading
+      def panda_cms_asset_debug
+        return "" unless Rails.env.development? || Rails.env.test?
+
+        version = Panda::CMS::VERSION
+        js_url = Panda::CMS::AssetLoader.javascript_url
+        css_url = Panda::CMS::AssetLoader.css_url
+        using_github = Panda::CMS::AssetLoader.use_github_assets?
+        compiled_available = Panda::CMS::AssetLoader.send(:compiled_assets_available?)
+
+        # Additional CI debugging
+        asset_file_exists = js_url && File.exist?(Rails.root.join("public#{js_url}"))
+        ci_env = ENV["GITHUB_ACTIONS"] == "true"
+
+        # Check what script tag will be generated
+        script_tag_preview = if using_github
+          tag_options = {src: js_url}
+          tag_options[:defer] = true unless ci_env
+          if !js_url.include?("panda-cms-assets")
+            tag_options[:type] = "module"
+          end
+          "Script tag: <script#{tag_options.map { |k, v| (v == true) ? " #{k}" : " #{k}=\"#{v}\"" }.join}></script>"
+        else
+          "Using development assets"
+        end
+
+        debug_info = [
+          "<!-- Panda CMS Asset Debug Info -->",
+          "<!-- Version: #{version} -->",
+          "<!-- Using GitHub assets: #{using_github} -->",
+          "<!-- Compiled assets available: #{compiled_available} -->",
+          "<!-- JavaScript URL: #{js_url} -->",
+          "<!-- CSS URL: #{css_url || "none"} -->",
+          "<!-- Rails environment: #{Rails.env} -->",
+          "<!-- Asset file exists: #{asset_file_exists} -->",
+          "<!-- Rails root: #{Rails.root} -->",
+          "<!-- CI environment: #{ci_env} -->",
+          "<!-- #{script_tag_preview} -->",
+          "<!-- Params embed_id: #{params[:embed_id] if respond_to?(:params)} -->",
+          "<!-- Compiled at: #{Time.now.utc.iso8601} -->"
+        ]
+
+        debug_info.join("\n").html_safe
+      end
+
+      # Initialize Panda CMS Stimulus application
+      # Call this after the asset tags to ensure proper initialization
+      def panda_cms_stimulus_init
+        javascript_tag(<<~JS, type: "module")
+          // Initialize Panda CMS Stimulus application
+          document.addEventListener('DOMContentLoaded', function() {
+            if (window.pandaCmsStimulus) {
+              console.debug('[Panda CMS] Stimulus application initialized');
+
+              // Set debug mode based on Rails environment
+              const railsEnv = document.body?.dataset?.environment || 'production';
+              window.pandaCmsStimulus.debug = (railsEnv === 'development');
+
+              // Trigger a custom event to signal Panda CMS is ready
+              document.dispatchEvent(new CustomEvent('panda-cms:ready', {
+                detail: {
+                  version: '#{Panda::CMS::VERSION}',
+                  usingGitHubAssets: #{Panda::CMS::AssetLoader.use_github_assets?}
+                }
+              }));
+            } else {
+              console.warn('[Panda CMS] Stimulus application not found. Assets may not have loaded properly.');
+            }
+          });
+        JS
+      end
+
+      # Complete asset loading with initialization
+      # This is the recommended way to include all Panda CMS assets
+      def panda_cms_complete_assets
+        [
+          panda_cms_asset_debug,
+          panda_cms_assets,
+          panda_cms_stimulus_init,
+          # Add immediate JavaScript execution test for CI debugging
+          (Rails.env.test? ? javascript_tag("window.pandaCmsInlineTest = true; console.log('[Panda CMS] Inline script executed');") : "")
+        ].join("\n").html_safe
+      end
+
+      private
+
+      def asset_integrity(version, filename)
+        Panda::CMS::AssetLoader.send(:asset_integrity, version, filename)
+      rescue
+        nil
+      end
+    end
+  end
+end

data/app/helpers/panda/cms/pages_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
     module PagesHelper

data/app/helpers/panda/cms/posts_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
     module PostsHelper

data/app/helpers/panda/cms/theme_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
     module ThemeHelper

data/app/javascript/panda/cms/application_panda_cms.js

@@ -3,37 +3,5 @@ console.debug("[Panda CMS] Controllers loading...");
 import "controllers"
 console.debug("[Panda CMS] Controllers loaded...");
 
-// Import editor resources
-import { EDITOR_JS_RESOURCES, EDITOR_JS_CSS } from "panda/cms/editor/editor_js_config"
-import { ResourceLoader } from "panda/cms/editor/resource_loader"
-
-// Function to load editor resources
-async function loadEditorResources() {
-  console.debug("[Panda CMS] Loading editor resources...");
-  try {
-    // First load EditorJS core
-    const editorCore = EDITOR_JS_RESOURCES[0]
-    await ResourceLoader.loadScript(document, document.head, editorCore)
-
-    // Then load all tools in parallel
-    const toolLoads = EDITOR_JS_RESOURCES.slice(1).map(async (resource) => {
-      await ResourceLoader.loadScript(document, document.head, resource)
-    })
-
-    // Load CSS directly since it's a string, not an array
-    await ResourceLoader.embedCSS(document, document.head, EDITOR_JS_CSS)
-
-    // Wait for all resources to load
-    await Promise.all(toolLoads)
-    console.debug("[Panda CMS] Editor resources loaded");
-
-    // Dispatch a custom event when resources are loaded
-    document.dispatchEvent(new CustomEvent('editorjs:loaded'))
-  } catch (error) {
-    console.error("[Panda CMS] Error loading editor resources:", error);
-  }
-}
-
-// Load resources on both initial page load and Turbo cache restore
-document.addEventListener('turbo:load', loadEditorResources);
-document.addEventListener('turbo:render', loadEditorResources);
+// Editor resources are now handled by panda-editor gem
+// The panda-editor gem will load its own resources when needed