terrazzo 0.6.0 → 0.7.0

data/app/views/terrazzo/application/_show_base.json.props

@@ -2,7 +2,8 @@ json.pageTitle @page.page_title
 
 show_field_json = ->(json, field) do
   json.attribute field.attribute.to_s
-  json.label field.attribute.to_s.humanize
+  json.label dashboard.attribute_label(field.attribute, :show)
+  json.hint dashboard.attribute_hint(field.attribute, :show)
   json.fieldType field.field_type
   json.value field.serialize_value(:show)
   json.options field.serializable_options
@@ -12,14 +13,14 @@ show_field_json = ->(json, field) do
       render_actions = field.options.fetch(:render_actions, true)
 
       json.hasManyRowExtras(field.page_records.each_with_object({}) do |record, hash|
-        extras = { showPath: (polymorphic_path([namespace, record]) rescue nil) }
+        extras = { showPath: collection_action_path(record, :show) }
         extras[:collectionItemActions] = collection_item_actions(record) if render_actions
         hash[record.id.to_s] = extras
       end)
 
       json.paginationPaths has_many_pagination_paths(field, @resource)
     else
-      json.showPath polymorphic_path([namespace, field.data]) rescue nil
+      json.showPath collection_action_path(field.data, :show)
     end
   end
 end
@@ -39,8 +40,9 @@ json.attributeGroups do
   end
 end
 
-json.editPath route_exists?(:edit) ? (edit_polymorphic_path([namespace, @resource]) rescue nil) : nil
-json.deletePath route_exists?(:destroy) ? (polymorphic_path([namespace, @resource]) rescue nil) : nil
+json.layoutActions Array(dashboard.layout_actions(:show, self, resource: @resource))
+json.editPath route_exists?(:edit) && authorized_action?(@resource, :edit) ? terrazzo_resource_member_path(@resource, action: :edit) : nil
+json.deletePath route_exists?(:destroy) && authorized_action?(@resource, :destroy) ? terrazzo_resource_member_path(@resource, action: :destroy) : nil
 json.indexPath begin
   url_for(controller: controller_path, action: :index, only_path: true)
 rescue ActionController::UrlGenerationError

data/lib/generators/terrazzo/dashboard/dashboard_generator.rb

@@ -1,4 +1,5 @@
 require "rails/generators"
+require "set"
 require "terrazzo/generator_helpers"
 
 module Terrazzo
@@ -11,7 +12,7 @@ module Terrazzo
       class_option :namespace, type: :string, default: "admin",
         desc: "Admin namespace"
       class_option :bundler, type: :string, default: "vite",
-        desc: "JavaScript bundler (vite or sprockets)"
+        desc: "JavaScript bundler (vite or esbuild)"
 
       def create_dashboard
         template "dashboard.rb.erb",
@@ -24,34 +25,22 @@ module Terrazzo
       end
 
       def update_page_to_page_mapping
-        return if options[:bundler] == "vite"
-
-        mapping_path = "app/javascript/#{options[:namespace]}/page_to_page_mapping.js"
-        return unless File.exist?(mapping_path)
-
-        namespace_name = options[:namespace]
-        action_to_component = {
-          "index" => "AdminIndex",
-          "show" => "AdminShow",
-          "new" => "AdminNew",
-          "edit" => "AdminEdit"
-        }
-
-        action_to_component.each do |action, component|
-          key = "'#{namespace_name}/application/#{action}'"
-          mapping_path_content = File.read(mapping_path)
-          next if mapping_path_content.include?(key)
-
-          inject_into_file mapping_path, before: "}" do
-            "  #{key}: #{component},\n"
-          end
-        end
+        # The generated page mapping falls back from resource identifiers
+        # (admin/posts/index) to shared application pages (admin/application/index).
+        # Resource-specific page generators register their own mappings in
+        # generated_page_mapping.js when needed.
       end
 
       private
 
       def model_class
         class_name.constantize
+      rescue NameError
+        raise Thor::Error, <<~MESSAGE
+          Terrazzo could not find model '#{class_name}'.
+
+          Generate the model first, then run `bin/rails generate terrazzo:dashboard #{class_name}` again.
+        MESSAGE
       end
 
       def attribute_types
@@ -61,7 +50,7 @@ module Terrazzo
         types = {}
 
         # ID first
-        types[:id] = "Field::Number"
+        types[:id] = "Field::String"
 
         # Columns
         columns.each do |col|
@@ -77,11 +66,18 @@ module Terrazzo
         else
           Set.new
         end
+        rich_text_association_names = rich_text_internal_association_names
+
+        rich_text_attribute_names.each do |name|
+          types[name] = "Field::RichText"
+        end
 
         # Associations
         associations.each do |assoc|
           # Skip Active Storage internal associations (e.g., document_attachment, document_blob)
           next if active_storage_internal?(assoc.name, attachment_names)
+          # Skip Action Text internals (e.g., rich_text_description)
+          next if rich_text_association_names.include?(assoc.name)
 
           case assoc.macro
           when :belongs_to
@@ -116,6 +112,22 @@ module Terrazzo
         attribute_types.keys.reject { |a| %i[id created_at updated_at].include?(a) }
       end
 
+      def controller_modules
+        [options[:namespace].camelize, *class_path.map(&:camelize)]
+      end
+
+      def controller_class_name
+        "#{file_name.pluralize.camelize}Controller"
+      end
+
+      def dashboard_modules
+        class_path.map(&:camelize)
+      end
+
+      def dashboard_class_name
+        "#{file_name.camelize}Dashboard"
+      end
+
       def association_foreign_key?(column_name, associations)
         associations.any? do |assoc|
           assoc.macro == :belongs_to &&
@@ -129,6 +141,18 @@ module Terrazzo
           att_s = att.to_s
           name == "#{att_s}_attachment" || name == "#{att_s}_blob" ||
             name == "#{att_s}_attachments" || name == "#{att_s}_blobs"
+          end
+      end
+
+      def rich_text_internal_association_names
+        return Set.new unless model_class.respond_to?(:rich_text_association_names)
+
+        model_class.rich_text_association_names.map(&:to_sym).to_set
+      end
+
+      def rich_text_attribute_names
+        rich_text_internal_association_names.map do |name|
+          name.to_s.sub(/\Arich_text_/, "").to_sym
         end
       end
 

data/lib/generators/terrazzo/dashboard/templates/controller.rb.erb

@@ -1,4 +1,8 @@
-module <%= options[:namespace].camelize %>
-  class <%= class_name.pluralize %>Controller < ApplicationController
-  end
-end
+<% controller_modules.each_with_index do |module_name, index| -%>
+<%= "  " * index %>module <%= module_name %>
+<% end -%>
+<%= "  " * controller_modules.size %>class <%= controller_class_name %> < ApplicationController
+<%= "  " * controller_modules.size %>end
+<% controller_modules.reverse.each_with_index do |_module_name, index| -%>
+<%= "  " * (controller_modules.size - index - 1) %>end
+<% end -%>

data/lib/generators/terrazzo/dashboard/templates/dashboard.rb.erb

@@ -1,43 +1,51 @@
 require "terrazzo/base_dashboard"
 
-class <%= class_name %>Dashboard < Terrazzo::BaseDashboard
-  ATTRIBUTE_TYPES = {
+<% dashboard_modules.each_with_index do |module_name, index| -%>
+<%= "  " * index %>module <%= module_name %>
+<% end -%>
+<% class_indent = "  " * dashboard_modules.size -%>
+<% body_indent = "  " * (dashboard_modules.size + 1) -%>
+<%= class_indent %>class <%= dashboard_class_name %> < Terrazzo::BaseDashboard
+<%= body_indent %>ATTRIBUTE_TYPES = {
 <% attribute_types.each do |attr, type| -%>
 <% if has_enum?(attr.to_s) -%>
-    <%= attr %>: <%= type %>.with_options(collection: <%= enum_collection(attr.to_s).inspect %>),
+<%= body_indent %>  <%= attr %>: <%= type %>.with_options(collection: <%= enum_collection(attr.to_s).inspect %>),
 <% else -%>
-    <%= attr %>: <%= type %>,
+<%= body_indent %>  <%= attr %>: <%= type %>,
 <% end -%>
 <% end -%>
-  }.freeze
+<%= body_indent %>}.freeze
 
-  COLLECTION_ATTRIBUTES = %i[
+<%= body_indent %>COLLECTION_ATTRIBUTES = %i[
 <% collection_attributes.each do |attr| -%>
-    <%= attr %>
+<%= body_indent %>  <%= attr %>
 <% end -%>
-  ].freeze
+<%= body_indent %>].freeze
 
-  SHOW_PAGE_ATTRIBUTES = %i[
+<%= body_indent %>SHOW_PAGE_ATTRIBUTES = %i[
 <% show_page_attributes.each do |attr| -%>
-    <%= attr %>
+<%= body_indent %>  <%= attr %>
 <% end -%>
-  ].freeze
+<%= body_indent %>].freeze
 
-  FORM_ATTRIBUTES = %i[
+<%= body_indent %>FORM_ATTRIBUTES = %i[
 <% form_attributes.each do |attr| -%>
-    <%= attr %>
+<%= body_indent %>  <%= attr %>
 <% end -%>
-  ].freeze
+<%= body_indent %>].freeze
 
-  # COLLECTION_FILTERS = {
-  #   active: ->(resources) { resources.where(active: true) },
-  #   recent: ->(resources) { resources.where("created_at > ?", 30.days.ago) },
-  # }.freeze
+<%= body_indent %># COLLECTION_FILTERS = {
+<%= body_indent %>#   active: ->(resources) { resources.where(active: true) },
+<%= body_indent %>#   recent: ->(resources) { resources.where("created_at > ?", 30.days.ago) },
+<%= body_indent %># }.freeze
 
-  # Overwrite this method to customize how <%= file_name.pluralize.humanize.downcase %> are displayed
-  # across all pages of the admin dashboard.
-  #
-  # def display_resource(resource)
-  #   "<%= class_name %> ##{resource.id}"
-  # end
-end
+<%= body_indent %># Override this method to customize how <%= file_name.pluralize.humanize.downcase %> are displayed
+<%= body_indent %># across all pages of the admin dashboard.
+<%= body_indent %>#
+<%= body_indent %># def display_resource(resource)
+<%= body_indent %>#   "<%= class_name %> ##{resource.id}"
+<%= body_indent %># end
+<%= class_indent %>end
+<% dashboard_modules.reverse.each_with_index do |_module_name, index| -%>
+<%= "  " * (dashboard_modules.size - index - 1) %>end
+<% end -%>