ruby_cms 0.1.9 → 0.2.0

data/app/controllers/ruby_cms/admin/content_block_versions_controller.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module RubyCms
+  module Admin
+    class ContentBlockVersionsController < BaseController
+      before_action { require_permission!(:manage_content_blocks) }
+      before_action :set_content_block
+      before_action :set_version, only: %i[show rollback]
+
+      def index
+        @versions = @content_block.versions.reverse_chronologically.preloaded
+
+        respond_to do |format|
+          format.html
+          format.json { render json: versions_json }
+        end
+      end
+
+      def show
+        @previous_version = @version.previous
+      end
+
+      def rollback
+        @content_block.rollback_to_version!(@version, user: current_user_cms)
+        redirect_to ruby_cms_admin_content_block_versions_path(@content_block),
+                    notice: "Teruggedraaid naar versie #{@version.version_number}"
+      end
+
+      private
+
+      def set_content_block
+        @content_block = ContentBlock.find(params[:content_block_id])
+      end
+
+      def set_version
+        @version = @content_block.versions.find(params[:id])
+      end
+
+      def versions_json
+        @versions.map do |v|
+          {
+            id: v.id,
+            version_number: v.version_number,
+            event: v.event,
+            user: display_user(v.user),
+            created_at: v.created_at.strftime("%B %d, %Y at %I:%M %p"),
+            metadata: v.metadata
+          }
+        end
+      end
+
+      def display_user(user)
+        return "System" if user.blank?
+
+        %i[email_address email username name].each do |attr|
+          return user.public_send(attr) if user.respond_to?(attr) && user.public_send(attr).present?
+        end
+        user.respond_to?(:id) ? "User ##{user.id}" : "System"
+      end
+    end
+  end
+end

data/app/controllers/ruby_cms/admin/dashboard_controller.rb

@@ -3,13 +3,53 @@
 module RubyCms
   module Admin
     class DashboardController < BaseController
+      # First main row: quick actions, recent errors, analytics (fixed keys). Remaining :main blocks render below (host/custom).
+      PRIMARY_MAIN_ROW_KEYS = %i[quick_actions recent_errors analytics_overview].freeze
+
       def index
         assign_counts
         assign_recent_activity
+        assign_analytics_overview_stats
+        assign_dashboard_blocks
       end
 
       private
 
+      def assign_analytics_overview_stats
+        start_date = 7.days.ago.beginning_of_day
+        end_date = Time.current.end_of_day
+        @dashboard_analytics_stats = RubyCms::Analytics::Report.new(start_date:, end_date:).dashboard_stats
+      rescue StandardError => e
+        Rails.logger.warn("[RubyCMS] Dashboard analytics snapshot: #{e.class}: #{e.message}")
+        @dashboard_analytics_stats = nil
+      end
+
+      def assign_dashboard_blocks
+        visible = RubyCms.visible_dashboard_blocks(user: current_user_cms)
+        @stats_blocks = visible
+                        .select {|b| b[:section] == :stats }
+                        .map {|b| prepare_dashboard_block(b) }
+        main = visible
+               .select {|b| b[:section] == :main }
+               .map {|b| prepare_dashboard_block(b) }
+        @primary_main_blocks = PRIMARY_MAIN_ROW_KEYS.filter_map {|k| main.find {|b| b[:key] == k } }
+        @extra_main_blocks = main
+                             .reject {|b| PRIMARY_MAIN_ROW_KEYS.include?(b[:key]) }
+                             .sort_by {|b| [b[:order], b[:label].to_s] }
+      end
+
+      def prepare_dashboard_block(block)
+        from_data =
+          if block[:data].respond_to?(:call)
+            block[:data].call(self)
+          else
+            {}
+          end
+        from_data = {} unless from_data.kind_of?(Hash)
+
+        block.merge(locals: { dashboard_block: block }.merge(from_data))
+      end
+
       def assign_counts
         @content_blocks_count = ::ContentBlock.count
         @content_blocks_published_count = ::ContentBlock.published.count

data/app/helpers/ruby_cms/admin/dashboard_helper.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module RubyCms
+  module Admin
+    module DashboardHelper
+      # Renders a dashboard block from the registry (+ :locals from the controller).
+      def render_dashboard_block(block)
+        locals = block[:locals]
+        locals = {} if locals.nil?
+        if block[:partial].present?
+          render partial: block[:partial], locals: locals
+        elsif block[:render].respond_to?(:call)
+          block[:render].call(self, locals)
+        else
+          ""
+        end
+      end
+    end
+  end
+end

data/app/javascript/controllers/ruby_cms/content_block_history_controller.js

@@ -0,0 +1,91 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+    static targets = ["panel", "list"]
+    static values = {
+        contentBlockId: Number
+    }
+
+    connect() {
+        this.isOpen = false
+    }
+
+    async toggle() {
+        if (this.isOpen) {
+            this.close()
+        } else {
+            await this.open()
+        }
+    }
+
+    async open() {
+        if (!this.contentBlockIdValue) return
+
+        try {
+            const response = await fetch(
+                `/admin/content_blocks/${this.contentBlockIdValue}/versions.json`,
+                { headers: { "Accept": "application/json" } }
+            )
+            if (!response.ok) throw new Error("Failed to fetch versions")
+
+            const versions = await response.json()
+            this.renderVersions(versions)
+            this.panelTarget.classList.remove("hidden")
+            this.isOpen = true
+        } catch (error) {
+            console.error("Error loading version history:", error)
+        }
+    }
+
+    close() {
+        this.panelTarget.classList.add("hidden")
+        this.isOpen = false
+    }
+
+    renderVersions(versions) {
+        if (!versions.length) {
+            this.listTarget.innerHTML = '<p class="text-sm text-muted-foreground p-3">Geen versies gevonden.</p>'
+            return
+        }
+
+        this.listTarget.innerHTML = versions.map(v => `
+      <div class="flex items-center justify-between p-3 border-b border-border/40 last:border-0">
+        <div>
+          <span class="text-xs font-medium">v${v.version_number}</span>
+          <span class="text-xs text-muted-foreground ml-1">${v.event}</span>
+          <span class="text-xs text-muted-foreground ml-2">${v.user}</span>
+          <span class="text-xs text-muted-foreground ml-2">${v.created_at}</span>
+        </div>
+        <button data-action="click->ruby-cms--content-block-history#rollback"
+                data-version-id="${v.id}"
+                class="text-xs text-primary hover:underline">
+          Herstel
+        </button>
+      </div>
+    `).join("")
+    }
+
+    async rollback(event) {
+        const versionId = event.currentTarget.dataset.versionId
+        if (!confirm("Weet je zeker dat je deze versie wilt herstellen?")) return
+
+        try {
+            const response = await fetch(
+                `/admin/content_blocks/${this.contentBlockIdValue}/versions/${versionId}/rollback`,
+                {
+                    method: "POST",
+                    headers: {
+                        "X-CSRF-Token": document.querySelector('meta[name="csrf-token"]').content,
+                        "Accept": "application/json"
+                    }
+                }
+            )
+            if (!response.ok) throw new Error("Rollback failed")
+
+            window.location.reload()
+        } catch (error) {
+            console.error("Rollback error:", error)
+            alert("Rollback mislukt")
+        }
+    }
+}

data/app/javascript/controllers/ruby_cms/index.js

@@ -11,6 +11,8 @@ import LocaleTabsController from "ruby_cms/locale_tabs_controller";
 import ClickableRowController from "ruby_cms/clickable_row_controller";
 import AutoSavePreferenceController from "ruby_cms/auto_save_preference_controller";
 import NavOrderSortableController from "ruby_cms/nav_order_sortable_controller";
+import ContentBlockHistoryController from "ruby_cms/content_block_history_controller";
+
 
 export {
   VisualEditorController,
@@ -23,6 +25,7 @@ export {
   ClickableRowController,
   AutoSavePreferenceController,
   NavOrderSortableController,
+  ContentBlockHistoryController,
 };
 
 // Helper function to register all RubyCms controllers with a Stimulus application
@@ -37,6 +40,7 @@ export function registerRubyCmsControllers(application) {
   );
   application.register("ruby-cms--toggle", ToggleController);
   application.register("ruby-cms--locale-tabs", LocaleTabsController);
+  application.register("ruby-cms--content-block-history", ContentBlockHistoryController);
   application.register("clickable-row", ClickableRowController);
   application.register(
     "ruby-cms--auto-save-preference",

data/app/javascript/controllers/ruby_cms/visual_editor_controller.js

@@ -17,7 +17,7 @@ export default class extends Controller {
     "toast",
     "toastMessage"
   ]
-  
+
   static values = {
     currentPage: String
   }
@@ -25,16 +25,17 @@ export default class extends Controller {
   connect() {
     this.currentContentBlockKey = null
     this.currentContentBlockLocale = null
+    this.currentContentBlockId = null
     this.currentBlockIndex = 0
     this.editMode = false
 
     // Listen for messages from iframe
     this.boundHandleMessage = this.handleMessage.bind(this)
     window.addEventListener("message", this.boundHandleMessage)
-    
+
     // Listen for Escape key globally when modal is open
     this.boundHandleEscape = this.handleEscape.bind(this)
-    
+
     // Listen for iframe load
     this.previewFrameTarget.addEventListener("load", () => {
       console.log("Preview frame loaded")
@@ -51,9 +52,9 @@ export default class extends Controller {
   handleMessage(event) {
     // Only accept same-origin messages (iframe preview is same app)
     if (event.origin !== window.location.origin) return
-    
+
     const { type, blockId, blockIndex, page } = event.data
-    
+
     if (type === "CONTENT_BLOCK_CLICKED") {
       this.openBlockEditor(blockId, blockIndex)
     }
@@ -75,11 +76,13 @@ export default class extends Controller {
       const currentLocale = this.getCurrentLocale()
       // Prefer block matching key and current locale; else first block with same key
       const block = blocks.find(b => b.key === blockKey && (b.locale === currentLocale || !b.locale)) ||
-                    blocks.find(b => b.key === blockKey) ||
-                    (blocks[blockIndex]?.key === blockKey ? blocks[blockIndex] : null) ||
-                    {}
+        blocks.find(b => b.key === blockKey) ||
+        (blocks[blockIndex]?.key === blockKey ? blocks[blockIndex] : null) ||
+        {}
 
       this.currentContentBlockLocale = block.locale || currentLocale
+      this.currentContentBlockId = block.id || null
+      this.dispatch("block-loaded", { detail: { blockId: block.id } })
 
       const contentType = String(block.content_type || "text").toLowerCase()
       this.contentTypeTarget.value = contentType
@@ -139,12 +142,13 @@ export default class extends Controller {
     this.modalTarget.classList.add("hidden")
     this.currentContentBlockKey = null
     this.currentContentBlockLocale = null
+    this.currentContentBlockId = null
     this.currentBlockIndex = 0
 
     document.removeEventListener("keydown", this.boundHandleEscape)
     this.sendMessageToPreview({ type: "CLEAR_HIGHLIGHT" })
   }
-  
+
   handleEscape(event) {
     // Only handle Escape if modal is visible
     if (event.key === "Escape" && !this.modalTarget.classList.contains("hidden")) {
@@ -156,7 +160,7 @@ export default class extends Controller {
 
   changeContentType() {
     const contentType = this.contentTypeTarget.value
-    
+
     if (contentType === "rich_text") {
       this.textContainerTarget.style.display = "none"
       this.richTextContainerTarget.classList.add("ruby_cms-visual-editor-modal__rich-text-container--visible")
@@ -164,14 +168,14 @@ export default class extends Controller {
       this.textContainerTarget.style.display = "block"
       this.richTextContainerTarget.classList.remove("ruby_cms-visual-editor-modal__rich-text-container--visible")
     }
-    
+
     this.updateCharCount()
   }
 
   updateCharCount() {
     const contentType = this.contentTypeTarget.value
     let content = ""
-    
+
     if (contentType === "rich_text") {
       const editor = this.richTextContainerTarget.querySelector("trix-editor")
       if (editor && editor.editor) {
@@ -180,33 +184,33 @@ export default class extends Controller {
     } else {
       content = this.contentInputTarget.value
     }
-    
+
     this.charCountTarget.textContent = `${content.length} characters`
   }
 
   async saveContent(event) {
     event.preventDefault()
-    
+
     if (!this.currentContentBlockKey) return
-    
+
     const contentType = this.contentTypeTarget.value
     const payload = {
       key: this.currentContentBlockKey,
       content_type: contentType,
       locale: this.currentContentBlockLocale || null
     }
-    
+
     if (contentType === "rich_text") {
       const editor = this.richTextContainerTarget.querySelector("trix-editor")
       payload.rich_content = editor ? editor.value : ""
     } else {
       payload.content = this.contentInputTarget.value
     }
-    
+
     try {
       this.saveButtonTarget.disabled = true
       this.saveButtonTarget.textContent = "Saving..."
-      
+
       const response = await fetch("/admin/visual_editor/quick_update", {
         method: "PATCH",
         headers: {
@@ -216,16 +220,16 @@ export default class extends Controller {
         },
         body: JSON.stringify(payload)
       })
-      
+
       const data = await response.json()
-      
+
       if (!response.ok || !data.success) {
         throw new Error(data.message || "Failed to save")
       }
-      
+
       // Update last updated time
       this.lastUpdatedTarget.textContent = data.updated_at
-      
+
       // Update content in preview (same message format as app so page_preview_controller works)
       const contentToDisplay = contentType === "rich_text"
         ? (data.rich_content_html || data.content || "")
@@ -237,13 +241,13 @@ export default class extends Controller {
         content: contentToDisplay,
         blockIndex: this.currentBlockIndex ?? 0
       })
-      
+
       // Close modal
       this.closeModal()
-      
+
       // Show success toast
       this.showToast(data.message || "Content updated successfully")
-      
+
     } catch (error) {
       console.error("Error saving content:", error)
       alert(error.message || "Failed to save content")
@@ -258,12 +262,12 @@ export default class extends Controller {
     if (event.key === "Enter") {
       const isTextarea = event.target.matches("textarea")
       const isTrixEditor = event.target.matches("trix-editor") || event.target.closest("trix-editor")
-      
+
       // Allow Shift+Enter for newlines in textareas/trix
       if ((isTextarea || isTrixEditor) && event.shiftKey) {
         return // Let the default behavior happen (newline)
       }
-      
+
       // Enter without Shift submits the form
       if (!isTextarea && !isTrixEditor) {
         // Enter outside textarea/trix submits
@@ -275,7 +279,7 @@ export default class extends Controller {
         this.saveContent(event)
       }
     }
-    
+
     // Ctrl/Cmd + Enter to save (alternative shortcut)
     if ((event.ctrlKey || event.metaKey) && event.key === "Enter") {
       event.preventDefault()
@@ -298,7 +302,7 @@ export default class extends Controller {
   showToast(message) {
     this.toastMessageTarget.textContent = message
     this.toastTarget.classList.remove("hidden")
-    
+
     setTimeout(() => {
       this.toastTarget.classList.add("hidden")
     }, 3000)

data/app/models/concerns/content_block/versionable.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+module ContentBlock::Versionable # rubocop:disable Style/ClassAndModuleChildren
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :versions, class_name: "ContentBlockVersion",
+                        dependent: :destroy
+    after_create :create_initial_version
+    after_update :create_update_version, if: :content_changed_meaningfully?
+
+    attr_accessor :_rollback_in_progress
+  end
+
+  def rollback_to_version!(version, user: nil)
+    transaction do
+      self._rollback_in_progress = true
+      assign_attributes(
+        title: version.title,
+        content: version.content,
+        content_type: version.content_type,
+        published: version.published
+      )
+      restore_rich_content(version) if version.rich_content_html.present?
+      self.updated_by = user if user
+      save!
+    end
+  ensure
+    self._rollback_in_progress = false
+  end
+
+  def current_version_number
+    versions.maximum(:version_number) || 0
+  end
+
+  private
+
+  def content_changed_meaningfully?
+    saved_change_to_title? || saved_change_to_content? ||
+      saved_change_to_content_type? || saved_change_to_published?
+  end
+
+  def create_initial_version
+    create_version_record(event: "create")
+  end
+
+  def create_update_version
+    create_version_record(event: determine_event)
+  end
+
+  def determine_event
+    return "rollback" if _rollback_in_progress
+    return "publish" if saved_change_to_published? && published?
+    return "unpublish" if saved_change_to_published? && !published?
+
+    "update"
+  end
+
+  def create_version_record(event:)
+    rich_html = (rich_content.body&.to_html.to_s if respond_to?(:rich_content) && rich_content.respond_to?(:body))
+
+    versions.create!(
+      user: updated_by,
+      version_number: current_version_number + 1,
+      title: title,
+      content: content,
+      rich_content_html: rich_html,
+      content_type: content_type,
+      published: published?,
+      event: event,
+      metadata: { changed_fields: previous_changes.keys }
+    )
+  end
+
+  def restore_rich_content(version)
+    return unless respond_to?(:rich_content=) && version.rich_content_html.present?
+
+    self.rich_content = version.rich_content_html
+  end
+end

data/app/models/content_block.rb

@@ -4,6 +4,7 @@
 class ContentBlock < ApplicationRecord
   include Publishable
   include Searchable
+  include Versionable
 
   self.table_name = "content_blocks"
 

data/app/models/content_block_version.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class ContentBlockVersion < ApplicationRecord
+  belongs_to :content_block
+  belongs_to :user, optional: true
+
+  EVENTS = %w[create update rollback publish unpublish visual_editor].freeze
+
+  validates :version_number, presence: true,
+                             uniqueness: { scope: :content_block_id }
+  validates :event, inclusion: { in: EVENTS }
+
+  scope :chronologically, -> { order(version_number: :asc) }
+  scope :reverse_chronologically, -> { order(version_number: :desc) }
+  scope :preloaded, -> { includes(:user) }
+
+  def diff_from(other)
+    fields = %i[title content rich_content_html content_type published]
+    fields.each_with_object({}) do |field, changes|
+      old_val = other&.public_send(field)
+      new_val = public_send(field)
+      changes[field] = { old: old_val, new: new_val } if old_val != new_val
+    end
+  end
+
+  def previous
+    content_block.versions.where(version_number: ...version_number)
+                 .order(version_number: :desc).first
+  end
+
+  def snapshot
+    { title:, content:, rich_content_html:, content_type:, published: }
+  end
+end

data/app/views/admin/content_block_versions/index.html.erb

@@ -0,0 +1,52 @@
+<h1>Versiegeschiedenis: <%= @content_block.key %></h1>
+
+<%= link_to "Terug naar content block", ruby_cms_admin_content_block_path(@content_block),
+    class: "inline-flex items-center gap-1 text-sm text-muted-foreground hover:text-foreground mb-4" %>
+
+<div class="space-y-4">
+  <% @versions.each do |version| %>
+    <div class="rounded-lg border border-border/60 bg-card p-4">
+      <div class="flex items-center justify-between">
+        <div class="flex items-center gap-3">
+          <span class="inline-flex items-center rounded-md px-2 py-0.5 text-xs font-medium
+            <%= case version.event
+                when 'create' then 'bg-blue-50 text-blue-700 ring-1 ring-blue-200'
+                when 'update' then 'bg-amber-50 text-amber-700 ring-1 ring-amber-200'
+                when 'rollback' then 'bg-purple-50 text-purple-700 ring-1 ring-purple-200'
+                when 'publish' then 'bg-emerald-50 text-emerald-700 ring-1 ring-emerald-200'
+                when 'unpublish' then 'bg-red-50 text-red-700 ring-1 ring-red-200'
+                when 'visual_editor' then 'bg-cyan-50 text-cyan-700 ring-1 ring-cyan-200'
+                else 'bg-muted text-muted-foreground ring-1 ring-border/60'
+                end %>">
+            v<%= version.version_number %> — <%= version.event %>
+          </span>
+          <span class="text-sm text-muted-foreground">
+            <%= version.user&.name || version.user&.email || "System" %>
+          </span>
+          <span class="text-xs text-muted-foreground">
+            <%= version.created_at.strftime("%b %d, %Y %H:%M") %>
+          </span>
+        </div>
+
+        <div class="flex items-center gap-2">
+          <%= link_to "Bekijk diff", ruby_cms_admin_content_block_version_path(@content_block, version),
+              class: "text-xs text-primary hover:underline" %>
+
+          <% unless version == @versions.first %>
+            <%= button_to "Rollback",
+                rollback_ruby_cms_admin_content_block_version_path(@content_block, version),
+                method: :post,
+                data: { turbo_confirm: "Weet je zeker dat je wilt terugdraaien naar versie #{version.version_number}?" },
+                class: "text-xs text-destructive hover:underline" %>
+          <% end %>
+        </div>
+      </div>
+
+      <% if version.metadata&.dig("changed_fields").present? %>
+        <p class="mt-2 text-xs text-muted-foreground">
+          Gewijzigde velden: <%= version.metadata["changed_fields"].join(", ") %>
+        </p>
+      <% end %>
+    </div>
+  <% end %>
+</div>

data/app/views/admin/content_block_versions/show.html.erb

@@ -0,0 +1,37 @@
+<h1>Versie <%= @version.version_number %> — <%= @content_block.key %></h1>
+
+<%= link_to "Terug naar versiegeschiedenis",
+    ruby_cms_admin_content_block_versions_path(@content_block),
+    class: "inline-flex items-center gap-1 text-sm text-muted-foreground hover:text-foreground mb-4" %>
+
+<% diff = @version.diff_from(@previous_version) %>
+
+<% if diff.empty? %>
+  <p class="text-sm text-muted-foreground">Geen wijzigingen ten opzichte van de vorige versie.</p>
+<% else %>
+  <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
+    <% diff.each do |field, changes| %>
+      <div class="col-span-2 rounded-lg border border-border/60 bg-card p-4">
+        <h3 class="text-sm font-semibold text-foreground mb-2"><%= field.to_s.humanize %></h3>
+        <div class="grid grid-cols-2 gap-4">
+          <div>
+            <span class="text-xs font-medium text-muted-foreground">Vorige versie</span>
+            <div class="mt-1 rounded-md bg-red-50 p-3 text-sm text-red-800 whitespace-pre-wrap"><%= changes[:old] || "(leeg)" %></div>
+          </div>
+          <div>
+            <span class="text-xs font-medium text-muted-foreground">Deze versie</span>
+            <div class="mt-1 rounded-md bg-emerald-50 p-3 text-sm text-emerald-800 whitespace-pre-wrap"><%= changes[:new] || "(leeg)" %></div>
+          </div>
+        </div>
+      </div>
+    <% end %>
+  </div>
+<% end %>
+
+<div class="mt-6">
+  <%= button_to "Rollback naar deze versie",
+      rollback_ruby_cms_admin_content_block_version_path(@content_block, @version),
+      method: :post,
+      data: { turbo_confirm: "Weet je zeker dat je wilt terugdraaien naar versie #{@version.version_number}?" },
+      class: "inline-flex items-center px-4 py-2 rounded-md bg-primary text-primary-foreground text-sm font-medium hover:bg-primary/90" %>
+</div>