terrazzo 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9ba7563c1db759831717790db2c022eb3f2d343c3f393f6679e164c250f8fc5
-  data.tar.gz: a985e9f57b97f224b26a58cd72d9e580666d0aae1b16efd8e722ce14460ad860
+  metadata.gz: 7c7c9b21f28f73f5cf332ac0d4b21d7eb32ae2461bfb2f52c5652eecd7642a8b
+  data.tar.gz: 7185c42a9d472e4d84ff7047a36a5468f761f272b9af5e0d9cb86930b130857f
 SHA512:
-  metadata.gz: 877fed40c106cc9ed5443197322033abd8c4d51c5fa69cb596d63ca77b355ffeb4c3235a13125a6bb6c7f1f28a747cab2c2674ebf08fee6bb4a2c7f225fc1eed
-  data.tar.gz: 24cdb50150d40149fda75e5fe376978222ab3b200247a006989cb52e98ea2e9482747ab49b3880f7557cb072ca089691f7468f3573a778eaec764bcf45b6cf3c
+  metadata.gz: f751974222e4ad11bd348dc07e3d8563c67454cf96d1b6faf3054b0b77f978dbba9dd1a10b16084b544e17799d8969df3e7ee50bf4485c0b1ce5849ab8f44716
+  data.tar.gz: b22856b13ec0ab28ba3e689cb92e99427311834f4e0e807e1a15506488832ce33f7c90a6d982b55d1c474ff4a1837394eed02d4a9bf3882164b9da988bb3b2e8

data/app/controllers/terrazzo/application_controller.rb

@@ -16,7 +16,8 @@ module Terrazzo
 
     prepend Terrazzo::UsesSuperglue::TemplateLookupOverride
 
-    helper_method :namespace, :dashboard, :resource_name, :resource_class, :application_title, :terrazzo_page_identifier
+    helper_method :namespace, :dashboard, :resource_name, :resource_class, :application_title, :terrazzo_page_identifier, :route_exists?
+    helper Terrazzo::CollectionActionsHelper
 
     def index
       search = Terrazzo::Search.new(scoped_resource, dashboard, params[:search])
@@ -129,9 +130,6 @@ module Terrazzo
 
     def find_resource(id)
       scoped_resource.find(id)
-    rescue ActiveRecord::RecordNotFound
-      # Support models that override to_param (e.g., slug-based URLs)
-      scoped_resource.find_by!(slug: id)
     end
 
     def resource_params(action = nil)
@@ -207,6 +205,16 @@ module Terrazzo
       "#{ns}/application/#{mapped_action}"
     end
 
+    def route_exists?(action)
+      @_route_exists_cache ||= {}
+      return @_route_exists_cache[action] if @_route_exists_cache.key?(action)
+
+      @_route_exists_cache[action] = Rails.application.routes.routes.any? do |route|
+        route.defaults[:controller] == controller_path &&
+          route.defaults[:action] == action.to_s
+      end
+    end
+
     private
 
     def resolver

data/app/helpers/terrazzo/collection_actions_helper.rb

@@ -0,0 +1,22 @@
+module Terrazzo
+  module CollectionActionsHelper
+    def collection_item_actions(resource)
+      resource_dashboard = "#{resource.class.name}Dashboard".safe_constantize&.new
+      if resource_dashboard&.respond_to?(:collection_item_actions)
+        resource_dashboard.collection_item_actions(resource, self)
+      else
+        default_collection_item_actions(resource)
+      end
+    end
+
+    private
+
+    def default_collection_item_actions(resource)
+      actions = []
+      actions << { label: "Show", url: polymorphic_path([namespace, resource]) } rescue nil
+      actions << { label: "Edit", url: edit_polymorphic_path([namespace, resource]) } rescue nil
+      actions << { label: "Destroy", url: polymorphic_path([namespace, resource]), method: "delete", confirm: "Are you sure?" } rescue nil
+      actions.compact
+    end
+  end
+end

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

@@ -5,7 +5,8 @@ json.pageTitle t("terrazzo.actions.edit", resource_name: resource_name)
 json.form do
   json.props({
     action: polymorphic_path([namespace, @resource]),
-    method: "post"
+    method: "post",
+    encType: "multipart/form-data"
   })
   json.extras do
     if protect_against_forgery?

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

@@ -33,8 +33,7 @@ json.table do
     json.array! @resources do |resource|
       json.id resource.id
       json.showPath polymorphic_path([namespace, resource]) rescue nil
-      json.editPath edit_polymorphic_path([namespace, resource]) rescue nil
-      json.deletePath polymorphic_path([namespace, resource]) rescue nil
+      json.collectionItemActions collection_item_actions(resource)
 
       json.cells do
         json.array! @page.attribute_names do |attr|
@@ -89,4 +88,4 @@ end
 
 json.resourceName resource_name.pluralize
 json.singularResourceName resource_name
-json.newResourcePath new_polymorphic_path([namespace, resource_class]) rescue nil
+json.newResourcePath route_exists?(:new) ? (new_polymorphic_path([namespace, resource_class]) rescue nil) : nil

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

@@ -6,7 +6,8 @@ json.pageTitle t("terrazzo.actions.new", resource_name: resource_name)
 json.form do
   json.props({
     action: polymorphic_path([namespace, resource_class]),
-    method: "post"
+    method: "post",
+    encType: "multipart/form-data"
   })
   json.extras do
     if protect_against_forgery?

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

@@ -11,6 +11,9 @@ show_field_json = ->(json, field) do
       json.itemShowPaths(field.data.each_with_object({}) do |record, paths|
         paths[record.id.to_s] = polymorphic_path([namespace, record]) rescue nil
       end)
+      json.collectionItemActions(field.data.each_with_object({}) do |record, hash|
+        hash[record.id.to_s] = collection_item_actions(record)
+      end)
     else
       json.showPath polymorphic_path([namespace, field.data]) rescue nil
     end
@@ -34,8 +37,8 @@ json.attributes do
   end
 end
 
-json.editPath edit_polymorphic_path([namespace, @resource]) rescue nil
-json.deletePath polymorphic_path([namespace, @resource]) rescue nil
+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.indexPath begin
   url_for(controller: controller_path, action: :index, only_path: true)
 rescue ActionController::UrlGenerationError

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

@@ -71,8 +71,18 @@ module Terrazzo
           types[col.name.to_sym] = column_to_field_type(col)
         end
 
+        # Active Storage attachment names (used to filter internal associations)
+        attachment_names = if model_class.respond_to?(:reflect_on_all_attachments)
+          model_class.reflect_on_all_attachments.map(&:name).to_set
+        else
+          Set.new
+        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)
+
           case assoc.macro
           when :belongs_to
             types[assoc.name] = assoc.options[:polymorphic] ? "Field::Polymorphic" : "Field::BelongsTo"
@@ -83,6 +93,13 @@ module Terrazzo
           end
         end
 
+        # Active Storage attachments
+        attachment_names.each do |name|
+          attachment = model_class.reflect_on_attachment(name)
+          next if attachment.macro == :has_many_attached
+          types[name] = "Field::Asset"
+        end
+
         types
       end
 
@@ -106,6 +123,15 @@ module Terrazzo
         end
       end
 
+      def active_storage_internal?(assoc_name, attachment_names)
+        name = assoc_name.to_s
+        attachment_names.any? do |att|
+          att_s = att.to_s
+          name == "#{att_s}_attachment" || name == "#{att_s}_blob" ||
+            name == "#{att_s}_attachments" || name == "#{att_s}_blobs"
+        end
+      end
+
       def has_enum?(column_name)
         model_class.defined_enums.key?(column_name.to_s)
       end

data/lib/generators/terrazzo/views/templates/fields/has_many/ShowField.jsx

@@ -11,9 +11,10 @@ import {
 } from "terrazzo/ui";
 import { Badge } from "terrazzo/ui";
 import { Button } from "terrazzo/ui";
+import { CollectionItemActions } from "terrazzo/components";
 import { FieldRenderer } from "../FieldRenderer";
 
-export function ShowField({ value, itemShowPaths }) {
+export function ShowField({ value, itemShowPaths, collectionItemActions }) {
   if (!value) return <span className="text-muted-foreground">None</span>;
 
   const { items, headers, total, initialLimit } = value;
@@ -46,6 +47,7 @@ export function ShowField({ value, itemShowPaths }) {
                 {headers.map((header) =>
                   <TableHead key={header.attribute}>{header.label}</TableHead>
                 )}
+                {collectionItemActions && <TableHead></TableHead>}
               </TableRow>
             </TableHeader>
             <TableBody>
@@ -67,6 +69,11 @@ export function ShowField({ value, itemShowPaths }) {
                         )}
                       </TableCell>
                     )}
+                    {collectionItemActions && (
+                      <TableCell>
+                        <CollectionItemActions actions={collectionItemActions?.[String(item.id)]} />
+                      </TableCell>
+                    )}
                   </TableRow>
                 );
               })}

data/lib/generators/terrazzo/views/templates/pages/index.jsx

@@ -1,7 +1,7 @@
 import React, { useContext } from "react";
 import { useContent, NavigationContext } from "@thoughtbot/superglue";
 
-import { Layout, SearchBar, Pagination, SortableHeader } from "terrazzo/components";
+import { Layout, SearchBar, Pagination, SortableHeader, CollectionItemActions } from "terrazzo/components";
 import { FieldRenderer } from "terrazzo/fields";
 import { Button, Table, TableHeader, TableBody, TableRow, TableHead, TableCell } from "terrazzo/ui";
 
@@ -66,39 +66,7 @@ export default function AdminIndex() {
                   </TableCell>
               )}
                 <TableCell>
-                  <div className="flex gap-1">
-                    {row.showPath &&
-                  <a href={row.showPath} data-sg-visit>
-                        <Button variant="ghost" size="sm">Show</Button>
-                      </a>
-                  }
-                    {row.editPath &&
-                  <a href={row.editPath} data-sg-visit>
-                        <Button variant="ghost" size="sm">Edit</Button>
-                      </a>
-                  }
-                    {row.deletePath &&
-                  <form
-                    action={row.deletePath}
-                    method="post"
-                    data-sg-visit
-                    style={{ display: "inline" }}
-                    onSubmit={(e) => {
-                      if (!window.confirm("Are you sure?")) e.preventDefault();
-                    }}>
-
-                        <input type="hidden" name="_method" value="delete" />
-                        <input
-                      type="hidden"
-                      name="authenticity_token"
-                      value={document.querySelector('meta[name="csrf-token"]')?.content ?? ""} />
-
-                        <Button type="submit" variant="ghost" size="sm" className="text-destructive">
-                          Delete
-                        </Button>
-                      </form>
-                  }
-                  </div>
+                  <CollectionItemActions actions={row.collectionItemActions} />
                 </TableCell>
               </TableRow>
             )}

data/lib/terrazzo/base_dashboard.rb

@@ -64,10 +64,13 @@ module Terrazzo
 
     def collection_includes
       collection_attr_set = Set.new(collection_attributes)
+      model = self.class.model
       attribute_types.each_with_object([]) do |(attr, type), includes|
         next unless collection_attr_set.include?(attr)
         next unless type.eager_load?
-        next unless self.class.model.reflect_on_association(attr)
+        has_association = model.reflect_on_association(attr)
+        has_attachment = model.respond_to?(:reflect_on_attachment) && model.reflect_on_attachment(attr)
+        next unless has_association || has_attachment
         includes << attr
       end
     end

data/lib/terrazzo/field/asset.rb

@@ -0,0 +1,34 @@
+module Terrazzo
+  module Field
+    class Asset < Base
+      def serialize_value(mode)
+        return nil if data.nil? || !data.attached?
+
+        case mode
+        when :index
+          data.filename.to_s
+        when :show
+          { filename: data.filename.to_s, byteSize: data.byte_size, contentType: data.content_type }
+        when :form
+          { filename: data.filename.to_s, signedId: data.signed_id }
+        else
+          data.filename.to_s
+        end
+      end
+
+      class << self
+        def searchable?
+          false
+        end
+
+        def sortable?
+          false
+        end
+
+        def eager_load?
+          true
+        end
+      end
+    end
+  end
+end

data/lib/terrazzo/field/associative.rb

@@ -44,7 +44,14 @@ module Terrazzo
           associated_class.all
         end
         pk = association_primary_key
-        scope.map { |r| [display_name(r), r.public_send(pk).to_s] }
+        dashboard = associated_dashboard
+        scope.map { |r| [dashboard ? dashboard.display_resource(r) : display_name(r), r.public_send(pk).to_s] }
+      end
+
+      def associated_dashboard
+        "#{associated_class.name}Dashboard".constantize.new
+      rescue NameError
+        nil
       end
 
       def association_primary_key

data/lib/terrazzo/field/date.rb

@@ -3,7 +3,8 @@ module Terrazzo
     class Date < Base
       def serialize_value(_mode)
         return nil if data.nil?
-        data.to_s
+        format = options[:format]
+        format ? data.strftime(format) : data.to_s
       end
     end
   end

data/lib/terrazzo/field/date_time.rb

@@ -3,7 +3,8 @@ module Terrazzo
     class DateTime < Base
       def serialize_value(_mode)
         return nil if data.nil?
-        data.iso8601
+        format = options[:format]
+        format ? data.strftime(format) : data.iso8601
       end
     end
   end

data/lib/terrazzo/field/has_many.rb

@@ -6,7 +6,10 @@ module Terrazzo
 
         case mode
         when :index
-          data.size
+          count = data.size
+          label = attribute.to_s.humanize.downcase
+          label = label.singularize if count == 1
+          { count: count, label: label }
         when :form
           data.map { |r| r.id.to_s }
         when :show

data/lib/terrazzo/field/number.rb

@@ -1,8 +1,10 @@
 module Terrazzo
   module Field
     class Number < Base
-      def serialize_value(_mode)
-        data
+      def serialize_value(mode)
+        return data if data.nil? || mode == :form || !options.key?(:multiplier)
+
+        data * options[:multiplier]
       end
 
       def serializable_options

data/lib/terrazzo/field/time.rb

@@ -3,7 +3,8 @@ module Terrazzo
     class Time < Base
       def serialize_value(_mode)
         return nil if data.nil?
-        data.to_s
+        format = options[:format]
+        format ? data.strftime(format) : data.to_s
       end
     end
   end

data/lib/terrazzo/version.rb

@@ -1,3 +1,3 @@
 module Terrazzo
-  VERSION = "0.3.0"
+  VERSION = "0.3.2"
 end

data/lib/terrazzo.rb

@@ -37,6 +37,7 @@ module Terrazzo
     autoload :HasMany, "terrazzo/field/has_many"
     autoload :HasOne, "terrazzo/field/has_one"
     autoload :Polymorphic, "terrazzo/field/polymorphic"
+    autoload :Asset, "terrazzo/field/asset"
   end
 
   module Page

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terrazzo
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Terrazzo Contributors
@@ -117,6 +117,7 @@ files:
 - LICENSE
 - Rakefile
 - app/controllers/terrazzo/application_controller.rb
+- app/helpers/terrazzo/collection_actions_helper.rb
 - app/views/terrazzo/application/_navigation.json.props
 - app/views/terrazzo/application/edit.json.props
 - app/views/terrazzo/application/index.json.props
@@ -242,6 +243,7 @@ files:
 - lib/terrazzo.rb
 - lib/terrazzo/base_dashboard.rb
 - lib/terrazzo/engine.rb
+- lib/terrazzo/field/asset.rb
 - lib/terrazzo/field/associative.rb
 - lib/terrazzo/field/base.rb
 - lib/terrazzo/field/belongs_to.rb