panda-cms 0.7.0 → 0.7.3

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

@@ -1,46 +1,37 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
     module Admin
       module PostsHelper
         def editor_content_for(post, preserved_content = nil)
-          Rails.logger.debug "Editor content for post: #{post.inspect}"
-          Rails.logger.debug "Preserved content: #{preserved_content.inspect}"
-          Rails.logger.debug "Post content: #{post.content.inspect}"
+          content = preserved_content || post.content
 
-          content = if preserved_content.present?
-            # If preserved_content is a string (JSON), parse it
-            begin
-              preserved_content.is_a?(String) ? JSON.parse(preserved_content) : preserved_content
-            rescue JSON::ParserError => e
-              Rails.logger.error "Failed to parse preserved content: #{e.message}"
-              post.content
-            end
+          # Return empty structure if no content
+          json_content = if content.blank?
+            {blocks: []}.to_json
+          # If content is already JSON string, use it
+          elsif content.is_a?(String) && valid_json?(content)
+            content
+          # If it's a hash, convert to JSON
+          elsif content.is_a?(Hash)
+            content.to_json
+          # Default to empty structure
           else
-            post.content
+            {blocks: []}.to_json
           end
 
-          Rails.logger.debug "Using content: #{content.inspect}"
+          # Base64 encode the JSON content
+          Base64.strict_encode64(json_content)
+        end
 
-          # Ensure we have a valid editor content structure
-          content = if content.blank? || !content.is_a?(Hash) || !content.key?("blocks")
-            Rails.logger.debug "Creating new editor content structure"
-            {
-              time: Time.now.to_i * 1000,
-              blocks: [],
-              version: "2.28.2"
-            }
-          else
-            # Ensure we have all required fields
-            Rails.logger.debug "Ensuring required fields are present"
-            content["time"] ||= Time.now.to_i * 1000
-            content["version"] ||= "2.28.2"
-            content["blocks"] ||= []
-            content
-          end
+        private
 
-          json = content.to_json
-          Rails.logger.debug "Returning JSON: #{json}"
-          json
+        def valid_json?(string)
+          JSON.parse(string)
+          true
+        rescue JSON::ParserError
+          false
         end
       end
     end

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

@@ -0,0 +1,32 @@
+module Panda
+  module CMS
+    module PostsHelper
+      def display_post_path(post)
+        # Unescape the path for display purposes
+        CGI.unescape(post.slug)
+      end
+
+      def posts_months_menu
+        Rails.cache.fetch("panda_cms_posts_months_menu", expires_in: 1.hour) do
+          Panda::CMS::Post
+            .where(status: :active)
+            .select(
+              Arel.sql("DATE_TRUNC('month', published_at) as month"),
+              Arel.sql("COUNT(*) as post_count")
+            )
+            .group(Arel.sql("DATE_TRUNC('month', published_at)"))
+            .order(Arel.sql("DATE_TRUNC('month', published_at) DESC"))
+            .map do |result|
+              date = result.month
+              {
+                year: date.strftime("%Y"),
+                month: date.strftime("%m"),
+                month_name: "#{date.strftime("%B")} #{date.year}",
+                post_count: result.post_count
+              }
+            end
+        end
+      end
+    end
+  end
+end

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

@@ -2,6 +2,5 @@ import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
   connect() {
-    console.log("Hello from Dashboard")
   }
 }

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

@@ -1,4 +1,6 @@
 import { Controller } from "@hotwired/stimulus";
+import { EDITOR_JS_RESOURCES, EDITOR_JS_CSS } from "panda/cms/editor/editor_js_config";
+import { ResourceLoader } from "panda/cms/editor/resource_loader";
 
 export default class extends Controller {
   static targets = ["editorContainer", "hiddenField"];
@@ -7,7 +9,27 @@ export default class extends Controller {
   };
 
   connect() {
-    this.initializeEditor();
+    this.loadEditorResources();
+  }
+
+  async loadEditorResources() {
+    try {
+      // First load EditorJS core
+      const editorCore = EDITOR_JS_RESOURCES[0];
+      await ResourceLoader.loadScript(document, document.head, editorCore);
+
+      // Load CSS
+      await ResourceLoader.embedCSS(document, document.head, EDITOR_JS_CSS);
+
+      // Then load all tools sequentially
+      for (const resource of EDITOR_JS_RESOURCES.slice(1)) {
+        await ResourceLoader.loadScript(document, document.head, resource);
+      }
+
+      await this.initializeEditor();
+    } catch (error) {
+      console.error("[Panda CMS] Failed to load editor resources:", error);
+    }
   }
 
   async initializeEditor() {
@@ -26,13 +48,15 @@ export default class extends Controller {
       const { getEditorConfig } = await import(
         "panda/cms/editor/editor_js_config"
       );
-      const config = getEditorConfig(holderId, this.getInitialContent());
 
-      editor_content_post;
+      // Get initial content before creating config
+      const initialContent = this.getInitialContent();
+      console.debug("[Panda CMS] Using initial content:", initialContent);
 
-      this.editor = new EditorJS({
-        ...config,
+      const config = {
+        ...getEditorConfig(holderId, initialContent),
         holder: holderId,
+        data: initialContent,
         autofocus: false,
         minHeight: 1,
         logLevel: "ERROR",
@@ -40,26 +64,125 @@ export default class extends Controller {
           if (!this.editor) return;
           this.editor.save().then((outputData) => {
             outputData.source = "editorJS";
-            this.hiddenFieldTarget.value = JSON.stringify(outputData);
+            const jsonString = JSON.stringify(outputData);
+            // Store both base64 and regular JSON
+            this.editorContainerTarget.dataset.editablePreviousData = btoa(jsonString);
+            this.editorContainerTarget.dataset.editableContent = jsonString;
+            this.hiddenFieldTarget.value = jsonString;
           });
         },
-      });
+        onReady: () => {
+          console.debug("[Panda CMS] Editor ready with content:", initialContent);
+          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"));
+        },
+        tools: {
+          paragraph: {
+            class: window.Paragraph,
+            inlineToolbar: true
+          },
+          header: {
+            class: window.Header,
+            inlineToolbar: true
+          },
+          list: {
+            class: window.NestedList,
+            inlineToolbar: true,
+            config: {
+              defaultStyle: 'unordered',
+              enableLineBreaks: true
+            }
+          },
+          quote: {
+            class: window.Quote,
+            inlineToolbar: true
+          },
+          table: {
+            class: window.Table,
+            inlineToolbar: true
+          }
+        }
+      };
+
+      // Ensure EditorJS is available
+      const EditorJS = window.EditorJS;
+      if (!EditorJS) {
+        throw new Error("EditorJS not loaded");
+      }
+
+      this.editor = new EditorJS(config);
+
+      // 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);
+      this.editorContainerTarget.dataset.editorInitialized = "false";
+      if (holderDiv) {
+        holderDiv.dataset.editorInitialized = "false";
+        holderDiv.classList.remove("editor-ready");
+      }
     }
   }
 
   getInitialContent() {
     try {
-      const value = this.hiddenFieldTarget.value;
-      if (value && value !== "{}") {
-        const data = JSON.parse(value);
-        if (data.blocks) return data;
+      const initialContent = this.hiddenFieldTarget.getAttribute("data-initial-content");
+      if (initialContent && initialContent !== "{}") {
+        try {
+          // First try to decode as base64
+          try {
+            const decodedData = atob(initialContent);
+            const data = JSON.parse(decodedData);
+            if (data.blocks) return data;
+          } catch (e) {
+            // If base64 decode fails, try direct JSON parse
+            const data = JSON.parse(initialContent);
+            if (data.blocks) return data;
+          }
+        } catch (e) {
+          console.error("[Panda CMS] Failed to parse content:", e);
+        }
+      }
+
+      // Try to get content from the editor container's data attributes
+      const previousData = this.editorContainerTarget.dataset.editablePreviousData;
+      const editorContent = this.editorContainerTarget.dataset.editableContent;
+
+      if (previousData) {
+        try {
+          const decodedData = atob(previousData);
+          const data = JSON.parse(decodedData);
+          if (data.blocks) return data;
+        } catch (e) {
+          console.debug("[Panda CMS] Failed to parse base64 data:", e);
+        }
+      }
+
+      if (editorContent && editorContent !== "{}") {
+        try {
+          const data = JSON.parse(editorContent);
+          if (data.blocks) return data;
+        } catch (e) {
+          console.debug("[Panda CMS] Failed to parse editor content:", e);
+        }
       }
     } catch (e) {
       console.warn("[Panda CMS] Could not parse initial content:", e);
     }
 
+    // Return default content if nothing else works
     return {
       time: Date.now(),
       blocks: [{ type: "paragraph", data: { text: "" } }],