panda-cms 0.7.4 → 0.7.5

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
@@ -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/asset_helper.rb

@@ -0,0 +1,182 @@
+# frozen_string_literal: true
+
+module Panda
+  module CMS
+    module AssetHelper
+      # Include Panda CMS JavaScript and CSS assets
+      # Automatically chooses between GitHub-hosted assets (production)
+      # and local development assets
+      def panda_cms_assets
+        Panda::CMS::AssetLoader.asset_tags.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/controllers/editor_form_controller.js

@@ -10,6 +10,10 @@ export default class extends Controller {
 
   connect() {
     this.loadEditorResources();
+    // Enable submit button after a delay as fallback
+    setTimeout(() => {
+      this.enableSubmitButton();
+    }, 1000);
   }
 
   async loadEditorResources() {
@@ -77,6 +81,8 @@ export default class extends Controller {
           holderDiv.dataset.editorInitialized = "true";
           // Add a class to indicate the editor is ready
           holderDiv.classList.add("editor-ready");
+          // Enable the submit button
+          this.enableSubmitButton();
           // Dispatch an event when editor is ready
           this.editorContainerTarget.dispatchEvent(new CustomEvent("editor:ready"));
         },
@@ -119,12 +125,6 @@ export default class extends Controller {
       // Wait for editor to be ready
       await this.editor.isReady;
       console.debug("[Panda CMS] Editor initialized successfully");
-      this.editorContainerTarget.dataset.editorInitialized = "true";
-      holderDiv.dataset.editorInitialized = "true";
-      // Add a class to indicate the editor is ready
-      holderDiv.classList.add("editor-ready");
-      // Dispatch an event when editor is ready
-      this.editorContainerTarget.dispatchEvent(new CustomEvent("editor:ready"));
 
     } catch (error) {
       console.error("[Panda CMS] Editor setup failed:", error);
@@ -133,6 +133,8 @@ export default class extends Controller {
         holderDiv.dataset.editorInitialized = "false";
         holderDiv.classList.remove("editor-ready");
       }
+      // Still enable the submit button even if editor fails
+      this.enableSubmitButton();
     }
   }
 
@@ -190,6 +192,57 @@ export default class extends Controller {
       source: "editorJS",
     };
   }
+  
+  enableSubmitButton() {
+    // Find the submit button in the form and enable it
+    const form = this.element.closest('form');
+    if (form) {
+      const submitButton = form.querySelector('input[type="submit"], button[type="submit"]');
+      if (submitButton) {
+        submitButton.disabled = false;
+      }
+    }
+  }
+
+  async submit(event) {
+    // Prevent the default button click behavior temporarily
+    event.preventDefault();
+    
+    const submitButton = event.target;
+    const form = submitButton.closest('form');
+    
+    // Re-enable the button that was disabled by data-disable-with
+    submitButton.disabled = false;
+    
+    // Ensure editor content is saved before form submission
+    if (this.editor) {
+      try {
+        const outputData = await this.editor.save();
+        outputData.source = "editorJS";
+        const jsonString = JSON.stringify(outputData);
+        this.hiddenFieldTarget.value = jsonString;
+        console.log("[Panda CMS] Editor content saved before submission");
+      } catch (error) {
+        console.error("[Panda CMS] Failed to save editor content:", error);
+      }
+    }
+    
+    // Now trigger the normal form submission (this will let Rails/Turbo handle it properly)
+    if (form) {
+      // Remove our custom action to prevent infinite loop
+      submitButton.removeAttribute('data-action');
+      
+      // Create a new click event that will trigger the normal form submission
+      const clickEvent = new MouseEvent('click', {
+        bubbles: true,
+        cancelable: true,
+        view: window
+      });
+      
+      // Dispatch the click event, which will trigger normal Rails form submission
+      submitButton.dispatchEvent(clickEvent);
+    }
+  }
 
   disconnect() {
     if (this.editor) {

data/app/javascript/panda/cms/controllers/index.js

@@ -1,16 +1,10 @@
 console.debug("[Panda CMS] Importing Panda CMS Stimulus Controller...")
 
-import { Application as PandaCMSApplication } from "@hotwired/stimulus"
+import { application } from "@hotwired/stimulus-loading"
 
-const pandaCmsApplication = PandaCMSApplication.start()
+console.debug("[Panda CMS] Using shared Stimulus application...")
 
-console.debug("[Panda CMS] Application started...")
-
-// Configure Stimulus development experience
-const railsEnv = document.body?.dataset?.environment || "production";
-pandaCmsApplication.debug = railsEnv === "development";
-
-console.debug("[Panda CMS] window.pandaCmsStimulus available...")
+const pandaCmsApplication = application
 
 console.debug("[Panda CMS] Registering controllers...")
 

data/app/javascript/panda/cms/controllers/theme_form_controller.js

@@ -2,8 +2,24 @@ import { Controller } from "@hotwired/stimulus";
 
 // Connects to data-controller="theme-form"
 export default class extends Controller {
+  connect() {
+    // Ensure submit button is enabled on connect
+    this.enableSubmitButton();
+  }
+
   updateTheme(event) {
     const newTheme = event.target.value;
     document.documentElement.dataset.theme = newTheme;
   }
+
+  enableSubmitButton() {
+    // Find the submit button in the form and ensure it's enabled
+    const form = this.element;
+    if (form) {
+      const submitButton = form.querySelector('input[type="submit"], button[type="submit"]');
+      if (submitButton) {
+        submitButton.disabled = false;
+      }
+    }
+  }
 }

data/app/javascript/panda/cms/stimulus-loading.js

@@ -0,0 +1,39 @@
+// Stimulus loading utilities for Panda CMS
+// This provides the loading functionality that would normally come from stimulus-rails
+
+import { Application } from "@hotwired/stimulus"
+
+const application = Application.start()
+
+// Configure debug mode based on environment
+const railsEnv = document.body?.dataset?.environment || "production";
+application.debug = railsEnv === "development"
+window.Stimulus = application
+
+// Auto-registration functionality
+function eagerLoadControllersFrom(context) {
+  const definitions = []
+  for (const path of context.keys()) {
+    const module = context(path)
+    const controller = module.default
+    if (controller && path.match(/[_-]controller\.(js|ts)$/)) {
+      const name = path
+        .replace(/^.*\//, "")
+        .replace(/[_-]controller\.(js|ts)$/, "")
+        .replace(/_/g, "-")
+      definitions.push({ name, module: controller, filename: path })
+    }
+  }
+  return definitions
+}
+
+function lazyLoadControllersFrom(context) {
+  return eagerLoadControllersFrom(context)
+}
+
+// Export the functions that stimulus-loading typically provides
+export {
+  application,
+  eagerLoadControllersFrom,
+  lazyLoadControllersFrom
+}

data/app/javascript/panda_cms/stimulus-loading.js

@@ -0,0 +1,39 @@
+// Stimulus loading utilities for Panda CMS
+// This provides the loading functionality that would normally come from stimulus-rails
+
+import { Application } from "@hotwired/stimulus"
+
+const application = Application.start()
+
+// Configure debug mode based on environment
+const railsEnv = document.body?.dataset?.environment || "production";
+application.debug = railsEnv === "development"
+window.Stimulus = application
+
+// Auto-registration functionality
+function eagerLoadControllersFrom(context) {
+  const definitions = []
+  for (const path of context.keys()) {
+    const module = context(path)
+    const controller = module.default
+    if (controller && path.match(/[_-]controller\.(js|ts)$/)) {
+      const name = path
+        .replace(/^.*\//, "")
+        .replace(/[_-]controller\.(js|ts)$/, "")
+        .replace(/_/g, "-")
+      definitions.push({ name, module: controller, filename: path })
+    }
+  }
+  return definitions
+}
+
+function lazyLoadControllersFrom(context) {
+  return eagerLoadControllersFrom(context)
+}
+
+// Export the functions that stimulus-loading typically provides
+export {
+  application,
+  eagerLoadControllersFrom,
+  lazyLoadControllersFrom
+}

data/app/jobs/panda/cms/application_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
     class ApplicationJob < ActiveJob::Base

data/app/jobs/panda/cms/record_visit_job.rb

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

data/app/mailers/panda/cms/application_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
     class ApplicationMailer < ActionMailer::Base

data/app/mailers/panda/cms/form_mailer.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
     class FormMailer < Panda::CMS::ApplicationMailer
       def notification_email(form:, form_submission:)
         # TODO: Handle fields named just "name", and "email" better
         @submission_data = form_submission.data
-        @sender_name = @submission_data["first_name"].to_s + " " + @submission_data["last_name"].to_s
+        @sender_name = "#{@submission_data["first_name"]} #{@submission_data["last_name"]}"
         @sender_email = @submission_data["email"].to_s
 
         mail(

data/app/models/panda/cms/application_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
     class ApplicationRecord < ActiveRecord::Base

data/app/models/panda/cms/block.rb

@@ -1,10 +1,13 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
     class Block < ApplicationRecord
       self.table_name = "panda_cms_blocks"
 
       belongs_to :template, foreign_key: :panda_cms_template_id, class_name: "Panda::CMS::Template"
-      has_many :block_contents, foreign_key: :panda_cms_block_id, class_name: "Panda::CMS::BlockContent", dependent: :destroy
+      has_many :block_contents, foreign_key: :panda_cms_block_id, class_name: "Panda::CMS::BlockContent",
+        dependent: :destroy
 
       validates :name, presence: true
       validates :key, presence: true, uniqueness: {scope: :panda_cms_template_id, case_sensitive: false}

data/app/models/panda/cms/block_content.rb

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

data/app/models/panda/cms/breadcrumb.rb

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

data/app/models/panda/cms/current.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
     class Current < ActiveSupport::CurrentAttributes

data/app/models/panda/cms/form.rb

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

data/app/models/panda/cms/form_submission.rb

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