terrazzo 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b55338dd365f9ad475e3892c34a4a5ca706625b50bd331dd6793bbd756ec75e7
-  data.tar.gz: a5193fda7a10ca72103816e0f47a58ba7facf375003a4af22efa0385914378b2
+  metadata.gz: 8912409821769ce6f2303842822a9d33696bef4a24c9fdc9974411a99dccc7b0
+  data.tar.gz: a171f982161da734439ac15c77cafa831ace5f8f9b8f87b43d93aa3107cf67d1
 SHA512:
-  metadata.gz: d048907fe5b71cee9100ce4cd7a1b606e666972be105a39f15c24f3119531deccc4bc7cb85144b65623faf933dbebfd1f78d61b841909872046afe754c3ea71f
-  data.tar.gz: 6eb4e86c0a06cd790094cc0829313894f2c9d7b6ce232327a5c46610d9d507c5215b87ec81c3a136c0e5ac2b6841c22de4f81b0544a46aba2846a1f8e762f009
+  metadata.gz: 1394dab4447f66fbda0801d3b60a74ddd8f0325b6927562c4f8cf7b33212491b029efc78b12d5d8eb887496fed9261b8abb3b75f4e5f2148d74a80061951643a
+  data.tar.gz: f16c4e076d8f693b789622073df1fd9ccb5bedf36afb4eaa1032c4da09e8d87cc69b5a4929c8dcea28d0228c2ef53fc7476e71c8e12eee1e98a8b057982bad4a

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

@@ -42,7 +42,6 @@ json.table do
           json.attribute attr.to_s
           json.fieldType field.field_type
           json.value field.serialize_value(:index)
-          json.options field.serializable_options
 
           if field.class.associative? && field.data.present?
             json.showPath polymorphic_path([namespace, field.data]) rescue nil

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

@@ -5,7 +5,6 @@ show_field_json = ->(json, field) do
   json.label field.attribute.to_s.humanize
   json.fieldType field.field_type
   json.value field.serialize_value(:show)
-  json.options field.serializable_options
 
   if field.class.associative? && field.data.present?
     if field.is_a?(Terrazzo::Field::HasMany)

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

@@ -1,4 +1,5 @@
-import React, { useState } from "react";
+import React, { useState, useContext } from "react";
+import { NavigationContext } from "@thoughtbot/superglue";
 
 import {
   Table,
@@ -17,6 +18,7 @@ export function ShowField({ value, itemShowPaths }) {
 
   const { items, headers, total, initialLimit } = value;
   const [expanded, setExpanded] = useState(false);
+  const { visit } = useContext(NavigationContext);
 
   if (!items || items.length === 0) {
     return <span className="text-muted-foreground">None</span>;
@@ -26,6 +28,13 @@ export function ShowField({ value, itemShowPaths }) {
   const hasMore = initialLimit && initialLimit > 0 && total > initialLimit;
   const visibleItems = expanded || !hasMore ? items : items.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, {});
+  };
+
   // Table mode: collection_attributes specified
   if (headers) {
     return (
@@ -43,7 +52,10 @@ export function ShowField({ value, itemShowPaths }) {
               {visibleItems.map((item) => {
                 const showPath = pathFor(item.id);
                 return (
-                  <TableRow key={item.id}>
+                  <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 ? (

data/lib/terrazzo/field/has_many.rb

@@ -44,7 +44,7 @@ module Terrazzo
         limit = options.fetch(:limit, 5)
         all_records = data.to_a
         total = all_records.size
-        col_attrs = options[:collection_attributes]
+        col_attrs = options[:collection_attributes] || resolve_default_collection_attributes
 
         if col_attrs
           serialize_with_collection_attributes(all_records, col_attrs, total, limit)
@@ -57,6 +57,13 @@ module Terrazzo
         end
       end
 
+      def resolve_default_collection_attributes
+        dashboard_class = find_associated_dashboard
+        dashboard_class.new.collection_attributes
+      rescue NameError
+        nil
+      end
+
       def serialize_with_collection_attributes(records, col_attrs, total, limit)
         dashboard_class = find_associated_dashboard
 

data/lib/terrazzo/version.rb

@@ -1,3 +1,3 @@
 module Terrazzo
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

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