terrazzo 0.4.4 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74a2f483fcd5a4f5e5f1f10b02ad43368eb574bd74d4173849a9cc5c828b0d72
-  data.tar.gz: 511ac138a16190e0a487b5987beff0da4bac9886bcfcf71bad47eb8c7a8291bd
+  metadata.gz: 60ad22a772a614c37195f4695a9dd9b41b2c28b4c2516edc2ab07ffb257253e2
+  data.tar.gz: 41449e6a9e4c590db843dac6d9f0836bd32c92ee362e4a92b502207f183cd7fc
 SHA512:
-  metadata.gz: '08790b1f7b604d682c6e6a64053243dc79642b67dcbeb422e3258ca373ac7a9474f900022a2797edd0a10c7a24de05b68aef5021998a7ad8a15fb9fb01746787'
-  data.tar.gz: c86e8eafecea3af3aa701db0a3d7d76ea9276acdd6743be558c237ab82ecdc54432820fa6a6492fc96995f56afa1ca5331d564b08e550b1dd67a558589cb7fca
+  metadata.gz: 8c07a8cc98e237208dede3049baf12c7edb3145c7745d69cb2996880594738bdd3ff9d1fbcd88da7d9b7e6f149abc289e1acd1f76331214016252bc2e7ec3c61
+  data.tar.gz: fe5c60e8af68eadb129ae735c266ca3958e4f88471a5692acbaea17edfa821b2809ad3c86c14ca13d9ea8790645f80eac97516c8431b12d88df328775c031cf9

data/app/controllers/terrazzo/application_controller.rb

@@ -191,18 +191,17 @@ module Terrazzo
       @_resource_name ||= resolver.resource_title
     end
 
-    # 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").
+    # Build a page identifier for the React page-to-component mapping.
+    # Returns a resource-specific identifier (e.g. "admin/orders/index")
+    # which the JS mapping resolves with fallback to "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
       mapped_action = TERRAZZO_ACTION_MAP[action_name] || action_name
-      "#{ns}/application/#{mapped_action}"
+      "#{controller_path}/#{mapped_action}"
     end
 
     def route_exists?(action)

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

@@ -3,9 +3,23 @@ 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 = {
+const pages = {
   '<%= namespace_name %>/application/index': AdminIndex,
   '<%= namespace_name %>/application/show': AdminShow,
   '<%= namespace_name %>/application/new': AdminNew,
   '<%= namespace_name %>/application/edit': AdminEdit,
 }
+
+// Resolves resource-specific page identifiers (e.g. "admin/orders/index")
+// with fallback to the shared application component (e.g. "admin/application/index").
+export const pageToPageMapping = new Proxy(pages, {
+  get(target, prop) {
+    if (prop in target) return target[prop]
+    if (typeof prop === "string") {
+      const action = prop.split("/").pop()
+      const fallback = "<%= namespace_name %>/application/" + action
+      if (fallback in target) return target[fallback]
+    }
+    return undefined
+  }
+})

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

@@ -1,9 +1,12 @@
 require "rails/generators"
+require_relative "page_mapping_helper"
 
 module Terrazzo
   module Generators
     module Views
       class EditGenerator < Rails::Generators::Base
+        include PageMappingHelper
+
         source_root File.expand_path("templates", __dir__)
 
         argument :resource, type: :string, required: false,
@@ -17,6 +20,7 @@ module Terrazzo
             eject_json_props
             copy_file "pages/edit.jsx", "app/views/#{namespace_name}/#{resource_path}/edit.jsx"
             copy_file "pages/_form.jsx", "app/views/#{namespace_name}/#{resource_path}/_form.jsx"
+            register_page_mapping("edit")
             eject_new_view if should_eject_new?
           else
             copy_file "pages/edit.jsx", "app/views/#{namespace_name}/application/edit.jsx"
@@ -50,6 +54,7 @@ module Terrazzo
           if resource.present?
             eject_new_json_props
             copy_file "pages/new.jsx", "app/views/#{namespace_name}/#{resource_path}/new.jsx"
+            register_page_mapping("new")
           else
             copy_file "pages/new.jsx", "app/views/#{namespace_name}/application/new.jsx"
           end

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

@@ -1,9 +1,12 @@
 require "rails/generators"
+require_relative "page_mapping_helper"
 
 module Terrazzo
   module Generators
     module Views
       class IndexGenerator < Rails::Generators::Base
+        include PageMappingHelper
+
         source_root File.expand_path("templates", __dir__)
 
         argument :resource, type: :string, required: false,
@@ -17,6 +20,7 @@ module Terrazzo
             eject_json_props
             copy_file "pages/index.jsx", "app/views/#{namespace_name}/#{resource_path}/index.jsx"
             copy_file "pages/_collection.jsx", "app/views/#{namespace_name}/#{resource_path}/_collection.jsx"
+            register_page_mapping("index")
           else
             copy_file "pages/index.jsx", "app/views/#{namespace_name}/application/index.jsx"
             copy_file "pages/_collection.jsx", "app/views/#{namespace_name}/application/_collection.jsx"

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

@@ -1,9 +1,12 @@
 require "rails/generators"
+require_relative "page_mapping_helper"
 
 module Terrazzo
   module Generators
     module Views
       class NewGenerator < Rails::Generators::Base
+        include PageMappingHelper
+
         source_root File.expand_path("templates", __dir__)
 
         argument :resource, type: :string, required: false,
@@ -17,6 +20,7 @@ module Terrazzo
             eject_json_props
             copy_file "pages/new.jsx", "app/views/#{namespace_name}/#{resource_path}/new.jsx"
             copy_file "pages/_form.jsx", "app/views/#{namespace_name}/#{resource_path}/_form.jsx"
+            register_page_mapping("new")
             eject_edit_view if should_eject_edit?
           else
             copy_file "pages/new.jsx", "app/views/#{namespace_name}/application/new.jsx"
@@ -50,6 +54,7 @@ module Terrazzo
           if resource.present?
             eject_edit_json_props
             copy_file "pages/edit.jsx", "app/views/#{namespace_name}/#{resource_path}/edit.jsx"
+            register_page_mapping("edit")
           else
             copy_file "pages/edit.jsx", "app/views/#{namespace_name}/application/edit.jsx"
           end

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

@@ -0,0 +1,29 @@
+module Terrazzo
+  module Generators
+    module Views
+      module PageMappingHelper
+        private
+
+        def register_page_mapping(action)
+          mapping_path = File.join(destination_root, "app/javascript/#{namespace_name}/page_to_page_mapping.js")
+          return unless File.exist?(mapping_path)
+
+          component_name = "#{resource.gsub('::', '')}#{action.capitalize}"
+          import_path = "../../views/#{namespace_name}/#{resource_path}/#{action}"
+          key = "'#{namespace_name}/#{resource_path}/#{action}'"
+
+          content = File.read(mapping_path)
+          return if content.include?(key)
+
+          # Add import before the pages object declaration
+          import_line = "import #{component_name} from \"#{import_path}\";\n"
+          inject_into_file mapping_path, import_line, before: "\nconst pages"
+
+          # Add mapping entry inside the pages object (before its closing brace)
+          entry_line = "  #{key}: #{component_name},\n"
+          inject_into_file mapping_path, entry_line, before: "}\n\n//"
+        end
+      end
+    end
+  end
+end

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

@@ -1,13 +1,16 @@
 require "rails/generators"
+require_relative "page_mapping_helper"
 
 module Terrazzo
   module Generators
     module Views
       class ShowGenerator < Rails::Generators::Base
+        include PageMappingHelper
+
         source_root File.expand_path("templates", __dir__)
 
         argument :resource, type: :string, required: false,
-          desc: "Resource model (e.g., User) to eject a resource-specific show.json.props"
+          desc: "Resource model (e.g., User) to eject a resource-specific show view"
 
         class_option :namespace, type: :string, default: "admin",
           desc: "Admin namespace"
@@ -15,6 +18,8 @@ module Terrazzo
         def copy_show_template
           if resource.present?
             eject_json_props
+            copy_file "pages/show.jsx", "app/views/#{namespace_name}/#{resource_path}/show.jsx"
+            register_page_mapping("show")
           else
             copy_file "pages/show.jsx", "app/views/#{namespace_name}/application/show.jsx"
           end

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

@@ -1,9 +1,9 @@
 import React, { useContext } from "react";
 import { NavigationContext } from "@thoughtbot/superglue";
 
-import { SortableHeader, CollectionItemActions } from "../components";
-import { FieldRenderer } from "../fields";
-import { Table, TableHeader, TableBody, TableRow, TableHead, TableCell } from "../components/ui";
+import { SortableHeader, CollectionItemActions } from "terrazzo/components";
+import { FieldRenderer } from "terrazzo/fields";
+import { Table, TableHeader, TableBody, TableRow, TableHead, TableCell } from "terrazzo/ui";
 
 export function AdminCollection({ table }) {
   const { visit } = useContext(NavigationContext);

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

@@ -2,9 +2,9 @@ import React from "react";
 import { useContent } from "@thoughtbot/superglue";
 
 import { getLayout } from "terrazzo";
-import { SearchBar, Pagination } from "../components";
+import { SearchBar, Pagination } from "terrazzo/components";
 import { AdminCollection } from "./_collection";
-import { Button } from "../components/ui";
+import { Button } from "terrazzo/ui";
 
 export default function AdminIndex() {
   const Layout = getLayout();

data/lib/terrazzo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terrazzo
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.1
 platform: ruby
 authors:
 - Terrazzo Contributors
@@ -156,6 +156,7 @@ files:
 - lib/generators/terrazzo/views/layout_generator.rb
 - lib/generators/terrazzo/views/navigation_generator.rb
 - lib/generators/terrazzo/views/new_generator.rb
+- lib/generators/terrazzo/views/page_mapping_helper.rb
 - lib/generators/terrazzo/views/show_generator.rb
 - lib/generators/terrazzo/views/templates/components/FlashMessages.jsx
 - lib/generators/terrazzo/views/templates/components/Layout.jsx