solidus_admin 0.3.2 → 0.4.0

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

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

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

@@ -13,14 +13,13 @@ class SolidusAdmin::ReturnReasons::Index::Component < SolidusAdmin::RefundsAndRe
     :name_cont
   end
 
-  def row_url(return_reason)
-    spree.edit_admin_return_reason_path(return_reason, _turbo_frame: :edit_return_reason_modal)
+  def edit_path(return_reason)
+    spree.edit_admin_return_reason_path(return_reason, **search_filter_params)
   end
 
   def turbo_frames
     %w[
-      new_return_reason_modal
-      edit_return_reason_modal
+      resource_modal
     ]
   end
 
@@ -28,8 +27,8 @@ class SolidusAdmin::ReturnReasons::Index::Component < SolidusAdmin::RefundsAndRe
     render component("ui/button").new(
       tag: :a,
       text: t('.add'),
-      href: solidus_admin.new_return_reason_path,
-      data: { turbo_frame: :new_return_reason_modal },
+      href: solidus_admin.new_return_reason_path(**search_filter_params),
+      data: { turbo_frame: :resource_modal },
       icon: "add-line",
       class: "align-self-end w-full",
     )
@@ -48,7 +47,14 @@ class SolidusAdmin::ReturnReasons::Index::Component < SolidusAdmin::RefundsAndRe
 
   def columns
     [
-      :name,
+      {
+        header: :name,
+        data: ->(return_reason) do
+          link_to return_reason.name, edit_path(return_reason),
+            data: { turbo_frame: :resource_modal },
+            class: 'body-link'
+        end
+      },
       {
         header: :active,
         data: ->(return_reason) do

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

@@ -1,6 +1,6 @@
-<%= turbo_frame_tag :new_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_reasons_path, 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,5 +23,3 @@
     <% end %>
   <% end %>
 <% end %>
-
-<%= render component("return_reasons/index").new(page: @page) %>

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

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

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

@@ -1,6 +1,6 @@
-<%= turbo_frame_tag :edit_role_modal do %>
+<%= turbo_frame_tag :resource_modal, target: "_top" do %>
   <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
-    <%= form_for @role, url: solidus_admin.role_path(@role), html: { id: form_id } do |f| %>
+    <%= form_for @role, 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, :description) %>
@@ -29,5 +29,3 @@
     <% end %>
   <% end %>
 <% end %>
-
-<%= render component("roles/index").new(page: @page) %>

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

@@ -1,17 +1,8 @@
 # frozen_string_literal: true
 
-class SolidusAdmin::Roles::Edit::Component < SolidusAdmin::BaseComponent
+class SolidusAdmin::Roles::Edit::Component < SolidusAdmin::Resources::Edit::Component
   include SolidusAdmin::PermissionSetsHelper
 
-  def initialize(page:, role:)
-    @page = page
-    @role = role
-  end
-
-  def form_id
-    dom_id(@role, "#{stimulus_id}_edit_role_form")
-  end
-
   private
 
   def permission_set_options

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

@@ -13,23 +13,23 @@ class SolidusAdmin::Roles::Index::Component < SolidusAdmin::UsersAndRoles::Compo
     solidus_admin.roles_path
   end
 
-  def row_url(role)
-    solidus_admin.edit_role_path(role, _turbo_frame: :edit_role_modal)
+  def edit_path(role)
+    solidus_admin.edit_role_path(role, **search_filter_params)
   end
 
   def page_actions
     render component("ui/button").new(
       tag: :a,
       text: t('.add'),
-      href: solidus_admin.new_role_path, data: { turbo_frame: :new_role_modal },
+      href: solidus_admin.new_role_path(**search_filter_params),
+      data: { turbo_frame: :resource_modal },
       icon: "add-line",
     )
   end
 
   def turbo_frames
     %w[
-      new_role_modal
-      edit_role_modal
+      resource_modal
     ]
   end
 
@@ -37,7 +37,7 @@ class SolidusAdmin::Roles::Index::Component < SolidusAdmin::UsersAndRoles::Compo
     [
       {
         label: t('.batch_actions.delete'),
-        action: solidus_admin.roles_path,
+        action: solidus_admin.roles_path(**search_filter_params),
         method: :delete,
         icon: 'delete-bin-7-line',
       },
@@ -59,11 +59,19 @@ class SolidusAdmin::Roles::Index::Component < SolidusAdmin::UsersAndRoles::Compo
     [
       {
         header: :role,
-        data: :name,
+        data: ->(role) do
+          link_to role.name, edit_path(role),
+            data: { turbo_frame: :resource_modal },
+            class: "body-link"
+        end,
       },
       {
         header: :description,
-        data: :description,
+        data: ->(role) do
+          link_to_if role.description, role.description, edit_path(role),
+            data: { turbo_frame: :resource_modal },
+            class: "body-link"
+        end
       }
     ]
   end

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

@@ -1,6 +1,6 @@
-<%= turbo_frame_tag :new_role_modal do %>
+<%= turbo_frame_tag :resource_modal, target: "_top" do %>
   <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
-    <%= form_for @role, url: solidus_admin.roles_path, html: { id: form_id } do |f| %>
+    <%= form_for @role, 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", placeholder: t(".name_placeholder")) %>
         <%= render component("ui/forms/field").text_field(f, :description, placeholder: t(".description_placeholder")) %>
@@ -29,5 +29,3 @@
     <% end %>
   <% end %>
 <% end %>
-
-<%= render component("roles/index").new(page: @page) %>

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

@@ -1,17 +1,8 @@
 # frozen_string_literal: true
 
-class SolidusAdmin::Roles::New::Component < SolidusAdmin::BaseComponent
+class SolidusAdmin::Roles::New::Component < SolidusAdmin::Resources::New::Component
   include SolidusAdmin::PermissionSetsHelper
 
-  def initialize(page:, role:)
-    @page = page
-    @role = role
-  end
-
-  def form_id
-    dom_id(@role, "#{stimulus_id}_new_role_form")
-  end
-
   private
 
   def permission_set_options

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

@@ -1,6 +1,6 @@
-<%= turbo_frame_tag :edit_shipping_category_modal do %>
+<%= turbo_frame_tag :resource_modal, target: "_top" do %>
   <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
-    <%= form_for @shipping_category, url: solidus_admin.shipping_category_path(@shipping_category), html: { id: form_id } do |f| %>
+    <%= form_for @shipping_category, 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) %>
       </div>
@@ -13,4 +13,3 @@
     <% end %>
   <% end %>
 <% end %>
-<%= render component("shipping_categories/index").new(page: @page) %>

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

@@ -1,12 +1,4 @@
 # frozen_string_literal: true
 
-class SolidusAdmin::ShippingCategories::Edit::Component < SolidusAdmin::ShippingCategories::Index::Component
-  def initialize(page:, shipping_category:)
-    @page = page
-    @shipping_category = shipping_category
-  end
-
-  def form_id
-    dom_id(@shipping_category, "#{stimulus_id}_edit_shipping_category_form")
-  end
+class SolidusAdmin::ShippingCategories::Edit::Component < SolidusAdmin::Resources::Edit::Component
 end

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

@@ -5,21 +5,12 @@ class SolidusAdmin::ShippingCategories::Index::Component < SolidusAdmin::Shippin
     Spree::ShippingCategory
   end
 
-  def actions
-    render component("ui/button").new(
-      tag: :a,
-      text: t('.add'),
-      href: spree.new_admin_shipping_category_path,
-      icon: "add-line",
-      class: "align-self-end w-full",
-    )
-  end
-
   def page_actions
     render component("ui/button").new(
       tag: :a,
       text: t('.add'),
-      href: solidus_admin.new_shipping_category_path, data: { turbo_frame: :new_shipping_category_modal },
+      href: solidus_admin.new_shipping_category_path(**search_filter_params),
+      data: { turbo_frame: :resource_modal },
       icon: "add-line",
       class: "align-self-end w-full",
     )
@@ -27,13 +18,12 @@ class SolidusAdmin::ShippingCategories::Index::Component < SolidusAdmin::Shippin
 
   def turbo_frames
     %w[
-      new_shipping_category_modal
-      edit_shipping_category_modal
+      resource_modal
     ]
   end
 
-  def row_url(shipping_category)
-    spree.edit_admin_shipping_category_path(shipping_category, _turbo_frame: :edit_shipping_category_modal)
+  def edit_url(shipping_category)
+    spree.edit_admin_shipping_category_path(shipping_category, **search_filter_params)
   end
 
   def search_key
@@ -48,7 +38,7 @@ class SolidusAdmin::ShippingCategories::Index::Component < SolidusAdmin::Shippin
     [
       {
         label: t('.batch_actions.delete'),
-        action: solidus_admin.shipping_categories_path,
+        action: solidus_admin.shipping_categories_path(**search_filter_params),
         method: :delete,
         icon: 'delete-bin-7-line',
       },
@@ -57,7 +47,14 @@ class SolidusAdmin::ShippingCategories::Index::Component < SolidusAdmin::Shippin
 
   def columns
     [
-      :name
+      {
+        header: :name,
+        data: ->(shipping_category) do
+          link_to shipping_category.name, edit_url(shipping_category),
+            data: { turbo_frame: :resource_modal },
+            class: "body-link"
+        end
+      },
     ]
   end
 end

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

@@ -1,6 +1,6 @@
-<%= turbo_frame_tag :new_shipping_category_modal do %>
+<%= turbo_frame_tag :resource_modal, target: "_top" do %>
   <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
-    <%= form_for @shipping_category, url: solidus_admin.shipping_categories_path(page: params[:page], q: params[:q]), html: { id: form_id } do |f| %>
+    <%= form_for @shipping_category, 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) %>
       </div>
@@ -13,5 +13,3 @@
     <% end %>
   <% end %>
 <% end %>
-
-<%= render component("shipping_categories/index").new(page: @page) %>

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

@@ -1,12 +1,4 @@
 # frozen_string_literal: true
 
-class SolidusAdmin::ShippingCategories::New::Component < SolidusAdmin::ShippingCategories::Index::Component
-  def initialize(page:, shipping_category:)
-    @page = page
-    @shipping_category = shipping_category
-  end
-
-  def form_id
-    dom_id(@shipping_category, "#{stimulus_id}_new_shipping_category_form")
-  end
+class SolidusAdmin::ShippingCategories::New::Component < SolidusAdmin::Resources::New::Component
 end

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

@@ -1,83 +1,84 @@
-<div
-  data-controller="<%= stimulus_id %>"
-  data-<%= stimulus_id %>-initial-count-on-hand-value="<%= @stock_item.count_on_hand_was || @stock_item.count_on_hand %>"
-  data-action="input-><%= stimulus_id %>#updateCountOnHand"
->
-  <%= turbo_frame_tag :edit_stock_item_modal do %>
-    <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
-      <%= form_for @stock_item, url: solidus_admin.stock_item_path(@stock_item), html: { id: form_id } do |f| %>
-        <div class="flex flex-col gap-6 pb-4">
-          <div class="flex gap-4">
-            <%= link_to spree.edit_admin_product_variant_path(
-              @stock_item.variant.product,
-              @stock_item.variant,
-            ), class: 'hover:bg-gray-25 rounded p-1 w-1/2 border border-gray-100' do %>
-              <%= render component("ui/resource_item").new(
-                thumbnail:
-                  (
-                    @stock_item.variant.images.first ||
-                      @stock_item.variant.product.gallery.images.first
-                  )&.url(:small),
-                title: @stock_item.variant.name,
-                subtitle:
-                  "#{@stock_item.variant.sku}#{@stock_item.variant.options_text.presence&.prepend(" - ")}",
-              ) %>
-            <% end %>
-            <%= link_to spree.edit_admin_stock_location_path(@stock_item.stock_location), class: 'hover:bg-gray-25 rounded p-1 w-1/2 border border-gray-100' do %>
-              <%= render component("ui/resource_item").new(
-                title: @stock_item.stock_location.name,
-                subtitle: "#{Spree::StockLocation.model_name.human} #{@stock_item.stock_location.code}",
-              ) %>
-            <% end %>
-          </div>
-
-          <%= render component("ui/forms/field").text_field(
-            f,
-            :count_on_hand,
-            disabled: true,
-            value: @stock_item.count_on_hand_was || @stock_item.count_on_hand,
-            "data-#{stimulus_id}-target": 'countOnHand',
-          ) %>
-          <%= render component("ui/forms/field").new(
-            label: t(".quantity_adjustment"),
-            hint: t(".quantity_adjustment_hint_html"),
-          ) do %>
-            <%= render component("ui/forms/input").new(
-              value: params[:quantity_adjustment] || 0,
-              name: :quantity_adjustment,
-              type: :number,
-              step: 1,
-              "data-#{stimulus_id}-target": 'quantityAdjustment',
+<%= turbo_frame_tag :resource_modal, target: "_top" do %>
+  <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
+    <%= form_for @stock_item, url: form_url, html: { id: form_id } do |f| %>
+      <div
+        class="flex flex-col gap-6 pb-4"
+        data-controller="<%= stimulus_id %>"
+        data-<%= stimulus_id %>-initial-count-on-hand-value="<%= @stock_item.count_on_hand_was || @stock_item.count_on_hand %>"
+        data-action="input-><%= stimulus_id %>#updateCountOnHand"
+      >
+        <div class="flex gap-4">
+          <%= link_to spree.edit_admin_product_variant_path(
+            @stock_item.variant.product,
+            @stock_item.variant,
+          ),
+          data: {turbo_frame: "_top"},
+          class: 'hover:bg-gray-25 rounded p-1 w-1/2 border border-gray-100' do %>
+            <%= render component("ui/resource_item").new(
+              thumbnail:
+                (
+                  @stock_item.variant.images.first ||
+                    @stock_item.variant.product.gallery.images.first
+                )&.url(:small),
+              title: @stock_item.variant.name,
+              subtitle:
+                "#{@stock_item.variant.sku}#{@stock_item.variant.options_text.presence&.prepend(" - ")}",
+            ) %>
+          <% end %>
+          <%= link_to spree.edit_admin_stock_location_path(@stock_item.stock_location),
+            data: {turbo_frame: "_top"},
+            class: 'hover:bg-gray-25 rounded p-1 w-1/2 border border-gray-100' do %>
+            <%= render component("ui/resource_item").new(
+              title: @stock_item.stock_location.name,
+              subtitle: "#{Spree::StockLocation.model_name.human} #{@stock_item.stock_location.code}",
             ) %>
           <% end %>
-
-          <%= render component("ui/forms/switch_field").new(
-            name: "#{f.object_name}[backorderable]",
-            label: Spree::StockItem.human_attribute_name(:backorderable),
-            error: f.object.errors[:backorderable],
-            hint: t(".backorderable_hint_html"),
-            checked: f.object.backorderable?,
-            include_hidden: true,
-          ) %>
         </div>
-      <% end %>
 
-      <% modal.with_actions do %>
-        <form method="dialog">
-          <%= render component("ui/button").new(
-            scheme: :secondary,
-            text: t(".cancel"),
+        <%= render component("ui/forms/field").text_field(
+          f,
+          :count_on_hand,
+          readonly: true,
+          value: @stock_item.count_on_hand_was || @stock_item.count_on_hand,
+          "data-#{stimulus_id}-target": 'countOnHand',
+        ) %>
+        <%= render component("ui/forms/field").new(
+          label: t(".quantity_adjustment"),
+          hint: t(".quantity_adjustment_hint_html"),
+        ) do %>
+          <%= render component("ui/forms/input").new(
+            value: params[:quantity_adjustment] || 0,
+            name: :quantity_adjustment,
+            type: :number,
+            step: 1,
+            "data-#{stimulus_id}-target": 'quantityAdjustment',
           ) %>
-        </form>
+        <% end %>
+
+        <%= render component("ui/forms/switch_field").new(
+          name: "#{f.object_name}[backorderable]",
+          label: Spree::StockItem.human_attribute_name(:backorderable),
+          error: f.object.errors[:backorderable],
+          hint: t(".backorderable_hint_html"),
+          checked: f.object.backorderable?,
+          include_hidden: true,
+        ) %>
+      </div>
+    <% end %>
 
+    <% modal.with_actions do %>
+      <form method="dialog">
         <%= render component("ui/button").new(
-          tag: :button,
-          text: t(".submit"),
-          form: form_id,
+          scheme: :secondary,
+          text: t(".cancel"),
         ) %>
-      <% end %>
+      </form>
+
+      <%= render component("ui/button").new(
+        tag: :button,
+        text: t(".submit"),
+        form: form_id,
+      ) %>
     <% end %>
   <% end %>
-
-  <%= render component("stock_items/index").new(page: @page) %>
-</div>
+<% end %>

data/app/components/solidus_admin/stock_items/edit/component.js

@@ -1,17 +1,18 @@
-import { Controller } from '@hotwired/stimulus'
+import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
   static values = {
     initialCountOnHand: Number,
   }
 
-  static targets = ['countOnHand', 'quantityAdjustment']
+  static targets = ["countOnHand", "quantityAdjustment"]
 
   connect() {
     this.updateCountOnHand()
   }
 
   updateCountOnHand() {
-    this.countOnHandTarget.value = parseInt(this.initialCountOnHandValue) + parseInt(this.quantityAdjustmentTarget.value)
+    this.countOnHandTarget.value =
+      parseInt(this.initialCountOnHandValue) + parseInt(this.quantityAdjustmentTarget.value)
   }
 }

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

@@ -1,18 +1,9 @@
 # frozen_string_literal: true
 
-class SolidusAdmin::StockItems::Edit::Component < SolidusAdmin::BaseComponent
-  def initialize(stock_item:, page:)
-    @stock_item = stock_item
-    @page = page
-  end
-
+class SolidusAdmin::StockItems::Edit::Component < SolidusAdmin::Resources::Edit::Component
   def title
     [
       "#{Spree::StockLocation.model_name.human}: #{@stock_item.stock_location.name}",
     ].join(' / ')
   end
-
-  def form_id
-    "#{stimulus_id}-#{dom_id(@stock_item)}"
-  end
 end

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

@@ -13,8 +13,8 @@ class SolidusAdmin::StockItems::Index::Component < SolidusAdmin::UI::Pages::Inde
     solidus_admin.stock_items_path
   end
 
-  def row_url(stock_item)
-    solidus_admin.edit_stock_item_path(stock_item, _turbo_frame: :edit_stock_item_modal)
+  def edit_path(stock_item)
+    solidus_admin.edit_stock_item_path(stock_item, **search_filter_params)
   end
 
   def scopes
@@ -90,7 +90,9 @@ class SolidusAdmin::StockItems::Index::Component < SolidusAdmin::UI::Pages::Inde
     {
       header: :name,
       data: ->(stock_item) do
-        content_tag :div, stock_item.variant.name
+        link_to stock_item.variant.name, edit_path(stock_item),
+          data: { turbo_frame: :resource_modal },
+          class: 'body-link'
       end
     }
   end
@@ -99,7 +101,9 @@ class SolidusAdmin::StockItems::Index::Component < SolidusAdmin::UI::Pages::Inde
     {
       header: :sku,
       data: ->(stock_item) do
-        content_tag :div, stock_item.variant.sku
+        link_to stock_item.variant.sku, edit_path(stock_item),
+          data: { turbo_frame: :resource_modal },
+          class: 'body-link'
       end
     }
   end
@@ -168,6 +172,6 @@ class SolidusAdmin::StockItems::Index::Component < SolidusAdmin::UI::Pages::Inde
   end
 
   def turbo_frames
-    %w[edit_stock_item_modal]
+    %w[resource_modal]
   end
 end

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

@@ -1,6 +1,6 @@
-<%= turbo_frame_tag :edit_store_credit_reason_modal do %>
+<%= turbo_frame_tag :resource_modal, target: "_top" do %>
   <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
-    <%= form_for @store_credit_reason, url: solidus_admin.store_credit_reason_path(@store_credit_reason), html: { id: form_id } do |f| %>
+    <%= form_for @store_credit_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("store_credit_reasons/index").new(page: @page) %>

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

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