terrazzo 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60ad22a772a614c37195f4695a9dd9b41b2c28b4c2516edc2ab07ffb257253e2
-  data.tar.gz: 41449e6a9e4c590db843dac6d9f0836bd32c92ee362e4a92b502207f183cd7fc
+  metadata.gz: 6976f4987f794484e19de73da573e1b7d65dfc75a0852133c1eebf005d22167e
+  data.tar.gz: 4dc5597241838c5523ed2a5a50d23185a0e21199b18ae9dd07128d7687e836e6
 SHA512:
-  metadata.gz: 8c07a8cc98e237208dede3049baf12c7edb3145c7745d69cb2996880594738bdd3ff9d1fbcd88da7d9b7e6f149abc289e1acd1f76331214016252bc2e7ec3c61
-  data.tar.gz: fe5c60e8af68eadb129ae735c266ca3958e4f88471a5692acbaea17edfa821b2809ad3c86c14ca13d9ea8790645f80eac97516c8431b12d88df328775c031cf9
+  metadata.gz: 673cd873e8c295de85c4bc2d798a33d4879e37cfded9357d01c08b1617e050931502193c3be3c445f0577f4bc29372bc15867b3e4fafe519161f6209d894ca4f
+  data.tar.gz: ae15ddf2abd934407d97f3e17d4344e68f5ff93e7fce588f9d520998d017404f980c7f75d07709ba2e984ae49490d65d9a573d4f169949c8b03cce849402f46b

data/app/controllers/terrazzo/application_controller.rb

@@ -129,7 +129,7 @@ module Terrazzo
     end
 
     def find_resource(id)
-      scoped_resource.find(id)
+      @_find_resource ||= scoped_resource.find(id)
     end
 
     def resource_params(action = nil)

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

@@ -29,7 +29,7 @@ json.form do
       json.label field.attribute.to_s.humanize
       json.fieldType field.field_type
       json.value field.serialize_value(:form)
-      json.options field.serializable_options
+      json.options field.serializable_options(:form)
       json.required field.required?
       json.input field.form_input_attributes(param_key)
     end
@@ -43,7 +43,7 @@ json.form do
           json.label field.attribute.to_s.humanize
           json.fieldType field.field_type
           json.value field.serialize_value(:form)
-          json.options field.serializable_options
+          json.options field.serializable_options(:form)
           json.required field.required?
           json.input field.form_input_attributes(param_key)
         end

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

@@ -25,7 +25,7 @@ json.form do
       json.label field.attribute.to_s.humanize
       json.fieldType field.field_type
       json.value field.serialize_value(:form)
-      json.options field.serializable_options
+      json.options field.serializable_options(:form)
       json.required field.required?
       json.input field.form_input_attributes(param_key)
     end
@@ -39,7 +39,7 @@ json.form do
           json.label field.attribute.to_s.humanize
           json.fieldType field.field_type
           json.value field.serialize_value(:form)
-          json.options field.serializable_options
+          json.options field.serializable_options(:form)
           json.required field.required?
           json.input field.form_input_attributes(param_key)
         end

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

@@ -9,11 +9,11 @@ show_field_json = ->(json, field) do
 
   if field.class.associative? && field.data.present?
     if field.is_a?(Terrazzo::Field::HasMany)
-      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)
+      render_actions = field.options.fetch(:render_actions, true)
+      json.hasManyRowExtras(field.data.each_with_object({}) do |record, hash|
+        extras = { showPath: (polymorphic_path([namespace, record]) rescue nil) }
+        extras[:collectionItemActions] = collection_item_actions(record) if render_actions
+        hash[record.id.to_s] = extras
       end)
     else
       json.showPath polymorphic_path([namespace, field.data]) rescue nil
@@ -21,7 +21,7 @@ show_field_json = ->(json, field) do
   end
 end
 
-json.attributeGroups do
+json.attributes do
   json.array! @page.grouped_attributes do |group|
     json.name group[:name]
     json.attributes do
@@ -32,12 +32,6 @@ json.attributeGroups do
   end
 end
 
-json.attributes do
-  json.array! @page.attributes do |field|
-    show_field_json.call(json, field)
-  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.indexPath begin

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

@@ -5,7 +5,7 @@ module Terrazzo
         data
       end
 
-      def serializable_options
+      def serializable_options(page = nil)
         {}
       end
 

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

@@ -1,85 +1,36 @@
-import React, { useState, useContext } from "react";
-import { NavigationContext } from "@thoughtbot/superglue";
+import React, { useState } from "react";
 
-import {
-  Table,
-  TableHeader,
-  TableBody,
-  TableRow,
-  TableHead,
-  TableCell,
-} from "terrazzo/ui";
+import { ResourceTable } from "terrazzo/components";
 import { Badge } from "terrazzo/ui";
 import { Button } from "terrazzo/ui";
-import { CollectionItemActions } from "terrazzo/components";
-import { FieldRenderer } from "../FieldRenderer";
 
-export function ShowField({ value, itemShowPaths, collectionItemActions }) {
+export function ShowField({ value, hasManyRowExtras, options }) {
   if (!value) return <span className="text-muted-foreground">None</span>;
 
-  const { items, headers, total, initialLimit } = value;
+  const { rows, headers, total, initialLimit, items } = value;
   const [expanded, setExpanded] = useState(false);
-  const { visit } = useContext(NavigationContext);
 
-  if (!items || items.length === 0) {
-    return <span className="text-muted-foreground">None</span>;
-  }
+  // Table mode: collection_attributes specified
+  if (headers && rows) {
+    if (rows.length === 0) {
+      return <span className="text-muted-foreground">None</span>;
+    }
 
-  const pathFor = (id) => itemShowPaths?.[String(id)];
-  const hasMore = initialLimit && initialLimit > 0 && total > initialLimit;
-  const visibleItems = expanded || !hasMore ? items : items.slice(0, initialLimit);
+    const hasMore = initialLimit && initialLimit > 0 && total > initialLimit;
+    const visibleRows = expanded || !hasMore ? rows : rows.slice(0, initialLimit);
 
-  const handleRowClick = (e, showPath) => {
-    if (!showPath) return;
-    if (e.target.closest("a, button, form")) return;
-    if (window.getSelection().toString()) return;
-    visit(showPath, {});
-  };
+    const enrichedRows = visibleRows.map((row) => {
+      const extras = hasManyRowExtras?.[String(row.id)] || {};
+      return {
+        ...row,
+        showPath: extras.showPath,
+        collectionItemActions: extras.collectionItemActions,
+      };
+    });
 
-  // Table mode: collection_attributes specified
-  if (headers) {
     return (
       <div>
-        <div className="rounded-md border">
-          <Table>
-            <TableHeader>
-              <TableRow>
-                {headers.map((header) =>
-                  <TableHead key={header.attribute}>{header.label}</TableHead>
-                )}
-                {collectionItemActions && <TableHead></TableHead>}
-              </TableRow>
-            </TableHeader>
-            <TableBody>
-              {visibleItems.map((item) => {
-                const showPath = pathFor(item.id);
-                return (
-                  <TableRow
-                    key={item.id}
-                    className={showPath ? "cursor-pointer" : ""}
-                    onClick={(e) => handleRowClick(e, showPath)}>
-                    {item.columns.map((col, colIndex) =>
-                      <TableCell key={col.attribute}>
-                        {showPath && colIndex === 0 ? (
-                          <a href={showPath} data-sg-visit className="hover:underline">
-                            <FieldRenderer mode="index" {...col} />
-                          </a>
-                        ) : (
-                          <FieldRenderer mode="index" {...col} />
-                        )}
-                      </TableCell>
-                    )}
-                    {collectionItemActions && (
-                      <TableCell>
-                        <CollectionItemActions actions={collectionItemActions?.[String(item.id)]} />
-                      </TableCell>
-                    )}
-                  </TableRow>
-                );
-              })}
-            </TableBody>
-          </Table>
-        </div>
+        <ResourceTable headers={headers} rows={enrichedRows} showActions={options?.renderActions !== false} />
         {hasMore && (
           <Button
             variant="link"
@@ -93,12 +44,19 @@ export function ShowField({ value, itemShowPaths, collectionItemActions }) {
     );
   }
 
-  // Simple list mode
+  // Simple list mode (no collection_attributes)
+  if (!items || items.length === 0) {
+    return <span className="text-muted-foreground">None</span>;
+  }
+
+  const hasMore = initialLimit && initialLimit > 0 && total > initialLimit;
+  const visibleItems = expanded || !hasMore ? items : items.slice(0, initialLimit);
+
   return (
     <div>
       <div className="flex flex-wrap items-center gap-1.5">
         {visibleItems.map((item) => {
-          const showPath = pathFor(item.id);
+          const showPath = hasManyRowExtras?.[String(item.id)]?.showPath;
           return showPath ? (
             <a key={item.id} href={showPath} data-sg-visit>
               <Badge variant="secondary" className="cursor-pointer">{item.display}</Badge>

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

@@ -1,55 +1,11 @@
-import React, { useContext } from "react";
-import { NavigationContext } from "@thoughtbot/superglue";
+import React from "react";
 
-import { SortableHeader, CollectionItemActions } from "terrazzo/components";
-import { FieldRenderer } from "terrazzo/fields";
-import { Table, TableHeader, TableBody, TableRow, TableHead, TableCell } from "terrazzo/ui";
+import { ResourceTable } from "terrazzo/components";
 
 export function AdminCollection({ table }) {
-  const { visit } = useContext(NavigationContext);
-
-  const handleRowClick = (e, showPath) => {
-    if (!showPath) return;
-    if (e.target.closest("a, button, form")) return;
-    if (window.getSelection().toString()) return;
-    visit(showPath, {});
-  };
-
   return (
-    <div className="overflow-x-auto rounded-md border">
-      <Table>
-        <TableHeader>
-          <TableRow>
-            {table.headers.map((header) =>
-            <SortableHeader key={header.attribute} {...header} />
-            )}
-            <TableHead className="w-[120px]">Actions</TableHead>
-          </TableRow>
-        </TableHeader>
-        <TableBody>
-          {table.rows.map((row) =>
-          <TableRow
-            key={row.id}
-            className={row.showPath ? "cursor-pointer" : ""}
-            onClick={(e) => handleRowClick(e, row.showPath)}>
-              {row.cells.map((cell) =>
-            <TableCell key={cell.attribute}>
-                  {cell.showPath ? (
-                    <a href={cell.showPath} data-sg-visit className="hover:underline">
-                      <FieldRenderer mode="index" {...cell} />
-                    </a>
-                  ) : (
-                    <FieldRenderer mode="index" {...cell} />
-                  )}
-                </TableCell>
-            )}
-              <TableCell>
-                <CollectionItemActions actions={row.collectionItemActions} />
-              </TableCell>
-            </TableRow>
-          )}
-        </TableBody>
-      </Table>
+    <div className="overflow-x-auto">
+      <ResourceTable headers={table.headers} rows={table.rows} />
     </div>
   );
 }

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

@@ -9,7 +9,7 @@ export default function AdminShow() {
   const Layout = getLayout();
   const {
     pageTitle,
-    attributeGroups,
+    attributes,
     editPath,
     deletePath,
     indexPath,
@@ -54,7 +54,7 @@ export default function AdminShow() {
         </div>
       }>
 
-      {attributeGroups.map((group, groupIndex) =>
+      {attributes.map((group, groupIndex) =>
         <Card key={groupIndex}>
           {group.name && (
             <CardHeader>

data/lib/terrazzo/field/base.rb

@@ -20,7 +20,7 @@ module Terrazzo
         data
       end
 
-      def serializable_options
+      def serializable_options(page = nil)
         {}
       end
 

data/lib/terrazzo/field/belongs_to.rb

@@ -11,16 +11,13 @@ module Terrazzo
         end
       end
 
-      def serializable_options
-        opts = {}
-        if resource
-          collection = ordered_resource_options
-          if options[:include_blank]
-            collection = [["", nil]] + collection
-          end
-          opts[:resourceOptions] = collection
+      def serializable_options(page = nil)
+        return {} unless page == :form && resource
+        collection = ordered_resource_options
+        if options[:include_blank]
+          collection = [["", nil]] + collection
         end
-        opts
+        { resourceOptions: collection }
       end
 
       class << self

data/lib/terrazzo/field/has_many.rb

@@ -19,11 +19,14 @@ module Terrazzo
         end
       end
 
-      def serializable_options
+      def serializable_options(page = nil)
         opts = {}
-        if resource
+        if page == :form && resource
           opts[:resourceOptions] = resource_options
         end
+        if options.key?(:render_actions)
+          opts[:renderActions] = options[:render_actions]
+        end
         opts
       end
 
@@ -75,8 +78,8 @@ module Terrazzo
           { attribute: attr.to_s, label: attr.to_s.humanize }
         end
 
-        items = records.map do |record|
-          columns = col_attrs.map do |attr|
+        rows = records.map do |record|
+          cells = col_attrs.map do |attr|
             field = dashboard_class.new.attribute_type_for(attr).new(attr, nil, :index, resource: record)
             {
               attribute: attr.to_s,
@@ -84,12 +87,12 @@ module Terrazzo
               value: field.serialize_value(:index)
             }
           end
-          { id: record.id.to_s, columns: columns }
+          { id: record.id.to_s, cells: cells }
         end
 
         {
           headers: headers,
-          items: items,
+          rows: rows,
           total: total,
           initialLimit: limit
         }
@@ -115,7 +118,13 @@ module Terrazzo
         return records unless sort_by
 
         direction = options.fetch(:direction, :asc)
-        records.reorder(sort_by => direction)
+
+        if records.respond_to?(:reorder)
+          records.reorder(sort_by => direction)
+        else
+          sorted = records.sort_by { |r| r.public_send(sort_by) }
+          direction.to_sym == :desc ? sorted.reverse : sorted
+        end
       end
 
       def find_associated_dashboard

data/lib/terrazzo/field/has_one.rb

@@ -11,12 +11,9 @@ module Terrazzo
         end
       end
 
-      def serializable_options
-        opts = {}
-        if resource
-          opts[:resourceOptions] = resource_options
-        end
-        opts
+      def serializable_options(page = nil)
+        return {} unless page == :form && resource
+        { resourceOptions: resource_options }
       end
 
       class << self

data/lib/terrazzo/field/money.rb

@@ -11,7 +11,7 @@ module Terrazzo
         end
       end
 
-      def serializable_options
+      def serializable_options(page = nil)
         opts = {}
         opts[:prefix] = options[:prefix] if options.key?(:prefix)
         opts[:suffix] = options[:suffix] if options.key?(:suffix)

data/lib/terrazzo/field/number.rb

@@ -17,7 +17,7 @@ module Terrazzo
         end
       end
 
-      def serializable_options
+      def serializable_options(page = nil)
         opts = {}
         opts[:prefix] = options[:prefix] if options.key?(:prefix)
         opts[:suffix] = options[:suffix] if options.key?(:suffix)

data/lib/terrazzo/field/polymorphic.rb

@@ -12,16 +12,16 @@ module Terrazzo
         end
       end
 
-      def serializable_options
-        opts = {}
+      def serializable_options(page = nil)
+        return {} unless page == :form
         classes = options[:classes] || []
         order = options[:order]
-        opts[:groupedOptions] = classes.each_with_object({}) do |klass, hash|
+        grouped = classes.each_with_object({}) do |klass, hash|
           klass = klass.constantize if klass.is_a?(::String)
           scope = order ? klass.order(order) : klass.all
           hash[klass.name] = scope.map { |r| [display_name(r), r.id.to_s] }
         end
-        opts
+        { groupedOptions: grouped }
       end
 
       class << self

data/lib/terrazzo/field/select.rb

@@ -5,7 +5,8 @@ module Terrazzo
         data
       end
 
-      def serializable_options
+      def serializable_options(page = nil)
+        return {} unless page == :form
         { selectableOptions: resolve_collection }
       end
 

data/lib/terrazzo/version.rb

@@ -1,3 +1,3 @@
 module Terrazzo
-  VERSION = "0.5.1"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terrazzo
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Terrazzo Contributors