solidus_admin 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 697989b3ed1f8f55cb6b526f00ab4ef89a1c2ed08912ee02214e9e3370a4ed91
-  data.tar.gz: bf69f368a14f08eab2daa067a1c3d45ec8dbaecaf5ae33465620a274f6c84217
+  metadata.gz: ad8d6194f5a37ead1b362139f65c296fa6c7485807e79be11122d4689db00e9f
+  data.tar.gz: 17f079ab01043b7529e013eff1b613c95de6385c2e85e6664a8476e42c7ff940
 SHA512:
-  metadata.gz: f893969db91009080b3fbd329af2c4fd828dcabd130dd89740a54ebde7c9b062330f9fdf8ac6738f33d3b30c484fb31e2b10cecee099e8821f33ba07c030af67
-  data.tar.gz: ce0bec96616ceb9f980cc12858a081ce6d071e951837b1fe2e7b898ce3b926ec8c08a893ba00b40018272a8d127bb1adee4a827ffe65c80f281a6dc644eb34bf
+  metadata.gz: c60e10eceed8c821298dee0ad21cf3c0069953f7269a0b483a5c5778f3532bd8e6ba84a46531082eb774682b59fb6a631fd654eaa78033b800cb30a87e7a6bcb
+  data.tar.gz: 837117c43cc7618445d41b2d500a2e9c79eb4f5b7c4f485ce21d4f2ab3dc816cdace1ad930208b970ab22096deda3e0c4a0e43a4f472caee39b21c048b7f0b77

data/.prettierrc

@@ -0,0 +1,4 @@
+{
+  "trailingComma": "es5",
+  "semi": false
+}

data/app/assets/builds/solidus_admin/tailwind.css

@@ -109,7 +109,7 @@
 }
 
 /*
-! tailwindcss v3.4.15 | MIT License | https://tailwindcss.com
+! tailwindcss v3.4.17 | MIT License | https://tailwindcss.com
 */
 
 /*
@@ -1141,6 +1141,10 @@ summary{
   width: 10%;
 }
 
+.w-\[100\%\]{
+  width: 100%;
+}
+
 .w-\[12\%\]{
   width: 12%;
 }
@@ -1165,6 +1169,10 @@ summary{
   width: 1rem;
 }
 
+.w-\[20\%\]{
+  width: 20%;
+}
+
 .w-\[22\%\]{
   width: 22%;
 }
@@ -1177,6 +1185,10 @@ summary{
   width: 24%;
 }
 
+.w-\[25\%\]{
+  width: 25%;
+}
+
 .w-\[400px\]{
   width: 400px;
 }

data/app/components/solidus_admin/adjustment_reasons/edit/component.html.erb

@@ -1,6 +1,6 @@
-<%= turbo_frame_tag :edit_adjustment_reason_modal do %>
+<%= turbo_frame_tag :resource_modal, target: "_top" do %>
   <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
-    <%= form_for @adjustment_reason, url: solidus_admin.adjustment_reason_path(@adjustment_reason), html: { id: form_id } do |f| %>
+    <%= form_for @adjustment_reason, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">
         <%= render component("ui/forms/field").text_field(f, :name, class: "required") %>
         <%= render component("ui/forms/field").text_field(f, :code, class: "required") %>
@@ -24,4 +24,3 @@
     <% end %>
   <% end %>
 <% end %>
-<%= render component("adjustment_reasons/index").new(page: @page) %>

data/app/components/solidus_admin/adjustment_reasons/edit/component.rb

@@ -1,12 +1,4 @@
 # frozen_string_literal: true
 
-class SolidusAdmin::AdjustmentReasons::Edit::Component < SolidusAdmin::BaseComponent
-  def initialize(page:, adjustment_reason:)
-    @page = page
-    @adjustment_reason = adjustment_reason
-  end
-
-  def form_id
-    dom_id(@adjustment_reason, "#{stimulus_id}_edit_adjustment_reason_form")
-  end
+class SolidusAdmin::AdjustmentReasons::Edit::Component < SolidusAdmin::Resources::Edit::Component
 end

data/app/components/solidus_admin/adjustment_reasons/index/component.rb

@@ -17,7 +17,8 @@ class SolidusAdmin::AdjustmentReasons::Index::Component < SolidusAdmin::RefundsA
     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(**search_filter_params),
+      data: { turbo_frame: :resource_modal },
       icon: "add-line",
       class: "align-self-end w-full",
     )
@@ -25,20 +26,19 @@ class SolidusAdmin::AdjustmentReasons::Index::Component < SolidusAdmin::RefundsA
 
   def turbo_frames
     %w[
-      new_adjustment_reason_modal
-      edit_adjustment_reason_modal
+      resource_modal
     ]
   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, **search_filter_params)
   end
 
   def batch_actions
     [
       {
         label: t('.batch_actions.delete'),
-        action: solidus_admin.adjustment_reasons_path,
+        action: solidus_admin.adjustment_reasons_path(**search_filter_params),
         method: :delete,
         icon: 'delete-bin-7-line',
       },
@@ -47,8 +47,22 @@ class SolidusAdmin::AdjustmentReasons::Index::Component < SolidusAdmin::RefundsA
 
   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: :resource_modal }
+        end
+      },
+      {
+        header: :code,
+        data: ->(adjustment_reason) do
+          link_to adjustment_reason.code, edit_path(adjustment_reason),
+            class: 'body-link',
+            data: { turbo_frame: :resource_modal }
+        end
+      },
       {
         header: :active,
         data: ->(adjustment_reason) do

data/app/components/solidus_admin/adjustment_reasons/new/component.html.erb

@@ -1,6 +1,6 @@
-<%= turbo_frame_tag :new_adjustment_reason_modal do %>
+<%= turbo_frame_tag :resource_modal, target: "_top" do %>
   <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
-    <%= form_for @adjustment_reason, url: solidus_admin.adjustment_reasons_path, html: { id: form_id } do |f| %>
+    <%= form_for @adjustment_reason, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">
         <%= render component("ui/forms/field").text_field(f, :name, class: "required") %>
         <%= render component("ui/forms/field").text_field(f, :code, class: "required") %>
@@ -24,5 +24,3 @@
     <% end %>
   <% end %>
 <% end %>
-
-<%= render component("adjustment_reasons/index").new(page: @page) %>

data/app/components/solidus_admin/adjustment_reasons/new/component.rb

@@ -1,12 +1,4 @@
 # frozen_string_literal: true
 
-class SolidusAdmin::AdjustmentReasons::New::Component < SolidusAdmin::BaseComponent
-  def initialize(page:, adjustment_reason:)
-    @page = page
-    @adjustment_reason = adjustment_reason
-  end
-
-  def form_id
-    dom_id(@adjustment_reason, "#{stimulus_id}_new_adjustment_reason_form")
-  end
+class SolidusAdmin::AdjustmentReasons::New::Component < SolidusAdmin::Resources::New::Component
 end

data/app/components/solidus_admin/base_component.rb

@@ -7,6 +7,7 @@ module SolidusAdmin
   # BaseComponent is the base class for all components in Solidus Admin.
   class BaseComponent < ViewComponent::Base
     include SolidusAdmin::ComponentsHelper
+    include SolidusAdmin::VoidElementsHelper
     include Turbo::FramesHelper
 
     def icon_tag(name, **attrs)
@@ -37,23 +38,6 @@ module SolidusAdmin
     end
 
     delegate :stimulus_id, to: :class
-
-    class << self
-      private
-
-      def engines_with_routes
-        Rails::Engine.subclasses.map(&:instance).reject do |engine|
-          engine.routes.empty?
-        end
-      end
-    end
-
-    # For each engine with routes, define a method that returns the routes proxy.
-    # This allows us to use the routes in the context of a component class.
-    engines_with_routes.each do |engine|
-      define_method(engine.engine_name) do
-        engine.routes.url_helpers
-      end
-    end
+    delegate :search_filter_params, to: :helpers
   end
 end

data/app/components/solidus_admin/layout/navigation/component.js

@@ -2,7 +2,7 @@ import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
   static values = {
-    cookie: String
+    cookie: String,
   }
 
   setCookie(event) {

data/app/components/solidus_admin/orders/index/component.rb

@@ -143,7 +143,7 @@ class SolidusAdmin::Orders::Index::Component < SolidusAdmin::UI::Pages::Index::C
       col: { class: "w-[400px]" },
       header: :customer,
       data: ->(order) do
-        customer_email = order.user&.email
+        customer_email = order.email
         content_tag :div, String(customer_email)
       end
     }
@@ -153,7 +153,7 @@ class SolidusAdmin::Orders::Index::Component < SolidusAdmin::UI::Pages::Index::C
     {
       header: :total,
       data: ->(order) do
-        content_tag :div, number_to_currency(order.total)
+        content_tag :div, order.display_total
       end
     }
   end

data/app/components/solidus_admin/orders/show/address/component.js

@@ -1,9 +1,9 @@
-import { Controller } from '@hotwired/stimulus'
+import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
   static targets = ["addresses"]
 
   close() {
-    this.addressesTarget.removeAttribute('open')
+    this.addressesTarget.removeAttribute("open")
   }
 }

data/app/components/solidus_admin/orders/show/component.js

@@ -1,7 +1,7 @@
-import { Controller } from '@hotwired/stimulus'
+import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
   closeMenus() {
-    this.element.querySelectorAll('details').forEach(details => details.removeAttribute('open'))
+    this.element.querySelectorAll("details").forEach((details) => details.removeAttribute("open"))
   }
 }

data/app/components/solidus_admin/orders/show/customer_search/component.js

@@ -1,14 +1,15 @@
-import { Controller } from '@hotwired/stimulus'
+import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
   static values = { customersUrl: String }
 
   async search({ detail: { query, controller } }) {
-    controller.resultsValue =
-      (await (await fetch(`${this.customersUrlValue}?q[name_or_variants_including_master_sku_cont]=${query}`)).text())
+    controller.resultsValue = await (
+      await fetch(`${this.customersUrlValue}?q[name_or_variants_including_master_sku_cont]=${query}`)
+    ).text()
   }
 
   submit(event) {
-    event.detail.resultTarget.querySelector('form').submit()
+    event.detail.resultTarget.querySelector("form").submit()
   }
 }

data/app/components/solidus_admin/orders/show/summary/component.html.erb

@@ -2,12 +2,12 @@
   <%= render component('ui/panel').new(title: t('.summary')) do %>
     <%= render component('ui/details_list').new(
       items: [
-        { label: t('.subtotal'), value: number_to_currency(@order.item_total), class: 'font-semibold' },
-        { label: t('.taxes'), value: number_to_currency(@order.additional_tax_total) },
-        { label: t('.shipping'), value: number_to_currency(@order.shipment_total) },
-        { label: link_to(t('.add_promo_code'), '#', class: "body-link"), value: number_to_currency(@order.promo_total) },
-        { label: link_to(t('.adjustments'), solidus_admin.order_adjustments_path(@order), class: "body-link"), value: number_to_currency(@order.adjustment_total) },
-        { label: t('.total'), value: number_to_currency(@order.total), class: 'font-semibold' }
+        { label: t('.subtotal'), value: @order.display_item_total, class: 'font-semibold' },
+        { label: t('.taxes'), value: @order.display_additional_tax_total },
+        { label: t('.shipping'), value: @order.display_shipment_total },
+        { label: link_to(t('.add_promo_code'), '#', class: "body-link"), value: @order.display_promo_total },
+        { label: link_to(t('.adjustments'), solidus_admin.order_adjustments_path(@order), class: "body-link"), value: @order.display_adjustment_total },
+        { label: t('.total'), value: @order.display_total, class: 'font-semibold' }
       ]
     ) %>
   <% end %>

data/app/components/solidus_admin/products/show/component.html.erb

@@ -36,8 +36,14 @@
           <%= render component("ui/forms/field").text_field(f, :meta_title) %>
           <%= render component("ui/forms/field").text_field(f, :meta_description) %>
           <%= render component("ui/forms/field").text_area(f, :meta_keywords) %>
+          <%= render component("ui/forms/field").text_field(f, :gtin) %>
+          <%= render component("ui/forms/field").select(
+            f,
+            :condition,
+            condition_options,
+            include_blank: t('spree.unset'),
+          ) %>
         <% end %>
-
         <%= render component('ui/panel').new(title: "Media") do |panel| %>
           <% panel.with_action(
             name: t(".manage_images"),

data/app/components/solidus_admin/products/show/component.rb

@@ -25,4 +25,10 @@ class SolidusAdmin::Products::Show::Component < SolidusAdmin::BaseComponent
       ["#{_1} (#{_2})", _3]
     end
   end
+
+  def condition_options
+    @condition_options ||= Spree::Variant.conditions.map do |key, value|
+      [t("spree.condition.#{key}"), value]
+    end
+  end
 end

data/app/components/solidus_admin/properties/edit/component.html.erb

@@ -0,0 +1,16 @@
+<%= turbo_frame_tag :resource_modal, target: "_top" do %>
+  <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
+    <%= form_for @property, url: form_url, html: { id: form_id } do |f| %>
+      <div class="flex flex-col gap-6 pb-4">
+        <%= render component("ui/forms/field").text_field(f, :name, class: "required") %>
+        <%= render component("ui/forms/field").text_field(f, :presentation, class: "required") %>
+      </div>
+      <% modal.with_actions do %>
+        <form method="dialog">
+          <%= render component("ui/button").new(scheme: :secondary, text: t('.cancel')) %>
+        </form>
+        <%= render component("ui/button").new(form: form_id, type: :submit, text: t('.submit')) %>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/components/solidus_admin/properties/edit/component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Properties::Edit::Component < SolidusAdmin::Resources::Edit::Component
+end

data/app/components/solidus_admin/properties/edit/component.yml

@@ -0,0 +1,4 @@
+en:
+  title: "Edit Property"
+  cancel: "Cancel"
+  submit: "Update Property"

data/app/components/solidus_admin/properties/index/component.rb

@@ -5,6 +5,10 @@ class SolidusAdmin::Properties::Index::Component < SolidusAdmin::UI::Pages::Inde
     Spree::Property
   end
 
+  def title
+    t('solidus_admin.properties.title')
+  end
+
   def search_key
     :name_cont
   end
@@ -13,15 +17,20 @@ class SolidusAdmin::Properties::Index::Component < SolidusAdmin::UI::Pages::Inde
     solidus_admin.properties_path
   end
 
-  def row_url(property)
-    spree.admin_property_path(property)
+  def edit_path(property)
+    solidus_admin.edit_property_path(property, **search_filter_params)
+  end
+
+  def turbo_frames
+    %w[resource_modal]
   end
 
   def page_actions
     render component("ui/button").new(
       tag: :a,
       text: t('.add'),
-      href: spree.new_admin_property_path,
+      href: solidus_admin.new_property_path(**search_filter_params),
+      data: { turbo_frame: :resource_modal },
       icon: "add-line",
     )
   end
@@ -30,7 +39,7 @@ class SolidusAdmin::Properties::Index::Component < SolidusAdmin::UI::Pages::Inde
     [
       {
         label: t('.batch_actions.delete'),
-        action: solidus_admin.properties_path,
+        action: solidus_admin.properties_path(**search_filter_params),
         method: :delete,
         icon: 'delete-bin-7-line',
       },
@@ -48,7 +57,9 @@ class SolidusAdmin::Properties::Index::Component < SolidusAdmin::UI::Pages::Inde
     {
       header: :name,
       data: ->(property) do
-        content_tag :div, property.name
+        link_to property.name, edit_path(property),
+          data: { turbo_frame: :resource_modal },
+          class: 'body-link'
       end
     }
   end
@@ -57,7 +68,9 @@ class SolidusAdmin::Properties::Index::Component < SolidusAdmin::UI::Pages::Inde
     {
       header: :presentation,
       data: ->(property) do
-        content_tag :div, property.presentation
+        link_to property.presentation, edit_path(property),
+          data: { turbo_frame: :resource_modal },
+          class: 'body-link'
       end
     }
   end

data/app/components/solidus_admin/properties/new/component.html.erb

@@ -0,0 +1,16 @@
+<%= turbo_frame_tag :resource_modal, target: "_top" do %>
+  <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
+    <%= form_for @property, url: form_url, html: { id: form_id } do |f| %>
+      <div class="flex flex-col gap-6 pb-4">
+        <%= render component("ui/forms/field").text_field(f, :name, class: "required") %>
+        <%= render component("ui/forms/field").text_field(f, :presentation, class: "required") %>
+      </div>
+      <% modal.with_actions do %>
+        <form method="dialog">
+          <%= render component("ui/button").new(scheme: :secondary, text: t('.cancel')) %>
+        </form>
+        <%= render component("ui/button").new(form: form_id, type: :submit, text: t('.submit')) %>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/components/solidus_admin/properties/new/component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Properties::New::Component < SolidusAdmin::Resources::New::Component
+end

data/app/components/solidus_admin/properties/new/component.yml

@@ -0,0 +1,4 @@
+en:
+  title: "New Property"
+  cancel: "Cancel"
+  submit: "Add Property"

data/app/components/solidus_admin/refund_reasons/edit/component.html.erb

@@ -1,6 +1,6 @@
-<%= turbo_frame_tag :edit_refund_reason_modal do %>
+<%= turbo_frame_tag :resource_modal, target: "_top" do %>
   <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
-    <%= form_for @refund_reason, url: solidus_admin.refund_reason_path(@refund_reason), html: { id: form_id } do |f| %>
+    <%= form_for @refund_reason, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">
         <%= render component("ui/forms/field").text_field(f, :name, class: "required") %>
         <%= render component("ui/forms/field").text_field(f, :code, class: "required") %>
@@ -24,4 +24,3 @@
     <% end %>
   <% end %>
 <% end %>
-<%= render component("refund_reasons/index").new(page: @page) %>

data/app/components/solidus_admin/refund_reasons/edit/component.rb

@@ -1,12 +1,4 @@
 # frozen_string_literal: true
 
-class SolidusAdmin::RefundReasons::Edit::Component < SolidusAdmin::BaseComponent
-  def initialize(page:, refund_reason:)
-    @page = page
-    @refund_reason = refund_reason
-  end
-
-  def form_id
-    dom_id(@refund_reason, "#{stimulus_id}_edit_refund_reason_form")
-  end
+class SolidusAdmin::RefundReasons::Edit::Component < SolidusAdmin::Resources::Edit::Component
 end

data/app/components/solidus_admin/refund_reasons/index/component.rb

@@ -13,14 +13,13 @@ class SolidusAdmin::RefundReasons::Index::Component < SolidusAdmin::RefundsAndRe
     :name_or_code_cont
   end
 
-  def row_url(refund_reason)
-    spree.edit_admin_refund_reason_path(refund_reason, _turbo_frame: :edit_refund_reason_modal)
+  def edit_path(refund_reason)
+    spree.edit_admin_refund_reason_path(refund_reason, **search_filter_params)
   end
 
   def turbo_frames
     %w[
-      new_refund_reason_modal
-      edit_refund_reason_modal
+      resource_modal
     ]
   end
 
@@ -28,7 +27,8 @@ class SolidusAdmin::RefundReasons::Index::Component < SolidusAdmin::RefundsAndRe
     render component("ui/button").new(
       tag: :a,
       text: t('.add'),
-      href: solidus_admin.new_refund_reason_path, data: { turbo_frame: :new_refund_reason_modal },
+      href: solidus_admin.new_refund_reason_path(**search_filter_params),
+      data: { turbo_frame: :resource_modal },
       icon: "add-line",
       class: "align-self-end w-full",
     )
@@ -38,7 +38,7 @@ class SolidusAdmin::RefundReasons::Index::Component < SolidusAdmin::RefundsAndRe
     [
       {
         label: t('.batch_actions.delete'),
-        action: solidus_admin.refund_reasons_path,
+        action: solidus_admin.refund_reasons_path(**search_filter_params),
         method: :delete,
         icon: 'delete-bin-7-line',
       },
@@ -47,8 +47,22 @@ class SolidusAdmin::RefundReasons::Index::Component < SolidusAdmin::RefundsAndRe
 
   def columns
     [
-      :name,
-      :code,
+      {
+        header: :name,
+        data: ->(refund_reason) do
+          link_to refund_reason.name, edit_path(refund_reason),
+            data: { turbo_frame: :resource_modal },
+            class: 'body-link'
+        end
+      },
+      {
+        header: :code,
+        data: ->(refund_reason) do
+          link_to_if refund_reason.code, refund_reason.code, edit_path(refund_reason),
+            data: { turbo_frame: :resource_modal },
+            class: 'body-link'
+        end
+      },
       {
         header: :active,
         data: ->(refund_reason) do

data/app/components/solidus_admin/refund_reasons/new/component.html.erb

@@ -1,6 +1,6 @@
-<%= turbo_frame_tag :new_refund_reason_modal do %>
+<%= turbo_frame_tag :resource_modal, target: "_top" do %>
   <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
-    <%= form_for @refund_reason, url: solidus_admin.refund_reasons_path, html: { id: form_id } do |f| %>
+    <%= form_for @refund_reason, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">
         <%= render component("ui/forms/field").text_field(f, :name, class: "required") %>
         <%= render component("ui/forms/field").text_field(f, :code, class: "required") %>
@@ -23,5 +23,3 @@
     <% end %>
   <% end %>
 <% end %>
-
-<%= render component("refund_reasons/index").new(page: @page) %>

data/app/components/solidus_admin/refund_reasons/new/component.rb

@@ -1,12 +1,4 @@
 # frozen_string_literal: true
 
-class SolidusAdmin::RefundReasons::New::Component < SolidusAdmin::BaseComponent
-  def initialize(page:, refund_reason:)
-    @page = page
-    @refund_reason = refund_reason
-  end
-
-  def form_id
-    dom_id(@refund_reason, "#{stimulus_id}_new_refund_reason_form")
-  end
+class SolidusAdmin::RefundReasons::New::Component < SolidusAdmin::Resources::New::Component
 end

data/app/components/solidus_admin/resources/base_component.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Resources::BaseComponent < SolidusAdmin::BaseComponent
+  def initialize(resource)
+    @resource = resource
+    instance_variable_set("@#{resource_name}", resource)
+  end
+
+  def back_url
+    solidus_admin.send("#{plural_resource_name}_path")
+  end
+
+  def resource_name
+    @resource.model_name.singular_route_key
+  end
+
+  def plural_resource_name
+    @resource.model_name.route_key
+  end
+end

data/app/components/solidus_admin/resources/edit/component.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Resources::Edit::Component < SolidusAdmin::Resources::BaseComponent
+  def form_id
+    dom_id(@resource, "#{stimulus_id}_edit_#{resource_name}_form")
+  end
+
+  def form_url
+    solidus_admin.send("#{resource_name}_path", @resource, **search_filter_params)
+  end
+end

data/app/components/solidus_admin/resources/new/component.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Resources::New::Component < SolidusAdmin::Resources::BaseComponent
+  def form_id
+    dom_id(@resource, "#{stimulus_id}_new_#{resource_name}_form")
+  end
+
+  def form_url
+    solidus_admin.send("#{plural_resource_name}_path", **search_filter_params)
+  end
+end

data/app/components/solidus_admin/return_reasons/edit/component.html.erb

@@ -1,6 +1,6 @@
-<%= turbo_frame_tag :edit_return_reason_modal do %>
+<%= turbo_frame_tag :resource_modal, target: "_top" do %>
   <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
-    <%= form_for @return_reason, url: solidus_admin.return_reason_path(@return_reason), html: { id: form_id } do |f| %>
+    <%= form_for @return_reason, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">
         <%= render component("ui/forms/field").text_field(f, :name, class: "required") %>
         <label class="flex gap-2 items-center">
@@ -23,4 +23,3 @@
     <% end %>
   <% end %>
 <% end %>
-<%= render component("return_reasons/index").new(page: @page) %>