trestle 0.10.0.pre2 → 0.10.1

data/app/helpers/trestle/url_helper.rb

@@ -2,81 +2,151 @@ module Trestle
   module UrlHelper
     MODAL_ACTIONS = [:new, :show, :edit]
 
-    def admin_link_to(content, instance_or_url=nil, options={}, &block)
+    # Generates a link to an admin, optionally for a specific instance on a resourceful admin.
+    #
+    # It has a few additional conveniences over using the standard `link_to` helper:
+    #
+    # 1) It can automatically infer the admin from the given instance.
+    # 2) It will automatically add data-controller="modal-trigger" when linking to a form
+    #    action that is set to show as a modal.
+    # 3) It sets data-turbo-frame appropriately for modal and non-modal contexts to ensure
+    #    the admin can correctly detect modal requests.
+    #
+    # content  - HTML or text content to use as the link content
+    #            (will be ignored if a block is provided)
+    # instance - Optional model instance, or explicit String path
+    # admin    - Optional admin instance to link to. Will be inferred from instance if provided,
+    #            otherwise falling back to the current admin if available
+    # action   - Optional admin action to link to. Will default to :show if instance is provided,
+    #            otherwise the admin's root action (usually :index) will be used
+    # method   - Optional request method (e.g. :delete), that will be set as `data-turbo-method`
+    # params   - Hash of URL parameters to pass to `instance_path` or `path` admin methods (default: {})
+    # options  - Hash of options to forward to the `link_to` helper (default: {})
+    # block    - Optional block to capture to use as the link content
+    #
+    # Examples
+    #
+    #   <%= admin_link_to article.name, article %>
+    #
+    #   <%= admin_link_to admin: :dashboard, action: :index do %>
+    #     <%= icon "fas fa-gauge" %> Dashboard
+    #   <% end %>
+    #
+    # Returns a HTML-safe String.
+    # Raises ActionController::UrlGenerationError if the admin cannot be automatically inferred.
+    def admin_link_to(content=nil, instance=nil, admin: nil, action: nil, method: nil, params: {}, **options, &block)
       # Block given - ignore content parameter and capture content from block
       if block_given?
-        instance_or_url, options = content, instance_or_url || {}
-        content = capture(&block)
+        instance, content = content, capture(&block)
       end
 
-      if instance_or_url.is_a?(String)
-        # Treat string URL as regular link
-        link_to(content, instance_or_url, options)
-      else
-        # Normalize options if instance is not provided
-        if instance_or_url.is_a?(Hash)
-          instance, options = nil, instance_or_url
-        else
-          instance = instance_or_url
-        end
-
-        # Determine admin
-        if options.key?(:admin)
-          admin = Trestle.lookup(options.delete(:admin))
-        elsif instance
-          admin = admin_for(instance)
-        end
+      # Treat string URL as regular link
+      if instance.is_a?(String)
+        return link_to(content, instance, options)
+      end
 
-        admin ||= self.admin if respond_to?(:admin)
+      # Determine target admin
+      target = lookup_admin_from_options(
+        instance: instance,
+        admin: admin,
+        fallback: self&.admin,
+        raise: true
+      )
 
-        if admin
-          # Ensure admin has controller context
-          admin = admin.new(self) if admin.is_a?(Class)
+      # Set default action depending on instance or not
+      action ||= (instance ? :show : target.root_action)
 
-          # Generate path
-          action = options.delete(:action) || :show
-          params = options.delete(:params) || {}
+      path = admin_url_for(instance, admin: target, action: action, **params)
 
-          if admin.respond_to?(:instance_path) && instance
-            path = admin.instance_path(instance, params.reverse_merge(action: action))
-          else
-            params[:id] ||= admin.to_param(instance) if instance
-            path = admin.path(action, params)
-          end
+      # Determine link data options
+      options[:data] ||= {}
 
-          # Determine link data options
-          options[:data] ||= {}
+      if MODAL_ACTIONS.include?(action) && target&.form&.modal?
+        options[:data][:controller] ||= "modal-trigger"
+      else
+        options[:data][:turbo_frame] ||= (modal_request? ? "modal" : "_top")
+      end
 
-          if MODAL_ACTIONS.include?(action) && admin.respond_to?(:form) && admin.form.modal?
-            options[:data][:controller] ||= "modal-trigger"
-          else
-            options[:data][:turbo_frame] = "_top"
-          end
+      options[:data][:turbo_method] ||= method if method
 
-          link_to(content, path, options)
-        else
-          raise ActionController::UrlGenerationError, "An admin could not be inferred. Please specify an admin using the :admin option."
-        end
-      end
+      link_to(content, path, options)
     end
 
-    def admin_url_for(instance, options={})
-      admin = Trestle.lookup(options.delete(:admin)) if options.key?(:admin)
-      admin ||= admin_for(instance)
-      return unless admin
+    # Returns the admin path for a given instance.
+    #
+    # An admin can either be explicitly specified (as a symbol or admin class),
+    # or it can be automatically inferred based the instance type using `admin_for`.
+    #
+    # instance - The model instance to generate a path for
+    # admin    - Optional admin (symbol or admin class)
+    # action   - Optional admin action to generate the URL for. Will default to :show if
+    #            instance is provided, otherwise the admin's root action (usually :index)
+    #            will be used
+    # raise    - Whether to raise a ActionController::UrlGenerationError if the admin
+    #            cannot be determined, either from the admin parameter or automatically
+    # params   - Hash of URL parameters to pass to `instance_path` or `path` admin methods
+    #
+    # Examples
+    #
+    #   <%= admin_url_for(article, action: :edit) %>
+    #   <%= admin_url_for(article, admin: :special_articles) %>
+    #
+    # Returns a String, or nil if the admin cannot be automatically inferred.
+    def admin_url_for(instance=nil, admin: nil, action: nil, raise: false, **params)
+      target = lookup_admin_from_options(
+        instance: instance,
+        admin: admin,
+        fallback: self&.admin,
+        raise: raise
+      )
+      return unless target
 
-      # Ensure admin has controller context
-      admin = admin.new(self) if admin.is_a?(Class)
+      # Set default action depending on instance or not
+      action ||= (instance ? :show : target.root_action)
 
-      if admin.respond_to?(:instance_path)
-        admin.instance_path(instance, options)
+      if instance
+        if target.respond_to?(:instance_path)
+          target.instance_path(instance, action: action, **params)
+        else
+          target.path(action, params.merge(id: target.to_param(instance)))
+        end
       else
-        admin.path(options[:action] || :show, id: admin.to_param(instance))
+        target.path(action, params)
       end
     end
 
+    # Looks up the registered Trestle admin for a given model instance.
+    #
+    # The lookup is performed on the global `Trestle::Registry` instance,
+    # which tracks admin resource models unless the resource was created
+    # with `register_model: false`.
+    #
+    # instance - The model instance to look up in the registry
+    #
+    # Returns a Trestle::Admin subclass or nil if no matching admin found.
     def admin_for(instance)
       Trestle.lookup_model(instance.class)
     end
+
+  private
+    def lookup_admin_from_options(instance: nil, admin: nil, fallback: nil, raise: true)
+      if admin
+        result = Trestle.lookup(admin)
+      elsif instance
+        result = Trestle.lookup_model(instance.class) || fallback
+      else
+        result = fallback
+      end
+
+      if result && result.is_a?(Class)
+        # Instantiate admin with current context
+        result.new(self)
+      elsif result
+        result
+      elsif raise
+        raise ActionController::UrlGenerationError,
+          "An admin could not be inferred. Please specify an admin using the :admin option."
+      end
+    end
   end
 end

data/app/views/kaminari/trestle/_first_page.html.erb

@@ -4,12 +4,11 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
 -%>
 <li class="page-item<% if current_page.first? %> disabled<% end %>">
   <% if current_page.first? %>
     <span class="page-link">&laquo;</span>
   <% else %>
-    <%= link_to content_tag(:span, "&laquo;".html_safe), url, class: "page-link", remote: remote %>
+    <%= link_to tag.span("&laquo;".html_safe), url, class: "page-link" %>
   <% end %>
 </li>

data/app/views/kaminari/trestle/_gap.html.erb

@@ -3,7 +3,6 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
 -%>
 <li class="page-item gap disabled">
   <span class="page-link"><%= t('views.pagination.truncate').html_safe %></span>

data/app/views/kaminari/trestle/_last_page.html.erb

@@ -4,12 +4,11 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
 -%>
 <li class="page-item<% if current_page.last? %> disabled<% end %>">
   <% if current_page.last? %>
     <span class="page-link">&raquo;</span>
   <% else %>
-    <%= link_to content_tag(:span, "&raquo;".html_safe), url, class: "page-link", remote: remote %>
+    <%= link_to tag.span("&raquo;".html_safe), url, class: "page-link" %>
   <% end %>
 </li>

data/app/views/kaminari/trestle/_page.html.erb

@@ -5,8 +5,7 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
 -%>
 <li class="page-item<% if page.current? %> active<% end %>">
-  <%= link_to content_tag(:span, page), url, class: "page-link", remote: remote, rel: page.next? ? 'next' : page.prev? ? 'prev' : nil %>
+  <%= link_to tag.span(page), url, class: "page-link", rel: page.next? ? 'next' : page.prev? ? 'prev' : nil %>
 </li>

data/app/views/kaminari/trestle/_paginator.html.erb

@@ -3,7 +3,6 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
     paginator:     the paginator that renders the pagination tags inside
 -%>
 <%= paginator.render do -%>

data/app/views/layouts/trestle/admin.html.erb

@@ -36,16 +36,16 @@
     <%= hook :head %>
   </head>
 
-  <%= content_tag :body, body_attributes do %>
+  <%= tag.body(**body_attributes) do %>
     <div id="app-wrapper" class="app-wrapper" data-controller="wrapper" data-action="click->wrapper#hideMobileSidebar touchstart->wrapper#hideMobileSidebar" data-wrapper-mobile-sidebar-outlet=".app-sidebar">
       <%= render "trestle/shared/sidebar" %>
 
       <div class="app-container">
         <%= render "trestle/shared/header" %>
 
-        <main class="app-main">
+        <div class="app-main">
           <%= yield %>
-        </main>
+        </div>
 
         <%= render "trestle/shared/footer" %>
       </div>

data/app/views/layouts/trestle/modal.html.erb

@@ -1,5 +1,5 @@
-<%= content_tag(:div, modal_wrapper_attributes) do %>
-  <%= content_tag(:div, modal_dialog_attributes) do %>
+<%= tag.div(**modal_wrapper_attributes) do %>
+  <%= tag.div(**modal_dialog_attributes) do %>
     <%= yield %>
   <% end %>
 <% end %>

data/app/views/trestle/application/_layout.html.erb

@@ -1,22 +1,26 @@
-<%= render "header", hide_breadcrumbs: local_assigns.fetch(:hide_breadcrumbs, false) if local_assigns.fetch(:header, true) %>
+<turbo-frame id="main" data-turbo-action="advance">
+  <%= render "header", hide_breadcrumbs: local_assigns.fetch(:hide_breadcrumbs, false) if local_assigns.fetch(:header, true) %>
 
-<div class="main-content-area" data-scroll-target>
-  <turbo-frame id="flash">
-    <%= render "trestle/flash/flash" %>
-  </turbo-frame>
+  <div class="main-content-area" data-scroll-target>
+    <turbo-frame id="flash">
+      <%= render "trestle/flash/flash" %>
+    </turbo-frame>
 
-  <%= render "utilities" %>
-  <%= render "tabs", data: { controller: "tabs tab-errors" } %>
+    <turbo-frame id="content" data-controller="reloadable" data-turbo-action="advance">
+      <%= render "utilities" %>
+      <%= render "tabs", data: { controller: "tabs tab-errors" } %>
 
-  <% if local_assigns.fetch(:wrapper, true) %>
-    <%= container do |c| %>
-      <%= yield %>
+      <% if local_assigns.fetch(:wrapper, true) %>
+        <%= container do |c| %>
+          <%= yield %>
 
-      <% c.sidebar do %>
-        <%= content_for(:sidebar) %>
-      <% end if content_for?(:sidebar) %>
-    <% end %>
-  <% else %>
-    <%= yield %>
-  <% end %>
-</div>
+          <% c.sidebar do %>
+            <%= content_for(:sidebar) %>
+          <% end if content_for?(:sidebar) %>
+        <% end %>
+      <% else %>
+        <%= yield %>
+      <% end %>
+    </turbo-frame>
+  </div>
+</turbo-frame>

data/app/views/trestle/application/_tabs.html.erb

@@ -1,5 +1,5 @@
 <% if tabs.any? || render_sidebar_as_tab? -%>
-  <%= content_tag :ul, class: "nav nav-tabs", data: local_assigns.fetch(:data, {}) do %>
+  <%= tag.ul(class: "nav nav-tabs", data: local_assigns.fetch(:data, {})) do %>
     <% tabs.each do |name, tab| %>
       <li class="nav-item">
         <%= link_to tab.label, "##{tab.id(("modal" if modal_request?))}", class: ["nav-link", ("active" if name == tabs.keys.first)], role: "tab", data: { bs_toggle: "tab" } %>

data/app/views/trestle/flash/_alert.html.erb

@@ -12,6 +12,8 @@
       <p><%= alert[:message] %></p>
     <% end %>
 
-    <%= yield if block_given? %>
+    <% if local_assigns[:errors] %>
+      <%= render "trestle/flash/debug", errors: errors %>
+    <% end %>
   </div>
 </div>

data/app/views/trestle/flash/_flash.html.erb

@@ -1,7 +1,10 @@
 <% if flash[:message] -%>
-  <%= render "trestle/flash/alert", html_class: "alert-success", icon: icon("alert-icon far fa-check-circle"), alert: normalize_flash_alert(flash[:message]) %>
+  <%= render "trestle/flash/alert", html_class: "alert-success",
+                                    icon: icon("alert-icon far fa-check-circle"),
+                                    alert: normalize_flash_alert(flash[:message]) %>
 <% elsif flash[:error] -%>
-  <%= render layout: "trestle/flash/alert", locals: { html_class: "alert-danger", icon: icon("alert-icon far fa-times-circle"), alert: normalize_flash_alert(flash[:error]) } do %>
-    <%= render "trestle/flash/debug", errors: Trestle::DebugErrors.new(instance.errors) if debug_form_errors? %>
-  <% end %>
+  <%= render "trestle/flash/alert", html_class: "alert-danger",
+                                    icon: icon("alert-icon far fa-times-circle"),
+                                    alert: normalize_flash_alert(flash[:error]),
+                                    errors: (Trestle::DebugErrors.new(instance.errors) if debug_form_errors?) %>
 <% end -%>

data/app/views/trestle/resource/_scopes.html.erb

@@ -1,12 +1,12 @@
-<%= content_tag(:dl, class: admin.scopes.classes) do %>
+<%= tag.dl(class: admin.scopes.classes) do %>
   <% admin.scopes.grouped.each do |group, scopes| %>
-    <%= content_tag(:dt, group, class: ["scope-group", ("scope-group-empty" if group.blank?)]) if admin.scopes.grouped? %>
+    <%= tag.dt(group, class: ["scope-group", ("scope-group-empty" if group.blank?)]) if admin.scopes.grouped? %>
 
     <dd>
       <ul class="scope-list">
         <% scopes.each do |scope| %>
           <li>
-            <%= link_to persistent_params.merge(scope: (scope unless scope.active?(params))), class: ["scope", ("active" if scope.active?(params))] do %>
+            <%= link_to persistent_params.merge(scope: scope), class: ["scope", ("active" if scope.active?(params))] do %>
               <strong><%= scope.label %></strong>
               <% if scope.count? %>(<%= number_with_delimiter(scope.count(admin.collection(params))) %>)<% end %>
             <% end %>

data/app/views/trestle/resource/create.turbo_stream.erb

@@ -1 +1,2 @@
 <%= turbo_stream.replace admin.build_instance({}, params), template: "trestle/resource/#{instance.persisted? ? "show" : "new"}" %>
+<%= turbo_stream.reload if modal_request? && instance.persisted? %>

data/app/views/trestle/resource/destroy.turbo_stream.erb

@@ -1 +1,3 @@
 <%= turbo_stream.close_modal instance %>
+<%= turbo_stream.flash %>
+<%= turbo_stream.reload %>

data/app/views/trestle/resource/index.html.erb

@@ -14,19 +14,17 @@
 <% end if admin.scopes.any? %>
 
 <%= render layout: "layout" do %>
-  <%= index_turbo_frame do %>
-    <% if hook?("resource.index.header") %>
-      <header class="main-content-header">
-        <%= hook("resource.index.header") %>
-      </header>
-    <% end %>
+  <% if hook?("resource.index.header") %>
+    <header class="main-content-header">
+      <%= hook("resource.index.header") %>
+    </header>
+  <% end %>
 
-    <%= render "trestle/table/table", table: admin.table, collection: collection %>
+  <%= render "trestle/table/table", table: admin.table, collection: collection %>
 
-    <footer class="main-content-footer">
-      <%= hook("resource.index.footer") %>
+  <footer class="main-content-footer">
+    <%= hook("resource.index.footer") %>
 
-      <%= pagination collection: collection, entry_name: admin.model_name, remote: admin.pagination_options[:ajax] %>
-    </footer>
-  <% end %>
+    <%= pagination collection: collection, entry_name: admin.model_name %>
+  </footer>
 <% end %>

data/app/views/trestle/resource/update.turbo_stream.erb

@@ -1 +1,2 @@
 <%= turbo_stream.replace instance, template: "trestle/resource/show" %>
+<%= turbo_stream.reload if modal_request? %>

data/app/views/trestle/shared/_sidebar.html.erb

@@ -12,27 +12,27 @@
   <div class="app-sidebar-inner" data-sidebar-target="inner">
     <nav class="app-nav" data-controller="navigation">
       <% Trestle.navigation(self).each do |group, items| %>
-        <%= content_tag(:ul, class: ("collapsed" if group.present? && navigation_group_collapsed?(group)), data: { group: group.id }) do %>
+        <%= tag.ul(class: ("collapsed" if group.present? && navigation_group_collapsed?(group)), data: { group: group.id }) do %>
           <% if group.present? %>
-            <li class="nav-header"><%= link_to content_tag(:span, group.label), "##{group.id}", data: { action: "navigation#toggle" } %></li>
+            <li class="nav-header"><%= link_to tag.span(group.label), "##{group.id}", data: { action: "navigation#toggle" } %></li>
           <% end %>
 
           <% items.each do |item| %>
-            <%= content_tag(:li, class: ["nav-item", ("active" if current_navigation_item?(item))]) do %>
+            <%= tag.li(class: ["nav-item", ("active" if current_navigation_item?(item))]) do %>
               <%= link_to item.path, item.html_options.merge(data: { controller: "navigation-tooltip" }) do %>
                 <%= icon("nav-icon", item.icon) %>
                 <span class="nav-label" data-navigation-tooltip-target="label"><%= item.label %></span>
 
-                <%= content_tag(:span, item.badge.text, class: ["badge", item.badge.html_class]) if item.badge? %>
+                <%= tag.span(item.badge.text, class: ["badge", item.badge.html_class]) if item.badge? %>
               <% end %>
             <% end %>
           <% end %>
         <% end %>
       <% end %>
     </nav>
-
-    <button class="toggle-sidebar" data-action="sidebar#toggle">
-      <span class="visually-hidden"><%= t("trestle.ui.toggle_sidebar", default: "Toggle sidebar") %></span>
-    </button>
   </div>
+
+  <button class="toggle-sidebar" data-action="sidebar#toggle">
+    <span class="visually-hidden"><%= t("trestle.ui.toggle_sidebar", default: "Toggle sidebar") %></span>
+  </button>
 </aside>

data/app/views/trestle/table/_table.html.erb

@@ -1,12 +1,12 @@
 <% table = table.renderer(self) %>
 
 <div class="table-container">
-  <%= content_tag(:table, id: table.id, class: table.classes, data: table.data) do %>
+  <%= tag.table(id: table.id, class: table.classes, data: table.data) do %>
     <% if table.header? %>
     <thead>
       <tr>
         <% table.columns.each do |column| %>
-          <%= content_tag(:th, column.header, class: column.classes, data: column.data) %>
+          <%= tag.th(column.header, class: column.classes, data: column.data) %>
         <% end %>
       </tr>
     </thead>

data/config/locales/pt-BR.yml

@@ -8,9 +8,9 @@ pt-BR:
       page_entries_info:
         one_page:
           display_entries:
-            zero: "Nenhum %{entry_name} encontrado"
-            one: "Mostrando <strong>1</strong> %{entry_name}"
-            other: "Mostrando <strong>all %{count}</strong> %{entry_name}"
+            zero: "Nenhum registro de %{entry_name} encontrado"
+            one: "Mostrando <strong>1 registro de</strong> %{entry_name}"
+            other: "Mostrando <strong>%{count} registros</strong> de %{entry_name}"
 
         more_pages:
           display_entries: "Mostrando %{entry_name} <strong>%{first}&nbsp;-&nbsp;%{last}</strong> de <b>%{total}</b>"
@@ -32,14 +32,14 @@ pt-BR:
 
   admin:
     titles:
-      index: "Listando %{pluralized_model_name}"
-      new: "Novo %{model_name}"
-      edit: "Editando %{model_name}"
+      index: "Listando registros de %{pluralized_model_name}"
+      new: "Novo registro de %{model_name}"
+      edit: "Editando registro de %{model_name}"
 
     buttons:
-      new: "Novo %{model_name}"
-      save: "Salvar %{model_name}"
-      delete: "Excluir %{model_name}"
+      new: "Novo registro de %{model_name}"
+      save: "Salvar registro de %{model_name}"
+      delete: "Excluir registro de %{model_name}"
 
     breadcrumbs:
       home: "Home"
@@ -48,7 +48,7 @@ pt-BR:
       create:
         success:
           title: "Sucesso!"
-          message: "O %{model_name} foi criado com sucesso."
+          message: "O registro de %{model_name} foi criado com sucesso."
 
         failure:
           title: "Atenção!"
@@ -57,7 +57,7 @@ pt-BR:
       update:
         success:
           title: "Sucesso!"
-          message: "O %{model_name} foi atualizado com sucesso."
+          message: "O registro de %{model_name} foi atualizado com sucesso."
 
         failure:
           title: "Atenção!"
@@ -66,11 +66,11 @@ pt-BR:
       destroy:
         success:
           title: "Sucesso!"
-          message: "O %{model_name} foi deletado com sucesso."
+          message: "O registro de %{model_name} foi deletado com sucesso."
 
         failure:
           title: "Atenção!"
-          message: "Falha ao excluir %{model_name}."
+          message: "O registro de %{model_name} não pôde ser deletado."
 
     table:
       headers:

data/frontend/css/components/_scopes.scss

@@ -6,23 +6,22 @@
   }
 
   &.grouped {
+    background: #fafafa;
+
+    dd {
+      padding: 0.375rem 0.5rem 0.375rem;
+    }
+
     @include media-breakpoint-up(md) {
       display: grid;
       grid-template-columns: auto 1fr;
     }
 
-
     @include media-breakpoint-down(md) {
       .scope-group-empty:first-child {
         display: none;
       }
     }
-
-    background: #fafafa;
-
-    dd {
-      padding: 0.375rem 0.5rem 0.375rem;
-    }
   }
 
   &.columns {

data/frontend/css/core/_theme.scss

@@ -11,9 +11,9 @@ $theme-colors: (
   @each $color, $value in $theme-colors {
     --#{$color}: #{$value};
 
-    --#{$color}-h: #{hue($value)};
-    --#{$color}-s: #{saturation($value)};
-    --#{$color}-l: #{lightness($value)};
+    --#{$color}-h: #{color.channel($value, "hue", $space: hsl)};
+    --#{$color}-s: #{color.channel($value, "saturation", $space: hsl)};
+    --#{$color}-l: #{color.channel($value, "lightness", $space: hsl)};
 
     --#{$color}-hue: var(--#{$color}-h);
     --#{$color}-saturation: var(--#{$color}-s);