Fix specs and add content block versions and dashboard additions.

Author: Job Hammer

Gemfile

@@ -24,6 +24,7 @@ group :development, :test, :ci, :linter do
   gem 'rubocop', require: false
   gem 'rubocop-performance', require: false
   gem 'rubocop-rails', require: false
+  gem 'rubocop-rails-omakase', require: false
   gem 'rubocop-rspec', require: false
   gem 'rubocop-rspec_rails', require: false
 end

Gemfile.lock

@@ -325,6 +325,10 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rails-omakase (1.1.0)
+      rubocop (>= 1.72)
+      rubocop-performance (>= 1.24)
+      rubocop-rails (>= 2.30)
     rubocop-rspec (3.9.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.81)
@@ -398,6 +402,7 @@ DEPENDENCIES
   rubocop
   rubocop-performance
   rubocop-rails
+  rubocop-rails-omakase
   rubocop-rspec
   rubocop-rspec_rails
   ruby_cms!
@@ -509,6 +514,7 @@ CHECKSUMS
   rubocop-ast (1.49.1) sha256=4412f3ee70f6fe4546cc489548e0f6fcf76cafcfa80fa03af67098ffed755035
   rubocop-performance (1.26.1) sha256=cd19b936ff196df85829d264b522fd4f98b6c89ad271fa52744a8c11b8f71834
   rubocop-rails (2.34.3) sha256=10d37989024865ecda8199f311f3faca990143fbac967de943f88aca11eb9ad2
+  rubocop-rails-omakase (1.1.0) sha256=2af73ac8ee5852de2919abbd2618af9c15c19b512c4cfc1f9a5d3b6ef009109d
   rubocop-rspec (3.9.0) sha256=8fa70a3619408237d789aeecfb9beef40576acc855173e60939d63332fdb55e2
   rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100
   ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33

app/controllers/ruby_cms/admin/base_controller.rb

@@ -20,8 +20,21 @@ class BaseController < Rails.application.config.ruby_cms.admin_base_controller.c
       # new_session_path, root_path, etc.
       include RubyCms::Engine.routes.url_helpers
 
+      # Public API: dashboard block +data procs and host code may call this on the controller instance.
+      def current_user_cms
+        @current_user_cms ||= resolve_current_user
+      end
+
       private
 
+      def resolve_current_user
+        if respond_to?(:current_user, true)
+          send(:current_user)
+        else
+          Rails.application.config.ruby_cms.current_user_resolver&.call(self)
+        end
+      end
+
       def require_cms_access
         ensure_authenticated
         require_permission!(:manage_admin)
@@ -67,18 +80,6 @@ def cms_redirect_path
         Rails.application.config.ruby_cms.unauthorized_redirect_path.presence || "/"
       end
 
-      def current_user_cms
-        @current_user_cms ||= resolve_current_user
-      end
-
-      def resolve_current_user
-        if respond_to?(:current_user, true)
-          send(:current_user)
-        else
-          Rails.application.config.ruby_cms.current_user_resolver&.call(self)
-        end
-      end
-
       def render_not_found
         render "ruby_cms/errors/not_found",
                status: :not_found,
@@ -106,6 +107,8 @@ def set_cms_locale
       def model_param_key(model_class, param_name)
         params.key?(param_name) ? param_name : model_class.model_name.param_key.to_sym
       end
+
+      public :current_user_cms
     end
   end
 end

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

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.is_a?(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

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

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")
+        }
+    }
+}

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",