Admin adjustment reasons with turbo-frame link and turbo template

solidusio · Dec 20, 2024 · 47b6065 · 47b6065
1 parent 7a56f2b
commit 47b6065
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 24 deletions.
diff --git a/admin/app/components/solidus_admin/adjustment_reasons/edit/component.html.erb b/admin/app/components/solidus_admin/adjustment_reasons/edit/component.html.erb
@@ -24,4 +24,3 @@
     <% end %>
   <% end %>
 <% end %>
-<%= render component("adjustment_reasons/index").new(page: @page) %>
diff --git a/admin/app/components/solidus_admin/adjustment_reasons/edit/component.rb b/admin/app/components/solidus_admin/adjustment_reasons/edit/component.rb
@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 class SolidusAdmin::AdjustmentReasons::Edit::Component < SolidusAdmin::BaseComponent
-  def initialize(page:, adjustment_reason:)
-    @page = page
+  def initialize(adjustment_reason:)
     @adjustment_reason = adjustment_reason
   end
 

diff --git a/admin/app/components/solidus_admin/adjustment_reasons/index/component.rb b/admin/app/components/solidus_admin/adjustment_reasons/index/component.rb
@@ -17,7 +17,10 @@ def page_actions
     render component("ui/button").new(
       tag: :a,
       text: t('.add'),
-      href: solidus_admin.new_adjustment_reason_path, data: { turbo_frame: :new_adjustment_reason_modal },
+      href: solidus_admin.new_adjustment_reason_path, data: {
+        turbo_frame: :new_adjustment_reason_modal,
+        turbo_prefetch: false
+      },
       icon: "add-line",
       class: "align-self-end w-full",
     )
@@ -30,8 +33,8 @@ def turbo_frames
     ]
   end
 
-  def row_url(adjustment_reason)
-    spree.edit_admin_adjustment_reason_path(adjustment_reason, _turbo_frame: :edit_adjustment_reason_modal)
+  def edit_path(adjustment_reason)
+    spree.edit_admin_adjustment_reason_path(adjustment_reason)
   end
 
   def batch_actions
@@ -47,8 +50,22 @@ def batch_actions
 
   def columns
     [
-      :name,
-      :code,
+      {
+        header: :name,
+        data: ->(adjustment_reason) do
+          link_to adjustment_reason.name, edit_path(adjustment_reason),
+            class: 'body-link',
+            data: { turbo_frame: :edit_adjustment_reason_modal, turbo_prefetch: false }
+        end
+      },
+      {
+        header: :code,
+        data: ->(adjustment_reason) do
+          link_to adjustment_reason.code, edit_path(adjustment_reason),
+            class: 'body-link',
+            data: { turbo_frame: :edit_adjustment_reason_modal, turbo_prefetch: false }
+        end
+      },
       {
         header: :active,
         data: ->(adjustment_reason) do

diff --git a/admin/app/components/solidus_admin/adjustment_reasons/new/component.html.erb b/admin/app/components/solidus_admin/adjustment_reasons/new/component.html.erb
@@ -24,5 +24,3 @@
     <% end %>
   <% end %>
 <% end %>
-
-<%= render component("adjustment_reasons/index").new(page: @page) %>
diff --git a/admin/app/components/solidus_admin/adjustment_reasons/new/component.rb b/admin/app/components/solidus_admin/adjustment_reasons/new/component.rb
@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 class SolidusAdmin::AdjustmentReasons::New::Component < SolidusAdmin::BaseComponent
-  def initialize(page:, adjustment_reason:)
-    @page = page
+  def initialize(adjustment_reason:)
     @adjustment_reason = adjustment_reason
   end
 

diff --git a/admin/app/controllers/solidus_admin/adjustment_reasons_controller.rb b/admin/app/controllers/solidus_admin/adjustment_reasons_controller.rb
@@ -17,10 +17,8 @@ def index
     def new
       @adjustment_reason = Spree::AdjustmentReason.new
 
-      set_index_page
-
       respond_to do |format|
-        format.html { render component('adjustment_reasons/new').new(page: @page, adjustment_reason: @adjustment_reason) }
+        format.html { render component('adjustment_reasons/new').new(adjustment_reason: @adjustment_reason) }
       end
     end
 
@@ -40,22 +38,20 @@ def create
           end
         end
       else
-        set_index_page
-
         respond_to do |format|
           format.html do
-            page_component = component('adjustment_reasons/new').new(page: @page, adjustment_reason: @adjustment_reason)
+            page_component = component('adjustment_reasons/new').new(adjustment_reason: @adjustment_reason)
             render page_component, status: :unprocessable_entity
           end
         end
       end
     end
 
     def edit
-      set_index_page
-
       respond_to do |format|
-        format.html { render component('adjustment_reasons/edit').new(page: @page, adjustment_reason: @adjustment_reason) }
+        format.html do
+          render component('adjustment_reasons/edit').new(adjustment_reason: @adjustment_reason)
+        end
       end
     end
 
@@ -73,11 +69,9 @@ def update
           end
         end
       else
-        set_index_page
-
         respond_to do |format|
           format.html do
-            page_component = component('adjustment_reasons/edit').new(page: @page, adjustment_reason: @adjustment_reason)
+            page_component = component('adjustment_reasons/edit').new(adjustment_reason: @adjustment_reason)
             render page_component, status: :unprocessable_entity
           end
         end