terrazzo 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f76fda78e25cb79116bd5f5f00b0b57e750503e3ebfdbee9a7bfe55dd8c17f34
-  data.tar.gz: 5cf113e4e1bfdd17591a3e50e1e993668da1408041efcc28a7f17b4a1b0eac05
+  metadata.gz: 7c7c9b21f28f73f5cf332ac0d4b21d7eb32ae2461bfb2f52c5652eecd7642a8b
+  data.tar.gz: 7185c42a9d472e4d84ff7047a36a5468f761f272b9af5e0d9cb86930b130857f
 SHA512:
-  metadata.gz: b60b58629158604c651402f6f920372f07146115b05f46613a2909be8af868f17005092bf7c84e288a4789724408e59150801fdc0b4f59c6575db1e05bb60f37
-  data.tar.gz: 9f6342b35c22e98a56f465221ef5e0bcc8911fcf75ee33ebea146144232e84a85b3c199b4ae14ce5969868c983587ca2cb59660ba96e2d2123c9ee1cc71aec36
+  metadata.gz: f751974222e4ad11bd348dc07e3d8563c67454cf96d1b6faf3054b0b77f978dbba9dd1a10b16084b544e17799d8969df3e7ee50bf4485c0b1ce5849ab8f44716
+  data.tar.gz: b22856b13ec0ab28ba3e689cb92e99427311834f4e0e807e1a15506488832ce33f7c90a6d982b55d1c474ff4a1837394eed02d4a9bf3882164b9da988bb3b2e8

data/app/controllers/terrazzo/application_controller.rb

@@ -17,6 +17,7 @@ module Terrazzo
     prepend Terrazzo::UsesSuperglue::TemplateLookupOverride
 
     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)

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/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 route_exists?(:edit) ? (edit_polymorphic_path([namespace, resource]) rescue nil) : nil
-      json.deletePath route_exists?(:destroy) ? (polymorphic_path([namespace, resource]) rescue nil) : nil
+      json.collectionItemActions collection_item_actions(resource)
 
       json.cells do
         json.array! @page.attribute_names do |attr|

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

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/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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terrazzo
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  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