trestle 0.9.9 → 0.10.0.pre

data/app/controllers/concerns/trestle/resource/controller/actions.rb

@@ -14,6 +14,7 @@ module Trestle
         def new
           respond_to do |format|
             format.html
+            format.turbo_stream { render turbo_stream: turbo_stream_modal }
             format.json { render json: instance }
 
             yield format if block_given?
@@ -23,20 +24,20 @@ module Trestle
         def create
           if save_instance
             respond_to do |format|
-              format.html do
-                flash[:message] = flash_message("create.success", title: "Success!", message: "The %{lowercase_model_name} was successfully created.")
-                redirect_to_return_location(:create, instance) { admin.instance_path(instance) }
-              end
+              flash[:message] = flash_message("create.success", title: "Success!", message: "The %{lowercase_model_name} was successfully created.")
+
+              format.html { redirect_to_return_location(:create, instance) { admin.instance_path(instance) } }
+              format.turbo_stream { flash.discard } if modal_request?
               format.json { render json: instance, status: :created, location: admin.instance_path(instance) }
 
               yield format if block_given?
             end
           else
             respond_to do |format|
-              format.html do
-                flash.now[:error] = flash_message("create.failure", title: "Warning!", message: "Please correct the errors below.")
-                render "new", status: :unprocessable_entity
-              end
+              flash.now[:error] = flash_message("create.failure", title: "Warning!", message: "Please correct the errors below.")
+
+              format.html { render "new", status: :unprocessable_entity }
+              format.turbo_stream { render "create", status: :unprocessable_entity } if modal_request?
               format.json { render json: instance.errors, status: :unprocessable_entity }
 
               yield format if block_given?
@@ -55,6 +56,7 @@ module Trestle
           else
             respond_to do |format|
               format.html
+              format.turbo_stream { render turbo_stream: turbo_stream_modal } if modal_request?
               format.json { render json: instance }
 
               yield format if block_given?
@@ -73,6 +75,7 @@ module Trestle
           else
             respond_to do |format|
               format.html
+              format.turbo_stream { render turbo_stream: turbo_stream_modal } if modal_request?
               format.json { render json: instance }
 
               yield format if block_given?
@@ -83,20 +86,20 @@ module Trestle
         def update
           if update_instance
             respond_to do |format|
-              format.html do
-                flash[:message] = flash_message("update.success", title: "Success!", message: "The %{lowercase_model_name} was successfully updated.")
-                redirect_to_return_location(:update, instance) { admin.instance_path(instance) }
-              end
+              flash[:message] = flash_message("update.success", title: "Success!", message: "The %{lowercase_model_name} was successfully updated.")
+
+              format.html { redirect_to_return_location(:update, instance) { admin.instance_path(instance) } }
+              format.turbo_stream { flash.discard }
               format.json { render json: instance, status: :ok }
 
               yield format if block_given?
             end
           else
             respond_to do |format|
-              format.html do
-                flash.now[:error] = flash_message("update.failure", title: "Warning!", message: "Please correct the errors below.")
-                render "show", status: :unprocessable_entity
-              end
+              flash.now[:error] = flash_message("update.failure", title: "Warning!", message: "Please correct the errors below.")
+
+              format.html { render "show", status: :unprocessable_entity }
+              format.turbo_stream { render "update", status: :unprocessable_entity }
               format.json { render json: instance.errors, status: :unprocessable_entity }
 
               yield format if block_given?
@@ -105,26 +108,34 @@ module Trestle
         end
 
         def destroy
-          success = delete_instance
+          deleting_referer = URI(request.referer).path == admin.instance_path(instance)
 
-          respond_to do |format|
-            format.html do
-              if success
-                flash[:message] = flash_message("destroy.success", title: "Success!", message: "The %{lowercase_model_name} was successfully deleted.")
-                redirect_to_return_location(:destroy, instance) { admin.path(:index) }
-              else
-                flash[:error] = flash_message("destroy.failure", title: "Warning!", message: "Could not delete %{lowercase_model_name}.")
+          if delete_instance
+            respond_to do |format|
+              flash[:message] = flash_message("destroy.success", title: "Success!", message: "The %{lowercase_model_name} was successfully deleted.")
+
+              format.html { redirect_to_return_location(:destroy, instance, status: :see_other) { admin.path(:index) } }
+              format.turbo_stream { flash.discard } unless deleting_referer
+              format.json { head :no_content }
+
+              yield format if block_given?
+            end
+          else
+            respond_to do |format|
+              flash[:error] = flash_message("destroy.failure", title: "Warning!", message: "Could not delete %{lowercase_model_name}.")
 
+              format.html do
                 if load_instance
                   redirect_to_return_location(:update, instance) { admin.instance_path(instance) }
                 else
-                  redirect_to_return_location(:destroy, instance) { admin.path(:index) }
+                  redirect_to_return_location(:destroy, instance, status: :see_other) { admin.path(:index) }
                 end
               end
-            end
-            format.json { head :no_content }
+              format.turbo_stream { flash.discard }
+              format.json { head :no_content }
 
-            yield format if block_given?
+              yield format if block_given?
+            end
           end
         end
       end

data/app/controllers/concerns/trestle/resource/controller/redirection.rb

@@ -3,20 +3,20 @@ module Trestle
     module Controller
       module Redirection
       protected
-        def redirect_to_return_location(action, instance, default: nil, &block)
+        def redirect_to_return_location(action, instance, status: :found, default: nil, &block)
           fallback_location = block_given? ? block : default
 
-          if admin.return_locations[action] && !dialog_request?
+          if admin.return_locations[action] && !modal_request?
             location = instance_exec(instance, &admin.return_locations[action])
 
             case location
             when :back
-              redirect_back fallback_location: fallback_location, turbolinks: false
+              redirect_back fallback_location: fallback_location, status: status
             else
-              redirect_to location, turbolinks: false
+              redirect_to location, status: status
             end
           else
-            redirect_to fallback_location, turbolinks: false
+            redirect_to fallback_location, status: status
           end
         end
       end

data/app/controllers/trestle/application_controller.rb

@@ -3,10 +3,11 @@ class Trestle::ApplicationController < ActionController::Base
 
   include Trestle::Controller::Breadcrumbs
   include Trestle::Controller::Callbacks
-  include Trestle::Controller::Dialog
   include Trestle::Controller::Helpers
   include Trestle::Controller::Layout
   include Trestle::Controller::Location
+  include Trestle::Controller::Modal
   include Trestle::Controller::Title
   include Trestle::Controller::Toolbars
+  include Trestle::Controller::Turbo
 end

data/app/helpers/trestle/flash_helper.rb

@@ -11,5 +11,15 @@ module Trestle
     def instance_has_errors?
       instance.errors.any? rescue false
     end
+
+    def turbo_stream_update_flash
+      <<-EOF
+      <turbo-stream action="update" target="flash">
+        <template>
+          #{render_to_string(partial: "trestle/flash/flash", formats: [:html])}
+        </template>
+      </turbo-stream>
+      EOF
+    end
   end
 end

data/app/helpers/trestle/form_helper.rb

@@ -1,13 +1,14 @@
 module Trestle
   module FormHelper
     IDENTITY_FIELD_ERROR_PROC = Proc.new { |html_tag, instance| html_tag }
+    DEFAULT_FORM_CONTROLLERS = %w(keyboard-submit form-loading form-error)
 
     def trestle_form_for(instance, options={}, &block)
       options[:builder] ||= Form::Builder
       options[:as] ||= admin.parameter_name
 
       options[:data] ||= {}
-      options[:data].reverse_merge!(remote: true, type: :html, behavior: "trestle-form", turbolinks: false)
+      options[:data][:controller] = (DEFAULT_FORM_CONTROLLERS + Array(options[:data][:controller])).join(" ")
 
       form_for(instance, options) do |f|
         with_identity_field_error_proc do
@@ -41,7 +42,7 @@ module Trestle
     end
 
     def render_sidebar_as_tab?
-      dialog_request? && content_for?(:sidebar)
+      modal_request? && content_for?(:sidebar)
     end
   end
 end

data/app/helpers/trestle/format_helper.rb

@@ -13,7 +13,8 @@ module Trestle
       when :currency
         number_to_currency(value)
       when :tags
-        safe_join(Array(value).map { |tag| content_tag(:span, tag, class: "tag") })
+        tags = Array(value).map { |tag| content_tag(:span, tag, class: "tag tag-primary") }
+        content_tag(:div, safe_join(tags), class: "tag-list")
       else
         value
       end

data/app/helpers/trestle/i18n_helper.rb

@@ -1,13 +1,52 @@
 module Trestle
   module I18nHelper
-    def i18n_javascript_translations
-      Trestle.config.javascript_i18n_keys.map { |key|
-        begin
-          [key, t(key, raise: true)]
-        rescue I18n::MissingTranslationData
-          nil
+    FLATPICKR_LOCALE_CONVERSIONS = { ca: "cat", el: "gr", nb: "no", vi: "vn" }.stringify_keys
+
+    # Returns the I18n fallbacks for the given locale.
+    #
+    # This is used to determine which locale files to include.
+    #
+    # Examples
+    #
+    #   i18n_fallbacks("pt-BR") => ["pt-BR", "pt"]
+    #   i18n_fallbacks("ca") => ["ca", "es-ES", "es"] %>
+    #
+    # Returns an array of locale Strings.
+    def i18n_fallbacks(locale=I18n.locale)
+      if I18n.respond_to?(:fallbacks)
+        I18n.fallbacks[locale].map(&:to_s)
+      elsif locale.to_s.include?("-")
+        fallback = locale.to_s.split("-").first
+        [locale, fallback]
+      else
+        [locale]
+      end
+    end
+
+    # Returns a nested hash of I18n key/value pairs for passing to JS.
+    def i18n_javascript_translations(keys=Trestle.config.javascript_i18n_keys)
+      result = {}
+
+      keys.each do |key|
+        if translation = I18n.t(key, default: nil)
+          *parts, last = key.split(".")
+
+          # Create nesting from period-separated i18n key
+          target = parts.inject(result) { |hash, part|
+            hash[part] ||= {}
+          }
+
+          target[last] = translation
         end
-      }.compact
+      end
+
+      result
+    end
+
+    # Returns the Flatpickr locale code corresponding to the given locale,
+    # as some of their codes are different to the Rails' counterparts.
+    def flatpickr_locale(locale)
+      FLATPICKR_LOCALE_CONVERSIONS.fetch(locale.to_s) { locale }
     end
   end
 end

data/app/helpers/trestle/modal_helper.rb

@@ -0,0 +1,34 @@
+module Trestle
+  module ModalHelper
+    def turbo_stream_modal(template: action_name)
+      template = render_to_string template: action_name, prefixes: _prefixes, formats: [:html], layout: "trestle/modal"
+      %(<turbo-stream action="modal"><template>#{template}</template></turbo-stream>).html_safe
+    end
+
+    def modal_options!(options)
+      modal_options.merge!(options)
+    end
+
+    def modal_options
+      @_modal_options ||= {}
+    end
+
+    def modal_wrapper_attributes
+      {
+        class: ["modal", "fade", modal_options[:wrapper_class]],
+        tabindex: "-1",
+        role: "dialog",
+        data: {
+          controller: ["modal", modal_options[:controller]].compact.join(" ")
+        }
+      }.deep_merge(modal_options.except(:class, :wrapper_class, :controller))
+    end
+
+    def modal_dialog_attributes
+      {
+        class: ["modal-dialog", modal_options[:class]],
+        role: "document"
+      }
+    end
+  end
+end

data/app/helpers/trestle/tab_helper.rb

@@ -7,7 +7,7 @@ module Trestle
     def tab(name, options={})
       tabs[name] = tab = Tab.new(name, options)
 
-      content_tag(:div, id: tab.id(("modal" if dialog_request?)), class: ["tab-pane", ('active' if name == tabs.keys.first)], role: "tabpanel") do
+      content_tag(:div, id: tab.id(("modal" if modal_request?)), class: ["tab-pane", ('active' if name == tabs.keys.first)], role: "tabpanel") do
         if block_given?
           yield
         elsif options[:partial]

data/app/helpers/trestle/turbo_frame_helper.rb

@@ -0,0 +1,34 @@
+module Trestle
+  module TurboFrameHelper
+    def index_turbo_frame(options={}, &block)
+      defaults = {
+        id: "index",
+        data: {
+          controller: "reloadable",
+          turbo_action: "advance"
+        }
+      }
+
+      content_tag("turbo-frame", defaults.merge(options), &block)
+    end
+
+    def resource_turbo_frame(instance, options={}, &block)
+      defaults = {
+        id: dom_id(instance),
+        target: ("_top" unless modal_request?),
+        data: {
+          controller: resource_turbo_frame_controllers.join(" ").presence
+        }
+      }
+
+      content_tag("turbo-frame", defaults.merge(options), &block)
+    end
+
+    def resource_turbo_frame_controllers
+      controllers = []
+      controllers << "modal-frame" if modal_request?
+      controllers << "deprecated--init" if modal_request? || request.post? || turbo_frame_request?
+      controllers
+    end
+  end
+end

data/app/helpers/trestle/url_helper.rb

@@ -1,6 +1,6 @@
 module Trestle
   module UrlHelper
-    DIALOG_ACTIONS = [:new, :show, :edit]
+    MODAL_ACTIONS = [:new, :show, :edit]
 
     def admin_link_to(content, instance_or_url=nil, options={}, &block)
       # Block given - ignore content parameter and capture content from block
@@ -45,9 +45,12 @@ module Trestle
           end
 
           # Determine link data options
-          if DIALOG_ACTIONS.include?(action) && admin.form.dialog?
-            options[:data] ||= {}
-            options[:data][:behavior] ||= "dialog"
+          options[:data] ||= {}
+
+          if MODAL_ACTIONS.include?(action) && admin.form.modal?
+            options[:data][:controller] ||= "modal-trigger"
+          else
+            options[:data][:turbo_frame] = "_top"
           end
 
           link_to(content, path, options)

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

@@ -5,10 +5,9 @@
     <meta content='width=device-width, initial-scale=1' name='viewport'>
     <meta content='IE=edge,chrome=1' http-equiv='X-UA-Compatible'>
 
-    <% if Trestle.config.turbolinks %>
-      <meta name='turbolinks-cache-control' content='no-cache'>
-      <meta name="turbolinks-root" content="<%= Trestle.config.path %>">
-    <% end %>
+    <meta name='turbo-cache-control' content='no-cache'>
+    <meta name="turbo-prefetch" content="false" />
+    <meta name="turbo-root" content="<%= Trestle.config.path %>">
 
     <%= csrf_meta_tags %>
 
@@ -16,43 +15,42 @@
 
     <%= favicon_link_tag Trestle.config.favicon if Trestle.config.favicon %>
 
-    <%= stylesheet_link_tag "trestle/admin", 'data-turbolinks-track': 'reload' %>
-    <%= stylesheet_link_tag "trestle/theme", 'data-turbolinks-track': 'reload' if Trestle.config.theme %>
-    <%= stylesheet_link_tag "trestle/custom", 'data-turbolinks-track': 'reload' %>
+    <%= stylesheet_link_tag "trestle/admin", 'data-turbo-track': 'reload' %>
+    <%= stylesheet_link_tag "trestle/icons/font-awesome", 'data-turbo-track': 'reload' if defined?(Sprockets) %>
 
-    <%= hook :stylesheets %>
+    <%= stylesheet_link_tag "trestle/custom", 'data-turbo-track': 'reload' %>
 
-    <%= javascript_include_tag "turbolinks" if Trestle.config.turbolinks rescue nil %>
-    <%= javascript_include_tag "trestle/admin", 'data-turbolinks-track': 'reload' %>
+    <%= hook :stylesheets %>
 
-    <%= javascript_tag nonce: true do %>
-      <% i18n_javascript_translations.each do |key, value| %>
-      Trestle.i18n['<%= key %>'] = "<%= escape_javascript(value) %>";
-      <% end %>
+    <%= javascript_include_tag "trestle/admin", 'data-turbo-track': 'reload' %>
+    <%= javascript_include_tag "trestle/custom", 'data-turbo-track': 'reload' %>
 
-      Trestle.localize(<%= Trestle.i18n_fallbacks.map { |l| "'#{l}'" }.join(", ").html_safe %>);
-    <% end %>
+    <%= render "trestle/i18n" unless I18n.locale == :en %>
 
     <%= hook :javascripts %>
 
+    <%= render "trestle/theme" %>
+
     <%= content_for(:head) %>
 
     <%= hook :head %>
   </head>
 
   <%= content_tag :body, body_attributes do %>
-    <div class="app-wrapper">
+    <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" data-context="<%= request.fullpath %>">
+        <main class="app-main">
           <%= yield %>
         </main>
 
         <%= render "trestle/shared/footer" %>
       </div>
     </div>
+
+    <turbo-frame id="modal"></turbo-frame>
   <% end %>
 </html>

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

@@ -0,0 +1,11 @@
+<%= yield %>
+
+<% unless modal_request? %>
+  <turbo-stream action="flash">
+    <template>
+      <%= render partial: "trestle/flash/flash", formats: [:html] %>
+    </template>
+  </turbo-stream>
+<% end %>
+
+<turbo-stream action="reload"></turbo-stream>

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

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

data/app/views/trestle/_i18n.html.erb

@@ -0,0 +1,12 @@
+<% i18n_fallbacks.each do |locale| %>
+  <%= javascript_include_tag "trestle/locale/#{locale}", 'data-turbo-track': 'reload' rescue nil %>
+  <%= javascript_include_tag "trestle/locale/flatpickr/#{flatpickr_locale(locale)}", 'data-turbo-track': 'reload' rescue nil %>
+<% end %>
+
+<%= javascript_tag nonce: true do %>
+  <% if Trestle.config.javascript_i18n_keys.any? %>
+  Trestle.i18n.store(<%=raw JSON.pretty_generate(I18n.locale => i18n_javascript_translations) %>);
+  <% end %>
+
+  Trestle.localize(<%= i18n_fallbacks.map { |l| "'#{l}'" }.join(", ").html_safe %>);
+<% end %>

data/app/views/trestle/_theme.html.erb

@@ -0,0 +1,15 @@
+<% if Trestle.config.theme.any? %>
+<style type="text/css">
+  :root {
+    <% Trestle.config.theme.each do |name, color| %>
+      --<%= name %>: <%= color.hex %>;
+      --<%= name %>-rgb: <%= color.rgb.join(", ") %>;
+
+      <% h, s, l = color.hsl %>
+      --<%= name %>-h: <%= h %>;
+      --<%= name %>-s: <%= s %>%;
+      --<%= name %>-l: <%= l %>%;
+    <% end %>
+  }
+</style>
+<% end %>

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

@@ -6,7 +6,7 @@
     <ol class="breadcrumb">
       <% breadcrumbs.each do |breadcrumb| %>
         <li class="breadcrumb-item<% if breadcrumb == breadcrumbs.last %> active<% end %>">
-          <%= link_to breadcrumb.label, breadcrumb.path %>
+          <%= link_to breadcrumb.label, breadcrumb.path, data: { turbo_frame: "_top" } %>
         </li>
       <% end %>
     </ol>

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

@@ -1,9 +1,12 @@
 <%= render "header", hide_breadcrumbs: local_assigns.fetch(:hide_breadcrumbs, false) if local_assigns.fetch(:header, true) %>
 
-<div class="main-content-area">
-  <%= render "trestle/flash/flash" %>
+<div class="main-content-area" data-scroll-target>
+  <turbo-frame id="flash">
+    <%= render "trestle/flash/flash" %>
+  </turbo-frame>
+
   <%= render "utilities" %>
-  <%= render "tabs" %>
+  <%= render "tabs", data: { controller: "tabs tab-errors" } %>
 
   <% if local_assigns.fetch(:wrapper, true) %>
     <%= container do |c| %>

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

@@ -0,0 +1,36 @@
+<div class="modal-content">
+  <div class="modal-header">
+    <h4 class="modal-title"><%= title %></h4>
+    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+  </div>
+
+  <div class="modal-flash">
+    <%= render "trestle/flash/flash" %>
+  </div>
+
+  <div class="modal-tabs">
+    <%= render "tabs", data: { controller: "tab-errors" } %>
+  </div>
+
+  <div class="modal-body">
+    <%= yield %>
+
+    <% if content_for?(:sidebar) %>
+      <div id="tab-sidebar" class="tab-pane" role="tabpanel">
+        <%= content_for(:sidebar) %>
+      </div>
+    <% end %>
+  </div>
+
+  <div class="modal-footer">
+    <div class="btn-toolbar secondary-toolbar" role="toolbar">
+      <%= render_toolbar(toolbar(:secondary)) %>
+      <%= deprecated_toolbar(:secondary) %>
+    </div>
+
+    <div class="btn-toolbar primary-toolbar" role="toolbar">
+      <%= render_toolbar(toolbar(:primary)) %>
+      <%= deprecated_toolbar(:primary) %>
+    </div>
+  </div>
+</div>

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

@@ -1,15 +1,15 @@
 <% if tabs.any? || render_sidebar_as_tab? -%>
-  <ul class="nav nav-tabs">
+  <%= content_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 dialog_request?))}", class: ["nav-link", ("active" if name == tabs.keys.first)], role: "tab", data: { toggle: "tab" } %>
+        <%= 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" } %>
       </li>
     <% end %>
 
     <% if render_sidebar_as_tab? %>
       <li class="nav-item align-right">
-        <%= link_to icon("fa fa-list-alt"), "#tab-sidebar", class: "nav-link", role: "tab", data: { toggle: "tab" } %>
+        <%= link_to icon("fa fa-list-alt"), "#tab-sidebar", class: "nav-link", role: "tab", data: { bs_toggle: "tab" } %>
       </li>
     <% end %>
-  </ul>
+  <% end %>
 <% end %>

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

@@ -1,5 +1,5 @@
 <div class="alert alert-dismissable <%= html_class %>" role="alert">
-  <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+  <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
 
   <%= icon %>
 

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

@@ -1,7 +1,7 @@
 <% errors = local_assigns.fetch(:errors, {}) %>
 
 <% if errors.any? %>
-  <%= link_to "Debug errors", "#debug-errors", class: "toggle-debug-errors small", data: { toggle: "collapse" } %>
+  <%= link_to "Debug errors", "#debug-errors", class: "toggle-debug-errors small", data: { bs_toggle: "collapse" } %>
 
   <div id="debug-errors" class="debug-errors collapse">
     <ul>

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

@@ -1,4 +1,9 @@
 <% if admin.form -%>
+  <% if admin.form.modal? && modal_options = admin.form.options[:modal] %>
+    <% modal_options!(class: modal_options[:class]) %>
+    <% modal_options!(controller: modal_options[:controller]) %>
+  <% end %>
+
   <%= admin.form.render(self, instance) %>
 <% else %>
   <p><%= t("trestle.onboarding.no_form", default: "Please define a form block or create a <code>_form.html</code> partial.").html_safe %></p>

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

@@ -0,0 +1,5 @@
+<turbo-stream action="replace" target="<%= dom_id(admin.build_instance({}, params)) %>">
+  <template>
+    <%= render template: instance.persisted? ? "trestle/resource/show" : "trestle/resource/new", formats: [:html] %>
+  </template>
+</turbo-stream>

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

@@ -0,0 +1 @@
+<turbo-stream action="closeModal" target="<%= dom_id(instance) %>"></turbo-stream>

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

@@ -11,6 +11,8 @@
   <%= t.delete %>
 <% end %>
 
-<%= trestle_form_for instance, url: admin.actions.include?(:update) ? admin.instance_path(instance, action: :update) : "#", method: :patch do |f| %>
-  <%= render partial: "form", layout: dialog_request? ? "dialog" : "layout" %>
+<%= resource_turbo_frame(instance) do %>
+  <%= trestle_form_for instance, url: admin.actions.include?(:update) ? admin.instance_path(instance, action: :update) : "#", method: :patch do |f| %>
+    <%= render partial: "form", layout: modal_request? ? "modal" : "layout" %>
+  <% end %>
 <% end %>