solidus_admin 0.2.0 → 0.3.1

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Roles::New::Component < SolidusAdmin::BaseComponent
+  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
+    @permission_set_options ||= organize_permissions(permission_sets: Spree::PermissionSet.all, view_label: t(".view"), edit_label: t(".edit"))
+  end
+end

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

@@ -0,0 +1,19 @@
+# Add your component translations here.
+# Use the translation in the example in your template with `t(".hello")`.
+en:
+  title: "New Role"
+  cancel: "Cancel"
+  submit: "Add Role"
+  edit: "Edit"
+  view: "View"
+  name_placeholder: "Enter a clear role name"
+  description_placeholder: "Enter a brief description"
+  choose_permissions: "Choose permissions"
+  orders: "Orders"
+  products: "Products"
+  stock: "Stock"
+  restricted_stock: "Restricted Stock"
+  customers: "Customers"
+  promotions: "Promotions"
+  settings: "Settings"
+  other: "Other permissions"

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

@@ -0,0 +1,16 @@
+<%= turbo_frame_tag :edit_shipping_category_modal 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| %>
+      <div class="flex flex-col gap-6 pb-4">
+        <%= render component("ui/forms/field").text_field(f, :name) %>
+      </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 %>
+<%= render component("shipping_categories/index").new(page: @page) %>

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

@@ -0,0 +1,12 @@
+# 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
+end

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

@@ -0,0 +1,6 @@
+# Add your component translations here.
+# Use the translation in the example in your template with `t(".hello")`.
+en:
+  title: "Edit Shipping Category"
+  cancel: "Cancel"
+  submit: "Update Shipping Category"

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

@@ -15,12 +15,29 @@ class SolidusAdmin::ShippingCategories::Index::Component < SolidusAdmin::Shippin
     )
   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 },
+      icon: "add-line",
+      class: "align-self-end w-full",
+    )
+  end
+
+  def turbo_frames
+    %w[
+      new_shipping_category_modal
+      edit_shipping_category_modal
+    ]
+  end
+
   def row_url(shipping_category)
-    spree.edit_admin_shipping_category_path(shipping_category)
+    spree.edit_admin_shipping_category_path(shipping_category, _turbo_frame: :edit_shipping_category_modal)
   end
 
   def search_key
-    :name_or_description_cont
+    :name_cont
   end
 
   def search_url
@@ -30,7 +47,7 @@ class SolidusAdmin::ShippingCategories::Index::Component < SolidusAdmin::Shippin
   def batch_actions
     [
       {
-        display_name: t('.batch_actions.delete'),
+        label: t('.batch_actions.delete'),
         action: solidus_admin.shipping_categories_path,
         method: :delete,
         icon: 'delete-bin-7-line',

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

@@ -0,0 +1,17 @@
+<%= turbo_frame_tag :new_shipping_category_modal 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| %>
+      <div class="flex flex-col gap-6 pb-4">
+        <%= render component("ui/forms/field").text_field(f, :name) %>
+      </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 %>
+
+<%= render component("shipping_categories/index").new(page: @page) %>

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

@@ -0,0 +1,12 @@
+# 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
+end

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

@@ -0,0 +1,6 @@
+# Add your component translations here.
+# Use the translation in the example in your template with `t(".hello")`.
+en:
+  title: "New Shipping Category"
+  cancel: "Cancel"
+  submit: "Add Shipping Category"

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

@@ -17,7 +17,7 @@ class SolidusAdmin::ShippingMethods::Index::Component < SolidusAdmin::Shipping::
     :name_or_description_cont
   end
 
-  def actions
+  def page_actions
     render component("ui/button").new(
       tag: :a,
       text: t('.add'),
@@ -30,7 +30,7 @@ class SolidusAdmin::ShippingMethods::Index::Component < SolidusAdmin::Shipping::
   def batch_actions
     [
       {
-        display_name: t('.batch_actions.delete'),
+        label: t('.batch_actions.delete'),
         action: solidus_admin.shipping_methods_path,
         method: :delete,
         icon: 'delete-bin-7-line',

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

@@ -3,85 +3,79 @@
   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"
 >
-  <%= render component("ui/modal").new(title: t(".title"), close_path: solidus_admin.stock_items_path(page: params[:page], q: permitted_query_params)) 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}",
+  <%= 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',
             ) %>
           <% 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 %>
 
-        <%= 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',
+      <% modal.with_actions do %>
+        <form method="dialog">
+          <%= render component("ui/button").new(
+            scheme: :secondary,
+            text: t(".cancel"),
           ) %>
-        <% end %>
+        </form>
 
-        <%= 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,
+        <%= render component("ui/button").new(
+          tag: :button,
+          text: t(".submit"),
+          form: form_id,
         ) %>
-
-        <% if params[:q] %>
-          <%= f.hidden_field :q, value: params[:q].to_json, id: false %>
-        <% end %>
-
-        <% if params[:page] %>
-          <%= f.hidden_field :page, value: params[:page], id: false %>
-        <% end %>
-      </div>
-    <% end %>
-
-    <% modal.with_actions do %>
-      <%= render component("ui/button").new(
-        tag: :a,
-        scheme: :secondary,
-        text: t(".cancel"),
-        href: solidus_admin.stock_items_path(page: params[:page], q: params[:q]),
-      ) %>
-
-      <%= render component("ui/button").new(
-        tag: :button,
-        text: t(".submit"),
-        form: form_id,
-      ) %>
+      <% end %>
     <% end %>
   <% end %>
 

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

@@ -15,9 +15,4 @@ class SolidusAdmin::StockItems::Edit::Component < SolidusAdmin::BaseComponent
   def form_id
     "#{stimulus_id}-#{dom_id(@stock_item)}"
   end
-
-  def permitted_query_params
-    return params[:q].permit! if params[:q].respond_to?(:permit)
-    {}
-  end
 end

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

@@ -14,7 +14,7 @@ class SolidusAdmin::StockItems::Index::Component < SolidusAdmin::UI::Pages::Inde
   end
 
   def row_url(stock_item)
-    solidus_admin.edit_stock_item_path(stock_item, page: params[:page], q: permitted_query_params)
+    solidus_admin.edit_stock_item_path(stock_item, _turbo_frame: :edit_stock_item_modal)
   end
 
   def scopes
@@ -30,7 +30,7 @@ class SolidusAdmin::StockItems::Index::Component < SolidusAdmin::UI::Pages::Inde
   def filters
     [
       {
-        presentation: t('.filters.stock_locations'),
+        label: t('.filters.stock_locations'),
         combinator: 'or',
         attribute: "stock_location_id",
         predicate: "eq",
@@ -42,7 +42,7 @@ class SolidusAdmin::StockItems::Index::Component < SolidusAdmin::UI::Pages::Inde
         end
       },
       {
-        presentation: t('.filters.variants'),
+        label: t('.filters.variants'),
         combinator: 'or',
         attribute: "variant_id",
         predicate: "eq",
@@ -167,8 +167,7 @@ class SolidusAdmin::StockItems::Index::Component < SolidusAdmin::UI::Pages::Inde
     }
   end
 
-  def permitted_query_params
-    return params[:q].permit! if params[:q].respond_to?(:permit)
-    {}
+  def turbo_frames
+    %w[edit_stock_item_modal]
   end
 end

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

@@ -30,7 +30,7 @@ class SolidusAdmin::StockLocations::Index::Component < SolidusAdmin::Shipping::C
   def batch_actions
     [
       {
-        display_name: t('.batch_actions.delete'),
+        label: t('.batch_actions.delete'),
         action: solidus_admin.stock_locations_path,
         method: :delete,
         icon: 'delete-bin-7-line',

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

@@ -0,0 +1,26 @@
+<%= turbo_frame_tag :edit_store_credit_reason_modal 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| %>
+      <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">
+          <%= hidden_field_tag "#{f.object_name}[active]", "0" %>
+          <%= render component("ui/forms/checkbox").new(
+            name: "#{f.object_name}[active]",
+            value: "1",
+            checked: f.object.active
+          ) %>
+          <span class="font-semibold text-xs ml-2"><%= Spree::StoreCreditReason.human_attribute_name :active %></span>
+          <%= render component("ui/toggletip").new(text: t(".hints.active")) %>
+        </label>
+      </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 %>
+<%= render component("store_credit_reasons/index").new(page: @page) %>

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

@@ -0,0 +1,12 @@
+# 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
+end

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

@@ -0,0 +1,8 @@
+# Add your component translations here.
+# Use the translation in the example in your template with `t(".hello")`.
+en:
+  title: "Edit Store Credit Reason"
+  cancel: "Cancel"
+  submit: "Update Store Credit Reason"
+  hints:
+    active: "When checked, this store credit reason will be available for selection when adding store credit to orders."

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

@@ -5,18 +5,25 @@ class SolidusAdmin::StoreCreditReasons::Index::Component < SolidusAdmin::Refunds
     Spree::StoreCreditReason
   end
 
-  def actions
+  def page_actions
     render component("ui/button").new(
       tag: :a,
       text: t('.add'),
-      href: spree.new_admin_store_credit_reason_path,
+      href: solidus_admin.new_store_credit_reason_path, data: { turbo_frame: :new_store_credit_reason_modal },
       icon: "add-line",
       class: "align-self-end w-full",
     )
   end
 
+  def turbo_frames
+    %w[
+      new_store_credit_reason_modal
+      edit_store_credit_reason_modal
+    ]
+  end
+
   def row_url(store_credit_reason)
-    spree.edit_admin_store_credit_reason_path(store_credit_reason)
+    spree.edit_admin_store_credit_reason_path(store_credit_reason, _turbo_frame: :edit_store_credit_reason_modal)
   end
 
   def search_url
@@ -30,7 +37,7 @@ class SolidusAdmin::StoreCreditReasons::Index::Component < SolidusAdmin::Refunds
   def batch_actions
     [
       {
-        display_name: t('.batch_actions.delete'),
+        label: t('.batch_actions.delete'),
         action: solidus_admin.store_credit_reasons_path,
         method: :delete,
         icon: 'delete-bin-7-line',

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

@@ -0,0 +1,27 @@
+<%= turbo_frame_tag :new_store_credit_reason_modal do %>
+  <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
+    <%= form_for @store_credit_reason, url: solidus_admin.store_credit_reasons_path, 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">
+          <%= hidden_field_tag "#{f.object_name}[active]", "0" %>
+          <%= render component("ui/forms/checkbox").new(
+            name: "#{f.object_name}[active]",
+            value: "1",
+            checked: f.object.active
+          ) %>
+          <span class="font-semibold text-xs ml-2"><%= Spree::StoreCreditReason.human_attribute_name :active %></span>
+          <%= render component("ui/toggletip").new(text: t(".hints.active")) %>
+        </label>
+      </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 %>
+
+<%= render component("store_credit_reasons/index").new(page: @page) %>

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::StoreCreditReasons::New::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}_new_store_credit_reason_form")
+  end
+end

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

@@ -0,0 +1,8 @@
+# Add your component translations here.
+# Use the translation in the example in your template with `t(".hello")`.
+en:
+  title: "New Store Credit Reason"
+  cancel: "Cancel"
+  submit: "Add Store Credit Reason"
+  hints:
+    active: "When checked, this store credit reason will be available for selection when adding store credit to orders."

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

@@ -29,7 +29,7 @@ class SolidusAdmin::Stores::Index::Component < SolidusAdmin::UI::Pages::Index::C
   def batch_actions
     [
       {
-        display_name: t('.batch_actions.delete'),
+        label: t('.batch_actions.delete'),
         action: solidus_admin.stores_path,
         method: :delete,
         icon: 'delete-bin-7-line',

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

@@ -0,0 +1,28 @@
+<%= turbo_frame_tag :edit_tax_category_modal do %>
+  <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
+    <%= form_for @tax_category, url: solidus_admin.tax_category_path(@tax_category), html: { id: form_id } do |f| %>
+      <div class="flex flex-col gap-6 pb-4">
+        <%= render component("ui/forms/field").text_field(f, :name) %>
+        <%= render component("ui/forms/field").text_field(f, :tax_code) %>
+        <%= render component("ui/forms/field").text_field(f, :description) %>
+        <label class="flex gap-2 items-center">
+          <%= render component("ui/forms/checkbox").new(
+              name: "#{f.object_name}[is_default]",
+              value: "1",
+              checked: f.object.is_default
+            ) %>
+            <span class="font-semibold text-xs ml-2"><%= Spree::TaxCategory.human_attribute_name :is_default %></span>
+          <%= render component("ui/toggletip").new(text: t(".hints.is_default")) %>
+        </label>
+      </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 %>
+
+<%= render component("tax_categories/index").new(page: @page) %>

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::TaxCategories::Edit::Component < SolidusAdmin::TaxCategories::Index::Component
+  def initialize(page:, tax_category:)
+    @page = page
+    @tax_category = tax_category
+  end
+
+  def form_id
+    dom_id(@tax_category, "#{stimulus_id}_edit_tax_category_form")
+  end
+end

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

@@ -0,0 +1,8 @@
+# Add your component translations here.
+# Use the translation in the example in your template with `t(".hello")`.
+en:
+  title: "Edit Tax Category"
+  cancel: "Cancel"
+  submit: "Update Tax Category"
+  hints:
+    is_default: "When checked, this tax category will be selected by default when creating new products or variants."

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

@@ -2,7 +2,7 @@
 
 class SolidusAdmin::TaxCategories::Index::Component < SolidusAdmin::Taxes::Component
   def row_url(tax_category)
-    spree.edit_admin_tax_category_path(tax_category)
+    spree.edit_admin_tax_category_path(tax_category, _turbo_frame: :edit_tax_category_modal)
   end
 
   def model_class
@@ -13,16 +13,23 @@ class SolidusAdmin::TaxCategories::Index::Component < SolidusAdmin::Taxes::Compo
     solidus_admin.tax_categories_path
   end
 
-  def actions
+  def page_actions
     render component("ui/button").new(
       tag: :a,
       text: t('.add'),
-      href: spree.new_admin_tax_category_path,
+      href: solidus_admin.new_tax_category_path, data: { turbo_frame: :new_tax_category_modal },
       icon: "add-line",
       class: "align-self-end w-full",
     )
   end
 
+  def turbo_frames
+    %w[
+      new_tax_category_modal
+      edit_tax_category_modal
+    ]
+  end
+
   def search_key
     :name_or_description_cont
   end
@@ -30,7 +37,7 @@ class SolidusAdmin::TaxCategories::Index::Component < SolidusAdmin::Taxes::Compo
   def batch_actions
     [
       {
-        display_name: t('.batch_actions.delete'),
+        label: t('.batch_actions.delete'),
         action: solidus_admin.tax_categories_path,
         method: :delete,
         icon: 'delete-bin-7-line',