terrazzo 0.2.3 → 0.3.1

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

@@ -8,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 }) {

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/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,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/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,13 +6,16 @@ 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(&: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
 
@@ -50,7 +53,7 @@ module Terrazzo
           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
           }
@@ -80,7 +83,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/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/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/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.2.3"
+  VERSION = "0.3.1"
 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

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.3
+  version: 0.3.1
 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
@@ -239,6 +242,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
@@ -275,7 +279,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: {}