terrazzo 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ff3b38b0cdec57570baa990aef1998197eba301cfa0c297d0619ff7d4003374
-  data.tar.gz: f0556e47ac6c647db017b2ebb0167a5f9585a5d3c9353bab740131fbd717b02b
+  metadata.gz: '0668700d10e6547d3366e74348a33674733828a834d3be9dd02ddd7effab6bd8'
+  data.tar.gz: d85d82e780f8820d1b306ac5f63c3d1a96802da1f56f301e11b8040903372601
 SHA512:
-  metadata.gz: b46cb63e1fe4754a6938fec445f76aa90eba36f55c3fde38f08713db3e325f504b3fe985816625a07e5a8b77e7fe6d820c62f262dd20d443deaa6566111c75db
-  data.tar.gz: '0974a53199cdbdb29b8e90096429ee853df3bbeb5414cb60d1ef2dceca0c6356a7533921a3ab383a19b04bc408e08658e8f5e4d58a55f7dbfb5caa06454ad39f'
+  metadata.gz: 84bff5afcc8deb6b423f7112593c318b80716c384d7e1140d596e50b816de4e8c651bb76d9cfa4653b5154ec1c28a7185052928f136fcdafa044ef3d8762f4c4
+  data.tar.gz: eaec2494d92552710c555f3f45db30688e29ca4a20af4d29c488aa8d15f62efaa42d7ae8e399c95d5c3cb291bb36f3001f9e96e5e4c47d02ae3009490b377f3c

data/app/controllers/terrazzo/application_controller.rb

@@ -14,6 +14,8 @@ module Terrazzo
 
     before_action :use_jsx_rendering_defaults
 
+    prepend Terrazzo::UsesSuperglue::TemplateLookupOverride
+
     helper_method :namespace, :dashboard, :resource_name, :resource_class, :application_title, :terrazzo_page_identifier
 
     def index

data/lib/generators/terrazzo/dashboard/dashboard_generator.rb

@@ -15,12 +15,12 @@ module Terrazzo
 
       def create_dashboard
         template "dashboard.rb.erb",
-          "app/dashboards/#{file_name}_dashboard.rb"
+          "app/dashboards/#{class_path.join('/')}/#{file_name}_dashboard.rb".squeeze("/")
       end
 
       def create_controller
         template "controller.rb.erb",
-          "app/controllers/#{options[:namespace]}/#{file_name.pluralize}_controller.rb"
+          "app/controllers/#{options[:namespace]}/#{class_path.join('/')}/#{file_name.pluralize}_controller.rb".squeeze("/")
       end
 
       def update_page_to_page_mapping
@@ -75,7 +75,7 @@ module Terrazzo
         associations.each do |assoc|
           case assoc.macro
           when :belongs_to
-            types[assoc.name] = "Field::BelongsTo"
+            types[assoc.name] = assoc.options[:polymorphic] ? "Field::Polymorphic" : "Field::BelongsTo"
           when :has_many, :has_and_belongs_to_many
             types[assoc.name] = "Field::HasMany"
           when :has_one

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

@@ -50,6 +50,11 @@ module Terrazzo
           "app/javascript/#{namespace_name}/slices/flash.js"
       end
 
+      def create_stylesheet
+        copy_file "admin.css",
+          "app/assets/stylesheets/#{namespace_name}.css"
+      end
+
       def run_views_generator
         generate "terrazzo:views", "--namespace=#{namespace_name}"
       end
@@ -75,10 +80,16 @@ module Terrazzo
       end
 
       def application_models
-        Rails.application.eager_load! if defined?(Rails)
-        ApplicationRecord.descendants.reject(&:abstract_class?)
-      rescue
-        []
+        models_path = Rails.root.join("app", "models")
+        return [] unless models_path.exist?
+
+        Dir[models_path.join("**", "*.rb")].filter_map do |file|
+          relative = Pathname.new(file).relative_path_from(models_path).to_s
+          next if relative.start_with?("concerns/")
+          next if relative == "application_record.rb"
+
+          relative.delete_suffix(".rb").camelize.safe_constantize
+        end.select { |klass| klass < ApplicationRecord && !klass.abstract_class? }
       end
     end
   end

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

@@ -0,0 +1,119 @@
+@import "tailwindcss";
+
+@custom-variant dark (&:is(.dark *));
+
+:root {
+  --radius: 0.625rem;
+  --background: oklch(1 0 0);
+  --foreground: oklch(0.145 0 0);
+  --card: oklch(1 0 0);
+  --card-foreground: oklch(0.145 0 0);
+  --popover: oklch(1 0 0);
+  --popover-foreground: oklch(0.145 0 0);
+  --primary: oklch(0.205 0 0);
+  --primary-foreground: oklch(0.985 0 0);
+  --secondary: oklch(0.97 0 0);
+  --secondary-foreground: oklch(0.205 0 0);
+  --muted: oklch(0.97 0 0);
+  --muted-foreground: oklch(0.556 0 0);
+  --accent: oklch(0.97 0 0);
+  --accent-foreground: oklch(0.205 0 0);
+  --destructive: oklch(0.577 0.245 27.325);
+  --destructive-foreground: oklch(0.985 0 0);
+  --border: oklch(0.922 0 0);
+  --input: oklch(0.922 0 0);
+  --ring: oklch(0.708 0 0);
+  --chart-1: oklch(0.646 0.222 41.116);
+  --chart-2: oklch(0.6 0.118 184.704);
+  --chart-3: oklch(0.398 0.07 227.392);
+  --chart-4: oklch(0.828 0.189 84.429);
+  --chart-5: oklch(0.769 0.188 70.08);
+  --sidebar: oklch(0.985 0 0);
+  --sidebar-foreground: oklch(0.145 0 0);
+  --sidebar-primary: oklch(0.205 0 0);
+  --sidebar-primary-foreground: oklch(0.985 0 0);
+  --sidebar-accent: oklch(0.97 0 0);
+  --sidebar-accent-foreground: oklch(0.205 0 0);
+  --sidebar-border: oklch(0.922 0 0);
+  --sidebar-ring: oklch(0.708 0 0);
+}
+
+.dark {
+  --background: oklch(0.145 0 0);
+  --foreground: oklch(0.985 0 0);
+  --card: oklch(0.205 0 0);
+  --card-foreground: oklch(0.985 0 0);
+  --popover: oklch(0.269 0 0);
+  --popover-foreground: oklch(0.985 0 0);
+  --primary: oklch(0.922 0 0);
+  --primary-foreground: oklch(0.205 0 0);
+  --secondary: oklch(0.269 0 0);
+  --secondary-foreground: oklch(0.985 0 0);
+  --muted: oklch(0.269 0 0);
+  --muted-foreground: oklch(0.708 0 0);
+  --accent: oklch(0.371 0 0);
+  --accent-foreground: oklch(0.985 0 0);
+  --destructive: oklch(0.704 0.191 22.216);
+  --destructive-foreground: oklch(0.985 0 0);
+  --border: oklch(1 0 0 / 10%);
+  --input: oklch(1 0 0 / 15%);
+  --ring: oklch(0.556 0 0);
+  --chart-1: oklch(0.488 0.243 264.376);
+  --chart-2: oklch(0.696 0.17 162.48);
+  --chart-3: oklch(0.769 0.188 70.08);
+  --chart-4: oklch(0.627 0.265 303.9);
+  --chart-5: oklch(0.645 0.246 16.439);
+  --sidebar: oklch(0.205 0 0);
+  --sidebar-foreground: oklch(0.985 0 0);
+  --sidebar-primary: oklch(0.488 0.243 264.376);
+  --sidebar-primary-foreground: oklch(0.985 0 0);
+  --sidebar-accent: oklch(0.269 0 0);
+  --sidebar-accent-foreground: oklch(0.985 0 0);
+  --sidebar-border: oklch(1 0 0 / 10%);
+  --sidebar-ring: oklch(0.439 0 0);
+}
+
+@theme inline {
+  --color-background: var(--background);
+  --color-foreground: var(--foreground);
+  --color-card: var(--card);
+  --color-card-foreground: var(--card-foreground);
+  --color-popover: var(--popover);
+  --color-popover-foreground: var(--popover-foreground);
+  --color-primary: var(--primary);
+  --color-primary-foreground: var(--primary-foreground);
+  --color-secondary: var(--secondary);
+  --color-secondary-foreground: var(--secondary-foreground);
+  --color-muted: var(--muted);
+  --color-muted-foreground: var(--muted-foreground);
+  --color-accent: var(--accent);
+  --color-accent-foreground: var(--accent-foreground);
+  --color-destructive: var(--destructive);
+  --color-destructive-foreground: var(--destructive-foreground);
+  --color-border: var(--border);
+  --color-input: var(--input);
+  --color-ring: var(--ring);
+  --color-chart-1: var(--chart-1);
+  --color-chart-2: var(--chart-2);
+  --color-chart-3: var(--chart-3);
+  --color-chart-4: var(--chart-4);
+  --color-chart-5: var(--chart-5);
+  --color-sidebar: var(--sidebar);
+  --color-sidebar-foreground: var(--sidebar-foreground);
+  --color-sidebar-primary: var(--sidebar-primary);
+  --color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
+  --color-sidebar-accent: var(--sidebar-accent);
+  --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
+  --color-sidebar-border: var(--sidebar-border);
+  --color-sidebar-ring: var(--sidebar-ring);
+  --radius-sm: calc(var(--radius) - 4px);
+  --radius-md: calc(var(--radius) - 2px);
+  --radius-lg: var(--radius);
+  --radius-xl: calc(var(--radius) + 4px);
+}
+
+*,
+::after,
+::before {
+  border-color: var(--color-border);
+}

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

@@ -1,8 +1,50 @@
 import { visit, remote } from "@thoughtbot/superglue/action_creators"
 
-export function buildVisitAndRemote(ref, store, pageToPageMapping) {
-  const appVisit = visit(ref, store, pageToPageMapping)
-  const appRemote = remote(ref, store, pageToPageMapping)
+export const buildVisitAndRemote = (ref, store) => {
+  const appRemote = (path, { dataset, ...options }) => {
+    return store.dispatch(remote(path, options))
+  }
+
+  const appVisit = (path, { dataset, ...options } = {}) => {
+    return store
+      .dispatch(visit(path, options))
+      .then((meta) => {
+        if (meta.needsRefresh) {
+          window.location.href = meta.pageKey
+          return meta
+        }
+
+        const navigationAction = !!dataset?.sgReplace
+          ? "replace"
+          : meta.navigationAction
+        ref.current?.navigateTo(meta.pageKey, {
+          action: navigationAction,
+        })
+
+        return meta
+      })
+      .catch((err) => {
+        const response = err.response
+
+        if (!response) {
+          console.error(err)
+          return
+        }
+
+        if (response.ok) {
+          window.location = response.url
+        } else {
+          if (response.status >= 400 && response.status < 500) {
+            window.location.href = "/400.html"
+            return
+          }
+          if (response.status >= 500) {
+            window.location.href = "/500.html"
+            return
+          }
+        }
+      })
+  }
 
   return { visit: appVisit, remote: appRemote }
 }

data/lib/generators/terrazzo/routes/routes_generator.rb

@@ -10,28 +10,61 @@ module Terrazzo
 
       def insert_routes
         namespace_name = options[:namespace]
-        route_content = <<~RUBY.indent(2)
+        models = application_models
+
+        # Group models by their module namespace
+        namespaced = {}
+        top_level = []
+
+        models.each do |model|
+          parts = model.name.split("::")
+          if parts.size > 1
+            ns = parts[0..-2].join("::").underscore
+            resource = parts.last.underscore.pluralize
+            namespaced[ns] ||= []
+            namespaced[ns] << resource
+          else
+            top_level << model.model_name.plural
+          end
+        end
+
+        lines = []
+        top_level.sort.each { |r| lines << "    resources :#{r}" }
+
+        namespaced.sort.each do |ns, resources|
+          lines << ""
+          lines << "    namespace :#{ns} do"
+          resources.sort.each { |r| lines << "      resources :#{r}" }
+          lines << "    end"
+        end
+
+        first_resource = top_level.sort.first || namespaced.values.flatten.first || "dashboard"
+
+        route_block = <<~RUBY.indent(2)
           namespace :#{namespace_name} do
+          #{lines.join("\n")}
+
             root to: "#{first_resource}#index"
           end
         RUBY
 
-        route route_content.strip
+        route route_block.strip
       end
 
       private
 
-      def first_resource
-        # Default to "customers" if no models found
-        models = application_models
-        models.any? ? models.first.model_name.plural : "dashboard"
-      end
-
       def application_models
-        Rails.application.eager_load! if defined?(Rails)
-        ApplicationRecord.descendants.reject(&:abstract_class?)
-      rescue
-        []
+        models_path = Rails.root.join("app", "models")
+        return [] unless models_path.exist?
+
+        Dir[models_path.join("**", "*.rb")].filter_map do |file|
+          relative = Pathname.new(file).relative_path_from(models_path).to_s
+          next if relative.start_with?("concerns/")
+          next if relative == "application_record.rb"
+
+          relative.delete_suffix(".rb").camelize.safe_constantize
+        end.select { |klass| klass < ApplicationRecord && !klass.abstract_class? }
+         .sort_by { |klass| klass.name }
       end
     end
   end

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

@@ -21,3 +21,5 @@ export function Layout({ navigation, title, actions, children }) {
     </SidebarProvider>);
 
 }
+
+export default Layout;

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

@@ -1,5 +1,5 @@
 import React from "react";
-import { ArrowUp, ArrowDown, ArrowUpDown } from "lucide-react";
+import { ChevronUp, ChevronDown, ChevronsUpDown } from "lucide-react";
 
 import { TableHead } from "./ui/table";
 
@@ -17,11 +17,11 @@ export function SortableHeader({ label, sortable, sortUrl, sortDirection }) {
 
         {label}
         {sortDirection === "asc" ?
-        <ArrowUp className="h-4 w-4" /> :
+        <ChevronUp className="h-4 w-4" /> :
         sortDirection === "desc" ?
-        <ArrowDown className="h-4 w-4" /> :
+        <ChevronDown className="h-4 w-4" /> :
 
-        <ArrowUpDown className="h-4 w-4" />
+        <ChevronsUpDown className="h-4 w-4" />
         }
       </a>
     </TableHead>);

data/lib/terrazzo/base_dashboard.rb

@@ -63,7 +63,9 @@ module Terrazzo
     end
 
     def collection_includes
+      collection_attr_set = Set.new(collection_attributes)
       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)
         includes << attr

data/lib/terrazzo/engine.rb

@@ -17,5 +17,11 @@ module Terrazzo
       app.config.superglue = ActiveSupport::OrderedOptions.new unless app.config.respond_to?(:superglue)
       app.config.superglue.auto_include = false
     end
+
+    initializer "terrazzo.uses_superglue" do
+      ActiveSupport.on_load(:action_controller_base) do
+        extend Terrazzo::UsesSuperglue
+      end
+    end
   end
 end

data/lib/terrazzo/field/base.rb

@@ -107,7 +107,7 @@ module Terrazzo
       private
 
       def resolve_data
-        resource.public_send(attribute)
+        resource.try(attribute)
       end
     end
   end

data/lib/terrazzo/field/deferred.rb

@@ -19,11 +19,11 @@ module Terrazzo
       end
 
       def searchable?
-        deferred_class.searchable?
+        options.key?(:searchable) ? options[:searchable] : deferred_class.searchable?
       end
 
       def sortable?
-        deferred_class.sortable?
+        options.key?(:sortable) ? options[:sortable] : deferred_class.sortable?
       end
 
       def eager_load?

data/lib/terrazzo/field/email.rb

@@ -4,12 +4,6 @@ module Terrazzo
       def serialize_value(_mode)
         data
       end
-
-      class << self
-        def searchable?
-          true
-        end
-      end
     end
   end
 end

data/lib/terrazzo/field/string.rb

@@ -14,10 +14,6 @@ module Terrazzo
       end
 
       class << self
-        def searchable?
-          true
-        end
-
         def default_options
           { truncate: 50 }
         end

data/lib/terrazzo/field/text.rb

@@ -14,10 +14,6 @@ module Terrazzo
       end
 
       class << self
-        def searchable?
-          true
-        end
-
         def default_options
           { truncate: 100 }
         end

data/lib/terrazzo/uses_superglue.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Terrazzo
+  module UsesSuperglue
+    # Prepended to fix a template shadowing problem.
+    #
+    # When a controller inherits a long view prefix chain (e.g. from Devise or
+    # other engines), Superglue's _render_template calls template_exists? with
+    # all those prefixes and may find a gem-supplied HTML template, causing it
+    # to render the unstyled ERB instead of the React page. This override
+    # restricts the template existence check to the app's own view path only.
+    module TemplateLookupOverride
+      def _render_template(options = {})
+        if @_capture_options_before_render
+          @_capture_options_before_render = false
+          @_render_options = options
+          _ensure_react_page!(options[:template], options[:prefixes])
+
+          app_views = Rails.root.join("app/views").to_s
+          app_resolver = view_paths.to_a.find { |vp| vp.to_s == app_views && !vp.is_a?(Superglue::Resolver) }
+          prefixes = Array(options[:prefixes]).compact
+          html_template_exist = app_resolver&.find_all(options[:template], prefixes, false, { formats: [:html], locale: [], handlers: [], variants: [] }, nil, [])&.any?
+          if !html_template_exist
+            super(options.merge(template: _superglue_template, prefixes: []))
+          else
+            super
+          end
+        else
+          super
+        end
+      end
+    end
+
+    def uses_superglue
+      include Superglue::Controller
+      prepend_view_path(Superglue::Resolver.new(Rails.root.join("app/views")))
+      before_action :use_jsx_rendering_defaults
+      prepend TemplateLookupOverride
+    end
+  end
+end

data/lib/terrazzo/version.rb

@@ -1,3 +1,3 @@
 module Terrazzo
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

data/lib/terrazzo.rb

@@ -13,6 +13,7 @@ module Terrazzo
   autoload :Filter, "terrazzo/filter"
   autoload :Namespace, "terrazzo/namespace"
   autoload :GeneratorHelpers, "terrazzo/generator_helpers"
+  autoload :UsesSuperglue, "terrazzo/uses_superglue"
 
   module Field
     autoload :Base, "terrazzo/field/base"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terrazzo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Terrazzo Contributors
@@ -132,6 +132,7 @@ files:
 - lib/generators/terrazzo/field/templates/ShowField.jsx.erb
 - lib/generators/terrazzo/field/templates/field.rb.erb
 - 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
@@ -271,6 +272,7 @@ files:
 - lib/terrazzo/page/show.rb
 - lib/terrazzo/resource_resolver.rb
 - lib/terrazzo/search.rb
+- lib/terrazzo/uses_superglue.rb
 - lib/terrazzo/version.rb
 - terrazzo.gemspec
 homepage: https://github.com/wengzilla/terrazzo