panda-cms 0.7.0 → 0.7.2

data/app/javascript/panda/cms/editor/rich_text_editor.js

@@ -0,0 +1,162 @@
+import EditorJS from "@editorjs/editorjs"
+import Paragraph from "@editorjs/paragraph"
+import Header from "@editorjs/header"
+import List from "@editorjs/list"
+import Quote from "@editorjs/quote"
+import Table from "@editorjs/table"
+import NestedList from "@editorjs/nested-list"
+
+export default class RichTextEditor {
+  constructor(element, iframe) {
+    this.element = element
+    this.iframe = iframe
+    this.editor = null
+    this.initialized = false
+    this.initialize()
+  }
+
+  async initialize() {
+    if (this.initialized) return
+    console.debug("[Panda CMS] Initializing EditorJS")
+
+    try {
+      let content = this.element.dataset.editableContent || ""
+      let previousData = this.element.dataset.editablePreviousData || ""
+      console.debug("[Panda CMS] Initial content:", content)
+      console.debug("[Panda CMS] Previous data:", previousData)
+
+      let parsedContent
+      if (previousData) {
+        try {
+          // Try to decode base64 first
+          const decodedData = atob(previousData)
+          console.debug("[Panda CMS] Decoded base64 data:", decodedData)
+          parsedContent = JSON.parse(decodedData)
+          console.debug("[Panda CMS] Successfully parsed base64 data:", parsedContent)
+        } catch (e) {
+          console.debug("[Panda CMS] Not base64 encoded or invalid, trying direct JSON parse:", e)
+          try {
+            parsedContent = JSON.parse(previousData)
+            console.debug("[Panda CMS] Successfully parsed JSON data:", parsedContent)
+          } catch (e2) {
+            console.error("[Panda CMS] Failed to parse previous data:", e2)
+            parsedContent = this.getDefaultContent()
+          }
+        }
+      } else if (content) {
+        try {
+          parsedContent = JSON.parse(content)
+          console.debug("[Panda CMS] Successfully parsed content:", parsedContent)
+        } catch (e) {
+          console.error("[Panda CMS] Failed to parse content:", e)
+          parsedContent = this.getDefaultContent()
+        }
+      } else {
+        parsedContent = this.getDefaultContent()
+      }
+
+      // Create holder element before initialization
+      const holderId = `editor-${Math.random().toString(36).substr(2, 9)}`
+      const holderElement = document.createElement("div")
+      holderElement.id = holderId
+      holderElement.className = "editor-js-holder codex-editor"
+
+      // Clear any existing content and append holder
+      this.element.textContent = ""
+      this.element.appendChild(holderElement)
+
+      // Initialize EditorJS
+      this.editor = new EditorJS({
+        holder: holderId,
+        data: parsedContent,
+        placeholder: "Click to start writing...",
+        tools: {
+          paragraph: {
+            class: Paragraph,
+            inlineToolbar: true
+          },
+          header: {
+            class: Header,
+            inlineToolbar: true
+          },
+          list: {
+            class: NestedList,
+            inlineToolbar: true,
+            config: {
+              defaultStyle: 'unordered',
+              enableLineBreaks: true
+            }
+          },
+          quote: {
+            class: Quote,
+            inlineToolbar: true
+          },
+          table: {
+            class: Table,
+            inlineToolbar: true
+          }
+        },
+        onChange: () => {
+          this.save()
+        }
+      })
+
+      await this.editor.isReady
+      this.initialized = true
+      console.debug("[Panda CMS] EditorJS initialized successfully")
+    } catch (error) {
+      console.error("[Panda CMS] Error initializing EditorJS:", error)
+    }
+  }
+
+  getDefaultContent() {
+    return {
+      time: Date.now(),
+      blocks: [
+        {
+          type: "paragraph",
+          data: {
+            text: ""
+          }
+        }
+      ],
+      version: "2.28.2"
+    }
+  }
+
+  async save() {
+    if (!this.editor) return null
+
+    try {
+      const savedData = await this.editor.save()
+      const jsonString = JSON.stringify(savedData)
+      // Store both base64 and regular JSON
+      this.element.dataset.editablePreviousData = btoa(jsonString)
+      this.element.dataset.editableContent = jsonString
+      return jsonString
+    } catch (error) {
+      console.error("[Panda CMS] Error saving EditorJS content:", error)
+      return null
+    }
+  }
+
+  async clear() {
+    if (!this.editor) return
+
+    try {
+      await this.editor.clear()
+      this.element.dataset.editablePreviousData = ""
+      this.element.dataset.editableContent = ""
+    } catch (error) {
+      console.error("[Panda CMS] Error clearing EditorJS content:", error)
+    }
+  }
+
+  destroy() {
+    if (this.editor) {
+      this.editor.destroy()
+      this.editor = null
+      this.initialized = false
+    }
+  }
+}

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

@@ -67,6 +67,7 @@ module Panda
         generate_content_blocks
         update_existing_menu_items
         update_auto_menus
+        create_redirect_if_path_changed
       end
 
       def generate_content_blocks
@@ -91,6 +92,23 @@ module Panda
       def update_existing_menu_items
         menu_items.where.not(text: title).update_all(text: title)
       end
+
+      def create_redirect_if_path_changed
+        return unless saved_change_to_path?
+
+        old_path = saved_changes["path"].first
+        new_path = saved_changes["path"].last
+
+        # Create a redirect from the old path to the new path
+        Panda::CMS::Redirect.create!(
+          origin_panda_cms_page_id: id,
+          destination_panda_cms_page_id: id,
+          status_code: 301,
+          visits: 0,
+          origin_path: old_path,
+          destination_path: new_path
+        )
+      end
     end
   end
 end

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

@@ -5,6 +5,9 @@ module Panda
     class Post < ApplicationRecord
       include ::Panda::CMS::EditorJsContent
 
+      after_commit :clear_menu_cache
+      before_validation :format_slug
+
       self.table_name = "panda_cms_posts"
 
       has_paper_trail versions: {
@@ -12,18 +15,20 @@ module Panda
       }
 
       belongs_to :user, class_name: "Panda::CMS::User"
+      belongs_to :author, class_name: "Panda::CMS::User"
 
       validates :title, presence: true
       validates :slug,
         presence: true,
         uniqueness: true,
         format: {
-          with: /\A\/[a-z0-9-]+\z/,
-          message: "must start with a forward slash and contain only lowercase letters, numbers, and hyphens"
+          with: %r{\A(/\d{4}/\d{2}/[a-z0-9-]+|/[a-z0-9-]+)\z},
+          message: "must be in format /YYYY/MM/slug or /slug with only lowercase letters, numbers, and hyphens"
         }
 
       scope :ordered, -> { order(published_at: :desc) }
       scope :with_user, -> { includes(:user) }
+      scope :with_author, -> { includes(:author) }
 
       enum :status, {
         active: "active",
@@ -33,7 +38,31 @@ module Panda
       }
 
       def to_param
-        slug.delete_prefix("/")
+        # For date-based URLs, return just the slug portion
+        parts = CGI.unescape(slug).delete_prefix("/").split("/")
+        if parts.length == 3 # year/month/slug format
+          parts.last
+        else
+          parts.first
+        end
+      end
+
+      def year
+        return nil unless slug.match?(%r{\A/\d{4}/})
+        slug.split("/")[1]
+      end
+
+      def month
+        return nil unless slug.match?(%r{\A/\d{4}/\d{2}/})
+        slug.split("/")[2]
+      end
+
+      def route_params
+        if year && month
+          {year: year, month: month, slug: to_param}
+        else
+          {slug: to_param}
+        end
       end
 
       def admin_param
@@ -55,6 +84,35 @@ module Panda
         text = text.squish if squish
         text.truncate(length).html_safe
       end
+
+      private
+
+      def clear_menu_cache
+        Rails.cache.delete("panda_cms_news_months")
+      end
+
+      def format_slug
+        return if slug.blank?
+
+        # Remove any leading/trailing slashes and decode
+        self.slug = CGI.unescape(slug.strip.gsub(%r{^/+|/+$}, ""))
+
+        # Handle the case where we already have a properly formatted slug
+        if slug.match?(%r{\A\d{4}/\d{2}/[^/]+\z})
+          return self.slug = "/#{slug}"
+        end
+
+        # Handle the case where we have a date-prefixed slug (from JS)
+        if (match = slug.match(%r{\A(\d{4})-(\d{2})-(.+)\z}))
+          year, month, base_slug = match[1], match[2], match[3]
+          return self.slug = "/#{year}/#{month}/#{base_slug}"
+        end
+
+        # For new slugs without any date structure
+        base_slug = slug.downcase.gsub(/[^a-z0-9-]+/, "-").gsub(/^-+|-+$/, "")
+        date_prefix = published_at.present? ? published_at.strftime("%Y/%m") : Time.current.strftime("%Y/%m")
+        self.slug = "/#{date_prefix}/#{base_slug}"
+      end
     end
   end
 end

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

@@ -1,8 +1,8 @@
 module Panda
   module CMS
     class Redirect < ApplicationRecord
-      belongs_to :origin_page, class_name: "Panda::CMS::Page", foreign_key: :origin_panda_cms_page_id
-      belongs_to :destination_page, class_name: "Panda::CMS::Page", foreign_key: :destination_panda_cms_page_id
+      belongs_to :origin_page, class_name: "Panda::CMS::Page", foreign_key: :origin_panda_cms_page_id, optional: true
+      belongs_to :destination_page, class_name: "Panda::CMS::Page", foreign_key: :destination_panda_cms_page_id, optional: true
 
       validates :status_code, presence: true
       validates :visits, presence: true

data/app/views/panda/cms/admin/posts/_form.html.erb

@@ -1,7 +1,18 @@
 <%= panda_cms_form_with model: post, url: url, method: post.persisted? ? :put : :post do |f| %>
-  <%= f.text_field :title, class: "block w-full rounded-md border-0 p-2 text-gray-900 ring-1 ring-inset ring-mid placeholder:text-gray-300 focus:ring-1 focus:ring-inset focus:ring-dark sm:leading-6 hover:pointer" %>
-  <%= f.text_field :slug, class: "block w-full rounded-md border-0 p-2 text-gray-900 ring-1 ring-inset ring-mid placeholder:text-gray-300 focus:ring-1 focus:ring-inset focus:ring-dark sm:leading-6 hover:pointer" %>
-  <%= f.select :user_id, Panda::CMS::User.admin.map { |u| [u.name, u.id] }, {}, class: "block w-full rounded-md border-0 py-1.5 pl-3 pr-10 text-gray-900 ring-1 ring-inset ring-mid focus:ring-1 focus:ring-inset focus:ring-dark sm:leading-6 hover:pointer" %>
+  <div data-controller="slug" data-slug-add-date-prefix-value="true">
+    <%= f.text_field :title,
+        class: "block w-full rounded-md border-0 p-2 text-gray-900 ring-1 ring-inset ring-mid placeholder:text-gray-300 focus:ring-1 focus:ring-inset focus:ring-dark sm:leading-6 hover:pointer",
+        data: {
+          "slug-target": "input_text",
+          action: "focusout->slug#generatePath"
+        } %>
+    <%= f.text_field :slug,
+        class: "block w-full rounded-md border-0 p-2 text-gray-900 ring-1 ring-inset ring-mid placeholder:text-gray-300 focus:ring-1 focus:ring-inset focus:ring-dark sm:leading-6 hover:pointer",
+        data: {
+          "slug-target": "output_text"
+        } %>
+  </div>
+  <%= f.select :author_id, Panda::CMS::User.admin.map { |u| [u.name, u.id] }, {}, class: "block w-full rounded-md border-0 py-1.5 pl-3 pr-10 text-gray-900 ring-1 ring-inset ring-mid focus:ring-1 focus:ring-inset focus:ring-dark sm:leading-6 hover:pointer" %>
   <%= f.datetime_field :published_at, class: "block w-full rounded-md border-0 p-2 text-gray-900 ring-1 ring-inset ring-mid placeholder:text-gray-300 focus:ring-1 focus:ring-inset focus:ring-dark sm:leading-6 hover:pointer" %>
   <%= f.select :status, options_for_select([["Active", "active"], ["Draft", "draft"], ["Hidden", "hidden"], ["Archived", "archived"]], selected: post.status), {}, class: "block w-full rounded-md border-0 py-1.5 pl-3 pr-10 text-gray-900 ring-1 ring-inset ring-mid focus:ring-1 focus:ring-inset focus:ring-dark sm:leading-6 hover:pointer" %>
 
@@ -16,7 +27,7 @@
         } %>
     <div id="<%= editor_id %>"
          data-editor-form-target="editorContainer"
-         class="max-w-full block ml-12 bg-white pt-1 mb-4 mt-2 border border-mid rounded-md min-h-[300px]">
+         class="max-w-full block bg-white pt-1 mb-4 mt-2 border border-mid rounded-md min-h-[300px]">
     </div>
   </div>
 

data/app/views/panda/cms/admin/posts/index.html.erb

@@ -5,13 +5,15 @@
 
   <%= render Panda::CMS::Admin::TableComponent.new(term: "post", rows: posts) do |table| %>
     <% table.column("Title") do |post| %>
-      <div class="">
+      <div>
         <%= link_to post.title, edit_admin_post_path(post.admin_param), class: "block h-full w-full" %>
-        <span class="block text-xs text-black/60"><%= post_path(post) %></span>
+        <span class="block text-xs text-black/60">
+          <%= CGI.unescape("#{Panda::CMS.config.posts[:prefix]}#{post.slug}") %>
+        </span>
       </div>
     <% end %>
     <% table.column("Status") { |post| render Panda::CMS::Admin::TagComponent.new(status: post.status) } %>
-    <% table.column("Published") { |post| render Panda::CMS::Admin::UserActivityComponent.new(at: post.published_at, user: post.user)} %>
+    <% table.column("Published") { |post| render Panda::CMS::Admin::UserActivityComponent.new(at: post.published_at, user: post.author)} %>
     <% table.column("Last Updated") { |post| render Panda::CMS::Admin::UserActivityComponent.new(whodunnit_to: post)} %>
   <% end %>
 

data/config/routes.rb

@@ -35,14 +35,42 @@ Panda::CMS::Engine.routes.draw do
   # OmniAuth additionally adds a GET route for "#{Panda::CMS.route_namespace}/auth/:provider" but doesn't name it
   delete Panda::CMS.route_namespace, to: "admin/sessions#destroy", as: :admin_logout
 
+  ### APPENDED ROUTES ###
+
+  # TODO: Allow multiple types of post in future
   if Panda::CMS.config.posts[:enabled]
-    # TODO: Allow multiple types of post in future
-    # TODO: This now requires a page to be created, make it explicit (with a rendering posts helper?)
-    # get Panda::CMS.posts[:prefix], to: "posts#index", as: :posts
-    get "#{Panda::CMS.config.posts[:prefix]}/:slug", to: "posts#show", as: :post
-  end
+    get Panda::CMS.config.posts[:prefix], to: "posts#index", as: :posts
 
-  ### APPENDED ROUTES ###
+    # Route for date-based URLs that won't encode slashes
+    get "#{Panda::CMS.config.posts[:prefix]}/:year/:month/:slug",
+      to: "posts#show",
+      as: :post_with_date,
+      constraints: {
+        year: /\d{4}/,
+        month: /\d{2}/,
+        slug: /[^\/]+/,
+        format: /html|json|xml/
+      }
+
+    # Route for non-date URLs
+    get "#{Panda::CMS.config.posts[:prefix]}/:slug",
+      to: "posts#show",
+      as: :post,
+      constraints: {
+        slug: /[^\/]+/,
+        format: /html|json|xml/
+      }
+
+    # Route for month archive
+    get "#{Panda::CMS.config.posts[:prefix]}/:year/:month",
+      to: "posts#by_month",
+      as: :posts_by_month,
+      constraints: {
+        year: /\d{4}/,
+        month: /\d{2}/,
+        format: /html|json|xml/
+      }
+  end
 
   # See lib/panda/cms/engine.rb
 end

data/db/migrate/20250106223303_add_author_id_to_panda_cms_posts.rb

@@ -0,0 +1,5 @@
+class AddAuthorIdToPandaCMSPosts < ActiveRecord::Migration[8.0]
+  def change
+    add_reference :panda_cms_posts, :author, type: :uuid, foreign_key: {to_table: :panda_cms_users}
+  end
+end

data/lib/panda/cms/editor_js_content.rb

@@ -12,10 +12,23 @@ module Panda::CMS::EditorJsContent
 
   def generate_cached_content
     if content.is_a?(String)
-      self.cached_content = content
+      begin
+        parsed_content = JSON.parse(content)
+        self.cached_content = if parsed_content.is_a?(Hash) && parsed_content["blocks"].present?
+          Panda::CMS::EditorJs::Renderer.new(parsed_content).render
+        else
+          content
+        end
+      rescue JSON::ParserError
+        # If it's not JSON, treat it as plain text
+        self.cached_content = content
+      end
     elsif content.is_a?(Hash) && content["blocks"].present?
       # Process EditorJS content
       self.cached_content = Panda::CMS::EditorJs::Renderer.new(content).render
+    else
+      # For any other case, store as is
+      self.cached_content = content.to_s
     end
   end
 end

data/lib/panda/cms/engine.rb

@@ -3,8 +3,12 @@ require "turbo-rails"
 require "stimulus-rails"
 require "view_component"
 
+require "panda/core"
 require "panda/cms/railtie"
 
+require "omniauth"
+require "omniauth/rails_csrf_protection"
+
 module Panda
   module CMS
     class Engine < ::Rails::Engine

data/lib/panda-cms/version.rb

@@ -1,5 +1,5 @@
 module Panda
   module CMS
-    VERSION = "0.7.0"
+    VERSION = "0.7.2"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: panda-cms
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Panda Software Limited
 bindir: bin
 cert_chain: []
-date: 2025-01-02 00:00:00.000000000 Z
+date: 2025-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: panda-core
@@ -452,6 +452,7 @@ files:
 - app/helpers/panda/cms/admin/posts_helper.rb
 - app/helpers/panda/cms/application_helper.rb
 - app/helpers/panda/cms/pages_helper.rb
+- app/helpers/panda/cms/posts_helper.rb
 - app/helpers/panda/cms/theme_helper.rb
 - app/javascript/panda/cms/@editorjs--editorjs.js
 - app/javascript/panda/cms/@hotwired--stimulus.js
@@ -468,6 +469,7 @@ files:
 - app/javascript/panda/cms/editor/editor_js_initializer.js
 - app/javascript/panda/cms/editor/plain_text_editor.js
 - app/javascript/panda/cms/editor/resource_loader.js
+- app/javascript/panda/cms/editor/rich_text_editor.js
 - app/javascript/panda/cms/tailwindcss-stimulus-components.js
 - app/jobs/panda/cms/application_job.rb
 - app/jobs/panda/cms/record_visit_job.rb
@@ -581,6 +583,7 @@ files:
 - db/migrate/20241120110943_add_editor_js_to_posts.rb
 - db/migrate/20241120113859_add_cached_content_to_panda_cms_posts.rb
 - db/migrate/20241123234140_remove_post_tag_id_from_posts.rb
+- db/migrate/20250106223303_add_author_id_to_panda_cms_posts.rb
 - db/migrate/migrate
 - db/seeds.rb
 - lib/generators/panda/cms/install_generator.rb