terrazzo 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b55338dd365f9ad475e3892c34a4a5ca706625b50bd331dd6793bbd756ec75e7
-  data.tar.gz: a5193fda7a10ca72103816e0f47a58ba7facf375003a4af22efa0385914378b2
+  metadata.gz: a9ba7563c1db759831717790db2c022eb3f2d343c3f393f6679e164c250f8fc5
+  data.tar.gz: a985e9f57b97f224b26a58cd72d9e580666d0aae1b16efd8e722ce14460ad860
 SHA512:
-  metadata.gz: d048907fe5b71cee9100ce4cd7a1b606e666972be105a39f15c24f3119531deccc4bc7cb85144b65623faf933dbebfd1f78d61b841909872046afe754c3ea71f
-  data.tar.gz: 6eb4e86c0a06cd790094cc0829313894f2c9d7b6ce232327a5c46610d9d507c5215b87ec81c3a136c0e5ac2b6841c22de4f81b0544a46aba2846a1f8e762f009
+  metadata.gz: 877fed40c106cc9ed5443197322033abd8c4d51c5fa69cb596d63ca77b355ffeb4c3235a13125a6bb6c7f1f28a747cab2c2674ebf08fee6bb4a2c7f225fc1eed
+  data.tar.gz: 24cdb50150d40149fda75e5fe376978222ab3b200247a006989cb52e98ea2e9482747ab49b3880f7557cb072ca089691f7468f3573a778eaec764bcf45b6cf3c

data/app/controllers/terrazzo/application_controller.rb

@@ -196,9 +196,15 @@ module Terrazzo
     # Build a page identifier that matches the user's namespace, not the
     # engine's internal template path. The React page-to-component mapping
     # keys off this identifier (e.g. "admin/application/index").
+    #
+    # Map create → new and update → edit so that failed validations
+    # (which render :new / :edit) resolve to the correct React component.
+    TERRAZZO_ACTION_MAP = { "create" => "new", "update" => "edit" }.freeze
+
     def terrazzo_page_identifier
       ns = controller_path.split("/").first
-      "#{ns}/application/#{action_name}"
+      mapped_action = TERRAZZO_ACTION_MAP[action_name] || action_name
+      "#{ns}/application/#{mapped_action}"
     end
 
     private

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

@@ -0,0 +1,12 @@
+resources = Terrazzo::Namespace.new(namespace).resources_with_index_route
+
+json.array! [{ label: "Resources", resources: resources }] do |group|
+  json.label group[:label]
+  json.items do
+    json.array! group[:resources] do |r|
+      json.label r.resource_name.humanize.pluralize
+      json.path url_for(controller: "/#{r.controller_path}", action: :index, only_path: true)
+      json.active r.controller_path == controller_path
+    end
+  end
+end

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

@@ -60,11 +60,3 @@ rescue ActionController::UrlGenerationError
   nil
 end
 json.resourceName resource_name
-
-json.navigation do
-  json.array! Terrazzo::Namespace.new(namespace).resources_with_index_route do |nav_resource|
-    json.label nav_resource.resource_name.humanize.pluralize
-    json.path url_for(controller: "/#{nav_resource.controller_path}", action: :index, only_path: true)
-    json.active nav_resource.controller_path == controller_path
-  end
-end

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
@@ -91,11 +90,3 @@ end
 json.resourceName resource_name.pluralize
 json.singularResourceName resource_name
 json.newResourcePath new_polymorphic_path([namespace, resource_class]) rescue nil
-
-json.navigation do
-  json.array! Terrazzo::Namespace.new(namespace).resources_with_index_route do |nav_resource|
-    json.label nav_resource.resource_name.humanize.pluralize
-    json.path url_for(controller: "/#{nav_resource.controller_path}", action: :index, only_path: true)
-    json.active nav_resource.controller_path == controller_path
-  end
-end

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

@@ -55,11 +55,3 @@ rescue ActionController::UrlGenerationError
   nil
 end
 json.resourceName resource_name
-
-json.navigation do
-  json.array! Terrazzo::Namespace.new(namespace).resources_with_index_route do |nav_resource|
-    json.label nav_resource.resource_name.humanize.pluralize
-    json.path url_for(controller: "/#{nav_resource.controller_path}", action: :index, only_path: true)
-    json.active nav_resource.controller_path == controller_path
-  end
-end

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)
@@ -44,11 +43,3 @@ rescue ActionController::UrlGenerationError
 end
 json.resourceName resource_name
 json.pluralResourceName resource_name.pluralize
-
-json.navigation do
-  json.array! Terrazzo::Namespace.new(namespace).resources_with_index_route do |nav_resource|
-    json.label nav_resource.resource_name.humanize.pluralize
-    json.path url_for(controller: "/#{nav_resource.controller_path}", action: :index, only_path: true)
-    json.active nav_resource.controller_path == controller_path
-  end
-end

data/lib/generators/terrazzo/eject/eject_generator.rb

@@ -0,0 +1,232 @@
+require "rails/generators"
+
+module Terrazzo
+  module Generators
+    class EjectGenerator < Rails::Generators::Base
+      source_root File.expand_path("../views/templates", __dir__)
+
+      argument :target, type: :string,
+        desc: "What to eject (e.g., fields/string, components/Layout, ui/button, pages/index)"
+
+      class_option :namespace, type: :string, default: "admin",
+        desc: "Admin namespace"
+
+      def eject
+        case category
+        when "fields"
+          eject_field
+        when "components"
+          eject_component
+        when "ui"
+          eject_ui
+        when "pages"
+          eject_page
+        when "navigation"
+          eject_navigation
+        else
+          say_status :error, "Unknown category '#{category}'. Use fields/, components/, ui/, pages/, or navigation", :red
+        end
+      end
+
+      private
+
+      def category
+        target.split("/").first
+      end
+
+      def component_name
+        target.split("/", 2).last
+      end
+
+      def namespace_name
+        options[:namespace]
+      end
+
+      def eject_field
+        field_type = component_name
+        source_dir = "fields/#{field_type}"
+
+        unless File.directory?(File.join(self.class.source_root, source_dir))
+          say_status :error, "Unknown field type '#{field_type}'", :red
+          return
+        end
+
+        %w[IndexField.jsx ShowField.jsx FormField.jsx].each do |file|
+          source = File.join(source_dir, file)
+          next unless File.exist?(File.join(self.class.source_root, source))
+          copy_file source, "app/views/#{namespace_name}/fields/#{field_type}/#{file}"
+        end
+
+        # Copy shared dependencies if needed
+        if field_uses_shared?(field_type)
+          copy_file "fields/shared/TextInputFormField.jsx",
+            "app/views/#{namespace_name}/fields/shared/TextInputFormField.jsx"
+        end
+
+        update_fields_barrel(field_type)
+      end
+
+      def eject_component
+        name = component_name
+        source = "components/#{name}.jsx"
+
+        unless File.exist?(File.join(self.class.source_root, source))
+          say_status :error, "Unknown component '#{name}'", :red
+          return
+        end
+
+        copy_file source, "app/views/#{namespace_name}/components/#{name}.jsx"
+        update_components_barrel(name)
+      end
+
+      def eject_ui
+        name = component_name
+        source = "components/ui/#{name}.jsx"
+
+        unless File.exist?(File.join(self.class.source_root, source))
+          say_status :error, "Unknown UI component '#{name}'", :red
+          return
+        end
+
+        copy_file source, "app/views/#{namespace_name}/components/ui/#{name}.jsx"
+        update_ui_barrel(name)
+      end
+
+      def eject_page
+        name = component_name
+        source = "pages/#{name}.jsx"
+
+        unless File.exist?(File.join(self.class.source_root, source))
+          say_status :error, "Unknown page template '#{name}'", :red
+          return
+        end
+
+        copy_file source, "app/views/#{namespace_name}/application/#{name}.jsx"
+      end
+
+      def eject_navigation
+        source = File.join(Terrazzo::Engine.root, "app/views/terrazzo/application/_navigation.json.props")
+        dest = "app/views/#{namespace_name}/application/_navigation.json.props"
+        copy_file source, dest
+        say "\nNavigation partial ejected to #{dest}.", :green
+        say "Edit it to customize your admin navigation."
+      end
+
+      def field_uses_shared?(field_type)
+        %w[string number email url password date date_time time].include?(field_type)
+      end
+
+      def update_fields_barrel(field_type)
+        barrel_path = "app/views/#{namespace_name}/fields/index.js"
+        barrel_file = File.join(destination_root, barrel_path)
+
+        type_label = field_type.split("_").map(&:capitalize).join("")
+        local_exports = <<~JS.strip
+          // #{type_label} - ejected
+          export { IndexField as #{type_label}IndexField } from "./#{field_type}/IndexField";
+          export { ShowField as #{type_label}ShowField } from "./#{field_type}/ShowField";
+          export { FormField as #{type_label}FormField } from "./#{field_type}/FormField";
+        JS
+
+        if File.exist?(barrel_file)
+          content = File.read(barrel_file)
+
+          # If barrel is still the default re-export-all, replace with explicit exports
+          if content.include?('export * from "terrazzo/fields"')
+            new_content = build_fields_barrel_with_ejection(field_type)
+            create_file barrel_path, new_content, force: true
+          else
+            # Barrel already has explicit exports; replace the line for this field type
+            # by inserting local exports before the terrazzo re-exports
+            unless content.include?("./#{field_type}/")
+              append_to_file barrel_path, "\n#{local_exports}\n"
+            end
+          end
+        end
+      end
+
+      def build_fields_barrel_with_ejection(ejected_field_type)
+        all_field_types = %w[
+          string text number boolean date date_time time email url password
+          select rich_text belongs_to has_many has_one polymorphic hstore
+        ]
+
+        lines = ['export { FieldRenderer, registerFieldType } from "terrazzo/fields";', ""]
+
+        all_field_types.each do |ft|
+          label = ft.split("_").map(&:capitalize).join("")
+          if ft == ejected_field_type
+            lines << "// #{label} - ejected"
+            lines << "export { IndexField as #{label}IndexField } from \"./#{ft}/IndexField\";"
+            lines << "export { ShowField as #{label}ShowField } from \"./#{ft}/ShowField\";"
+            lines << "export { FormField as #{label}FormField } from \"./#{ft}/FormField\";"
+          else
+            lines << "export { #{label}IndexField, #{label}ShowField, #{label}FormField } from \"terrazzo/fields\";"
+          end
+        end
+
+        lines.join("\n") + "\n"
+      end
+
+      def update_components_barrel(name)
+        barrel_path = "app/views/#{namespace_name}/components/index.js"
+        barrel_file = File.join(destination_root, barrel_path)
+
+        return unless File.exist?(barrel_file)
+
+        content = File.read(barrel_file)
+        if content.include?('export * from "terrazzo/components"')
+          export_name = component_export_name(name)
+          new_content = build_components_barrel_with_ejection(name, export_name)
+          create_file barrel_path, new_content, force: true
+        end
+      end
+
+      def build_components_barrel_with_ejection(ejected_name, export_name)
+        all_components = {
+          "Layout" => "Layout",
+          "app-sidebar" => "AppSidebar",
+          "site-header" => "SiteHeader",
+          "FlashMessages" => "FlashMessages",
+          "SearchBar" => "SearchBar",
+          "Pagination" => "Pagination",
+          "SortableHeader" => "SortableHeader",
+        }
+
+        lines = []
+        all_components.each do |file_name, export|
+          if file_name == ejected_name
+            lines << "export { #{export} } from \"./#{file_name}\"; // ejected"
+          else
+            lines << "export { #{export} } from \"terrazzo/components\";"
+          end
+        end
+
+        lines.join("\n") + "\n"
+      end
+
+      def update_ui_barrel(name)
+        barrel_path = "app/views/#{namespace_name}/components/ui/index.js"
+        barrel_file = File.join(destination_root, barrel_path)
+
+        return unless File.exist?(barrel_file)
+
+        content = File.read(barrel_file)
+        if content.include?('export * from "terrazzo/ui"')
+          new_content = "export * from \"terrazzo/ui\";\n"
+          new_content += "// Override ejected UI component:\n"
+          new_content += "export * from \"./#{name}\";\n"
+          create_file barrel_path, new_content, force: true
+        end
+      end
+
+      def component_export_name(file_name)
+        case file_name
+        when "app-sidebar" then "AppSidebar"
+        when "site-header" then "SiteHeader"
+        else file_name
+        end
+      end
+    end
+  end
+end

data/lib/generators/terrazzo/field/field_generator.rb

@@ -20,15 +20,22 @@ module Terrazzo
         end
       end
 
-      def show_registration_instructions
-        say "\nTo use your custom field, register it in your FieldRenderer.jsx:", :green
-        say "  import { IndexField as #{class_name}Index } from \"./#{file_name}/IndexField\";"
-        say "  import { ShowField as #{class_name}Show } from \"./#{file_name}/ShowField\";"
-        say "  import { FormField as #{class_name}Form } from \"./#{file_name}/FormField\";"
-        say ""
-        say "  registerFieldType(\"#{file_name}\", { index: #{class_name}Index, show: #{class_name}Show, form: #{class_name}Form });"
-        say ""
-        say "Then use it in your dashboard:"
+      def register_in_barrel
+        barrel_path = File.join(destination_root, "app/views/#{namespace_name}/fields/index.js")
+        return unless File.exist?(barrel_path)
+
+        registration = <<~JS
+
+          // #{class_name} - custom field
+          export { IndexField as #{class_name}IndexField } from "./#{file_name}/IndexField";
+          export { ShowField as #{class_name}ShowField } from "./#{file_name}/ShowField";
+          export { FormField as #{class_name}FormField } from "./#{file_name}/FormField";
+        JS
+
+        append_to_file "app/views/#{namespace_name}/fields/index.js", registration
+
+        say "\nCustom field '#{file_name}' registered in fields/index.js.", :green
+        say "Use it in your dashboard:"
         say "  #{file_name}: Terrazzo::Field::#{class_name},"
       end
 

data/lib/generators/terrazzo/field/templates/FormField.jsx.erb

@@ -1,6 +1,5 @@
 import React from "react";
-import { Input } from "../../components/ui/input";
-import { Label } from "../../components/ui/label";
+import { Input, Label } from "terrazzo/ui";
 
 export function FormField({ attribute, label, value, input, required }) {
   return (

data/lib/generators/terrazzo/install/install_generator.rb

@@ -21,7 +21,7 @@ module Terrazzo
       end
 
       def create_json_props_layout
-        copy_file "application.json.props",
+        template "application.json.props.tt",
           "app/views/layouts/#{namespace_name}/application.json.props"
       end
 

data/lib/generators/terrazzo/install/templates/admin.css

@@ -1,4 +1,5 @@
 @import "tailwindcss";
+@source "../../../node_modules/terrazzo/dist";
 
 @custom-variant dark (&:is(.dark *));
 

data/lib/generators/terrazzo/install/templates/{application.json.props → application.json.props.tt}

@@ -1,6 +1,7 @@
 path = request.format.json? ? param_to_dig_path(params[:props_at]) : nil
 
 json.data(dig: path) do
+  json.navigation(partial: ["<%= namespace_name %>/application/navigation"]) {}
   yield
 end
 

data/lib/generators/terrazzo/install/templates/page_to_page_mapping.js.erb

@@ -1,17 +1,7 @@
-<% if vite? -%>
-const pages = import.meta.glob("../../views/<%= namespace_name %>/**/*.jsx", { eager: true })
-
-export const pageToPageMapping = {}
-
-for (const key in pages) {
-  const identifier = key.replace("../../views/", "").replace(/\.jsx$/, "")
-  pageToPageMapping[identifier] = pages[key].default
-}
-<% else -%>
-import AdminIndex from "../../views/<%= namespace_name %>/application/index"
-import AdminShow from "../../views/<%= namespace_name %>/application/show"
-import AdminNew from "../../views/<%= namespace_name %>/application/new"
-import AdminEdit from "../../views/<%= namespace_name %>/application/edit"
+import AdminIndex from "../../views/<%= namespace_name %>/application/index";
+import AdminShow from "../../views/<%= namespace_name %>/application/show";
+import AdminNew from "../../views/<%= namespace_name %>/application/new";
+import AdminEdit from "../../views/<%= namespace_name %>/application/edit";
 
 export const pageToPageMapping = {
   '<%= namespace_name %>/application/index': AdminIndex,
@@ -19,4 +9,3 @@ export const pageToPageMapping = {
   '<%= namespace_name %>/application/new': AdminNew,
   '<%= namespace_name %>/application/edit': AdminEdit,
 }
-<% end -%>

data/lib/generators/terrazzo/views/templates/components/Layout.jsx

@@ -3,7 +3,7 @@ import React from "react";
 import { AppSidebar } from "./app-sidebar";
 import { SiteHeader } from "./site-header";
 import { FlashMessages } from "./FlashMessages";
-import { SidebarProvider, SidebarInset } from "./ui/sidebar";
+import { SidebarProvider, SidebarInset } from "terrazzo/ui";
 
 export function Layout({ navigation, title, actions, children }) {
   return (

data/lib/generators/terrazzo/views/templates/components/Pagination.jsx

@@ -1,14 +1,14 @@
 import React, { useContext } from "react";
 import { NavigationContext } from "@thoughtbot/superglue";
 
-import { Field, FieldLabel } from "./ui/field";
+import { Field, FieldLabel } from "terrazzo/ui";
 import {
   Pagination as PaginationRoot,
   PaginationContent,
   PaginationItem,
   PaginationNext,
   PaginationPrevious,
-} from "./ui/pagination";
+} from "terrazzo/ui";
 import {
   Select,
   SelectContent,
@@ -16,7 +16,7 @@ import {
   SelectItem,
   SelectTrigger,
   SelectValue,
-} from "./ui/select";
+} from "terrazzo/ui";
 
 export function Pagination({ currentPage, totalPages, totalCount, perPage, nextPagePath, prevPagePath }) {
   const { remote, pageKey } = useContext(NavigationContext);

data/lib/generators/terrazzo/views/templates/components/SearchBar.jsx

@@ -1,7 +1,7 @@
 import React, { useRef, useContext } from "react";
 import { NavigationContext } from "@thoughtbot/superglue";
 
-import { Input } from "./ui/input";
+import { Input } from "terrazzo/ui";
 import { Search } from "lucide-react";
 
 export function SearchBar({ searchTerm, searchPath }) {

data/lib/generators/terrazzo/views/templates/components/SortableHeader.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { ChevronUp, ChevronDown, ChevronsUpDown } from "lucide-react";
 
-import { TableHead } from "./ui/table";
+import { TableHead } from "terrazzo/ui";
 
 export function SortableHeader({ label, sortable, sortUrl, sortDirection }) {
   if (!sortable) {

data/lib/generators/terrazzo/views/templates/components/app-sidebar.jsx

@@ -11,7 +11,7 @@ import {
   SidebarMenu,
   SidebarMenuButton,
   SidebarMenuItem,
-} from "./ui/sidebar";
+} from "terrazzo/ui";
 
 export function AppSidebar({
   navigation,
@@ -27,7 +27,7 @@ export function AppSidebar({
               asChild
               className="data-[slot=sidebar-menu-button]:!p-1.5">
 
-              <a href={navigation[0]?.path ?? "#"} data-sg-visit>
+              <a href={navigation[0]?.items?.[0]?.path ?? navigation[0]?.path ?? "#"} data-sg-visit>
                 <LayoutDashboardIcon className="h-5 w-5" />
                 <span className="text-base font-semibold">{title}</span>
               </a>
@@ -36,26 +36,27 @@ export function AppSidebar({
         </SidebarMenu>
       </SidebarHeader>
       <SidebarContent>
-        <SidebarGroup>
-          <SidebarGroupLabel>Resources</SidebarGroupLabel>
-          <SidebarGroupContent>
-            <SidebarMenu>
-              {navigation.map((item) =>
-              <SidebarMenuItem key={item.path}>
-                  <SidebarMenuButton
-                  asChild
-                  isActive={item.active}
-                  tooltip={item.label}>
-
-                    <a href={item.path} data-sg-visit>
-                      <span>{item.label}</span>
-                    </a>
-                  </SidebarMenuButton>
-                </SidebarMenuItem>
-              )}
-            </SidebarMenu>
-          </SidebarGroupContent>
-        </SidebarGroup>
+        {navigation.map((group) =>
+          <SidebarGroup key={group.label}>
+            <SidebarGroupLabel>{group.label}</SidebarGroupLabel>
+            <SidebarGroupContent>
+              <SidebarMenu>
+                {group.items.map((item) =>
+                  <SidebarMenuItem key={item.path}>
+                    <SidebarMenuButton
+                      asChild
+                      isActive={item.active}
+                      tooltip={item.label}>
+                      <a href={item.path} data-sg-visit>
+                        <span>{item.label}</span>
+                      </a>
+                    </SidebarMenuButton>
+                  </SidebarMenuItem>
+                )}
+              </SidebarMenu>
+            </SidebarGroupContent>
+          </SidebarGroup>
+        )}
       </SidebarContent>
     </Sidebar>);
 

data/lib/generators/terrazzo/views/templates/components/site-header.jsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { Separator } from "./ui/separator";
-import { SidebarTrigger } from "./ui/sidebar";
+import { Separator } from "terrazzo/ui";
+import { SidebarTrigger } from "terrazzo/ui";
 
 export function SiteHeader({ title, actions }) {
   return (

data/lib/generators/terrazzo/views/templates/components/ui/index.js

@@ -97,7 +97,7 @@ export {
   SelectScrollDownButton,
 } from "./select";
 export {
-  Pagination as UiPagination,
+  Pagination,
   PaginationContent,
   PaginationItem,
   PaginationLink,

data/lib/generators/terrazzo/views/templates/fields/belongs_to/FormField.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-import { Label } from "../../components/ui/label";
+import { Label } from "terrazzo/ui";
 
 export function FormField({ value, label, input, options, required }) {
   const resourceOptions = options?.resourceOptions ?? [];

data/lib/generators/terrazzo/views/templates/fields/boolean/FormField.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-import { Label } from "../../components/ui/label";
+import { Label } from "terrazzo/ui";
 
 export function FormField({ value, label, input, required }) {
   return (

data/lib/generators/terrazzo/views/templates/fields/boolean/IndexField.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-import { Badge } from "../../components/ui/badge";
+import { Badge } from "terrazzo/ui";
 
 export function IndexField({ value }) {
   if (value == null) return <span className="text-muted-foreground">-</span>;

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

@@ -1,9 +1,9 @@
 import React, { useState, useRef, useCallback } from "react";
 import { X, Check } from "lucide-react";
 
-import { Label } from "../../components/ui/label";
-import { Badge } from "../../components/ui/badge";
-import { Popover, PopoverTrigger, PopoverContent } from "../../components/ui/popover";
+import { Label } from "terrazzo/ui";
+import { Badge } from "terrazzo/ui";
+import { Popover, PopoverTrigger, PopoverContent } from "terrazzo/ui";
 import { cn } from "terrazzo";
 
 export function FormField({ value, label, input, options, required }) {

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

@@ -1,6 +1,6 @@
 import React from "react";
 
-import { Badge } from "../../components/ui/badge";
+import { Badge } from "terrazzo/ui";
 
 export function IndexField({ value }) {
   const count = typeof value === "number" ? value : 0;

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,
@@ -7,9 +8,9 @@ import {
   TableRow,
   TableHead,
   TableCell,
-} from "../../components/ui/table";
-import { Badge } from "../../components/ui/badge";
-import { Button } from "../../components/ui/button";
+} from "terrazzo/ui";
+import { Badge } from "terrazzo/ui";
+import { Button } from "terrazzo/ui";
 import { FieldRenderer } from "../FieldRenderer";
 
 export function ShowField({ value, itemShowPaths }) {
@@ -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/generators/terrazzo/views/templates/fields/has_one/FormField.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-import { Label } from "../../components/ui/label";
+import { Label } from "terrazzo/ui";
 
 export function FormField({ value, label, input, options, required }) {
   const resourceOptions = options?.resourceOptions ?? [];

data/lib/generators/terrazzo/views/templates/fields/hstore/FormField.jsx

@@ -1,8 +1,8 @@
 import React, { useState, useRef, useEffect } from "react";
 
-import { Input } from "../../components/ui/input";
-import { Button } from "../../components/ui/button";
-import { Label } from "../../components/ui/label";
+import { Input } from "terrazzo/ui";
+import { Button } from "terrazzo/ui";
+import { Label } from "terrazzo/ui";
 
 export function FormField({ value, label, input, options, required }) {
   const initialPairs = () => {

data/lib/generators/terrazzo/views/templates/fields/hstore/IndexField.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-import { Badge } from "../../components/ui/badge";
+import { Badge } from "terrazzo/ui";
 
 export function IndexField({ value }) {
   if (value == null || value === "") {

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

@@ -1,6 +1,6 @@
 import React from "react";
 
-import { Badge } from "../../components/ui/badge";
+import { Badge } from "terrazzo/ui";
 
 export function ShowField({ value }) {
   if (value == null || Object.keys(value).length === 0) {

data/lib/generators/terrazzo/views/templates/fields/polymorphic/FormField.jsx

@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 
-import { Label } from "../../components/ui/label";
+import { Label } from "terrazzo/ui";
 
 export function FormField({ value, label, input, options, required }) {
   const groupedOptions = options?.groupedOptions ?? {};

data/lib/generators/terrazzo/views/templates/fields/rich_text/FormField.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 
-import { Textarea } from "../../components/ui/textarea";
-import { Label } from "../../components/ui/label";
+import { Textarea } from "terrazzo/ui";
+import { Label } from "terrazzo/ui";
 
 export function FormField({ value, label, input, required }) {
   return (

data/lib/generators/terrazzo/views/templates/fields/select/FormField.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-import { Label } from "../../components/ui/label";
+import { Label } from "terrazzo/ui";
 
 export function FormField({ value, label, input, options, required }) {
   const selectableOptions = options?.selectableOptions ?? [];

data/lib/generators/terrazzo/views/templates/fields/select/IndexField.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-import { Badge } from "../../components/ui/badge";
+import { Badge } from "terrazzo/ui";
 
 export function IndexField({ value }) {
   if (value == null) return <span className="text-muted-foreground">-</span>;

data/lib/generators/terrazzo/views/templates/fields/shared/TextInputFormField.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 
-import { Input } from "../../components/ui/input";
-import { Label } from "../../components/ui/label";
+import { Input } from "terrazzo/ui";
+import { Label } from "terrazzo/ui";
 
 export function TextInputFormField({ type = "text", value, label, input, required, defaultValue, ...inputProps }) {
   const resolvedDefault = defaultValue !== undefined ? defaultValue : String(value ?? "");

data/lib/generators/terrazzo/views/templates/fields/text/FormField.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 
-import { Textarea } from "../../components/ui/textarea";
-import { Label } from "../../components/ui/label";
+import { Textarea } from "terrazzo/ui";
+import { Label } from "terrazzo/ui";
 
 export function FormField({ value, label, input, required }) {
   return (

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

@@ -1,7 +1,7 @@
 import React from "react";
 
-import { FieldRenderer } from "../fields/FieldRenderer";
-import { Button } from "../components/ui/button";
+import { FieldRenderer } from "terrazzo/fields";
+import { Button } from "terrazzo/ui";
 
 export function AdminForm({ form, errors }) {
   const { props: formProps, extras, fieldGroups, fields } = form;

data/lib/generators/terrazzo/views/templates/pages/_navigation.json.props

@@ -0,0 +1,5 @@
+json.array! Terrazzo::Namespace.new(namespace).resources_with_index_route do |nav_resource|
+  json.label nav_resource.resource_name.humanize.pluralize
+  json.path url_for(controller: "/#{nav_resource.controller_path}", action: :index, only_path: true)
+  json.active nav_resource.controller_path == controller_path
+end

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

@@ -1,10 +1,9 @@
 import React from "react";
 import { useContent } from "@thoughtbot/superglue";
 
-import { Layout } from "../components/Layout";
+import { Layout } from "terrazzo/components";
 import { AdminForm } from "./_form";
-import { Button } from "../components/ui/button";
-import { Card, CardContent } from "../components/ui/card";
+import { Button, Card, CardContent } from "terrazzo/ui";
 
 export default function AdminEdit() {
   const {

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

@@ -1,20 +1,9 @@
 import React, { useContext } from "react";
 import { useContent, NavigationContext } from "@thoughtbot/superglue";
 
-import { Layout } from "../components/Layout";
-import { SearchBar } from "../components/SearchBar";
-import { Pagination } from "../components/Pagination";
-import { SortableHeader } from "../components/SortableHeader";
-import { FieldRenderer } from "../fields/FieldRenderer";
-import { Button } from "../components/ui/button";
-import {
-  Table,
-  TableHeader,
-  TableBody,
-  TableRow,
-  TableHead,
-  TableCell,
-} from "../components/ui/table";
+import { Layout, SearchBar, Pagination, SortableHeader } from "terrazzo/components";
+import { FieldRenderer } from "terrazzo/fields";
+import { Button, Table, TableHeader, TableBody, TableRow, TableHead, TableCell } from "terrazzo/ui";
 
 export default function AdminIndex() {
   const { visit } = useContext(NavigationContext);

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

@@ -1,10 +1,9 @@
 import React from "react";
 import { useContent } from "@thoughtbot/superglue";
 
-import { Layout } from "../components/Layout";
+import { Layout } from "terrazzo/components";
 import { AdminForm } from "./_form";
-import { Button } from "../components/ui/button";
-import { Card, CardContent } from "../components/ui/card";
+import { Button, Card, CardContent } from "terrazzo/ui";
 
 export default function AdminNew() {
   const {

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

@@ -1,10 +1,9 @@
 import React from "react";
 import { useContent } from "@thoughtbot/superglue";
 
-import { Layout } from "../components/Layout";
-import { FieldRenderer } from "../fields/FieldRenderer";
-import { Button } from "../components/ui/button";
-import { Card, CardContent, CardHeader, CardTitle } from "../components/ui/card";
+import { Layout } from "terrazzo/components";
+import { FieldRenderer } from "terrazzo/fields";
+import { Button, Card, CardContent, CardHeader, CardTitle } from "terrazzo/ui";
 
 export default function AdminShow() {
   const {

data/lib/generators/terrazzo/views/views_generator.rb

@@ -8,38 +8,57 @@ module Terrazzo
       class_option :namespace, type: :string, default: "admin",
         desc: "Admin namespace"
 
-      def copy_ui_components
-        directory "components/ui", "app/views/#{namespace_name}/components/ui"
+      def create_fields_barrel
+        create_file "app/views/#{namespace_name}/fields/index.js", <<~JS
+          // Re-export all fields from the terrazzo package.
+          // To customize a field, run: rails g terrazzo:eject fields/<field_type>
+          export * from "terrazzo/fields";
+        JS
       end
 
-      def copy_shared_components
-        %w[
-          Layout.jsx
-          app-sidebar.jsx
-          site-header.jsx
-          FlashMessages.jsx
-          SearchBar.jsx
-          Pagination.jsx
-          SortableHeader.jsx
-        ].each do |file|
-          copy_file "components/#{file}", "app/views/#{namespace_name}/components/#{file}"
-        end
+      def create_components_barrel
+        create_file "app/views/#{namespace_name}/components/index.js", <<~JS
+          // Re-export all components from the terrazzo package.
+          // To customize, run: rails g terrazzo:eject components/<component_name>
+          export * from "terrazzo/components";
+        JS
       end
 
-      def copy_page_templates
-        {
-          "pages/index.jsx" => "application/index.jsx",
-          "pages/show.jsx" => "application/show.jsx",
-          "pages/new.jsx" => "application/new.jsx",
-          "pages/edit.jsx" => "application/edit.jsx",
-          "pages/_form.jsx" => "application/_form.jsx",
-        }.each do |src, dest|
-          copy_file src, "app/views/#{namespace_name}/#{dest}"
-        end
+      def create_ui_barrel
+        create_file "app/views/#{namespace_name}/components/ui/index.js", <<~JS
+          // Re-export all UI primitives from the terrazzo package.
+          // To customize, run: rails g terrazzo:eject ui/<component_name>
+          export * from "terrazzo/ui";
+        JS
+      end
+
+      def create_navigation_partial
+        create_file "app/views/#{namespace_name}/application/_navigation.json.props", <<~RUBY
+          resources = Terrazzo::Namespace.new(namespace).resources_with_index_route
+
+          json.array! [{ label: "Resources", resources: resources }] do |group|
+            json.label group[:label]
+            json.items do
+              json.array! group[:resources] do |r|
+                json.label r.resource_name.humanize.pluralize
+                json.path url_for(controller: "/\#{r.controller_path}", action: :index, only_path: true)
+                json.active r.controller_path == controller_path
+              end
+            end
+          end
+        RUBY
       end
 
-      def copy_field_components
-        directory "fields", "app/views/#{namespace_name}/fields"
+      def create_page_stubs
+        {
+          "index" => "AdminIndex",
+          "show" => "AdminShow",
+          "new" => "AdminNew",
+          "edit" => "AdminEdit",
+        }.each do |page, component|
+          create_file "app/views/#{namespace_name}/application/#{page}.jsx",
+            "export { #{component} as default } from \"terrazzo/pages\";\n"
+        end
       end
 
       private

data/lib/terrazzo/field/associative.rb

@@ -44,7 +44,7 @@ module Terrazzo
           associated_class.all
         end
         pk = association_primary_key
-        scope.map { |r| [display_name(r), r.public_send(pk)] }
+        scope.map { |r| [display_name(r), r.public_send(pk).to_s] }
       end
 
       def association_primary_key

data/lib/terrazzo/field/belongs_to.rb

@@ -4,10 +4,10 @@ module Terrazzo
       def serialize_value(mode)
         case mode
         when :form
-          foreign_key_value
+          foreign_key_value&.to_s
         else
           return nil if data.nil?
-          { id: data.id, display: display_name(data) }
+          { id: data.id.to_s, display: display_name(data) }
         end
       end
 

data/lib/terrazzo/field/has_many.rb

@@ -8,11 +8,11 @@ module Terrazzo
         when :index
           data.size
         when :form
-          data.map(&:id)
+          data.map { |r| r.id.to_s }
         when :show
           serialize_show_value
         else
-          data.map { |r| { id: r.id, display: display_name(r) } }
+          data.map { |r| { id: r.id.to_s, display: display_name(r) } }
         end
       end
 
@@ -44,19 +44,26 @@ 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)
         else
           {
-            items: all_records.map { |r| { id: r.id, display: display_name(r) } },
+            items: all_records.map { |r| { id: r.id.to_s, display: display_name(r) } },
             total: total,
             initialLimit: limit
           }
         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
 
@@ -73,7 +80,7 @@ module Terrazzo
               value: field.serialize_value(:index)
             }
           end
-          { id: record.id, columns: columns }
+          { id: record.id.to_s, columns: columns }
         end
 
         {

data/lib/terrazzo/field/has_one.rb

@@ -4,10 +4,10 @@ module Terrazzo
       def serialize_value(mode)
         case mode
         when :form
-          data&.id
+          data&.id&.to_s
         else
           return nil if data.nil?
-          { id: data.id, display: display_name(data) }
+          { id: data.id.to_s, display: display_name(data) }
         end
       end
 

data/lib/terrazzo/field/polymorphic.rb

@@ -5,10 +5,10 @@ module Terrazzo
         case mode
         when :form
           return nil if data.nil?
-          { type: data.class.name, id: data.id }
+          { type: data.class.name, id: data.id.to_s }
         else
           return nil if data.nil?
-          { id: data.id, display: display_name(data), type: data.class.name }
+          { id: data.id.to_s, display: display_name(data), type: data.class.name }
         end
       end
 
@@ -17,7 +17,7 @@ module Terrazzo
         classes = options[:classes] || []
         opts[:groupedOptions] = classes.each_with_object({}) do |klass, hash|
           klass = klass.constantize if klass.is_a?(::String)
-          hash[klass.name] = klass.all.map { |r| [display_name(r), r.id] }
+          hash[klass.name] = klass.all.map { |r| [display_name(r), r.id.to_s] }
         end
         opts
       end

data/lib/terrazzo/version.rb

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

data/terrazzo.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.email = []
   spec.summary = "A Rails admin framework powered by Superglue and React"
   spec.description = "Drop-in admin panel for Rails apps using the Administrate dashboard DSL with a React SPA frontend powered by Superglue."
-  spec.homepage = "https://github.com/wengzilla/terrazzo"
+  spec.homepage = "https://github.com/gohypelab/terrazzo"
   spec.license = "MIT"
   spec.required_ruby_version = ">= 3.1"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terrazzo
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Terrazzo Contributors
@@ -117,6 +117,7 @@ files:
 - LICENSE
 - Rakefile
 - app/controllers/terrazzo/application_controller.rb
+- app/views/terrazzo/application/_navigation.json.props
 - app/views/terrazzo/application/edit.json.props
 - app/views/terrazzo/application/index.json.props
 - app/views/terrazzo/application/new.json.props
@@ -126,6 +127,7 @@ files:
 - lib/generators/terrazzo/dashboard/dashboard_generator.rb
 - lib/generators/terrazzo/dashboard/templates/controller.rb.erb
 - lib/generators/terrazzo/dashboard/templates/dashboard.rb.erb
+- lib/generators/terrazzo/eject/eject_generator.rb
 - lib/generators/terrazzo/field/field_generator.rb
 - lib/generators/terrazzo/field/templates/FormField.jsx.erb
 - lib/generators/terrazzo/field/templates/IndexField.jsx.erb
@@ -134,8 +136,8 @@ files:
 - lib/generators/terrazzo/install/install_generator.rb
 - lib/generators/terrazzo/install/templates/admin.css
 - lib/generators/terrazzo/install/templates/application.js.erb
-- lib/generators/terrazzo/install/templates/application.json.props
 - lib/generators/terrazzo/install/templates/application.json.props.erb
+- lib/generators/terrazzo/install/templates/application.json.props.tt
 - lib/generators/terrazzo/install/templates/application_controller.rb.erb
 - lib/generators/terrazzo/install/templates/application_visit.js.erb
 - lib/generators/terrazzo/install/templates/flash_slice.js.erb
@@ -231,6 +233,7 @@ files:
 - lib/generators/terrazzo/views/templates/fields/url/IndexField.jsx
 - lib/generators/terrazzo/views/templates/fields/url/ShowField.jsx
 - lib/generators/terrazzo/views/templates/pages/_form.jsx
+- lib/generators/terrazzo/views/templates/pages/_navigation.json.props
 - lib/generators/terrazzo/views/templates/pages/edit.jsx
 - lib/generators/terrazzo/views/templates/pages/index.jsx
 - lib/generators/terrazzo/views/templates/pages/new.jsx
@@ -275,7 +278,7 @@ files:
 - lib/terrazzo/uses_superglue.rb
 - lib/terrazzo/version.rb
 - terrazzo.gemspec
-homepage: https://github.com/wengzilla/terrazzo
+homepage: https://github.com/gohypelab/terrazzo
 licenses:
 - MIT
 metadata: {}